stop using $IMAGE

(Portage version: 2.1.2.2)

4 files changed, 20 insertions, 20 deletions

diff --git a/sys-apps/portage/portage-2.0.51.22-r3.ebuild b/sys-apps/portage/portage-2.0.51.22-r3.ebuild
index 066e7e8ef8d3..6f042aefdfee 100644
--- a/sys-apps/portage/portage-2.0.51.22-r3.ebuild
+++ b/sys-apps/portage/portage-2.0.51.22-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51.22-r3.ebuild,v 1.9 2007/02/26 18:40:03 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51.22-r3.ebuild,v 1.10 2007/03/10 14:31:25 vapier Exp $
 
 inherit toolchain-funcs flag-o-matic
 
@@ -111,10 +111,10 @@ src_install() {
 
 pkg_preinst() {
 	if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then
-		rm -rf ${IMAGE}/usr/lib/portage/pym/*
-		mv ${IMAGE}/usr/lib/portage/bin/tbz2tool ${T}
-		rm -rf ${IMAGE}/usr/lib/portage/bin/*
-		mv ${T}/tbz2tool ${IMAGE}/usr/lib/portage/bin/
+		rm -rf ${D}/usr/lib/portage/pym/*
+		mv ${D}/usr/lib/portage/bin/tbz2tool ${T}
+		rm -rf ${D}/usr/lib/portage/bin/*
+		mv ${T}/tbz2tool ${D}/usr/lib/portage/bin/
 	else
 		rm /usr/lib/portage/pym/*.pyc >& /dev/null
 		rm /usr/lib/portage/pym/*.pyo >& /dev/null
diff --git a/sys-apps/portage/portage-2.1.1-r2.ebuild b/sys-apps/portage/portage-2.1.1-r2.ebuild
index 30a2846a5d03..c38fe522dcae 100644
--- a/sys-apps/portage/portage-2.1.1-r2.ebuild
+++ b/sys-apps/portage/portage-2.1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.1-r2.ebuild,v 1.13 2007/02/26 18:40:03 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.1-r2.ebuild,v 1.14 2007/03/10 14:31:25 vapier Exp $
 
 inherit toolchain-funcs eutils flag-o-matic
 
@@ -169,10 +169,10 @@ src_install() {
 pkg_preinst() {
 	local portage_base="/usr/lib/portage"
 	if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then
-		rm -rf "${IMAGE}"/${portage_base}/pym/*
-		mv "${IMAGE}"/${portage_base}/bin/tbz2tool "${T}"
-		rm -rf "${IMAGE}"/${portage_base}/bin/*
-		mv "${T}"/tbz2tool "${IMAGE}"/${portage_base}/bin/
+		rm -rf "${D}"/${portage_base}/pym/*
+		mv "${D}"/${portage_base}/bin/tbz2tool "${T}"
+		rm -rf "${D}"/${portage_base}/bin/*
+		mv "${T}"/tbz2tool "${D}"/${portage_base}/bin/
 	else
 		for mydir in pym pym/cache pym/elog_modules; do
 			rm "${ROOT}"/${portage_base}/${mydir}/*.pyc >& /dev/null
diff --git a/sys-apps/portage/portage-2.1.2-r9.ebuild b/sys-apps/portage/portage-2.1.2-r9.ebuild
index 1a0ce30ccef2..31bf86da5770 100644
--- a/sys-apps/portage/portage-2.1.2-r9.ebuild
+++ b/sys-apps/portage/portage-2.1.2-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.2-r9.ebuild,v 1.13 2007/02/26 18:40:03 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.2-r9.ebuild,v 1.14 2007/03/10 14:31:25 vapier Exp $
 
 inherit toolchain-funcs eutils flag-o-matic
 
@@ -190,10 +190,10 @@ src_install() {
 pkg_preinst() {
 	local portage_base="/usr/lib/portage"
 	if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then
-		rm -rf "${IMAGE}"/${portage_base}/pym/*
-		mv "${IMAGE}"/${portage_base}/bin/tbz2tool "${T}"
-		rm -rf "${IMAGE}"/${portage_base}/bin/*
-		mv "${T}"/tbz2tool "${IMAGE}"/${portage_base}/bin/
+		rm -rf "${D}"/${portage_base}/pym/*
+		mv "${D}"/${portage_base}/bin/tbz2tool "${T}"
+		rm -rf "${D}"/${portage_base}/bin/*
+		mv "${T}"/tbz2tool "${D}"/${portage_base}/bin/
 	else
 		for mydir in bin pym pym/cache pym/elog_modules; do
 			rm "${ROOT}"/${portage_base}/${mydir}/*.pyc >& /dev/null
diff --git a/sys-apps/portage/portage-2.1.2.2.ebuild b/sys-apps/portage/portage-2.1.2.2.ebuild
index 81ad1a05091b..d1449e98738a 100644
--- a/sys-apps/portage/portage-2.1.2.2.ebuild
+++ b/sys-apps/portage/portage-2.1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.2.2.ebuild,v 1.8 2007/03/09 16:01:30 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.2.2.ebuild,v 1.9 2007/03/10 14:31:25 vapier Exp $
 
 inherit toolchain-funcs eutils flag-o-matic multilib
 
@@ -188,10 +188,10 @@ src_install() {
 pkg_preinst() {
 	local portage_base="/usr/$(get_libdir)/portage"
 	if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then
-		rm -rf "${IMAGE}"/${portage_base}/pym/*
-		mv "${IMAGE}"/${portage_base}/bin/tbz2tool "${T}"
-		rm -rf "${IMAGE}"/${portage_base}/bin/*
-		mv "${T}"/tbz2tool "${IMAGE}"/${portage_base}/bin/
+		rm -rf "${D}"/${portage_base}/pym/*
+		mv "${D}"/${portage_base}/bin/tbz2tool "${T}"
+		rm -rf "${D}"/${portage_base}/bin/*
+		mv "${T}"/tbz2tool "${D}"/${portage_base}/bin/
 	else
 		for mydir in bin pym pym/cache pym/elog_modules; do
 			rm "${ROOT}"/${portage_base}/${mydir}/*.pyc >& /dev/null