Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/
Date: Tue, 14 Feb 2017 20:58:12
Message-Id: 1487105853.454a0ccb7e737018595a660537d05a5361f18be8.zmedico@gentoo
1 commit: 454a0ccb7e737018595a660537d05a5361f18be8
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 14 20:56:41 2017 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 14 20:57:33 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=454a0ccb
7
8 sys-apps/portage: sync prefix repos.conf sed
9
10 Reported-by: Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail.com>
11 Package-Manager: Portage-2.3.3, Repoman-2.3.1
12
13 sys-apps/portage/portage-2.3.1.ebuild | 5 ++++-
14 sys-apps/portage/portage-2.3.2.ebuild | 5 ++++-
15 sys-apps/portage/portage-2.3.3.ebuild | 5 ++++-
16 3 files changed, 12 insertions(+), 3 deletions(-)
17
18 diff --git a/sys-apps/portage/portage-2.3.1.ebuild b/sys-apps/portage/portage-2.3.1.ebuild
19 index 5d43c5f9fe..d54241fc42 100644
20 --- a/sys-apps/portage/portage-2.3.1.ebuild
21 +++ b/sys-apps/portage/portage-2.3.1.ebuild
22 @@ -129,7 +129,10 @@ python_prepare_all() {
23 -i cnf/make.globals || die "sed failed"
24
25 einfo "Adjusting repos.conf ..."
26 - sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
27 + sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
28 + -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
29 + -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
30 + -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
31 -i cnf/repos.conf || die "sed failed"
32
33 einfo "Adding FEATURES=force-prefix to make.globals ..."
34
35 diff --git a/sys-apps/portage/portage-2.3.2.ebuild b/sys-apps/portage/portage-2.3.2.ebuild
36 index 799dbfacf1..2d14017e7c 100644
37 --- a/sys-apps/portage/portage-2.3.2.ebuild
38 +++ b/sys-apps/portage/portage-2.3.2.ebuild
39 @@ -125,7 +125,10 @@ python_prepare_all() {
40 -i cnf/make.globals || die "sed failed"
41
42 einfo "Adjusting repos.conf ..."
43 - sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
44 + sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
45 + -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
46 + -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
47 + -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
48 -i cnf/repos.conf || die "sed failed"
49
50 einfo "Adding FEATURES=force-prefix to make.globals ..."
51
52 diff --git a/sys-apps/portage/portage-2.3.3.ebuild b/sys-apps/portage/portage-2.3.3.ebuild
53 index caa08ee3ce..75ee0b48cb 100644
54 --- a/sys-apps/portage/portage-2.3.3.ebuild
55 +++ b/sys-apps/portage/portage-2.3.3.ebuild
56 @@ -130,7 +130,10 @@ python_prepare_all() {
57 -i cnf/make.globals || die "sed failed"
58
59 einfo "Adjusting repos.conf ..."
60 - sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
61 + sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
62 + -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
63 + -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
64 + -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
65 -i cnf/repos.conf || die "sed failed"
66
67 einfo "Adding FEATURES=force-prefix to make.globals ..."