[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/

["Zac Medico" <zmedico@gentoo.org>]

commit:     161da5c962d6e5a63f55ce3743ec48c7d7a43ab8
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  2 08:41:49 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Dec  2 08:54:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=161da5c9

sys-apps/portage: Revbump to 3.0.11-r1 for regression fix

 #754903 emerge: don't merge satisfied PDEPEND too early

Bug: https://bugs.gentoo.org/754903
Bug: https://bugs.gentoo.org/756028
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 sys-apps/portage/Manifest                                          | 1 +
 .../portage/{portage-3.0.11.ebuild => portage-3.0.11-r1.ebuild}    | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 9d2dc418afb..28bf11063cb 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,6 +1,7 @@
 DIST portage-2.3.89-bug-718578.patch 1325 BLAKE2B 7a3bc520274617736eac2e3d078e90d151bdb5d8615f6217a499c0f5d4c80813f2c753e7902cf34482df0725ad0b43a38707764c8be14aae9f7ca34f0bd8721f SHA512 6f1c5d7b42beb8078c45cccbad2bd65374b69af92521d9be3beb6784477ca5bcdd75d8e762b239e44e3121e6fe5e3a040c92c9b61521e4a9b1d6bafee10d4c88
 DIST portage-2.3.99.tar.bz2 1051210 BLAKE2B dd3f990dbc87e655a767ce01e1ee3f0b1d5226fa818949408e54b81a2f96e50a4215a79af42b00dc795792858c4f86453b238b14baef4f0793c937b5617534b8 SHA512 176842318a4134ce54c5aa6485fef296f5a14edd2a72421c2011973a0f1a6af39bc5398f1e9eb3b8666d5fc307589c5b91ab93c219bdedb2d307357d8ddefbf5
 DIST portage-3.0.10.tar.bz2 1048234 BLAKE2B 9011c7a3a7ea6c5c78190c5344370d26700e4bf95e56fdf7036c3c4e1ef2e8bf691f5ee21142aaa4e15d5798404e5abadfdb2b5fea288451666840f0adb0ef77 SHA512 d5823fa263876350f5128e03c92350a90f665a5539e0eeea1cfb9320a1c83cfdffe91315bfa54dbc1ba6ffb42fdcbda3b0b728f79aaf3ef254ebb7fd09563188
+DIST portage-3.0.11-bug-754903-pdepend.patch 5379 BLAKE2B 34d2bca2af7d0a7286fa8ca7e3486341112c0a2d52f79d76a89cf5b68d85be4bc66434b8c3916987824ffdb799ed97db4a50f7b10744d55e229c6ca923e8d3ba SHA512 ecb01de1dfd1a331231a6d7a4e77bce36f7f663354cacd1640eefacdd14873b64ebf30c30105df87b4857fc7d1b8612d61f5f44d6d617bc109fad7583d3940b2
 DIST portage-3.0.11.tar.bz2 1048734 BLAKE2B d52e6d90750da0a2474e7b0071955111382aaf14d0c464bd66e673fc953ee90c2a426bd2e05b3642339483184a390ba416b2024849779d0fd95172d383ad4851 SHA512 048f7df9f2748565b8cc258667d1ea8fe0cd5e2dbea58d70ce9670885ba00949c16f9c5e7d2c3b2f795fd8f1d977792a9cb083613376128d33bdf9c1e1e4a8e9
 DIST portage-3.0.4.tar.bz2 1042654 BLAKE2B 6f869b2eb24f9e590bf8e01172050105a1bd9ea88657db5893133b4620231a0ddcda871d6fcc10623f7f2ef809116310c76355263819be6c3734b0ca184d5fc0 SHA512 7a0c39cd4ed65aebd84ff8bbadba29760b3aa392a0d606c5b29a1112fd0845c42f74eebb0728a069b2b097a6eb7eec2d18af615fd9edcc38f1018ae6ff686812
 DIST portage-3.0.8.tar.bz2 1046968 BLAKE2B 662147c37a9e7b81030fadb4d6438b734ee57a9eb9bfcee80991d137a017aa3541565961282ebf8736db71aeb05532ffa139ff3a34a84bc9064cf74427acb666 SHA512 5f97870a11ecca30ffe8f463f87cd16a1edb52b44832c6eaba15cadcfde2b4f7edf963749e45c8043b45b38e53ee210dc913aa2d2432a2bd3928cc27c8765a85

diff --git a/sys-apps/portage/portage-3.0.11.ebuild b/sys-apps/portage/portage-3.0.11-r1.ebuild
similarity index 97%
rename from sys-apps/portage/portage-3.0.11.ebuild
rename to sys-apps/portage/portage-3.0.11-r1.ebuild
index 28cd3d04cca..a681356abc4 100644
--- a/sys-apps/portage/portage-3.0.11.ebuild
+++ b/sys-apps/portage/portage-3.0.11-r1.ebuild
@@ -82,7 +82,12 @@ prefix_src_archives() {
 
 TARBALL_PV=${PV}
 SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
+	https://github.com/gentoo/portage/commit/07a604537e746814613dc171a5c09072ef0266af.patch -> portage-3.0.11-bug-754903-pdepend.patch"
+
+PATCHES=(
+	"${DISTDIR}/portage-3.0.11-bug-754903-pdepend.patch"
+)
 
 pkg_pretend() {
 	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"