sys-apps/portage: only prefix-guest use gentoo_prefix repository

  prefix-standalone use the default gentoo main repository.
  This fixes the warnings in prefix-standalone like
  !!! Section 'gentoo_prefix' in repos.conf has name different \
  from repository name 'gentoo' set inside repository

Package-Manager: Portage-2.3.3, Repoman-2.3.1

diff --git a/sys-apps/portage/portage-2.3.8.ebuild b/sys-apps/portage/portage-2.3.8.ebuild
index a572531286194dd49afc509c25999822eb4ddfb7..af287ccb8752820f93aa970093e07b099becafca 100644 (file)
--- a/sys-apps/portage/portage-2.3.8.ebuild
+++ b/sys-apps/portage/portage-2.3.8.ebuild
@@ -129,11 +129,14 @@ python_prepare_all() {
                        -i cnf/make.globals || die "sed failed"
 
                einfo "Adjusting repos.conf ..."
-               sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-                       -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-                       -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-                       -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+               sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
                        -i cnf/repos.conf || die "sed failed"
+               if prefix-guest ; then
+                       sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+                               -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+                               -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+                               -i cnf/repos.conf || die "sed failed"
+               fi
 
                einfo "Adding FEATURES=force-prefix to make.globals ..."
                echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index ce2b5041babf4a75505acbeb534028fd21915112..04b5b025614598cbd938497068550b56cba59a49 100644 (file)
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -128,11 +128,14 @@ python_prepare_all() {
                        -i cnf/make.globals || die "sed failed"
 
                einfo "Adjusting repos.conf ..."
-               sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-                       -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-                       -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-                       -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+               sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
                        -i cnf/repos.conf || die "sed failed"
+               if prefix-guest ; then
+                       sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+                               -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+                               -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+                               -i cnf/repos.conf || die "sed failed"
+               fi
 
                einfo "Adding FEATURES=force-prefix to make.globals ..."
                echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \