From f479187702da8979792b94ea089ba37a4b4e8120 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 9 Apr 2018 22:03:24 +0100
Subject: app-portage/sisyphus : revision bump

---
 .../sisyphus/files/sisyphus-drop-datetime.patch    | 26 +++++++++
 app-portage/sisyphus/sisyphus-1.1804-r1.ebuild     | 65 ---------------------
 app-portage/sisyphus/sisyphus-1.1804-r2.ebuild     | 66 ++++++++++++++++++++++
 3 files changed, 92 insertions(+), 65 deletions(-)
 create mode 100644 app-portage/sisyphus/files/sisyphus-drop-datetime.patch
 delete mode 100644 app-portage/sisyphus/sisyphus-1.1804-r1.ebuild
 create mode 100644 app-portage/sisyphus/sisyphus-1.1804-r2.ebuild

(limited to 'app-portage')

diff --git a/app-portage/sisyphus/files/sisyphus-drop-datetime.patch b/app-portage/sisyphus/files/sisyphus-drop-datetime.patch
new file mode 100644
index 00000000..1d9e150b
--- /dev/null
+++ b/app-portage/sisyphus/files/sisyphus-drop-datetime.patch
@@ -0,0 +1,26 @@
+diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py
+index 59bf310..069d563 100755
+--- a/src/backend/libsisyphus.py
++++ b/src/backend/libsisyphus.py
+@@ -10,7 +10,6 @@
+ import urllib3
+ import io
+ 
+-from datetime import datetime
+ from dateutil import parser
+ 
+ redcore_portage_config_path = '/opt/redcore-build'
+@@ -101,11 +100,11 @@ def syncAll():
+ 
+     reqRmtPkgTs = http.request('HEAD',rmtCsvUrl)
+     rmtPkgTs = int(parser.parse(reqRmtPkgTs.headers['last-modified']).strftime("%s"))
+-    lclPkgTs = int(datetime.utcnow().strftime("%s"))
++    lclPkgTs = int(os.path.getctime(rmtPkgCsv))
+ 
+     reqRmtDscTs = http.request('HEAD',rmtDscUrl)
+     rmtDscTs = int(parser.parse(reqRmtDscTs.headers['last-modified']).strftime("%s"))
+-    lclDscTs = int(datetime.utcnow().strftime("%s"))
++    lclDscTs = int(os.path.getctime(rmtDscCsv))
+ 
+     if rmtPkgTs > lclPkgTs or rmtDscTs > lclDscTs:
+         fetchRemoteDatabaseCSV()
diff --git a/app-portage/sisyphus/sisyphus-1.1804-r1.ebuild b/app-portage/sisyphus/sisyphus-1.1804-r1.ebuild
deleted file mode 100644
index 430f448b..00000000
--- a/app-portage/sisyphus/sisyphus-1.1804-r1.ebuild
+++ /dev/null
@@ -1,65 +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"
-
-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_prepare() {
-	default
-	eapply "${FILESDIR}"/"${PN}"-use-dateutil.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}
-	
-	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
-}
-
-pkg_postinst() {
-	sisyphus rescue
-}
diff --git a/app-portage/sisyphus/sisyphus-1.1804-r2.ebuild b/app-portage/sisyphus/sisyphus-1.1804-r2.ebuild
new file mode 100644
index 00000000..b9b1f258
--- /dev/null
+++ b/app-portage/sisyphus/sisyphus-1.1804-r2.ebuild
@@ -0,0 +1,66 @@
+# 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"
+
+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_prepare() {
+	default
+	eapply "${FILESDIR}"/"${PN}"-use-dateutil.patch
+	eapply "${FILESDIR}"/"${PN}"-drop-datetime.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}
+	
+	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
+}
+
+pkg_postinst() {
+	sisyphus rescue
+}
-- 
cgit v1.2.3