From 36f3ac653f9441a014349f81c67d9b801244ad40 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 21 Jan 2018 14:52:44 +0000 Subject: app-portage/sisyphus : revision bump --- app-portage/sisyphus/files/mirrors.conf | 2 +- .../sisyphus-1.1801-remove-csv-hardcode.patch | 45 +++++++++++++++ app-portage/sisyphus/sisyphus-1.1801-r2.ebuild | 59 -------------------- app-portage/sisyphus/sisyphus-1.1801-r3.ebuild | 64 ++++++++++++++++++++++ 4 files changed, 110 insertions(+), 60 deletions(-) create mode 100644 app-portage/sisyphus/files/sisyphus-1.1801-remove-csv-hardcode.patch delete mode 100644 app-portage/sisyphus/sisyphus-1.1801-r2.ebuild create mode 100644 app-portage/sisyphus/sisyphus-1.1801-r3.ebuild diff --git a/app-portage/sisyphus/files/mirrors.conf b/app-portage/sisyphus/files/mirrors.conf index dbb55599..e5919f3e 100644 --- a/app-portage/sisyphus/files/mirrors.conf +++ b/app-portage/sisyphus/files/mirrors.conf @@ -7,4 +7,4 @@ # PORTAGE_BINHOST="http://mirror.math.princeton.edu/pub/redcorelinux/packages/" # Alpix.eu (DE) mirror -PORTAGE_BINHOST="https://mirror.alpix.eu/redcorelinux/packages/" +PORTAGE_BINHOST="http://mirror.alpix.eu/redcorelinux/packages/" 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 new file mode 100644 index 00000000..2d0befa0 --- /dev/null +++ b/app-portage/sisyphus/files/sisyphus-1.1801-remove-csv-hardcode.patch @@ -0,0 +1,45 @@ +diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py +index defc5cf..6a89563 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('\"').strip('/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('\"').strip('/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-r2.ebuild b/app-portage/sisyphus/sisyphus-1.1801-r2.ebuild deleted file mode 100644 index f479ea57..00000000 --- a/app-portage/sisyphus/sisyphus-1.1801-r2.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 2016-2017 Redcore Linux Project -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{4,5,6} ) - -inherit eutils python-r1 - -DESCRIPTION="A simple portage python wrapper which works like other package managers(apt-get/yum/dnf)" -HOMEPAGE="http://redcorelinux.org" -SRC_URI="https://github.com/redcorelinux/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+gui" - -DEPEND="dev-lang/python[sqlite]" -RDEPEND="${DEPEND} - app-portage/gentoolkit[${PYTHON_USEDEP}] - dev-python/animation[${PYTHON_USEDEP}] - dev-python/urllib3[${PYTHON_USEDEP}] - sys-apps/portage[${PYTHON_USEDEP}] - gui? ( dev-python/PyQt5[designer,gui,widgets,${PYTHON_USEDEP}] sys-apps/gentoo-functions )" - -src_install() { - default - - inject_libsisyphus() { - # FIXME, ugly hack - python_moduleinto "$(python_get_sitedir)/.." - python_domodule src/backend/libsisyphus.py - rm -rf ${D}$(python_get_sitedir) - } - - python_foreach_impl inject_libsisyphus - - dosym /usr/share/${PN}/${PN}-cli.py /usr/bin/${PN} - dodir var/lib/${PN}/{csv,db} - - dodir etc/${PN} - insinto etc/${PN} - doins ${FILESDIR}/mirrors.conf - - 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}/icon - rm -rf ${ED}usr/share/${PN}/ui - rm -rf ${ED}usr/share/applications - rm -rf ${ED}usr/share/pixmaps - rm -rf ${ED}usr/share/polkit-1 - fi -} - -pkg_postinst() { - sisyphus rescue -} diff --git a/app-portage/sisyphus/sisyphus-1.1801-r3.ebuild b/app-portage/sisyphus/sisyphus-1.1801-r3.ebuild new file mode 100644 index 00000000..cfb091c3 --- /dev/null +++ b/app-portage/sisyphus/sisyphus-1.1801-r3.ebuild @@ -0,0 +1,64 @@ +# Copyright 2016-2017 Redcore Linux Project +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{4,5,6} ) + +inherit eutils python-r1 + +DESCRIPTION="A simple portage python wrapper which works like other package managers(apt-get/yum/dnf)" +HOMEPAGE="http://redcorelinux.org" +SRC_URI="https://github.com/redcorelinux/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="+gui" + +DEPEND="dev-lang/python[sqlite]" +RDEPEND="${DEPEND} + app-portage/gentoolkit[${PYTHON_USEDEP}] + dev-python/animation[${PYTHON_USEDEP}] + dev-python/urllib3[${PYTHON_USEDEP}] + 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 + + inject_libsisyphus() { + # FIXME, ugly hack + python_moduleinto "$(python_get_sitedir)/.." + python_domodule src/backend/libsisyphus.py + rm -rf ${D}$(python_get_sitedir) + } + + python_foreach_impl inject_libsisyphus + + dosym /usr/share/${PN}/${PN}-cli.py /usr/bin/${PN} + dodir var/lib/${PN}/{csv,db} + + dodir etc/${PN} + insinto etc/${PN} + doins ${FILESDIR}/mirrors.conf + + 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}/icon + rm -rf ${ED}usr/share/${PN}/ui + rm -rf ${ED}usr/share/applications + rm -rf ${ED}usr/share/pixmaps + rm -rf ${ED}usr/share/polkit-1 + fi +} + +pkg_postinst() { + sisyphus rescue +} -- cgit v1.2.3