Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/
Date: Wed, 21 Nov 2018 05:05:18
Message-Id: 1542776695.ec4b54c4b0406d7f259dae34876da0b77d19fe3a.zmedico@gentoo
1 commit: ec4b54c4b0406d7f259dae34876da0b77d19fe3a
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 21 04:53:16 2018 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 21 05:04:55 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec4b54c4
7
8 sys-apps/portage: revbump to 2.3.52-r1 for bug 671472
9
10 Add trivial fix for an annoying regression in handling of
11 broken ebuilds.
12
13 Reported-by: Reinis Danne <rei4dan <AT> gmail.com>
14 Closes: https://bugs.gentoo.org/671472
15 Package-Manager: Portage-2.3.52, Repoman-2.3.12
16 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
17
18 .../portage/{portage-2.3.52.ebuild => portage-2.3.52-r1.ebuild} | 7 +++++--
19 1 file changed, 5 insertions(+), 2 deletions(-)
20
21 diff --git a/sys-apps/portage/portage-2.3.52.ebuild b/sys-apps/portage/portage-2.3.52-r1.ebuild
22 similarity index 96%
23 rename from sys-apps/portage/portage-2.3.52.ebuild
24 rename to sys-apps/portage/portage-2.3.52-r1.ebuild
25 index 9fc9f28ea21..aaf1fd8969f 100644
26 --- a/sys-apps/portage/portage-2.3.52.ebuild
27 +++ b/sys-apps/portage/portage-2.3.52-r1.ebuild
28 @@ -10,7 +10,7 @@ PYTHON_COMPAT=(
29 )
30 PYTHON_REQ_USE='bzip2(+),threads(+)'
31
32 -inherit distutils-r1 systemd
33 +inherit distutils-r1 epatch systemd
34
35 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
36 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
37 @@ -86,7 +86,8 @@ prefix_src_archives() {
38
39 TARBALL_PV=${PV}
40 SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
41 - $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
42 + $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
43 + https://github.com/gentoo/portage/commit/74d2509c99fbcb43e018ead4950b938e41e524e5.patch -> portage-74d2509c99fbcb43e018ead4950b938e41e524e5-bug-671472.patch"
44
45 pkg_setup() {
46 use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
47 @@ -95,6 +96,8 @@ pkg_setup() {
48 python_prepare_all() {
49 distutils-r1_python_prepare_all
50
51 + epatch "${DISTDIR}/portage-74d2509c99fbcb43e018ead4950b938e41e524e5-bug-671472.patch"
52 +
53 if use gentoo-dev; then
54 einfo "Disabling --dynamic-deps by default for gentoo-dev..."
55 sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \