sys-apps/portage: 2.3.78-r1 revbump for bug 698474
authorZac Medico <zmedico@gentoo.org>
Thu, 24 Oct 2019 19:37:51 +0000 (12:37 -0700)
committerZac Medico <zmedico@gentoo.org>
Thu, 24 Oct 2019 19:40:29 +0000 (12:40 -0700)
Closes: https://bugs.gentoo.org/698474
Bug: https://bugs.gentoo.org/697734
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Zac Medico <zmedico@gentoo.org>
sys-apps/portage/portage-2.3.78-r1.ebuild [moved from sys-apps/portage/portage-2.3.78.ebuild with 97% similarity]

similarity index 97%
rename from sys-apps/portage/portage-2.3.78.ebuild
rename to sys-apps/portage/portage-2.3.78-r1.ebuild
index 051e9931397ba97dca6b114df84660b4e0e61928..81439a8a03c673e04afc2a043ff8fc22b38c1308 100644 (file)
@@ -106,6 +106,9 @@ python_prepare_all() {
        # Apply 0299aedef74e47c0a68acf7905d8714c9578f125 for bug 698046.
        sed -e 's|rsync -avP|rsync -LtvP|' -i lib/portage/tests/util/test_getconfig.py || die
 
+       # Apply 26fd7ffdd5b74af3aeedf0e6a87ac6b3d1243848 for bug 698474.
+       sed -e 's|if "local" in custommirrors:|if try_mirrors and "local" in custommirrors:|' -i lib/portage/package/ebuild/fetch.py || die
+
        if use gentoo-dev; then
                einfo "Disabling --dynamic-deps by default for gentoo-dev..."
                sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \