commit: 27d01762f36c119670ee8a8e7a570c1dc8a697d4 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Fri Jun 18 16:32:13 2021 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Fri Jun 18 16:35:02 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27d01762
sys-apps/portage: 3.0.20-r4 regression fix revbump #796584 - OwnerSet exception if exclude-files not specified Bug: https://bugs.gentoo.org/785484 Closes: https://bugs.gentoo.org/796584 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-r3.ebuild => portage-3.0.20-r4.ebuild} | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 63440354a2a..31b4a9ee57a 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -6,4 +6,5 @@ DIST portage-3.0.18.tar.xz 971692 BLAKE2B 0a8d2062fce1bf85a2f1025d17ddd3eafc987f DIST portage-3.0.19.tar.gz 1347687 BLAKE2B 86eea08c2559b2d5a3eac39d8f7523380769710e7b4e3973463410bc291e746d9a36708e26d9b6456c06f67157fd04385c98ae28e25e48dba510fbaaab2d3536 SHA512 355153839219b93ae5d7c844ac5ed7ada10b2932d4a8e2b8208793fc33dfba3d46abe5ec7ecfbef9f16f23a6b21e57b7b14247f0b1fd85018a07e198bafa209c DIST portage-3.0.20-bug-777492-209be9a.patch 1758 BLAKE2B 9ed7b18ef8b73c59a08e5a2c2fba9365b37bd8cace32d5a275a4003cbf3f40f6a0a5a4d168dae987169e2017222a3af291d9a860a4494c994ef51ca851620db1 SHA512 38f402d1ecf125af7c454afdcee12221fa715f4e043c1a59073422025a12508a06a4bb77503bb75f6ed9603ff507499558bc1032157f5fc0aee9573bb18a6e4b DIST portage-3.0.20-bug-777492-a4d8829.patch 4549 BLAKE2B 9023c7bd3d173b48e1bfcf6d48c87f6b01731d6ec154132797c820a4c24ffedcaaf2eabf380d08c43238b377cb33c1be090fe8d213f8aef39b813ba2fab25672 SHA512 5575015216534bc0ddc0aa79bd2c1a96180d40dd8b3df61bb95e49a2d86e60da10a5eb8d658bf616da3f3f15ff6f4377d82e72ceca770304d2d79f1f25a26a11 +DIST portage-3.0.20-bug-796584-693f6bf.patch 2335 BLAKE2B 4922fad1fc34977b786555f1811e7b3b80e910bb940492eb735e95349f2ebb6c6f52642908fdc49e87c5f8b14f9171c8f32c627fe5ab472e645d5bc41c55bf33 SHA512 4032aef8de565e9ab166bf0f1b0fe4b4aec755eac4b8960dde57f89e08b00609a33cdce56f0f469292facb46aa088da4f3465cec935811cae4d00cca2254763b DIST portage-3.0.20.tar.gz 1348818 BLAKE2B e8af0662d073110a921ef23865872b0440f5e549da92b828af3dc71010d0f49d98c429c52c90ed683407fcfee7bf17a504082166f2fcad9590d7435dd43dfb83 SHA512 69c1846dedf0cfa3f57b2748cf8e077ead05ab0185e785dfc6310439b8624cdd72449209a807f12f59a5175ba065f8cca1409d43bee6012900b2c8b1e7f9b7e9 diff --git a/sys-apps/portage/portage-3.0.20-r3.ebuild b/sys-apps/portage/portage-3.0.20-r4.ebuild similarity index 96% rename from sys-apps/portage/portage-3.0.20-r3.ebuild rename to sys-apps/portage/portage-3.0.20-r4.ebuild index aab3a9bd436..e56f4c95dd5 100644 --- a/sys-apps/portage/portage-3.0.20-r3.ebuild +++ b/sys-apps/portage/portage-3.0.20-r4.ebuild @@ -75,7 +75,8 @@ PDEPEND=" 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/209be9a8bee13384dd04a4762436b4c2a5e35bc6.patch -> portage-3.0.20-bug-777492-209be9a.patch" + https://github.com/gentoo/portage/commit/209be9a8bee13384dd04a4762436b4c2a5e35bc6.patch -> portage-3.0.20-bug-777492-209be9a.patch + https://github.com/gentoo/portage/compare/8e47286b7082aac21fe25402a1f9d03db968cd30...693f6bf5a54e2424e2ad49e1838b61f76bf78e40.patch -> portage-3.0.20-bug-796584-693f6bf.patch" pkg_pretend() { local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS" @@ -92,6 +93,9 @@ python_prepare_all() { eapply -R "${DISTDIR}/portage-3.0.20-bug-777492-209be9a.patch" eapply -R "${DISTDIR}/portage-3.0.20-bug-777492-a4d8829.patch" + # Apply regression fix for https://bugs.gentoo.org/796584. + eapply "${DISTDIR}/portage-3.0.20-bug-796584-693f6bf.patch" + sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die if use gentoo-dev; then
