| 1 |
commit: 31145b96664db74c1e0069d8006a2cfed1fd371e |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 7 15:41:06 2021 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 7 15:41:06 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31145b96 |
| 7 |
|
| 8 |
app-portage/gentoolkit: fix default repo for Prefix, #632223 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/632223 |
| 11 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
| 12 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 13 |
|
| 14 |
app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild | 7 +++++++ |
| 15 |
app-portage/gentoolkit/gentoolkit-9999.ebuild | 9 ++++++++- |
| 16 |
2 files changed, 15 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild b/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild |
| 19 |
index 541f27e49fb..3a6ded10700 100644 |
| 20 |
--- a/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild |
| 21 |
+++ b/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild |
| 22 |
@@ -37,6 +37,13 @@ python_prepare_all() { |
| 23 |
echo VERSION="${PVR}" "${PYTHON}" setup.py set_version |
| 24 |
VERSION="${PVR}" "${PYTHON}" setup.py set_version |
| 25 |
distutils-r1_python_prepare_all |
| 26 |
+ |
| 27 |
+ if use prefix-guest ; then |
| 28 |
+ # use correct repo name, bug #632223 |
| 29 |
+ sed -i \ |
| 30 |
+ -e "/load_profile_data/s/repo='gentoo'/repo='gentoo_prefix'/" \ |
| 31 |
+ pym/gentoolkit/profile.py || die |
| 32 |
+ fi |
| 33 |
} |
| 34 |
|
| 35 |
pkg_preinst() { |
| 36 |
|
| 37 |
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild |
| 38 |
index 44c2b480a31..800d54f340b 100644 |
| 39 |
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild |
| 40 |
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild |
| 41 |
@@ -1,4 +1,4 @@ |
| 42 |
-# Copyright 1999-2020 Gentoo Authors |
| 43 |
+# Copyright 1999-2021 Gentoo Authors |
| 44 |
# Distributed under the terms of the GNU General Public License v2 |
| 45 |
|
| 46 |
EAPI=7 |
| 47 |
@@ -33,6 +33,13 @@ python_prepare_all() { |
| 48 |
echo VERSION="${PVR}" "${PYTHON}" setup.py set_version |
| 49 |
VERSION="${PVR}" "${PYTHON}" setup.py set_version |
| 50 |
distutils-r1_python_prepare_all |
| 51 |
+ |
| 52 |
+ if use prefix-guest ; then |
| 53 |
+ # use correct repo name, bug #632223 |
| 54 |
+ sed -i \ |
| 55 |
+ -e "/load_profile_data/s/repo='gentoo'/repo='gentoo_prefix'/" \ |
| 56 |
+ pym/gentoolkit/profile.py || die |
| 57 |
+ fi |
| 58 |
} |
| 59 |
|
| 60 |
pkg_preinst() { |
Archives