(QA) Fix ${ROOT} abuse. bug #167271.

Package-Manager: portage-2.1.3_rc5

4 files changed, 31 insertions, 29 deletions

diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog
index 5ba76e91843e..3eb856c3a730 100644
--- a/dev-lang/tcl/ChangeLog
+++ b/dev-lang/tcl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/tcl
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.79 2007/05/25 15:15:26 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.80 2007/06/24 23:36:14 peper Exp $
+
+  24 Jun 2007; Piotr Jaroszyński <peper@gentoo.org> tcl-8.4.9.ebuild,
+  tcl-8.4.14.ebuild:
+  (QA) Fix ${ROOT} abuse. bug #167271.
 
   25 May 2007; Brent Baude <ranger@gentoo.org> tcl-8.4.14.ebuild:
   Marking tcl-8.4.14 ppc64 stable for bug 178320
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index dbec4af04d2d..747ce693201e 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -19,18 +19,18 @@ RMD160 4ff8355af81705058fd411910dfae94887bcd884 files/tcl-configure-LANG.patch 1
 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea files/tcl-configure-LANG.patch 1686
 DIST tcl8.4.14-src.tar.gz 3544609 RMD160 392a4f4617ee77cfdae10b24e9ccbe84afed0a40 SHA1 d7af7e0c7ed563e2344dda04bbe49961589244dd SHA256 2746e3c568a5837cfb7a83359ab34401886ad621965ab4571333859807ab6143
 DIST tcl8.4.9-src.tar.gz 3496364 RMD160 0d02e3224fcc6d2dd41f2edfb89a824e5437fca8 SHA1 77370577ded22315fb8f60e20500920352412e58 SHA256 b4178967e94bcfae6b73abaaf575397e6aac81ffbaf144d757a3891d0bf89d96
-EBUILD tcl-8.4.14.ebuild 3500 RMD160 8a21ed6317514ad4040602af607196d69226a565 SHA1 d08db3cfd6216ea376c9120dd1c883905890aa7e SHA256 187416298110e4544cc894812805600de00b491f7ec8ce3076c5e2c4aae576fc
-MD5 63d1a337522ce059789689ed3839ad54 tcl-8.4.14.ebuild 3500
-RMD160 8a21ed6317514ad4040602af607196d69226a565 tcl-8.4.14.ebuild 3500
-SHA256 187416298110e4544cc894812805600de00b491f7ec8ce3076c5e2c4aae576fc tcl-8.4.14.ebuild 3500
-EBUILD tcl-8.4.9.ebuild 3511 RMD160 a741d37e1321dcb3d5c2ab2effe34ab6912a32e1 SHA1 e9bc7cfa253032e26ff5e221c52491e773c7b7d2 SHA256 0fd4205fe462892d907cb0753a90f3f10898d40888bcbb708b60bd872006d035
-MD5 af3ec8733dddf50f34db16fefc41aac6 tcl-8.4.9.ebuild 3511
-RMD160 a741d37e1321dcb3d5c2ab2effe34ab6912a32e1 tcl-8.4.9.ebuild 3511
-SHA256 0fd4205fe462892d907cb0753a90f3f10898d40888bcbb708b60bd872006d035 tcl-8.4.9.ebuild 3511
-MISC ChangeLog 10022 RMD160 3a0ceb6fd82d007e5308b0d34e775357e9262d6b SHA1 3884163a86f5c682a5cc6f47ec63504afa9008e2 SHA256 dfce37bef81af9c491832e67c10ab3da17e4fb61ac827fce0b208d4621102add
-MD5 af9105a846456c623c7a789f806ea708 ChangeLog 10022
-RMD160 3a0ceb6fd82d007e5308b0d34e775357e9262d6b ChangeLog 10022
-SHA256 dfce37bef81af9c491832e67c10ab3da17e4fb61ac827fce0b208d4621102add ChangeLog 10022
+EBUILD tcl-8.4.14.ebuild 3434 RMD160 ffbf03b07599c7f86bbc061bd9a181314526af15 SHA1 3b5eeac4cb8cb395a204db220d8ae573e937d2dc SHA256 b62032d727d9ef4ab8af60a79590176032d1eed8c0b52ad881977885847b2305
+MD5 8998c0dae3cc646584413efd7e8b359a tcl-8.4.14.ebuild 3434
+RMD160 ffbf03b07599c7f86bbc061bd9a181314526af15 tcl-8.4.14.ebuild 3434
+SHA256 b62032d727d9ef4ab8af60a79590176032d1eed8c0b52ad881977885847b2305 tcl-8.4.14.ebuild 3434
+EBUILD tcl-8.4.9.ebuild 3443 RMD160 05159f2885e6520b21d2ccd64f19a8a64445edc8 SHA1 27ac2a5dbfb20bea5019cba34a2f9d4a3577d0c9 SHA256 1266e03d39b5055236d4fa908ab8375251a941ed21ad3766842293a79b8ace39
+MD5 2881de6cd0f5abd0df976fc41013025a tcl-8.4.9.ebuild 3443
+RMD160 05159f2885e6520b21d2ccd64f19a8a64445edc8 tcl-8.4.9.ebuild 3443
+SHA256 1266e03d39b5055236d4fa908ab8375251a941ed21ad3766842293a79b8ace39 tcl-8.4.9.ebuild 3443
+MISC ChangeLog 10153 RMD160 ee3ec2cf278eeefe756d67d65210fa78b34f1ab8 SHA1 ff03a015a152b45bad5b382eda8c5327fd29cb30 SHA256 4fde92e673cebfeaf582e799e97af3bdc2ca59144d87304e36034567215f861d
+MD5 5508643be0e085743364df515d753ed2 ChangeLog 10153
+RMD160 ee3ec2cf278eeefe756d67d65210fa78b34f1ab8 ChangeLog 10153
+SHA256 4fde92e673cebfeaf582e799e97af3bdc2ca59144d87304e36034567215f861d ChangeLog 10153
 MISC metadata.xml 264 RMD160 6318855997b3e957f4ad5c59677534993e352c34 SHA1 19fe5fc86133d09d7fcb0b2ce44054eff4fff028 SHA256 01ce19dabf2e53a73d86e4b16f653c6cd2b6c9aca1b79ec095f353315c8b84ee
 MD5 72be7b18671e9312d64a3fb833dceecd metadata.xml 264
 RMD160 6318855997b3e957f4ad5c59677534993e352c34 metadata.xml 264
@@ -44,7 +44,7 @@ SHA256 db369d00f1fdaee61aa379e2b5e30ce8bae7bd510a0ca28a98e0c7ae515bb43a files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGfuDDp/wUKkr7RBoRAk1JAJoC2sNVMD4pxcvool4MkurgcgwjIQCg4k+H
-jr5+2gUxyer1PG4oLtIjwi0=
-=9PR7
+iD8DBQFGfv/xppoStNGKGywRAriHAJ9AQZv4KG9MUXpScCSwfZmK4K7etQCgw8PL
+p4sSbDNC+HBqJd6Vge7PDOU=
+=lZha
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/tcl/tcl-8.4.14.ebuild b/dev-lang/tcl/tcl-8.4.14.ebuild
index 2769fc62e481..f2635c1dfcf9 100644
--- a/dev-lang/tcl/tcl-8.4.14.ebuild
+++ b/dev-lang/tcl/tcl-8.4.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/dev-lang/tcl/tcl-8.4.14.ebuild,v 1.9 2007/06/24 21:23:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.14.ebuild,v 1.10 2007/06/24 23:36:14 peper Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
@@ -76,13 +76,12 @@ src_install() {
 	S= make DESTDIR="${D}" install || die
 
 	# fix the tclConfig.sh to eliminate refs to the build directory
-	[[ ${ROOT:0-1} != "/" ]] && ROOT=${ROOT}/
 	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
 	sed -i \
-		-e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${ROOT}usr/${mylibdir}," \
-		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${ROOT}usr/${mylibdir}/tcl${v1}/include'," \
-		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${ROOT}usr/${mylibdir}," \
-		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${ROOT}usr/${mylibdir}," \
+		-e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L$/usr/${mylibdir}," \
+		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='/usr/${mylibdir}/tcl${v1}/include'," \
+		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L/usr/${mylibdir}," \
+		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='/usr/${mylibdir}," \
 		-e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \
 		-e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \
 		-e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \
diff --git a/dev-lang/tcl/tcl-8.4.9.ebuild b/dev-lang/tcl/tcl-8.4.9.ebuild
index aa4e07765b3c..9c9e8291fd68 100644
--- a/dev-lang/tcl/tcl-8.4.9.ebuild
+++ b/dev-lang/tcl/tcl-8.4.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.9.ebuild,v 1.15 2006/09/04 08:51:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.9.ebuild,v 1.16 2007/06/24 23:36:14 peper Exp $
 
 inherit eutils multilib
 
@@ -67,13 +67,12 @@ src_install() {
 	S= make INSTALL_ROOT=${D} MAN_INSTALL_DIR=${D}/usr/share/man install || die
 
 	# fix the tclConfig.sh to eliminate refs to the build directory
-	[[ ${ROOT:0-1} != "/" ]] && ROOT=${ROOT}/
 	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
 	sed -i \
-		-e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${ROOT}usr/${mylibdir}," \
-		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${ROOT}usr/${mylibdir}/tcl${v1}/include'," \
-		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${ROOT}usr/${mylibdir}," \
-		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${ROOT}usr/${mylibdir}," \
+		-e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L/usr/${mylibdir}," \
+		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='/usr/${mylibdir}/tcl${v1}/include'," \
+		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L/usr/${mylibdir}," \
+		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='/usr/${mylibdir}," \
 		-e "s,^TCL_LIB_FILE='libtcl8.4..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl8.4\$\{TCL_DBGX\}.so\"," \
 		-e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \
 		-e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \