From cfee6a895bc7ebce123e711b507b85b815ec10e9 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 27 Feb 2018 19:13:26 +0000
Subject: app-portage/sisyphus : revision bump
---
.../sisyphus-1.1801-remove-csv-hardcode.patch | 6 +-
app-portage/sisyphus/sisyphus-1.1801-r4.ebuild | 64 ----------------------
app-portage/sisyphus/sisyphus-1.1801-r5.ebuild | 64 ++++++++++++++++++++++
3 files changed, 67 insertions(+), 67 deletions(-)
delete mode 100644 app-portage/sisyphus/sisyphus-1.1801-r4.ebuild
create mode 100644 app-portage/sisyphus/sisyphus-1.1801-r5.ebuild
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
index 2d0befa0..bcbf0d87 100644
--- a/app-portage/sisyphus/files/sisyphus-1.1801-remove-csv-hardcode.patch
+++ b/app-portage/sisyphus/files/sisyphus-1.1801-remove-csv-hardcode.patch
@@ -1,5 +1,5 @@
diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py
-index defc5cf..6a89563 100755
+index defc5cf..5944ef4 100755
--- a/src/backend/libsisyphus.py
+++ b/src/backend/libsisyphus.py
@@ -10,15 +10,14 @@
@@ -26,7 +26,7 @@ index defc5cf..6a89563 100755
+ 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')
++ sisyphus_remote_csv_url = str(portage_output.rstrip().split("=")[1].strip('\"').replace('packages', 'csv') + 'remote_packages_pre.csv')
+
http = urllib3.PoolManager()
@@ -38,7 +38,7 @@ index defc5cf..6a89563 100755
+ 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')
++ sisyphus_removable_csv_url = str(portage_output.rstrip().split("=")[1].strip('\"').replace('packages', 'csv') + 'removable_packages_pre.csv')
+
http = urllib3.PoolManager()
diff --git a/app-portage/sisyphus/sisyphus-1.1801-r4.ebuild b/app-portage/sisyphus/sisyphus-1.1801-r4.ebuild
deleted file mode 100644
index cfb091c3..00000000
--- a/app-portage/sisyphus/sisyphus-1.1801-r4.ebuild
+++ /dev/null
@@ -1,64 +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_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
-}
diff --git a/app-portage/sisyphus/sisyphus-1.1801-r5.ebuild b/app-portage/sisyphus/sisyphus-1.1801-r5.ebuild
new file mode 100644
index 00000000..cfb091c3
--- /dev/null
+++ b/app-portage/sisyphus/sisyphus-1.1801-r5.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