diff options
| -rw-r--r-- | app-portage/sisyphus/Manifest | 2 | ||||
| -rw-r--r-- | app-portage/sisyphus/files/sisyphus-fixes.patch | 56 | ||||
| -rw-r--r-- | app-portage/sisyphus/sisyphus-1.1805.ebuild (renamed from app-portage/sisyphus/sisyphus-1.1804-r4.ebuild) | 5 |
3 files changed, 1 insertions, 62 deletions
diff --git a/app-portage/sisyphus/Manifest b/app-portage/sisyphus/Manifest index a62b5df2..48a0ff14 100644 --- a/app-portage/sisyphus/Manifest +++ b/app-portage/sisyphus/Manifest @@ -1 +1 @@ -DIST sisyphus-1.1804.tar.gz 208905 BLAKE2B 9f3d34945508bbc648bdf77c00634a2df8c4404c10e11421647634450314277607a5e9f9ce6e1030c74c13fb5f984e9bb9b9dbb469a9c1cbbe355e2165854106 SHA512 31f7d808efd7e1471c568b59d42276445e0a8b439a6f2e30bd9bcb52129256881a517afe545c03c5528e1da8ecee640ebbea61f4ad1cb5823bafcdade04f77b2 +DIST sisyphus-1.1805.tar.gz 209422 BLAKE2B 68cbb96f1fbadf4864a08540efdfc4edfc1a0045c666ce7e6304e771578e019052be5780679d75113f6770e2f35cd910452ed769b454fce64595a9246839be2c SHA512 1bb7e1c66aa7851573165b8491a382dc4e7b2a42bbb3bf7b44c5472e8f97093d2dc473d56a163ace18f5154f53b07944235a8f80dac1d7cd6b9db144ecbba2be diff --git a/app-portage/sisyphus/files/sisyphus-fixes.patch b/app-portage/sisyphus/files/sisyphus-fixes.patch deleted file mode 100644 index 276f97ce..00000000 --- a/app-portage/sisyphus/files/sisyphus-fixes.patch +++ /dev/null @@ -1,56 +0,0 @@ -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/sisyphus-1.1804-r4.ebuild b/app-portage/sisyphus/sisyphus-1.1805.ebuild index faa23dfd..caa492df 100644 --- a/app-portage/sisyphus/sisyphus-1.1804-r4.ebuild +++ b/app-portage/sisyphus/sisyphus-1.1805.ebuild @@ -24,11 +24,6 @@ RDEPEND="${DEPEND} sys-apps/portage[${PYTHON_USEDEP}] gui? ( dev-python/PyQt5[designer,gui,widgets,${PYTHON_USEDEP}] sys-apps/gentoo-functions )" -src_prepare() { - default - eapply "${FILESDIR}"/"${PN}"-fixes.patch -} - src_install() { default |