commit: b962eb35f8111775d62158297c778d721348de4c
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 3 09:40:03 2023 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec 3 09:40:03 2023 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=b962eb35
*: remove usage of @PORTAGE_EPREFIX@
The places where this is used are handled by meson's hprefixify
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
bin/etc-update | 3 +--
cnf/make.globals | 13 ++++---------
cnf/repos.conf | 2 +-
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/bin/etc-update b/bin/etc-update
index 4b39521a64..274bc6f7be 100755
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -34,8 +34,7 @@ get_config() {
"${PORTAGE_CONFIGROOT}"etc/etc-update.conf)
}
-# PREFIX LOCAL: use os-release from Prefix
-OS_RELEASE_POSSIBLE_IDS=$(source "@PORTAGE_EPREFIX@"/etc/os-release >/dev/null
2>&1; echo ":${ID}:${ID_LIKE//[[:space:]]/:}:")
+OS_RELEASE_POSSIBLE_IDS=$(source /etc/os-release >/dev/null 2>&1; echo
":${ID}:${ID_LIKE//[[:space:]]/:}:")
case ${OS_RELEASE_POSSIBLE_IDS} in
*:suse:*|*:opensuse:*|*:opensuse-tumbleweed:*) OS_FAMILY='rpm';;
diff --git a/cnf/make.globals b/cnf/make.globals
index b7bd9d7e49..574135288c 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -27,12 +27,12 @@ ACCEPT_PROPERTIES="*"
ACCEPT_RESTRICT="*"
# Miscellaneous paths
-DISTDIR="@PORTAGE_EPREFIX@/var/cache/distfiles"
-PKGDIR="@PORTAGE_EPREFIX@/var/cache/binpkgs"
-RPMDIR="@PORTAGE_EPREFIX@/var/cache/rpm"
+DISTDIR="/var/cache/distfiles"
+PKGDIR="/var/cache/binpkgs"
+RPMDIR="/var/cache/rpm"
# Temporary build directory
-PORTAGE_TMPDIR="@PORTAGE_EPREFIX@/var/tmp"
+PORTAGE_TMPDIR="/var/tmp"
# The compression used for binary packages. Defaults to zstd except for
# existing installs where bzip2 is used for backward compatibility.
@@ -151,11 +151,6 @@ PORTAGE_INST_GID="@rootgid@"
# Any extra PATHs to add to the ebuild environment's PATH (if any)
EXTRA_PATH="@EXTRA_PATH@"
-# The offset prefix this Portage was configured with (not used by
-# Portage itself)
-CONFIGURE_EPREFIX="@PORTAGE_EPREFIX@"
-# END PREFIX LOCAL
-
# Mode bits for ${WORKDIR} (see ebuild.5).
PORTAGE_WORKDIR_MODE="0700"
diff --git a/cnf/repos.conf b/cnf/repos.conf
index d8de8938ee..3924461c96 100644
--- a/cnf/repos.conf
+++ b/cnf/repos.conf
@@ -2,7 +2,7 @@
main-repo = gentoo_prefix
[gentoo_prefix]
-location = @PORTAGE_EPREFIX@/var/db/repos/gentoo
+location = /var/db/repos/gentoo
sync-type = rsync
sync-uri = rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix
auto-sync = yes
