From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 31 Jan 2018 23:52:50 +0000 (-0800)
Subject: sys-apps/portage: apply EPREFIX to repos.conf pubring.gpg path
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1d23e6f8bf2334d62872f75e93a968d8558eed07;p=gentoo.git

sys-apps/portage: apply EPREFIX to repos.conf pubring.gpg path

Closes: https://bugs.gentoo.org/646250
Package-Manager: Portage-2.3.21, Repoman-2.3.6
---

diff --git a/sys-apps/portage/portage-2.3.21.ebuild b/sys-apps/portage/portage-2.3.21.ebuild
index 62973a379b0a..8ec832904bf2 100644
--- a/sys-apps/portage/portage-2.3.21.ebuild
+++ b/sys-apps/portage/portage-2.3.21.ebuild
@@ -144,6 +144,7 @@ python_prepare_all() {
 
 		einfo "Adjusting repos.conf ..."
 		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(sync-rsync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
 			-i cnf/repos.conf || die "sed failed"
 		if use prefix-guest ; then
 			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 7913145d58f0..43c081296c77 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -143,6 +143,7 @@ python_prepare_all() {
 
 		einfo "Adjusting repos.conf ..."
 		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
 			-i cnf/repos.conf || die "sed failed"
 		if prefix-guest ; then
 			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \