diff options
-rw-r--r-- | app-portage/sisyphus/Manifest | 2 | ||||
-rw-r--r-- | app-portage/sisyphus/files/sisyphus-1.1709-r2.patch | 26 | ||||
-rw-r--r-- | app-portage/sisyphus/sisyphus-1.1710.ebuild (renamed from app-portage/sisyphus/sisyphus-1.1709-r2.ebuild) | 5 |
3 files changed, 1 insertions, 32 deletions
diff --git a/app-portage/sisyphus/Manifest b/app-portage/sisyphus/Manifest index a07649a6..6227bd7c 100644 --- a/app-portage/sisyphus/Manifest +++ b/app-portage/sisyphus/Manifest @@ -1 +1 @@ -DIST sisyphus-1.1709.tar.gz 181658 SHA256 b9178adc2acc9104c5a2f07eb34a9ca4cedc1ae6bcd4b9fc3cb77f6e5b342ace SHA512 1f56b1c098ad3fac6bedb52148aab6dd51dc517570ba0a8d4f031d2f21dca1a508bdc27d484222d4098fd0ac91c28031d9fb9ce0e6dd6b2c01e3b96f5df4879a WHIRLPOOL 1c9305999d7d82907b416e8c285d8eb78b854d37d9fff63a97a190b49443678003645f864938f4473a0a0a0afe7d42757262aede178cb480d5508f2ba661b41f +DIST sisyphus-1.1710.tar.gz 181859 SHA256 ff843eebe05bf72a4f0c5c0fec61a3a94031f64b26db29e969379229bce4fa3c SHA512 bfff6ab89d90f18f59780f33378c05ad602989c2fe87d65bb2da22625b8078ebd7cc6531817382a0f1cdd10526448fec68efc1a1b45f466d4eda9f7570cc698c WHIRLPOOL 081ed40c25bb19f1003f2a0f677d7bc619e9a4ff4f9647e93de78b6a1f633487e14fae912432eb7f38e99b01ea79dff0c8a717d16e3b44eeaa1204ab5a364e2e diff --git a/app-portage/sisyphus/files/sisyphus-1.1709-r2.patch b/app-portage/sisyphus/files/sisyphus-1.1709-r2.patch deleted file mode 100644 index 4149de01..00000000 --- a/app-portage/sisyphus/files/sisyphus-1.1709-r2.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py -index f49e9da..c19bd88 100755 ---- a/src/backend/libsisyphus.py -+++ b/src/backend/libsisyphus.py -@@ -258,8 +258,6 @@ def sisyphus_db_rescue(): - os.remove(sisyphus_remote_csv_path_pre) - if os.path.exists(sisyphus_removable_csv_path_pre): - os.remove(sisyphus_removable_csv_path_pre) -- if os.path.exists(sisyphus_local_csv_path_pre): -- os.remove(sisyphus_local_csv_path_pre) - if os.path.exists(sisyphus_database_path): - os.remove(sisyphus_database_path) - sisyphus_pkg_system_update() -diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py -index ee90c6f..c8a8bd9 100755 ---- a/src/frontend/cli/sisyphus-cli.py -+++ b/src/frontend/cli/sisyphus-cli.py -@@ -17,7 +17,7 @@ - elif "remove-orphans" in sys.argv[1:]: - sisyphus_pkg_remove_orphans() - elif "update" in sys.argv[1:]: -- sisyphus_pkg_system_update -+ sisyphus_pkg_system_update() - elif "upgrade" in sys.argv[1:]: - sisyphus_pkg_system_upgrade() - elif "search" in sys.argv[1:]: diff --git a/app-portage/sisyphus/sisyphus-1.1709-r2.ebuild b/app-portage/sisyphus/sisyphus-1.1710.ebuild index accff4fd..cbf83f20 100644 --- a/app-portage/sisyphus/sisyphus-1.1709-r2.ebuild +++ b/app-portage/sisyphus/sisyphus-1.1710.ebuild @@ -24,11 +24,6 @@ RDEPEND="${DEPEND} sys-apps/portage[${PYTHON_USEDEP}] gui? ( dev-python/PyQt5[designer,gui,widgets,${PYTHON_USEDEP}] )" -src_prepare() { - default - epatch ${FILESDIR}/${P}-r2.patch -} - src_install() { default dosym /usr/share/${PN}/${PN}-cli.py /usr/bin/${PN} |