From: Fabian Groffen <grobian@gentoo.org>
Date: Thu, 22 Dec 2011 09:51:06 +0000 (+0100)
Subject: make.globals: bring back hardcoded EPREFIX (bug #395633)
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9dee9d50c541da4f5282ce6624d82be64bb88a37;p=portage.git

make.globals: bring back hardcoded EPREFIX (bug #395633)
---

diff --git a/cnf/make.globals b/cnf/make.globals
index 78ca91bc6..5a2c612fc 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -30,13 +30,13 @@ ACCEPT_LICENSE="* -@EULA"
 ACCEPT_PROPERTIES="*"
 
 # Repository Paths
-PORTDIR=/usr/portage
+PORTDIR="@PORTAGE_EPREFIX@/usr/portage"
 DISTDIR=${PORTDIR}/distfiles
 PKGDIR=${PORTDIR}/packages
 RPMDIR=${PORTDIR}/rpm
 
 # Temporary build directory
-PORTAGE_TMPDIR=/var/tmp
+PORTAGE_TMPDIR="@PORTAGE_EPREFIX@/var/tmp"
 
 # Fetching command (3 tries, passive ftp for firewall compatibility)
 FETCHCOMMAND="wget -t 3 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\""