diff options
| -rw-r--r-- | app-portage/sisyphus/Manifest | 2 | ||||
| -rw-r--r-- | app-portage/sisyphus/files/sisyphus-1.1710-r4.patch | 90 | ||||
| -rw-r--r-- | app-portage/sisyphus/sisyphus-1.1801.ebuild (renamed from app-portage/sisyphus/sisyphus-1.1710-r4.ebuild) | 10 |
3 files changed, 3 insertions, 99 deletions
diff --git a/app-portage/sisyphus/Manifest b/app-portage/sisyphus/Manifest index 6227bd7c..68cb1f48 100644 --- a/app-portage/sisyphus/Manifest +++ b/app-portage/sisyphus/Manifest @@ -1 +1 @@ -DIST sisyphus-1.1710.tar.gz 181859 SHA256 ff843eebe05bf72a4f0c5c0fec61a3a94031f64b26db29e969379229bce4fa3c SHA512 bfff6ab89d90f18f59780f33378c05ad602989c2fe87d65bb2da22625b8078ebd7cc6531817382a0f1cdd10526448fec68efc1a1b45f466d4eda9f7570cc698c WHIRLPOOL 081ed40c25bb19f1003f2a0f677d7bc619e9a4ff4f9647e93de78b6a1f633487e14fae912432eb7f38e99b01ea79dff0c8a717d16e3b44eeaa1204ab5a364e2e +DIST sisyphus-1.1801.tar.gz 182422 SHA256 2f45d9bae8b945f21d566ccea5936562ecbbe74e21dc7f22e2f93836025d55ce SHA512 5b55c03d20606f85bb05e7e38370f857a86277260e82e39bfec3b048da778a0ec131af249003cf67a11aea75dc16ff4f589164708afe678e5eb21b4371118ff4 WHIRLPOOL 4c91e50960b1f28b0cceb6351417846d69d66571c948f3d849e1c8374d64a7a544b69cceca92455c45d822ae174e72dd5fa31f79ea13f695f99d707afe474892 diff --git a/app-portage/sisyphus/files/sisyphus-1.1710-r4.patch b/app-portage/sisyphus/files/sisyphus-1.1710-r4.patch deleted file mode 100644 index de2d6096..00000000 --- a/app-portage/sisyphus/files/sisyphus-1.1710-r4.patch +++ /dev/null @@ -1,90 +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..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-r4.ebuild b/app-portage/sisyphus/sisyphus-1.1801.ebuild index f83af50c..2b0d726b 100644 --- a/app-portage/sisyphus/sisyphus-1.1710-r4.ebuild +++ b/app-portage/sisyphus/sisyphus-1.1801.ebuild @@ -1,6 +1,5 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 2016-2017 Redcore Linux Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI=6 @@ -22,12 +21,7 @@ RDEPEND="${DEPEND} 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 -} + gui? ( dev-python/PyQt5[designer,gui,widgets,${PYTHON_USEDEP}] sys-apps/gentoo-functions )" src_install() { default |