| 1 |
commit: 5ace8dcb975be031b52bcea11d329591d6908697 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 21 03:26:53 2021 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 21 03:33:21 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ace8dcb |
| 7 |
|
| 8 |
sys-apps/portage: sys-apps/portage: 3.0.20-r6 revbump for EAPI 8 #796959 |
| 9 |
|
| 10 |
#796959 Fix exposing evaluated PROPERTIES & RESTRICT in EAPI 8 |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/796959 |
| 13 |
Bug: https://bugs.gentoo.org/785484 |
| 14 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 15 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 16 |
|
| 17 |
sys-apps/portage/Manifest | 1 + |
| 18 |
.../portage/{portage-3.0.20-r5.ebuild => portage-3.0.20-r6.ebuild} | 6 +++++- |
| 19 |
2 files changed, 6 insertions(+), 1 deletion(-) |
| 20 |
|
| 21 |
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest |
| 22 |
index 7d638f43e89..e2172affcdc 100644 |
| 23 |
--- a/sys-apps/portage/Manifest |
| 24 |
+++ b/sys-apps/portage/Manifest |
| 25 |
@@ -4,4 +4,5 @@ DIST portage-3.0.20-bug-777492-209be9a.patch 1758 BLAKE2B 9ed7b18ef8b73c59a08e5a |
| 26 |
DIST portage-3.0.20-bug-777492-a4d8829.patch 4549 BLAKE2B 9023c7bd3d173b48e1bfcf6d48c87f6b01731d6ec154132797c820a4c24ffedcaaf2eabf380d08c43238b377cb33c1be090fe8d213f8aef39b813ba2fab25672 SHA512 5575015216534bc0ddc0aa79bd2c1a96180d40dd8b3df61bb95e49a2d86e60da10a5eb8d658bf616da3f3f15ff6f4377d82e72ceca770304d2d79f1f25a26a11 |
| 27 |
DIST portage-3.0.20-bug-796584-693f6bf.patch 2335 BLAKE2B 4922fad1fc34977b786555f1811e7b3b80e910bb940492eb735e95349f2ebb6c6f52642908fdc49e87c5f8b14f9171c8f32c627fe5ab472e645d5bc41c55bf33 SHA512 4032aef8de565e9ab166bf0f1b0fe4b4aec755eac4b8960dde57f89e08b00609a33cdce56f0f469292facb46aa088da4f3465cec935811cae4d00cca2254763b |
| 28 |
DIST portage-3.0.20-bug-796812-2ce11f0.patch 1292 BLAKE2B b7ca91f6d24e0eaf398ecdae8534ba19f88649ae91316a1cf074a04755a433038c04be49bce4d06306a03e25f7b83899205b971e40fba9248a56d5e65c48a2a8 SHA512 7de6d01d35e6e65be631a31e886b0b7d56d87211aeb1d5d3b8a60c3c6c510db368cca9280ea430675fd101434a15b3d1aef47d2a1d90a28fb634de46c2152768 |
| 29 |
+DIST portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch 10306 BLAKE2B 9ffcf396b983accef3263efa9f7a6d515cb5b669643abc5dfe610577abec80713d8a202950d37ed78625446f2db37559639002745dea7cc973d47f8befadca06 SHA512 f4cdf3dec98f7ba7da4d5454f4e75408b64934f59e4e1fc9f391a8fe4832b03c4598eef0affba01a415bcc2135d09d682fa612116ed1dbd753783268af243aa8 |
| 30 |
DIST portage-3.0.20.tar.gz 1348818 BLAKE2B e8af0662d073110a921ef23865872b0440f5e549da92b828af3dc71010d0f49d98c429c52c90ed683407fcfee7bf17a504082166f2fcad9590d7435dd43dfb83 SHA512 69c1846dedf0cfa3f57b2748cf8e077ead05ab0185e785dfc6310439b8624cdd72449209a807f12f59a5175ba065f8cca1409d43bee6012900b2c8b1e7f9b7e9 |
| 31 |
|
| 32 |
diff --git a/sys-apps/portage/portage-3.0.20-r5.ebuild b/sys-apps/portage/portage-3.0.20-r6.ebuild |
| 33 |
similarity index 96% |
| 34 |
rename from sys-apps/portage/portage-3.0.20-r5.ebuild |
| 35 |
rename to sys-apps/portage/portage-3.0.20-r6.ebuild |
| 36 |
index 67f70e6bc45..e0104657fc2 100644 |
| 37 |
--- a/sys-apps/portage/portage-3.0.20-r5.ebuild |
| 38 |
+++ b/sys-apps/portage/portage-3.0.20-r6.ebuild |
| 39 |
@@ -77,7 +77,8 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz |
| 40 |
https://github.com/gentoo/portage/commit/a4d882964ee1931462f911d0c46a80e27e59fa48.patch -> portage-3.0.20-bug-777492-a4d8829.patch |
| 41 |
https://github.com/gentoo/portage/commit/209be9a8bee13384dd04a4762436b4c2a5e35bc6.patch -> portage-3.0.20-bug-777492-209be9a.patch |
| 42 |
https://github.com/gentoo/portage/compare/8e47286b7082aac21fe25402a1f9d03db968cd30...693f6bf5a54e2424e2ad49e1838b61f76bf78e40.patch -> portage-3.0.20-bug-796584-693f6bf.patch |
| 43 |
- https://github.com/gentoo/portage/commit/2ce11f06e48290efb2d4b6743c8edf01c176b0fc.patch -> portage-3.0.20-bug-796812-2ce11f0.patch" |
| 44 |
+ https://github.com/gentoo/portage/commit/2ce11f06e48290efb2d4b6743c8edf01c176b0fc.patch -> portage-3.0.20-bug-796812-2ce11f0.patch |
| 45 |
+ https://github.com/gentoo/portage/compare/2ce11f06e48290efb2d4b6743c8edf01c176b0fc...c3e4919fd004ce0f5c91c67ea377bbda83558ca9.patch -> portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch" |
| 46 |
|
| 47 |
pkg_pretend() { |
| 48 |
local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS" |
| 49 |
@@ -100,6 +101,9 @@ python_prepare_all() { |
| 50 |
# Apply EAPI 8 fix for https://bugs.gentoo.org/796812. |
| 51 |
eapply "${DISTDIR}/portage-3.0.20-bug-796812-2ce11f0.patch" |
| 52 |
|
| 53 |
+ # Apply EAPI 8 fix for https://bugs.gentoo.org/796959 |
| 54 |
+ eapply "${DISTDIR}/portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch" |
| 55 |
+ |
| 56 |
sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die |
| 57 |
|
| 58 |
if use gentoo-dev; then |
Archives