From 024c0d9e17ad0be0134bec4d673e4226984786f2 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 30 Sep 2017 20:19:36 +0100
Subject: app-portage/sisyphus : revision bump

---
 .../sisyphus/files/sisyphus-1.1709-r1.patch        | 30 -------------
 .../sisyphus/files/sisyphus-1.1709-r2.patch        | 26 +++++++++++
 app-portage/sisyphus/sisyphus-1.1709-r1.ebuild     | 50 ----------------------
 app-portage/sisyphus/sisyphus-1.1709-r2.ebuild     | 50 ++++++++++++++++++++++
 4 files changed, 76 insertions(+), 80 deletions(-)
 delete mode 100644 app-portage/sisyphus/files/sisyphus-1.1709-r1.patch
 create mode 100644 app-portage/sisyphus/files/sisyphus-1.1709-r2.patch
 delete mode 100644 app-portage/sisyphus/sisyphus-1.1709-r1.ebuild
 create mode 100644 app-portage/sisyphus/sisyphus-1.1709-r2.ebuild

diff --git a/app-portage/sisyphus/files/sisyphus-1.1709-r1.patch b/app-portage/sisyphus/files/sisyphus-1.1709-r1.patch
deleted file mode 100644
index 2d70bd93..00000000
--- a/app-portage/sisyphus/files/sisyphus-1.1709-r1.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py
-index f49e9da..2f8e150 100755
---- a/src/backend/libsisyphus.py
-+++ b/src/backend/libsisyphus.py
-@@ -254,12 +254,6 @@ def sisyphus_pkg_sysinfo():
-     subprocess.check_call(['emerge', '--info'])
- 
- def sisyphus_db_rescue():
--    if os.path.exists(sisyphus_remote_csv_path_pre):
--        os.remove(sisyphus_remote_csv_path_pre)
--    if os.path.exists(sisyphus_removable_csv_path_pre):
--        os.remove(sisyphus_removable_csv_path_pre)
--    if os.path.exists(sisyphus_local_csv_path_pre):
--        os.remove(sisyphus_local_csv_path_pre)
-     if os.path.exists(sisyphus_database_path):
-         os.remove(sisyphus_database_path)
-     sisyphus_pkg_system_update()
-diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py
-index ee90c6f..c8a8bd9 100755
---- a/src/frontend/cli/sisyphus-cli.py
-+++ b/src/frontend/cli/sisyphus-cli.py
-@@ -17,7 +17,7 @@
-     elif "remove-orphans" in sys.argv[1:]:
-         sisyphus_pkg_remove_orphans()
-     elif "update" in sys.argv[1:]:
--        sisyphus_pkg_system_update
-+        sisyphus_pkg_system_update()
-     elif "upgrade" in sys.argv[1:]:
-         sisyphus_pkg_system_upgrade()
-     elif "search" in sys.argv[1:]:
diff --git a/app-portage/sisyphus/files/sisyphus-1.1709-r2.patch b/app-portage/sisyphus/files/sisyphus-1.1709-r2.patch
new file mode 100644
index 00000000..4149de01
--- /dev/null
+++ b/app-portage/sisyphus/files/sisyphus-1.1709-r2.patch
@@ -0,0 +1,26 @@
+diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py
+index f49e9da..c19bd88 100755
+--- a/src/backend/libsisyphus.py
++++ b/src/backend/libsisyphus.py
+@@ -258,8 +258,6 @@ def sisyphus_db_rescue():
+         os.remove(sisyphus_remote_csv_path_pre)
+     if os.path.exists(sisyphus_removable_csv_path_pre):
+         os.remove(sisyphus_removable_csv_path_pre)
+-    if os.path.exists(sisyphus_local_csv_path_pre):
+-        os.remove(sisyphus_local_csv_path_pre)
+     if os.path.exists(sisyphus_database_path):
+         os.remove(sisyphus_database_path)
+     sisyphus_pkg_system_update()
+diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py
+index ee90c6f..c8a8bd9 100755
+--- a/src/frontend/cli/sisyphus-cli.py
++++ b/src/frontend/cli/sisyphus-cli.py
+@@ -17,7 +17,7 @@
+     elif "remove-orphans" in sys.argv[1:]:
+         sisyphus_pkg_remove_orphans()
+     elif "update" in sys.argv[1:]:
+-        sisyphus_pkg_system_update
++        sisyphus_pkg_system_update()
+     elif "upgrade" in sys.argv[1:]:
+         sisyphus_pkg_system_upgrade()
+     elif "search" in sys.argv[1:]:
diff --git a/app-portage/sisyphus/sisyphus-1.1709-r1.ebuild b/app-portage/sisyphus/sisyphus-1.1709-r1.ebuild
deleted file mode 100644
index 97b61297..00000000
--- a/app-portage/sisyphus/sisyphus-1.1709-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
-	epatch ${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.1709-r2.ebuild b/app-portage/sisyphus/sisyphus-1.1709-r2.ebuild
new file mode 100644
index 00000000..accff4fd
--- /dev/null
+++ b/app-portage/sisyphus/sisyphus-1.1709-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_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
+	epatch ${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