stop using $IMAGE

Package-Manager: portage-2.1.2.2

diff --git a/net-fs/nfs-utils/nfs-utils-1.0.10.ebuild b/net-fs/nfs-utils/nfs-utils-1.0.10.ebuild
index 1813ac83cc15008d964de53814a8cd83fb702437..a730af1418768d870de3e2b8baa9db36aefc2ccb 100644 (file)
--- a/net-fs/nfs-utils/nfs-utils-1.0.10.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.0.10.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/net-fs/nfs-utils/nfs-utils-1.0.10.ebuild,v 1.8 2007/02/23 22:12:25 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.0.10.ebuild,v 1.9 2007/03/10 14:25:03 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -87,7 +87,7 @@ src_install() {
 
 pkg_preinst() {
        if [[ -s ${ROOT}/etc/exports ]] ; then
-               rm -f "${IMAGE}"/etc/exports
+               rm -f "${D}"/etc/exports
        fi
 }
 

diff --git a/net-fs/nfs-utils/nfs-utils-1.0.7-r2.ebuild b/net-fs/nfs-utils/nfs-utils-1.0.7-r2.ebuild
index 462379b1c556812471f67a7f14cbfb5fcdb6b976..fd80456a6cc08cd336bb30037b47efc06c17f2cf 100644 (file)
--- a/net-fs/nfs-utils/nfs-utils-1.0.7-r2.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.0.7-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/net-fs/nfs-utils/nfs-utils-1.0.7-r2.ebuild,v 1.5 2006/06/10 19:13:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.0.7-r2.ebuild,v 1.6 2007/03/10 14:25:03 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -99,7 +99,7 @@ src_install() {
 
 pkg_preinst() {
        if [[ -s ${ROOT}/etc/exports ]] ; then
-               rm -f "${IMAGE}"/etc/exports
+               rm -f "${D}"/etc/exports
        fi
 }
 

diff --git a/net-fs/nfs-utils/nfs-utils-1.0.9.ebuild b/net-fs/nfs-utils/nfs-utils-1.0.9.ebuild
index 7a2e605d4d2d89e40bd18e17998c7db611624b55..c63bbe81bc580f7d7569ce59b30df959dfb769d5 100644 (file)
--- a/net-fs/nfs-utils/nfs-utils-1.0.9.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.0.9.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/net-fs/nfs-utils/nfs-utils-1.0.9.ebuild,v 1.4 2006/08/09 02:23:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.0.9.ebuild,v 1.5 2007/03/10 14:25:03 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -86,7 +86,7 @@ src_install() {
 
 pkg_preinst() {
        if [[ -s ${ROOT}/etc/exports ]] ; then
-               rm -f "${IMAGE}"/etc/exports
+               rm -f "${D}"/etc/exports
        fi
 }
 

diff --git a/net-fs/openafs/openafs-1.2.13-r2.ebuild b/net-fs/openafs/openafs-1.2.13-r2.ebuild
index 7423d064bb8a49e2e31fa424232ddba2c5ef1b17..e077060eb78e72b59647578f203ee09c4fba3d99 100644 (file)
--- a/net-fs/openafs/openafs-1.2.13-r2.ebuild
+++ b/net-fs/openafs/openafs-1.2.13-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.2.13-r2.ebuild,v 1.1 2005/09/02 16:50:36 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.2.13-r2.ebuild,v 1.2 2007/03/10 14:26:12 vapier Exp $
 
 inherit fixheadtails flag-o-matic eutils toolchain-funcs versionator
 
@@ -255,17 +255,17 @@ pkg_preinst() {
        if [ ! -e ${ROOT}etc/openafs/CellServDB ] \
                || grep "GCO Public CellServDB" ${ROOT}etc/openafs/CellServDB &> /dev/null
        then
-               cp ${CONFDIR}/CellServDB ${IMAGE}etc/openafs
+               cp ${CONFDIR}/CellServDB ${D}etc/openafs
        fi
        # cacheinfo: use a default location cache, 50 megabyte in size
        # (should be safe for about any root partition, the user can increase
        # the size as required)
        if [ ! -e ${ROOT}etc/openafs/cacheinfo ]; then
-               echo "/afs:/var/cache/openafs:50000" > ${IMAGE}etc/openafs/cacheinfo
+               echo "/afs:/var/cache/openafs:50000" > ${D}etc/openafs/cacheinfo
        fi
        # ThisCell: default to "openafs.org"
        if [ ! -e ${ROOT}etc/openafs/ThisCell ]; then
-               echo "openafs.org" > ${IMAGE}etc/openafs/ThisCell
+               echo "openafs.org" > ${D}etc/openafs/ThisCell
        fi
 }
 

diff --git a/net-fs/openafs/openafs-1.4.0-r2.ebuild b/net-fs/openafs/openafs-1.4.0-r2.ebuild
index 13c6543d4d64540a9b9fb0fe287f925a725a51bf..96e7e9b107cffb24d83a988c65bf0e5898eacef9 100644 (file)
--- a/net-fs/openafs/openafs-1.4.0-r2.ebuild
+++ b/net-fs/openafs/openafs-1.4.0-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/net-fs/openafs/openafs-1.4.0-r2.ebuild,v 1.8 2006/08/09 17:04:49 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.4.0-r2.ebuild,v 1.9 2007/03/10 14:26:12 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs versionator
 
@@ -276,17 +276,17 @@ pkg_preinst() {
        if [ ! -e ${ROOT}etc/openafs/CellServDB ] \
                || grep "GCO Public CellServDB" ${ROOT}etc/openafs/CellServDB &> /dev/null
        then
-               cp ${CONFDIR}/CellServDB ${IMAGE}etc/openafs
+               cp ${CONFDIR}/CellServDB ${D}etc/openafs
        fi
        # cacheinfo: use a default location cache, 200 megabyte in size
        # (should be safe for about any root partition, the user can increase
        # the size as required)
        if [ ! -e ${ROOT}etc/openafs/cacheinfo ]; then
-               echo "/afs:/var/cache/openafs:200000" > ${IMAGE}etc/openafs/cacheinfo
+               echo "/afs:/var/cache/openafs:200000" > ${D}etc/openafs/cacheinfo
        fi
        # ThisCell: default to "openafs.org"
        if [ ! -e ${ROOT}etc/openafs/ThisCell ]; then
-               echo "openafs.org" > ${IMAGE}etc/openafs/ThisCell
+               echo "openafs.org" > ${D}etc/openafs/ThisCell
        fi
 }
 

diff --git a/net-fs/openafs/openafs-1.4.2.ebuild b/net-fs/openafs/openafs-1.4.2.ebuild
index 0d25b40a133fd589bca6c53dbf5d03518ccf1215..c6fef9db2c8d48ca478f8bbde53415dd1d9fec77 100644 (file)
--- a/net-fs/openafs/openafs-1.4.2.ebuild
+++ b/net-fs/openafs/openafs-1.4.2.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/net-fs/openafs/openafs-1.4.2.ebuild,v 1.7 2006/12/01 03:26:38 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.4.2.ebuild,v 1.8 2007/03/10 14:26:12 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs versionator
 
@@ -278,17 +278,17 @@ pkg_preinst() {
        if [ ! -e ${ROOT}etc/openafs/CellServDB ] \
                || grep "GCO Public CellServDB" ${ROOT}etc/openafs/CellServDB &> /dev/null
        then
-               cp ${CONFDIR}/CellServDB ${IMAGE}etc/openafs
+               cp ${CONFDIR}/CellServDB ${D}etc/openafs
        fi
        # cacheinfo: use a default location cache, 200 megabyte in size
        # (should be safe for about any root partition, the user can increase
        # the size as required)
        if [ ! -e ${ROOT}etc/openafs/cacheinfo ]; then
-               echo "/afs:/var/cache/openafs:200000" > ${IMAGE}etc/openafs/cacheinfo
+               echo "/afs:/var/cache/openafs:200000" > ${D}etc/openafs/cacheinfo
        fi
        # ThisCell: default to "openafs.org"
        if [ ! -e ${ROOT}etc/openafs/ThisCell ]; then
-               echo "openafs.org" > ${IMAGE}etc/openafs/ThisCell
+               echo "openafs.org" > ${D}etc/openafs/ThisCell
        fi
 }
 

diff --git a/net-fs/openafs/openafs-1.4.3_rc2.ebuild b/net-fs/openafs/openafs-1.4.3_rc2.ebuild
index 7bfa6d6ff00bc958308002496e87021275bc0a4a..490f73c5f867cf6e74738677bf3796a5ba3c0583 100644 (file)
--- a/net-fs/openafs/openafs-1.4.3_rc2.ebuild
+++ b/net-fs/openafs/openafs-1.4.3_rc2.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/net-fs/openafs/openafs-1.4.3_rc2.ebuild,v 1.1 2007/02/15 15:45:45 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.4.3_rc2.ebuild,v 1.2 2007/03/10 14:26:12 vapier Exp $
 
 inherit flag-o-matic eutils linux-mod toolchain-funcs versionator
 
@@ -288,17 +288,17 @@ pkg_preinst() {
        if [ ! -e ${ROOT}etc/openafs/CellServDB ] \
                || grep "GCO Public CellServDB" ${ROOT}etc/openafs/CellServDB &> /dev/null
        then
-               cp ${CONFDIR}/CellServDB ${IMAGE}etc/openafs
+               cp ${CONFDIR}/CellServDB ${D}etc/openafs
        fi
        # cacheinfo: use a default location cache, 200 megabyte in size
        # (should be safe for about any root partition, the user can increase
        # the size as required)
        if [ ! -e ${ROOT}etc/openafs/cacheinfo ]; then
-               echo "/afs:/var/cache/openafs:200000" > ${IMAGE}etc/openafs/cacheinfo
+               echo "/afs:/var/cache/openafs:200000" > ${D}etc/openafs/cacheinfo
        fi
        # ThisCell: default to "openafs.org"
        if [ ! -e ${ROOT}etc/openafs/ThisCell ]; then
-               echo "openafs.org" > ${IMAGE}etc/openafs/ThisCell
+               echo "openafs.org" > ${D}etc/openafs/ThisCell
        fi
 }
 

diff --git a/net-fs/openafs/openafs-1.4.3_rc3.ebuild b/net-fs/openafs/openafs-1.4.3_rc3.ebuild
index bda58a58fde8b4320f7bd742612e070fe26de5e1..fcd8e92b5975c23b564f03ba2ca2309d823604f0 100644 (file)
--- a/net-fs/openafs/openafs-1.4.3_rc3.ebuild
+++ b/net-fs/openafs/openafs-1.4.3_rc3.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/net-fs/openafs/openafs-1.4.3_rc3.ebuild,v 1.1 2007/03/08 21:51:58 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.4.3_rc3.ebuild,v 1.2 2007/03/10 14:26:12 vapier Exp $
 
 inherit flag-o-matic eutils linux-mod toolchain-funcs versionator
 
@@ -288,17 +288,17 @@ pkg_preinst() {
        if [ ! -e ${ROOT}etc/openafs/CellServDB ] \
                || grep "GCO Public CellServDB" ${ROOT}etc/openafs/CellServDB &> /dev/null
        then
-               cp ${CONFDIR}/CellServDB ${IMAGE}etc/openafs
+               cp ${CONFDIR}/CellServDB ${D}etc/openafs
        fi
        # cacheinfo: use a default location cache, 200 megabyte in size
        # (should be safe for about any root partition, the user can increase
        # the size as required)
        if [ ! -e ${ROOT}etc/openafs/cacheinfo ]; then
-               echo "/afs:/var/cache/openafs:200000" > ${IMAGE}etc/openafs/cacheinfo
+               echo "/afs:/var/cache/openafs:200000" > ${D}etc/openafs/cacheinfo
        fi
        # ThisCell: default to "openafs.org"
        if [ ! -e ${ROOT}etc/openafs/ThisCell ]; then
-               echo "openafs.org" > ${IMAGE}etc/openafs/ThisCell
+               echo "openafs.org" > ${D}etc/openafs/ThisCell
        fi
 }
 

diff --git a/net-fs/openafs/openafs-1.5.14.ebuild b/net-fs/openafs/openafs-1.5.14.ebuild
index 6c78a220d5bfd79d714b305928c402d3d8b75df8..aab010d3ecb1631ff5dd57e7f393f0fc50534ed3 100644 (file)
--- a/net-fs/openafs/openafs-1.5.14.ebuild
+++ b/net-fs/openafs/openafs-1.5.14.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/net-fs/openafs/openafs-1.5.14.ebuild,v 1.1 2007/01/20 09:34:56 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.5.14.ebuild,v 1.2 2007/03/10 14:26:12 vapier Exp $
 
 inherit flag-o-matic eutils linux-mod toolchain-funcs versionator
 
@@ -283,17 +283,17 @@ pkg_preinst() {
        if [ ! -e ${ROOT}etc/openafs/CellServDB ] \
                || grep "GCO Public CellServDB" ${ROOT}etc/openafs/CellServDB &> /dev/null
        then
-               cp ${CONFDIR}/CellServDB ${IMAGE}etc/openafs
+               cp ${CONFDIR}/CellServDB ${D}etc/openafs
        fi
        # cacheinfo: use a default location cache, 200 megabyte in size
        # (should be safe for about any root partition, the user can increase
        # the size as required)
        if [ ! -e ${ROOT}etc/openafs/cacheinfo ]; then
-               echo "/afs:/var/cache/openafs:200000" > ${IMAGE}etc/openafs/cacheinfo
+               echo "/afs:/var/cache/openafs:200000" > ${D}etc/openafs/cacheinfo
        fi
        # ThisCell: default to "openafs.org"
        if [ ! -e ${ROOT}etc/openafs/ThisCell ]; then
-               echo "openafs.org" > ${IMAGE}etc/openafs/ThisCell
+               echo "openafs.org" > ${D}etc/openafs/ThisCell
        fi
 }
 

diff --git a/net-fs/openafs/openafs-1.5.15.ebuild b/net-fs/openafs/openafs-1.5.15.ebuild
index ae0dc59ffa8e3df360188f750256182eb9fadc97..71fe054e3e32a464711398f253765d4e0e81d150 100644 (file)
--- a/net-fs/openafs/openafs-1.5.15.ebuild
+++ b/net-fs/openafs/openafs-1.5.15.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/net-fs/openafs/openafs-1.5.15.ebuild,v 1.1 2007/02/15 17:48:27 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.5.15.ebuild,v 1.2 2007/03/10 14:26:12 vapier Exp $
 
 inherit flag-o-matic eutils linux-mod toolchain-funcs versionator
 
@@ -283,17 +283,17 @@ pkg_preinst() {
        if [ ! -e ${ROOT}etc/openafs/CellServDB ] \
                || grep "GCO Public CellServDB" ${ROOT}etc/openafs/CellServDB &> /dev/null
        then
-               cp ${CONFDIR}/CellServDB ${IMAGE}etc/openafs
+               cp ${CONFDIR}/CellServDB ${D}etc/openafs
        fi
        # cacheinfo: use a default location cache, 200 megabyte in size
        # (should be safe for about any root partition, the user can increase
        # the size as required)
        if [ ! -e ${ROOT}etc/openafs/cacheinfo ]; then
-               echo "/afs:/var/cache/openafs:200000" > ${IMAGE}etc/openafs/cacheinfo
+               echo "/afs:/var/cache/openafs:200000" > ${D}etc/openafs/cacheinfo
        fi
        # ThisCell: default to "openafs.org"
        if [ ! -e ${ROOT}etc/openafs/ThisCell ]; then
-               echo "openafs.org" > ${IMAGE}etc/openafs/ThisCell
+               echo "openafs.org" > ${D}etc/openafs/ThisCell
        fi
 }
 

diff --git a/net-fs/samba/samba-3.0.22-r3.ebuild b/net-fs/samba/samba-3.0.22-r3.ebuild
index daee125b152a8087e0824647bbdd4d9d118c4a9a..df9261e5ad09a0482aa3c1600548d782c9270cdd 100644 (file)
--- a/net-fs/samba/samba-3.0.22-r3.ebuild
+++ b/net-fs/samba/samba-3.0.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/net-fs/samba/samba-3.0.22-r3.ebuild,v 1.13 2007/01/08 15:33:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.22-r3.ebuild,v 1.14 2007/03/10 14:26:22 vapier Exp $
 
 inherit eutils versionator pam
 
@@ -280,13 +280,13 @@ pkg_preinst() {
        if [[ ! -r ${ROOT}/${PRIVATE_DST}/secrets.tdb \
                && -r ${ROOT}/${PRIVATE_SRC}/secrets.tdb ]]; then
                ebegin "Copying ${ROOT}/${PRIVATE_SRC}/* to ${ROOT}/${PRIVATE_DST}/"
-                       mkdir -p ${IMAGE}/${PRIVATE_DST}
-                       cp -pPRf ${ROOT}/${PRIVATE_SRC}/* ${IMAGE}/${PRIVATE_DST}/
+                       mkdir -p ${D}/${PRIVATE_DST}
+                       cp -pPRf ${ROOT}/${PRIVATE_SRC}/* ${D}/${PRIVATE_DST}/
                eend $?
        fi
 
        if [[ ! -f "${ROOT}/etc/samba/smb.conf" ]]; then
-               touch ${IMAGE}/etc/samba/smb.conf
+               touch ${D}/etc/samba/smb.conf
        fi
 }