From 3858e01d1347c89a77d2693013477a33aa33c5cc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 22 Dec 2017 16:31:09 +0000 Subject: app-portage/sisyphus : revision bump --- .../sisyphus/files/sisyphus-1.1710-r3.patch | 72 ----------------- .../sisyphus/files/sisyphus-1.1710-r4.patch | 90 ++++++++++++++++++++++ app-portage/sisyphus/sisyphus-1.1710-r3.ebuild | 60 --------------- app-portage/sisyphus/sisyphus-1.1710-r4.ebuild | 60 +++++++++++++++ 4 files changed, 150 insertions(+), 132 deletions(-) delete mode 100644 app-portage/sisyphus/files/sisyphus-1.1710-r3.patch create mode 100644 app-portage/sisyphus/files/sisyphus-1.1710-r4.patch delete mode 100644 app-portage/sisyphus/sisyphus-1.1710-r3.ebuild create mode 100644 app-portage/sisyphus/sisyphus-1.1710-r4.ebuild diff --git a/app-portage/sisyphus/files/sisyphus-1.1710-r3.patch b/app-portage/sisyphus/files/sisyphus-1.1710-r3.patch deleted file mode 100644 index 5898f921..00000000 --- a/app-portage/sisyphus/files/sisyphus-1.1710-r3.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff --git a/Makefile b/Makefile -index 4d9785d..af54dfd 100644 ---- a/Makefile -+++ b/Makefile -@@ -4,7 +4,6 @@ UBINDIR ?= /usr/bin - DESKTOPDIR ?= /usr/share/applications - PIXMAPDIR ?= /usr/share/pixmaps - SISYPHUSDATADIR ?= /usr/share/sisyphus --SISYPHUSPYLIBDIR ?= /usr/lib64/python3.4 - POLKITDIR ?= /usr/share/polkit-1/actions - - all: -@@ -19,8 +18,6 @@ install: - install -d $(DESTDIR)$(UBINDIR) - install -m 0755 sisyphus-gui $(DESTDIR)$(UBINDIR)/ - install -m 0755 sisyphus-gui-pkexec $(DESTDIR)$(UBINDIR)/ -- install -d $(DESTDIR)$(SISYPHUSPYLIBDIR) -- install -m 0644 src/backend/libsisyphus.py $(DESTDIR)$(SISYPHUSPYLIBDIR)/ - install -d $(DESTDIR)$(SISYPHUSDATADIR) - install -d $(DESTDIR)$(SISYPHUSDATADIR)/helpers - install -d $(DESTDIR)$(SISYPHUSDATADIR)/icon -@@ -44,4 +41,3 @@ uninstall: - rm -rf $(DESTDIR)$(PIXMAPDIR)/sisyphus-gui.png - rm -rf $(DESTDIR)$(POLKITDIR)/org.redcorelinux.sisyphus-gui.policy - rm -rf $(DESTDIR)$(SISYPHUSDATADIR) -- rm -rf $(DESTDIR)$(SISYPHUSPYLIBDIR)/libsisyphus.py -diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py -index 5f62119..4f7fda5 100755 ---- a/src/backend/libsisyphus.py -+++ b/src/backend/libsisyphus.py -@@ -112,10 +112,24 @@ def sync_sisyphus_database_removable_packages_table(): - @animation.wait('syncing remote databases') - def redcore_sync(): - check_if_root() -- sync_redcore_portage_tree_and_desktop_overlay() -- sync_redcore_portage_config() -- sync_sisyphus_database_remote_packages_table() -- sync_sisyphus_database_removable_packages_table() -+ -+ fetch_sisyphus_remote_packages_table_csv() -+ if filecmp.cmp(sisyphus_remote_csv_path_pre, sisyphus_remote_csv_path_post): -+ os.remove(sisyphus_remote_csv_path_post) -+ else: -+ sync_redcore_portage_tree_and_desktop_overlay() -+ sync_redcore_portage_config() -+ sync_sisyphus_database_remote_packages_table() -+ sync_sisyphus_database_removable_packages_table() -+ -+ fetch_sisyphus_removable_packages_table_csv() -+ if filecmp.cmp(sisyphus_removable_csv_path_pre, sisyphus_removable_csv_path_post): -+ os.remove(sisyphus_removable_csv_path_post) -+ else: -+ sync_redcore_portage_tree_and_desktop_overlay() -+ sync_redcore_portage_config() -+ sync_sisyphus_database_remote_packages_table() -+ sync_sisyphus_database_removable_packages_table() - - def generate_sisyphus_local_packages_table_csv_pre(): - subprocess.check_call(['/usr/share/sisyphus/helpers/make_local_csv_pre']) # this is really hard to do in python, so we cheat with a bash helper script -diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py -index d64f431..027c90c 100755 ---- a/src/frontend/gui/sisyphus-gui.py -+++ b/src/frontend/gui/sisyphus-gui.py -@@ -172,7 +172,7 @@ def loadDatabase(self): - AND i.name = a.name - AND i.slot = a.slot - WHERE %s LIKE %s %s -- AND a.timestamp <> i.timestamp -+ AND a.timestamp > i.timestamp - ''' % (Sisyphus.SEARCHFIELD, Sisyphus.SEARCHTERM, FILTEROUT)), - ]) - with sqlite3.connect(sisyphus_database_path) as db: diff --git a/app-portage/sisyphus/files/sisyphus-1.1710-r4.patch b/app-portage/sisyphus/files/sisyphus-1.1710-r4.patch new file mode 100644 index 00000000..de2d6096 --- /dev/null +++ b/app-portage/sisyphus/files/sisyphus-1.1710-r4.patch @@ -0,0 +1,90 @@ +diff --git a/Makefile b/Makefile +index 4d9785d..af54dfd 100644 +--- a/Makefile ++++ b/Makefile +@@ -4,7 +4,6 @@ UBINDIR ?= /usr/bin + DESKTOPDIR ?= /usr/share/applications + PIXMAPDIR ?= /usr/share/pixmaps + SISYPHUSDATADIR ?= /usr/share/sisyphus +-SISYPHUSPYLIBDIR ?= /usr/lib64/python3.4 + POLKITDIR ?= /usr/share/polkit-1/actions + + all: +@@ -19,8 +18,6 @@ install: + install -d $(DESTDIR)$(UBINDIR) + install -m 0755 sisyphus-gui $(DESTDIR)$(UBINDIR)/ + install -m 0755 sisyphus-gui-pkexec $(DESTDIR)$(UBINDIR)/ +- install -d $(DESTDIR)$(SISYPHUSPYLIBDIR) +- install -m 0644 src/backend/libsisyphus.py $(DESTDIR)$(SISYPHUSPYLIBDIR)/ + install -d $(DESTDIR)$(SISYPHUSDATADIR) + install -d $(DESTDIR)$(SISYPHUSDATADIR)/helpers + install -d $(DESTDIR)$(SISYPHUSDATADIR)/icon +@@ -44,4 +41,3 @@ uninstall: + rm -rf $(DESTDIR)$(PIXMAPDIR)/sisyphus-gui.png + rm -rf $(DESTDIR)$(POLKITDIR)/org.redcorelinux.sisyphus-gui.policy + rm -rf $(DESTDIR)$(SISYPHUSDATADIR) +- rm -rf $(DESTDIR)$(SISYPHUSPYLIBDIR)/libsisyphus.py +diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py +index 5f62119..a18e1cc 100755 +--- a/src/backend/libsisyphus.py ++++ b/src/backend/libsisyphus.py +@@ -112,10 +112,24 @@ def sync_sisyphus_database_removable_packages_table(): + @animation.wait('syncing remote databases') + def redcore_sync(): + check_if_root() +- sync_redcore_portage_tree_and_desktop_overlay() +- sync_redcore_portage_config() +- sync_sisyphus_database_remote_packages_table() +- sync_sisyphus_database_removable_packages_table() ++ ++ fetch_sisyphus_remote_packages_table_csv() ++ if filecmp.cmp(sisyphus_remote_csv_path_pre, sisyphus_remote_csv_path_post): ++ os.remove(sisyphus_remote_csv_path_post) ++ else: ++ sync_redcore_portage_tree_and_desktop_overlay() ++ sync_redcore_portage_config() ++ sync_sisyphus_database_remote_packages_table() ++ sync_sisyphus_database_removable_packages_table() ++ ++ fetch_sisyphus_removable_packages_table_csv() ++ if filecmp.cmp(sisyphus_removable_csv_path_pre, sisyphus_removable_csv_path_post): ++ os.remove(sisyphus_removable_csv_path_post) ++ else: ++ sync_redcore_portage_tree_and_desktop_overlay() ++ sync_redcore_portage_config() ++ sync_sisyphus_database_remote_packages_table() ++ sync_sisyphus_database_removable_packages_table() + + def generate_sisyphus_local_packages_table_csv_pre(): + subprocess.check_call(['/usr/share/sisyphus/helpers/make_local_csv_pre']) # this is really hard to do in python, so we cheat with a bash helper script +@@ -229,7 +243,7 @@ def sisyphus_pkg_auto_remove_orphans(): + def sisyphus_pkg_system_upgrade(): + redcore_sync() + generate_sisyphus_local_packages_table_csv_pre() +- portage_call = subprocess.Popen(['emerge', '-uDaNq', '--with-bdeps=y', '@world']) ++ portage_call = subprocess.Popen(['emerge', '-uDaNq', '--backtrack=100', '--with-bdeps=y', '@world']) + atexit.register(kill_bg_portage, portage_call) + portage_call.communicate() + generate_sisyphus_local_packages_table_csv_post() +@@ -238,7 +252,7 @@ def sisyphus_pkg_system_upgrade(): + def sisyphus_pkg_auto_system_upgrade(): + redcore_sync() + generate_sisyphus_local_packages_table_csv_pre() +- portage_call = subprocess.Popen(['emerge', '-uDNq', '--with-bdeps=y', '@world']) ++ portage_call = subprocess.Popen(['emerge', '-uDNq', '--backtrack=100', '--with-bdeps=y', '@world']) + atexit.register(kill_bg_portage, portage_call) + portage_call.communicate() + generate_sisyphus_local_packages_table_csv_post() +diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py +index d64f431..027c90c 100755 +--- a/src/frontend/gui/sisyphus-gui.py ++++ b/src/frontend/gui/sisyphus-gui.py +@@ -172,7 +172,7 @@ def loadDatabase(self): + AND i.name = a.name + AND i.slot = a.slot + WHERE %s LIKE %s %s +- AND a.timestamp <> i.timestamp ++ AND a.timestamp > i.timestamp + ''' % (Sisyphus.SEARCHFIELD, Sisyphus.SEARCHTERM, FILTEROUT)), + ]) + with sqlite3.connect(sisyphus_database_path) as db: diff --git a/app-portage/sisyphus/sisyphus-1.1710-r3.ebuild b/app-portage/sisyphus/sisyphus-1.1710-r3.ebuild deleted file mode 100644 index ac58c753..00000000 --- a/app-portage/sisyphus/sisyphus-1.1710-r3.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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}] )" - -src_prepare() { - default - eapply ${FILESDIR}/${P}-r3.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} - 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.1710-r4.ebuild b/app-portage/sisyphus/sisyphus-1.1710-r4.ebuild new file mode 100644 index 00000000..f83af50c --- /dev/null +++ b/app-portage/sisyphus/sisyphus-1.1710-r4.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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}] )" + +src_prepare() { + default + eapply ${FILESDIR}/${P}-r4.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} + 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