From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 10 Mar 2007 14:32:22 +0000 (+0000)
Subject: stop using $IMAGE
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aa7601ba46ba82a25493b0fffe5007e7cb6e8d3e;p=gentoo.git

stop using $IMAGE
Package-Manager: portage-2.1.2.2
---

diff --git a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r4.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r4.ebuild
index 1ed709eb9956..a4d1cfde9b6b 100644
--- a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r4.ebuild
+++ b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r4.ebuild,v 1.4 2006/10/06 11:19:07 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r4.ebuild,v 1.5 2007/03/10 14:32:22 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -340,7 +340,7 @@ remap_dns_vars() {
 			-e 's/\<mac_nameservers_/mac_dns_servers_/g' \
 			-e 's/\<searchdomains_/dns_search_domains_/g' \
 			-e 's/\<mac_searchdomains_/mac_dns_search_domains_/g' \
-			${ROOT}/etc/conf.d/${f} > ${IMAGE}/etc/conf.d/${f}
+			${ROOT}/etc/conf.d/${f} > ${D}/etc/conf.d/${f}
 	fi
 }
 
diff --git a/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild b/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild
index 3bccec2b87ca..2a7ebc3da183 100644
--- a/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild
+++ b/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild,v 1.5 2007/01/20 15:16:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild,v 1.6 2007/03/10 14:30:57 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -397,7 +397,7 @@ remap_dns_vars() {
 			-e 's/\<mac_nameservers_/mac_dns_servers_/g' \
 			-e 's/\<searchdomains_/dns_search_domains_/g' \
 			-e 's/\<mac_searchdomains_/mac_dns_search_domains_/g' \
-			${ROOT}/etc/conf.d/${f} > ${IMAGE}/etc/conf.d/${f}
+			${ROOT}/etc/conf.d/${f} > ${D}/etc/conf.d/${f}
 	fi
 }
 
diff --git a/sys-apps/baselayout/baselayout-1.12.4-r7.ebuild b/sys-apps/baselayout/baselayout-1.12.4-r7.ebuild
index 8fbea2db07f1..f6509bd15cb0 100644
--- a/sys-apps/baselayout/baselayout-1.12.4-r7.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.4-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.4-r7.ebuild,v 1.2 2007/01/20 15:16:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.4-r7.ebuild,v 1.3 2007/03/10 14:30:57 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -414,7 +414,7 @@ remap_dns_vars() {
 			-e 's/\<mac_nameservers_/mac_dns_servers_/g' \
 			-e 's/\<searchdomains_/dns_search_domains_/g' \
 			-e 's/\<mac_searchdomains_/mac_dns_search_domains_/g' \
-			${ROOT}/etc/conf.d/${f} > ${IMAGE}/etc/conf.d/${f}
+			${ROOT}/etc/conf.d/${f} > ${D}/etc/conf.d/${f}
 	fi
 }
 
diff --git a/sys-apps/baselayout/baselayout-1.12.5-r2.ebuild b/sys-apps/baselayout/baselayout-1.12.5-r2.ebuild
index 6eb6f3b800fd..f9102ca57b74 100644
--- a/sys-apps/baselayout/baselayout-1.12.5-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.5-r2.ebuild,v 1.4 2007/01/20 15:16:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.5-r2.ebuild,v 1.5 2007/03/10 14:30:57 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -408,7 +408,7 @@ remap_dns_vars() {
 			-e 's/\<mac_nameservers_/mac_dns_servers_/g' \
 			-e 's/\<searchdomains_/dns_search_domains_/g' \
 			-e 's/\<mac_searchdomains_/mac_dns_search_domains_/g' \
-			${ROOT}/etc/conf.d/${f} > ${IMAGE}/etc/conf.d/${f}
+			${ROOT}/etc/conf.d/${f} > ${D}/etc/conf.d/${f}
 	fi
 }
 
diff --git a/sys-apps/baselayout/baselayout-1.12.6.ebuild b/sys-apps/baselayout/baselayout-1.12.6.ebuild
index 7eb48f8fab79..396b8bdd291f 100644
--- a/sys-apps/baselayout/baselayout-1.12.6.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.6.ebuild,v 1.2 2007/01/20 15:16:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.6.ebuild,v 1.3 2007/03/10 14:30:57 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -405,7 +405,7 @@ remap_dns_vars() {
 			-e 's/\<mac_nameservers_/mac_dns_servers_/g' \
 			-e 's/\<searchdomains_/dns_search_domains_/g' \
 			-e 's/\<mac_searchdomains_/mac_dns_search_domains_/g' \
-			${ROOT}/etc/conf.d/${f} > ${IMAGE}/etc/conf.d/${f}
+			${ROOT}/etc/conf.d/${f} > ${D}/etc/conf.d/${f}
 	fi
 }
 
diff --git a/sys-apps/baselayout/baselayout-1.12.8-r1.ebuild b/sys-apps/baselayout/baselayout-1.12.8-r1.ebuild
index 3d4aeaad874f..2f5bae87b556 100644
--- a/sys-apps/baselayout/baselayout-1.12.8-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.8-r1.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/baselayout/baselayout-1.12.8-r1.ebuild,v 1.6 2007/02/06 12:32:13 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.8-r1.ebuild,v 1.7 2007/03/10 14:30:57 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -373,7 +373,7 @@ remap_dns_vars() {
 			-e 's/\<mac_nameservers_/mac_dns_servers_/g' \
 			-e 's/\<searchdomains_/dns_search_domains_/g' \
 			-e 's/\<mac_searchdomains_/mac_dns_search_domains_/g' \
-			${ROOT}/etc/conf.d/${f} > ${IMAGE}/etc/conf.d/${f}
+			${ROOT}/etc/conf.d/${f} > ${D}/etc/conf.d/${f}
 	fi
 }
 
diff --git a/sys-apps/baselayout/baselayout-1.12.8-r2.ebuild b/sys-apps/baselayout/baselayout-1.12.8-r2.ebuild
index 8e2a2f78623c..fce3cec567d6 100644
--- a/sys-apps/baselayout/baselayout-1.12.8-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.8-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/baselayout/baselayout-1.12.8-r2.ebuild,v 1.5 2007/01/20 15:16:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.8-r2.ebuild,v 1.6 2007/03/10 14:30:57 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -401,7 +401,7 @@ remap_dns_vars() {
 			-e 's/\<mac_nameservers_/mac_dns_servers_/g' \
 			-e 's/\<searchdomains_/dns_search_domains_/g' \
 			-e 's/\<mac_searchdomains_/mac_dns_search_domains_/g' \
-			${ROOT}/etc/conf.d/${f} > ${IMAGE}/etc/conf.d/${f}
+			${ROOT}/etc/conf.d/${f} > ${D}/etc/conf.d/${f}
 	fi
 }
 
diff --git a/sys-apps/baselayout/baselayout-1.12.8-r5.ebuild b/sys-apps/baselayout/baselayout-1.12.8-r5.ebuild
index 1ff5a4ccd5cd..f75aa97e10a4 100644
--- a/sys-apps/baselayout/baselayout-1.12.8-r5.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.8-r5.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/baselayout/baselayout-1.12.8-r5.ebuild,v 1.3 2007/01/20 15:16:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.8-r5.ebuild,v 1.4 2007/03/10 14:30:57 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -403,7 +403,7 @@ remap_dns_vars() {
 			-e 's/\<mac_nameservers_/mac_dns_servers_/g' \
 			-e 's/\<searchdomains_/dns_search_domains_/g' \
 			-e 's/\<mac_searchdomains_/mac_dns_search_domains_/g' \
-			${ROOT}/etc/conf.d/${f} > ${IMAGE}/etc/conf.d/${f}
+			${ROOT}/etc/conf.d/${f} > ${D}/etc/conf.d/${f}
 	fi
 }
 
diff --git a/sys-apps/baselayout/baselayout-1.12.9.ebuild b/sys-apps/baselayout/baselayout-1.12.9.ebuild
index 7ce64d1cab95..1bfbf7427d9a 100644
--- a/sys-apps/baselayout/baselayout-1.12.9.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.9.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/baselayout/baselayout-1.12.9.ebuild,v 1.11 2007/02/15 18:53:29 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.9.ebuild,v 1.12 2007/03/10 14:30:57 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -397,7 +397,7 @@ remap_dns_vars() {
 			-e 's/\<mac_nameservers_/mac_dns_servers_/g' \
 			-e 's/\<searchdomains_/dns_search_domains_/g' \
 			-e 's/\<mac_searchdomains_/mac_dns_search_domains_/g' \
-			${ROOT}/etc/conf.d/${f} > ${IMAGE}/etc/conf.d/${f}
+			${ROOT}/etc/conf.d/${f} > ${D}/etc/conf.d/${f}
 	fi
 }
 
diff --git a/sys-apps/baselayout/baselayout-1.13.0_alpha10-r2.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha10-r2.ebuild
index 04c0c062df6a..92e16319d40e 100644
--- a/sys-apps/baselayout/baselayout-1.13.0_alpha10-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-1.13.0_alpha10-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/baselayout/baselayout-1.13.0_alpha10-r2.ebuild,v 1.6 2007/01/20 15:16:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.13.0_alpha10-r2.ebuild,v 1.7 2007/03/10 14:30:57 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -91,7 +91,7 @@ remap_dns_vars() {
 			-e 's/\<mac_nameservers_/mac_dns_servers_/g' \
 			-e 's/\<searchdomains_/dns_search_domains_/g' \
 			-e 's/\<mac_searchdomains_/mac_dns_search_domains_/g' \
-			"${ROOT}/etc/conf.d/$1" > "${IMAGE}/etc/conf.d/$1"
+			"${ROOT}/etc/conf.d/$1" > "${D}/etc/conf.d/$1"
 	fi
 }
 
diff --git a/sys-apps/baselayout/baselayout-1.13.0_alpha11-r1.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha11-r1.ebuild
index 5bdf08fbf6ba..1b9bbe8c4653 100644
--- a/sys-apps/baselayout/baselayout-1.13.0_alpha11-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.13.0_alpha11-r1.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/baselayout/baselayout-1.13.0_alpha11-r1.ebuild,v 1.3 2007/01/20 15:16:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.13.0_alpha11-r1.ebuild,v 1.4 2007/03/10 14:30:57 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -86,7 +86,7 @@ remap_dns_vars() {
 			-e 's/\<mac_nameservers_/mac_dns_servers_/g' \
 			-e 's/\<searchdomains_/dns_search_domains_/g' \
 			-e 's/\<mac_searchdomains_/mac_dns_search_domains_/g' \
-			"${ROOT}/etc/conf.d/$1" > "${IMAGE}/etc/conf.d/$1"
+			"${ROOT}/etc/conf.d/$1" > "${D}/etc/conf.d/$1"
 	fi
 }
 
diff --git a/sys-apps/baselayout/baselayout-1.13.0_alpha11-r2.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha11-r2.ebuild
index 675b3b3b653a..da9ca2472a0f 100644
--- a/sys-apps/baselayout/baselayout-1.13.0_alpha11-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-1.13.0_alpha11-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/baselayout/baselayout-1.13.0_alpha11-r2.ebuild,v 1.2 2007/01/20 15:16:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.13.0_alpha11-r2.ebuild,v 1.3 2007/03/10 14:30:57 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -87,7 +87,7 @@ remap_dns_vars() {
 			-e 's/\<mac_nameservers_/mac_dns_servers_/g' \
 			-e 's/\<searchdomains_/dns_search_domains_/g' \
 			-e 's/\<mac_searchdomains_/mac_dns_search_domains_/g' \
-			"${ROOT}/etc/conf.d/$1" > "${IMAGE}/etc/conf.d/$1"
+			"${ROOT}/etc/conf.d/$1" > "${D}/etc/conf.d/$1"
 	fi
 }
 
diff --git a/sys-apps/baselayout/baselayout-1.13.0_alpha12.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha12.ebuild
index aa10fd7665b0..c76b6e195125 100644
--- a/sys-apps/baselayout/baselayout-1.13.0_alpha12.ebuild
+++ b/sys-apps/baselayout/baselayout-1.13.0_alpha12.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/baselayout/baselayout-1.13.0_alpha12.ebuild,v 1.3 2007/02/15 18:53:29 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.13.0_alpha12.ebuild,v 1.4 2007/03/10 14:30:57 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -83,7 +83,7 @@ remap_dns_vars() {
 			-e 's/\<mac_nameservers_/mac_dns_servers_/g' \
 			-e 's/\<searchdomains_/dns_search_domains_/g' \
 			-e 's/\<mac_searchdomains_/mac_dns_search_domains_/g' \
-			"${ROOT}/etc/conf.d/$1" > "${IMAGE}/etc/conf.d/$1"
+			"${ROOT}/etc/conf.d/$1" > "${D}/etc/conf.d/$1"
 	fi
 }
 
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
diff --git a/sys-apps/sandbox/sandbox-1.2.12.ebuild b/sys-apps/sandbox/sandbox-1.2.12.ebuild
index a40d934901fc..bf6649471058 100644
--- a/sys-apps/sandbox/sandbox-1.2.12.ebuild
+++ b/sys-apps/sandbox/sandbox-1.2.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.12.ebuild,v 1.14 2006/04/01 01:14:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.12.ebuild,v 1.15 2007/03/10 14:32:07 vapier Exp $
 
 #
 # don't monkey with this ebuild unless contacting portage devs.
@@ -113,6 +113,6 @@ src_install() {
 }
 
 pkg_preinst() {
-	chown root:portage ${IMAGE}/var/log/sandbox
-	chmod 0770 ${IMAGE}/var/log/sandbox
+	chown root:portage ${D}/var/log/sandbox
+	chmod 0770 ${D}/var/log/sandbox
 }
diff --git a/sys-apps/sandbox/sandbox-1.2.16.ebuild b/sys-apps/sandbox/sandbox-1.2.16.ebuild
index cbc1b7086571..ce25d460a3b1 100644
--- a/sys-apps/sandbox/sandbox-1.2.16.ebuild
+++ b/sys-apps/sandbox/sandbox-1.2.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.16.ebuild,v 1.4 2006/04/01 01:14:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.16.ebuild,v 1.5 2007/03/10 14:32:07 vapier Exp $
 
 #
 # don't monkey with this ebuild unless contacting portage devs.
@@ -112,6 +112,6 @@ src_install() {
 }
 
 pkg_preinst() {
-	chown root:portage ${IMAGE}/var/log/sandbox
-	chmod 0770 ${IMAGE}/var/log/sandbox
+	chown root:portage ${D}/var/log/sandbox
+	chmod 0770 ${D}/var/log/sandbox
 }
diff --git a/sys-apps/sandbox/sandbox-1.2.17.ebuild b/sys-apps/sandbox/sandbox-1.2.17.ebuild
index 9ca1a5990c37..b687e39e031b 100644
--- a/sys-apps/sandbox/sandbox-1.2.17.ebuild
+++ b/sys-apps/sandbox/sandbox-1.2.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.17.ebuild,v 1.14 2006/07/09 06:36:47 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.17.ebuild,v 1.15 2007/03/10 14:32:07 vapier Exp $
 
 #
 # don't monkey with this ebuild unless contacting portage devs.
@@ -113,6 +113,6 @@ src_install() {
 }
 
 pkg_preinst() {
-	chown root:portage ${IMAGE}/var/log/sandbox
-	chmod 0770 ${IMAGE}/var/log/sandbox
+	chown root:portage ${D}/var/log/sandbox
+	chmod 0770 ${D}/var/log/sandbox
 }
diff --git a/sys-apps/sandbox/sandbox-1.2.18.1.ebuild b/sys-apps/sandbox/sandbox-1.2.18.1.ebuild
index 77158d711a17..2b7435e3426a 100644
--- a/sys-apps/sandbox/sandbox-1.2.18.1.ebuild
+++ b/sys-apps/sandbox/sandbox-1.2.18.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.18.1.ebuild,v 1.1 2006/05/19 12:15:28 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.18.1.ebuild,v 1.2 2007/03/10 14:32:07 vapier Exp $
 
 #
 # don't monkey with this ebuild unless contacting portage devs.
@@ -112,6 +112,6 @@ src_install() {
 }
 
 pkg_preinst() {
-	chown root:portage ${IMAGE}/var/log/sandbox
-	chmod 0770 ${IMAGE}/var/log/sandbox
+	chown root:portage ${D}/var/log/sandbox
+	chmod 0770 ${D}/var/log/sandbox
 }
diff --git a/sys-apps/sandbox/sandbox-1.2.18.ebuild b/sys-apps/sandbox/sandbox-1.2.18.ebuild
index 781df10da59e..7b4530487893 100644
--- a/sys-apps/sandbox/sandbox-1.2.18.ebuild
+++ b/sys-apps/sandbox/sandbox-1.2.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.18.ebuild,v 1.2 2006/05/10 07:00:45 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.18.ebuild,v 1.3 2007/03/10 14:32:07 vapier Exp $
 
 #
 # don't monkey with this ebuild unless contacting portage devs.
@@ -113,6 +113,6 @@ src_install() {
 }
 
 pkg_preinst() {
-	chown root:portage ${IMAGE}/var/log/sandbox
-	chmod 0770 ${IMAGE}/var/log/sandbox
+	chown root:portage ${D}/var/log/sandbox
+	chmod 0770 ${D}/var/log/sandbox
 }
diff --git a/sys-apps/sandbox/sandbox-1.2.20_alpha1-r2.ebuild b/sys-apps/sandbox/sandbox-1.2.20_alpha1-r2.ebuild
index 3642d4137c59..57b70fcdea85 100644
--- a/sys-apps/sandbox/sandbox-1.2.20_alpha1-r2.ebuild
+++ b/sys-apps/sandbox/sandbox-1.2.20_alpha1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.20_alpha1-r2.ebuild,v 1.1 2006/07/08 21:19:52 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.20_alpha1-r2.ebuild,v 1.2 2007/03/10 14:32:07 vapier Exp $
 
 #
 # don't monkey with this ebuild unless contacting portage devs.
@@ -123,6 +123,6 @@ src_install() {
 }
 
 pkg_preinst() {
-	chown root:portage ${IMAGE}/var/log/sandbox
-	chmod 0770 ${IMAGE}/var/log/sandbox
+	chown root:portage ${D}/var/log/sandbox
+	chmod 0770 ${D}/var/log/sandbox
 }