Fixed $ROOT abuse (bug #167271)

Package-Manager: portage-2.1.3_rc5

7 files changed, 49 insertions, 54 deletions

diff --git a/dev-python/sip/ChangeLog b/dev-python/sip/ChangeLog
index 376174341c78..7f17096d3b27 100644
--- a/dev-python/sip/ChangeLog
+++ b/dev-python/sip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/sip
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.97 2007/06/15 20:48:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.98 2007/06/24 21:48:17 dev-zero Exp $
+
+  24 Jun 2007; Tiziano Müller <dev-zero@gentoo.org> sip-4.2.1.ebuild,
+  sip-4.2.1-r1.ebuild, sip-4.3.2.ebuild, sip-4.5.2-r1.ebuild,
+  sip-4.6.ebuild:
+  Fixed $ROOT abuse (bug #167271)
 
   15 Jun 2007; Diego Pettenò <flameeyes@gentoo.org> sip-4.6.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index e33cc7d9d332..197a47afab1b 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX sip-4.2.1-python-2.5-compat.diff 10853 RMD160 5908121a919649a771dbf37c2e0530f604d95b9a SHA1 d61c9523e320462a2af55a4f9213e885deb9729a SHA256 0f7e4fbb44ae5ee09fbca14dfb0629df309ef950948c2ecc7b7c555af5950af6
 MD5 28595e19ba4a1797d677528c7520be1a files/sip-4.2.1-python-2.5-compat.diff 10853
 RMD160 5908121a919649a771dbf37c2e0530f604d95b9a files/sip-4.2.1-python-2.5-compat.diff 10853
@@ -9,30 +6,30 @@ DIST sip-4.2.1.tar.gz 313308 RMD160 f65e3adcfbd3e2030051aba5a7c96daad39a8599 SHA
 DIST sip-4.3.2.tar.gz 334659 RMD160 3910cb93f6b62bc1f6d540f8c06d56054cd2aa12 SHA1 5eac6ddf8e4b7e0fdb03b069aa5336a535ef41ce SHA256 2dfb459b2e9c37d899ae2108ce3b8d450c763a3c478d358abfae0e3e91417479
 DIST sip-4.5.2.tar.gz 417298 RMD160 82efbb024e5a5be222173ca8c0e2629e7b909258 SHA1 2ca7a3b61ce65dee128ac227f667fc72eb00bd5c SHA256 4344f50a3cedb83859c9015e71880ddd58be0c689de895e0e05546531923ee36
 DIST sip-4.6.tar.gz 428932 RMD160 3453108db9d07cdd4ab894f0e9f2f9bf4ba139c8 SHA1 604fef1204942146091df32f0e2276c5ab77a71c SHA256 d17d5a32e627d9e3230812b33d0d24c67d02d554c1302b0caa8d8559bd4a186c
-EBUILD sip-4.2.1-r1.ebuild 1532 RMD160 9dac86064fdb3287896dba6efef87912196c4787 SHA1 e34820816c909b60a8f9d74ba050e0ea12212fd5 SHA256 9dbeedf9904584497b50588c717cd00301f1a26a756ccf03f97c9065d763c8e1
-MD5 e6d660e9713f5d512fbb9b0e743c1eb6 sip-4.2.1-r1.ebuild 1532
-RMD160 9dac86064fdb3287896dba6efef87912196c4787 sip-4.2.1-r1.ebuild 1532
-SHA256 9dbeedf9904584497b50588c717cd00301f1a26a756ccf03f97c9065d763c8e1 sip-4.2.1-r1.ebuild 1532
-EBUILD sip-4.2.1.ebuild 1410 RMD160 29bb69f4708023ad93331e75e6dce0e39bfd6a93 SHA1 d5a0bdbf0088c36b89e0fdc5d2403ecafa9734c2 SHA256 0e896b90ba6eac630fc3e9d55d357c6b6593bf73a1739111616d439966408778
-MD5 b6ff8c48d913ec6d17e0d5c51d3b7720 sip-4.2.1.ebuild 1410
-RMD160 29bb69f4708023ad93331e75e6dce0e39bfd6a93 sip-4.2.1.ebuild 1410
-SHA256 0e896b90ba6eac630fc3e9d55d357c6b6593bf73a1739111616d439966408778 sip-4.2.1.ebuild 1410
-EBUILD sip-4.3.2.ebuild 1416 RMD160 dd18ac9174606f47df6265e1b07eff3eaff1e908 SHA1 f4d716a1650eb39179b5c1aae7a6d7322578b6b2 SHA256 72d117885523bad4e3d582455e8a9bcb41e6887076bcffeacadd9bb971f629e9
-MD5 75b8edcaec9588f224dc365db3efc875 sip-4.3.2.ebuild 1416
-RMD160 dd18ac9174606f47df6265e1b07eff3eaff1e908 sip-4.3.2.ebuild 1416
-SHA256 72d117885523bad4e3d582455e8a9bcb41e6887076bcffeacadd9bb971f629e9 sip-4.3.2.ebuild 1416
-EBUILD sip-4.5.2-r1.ebuild 1425 RMD160 bc7ec443ac98b4d84e1fbe17759cde2f370a666b SHA1 adcd0831a36257a00f8341d7f24150aa20421ead SHA256 e011a1e09435e813f55e98ac1be39500d053b1398e892055f08749ebda917149
-MD5 fa7a36f8100995ebe3d5fc6b0414e6fe sip-4.5.2-r1.ebuild 1425
-RMD160 bc7ec443ac98b4d84e1fbe17759cde2f370a666b sip-4.5.2-r1.ebuild 1425
-SHA256 e011a1e09435e813f55e98ac1be39500d053b1398e892055f08749ebda917149 sip-4.5.2-r1.ebuild 1425
-EBUILD sip-4.6.ebuild 1440 RMD160 8b8debd5ca1726fabfe03adcbaedfe4eef04161a SHA1 0f1df0bed9cef576f5b12881534a9654d52c799a SHA256 ee1cf394ec68889d669193d2d42d17e0ab9edb32da497e859c801071694461c4
-MD5 5e1da6ec1d0fa19610274030e5bc9ee6 sip-4.6.ebuild 1440
-RMD160 8b8debd5ca1726fabfe03adcbaedfe4eef04161a sip-4.6.ebuild 1440
-SHA256 ee1cf394ec68889d669193d2d42d17e0ab9edb32da497e859c801071694461c4 sip-4.6.ebuild 1440
-MISC ChangeLog 11736 RMD160 98ada47c30ab8379df35309a89b24f39ec89d8e4 SHA1 359d3b140e606376d8341158087c409d559fc64c SHA256 e120f9692917a43481ebbd96819984f6e066a8ca0f4deab2f73c627f2d6a2e55
-MD5 a4fe1b14bdfa5e533e82b036e4eb7335 ChangeLog 11736
-RMD160 98ada47c30ab8379df35309a89b24f39ec89d8e4 ChangeLog 11736
-SHA256 e120f9692917a43481ebbd96819984f6e066a8ca0f4deab2f73c627f2d6a2e55 ChangeLog 11736
+EBUILD sip-4.2.1-r1.ebuild 1516 RMD160 b443682a7bd6cce8e4315a9e4559e2061ef4c5db SHA1 b1ae2f34409bf23d8346ad5f46589f81cc5187c4 SHA256 d5878c1b6aedbb72a526a1f7f8883f3e1b80d935391a9c59fce7e911e668ece0
+MD5 f79d1627fdf15389ed26f85fedf6591c sip-4.2.1-r1.ebuild 1516
+RMD160 b443682a7bd6cce8e4315a9e4559e2061ef4c5db sip-4.2.1-r1.ebuild 1516
+SHA256 d5878c1b6aedbb72a526a1f7f8883f3e1b80d935391a9c59fce7e911e668ece0 sip-4.2.1-r1.ebuild 1516
+EBUILD sip-4.2.1.ebuild 1394 RMD160 0abb63e5c52ee3b21ac43e30dcfc9bbe4bbfe449 SHA1 cf49b2d3f95f2427bdd6dd282018f76008931b00 SHA256 51d7ef6903a331f3ee949530b97767140c4956d49aeb2f3dda17a8bc1c080bd0
+MD5 4116e5733bcdc30cd1e2f61b03437da6 sip-4.2.1.ebuild 1394
+RMD160 0abb63e5c52ee3b21ac43e30dcfc9bbe4bbfe449 sip-4.2.1.ebuild 1394
+SHA256 51d7ef6903a331f3ee949530b97767140c4956d49aeb2f3dda17a8bc1c080bd0 sip-4.2.1.ebuild 1394
+EBUILD sip-4.3.2.ebuild 1409 RMD160 77201d50b8742e1bc0681dbb2a552adab92f9cca SHA1 f9133e1312c813b3cc7b93da2cc7edb4c16c85f1 SHA256 2878c485307769ce327fe98c4ece21474b608be2071c56d1fc4764aee1a7ccaf
+MD5 3a1c2c2572a0cc9fe44ea3415dcf59c7 sip-4.3.2.ebuild 1409
+RMD160 77201d50b8742e1bc0681dbb2a552adab92f9cca sip-4.3.2.ebuild 1409
+SHA256 2878c485307769ce327fe98c4ece21474b608be2071c56d1fc4764aee1a7ccaf sip-4.3.2.ebuild 1409
+EBUILD sip-4.5.2-r1.ebuild 1412 RMD160 def70ef0b9e651ee7538d6e2d764b983ae24b703 SHA1 3702231ef0211fa614b975fc67bed060cbecca04 SHA256 b6bf5e001dd694415d99d9a60b53c8fba296ec635736491020a1f33bde7fd572
+MD5 66ea1c914b83605d34eee62f51f6f0d6 sip-4.5.2-r1.ebuild 1412
+RMD160 def70ef0b9e651ee7538d6e2d764b983ae24b703 sip-4.5.2-r1.ebuild 1412
+SHA256 b6bf5e001dd694415d99d9a60b53c8fba296ec635736491020a1f33bde7fd572 sip-4.5.2-r1.ebuild 1412
+EBUILD sip-4.6.ebuild 1424 RMD160 ec5bc6744df4d688627893094874dc95b5e6cafa SHA1 1e23450e5f7a300e73f97fbffb5d3f27cb0be8b0 SHA256 62088f51b09e8441a14bd2f9125ea90486ec417af5b8a500ec7016e7bb11b187
+MD5 3d278c069cfeadc4f99a53bf8dd8e6a8 sip-4.6.ebuild 1424
+RMD160 ec5bc6744df4d688627893094874dc95b5e6cafa sip-4.6.ebuild 1424
+SHA256 62088f51b09e8441a14bd2f9125ea90486ec417af5b8a500ec7016e7bb11b187 sip-4.6.ebuild 1424
+MISC ChangeLog 11921 RMD160 39bb2656c8e8bdd80b4bce917a0fb39bea9f0f85 SHA1 e782081c220e13314a1fea1c5573149d8c7925a6 SHA256 732d92e8e24018a882ec50f5c68cfdfb0afe4cd5d5605928cf9c92ae1defdae3
+MD5 c6320ace6d96694dd7ef9d033eb0a449 ChangeLog 11921
+RMD160 39bb2656c8e8bdd80b4bce917a0fb39bea9f0f85 ChangeLog 11921
+SHA256 732d92e8e24018a882ec50f5c68cfdfb0afe4cd5d5605928cf9c92ae1defdae3 ChangeLog 11921
 MISC metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 SHA1 ec86e15b85c2bc4429ad67bb52238b44f2b16cbd SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d
 MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 metadata.xml 175
@@ -52,10 +49,3 @@ SHA256 2b5d591b09d17d1880b20b5aaa3770e114a63e2f69857b5167be7d570ea34c60 files/di
 MD5 cdd8f89cbe59f6098db98b8b2ef0faa7 files/digest-sip-4.6 223
 RMD160 386cd2d412ad0c94486eaaf8097880f8f97eda4d files/digest-sip-4.6 223
 SHA256 28a499a7bab5caa6d5ecda3723947444012eb82f0b16eb8cdd4f8f97b8c76ccb files/digest-sip-4.6 223
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGcvtAAiZjviIA2XgRAlfgAKCI4AmHMf0MMfEj5hW/kHo3tnpM/ACg5kwT
-XzPXPcqUgR7lJkDOpRmpO1Q=
-=Nvpa
------END PGP SIGNATURE-----
diff --git a/dev-python/sip/sip-4.2.1-r1.ebuild b/dev-python/sip/sip-4.2.1-r1.ebuild
index e8d884fd9a21..f9e702677db6 100644
--- a/dev-python/sip/sip-4.2.1-r1.ebuild
+++ b/dev-python/sip/sip-4.2.1-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/dev-python/sip/sip-4.2.1-r1.ebuild,v 1.2 2007/03/05 03:08:01 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.2.1-r1.ebuild,v 1.3 2007/06/24 21:48:17 dev-zero Exp $
 
 inherit distutils
 
@@ -32,7 +32,7 @@ src_unpack(){
 src_compile(){
 	distutils_python_version
 
-	local myconf="-l qt-mt -b ${ROOT}usr/bin -d ${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages -e ${ROOT}usr/include/python${PYVER}"
+	local myconf="-l qt-mt -b /usr/bin -d /usr/$(get_libdir)/python${PYVER}/site-packages -e /usr/include/python${PYVER}"
 	use debug && myconf="${myconf} -u"
 
 	python configure.py ${myconf} "CFLAGS+=${CFLAGS}" "CXXFLAGS+=${CXXFLAGS}"
diff --git a/dev-python/sip/sip-4.2.1.ebuild b/dev-python/sip/sip-4.2.1.ebuild
index 59b9bdffc2b8..7a316b043fc4 100644
--- a/dev-python/sip/sip-4.2.1.ebuild
+++ b/dev-python/sip/sip-4.2.1.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-python/sip/sip-4.2.1.ebuild,v 1.11 2007/03/05 03:08:01 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.2.1.ebuild,v 1.12 2007/06/24 21:48:17 dev-zero Exp $
 
 inherit distutils
 
@@ -26,7 +26,7 @@ DEPEND="virtual/libc
 src_compile(){
 	distutils_python_version
 
-	local myconf="-l qt-mt -b ${ROOT}usr/bin -d ${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages -e ${ROOT}usr/include/python${PYVER}"
+	local myconf="-l qt-mt -b /usr/bin -d /usr/$(get_libdir)/python${PYVER}/site-packages -e /usr/include/python${PYVER}"
 	use debug && myconf="${myconf} -u"
 
 	python configure.py ${myconf} "CFLAGS+=${CFLAGS}" "CXXFLAGS+=${CXXFLAGS}"
diff --git a/dev-python/sip/sip-4.3.2.ebuild b/dev-python/sip/sip-4.3.2.ebuild
index b2ef9066d8d3..0928d65ff7f4 100644
--- a/dev-python/sip/sip-4.3.2.ebuild
+++ b/dev-python/sip/sip-4.3.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.3.2.ebuild,v 1.3 2007/03/05 03:08:01 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.3.2.ebuild,v 1.4 2007/06/24 21:48:17 dev-zero Exp $
 
-inherit distutils
+inherit distutils multilib
 
 MY_P=${P/"?.?.?_pre"/"snapshot-"}
 MY_P=${MY_P/_/}
@@ -26,7 +26,7 @@ DEPEND="virtual/libc
 src_compile(){
 	distutils_python_version
 
-	local myconf="-l qt-mt -b ${ROOT}usr/bin -d ${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages -e ${ROOT}usr/include/python${PYVER}"
+	local myconf="-l qt-mt -b /usr/bin -d /usr/$(get_libdir)/python${PYVER}/site-packages -e /usr/include/python${PYVER}"
 	use debug && myconf="${myconf} -u"
 
 	python configure.py ${myconf} "CFLAGS+=${CFLAGS}" "CXXFLAGS+=${CXXFLAGS}"
diff --git a/dev-python/sip/sip-4.5.2-r1.ebuild b/dev-python/sip/sip-4.5.2-r1.ebuild
index 5f9128d9c579..62ed95004412 100644
--- a/dev-python/sip/sip-4.5.2-r1.ebuild
+++ b/dev-python/sip/sip-4.5.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.5.2-r1.ebuild,v 1.7 2007/06/01 13:57:44 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.5.2-r1.ebuild,v 1.8 2007/06/24 21:48:17 dev-zero Exp $
 
 NEED_PYTHON=2.3
 
-inherit python toolchain-funcs versionator
+inherit python toolchain-funcs versionator multilib
 
 MY_P=${P/_}
 
@@ -29,10 +29,10 @@ src_compile(){
 	use debug && myconf="${myconf} -u"
 
 	python configure.py \
-		-b "${ROOT}usr/bin" \
-		-d "${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages" \
-		-e "${ROOT}usr/include/python${PYVER}" \
-		-v "${ROOT}usr/share/sip" \
+		-b "/usr/bin" \
+		-d "/usr/$(get_libdir)/python${PYVER}/site-packages" \
+		-e "/usr/include/python${PYVER}" \
+		-v "/usr/share/sip" \
 		${myconf} \
 		CXXFLAGS_RELEASE="" CFLAGS_RELEASE="" \
 		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
diff --git a/dev-python/sip/sip-4.6.ebuild b/dev-python/sip/sip-4.6.ebuild
index 202b1b7bdb18..4d081a3e5247 100644
--- a/dev-python/sip/sip-4.6.ebuild
+++ b/dev-python/sip/sip-4.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.6.ebuild,v 1.2 2007/06/15 20:48:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.6.ebuild,v 1.3 2007/06/24 21:48:17 dev-zero Exp $
 
 NEED_PYTHON=2.3
 
-inherit python toolchain-funcs versionator
+inherit python toolchain-funcs versionator multilib
 
 MY_P=${P/_}
 
@@ -29,10 +29,10 @@ src_compile(){
 	use debug && myconf="${myconf} -u"
 
 	python configure.py \
-		-b "${ROOT}usr/bin" \
-		-d "${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages" \
-		-e "${ROOT}usr/include/python${PYVER}" \
-		-v "${ROOT}usr/share/sip" \
+		-b "/usr/bin" \
+		-d "/usr/$(get_libdir)/python${PYVER}/site-packages" \
+		-e "/usr/include/python${PYVER}" \
+		-v "/usr/share/sip" \
 		${myconf} \
 		CXXFLAGS_RELEASE="" CFLAGS_RELEASE="" \
 		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \