fixup on pkg_preinst() to use ROOT

8 files changed, 40 insertions, 34 deletions

diff --git a/sys-devel/autoconf/ChangeLog b/sys-devel/autoconf/ChangeLog
index 04910603f20f..069124637765 100644
--- a/sys-devel/autoconf/ChangeLog
+++ b/sys-devel/autoconf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/autoconf
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.28 2003/10/07 22:02:28 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.29 2003/10/31 00:03:07 drobbins Exp $
+
+  30 Oct 2003; Daniel Robbins <drobbins@gentoo.org>: all ebuilds: modified
+  pkg_preinst() to use $ROOT and prevent non-ROOT="/" autoconf merges from
+  frying the "/" tree (was causing catalyst to die.) Should be a very low-
+  risk change since the overwhelming majority of Gentoo users always have
+  ROOT set to "/" anyway.
 
 *autoconf-2.57a-r1 (08 Oct 2003)
 
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 739fa116c8c2..ff510191dcd6 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -1,22 +1,22 @@
-MD5 02b36622049cd1daa12c16dc708dc7b8 autoconf-2.54-r1.ebuild 3207
-MD5 0e273fec6f80838f4556e7114868d8d8 autoconf-2.57.ebuild 3212
-MD5 512a24f6969c9f497f2d94c77a7b549c autoconf-2.53a.ebuild 2782
-MD5 0e3dddf05f2b4efa229843d9a1201410 autoconf-2.54.ebuild 3205
+MD5 20a91c88e56e5c5472616093f8eb83ed autoconf-2.54-r1.ebuild 3221
+MD5 edd322cb328dc943b8731a9d43faf3ba autoconf-2.57a-r1.ebuild 3390
+MD5 c7580522df96c95bfb223bebf6cdf1ff autoconf-2.57-r1.ebuild 3233
 MD5 f73eea253e36a72484edff7fe1ca1086 autoconf-2.13-r2.ebuild 989
-MD5 3935cfd6a39ecb4fec96590af0838937 ChangeLog 4718
-MD5 98662b30b8641482848514c4b26efede autoconf-2.57-r1.ebuild 3216
-MD5 3ccbd266e1fd59b19de72b2a96bce6c6 autoconf-2.57a-r1.ebuild 3374
-MD5 28795f22763ef0683a8a1e72e8dd4646 files/ac-wrapper.pl 2133
+MD5 cce411fa2ad2abf61cc502f677469549 autoconf-2.57.ebuild 3226
+MD5 95cd9367a4df2e554aa7db8e0a5cb27f autoconf-2.53a.ebuild 2796
+MD5 0cc339109d2c3012c3e811d430344916 autoconf-2.54.ebuild 3219
+MD5 4411cdf314bc25e89cc9e4b558254975 ChangeLog 5046
+MD5 b9d11bdf9f87c461517d45f1408756a8 files/digest-autoconf-2.53a 132
 MD5 c98042870fa4228b40ce57442d91ca47 files/autoconf-2.57a-infopage-namechange.patch 5119
-MD5 02c192b9ea3e4945d007a8cfde221c73 files/digest-autoconf-2.13-r2 65
-MD5 ac8caa17f05e56e10927af757cf12f99 files/digest-autoconf-2.54 131
-MD5 12f8fb67eaf50f87ed7825356503e8d7 files/autoconf-2.13-configure-gentoo.diff 958
-MD5 f935499520b964a1fcfc23b68d8c8558 files/autoconf-2.13-configure.in-gentoo.diff 443
+MD5 1e532467a5e16fbc8acf85b00d89ca85 files/autoconf-2.57a-AC_HELP_STRING.patch 403
+MD5 28795f22763ef0683a8a1e72e8dd4646 files/ac-wrapper.pl 2133
+MD5 f2802f3155defa9299baf6e5d0d79571 files/digest-autoconf-2.57a-r1 132
 MD5 c39fbf4a2c9bd249b6062e5b1cb67eae files/autoconf-2.57-infopage-namechange.patch 4628
+MD5 ac8caa17f05e56e10927af757cf12f99 files/digest-autoconf-2.54 131
 MD5 cff703b5ddfcb647f18aeed0111b8138 files/digest-autoconf-2.57 131
+MD5 f935499520b964a1fcfc23b68d8c8558 files/autoconf-2.13-configure.in-gentoo.diff 443
 MD5 e3137dce2883f1c5fa9adbee73a86113 files/autoconf-2.5-infopage-namechange.patch 4043
+MD5 02c192b9ea3e4945d007a8cfde221c73 files/digest-autoconf-2.13-r2 65
 MD5 ac8caa17f05e56e10927af757cf12f99 files/digest-autoconf-2.54-r1 131
-MD5 1e532467a5e16fbc8acf85b00d89ca85 files/autoconf-2.57a-AC_HELP_STRING.patch 403
-MD5 f2802f3155defa9299baf6e5d0d79571 files/digest-autoconf-2.57a-r1 132
 MD5 cff703b5ddfcb647f18aeed0111b8138 files/digest-autoconf-2.57-r1 131
-MD5 b9d11bdf9f87c461517d45f1408756a8 files/digest-autoconf-2.53a 132
+MD5 12f8fb67eaf50f87ed7825356503e8d7 files/autoconf-2.13-configure-gentoo.diff 958
diff --git a/sys-devel/autoconf/autoconf-2.53a.ebuild b/sys-devel/autoconf/autoconf-2.53a.ebuild
index 74e344d195f2..7dfe33bf0d89 100644
--- a/sys-devel/autoconf/autoconf-2.53a.ebuild
+++ b/sys-devel/autoconf/autoconf-2.53a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.53a.ebuild,v 1.16 2003/09/06 08:10:52 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.53a.ebuild,v 1.17 2003/10/31 00:03:07 drobbins Exp $
 
 OLD_PV=2.13
 OLD_P=${PN}-${OLD_PV}
@@ -112,9 +112,9 @@ pkg_preinst() {
 	# was binaries
 	for x in autoconf autoheader autoreconf autoscan autoupdate ifnames autom4te
 	do
-		if [ -e /usr/bin/${x} ]
+		if [ -e ${ROOT}/usr/bin/${x} ]
 		then
-			rm -f /usr/bin/${x}
+			rm -f ${ROOT}/usr/bin/${x}
 		fi
 	done
 }
diff --git a/sys-devel/autoconf/autoconf-2.54-r1.ebuild b/sys-devel/autoconf/autoconf-2.54-r1.ebuild
index 8748318fc758..78cdc7423e70 100644
--- a/sys-devel/autoconf/autoconf-2.54-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.54-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.54-r1.ebuild,v 1.3 2003/09/06 08:10:52 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.54-r1.ebuild,v 1.4 2003/10/31 00:03:07 drobbins Exp $
 
 IUSE=""
 
@@ -130,9 +130,9 @@ pkg_preinst() {
 	# was binaries
 	for x in autoconf autoheader autoreconf autoscan autoupdate ifnames autom4te
 	do
-		if [ -e /usr/bin/${x} ]
+		if [ -e ${ROOT}/usr/bin/${x} ]
 		then
-			rm -f /usr/bin/${x}
+			rm -f ${ROOT}/usr/bin/${x}
 		fi
 	done
 }
diff --git a/sys-devel/autoconf/autoconf-2.54.ebuild b/sys-devel/autoconf/autoconf-2.54.ebuild
index 8fa613e4c255..4d72fab67bcc 100644
--- a/sys-devel/autoconf/autoconf-2.54.ebuild
+++ b/sys-devel/autoconf/autoconf-2.54.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.54.ebuild,v 1.15 2003/09/06 08:10:52 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.54.ebuild,v 1.16 2003/10/31 00:03:07 drobbins Exp $
 
 IUSE=""
 
@@ -130,9 +130,9 @@ pkg_preinst() {
 	# was binaries
 	for x in autoconf autoheader autoreconf autoscan autoupdate ifnames autom4te
 	do
-		if [ -e /usr/bin/${x} ]
+		if [ -e ${ROOT}/usr/bin/${x} ]
 		then
-			rm -f /usr/bin/${x}
+			rm -f ${ROOT}/usr/bin/${x}
 		fi
 	done
 }
diff --git a/sys-devel/autoconf/autoconf-2.57-r1.ebuild b/sys-devel/autoconf/autoconf-2.57-r1.ebuild
index ea2e639557c3..60f6021b1e54 100644
--- a/sys-devel/autoconf/autoconf-2.57-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.57-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.57-r1.ebuild,v 1.6 2003/09/17 21:03:51 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.57-r1.ebuild,v 1.7 2003/10/31 00:03:07 drobbins Exp $
 
 IUSE=""
 
@@ -130,9 +130,9 @@ pkg_preinst() {
 	# was binaries
 	for x in autoconf autoheader autoreconf autoscan autoupdate ifnames autom4te
 	do
-		if [ -e /usr/bin/${x} ]
+		if [ -e ${ROOT}/usr/bin/${x} ]
 		then
-			rm -f /usr/bin/${x}
+			rm -f ${ROOT}/usr/bin/${x}
 		fi
 	done
 }
diff --git a/sys-devel/autoconf/autoconf-2.57.ebuild b/sys-devel/autoconf/autoconf-2.57.ebuild
index 30409db57b69..68965078c97d 100644
--- a/sys-devel/autoconf/autoconf-2.57.ebuild
+++ b/sys-devel/autoconf/autoconf-2.57.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.57.ebuild,v 1.10 2003/09/06 08:10:52 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.57.ebuild,v 1.11 2003/10/31 00:03:07 drobbins Exp $
 
 IUSE=""
 
@@ -130,9 +130,9 @@ pkg_preinst() {
 	# was binaries
 	for x in autoconf autoheader autoreconf autoscan autoupdate ifnames autom4te
 	do
-		if [ -e /usr/bin/${x} ]
+		if [ -e ${ROOT}/usr/bin/${x} ]
 		then
-			rm -f /usr/bin/${x}
+			rm -f ${ROOT}/usr/bin/${x}
 		fi
 	done
 }
diff --git a/sys-devel/autoconf/autoconf-2.57a-r1.ebuild b/sys-devel/autoconf/autoconf-2.57a-r1.ebuild
index 93ca0a079ef3..cec41a0e6d85 100644
--- a/sys-devel/autoconf/autoconf-2.57a-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.57a-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.57a-r1.ebuild,v 1.1 2003/10/07 22:02:28 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.57a-r1.ebuild,v 1.2 2003/10/31 00:03:07 drobbins Exp $
 
 IUSE=""
 
@@ -134,9 +134,9 @@ pkg_preinst() {
 	# was binaries
 	for x in autoconf autoheader autoreconf autoscan autoupdate ifnames autom4te
 	do
-		if [ -e /usr/bin/${x} ]
+		if [ -e ${ROOT}/usr/bin/${x} ]
 		then
-			rm -f /usr/bin/${x}
+			rm -f ${ROOT}/usr/bin/${x}
 		fi
 	done
 }