From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 11 Jul 2018 18:07:37 +0000 (-0700)
Subject: sys-apps/portage: 2.3.42-r1 revbump
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=542c18ce2810ee20ed0ddee0b282d3bddfd0216c;p=gentoo.git

sys-apps/portage: 2.3.42-r1 revbump

If we have a local sync-allow-hardlinks setting in [gentoo],
it overrides the DEFAULT section. The default setting for
sync-allow-hardlinks is already done in the RepoConfig
class.

Reported-by: Ulrich Müller <ulm@gentoo.org>
See: https://gitweb.gentoo.org/proj/portage.git/commit/?id=36dca004be44e2ca51cf0188958e9404136a049f
Package-Manager: Portage-2.3.42, Repoman-2.3.9
---

diff --git a/sys-apps/portage/portage-2.3.42.ebuild b/sys-apps/portage/portage-2.3.42-r1.ebuild
similarity index 98%
rename from sys-apps/portage/portage-2.3.42.ebuild
rename to sys-apps/portage/portage-2.3.42-r1.ebuild
index 08db0a649a22..cc042b0b156e 100644
--- a/sys-apps/portage/portage-2.3.42.ebuild
+++ b/sys-apps/portage/portage-2.3.42-r1.ebuild
@@ -94,6 +94,10 @@ pkg_setup() {
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
+	# Apply 36dca004be44 so that sync-allow-hardlinks can
+	# be set in the DEFAULT section.
+	sed -e 's:^sync-allow-hardlinks:#\0:' -i cnf/repos.conf || die
+
 	if use gentoo-dev; then
 		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
 		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \