summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2018-11-20 20:53:16 -0800
committerZac Medico <zmedico@gentoo.org>2018-11-20 21:04:55 -0800
commitef23d0461d59c5e9c5627bf1c1e10cf120ae411b (patch)
treef0f42e23c8dae66de6fccee12cc527aaf8e015f1 /sys-apps
parentdev-util/bcc: version bump to 0.7.0 (diff)
downloadgentoo-ef23d0461d59c5e9c5627bf1c1e10cf120ae411b.tar.gz
gentoo-ef23d0461d59c5e9c5627bf1c1e10cf120ae411b.tar.bz2
gentoo-ef23d0461d59c5e9c5627bf1c1e10cf120ae411b.zip
sys-apps/portage: revbump to 2.3.51-r1 for bug 671472
Add trivial fix for an annoying regression in handling of broken ebuilds. Reported-by: Reinis Danne <rei4dan@gmail.com> Closes: https://bugs.gentoo.org/671472 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/portage/Manifest1
-rw-r--r--sys-apps/portage/portage-2.3.51-r1.ebuild (renamed from sys-apps/portage/portage-2.3.51.ebuild)7
2 files changed, 6 insertions, 2 deletions
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index bd15bdfe9daf..b17057cee050 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -5,3 +5,4 @@ DIST portage-2.3.49.tar.bz2 1010414 BLAKE2B be8e0194855eda8e8a617ee4415d702199e1
DIST portage-2.3.51.tar.bz2 1013015 BLAKE2B f7f5e6c9e627db5a9e4bfcc9a6cbebb40fda910d3cc928922870b295c706a9f669d3d812e726b220610efe6b182460811eb9420d6fa5b8756481df64a88fe2b9 SHA512 6c22b97959d4b5be263b9a1de6bb343b1f8300e989f37c7334a9d5d6fb65fe2390958e222bc5379ec95099124fc51a049ecca6e1bfc18f0a6c57e4601342bb94
DIST portage-2.3.52.tar.bz2 1014660 BLAKE2B 22fab75c4c9a12752bbdea960c9d4f583c3add4896ed94eea5e5e9ea03fd9838545f9c0075f279d81ac9ae0cfeca09fe44d18eac89f29c95d2be99a822da8446 SHA512 cd9fc6dc6f4d52886c41dd48694f290f30462111709a61a9814d5ae02519a0dd31d8fc5305c767e2a3b78d7b7d0cc8ab4c1d4273e95baec7b6d405bd9fb3f548
DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8
+DIST portage-74d2509c99fbcb43e018ead4950b938e41e524e5-bug-671472.patch 1584 BLAKE2B 452cd4cb25e42dcfa05c4f9da2bd3cc279556b9cd87037d0d965d39678f347b701dac0eaa59bfdebee9e3715abb506bf3744900ebefafa8fa729a1eb442889b9 SHA512 5bbe163e8eec00ece831c113676e87f0cf61a40f30a75a0de548490eeb789479336feec5bf81868a284bf32bafa00209176156cfb9ce557390d0f4a2ab6d1c1a
diff --git a/sys-apps/portage/portage-2.3.51.ebuild b/sys-apps/portage/portage-2.3.51-r1.ebuild
index c49888704287..c4a71aae5fa7 100644
--- a/sys-apps/portage/portage-2.3.51.ebuild
+++ b/sys-apps/portage/portage-2.3.51-r1.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=(
)
PYTHON_REQ_USE='bzip2(+),threads(+)'
-inherit distutils-r1 systemd
+inherit distutils-r1 epatch systemd
DESCRIPTION="Portage is the package management and distribution system for Gentoo"
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
@@ -86,7 +86,8 @@ 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/74d2509c99fbcb43e018ead4950b938e41e524e5.patch -> portage-74d2509c99fbcb43e018ead4950b938e41e524e5-bug-671472.patch"
pkg_setup() {
use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
@@ -95,6 +96,8 @@ pkg_setup() {
python_prepare_all() {
distutils-r1_python_prepare_all
+ epatch "${DISTDIR}/portage-74d2509c99fbcb43e018ead4950b938e41e524e5-bug-671472.patch"
+
if use gentoo-dev; then
einfo "Disabling --dynamic-deps by default for gentoo-dev..."
sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \