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 62973a379b0a643b2cb5d9ff5cd1d9a3e70a23fa..8ec832904bf27f7dc390929a5d07b20982128c32 100644 (file)
--- 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 7913145d58f0606f8a3c156a401973711f8a2e97..43c081296c77f5a50136bfb2ddcb42c46842a8af 100644 (file)
--- 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|" \