diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2021-06-17 10:29:38 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2021-06-17 10:37:06 -0700 |
| commit | 797c0e1ba74de82ff9ddf5aee2f7dd05eb8fe0a9 (patch) | |
| tree | 36bc7d8ac6f45ff9292201b6df1468f5310bf406 /sys-apps/portage | |
| parent | dev-libs/openssl: add check for kernel TLS options (diff) | |
| download | gentoo-797c0e1ba74de82ff9ddf5aee2f7dd05eb8fe0a9.tar.gz gentoo-797c0e1ba74de82ff9ddf5aee2f7dd05eb8fe0a9.tar.bz2 gentoo-797c0e1ba74de82ff9ddf5aee2f7dd05eb8fe0a9.zip | |
Revert "sys-apps/portage: 3.0.20-r2 revbump"
This reverts commit c9af8d3c9f5854407f1306c3adaceee1bb4ac07c
due to another regression.
See: https://github.com/gentoo/portage/pull/728
Bug: https://bugs.gentoo.org/777492
Bug: https://bugs.gentoo.org/785484
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'sys-apps/portage')
| -rw-r--r-- | sys-apps/portage/Manifest | 1 | ||||
| -rw-r--r-- | sys-apps/portage/portage-3.0.20-r1.ebuild (renamed from sys-apps/portage/portage-3.0.20-r2.ebuild) | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 3aa867846e88..a801adad31b9 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -4,6 +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-fix-055abe5.patch 5816 BLAKE2B 89c4be562de9be0d2a9c452a66500751a16db99a4069806cc767d358d56a0a787e0d9d872f95bd6c03fea7f543a19333a2b03f292009418b9da161065aa99aa9 SHA512 4cf114a7772baa8d37010d08d69dbb63a0b371c7369cff411663b545833f949b0c846d89793e38a61cd47ee5e3a7e8dd4335f03dd05f2b69fb6ff6299a446dba 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-r2.ebuild b/sys-apps/portage/portage-3.0.20-r1.ebuild index 7f7c65e2f5a7..9c18788e0c6f 100644 --- a/sys-apps/portage/portage-3.0.20-r2.ebuild +++ b/sys-apps/portage/portage-3.0.20-r1.ebuild @@ -74,8 +74,7 @@ PDEPEND=" # NOTE: FEATURES=installsources requires debugedit and rsync 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 - https://github.com/gentoo/portage/commit/055abe523c2c3f6c8f1dccfb53565209222f90c1.patch -> portage-3.0.20-bug-777492-a4d8829-fix-055abe5.patch" + 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" @@ -86,9 +85,10 @@ pkg_pretend() { python_prepare_all() { distutils-r1_python_prepare_all - # Revert a4d8829 and apply 055abe5 for bug 777492. + # Revert due to regressions: + # https://bugs.gentoo.org/777492 + # https://github.com/gentoo/portage/pull/728 eapply -R "${DISTDIR}/portage-3.0.20-bug-777492-a4d8829.patch" - eapply "${DISTDIR}/portage-3.0.20-bug-777492-a4d8829-fix-055abe5.patch" sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die |