commit:     2b1778c25157f4ab48237d25431ee5742261e6b2
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  6 21:52:28 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Sep  6 22:15:01 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b1778c2

sys-apps/portage: Revbump to 2.3.75-r1 for bug 688902

Fix emaint --fix binhost with FEATURES=pkgdir-index-trusted.

Bug: https://bugs.gentoo.org/688902
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 sys-apps/portage/{portage-2.3.75.ebuild => portage-2.3.75-r1.ebuild} | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sys-apps/portage/portage-2.3.75.ebuild 
b/sys-apps/portage/portage-2.3.75-r1.ebuild
similarity index 96%
rename from sys-apps/portage/portage-2.3.75.ebuild
rename to sys-apps/portage/portage-2.3.75-r1.ebuild
index b45fedf3529..3b24def35f5 100644
--- a/sys-apps/portage/portage-2.3.75.ebuild
+++ b/sys-apps/portage/portage-2.3.75-r1.ebuild
@@ -103,6 +103,10 @@ pkg_setup() {
 python_prepare_all() {
        distutils-r1_python_prepare_all
 
+       # Apply 2565d3a for bug 688902
+       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|' \
+               -i lib/portage/emaint/modules/binhost/binhost.py || die
+
        if use gentoo-dev; then
                einfo "Disabling --dynamic-deps by default for gentoo-dev..."
                sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \

Reply via email to