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: Fri, 06 Sep 2019 22:15:14
Message-Id: 1567808101.2b1778c25157f4ab48237d25431ee5742261e6b2.zmedico@gentoo
1 commit: 2b1778c25157f4ab48237d25431ee5742261e6b2
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 6 21:52:28 2019 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 6 22:15:01 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b1778c2
7
8 sys-apps/portage: Revbump to 2.3.75-r1 for bug 688902
9
10 Fix emaint --fix binhost with FEATURES=pkgdir-index-trusted.
11
12 Bug: https://bugs.gentoo.org/688902
13 Package-Manager: Portage-2.3.75, Repoman-2.3.17
14 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
15
16 sys-apps/portage/{portage-2.3.75.ebuild => portage-2.3.75-r1.ebuild} | 4 ++++
17 1 file changed, 4 insertions(+)
18
19 diff --git a/sys-apps/portage/portage-2.3.75.ebuild b/sys-apps/portage/portage-2.3.75-r1.ebuild
20 similarity index 96%
21 rename from sys-apps/portage/portage-2.3.75.ebuild
22 rename to sys-apps/portage/portage-2.3.75-r1.ebuild
23 index b45fedf3529..3b24def35f5 100644
24 --- a/sys-apps/portage/portage-2.3.75.ebuild
25 +++ b/sys-apps/portage/portage-2.3.75-r1.ebuild
26 @@ -103,6 +103,10 @@ pkg_setup() {
27 python_prepare_all() {
28 distutils-r1_python_prepare_all
29
30 + # Apply 2565d3a for bug 688902
31 + sed -e 's|bintree = self._bintree|\0\n\t\t# Force reindex in case pkgdir-index-trusted is enabled.\n\t\tbintree._populate_local(reindex=True)\n\t\tbintree.populated = True|' \
32 + -i lib/portage/emaint/modules/binhost/binhost.py || die
33 +
34 if use gentoo-dev; then
35 einfo "Disabling --dynamic-deps by default for gentoo-dev..."
36 sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \