5 files changed, 57 insertions, 85 deletions
diff --git a/app-portage/sisyphus/files/sisyphus-drop-datetime.patch b/app-portage/sisyphus/files/sisyphus-drop-datetime.patch
deleted file mode 100644
index 1d9e150b..00000000
--- a/app-portage/sisyphus/files/sisyphus-drop-datetime.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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/files/sisyphus-fixes.patch b/app-portage/sisyphus/files/sisyphus-fixes.patch
new file mode 100644
index 00000000..276f97ce
--- /dev/null
+++ b/app-portage/sisyphus/files/sisyphus-fixes.patch
@@ -0,0 +1,56 @@
+diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py
+index 36a2dce..a71db21 100755
+--- a/src/backend/libsisyphus.py
++++ b/src/backend/libsisyphus.py
+@@ -9,7 +9,8 @@
+ import sys
+ import urllib3
+ import io
+-from datetime import datetime
++
++from dateutil import parser
+ 
+ redcore_portage_config_path = '/opt/redcore-build'
+ 
+@@ -98,12 +99,12 @@ def syncAll():
+     http = urllib3.PoolManager()
+ 
+     reqRmtPkgTs = http.request('HEAD',rmtCsvUrl)
+-    rmtPkgTs = int(datetime.strptime(reqRmtPkgTs.headers['last-modified'], '%a, %d %b %Y %H:%M:%S %Z').strftime("%s"))
+-    lclPkgTs = int(datetime.utcnow().strftime("%s"))
++    rmtPkgTs = int(parser.parse(reqRmtPkgTs.headers['last-modified']).strftime("%s"))
++    lclPkgTs = int(os.path.getctime(rmtPkgCsv))
+ 
+     reqRmtDscTs = http.request('HEAD',rmtDscUrl)
+-    rmtDscTs = int(datetime.strptime(reqRmtDscTs.headers['last-modified'], '%a, %d %b %Y %H:%M:%S %Z').strftime("%s"))
+-    lclDscTs = int(datetime.utcnow().strftime("%s"))
++    rmtDscTs = int(parser.parse(reqRmtDscTs.headers['last-modified']).strftime("%s"))
++    lclDscTs = int(os.path.getctime(rmtDscCsv))
+ 
+     if rmtPkgTs > lclPkgTs or rmtDscTs > lclDscTs:
+         fetchRemoteDatabaseCSV()
+@@ -167,6 +168,11 @@ def startSearch(pkgList):
+ def startUpdate():
+     syncAll()
+ 
++@animation.wait('syncing portage tree && portage config files')
++def startSync():
++    syncGitRepos()
++    syncPortageCfg()
++
+ def sysInfo():
+     subprocess.check_call(['emerge', '--info'])
+ 
+diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py
+index 965e3f1..9d347ab 100755
+--- a/src/frontend/cli/sisyphus-cli.py
++++ b/src/frontend/cli/sisyphus-cli.py
+@@ -18,7 +18,7 @@
+         elif "remove-orphans" in sys.argv[1:]:
+             removeOrphans()
+         elif "update" in sys.argv[1:]:
+-            startUpdate()
++            startSync()
+         elif "upgrade" in sys.argv[1:]:
+             startUpgrade()
+         elif "search" in sys.argv[1:]:
diff --git a/app-portage/sisyphus/files/sisyphus-update.patch b/app-portage/sisyphus/files/sisyphus-update.patch
deleted file mode 100644
index f70fb862..00000000
--- a/app-portage/sisyphus/files/sisyphus-update.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py
-index 069d563..e83258a 100755
---- a/src/backend/libsisyphus.py
-+++ b/src/backend/libsisyphus.py
-@@ -168,6 +168,10 @@ def startSearch(pkgList):
- def startUpdate():
-     syncAll()
- 
-+def startSync():
-+    syncGitRepos()
-+    syncPortageCfg()
-+
- def sysInfo():
-     subprocess.check_call(['emerge', '--info'])
- 
-diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py
-index 965e3f1..9d347ab 100755
---- a/src/frontend/cli/sisyphus-cli.py
-+++ b/src/frontend/cli/sisyphus-cli.py
-@@ -18,7 +18,7 @@
-         elif "remove-orphans" in sys.argv[1:]:
-             removeOrphans()
-         elif "update" in sys.argv[1:]:
--            startUpdate()
-+            startSync()
-         elif "upgrade" in sys.argv[1:]:
-             startUpgrade()
-         elif "search" in sys.argv[1:]:
diff --git a/app-portage/sisyphus/files/sisyphus-use-dateutil.patch b/app-portage/sisyphus/files/sisyphus-use-dateutil.patch
deleted file mode 100644
index 29165a78..00000000
--- a/app-portage/sisyphus/files/sisyphus-use-dateutil.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py
-index 36a2dce..59bf310 100755
---- a/src/backend/libsisyphus.py
-+++ b/src/backend/libsisyphus.py
-@@ -9,7 +9,9 @@
- import sys
- import urllib3
- import io
-+
- from datetime import datetime
-+from dateutil import parser
- 
- redcore_portage_config_path = '/opt/redcore-build'
- 
-@@ -98,11 +100,11 @@ def syncAll():
-     http = urllib3.PoolManager()
- 
-     reqRmtPkgTs = http.request('HEAD',rmtCsvUrl)
--    rmtPkgTs = int(datetime.strptime(reqRmtPkgTs.headers['last-modified'], '%a, %d %b %Y %H:%M:%S %Z').strftime("%s"))
-+    rmtPkgTs = int(parser.parse(reqRmtPkgTs.headers['last-modified']).strftime("%s"))
-     lclPkgTs = int(datetime.utcnow().strftime("%s"))
- 
-     reqRmtDscTs = http.request('HEAD',rmtDscUrl)
--    rmtDscTs = int(datetime.strptime(reqRmtDscTs.headers['last-modified'], '%a, %d %b %Y %H:%M:%S %Z').strftime("%s"))
-+    rmtDscTs = int(parser.parse(reqRmtDscTs.headers['last-modified']).strftime("%s"))
-     lclDscTs = int(datetime.utcnow().strftime("%s"))
- 
-     if rmtPkgTs > lclPkgTs or rmtDscTs > lclDscTs:
diff --git a/app-portage/sisyphus/sisyphus-1.1804-r3.ebuild b/app-portage/sisyphus/sisyphus-1.1804-r4.ebuild
index c781f2d9..faa23dfd 100644
--- a/app-portage/sisyphus/sisyphus-1.1804-r3.ebuild
+++ b/app-portage/sisyphus/sisyphus-1.1804-r4.ebuild
@@ -26,9 +26,7 @@ RDEPEND="${DEPEND}
 
 src_prepare() {
 	default
-	eapply "${FILESDIR}"/"${PN}"-use-dateutil.patch
-	eapply "${FILESDIR}"/"${PN}"-drop-datetime.patch
-	eapply "${FILESDIR}"/"${PN}"-update.patch
+	eapply "${FILESDIR}"/"${PN}"-fixes.patch
 }
 
 src_install() {