1 |
commit: 1d23e6f8bf2334d62872f75e93a968d8558eed07 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 31 23:52:50 2018 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 31 23:52:50 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d23e6f8 |
7 |
|
8 |
sys-apps/portage: apply EPREFIX to repos.conf pubring.gpg path |
9 |
|
10 |
Closes: https://bugs.gentoo.org/646250 |
11 |
Package-Manager: Portage-2.3.21, Repoman-2.3.6 |
12 |
|
13 |
sys-apps/portage/portage-2.3.21.ebuild | 1 + |
14 |
sys-apps/portage/portage-9999.ebuild | 1 + |
15 |
2 files changed, 2 insertions(+) |
16 |
|
17 |
diff --git a/sys-apps/portage/portage-2.3.21.ebuild b/sys-apps/portage/portage-2.3.21.ebuild |
18 |
index 62973a379b0..8ec832904bf 100644 |
19 |
--- a/sys-apps/portage/portage-2.3.21.ebuild |
20 |
+++ b/sys-apps/portage/portage-2.3.21.ebuild |
21 |
@@ -144,6 +144,7 @@ python_prepare_all() { |
22 |
|
23 |
einfo "Adjusting repos.conf ..." |
24 |
sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ |
25 |
+ -e "s|^\(sync-rsync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \ |
26 |
-i cnf/repos.conf || die "sed failed" |
27 |
if use prefix-guest ; then |
28 |
sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ |
29 |
|
30 |
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild |
31 |
index 7913145d58f..43c081296c7 100644 |
32 |
--- a/sys-apps/portage/portage-9999.ebuild |
33 |
+++ b/sys-apps/portage/portage-9999.ebuild |
34 |
@@ -143,6 +143,7 @@ python_prepare_all() { |
35 |
|
36 |
einfo "Adjusting repos.conf ..." |
37 |
sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ |
38 |
+ -e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \ |
39 |
-i cnf/repos.conf || die "sed failed" |
40 |
if prefix-guest ; then |
41 |
sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ |