sys-apps/portage: Revbump to 2.3.75-r1 for bug 688902
authorZac Medico <zmedico@gentoo.org>
Fri, 6 Sep 2019 21:52:28 +0000 (14:52 -0700)
committerZac Medico <zmedico@gentoo.org>
Fri, 6 Sep 2019 22:15:01 +0000 (15:15 -0700)
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@gentoo.org>
sys-apps/portage/portage-2.3.75-r1.ebuild [moved from sys-apps/portage/portage-2.3.75.ebuild with 96% similarity]

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 b45fedf352924f1383d7a4f8d84eaae7c6c86d2f..3b24def35f572e142f1e36418c2b94430a8456b4 100644 (file)
@@ -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":' \