From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 12 Mar 2007 22:47:54 +0000 (+0000)
Subject: use D, not IMAGE, in pkg_* functions
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=70884ecdbee4bd6492e1da8c070b1cc65021ce94;p=gentoo.git

use D, not IMAGE, in pkg_* functions
Package-Manager: portage-2.1.2.2
---

diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index e903deffa8dc..bc817d09ca9a 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,11 +1,14 @@
-EBUILD xorg-x11-7.1.ebuild 3839 RMD160 10fad8db34ec5dd3b05cd3674ebec6cd54be662a SHA1 20431a4e72a070633dd3fc5bc39a1a7f215166ec SHA256 fbaa02356fe8b86455a91dee98c98f3b8a9838c3d421a8a16d9bbc6dc4b5e0e7
-MD5 403830badf415ead887a0933ad19fedd xorg-x11-7.1.ebuild 3839
-RMD160 10fad8db34ec5dd3b05cd3674ebec6cd54be662a xorg-x11-7.1.ebuild 3839
-SHA256 fbaa02356fe8b86455a91dee98c98f3b8a9838c3d421a8a16d9bbc6dc4b5e0e7 xorg-x11-7.1.ebuild 3839
-EBUILD xorg-x11-7.2.ebuild 3854 RMD160 91109366b5a57d6659e246eec63ae04d5ff50cdf SHA1 ab9a000be4c3137a8d65c91f07cdf0f3987c79d8 SHA256 07f8f0a51261875d074ee1d4b783032a4d9ae7acee3f6702b91bfbd8dc186232
-MD5 8b1b8fb4616929731d3eba8c46a9dcb8 xorg-x11-7.2.ebuild 3854
-RMD160 91109366b5a57d6659e246eec63ae04d5ff50cdf xorg-x11-7.2.ebuild 3854
-SHA256 07f8f0a51261875d074ee1d4b783032a4d9ae7acee3f6702b91bfbd8dc186232 xorg-x11-7.2.ebuild 3854
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+EBUILD xorg-x11-7.1.ebuild 3829 RMD160 28cf6895486e771c9216547bb0424ba1364358ad SHA1 fd2d4625b58d69c009bb94cb984ce68fcde2e150 SHA256 4e6aba6ae2f22961213415ec9c2b92197f4eb21432a41dfc1df49aa2e1c874ea
+MD5 7fc3d8e0ec186b98e8aec6e5ae8902bc xorg-x11-7.1.ebuild 3829
+RMD160 28cf6895486e771c9216547bb0424ba1364358ad xorg-x11-7.1.ebuild 3829
+SHA256 4e6aba6ae2f22961213415ec9c2b92197f4eb21432a41dfc1df49aa2e1c874ea xorg-x11-7.1.ebuild 3829
+EBUILD xorg-x11-7.2.ebuild 3839 RMD160 f883e3f2e20d7c7f8fa68239c7797c3fee9bd68a SHA1 37d919c04baccf10a62a5446013a85e4a33d5abd SHA256 a7652c36b11e973300531fbc41a68dddb265b8d137afac4094c4de5996f3efc4
+MD5 a79bf33eae517f0484fba443953d7a39 xorg-x11-7.2.ebuild 3839
+RMD160 f883e3f2e20d7c7f8fa68239c7797c3fee9bd68a xorg-x11-7.2.ebuild 3839
+SHA256 a7652c36b11e973300531fbc41a68dddb265b8d137afac4094c4de5996f3efc4 xorg-x11-7.2.ebuild 3839
 MISC ChangeLog 125717 RMD160 fe78d7b47df6c9be18d185f0d41fc9518ab51683 SHA1 c71ec261d4f9637b17fcf8f0693993b23849efc3 SHA256 bb1b46e556cb1788a6aca0cb0cd2b16a979d8d719040c7687774f89867b60207
 MD5 2d4405f5e26ef18f718d5606e5047e46 ChangeLog 125717
 RMD160 fe78d7b47df6c9be18d185f0d41fc9518ab51683 ChangeLog 125717
@@ -20,3 +23,10 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xorg-x11-7.2 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-xorg-x11-7.2 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-xorg-x11-7.2 0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFF9dij8bi6rjpTunYRAiJhAJ4hUsdXIc6EV1/CylAeOPidfvfPOwCghyjb
+Tjd53idO69lC/hTqF5r32Lc=
+=vgAQ
+-----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-x11/xorg-x11-7.1.ebuild b/x11-base/xorg-x11/xorg-x11-7.1.ebuild
index eaeb5ff69966..94570b231865 100644
--- a/x11-base/xorg-x11/xorg-x11-7.1.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-7.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/x11-base/xorg-x11/xorg-x11-7.1.ebuild,v 1.9 2006/11/02 05:15:05 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.1.ebuild,v 1.10 2007/03/12 22:47:54 vapier Exp $
 
 inherit eutils
 
@@ -76,9 +76,9 @@ pkg_preinst() {
 	# For RC3 - filter out RgbPath line since it also seems to break things
 	XORGCONF="/etc/X11/xorg.conf"
 	if [ -e ${XORGCONF} ]; then
-		mkdir -p "${IMAGE}/etc/X11"
-		sed "/ModulePath/d" ${XORGCONF}	> ${IMAGE}${XORGCONF}
-		sed -i "/RgbPath/d" ${IMAGE}${XORGCONF}
+		mkdir -p "${D}/etc/X11"
+		sed "/ModulePath/d" ${XORGCONF}	> "${D}"${XORGCONF}
+		sed -i "/RgbPath/d" "${D}"${XORGCONF}
 	fi
 }
 
diff --git a/x11-base/xorg-x11/xorg-x11-7.2.ebuild b/x11-base/xorg-x11/xorg-x11-7.2.ebuild
index 26f9f1d3a43d..8d004fbf7fd2 100644
--- a/x11-base/xorg-x11/xorg-x11-7.2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-7.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/x11-base/xorg-x11/xorg-x11-7.2.ebuild,v 1.2 2007/02/17 16:27:17 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.2.ebuild,v 1.3 2007/03/12 22:47:54 vapier Exp $
 
 inherit eutils
 
@@ -76,9 +76,9 @@ pkg_preinst() {
 	# For RC3 - filter out RgbPath line since it also seems to break things
 	XORGCONF="/etc/X11/xorg.conf"
 	if [ -e ${XORGCONF} ]; then
-		mkdir -p "${IMAGE}/etc/X11"
-		sed "/ModulePath/d" ${XORGCONF}	> ${IMAGE}${XORGCONF}
-		sed -i "/RgbPath/d" ${IMAGE}${XORGCONF}
+		mkdir -p "${D}/etc/X11"
+		sed "/ModulePath/d" ${XORGCONF}	> "${D}"${XORGCONF}
+		sed -i "/RgbPath/d" "${D}"${XORGCONF}
 	fi
 }