diff options
| -rw-r--r-- | app-portage/sisyphus/Manifest | 2 | ||||
| -rw-r--r-- | app-portage/sisyphus/files/sisyphus-1.1801-remove-csv-hardcode.patch | 45 | ||||
| -rw-r--r-- | app-portage/sisyphus/sisyphus-1.1803.ebuild (renamed from app-portage/sisyphus/sisyphus-1.1801-r5.ebuild) | 7 |
3 files changed, 2 insertions, 52 deletions
diff --git a/app-portage/sisyphus/Manifest b/app-portage/sisyphus/Manifest index 1d6863a2..92f7ac77 100644 --- a/app-portage/sisyphus/Manifest +++ b/app-portage/sisyphus/Manifest @@ -1 +1 @@ -DIST sisyphus-1.1801.tar.gz 182476 SHA256 814968af85393896440454a6875ea73b853b9ae1b3245d57959d40a8ddd499a0 SHA512 eeae4fff9570ed881a0b3188af04da071d251c8e2b5325fa97e92ca7f741f10712d18bd94860beb265f6cb20ea1eda23640622a13ad9859b866b3f1814e5c01b WHIRLPOOL cdaf350d1371b3db971eb5f7b547781788a10ebd2ea787bdce259c8e79e69de6f0008ef17eed4db55727943678d57402e28377c266ed786c0e43c33cc0a46654 +DIST sisyphus-1.1803.tar.gz 209499 BLAKE2B 23c42e4bce489886ca40582563d3f062cf3d9fa84092ccbca1e1697313285f396ef06d5e07c8ed58722a85c29bf628ad32db6984f9866664536b392b1a936815 SHA512 1231c746b1d25237631fd1dc59865f719ba7fda049963d1a075a06b37805882db8c94545cf1f71453524af7a1a7e79cc5ad46228116e4365eb3817d7f1561606 diff --git a/app-portage/sisyphus/files/sisyphus-1.1801-remove-csv-hardcode.patch b/app-portage/sisyphus/files/sisyphus-1.1801-remove-csv-hardcode.patch deleted file mode 100644 index bcbf0d87..00000000 --- a/app-portage/sisyphus/files/sisyphus-1.1801-remove-csv-hardcode.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py -index defc5cf..5944ef4 100755 ---- a/src/backend/libsisyphus.py -+++ b/src/backend/libsisyphus.py -@@ -10,15 +10,14 @@ - import sys - import time - import urllib3 -+import io - - redcore_portage_tree_path = '/usr/portage' - redcore_desktop_overlay_path = '/var/lib/layman/redcore-desktop' - redcore_portage_config_path = '/opt/redcore-build' - --sisyphus_remote_csv_url = 'http://mirror.math.princeton.edu/pub/redcorelinux/csv/remote_packages_pre.csv' - sisyphus_remote_csv_path_pre = '/var/lib/sisyphus/csv/remote_packages_pre.csv' - sisyphus_remote_csv_path_post = '/var/lib/sisyphus/csv/remote_packages_post.csv' --sisyphus_removable_csv_url = 'http://mirror.math.princeton.edu/pub/redcorelinux/csv/removable_packages_pre.csv' - sisyphus_removable_csv_path_pre = '/var/lib/sisyphus/csv/removable_packages_pre.csv' - sisyphus_removable_csv_path_post = '/var/lib/sisyphus/csv/removable_packages_post.csv' - sisyphus_local_csv_path_pre = '/var/lib/sisyphus/csv/local_packages_pre.csv' -@@ -48,6 +47,11 @@ def check_system_mode(): - sys.exit(1) - - def fetch_sisyphus_remote_packages_table_csv(): -+ portage_call = subprocess.Popen(['emerge', '--info', '--verbose'], stdout=subprocess.PIPE) -+ for portage_output in io.TextIOWrapper(portage_call.stdout, encoding="utf-8"): -+ if "PORTAGE_BINHOST" in portage_output.rstrip(): -+ sisyphus_remote_csv_url = str(portage_output.rstrip().split("=")[1].strip('\"').replace('packages', 'csv') + 'remote_packages_pre.csv') -+ - http = urllib3.PoolManager() - - if not os.path.isfile(sisyphus_remote_csv_path_pre): -@@ -59,6 +63,11 @@ def fetch_sisyphus_remote_packages_table_csv(): - shutil.copyfileobj(tmp_buffer, output_file) - - def fetch_sisyphus_removable_packages_table_csv(): -+ portage_call = subprocess.Popen(['emerge', '--info', '--verbose'], stdout=subprocess.PIPE) -+ for portage_output in io.TextIOWrapper(portage_call.stdout, encoding="utf-8"): -+ if "PORTAGE_BINHOST" in portage_output.rstrip(): -+ sisyphus_removable_csv_url = str(portage_output.rstrip().split("=")[1].strip('\"').replace('packages', 'csv') + 'removable_packages_pre.csv') -+ - http = urllib3.PoolManager() - - if not os.path.isfile(sisyphus_removable_csv_path_pre): diff --git a/app-portage/sisyphus/sisyphus-1.1801-r5.ebuild b/app-portage/sisyphus/sisyphus-1.1803.ebuild index cfb091c3..04fc4b97 100644 --- a/app-portage/sisyphus/sisyphus-1.1801-r5.ebuild +++ b/app-portage/sisyphus/sisyphus-1.1803.ebuild @@ -23,11 +23,6 @@ RDEPEND="${DEPEND} sys-apps/portage[${PYTHON_USEDEP}] gui? ( dev-python/PyQt5[designer,gui,widgets,${PYTHON_USEDEP}] sys-apps/gentoo-functions )" -src_prepare() { - default - eapply "${FILESDIR}/${P}-remove-csv-hardcode.patch" -} - src_install() { default @@ -50,7 +45,7 @@ src_install() { if ! use gui; then rm -rf ${ED}usr/bin/${PN}-gui rm -rf ${ED}usr/bin/${PN}-gui-pkexec - rm -rf ${ED}usr/share/${PN}/*py + rm -rf ${ED}usr/share/${PN}/${PN}-gui.py rm -rf ${ED}usr/share/${PN}/icon rm -rf ${ED}usr/share/${PN}/ui rm -rf ${ED}usr/share/applications |