Fixed $ROOT abuse (bug #167271)

(Portage version: 2.1.3_rc5)

6 files changed, 25 insertions, 20 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/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}" \