From 29435f2aed08a4d28c14bdc2c88ca5ca3f8b06ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 19 May 2018 14:54:01 +0100 Subject: app-portage/sisyphus : revision bump (apply zombie process kill fix) --- .../4fa81a14d7e657e3976c26c64748b5963a55c56d.patch | 82 ++++++++++++++++++++++ app-portage/sisyphus/sisyphus-1.1805-r1.ebuild | 62 ---------------- app-portage/sisyphus/sisyphus-1.1805-r2.ebuild | 59 ++++++++++++++++ 3 files changed, 141 insertions(+), 62 deletions(-) create mode 100644 app-portage/sisyphus/files/4fa81a14d7e657e3976c26c64748b5963a55c56d.patch delete mode 100644 app-portage/sisyphus/sisyphus-1.1805-r1.ebuild create mode 100644 app-portage/sisyphus/sisyphus-1.1805-r2.ebuild (limited to 'app-portage/sisyphus') diff --git a/app-portage/sisyphus/files/4fa81a14d7e657e3976c26c64748b5963a55c56d.patch b/app-portage/sisyphus/files/4fa81a14d7e657e3976c26c64748b5963a55c56d.patch new file mode 100644 index 00000000..55af7a86 --- /dev/null +++ b/app-portage/sisyphus/files/4fa81a14d7e657e3976c26c64748b5963a55c56d.patch @@ -0,0 +1,82 @@ +diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py +index ac7d7b2..1d05b8c 100755 +--- a/src/backend/libsisyphus.py ++++ b/src/backend/libsisyphus.py +@@ -192,28 +192,28 @@ def rescueDB(): + def startInstall(pkgList): + syncAll() + portageExec = subprocess.Popen(['emerge', '-aq'] + pkgList) +- portageExec.communicate() ++ portageExec.wait() + syncLocalDatabase() + + # call portage to uninstall the package(s) (CLI frontend) + + def startUninstall(pkgList): + portageExec = subprocess.Popen(['emerge', '--depclean', '-aq'] + pkgList) +- portageExec.communicate() ++ portageExec.wait() + syncLocalDatabase() + + # call portage to force-uninstall the package(s) (CLI frontend) + + def startUninstallForce(pkgList): + portageExec = subprocess.Popen(['emerge', '--unmerge', '-aq'] + pkgList) +- portageExec.communicate() ++ portageExec.wait() + syncLocalDatabase() + + # call portage to remove orphan package(s) (CLI frontend) + + def removeOrphans(): + portageExec = subprocess.Popen(['emerge', '--depclean', '-aq']) +- portageExec.communicate() ++ portageExec.wait() + syncLocalDatabase() + + # call portage to perform a system upgrade (CLI frontend) +@@ -221,7 +221,7 @@ def removeOrphans(): + def startUpgrade(): + syncAll() + portageExec = subprocess.Popen(['emerge', '-uDaNq', '--backtrack=100', '--with-bdeps=y', '@world']) +- portageExec.communicate() ++ portageExec.wait() + syncLocalDatabase() + + # call portage to search for package(s) (CLI frontend) +diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py +index 406ea7a..0f290c8 100755 +--- a/src/frontend/gui/sisyphus-gui.py ++++ b/src/frontend/gui/sisyphus-gui.py +@@ -377,6 +377,7 @@ def startInstall(self): + atexit.register(portageKill, portageExec) + for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): + self.strReady.emit(portageOutput.rstrip()) ++ portageExec.wait() + syncLocalDatabase() + self.finished.emit() + +@@ -389,6 +390,7 @@ def startUninstall(self): + atexit.register(portageKill, portageExec) + for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): + self.strReady.emit(portageOutput.rstrip()) ++ portageExec.wait() + syncLocalDatabase() + self.finished.emit() + +@@ -400,6 +402,7 @@ def startUpgrade(self): + atexit.register(portageKill, portageExec) + for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): + self.strReady.emit(portageOutput.rstrip()) ++ portageExec.wait() + syncLocalDatabase() + self.finished.emit() + +@@ -411,6 +414,7 @@ def cleanOrphans(self): + atexit.register(portageKill, portageExec) + for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): + self.strReady.emit(portageOutput.rstrip()) ++ portageExec.wait() + syncLocalDatabase() + self.finished.emit() + diff --git a/app-portage/sisyphus/sisyphus-1.1805-r1.ebuild b/app-portage/sisyphus/sisyphus-1.1805-r1.ebuild deleted file mode 100644 index 1ebe7f8b..00000000 --- a/app-portage/sisyphus/sisyphus-1.1805-r1.ebuild +++ /dev/null @@ -1,62 +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" - -PATCHES=( "${FILESDIR}"/30fb816f2482fd06a60b557de5bf7cf6e8212d2a.patch ) - -DEPEND="dev-lang/python[sqlite]" -RDEPEND="${DEPEND} - app-portage/gentoolkit[${PYTHON_USEDEP}] - dev-python/animation[${PYTHON_USEDEP}] - dev-python/python-dateutil[${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}/${PN}-gui.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.1805-r2.ebuild b/app-portage/sisyphus/sisyphus-1.1805-r2.ebuild new file mode 100644 index 00000000..1bf42a85 --- /dev/null +++ b/app-portage/sisyphus/sisyphus-1.1805-r2.ebuild @@ -0,0 +1,59 @@ +# 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" + +PATCHES=( "${FILESDIR}"/30fb816f2482fd06a60b557de5bf7cf6e8212d2a.patch + "${FILESDIR}"/4fa81a14d7e657e3976c26c64748b5963a55c56d.patch ) + +DEPEND="dev-lang/python[sqlite]" +RDEPEND="${DEPEND} + app-portage/gentoolkit[${PYTHON_USEDEP}] + dev-python/animation[${PYTHON_USEDEP}] + dev-python/python-dateutil[${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}/${PN}-gui.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 +} -- cgit v1.2.3