--- portage-2.1_pre7/bin/doexe
+++ portage-2.1_pre7/bin/doexe
@@ -14,7 +14,7 @@
 
 for x in "$@" ; do
 	if [ -L "${x}" ] ; then
-		cp "${x}" "${T}"
+		cp "${x}" "${PORTAGE_T}"
 		mysrc="${T}"/`/usr/bin/basename "${x}"`
 	elif [ -d "${x}" ] ; then
 		echo "doexe: warning, skipping directory ${x}"
--- portage-2.1_pre7/bin/doins
+++ portage-2.1_pre7/bin/doins
@@ -32,8 +32,8 @@
 
 for x in "$@" ; do
 	if [ -L "$x" ] ; then
-		cp "$x" "${T}"
+		cp "$x" "${PORTAGE_T}"
-		mysrc="${T}/$(/usr/bin/basename "${x}")"
+		mysrc="${PORTAGE_T}/$(/usr/bin/basename "${x}")"
 	elif [ -d "$x" ] ; then
 		if [ "${DOINSRECUR}" == "n" ] ; then
 			continue
--- portage-2.1_pre7/bin/dojar
+++ portage-2.1_pre7/bin/dojar
@@ -30,8 +30,8 @@
 	JARDESTTREE="lib"
 fi
 
-jarroot="${DESTTREE}/share/${PN}/"
+jarroot="${DESTTREE}/share/${PORTAGE_PN}/"
-jardest="${DESTTREE}/share/${PN}/${JARDESTTREE}/"
+jardest="${DESTTREE}/share/${PORTAGE_PN}/${JARDESTTREE}/"
 pf="${D}${jarroot}/package.env"
 
 dodir "${jardest}"
--- portage-2.1_pre7/bin/dosed
+++ portage-2.1_pre7/bin/dosed
@@ -9,7 +9,7 @@
 	y="${D}${x}"
 	if [ -a "${y}" ] ; then
 		if [ -f "${y}" ] ; then
-			mysrc="${T}/${y##*/}"
+			mysrc="${PORTAGE_T}/${y##*/}"
 			cp "${y}" "${mysrc}"
 			sed -e "${mysed}" "${mysrc}" > "${y}"
 		else
--- portage-2.1_pre7/bin/ebuild.sh
+++ portage-2.1_pre7/bin/ebuild.sh
@@ -1391,8 +1391,9 @@
 unset E_IUSE E_DEPEND E_RDEPEND E_PDEPEND
 
 for x in T P PN PV PVR PR CATEGORY A EBUILD EMERGE_FROM O PPID FILESDIR PORTAGE_TMPDIR; do
-	[[ ${!x-UNSET_VAR} != UNSET_VAR ]] && declare -r ${x}
+	declare +x -r ${x}
+	declare -x -r PORTAGE_${x}="${!x}"
 done
 # Need to be able to change D in dyn_preinst due to the IMAGE stuff
 [[ $* != "preinst" ]] && declare -r D
 unset x
--- portage-2.1_pre7/bin/newbin
+++ portage-2.1_pre7/bin/newbin
@@ -3,11 +3,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id: /var/cvsroot/gentoo-src/portage/bin/newbin,v 1.7 2004/10/04 13:56:50 vapier Exp $
 
-if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
+if [[ -z ${PORTAGE_T} ]] || [[ -z ${2} ]] ; then
 	echo "$0: Need two arguments, old file and new file" 1>&2
 	exit 1
 fi
 
-rm -rf "${T}/${2}" && \
+rm -rf "${PORTAGE_T}/${2}" && \
-cp -f "${1}" "${T}/${2}" && \
+cp -f "${1}" "${PORTAGE_T}/${2}" && \
-exec dobin "${T}/${2}"
+exec dobin "${PORTAGE_T}/${2}"
--- portage-2.1_pre7/bin/newconfd
+++ portage-2.1_pre7/bin/newconfd
@@ -3,11 +3,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id: /var/cvsroot/gentoo-src/portage/bin/newconfd,v 1.2 2004/10/04 13:56:50 vapier Exp $
 
-if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
+if [[ -z ${PORTAGE_T} ]] || [[ -z ${2} ]] ; then
 	echo "$0: Need two arguments, old file and new file" 1>&2
 	exit 1
 fi
 
-rm -rf "${T}/${2}" && \
+rm -rf "${PORTAGE_T}/${2}" && \
-cp -f "${1}" "${T}/${2}" && \
+cp -f "${1}" "${PORTAGE_T}/${2}" && \
-exec doconfd "${T}/${2}"
+exec doconfd "${PORTAGE_T}/${2}"
--- portage-2.1_pre7/bin/newdoc
+++ portage-2.1_pre7/bin/newdoc
@@ -3,11 +3,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id: /var/cvsroot/gentoo-src/portage/bin/newdoc,v 1.7 2004/10/04 13:56:50 vapier Exp $
 
-if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
+if [[ -z ${PORTAGE_T} ]] || [[ -z ${2} ]] ; then
 	echo "$0: Need two arguments, old file and new file" 1>&2
 	exit 1
 fi
 
-rm -rf "${T}/${2}" && \
+rm -rf "${PORTAGE_T}/${2}" && \
-cp -f "${1}" "${T}/${2}" && \
+cp -f "${1}" "${PORTAGE_T}/${2}" && \
-exec dodoc "${T}/${2}"
+exec dodoc "${PORTAGE_T}/${2}"
--- portage-2.1_pre7/bin/newenvd
+++ portage-2.1_pre7/bin/newenvd
@@ -3,11 +3,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id: /var/cvsroot/gentoo-src/portage/bin/newenvd,v 1.2 2004/10/04 13:56:50 vapier Exp $
 
-if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
+if [[ -z ${PORTAGE_T} ]] || [[ -z ${2} ]] ; then
 	echo "$0: Need two arguments, old file and new file" 1>&2
 	exit 1
 fi
 
-rm -rf "${T}/${2}" && \
+rm -rf "${PORTAGE_T}/${2}" && \
-cp -f "${1}" "${T}/${2}" && \
+cp -f "${1}" "${PORTAGE_T}/${2}" && \
-exec doenvd "${T}/${2}"
+exec doenvd "${PORTAGE_T}/${2}"
--- portage-2.1_pre7/bin/newexe
+++ portage-2.1_pre7/bin/newexe
@@ -3,11 +3,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id: /var/cvsroot/gentoo-src/portage/bin/newexe,v 1.7 2004/10/04 13:56:50 vapier Exp $
 
-if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
+if [[ -z ${PORTAGE_T} ]] || [[ -z ${2} ]] ; then
 	echo "$0: Need two arguments, old file and new file" 1>&2
 	exit 1
 fi
 
-rm -rf "${T}/${2}" && \
+rm -rf "${PORTAGE_T}/${2}" && \
-cp -f "${1}" "${T}/${2}" && \
+cp -f "${1}" "${PORTAGE_T}/${2}" && \
-exec doexe "${T}/${2}"
+exec doexe "${PORTAGE_T}/${2}"
--- portage-2.1_pre7/bin/newinitd
+++ portage-2.1_pre7/bin/newinitd
@@ -3,11 +3,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id: /var/cvsroot/gentoo-src/portage/bin/newinitd,v 1.2 2004/10/04 13:56:50 vapier Exp $
 
-if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
+if [[ -z ${PORTAGE_T} ]] || [[ -z ${2} ]] ; then
 	echo "$0: Need two arguments, old file and new file" 1>&2
 	exit 1
 fi
 
-rm -rf "${T}/${2}" && \
+rm -rf "${PORTAGE_T}/${2}" && \
-cp -f "${1}" "${T}/${2}" && \
+cp -f "${1}" "${PORTAGE_T}/${2}" && \
-exec doinitd "${T}/${2}"
+exec doinitd "${PORTAGE_T}/${2}"
--- portage-2.1_pre7/bin/newins
+++ portage-2.1_pre7/bin/newins
@@ -3,11 +3,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id: /var/cvsroot/gentoo-src/portage/bin/newins,v 1.7 2004/10/04 13:56:50 vapier Exp $
 
-if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
+if [[ -z ${PORTAGE_T} ]] || [[ -z ${2} ]] ; then
 	echo "$0: Need two arguments, old file and new file" 1>&2
 	exit 1
 fi
 
-rm -rf "${T}/${2}" && \
+rm -rf "${PORTAGE_T}/${2}" && \
-cp -f "${1}" "${T}/${2}" && \
+cp -f "${1}" "${PORTAGE_T}/${2}" && \
-exec doins "${T}/${2}"
+exec doins "${PORTAGE_T}/${2}"
--- portage-2.1_pre7/bin/newlib.a
+++ portage-2.1_pre7/bin/newlib.a
@@ -3,11 +3,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id: /var/cvsroot/gentoo-src/portage/bin/newlib.a,v 1.7 2004/10/04 13:56:50 vapier Exp $
 
-if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
+if [[ -z ${PORTAGE_T} ]] || [[ -z ${2} ]] ; then
 	echo "$0: Need two arguments, old file and new file" 1>&2
 	exit 1
 fi
 
-rm -rf "${T}/${2}" && \
+rm -rf "${PORTAGE_T}/${2}" && \
-cp -f "${1}" "${T}/${2}" && \
+cp -f "${1}" "${PORTAGE_T}/${2}" && \
-exec dolib.a "${T}/${2}"
+exec dolib.a "${PORTAGE_T}/${2}"
--- portage-2.1_pre7/bin/newlib.so
+++ portage-2.1_pre7/bin/newlib.so
@@ -3,11 +3,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id: /var/cvsroot/gentoo-src/portage/bin/newlib.so,v 1.7 2004/10/04 13:56:50 vapier Exp $
 
-if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
+if [[ -z ${PORTAGE_T} ]] || [[ -z ${2} ]] ; then
 	echo "$0: Need two arguments, old file and new file" 1>&2
 	exit 1
 fi
 
-rm -rf "${T}/${2}" && \
+rm -rf "${PORTAGE_T}/${2}" && \
-cp -f "${1}" "${T}/${2}" && \
+cp -f "${1}" "${PORTAGE_T}/${2}" && \
-exec dolib.so "${T}/${2}"
+exec dolib.so "${PORTAGE_T}/${2}"
--- portage-2.1_pre7/bin/newman
+++ portage-2.1_pre7/bin/newman
@@ -3,11 +3,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id: /var/cvsroot/gentoo-src/portage/bin/newman,v 1.7 2004/10/04 13:56:50 vapier Exp $
 
-if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
+if [[ -z ${PORTAGE_T} ]] || [[ -z ${2} ]] ; then
 	echo "$0: Need two arguments, old file and new file" 1>&2
 	exit 1
 fi
 
-rm -rf "${T}/${2}" && \
+rm -rf "${PORTAGE_T}/${2}" && \
-cp -f "${1}" "${T}/${2}" && \
+cp -f "${1}" "${PORTAGE_T}/${2}" && \
-exec doman "${T}/${2}"
+exec doman "${PORTAGE_T}/${2}"
--- portage-2.1_pre7/bin/newsbin
+++ portage-2.1_pre7/bin/newsbin
@@ -3,11 +3,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id: /var/cvsroot/gentoo-src/portage/bin/newsbin,v 1.7 2004/10/04 13:56:50 vapier Exp $
 
-if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
+if [[ -z ${PORTAGE_T} ]] || [[ -z ${2} ]] ; then
 	echo "$0: Need two arguments, old file and new file" 1>&2
 	exit 1
 fi
 
-rm -rf "${T}/${2}" && \
+rm -rf "${PORTAGE_T}/${2}" && \
-cp -f "${1}" "${T}/${2}" && \
+cp -f "${1}" "${PORTAGE_T}/${2}" && \
-exec dosbin "${T}/${2}"
+exec dosbin "${PORTAGE_T}/${2}"
--- portage-2.1_pre7/bin/prepstrip
+++ portage-2.1_pre7/bin/prepstrip
@@ -36,10 +36,10 @@
 	[[ " ${FEATURES} " != *" installsources "* ]] && return 0
 
 	if [[ -x "/usr/bin/debugedit" ]] ; then
-		debugedit -b "${WORKDIR}" -d /usr/src/debug/${PF} -l "${T}"/debug.sources "${x}"
+		debugedit -b "${WORKDIR}" -d /usr/src/debug/${PF} -l "${PORTAGE_T}"/debug.sources "${x}"
-		if [[ -s ${T}/debug.sources ]] ; then 
+		if [[ -s ${PORTAGE_T}/debug.sources ]] ; then 
 			[[ -d ${D}/usr/src/debug/${PF} ]] || mkdir -p "${D}/usr/src/debug/${PF}"
-			cat "${T}"/debug.sources | (cd "${WORKDIR}"; LANG=C sort -z -u | xargs -0 -- cp --parents -p --target-directory="${D}/usr/src/debug/${PF}" )
+			cat "${PORTAGE_T}"/debug.sources | (cd "${WORKDIR}"; LANG=C sort -z -u | xargs -0 -- cp --parents -p --target-directory="${D}/usr/src/debug/${PF}" )
 		fi
 	fi
 }