From 180e20131850682a9d6dc44b417de6f807c6fc3a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 1 Dec 2017 03:55:26 +0000 Subject: app-portage/sisyphus : PYTHON_COMPAT 3.5 --- .../sisyphus/files/sisyphus-1.1710-r1.patch | 46 ----------------- .../sisyphus/files/sisyphus-1.1710-r2.patch | 59 ++++++++++++++++++++++ app-portage/sisyphus/sisyphus-1.1710-r1.ebuild | 50 ------------------ app-portage/sisyphus/sisyphus-1.1710-r2.ebuild | 50 ++++++++++++++++++ 4 files changed, 109 insertions(+), 96 deletions(-) delete mode 100644 app-portage/sisyphus/files/sisyphus-1.1710-r1.patch create mode 100644 app-portage/sisyphus/files/sisyphus-1.1710-r2.patch delete mode 100644 app-portage/sisyphus/sisyphus-1.1710-r1.ebuild create mode 100644 app-portage/sisyphus/sisyphus-1.1710-r2.ebuild (limited to 'app-portage/sisyphus') diff --git a/app-portage/sisyphus/files/sisyphus-1.1710-r1.patch b/app-portage/sisyphus/files/sisyphus-1.1710-r1.patch deleted file mode 100644 index 716ac971..00000000 --- a/app-portage/sisyphus/files/sisyphus-1.1710-r1.patch +++ /dev/null @@ -1,46 +0,0 @@ -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-r2.patch b/app-portage/sisyphus/files/sisyphus-1.1710-r2.patch new file mode 100644 index 00000000..36fe5c44 --- /dev/null +++ b/app-portage/sisyphus/files/sisyphus-1.1710-r2.patch @@ -0,0 +1,59 @@ +diff --git a/Makefile b/Makefile +index 4d9785d..70579b0 100644 +--- a/Makefile ++++ b/Makefile +@@ -4,7 +4,7 @@ UBINDIR ?= /usr/bin + DESKTOPDIR ?= /usr/share/applications + PIXMAPDIR ?= /usr/share/pixmaps + SISYPHUSDATADIR ?= /usr/share/sisyphus +-SISYPHUSPYLIBDIR ?= /usr/lib64/python3.4 ++SISYPHUSPYLIBDIR ?= /usr/lib64/python3.5 + POLKITDIR ?= /usr/share/polkit-1/actions + + all: +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/sisyphus-1.1710-r1.ebuild b/app-portage/sisyphus/sisyphus-1.1710-r1.ebuild deleted file mode 100644 index 31bb18fd..00000000 --- a/app-portage/sisyphus/sisyphus-1.1710-r1.ebuild +++ /dev/null @@ -1,50 +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 ) - -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:3.4[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}-r1.patch -} - -src_install() { - default - 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-r2.ebuild b/app-portage/sisyphus/sisyphus-1.1710-r2.ebuild new file mode 100644 index 00000000..775f2422 --- /dev/null +++ b/app-portage/sisyphus/sisyphus-1.1710-r2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python3_5 ) + +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:3.5[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}-r2.patch +} + +src_install() { + default + 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