commit: 19043cf034fc35902ada6c59b377d8edd57afd2e
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 14 06:37:50 2021 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Jun 14 06:41:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19043cf0
sys-apps/portage: 3.0.20-r1 revbump
Reverting the patch from bug 777492 because it triggered this
regression:
# PORTAGE_NICENESS=20 emerge -av --depclean
OSError: [Errno 22] Invalid argument
During handling of the above exception, another exception occurred:
Traceback (most recent call last):
File "/usr/lib/python-exec/python3.9/emerge", line 51, in <module>
retval = emerge_main()
File "/usr/lib/python3.9/site-packages/_emerge/main.py", line 1319, in
emerge_main
return run_action(emerge_config)
File "/usr/lib/python3.9/site-packages/_emerge/actions.py", line 2999, in
run_action
apply_priorities(emerge_config.target_config.settings)
File "/usr/lib/python3.9/site-packages/_emerge/actions.py", line 2635, in
apply_priorities
nice(settings)
File "/usr/lib/python3.9/site-packages/_emerge/actions.py", line 2672, in nice
out.eerror("%s\n" % str(e))
OSError: [Errno 22] Invalid argument
Bug: https://bugs.gentoo.org/785484
Bug: https://bugs.gentoo.org/777492#c4
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
sys-apps/portage/Manifest | 1 +
.../portage/{portage-3.0.20.ebuild => portage-3.0.20-r1.ebuild} | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 864fdaba38a..a801adad31b 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -4,4 +4,5 @@ DIST
portage-3.0.17-bug-775239-_test_lock_fn-tempfile-leak-d8a12c.patch 733 BLAK
DIST portage-3.0.17.tar.xz 970076 BLAKE2B
261d8d3b0da5bb77f37328219365a59d7ac56a22e887de59a6b702fcf895493f7a0aac1af744bc67b80c9e2aa730795e507764e9e1c807c247d1ccbe6f825d2f
SHA512
6f4a50b005a67e6eea24600d10179fd48b4aa1de4cdf99bc310854dc303248408f8a31bca4135e4e530fcbd2b3d99c2f89644e4e4240e3a754fd97e949403ffc
DIST portage-3.0.18.tar.xz 971692 BLAKE2B
0a8d2062fce1bf85a2f1025d17ddd3eafc987fd93c01f17bcc4487b23841e530451502417e24bbe58175b4fee871ceb528696775116a60f93b7b841d14ecf7a3
SHA512
d3f4b5258748fbef7b8ec000685b7e42804123a5c6b474bb6679666c2696a16e3bd202108df6e647770406539ff223bfd0deb1a3b4240e0a7ba1f2ec52aca2cd
DIST portage-3.0.19.tar.gz 1347687 BLAKE2B
86eea08c2559b2d5a3eac39d8f7523380769710e7b4e3973463410bc291e746d9a36708e26d9b6456c06f67157fd04385c98ae28e25e48dba510fbaaab2d3536
SHA512
355153839219b93ae5d7c844ac5ed7ada10b2932d4a8e2b8208793fc33dfba3d46abe5ec7ecfbef9f16f23a6b21e57b7b14247f0b1fd85018a07e198bafa209c
+DIST portage-3.0.20-bug-777492-a4d8829.patch 4549 BLAKE2B
9023c7bd3d173b48e1bfcf6d48c87f6b01731d6ec154132797c820a4c24ffedcaaf2eabf380d08c43238b377cb33c1be090fe8d213f8aef39b813ba2fab25672
SHA512
5575015216534bc0ddc0aa79bd2c1a96180d40dd8b3df61bb95e49a2d86e60da10a5eb8d658bf616da3f3f15ff6f4377d82e72ceca770304d2d79f1f25a26a11
DIST portage-3.0.20.tar.gz 1348818 BLAKE2B
e8af0662d073110a921ef23865872b0440f5e549da92b828af3dc71010d0f49d98c429c52c90ed683407fcfee7bf17a504082166f2fcad9590d7435dd43dfb83
SHA512
69c1846dedf0cfa3f57b2748cf8e077ead05ab0185e785dfc6310439b8624cdd72449209a807f12f59a5175ba065f8cca1409d43bee6012900b2c8b1e7f9b7e9
diff --git a/sys-apps/portage/portage-3.0.20.ebuild
b/sys-apps/portage/portage-3.0.20-r1.ebuild
similarity index 96%
rename from sys-apps/portage/portage-3.0.20.ebuild
rename to sys-apps/portage/portage-3.0.20-r1.ebuild
index 86acdffec83..98ee6042f5a 100644
--- a/sys-apps/portage/portage-3.0.20.ebuild
+++ b/sys-apps/portage/portage-3.0.20-r1.ebuild
@@ -73,7 +73,8 @@ PDEPEND="
# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
# NOTE: FEATURES=installsources requires debugedit and rsync
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+
https://github.com/gentoo/portage/commit/a4d882964ee1931462f911d0c46a80e27e59fa48.patch
-> portage-3.0.20-bug-777492-a4d8829.patch"
pkg_pretend() {
local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
@@ -84,6 +85,9 @@ pkg_pretend() {
python_prepare_all() {
distutils-r1_python_prepare_all
+ # Revert due to regression: https://bugs.gentoo.org/777492#c4
+ eapply -R "${DISTDIR}/portage-3.0.20-bug-777492-a4d8829.patch"
+
sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i
lib/portage/__init__.py || die
if use gentoo-dev; then
