From 859e986656c6a98ab74f41a2860d3e54bce86120 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 24 May 2018 14:20:56 +0100 Subject: app-portage/sisyphus : revision bump (restrict sisyphus to binmode only) --- .../3e34420beb774d76d1f3e6b4ed0efd2c3c5b3e65.patch | 24 +++++++++ app-portage/sisyphus/sisyphus-1.1805-r2.ebuild | 59 --------------------- app-portage/sisyphus/sisyphus-1.1805-r9.ebuild | 60 ++++++++++++++++++++++ 3 files changed, 84 insertions(+), 59 deletions(-) create mode 100644 app-portage/sisyphus/files/3e34420beb774d76d1f3e6b4ed0efd2c3c5b3e65.patch delete mode 100644 app-portage/sisyphus/sisyphus-1.1805-r2.ebuild create mode 100644 app-portage/sisyphus/sisyphus-1.1805-r9.ebuild diff --git a/app-portage/sisyphus/files/3e34420beb774d76d1f3e6b4ed0efd2c3c5b3e65.patch b/app-portage/sisyphus/files/3e34420beb774d76d1f3e6b4ed0efd2c3c5b3e65.patch new file mode 100644 index 00000000..b817acbc --- /dev/null +++ b/app-portage/sisyphus/files/3e34420beb774d76d1f3e6b4ed0efd2c3c5b3e65.patch @@ -0,0 +1,24 @@ +diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py +index 1d05b8c..1f15140 100755 +--- a/src/backend/libsisyphus.py ++++ b/src/backend/libsisyphus.py +@@ -28,7 +28,6 @@ def checkRoot(): + + def checkSystemMode(): + portage_binmode_make_conf = '/opt/redcore-build/conf/intel/portage/make.conf.amd64-binmode' +- portage_mixedmode_make_conf = '/opt/redcore-build/conf/intel/portage/make.conf.amd64-mixedmode' + portage_make_conf_symlink = '/etc/portage/make.conf' + + if not os.path.islink(portage_make_conf_symlink): +@@ -37,10 +36,8 @@ def checkSystemMode(): + else: + if os.path.realpath(portage_make_conf_symlink) == portage_binmode_make_conf: + pass +- elif os.path.realpath(portage_make_conf_symlink) == portage_mixedmode_make_conf: +- pass + else: +- print("\nThe system is not set to binmode or mixedmode, refusing to run!\n") ++ print("\nThe system is not set to binmode, refusing to run!\n") + sys.exit(1) + + # get current mirror information, so we know where we download from (CLI + GUI frontend) diff --git a/app-portage/sisyphus/sisyphus-1.1805-r2.ebuild b/app-portage/sisyphus/sisyphus-1.1805-r2.ebuild deleted file mode 100644 index 1bf42a85..00000000 --- a/app-portage/sisyphus/sisyphus-1.1805-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" - -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 -} diff --git a/app-portage/sisyphus/sisyphus-1.1805-r9.ebuild b/app-portage/sisyphus/sisyphus-1.1805-r9.ebuild new file mode 100644 index 00000000..8a15e58a --- /dev/null +++ b/app-portage/sisyphus/sisyphus-1.1805-r9.ebuild @@ -0,0 +1,60 @@ +# 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 + "${FILESDIR}"/3e34420beb774d76d1f3e6b4ed0efd2c3c5b3e65.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