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 1ed709eb995688cfe0e1722ef574fd279c3b59cd..a4d1cfde9b6b8c88a6a2df94c80572baf93771b0 100644 (file)
--- 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 3bccec2b87ca46dde4736fa2e9bb34505621f783..2a7ebc3da1834e9e5559cb7e1ceaed283875495b 100644 (file)
--- 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 8fbea2db07f1a9ea9a35419b0a58ddc9dfa4eeef..f6509bd15cb03695f57413e04c4dbc8995b01761 100644 (file)
--- 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 6eb6f3b800fd877fd60acba1e4442efc96edf312..f9102ca57b746282979814e2fbc88fa4500283f8 100644 (file)
--- 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 7eb48f8fab7903c60230fd9c30e4c8356b7e6eac..396b8bdd291f374414817710afcd2bc163c44115 100644 (file)
--- 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 3d4aeaad874f44caba54f08703b3b3681160428a..2f5bae87b5564b05e19256ff8269a841752b3773 100644 (file)
--- 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 8e2a2f78623cc9ce97ee2b9f021f58100440b1fd..fce3cec567d63ef05ead895ee004aecc83809714 100644 (file)
--- 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 1ff5a4ccd5cd4c2829d062f5dd43b2f882f3cfec..f75aa97e10a45a56687201b2a4925b8fa1029d16 100644 (file)
--- 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 7ce64d1cab9547d9552492a2fea3a71c7db59c49..1bfbf7427d9aa1142d18c7b30975f7fb6f3cb118 100644 (file)
--- 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 04c0c062df6add48c385d1cf95d49cc9ef68c01c..92e16319d40eae801bd4bf0a5ba2844f81bb7a40 100644 (file)
--- 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 5bdf08fbf6bac12724441ce988a6fd95954f1f51..1b9bbe8c4653f47da8dc3a34c3bc8e117ff8e7fe 100644 (file)
--- 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 675b3b3b653acc0de820f142cfa081880d020025..da9ca2472a0fb1706d552ed06cda46bcbb219d89 100644 (file)
--- 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 aa10fd7665b0ae757853651a6d30e4352fe3be9e..c76b6e195125085994ff2fd7df032a2f188713ac 100644 (file)
--- 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 066e7e8ef8d37c884dcf14f5948a3a55e674dbb2..6f042aefdfeeaeb58726521e6751881e8b2b51c2 100644 (file)
--- 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 30a2846a5d034510f18cee4cc00d7d60dd1dea98..c38fe522dcae85693f3eed7d386ec3435b286777 100644 (file)
--- 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 1a0ce30ccef2266a61aa6cc82912b5fb16112e58..31bf86da5770d674531d67e326dbb57e348a8751 100644 (file)
--- 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 81ad1a05091b062153e12b99e97bc6e92a16380d..d1449e98738a66ca4e72d967e401a098f2fdc835 100644 (file)
--- 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 a40d934901fc9609146e15f3a3df6bd608f3365f..bf664947105859f092ed64c6a2b98f075d9574b6 100644 (file)
--- 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 cbc1b70865716f11a57ee41b4c23186329f2720c..ce25d460a3b10355a463189595bae4e26bf4bd8b 100644 (file)
--- 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 9ca1a5990c37d4c990b900635327df2d26f5993e..b687e39e031b28970fe807344f84233e92d4e9dd 100644 (file)
--- 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 77158d711a1762c123ee3e9a13fc29e16692d659..2b7435e3426a63808b7a18b97d25e24d447ab740 100644 (file)
--- 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 781df10da59e5976f454824d4bef14c434bcee47..7b45304878930a828e1dbcea5ff58865e957b80b 100644 (file)
--- 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 3642d4137c59e9594582f9b4774a2797774fbb84..57b70fcdea8566a4ea91b32472fe29a6c8cb5604 100644 (file)
--- 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
 }