Fixed $ROOT abuse (bug #167271)

(Portage version: 2.1.3_rc5)

5 files changed, 22 insertions, 77 deletions

diff --git a/dev-util/eric/ChangeLog b/dev-util/eric/ChangeLog
index 86c21cd2af2a..fe709b5e925a 100644
--- a/dev-util/eric/ChangeLog
+++ b/dev-util/eric/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/eric
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.44 2007/06/23 21:07:44 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.45 2007/06/24 21:55:36 dev-zero Exp $
+
+  24 Jun 2007; Tiziano Müller <dev-zero@gentoo.org> eric-3.7.2-r1.ebuild,
+  -eric-3.9.4.ebuild, eric-3.9.5.ebuild:
+  Fixed $ROOT abuse (bug #167271)
 
   23 Jun 2007; Lukasz Strzygowski <lucass@gentoo.org> eric-3.9.5.ebuild:
   Added doc/examples use-flags. Cleanup.
diff --git a/dev-util/eric/eric-3.7.2-r1.ebuild b/dev-util/eric/eric-3.7.2-r1.ebuild
index d6fbc98dbcdf..cdecb9b3d35d 100644
--- a/dev-util/eric/eric-3.7.2-r1.ebuild
+++ b/dev-util/eric/eric-3.7.2-r1.ebuild
@@ -1,8 +1,8 @@
-# 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-util/eric/eric-3.7.2-r1.ebuild,v 1.6 2006/12/30 00:19:42 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-3.7.2-r1.ebuild,v 1.7 2007/06/24 21:55:36 dev-zero Exp $
 
-inherit python eutils
+inherit python eutils multilib
 
 MY_PV=${PV/"?.?_pre"/"snapshot-"}
 S=${WORKDIR}/${PN}-${MY_PV}
@@ -37,9 +37,9 @@ python_version
 
 src_install() {
 	python install.py \
-		-b ${ROOT}usr/bin \
-		-i ${D} \
-		-d ${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages \
+		-b /usr/bin \
+		-i "${D}" \
+		-d /usr/$(get_libdir)/python${PYVER}/site-packages \
 		-c
 
 	dodoc HISTORY LICENSE.GPL THANKS eric/README*
diff --git a/dev-util/eric/eric-3.9.4.ebuild b/dev-util/eric/eric-3.9.4.ebuild
deleted file mode 100644
index 9bfad51f2b72..000000000000
--- a/dev-util/eric/eric-3.9.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-3.9.4.ebuild,v 1.1 2006/12/30 21:10:20 dev-zero Exp $
-
-inherit python eutils
-
-DESCRIPTION="eric3 is a full featured Python IDE that is written in PyQt using the QScintilla editor widget"
-HOMEPAGE="http://www.die-offenbachs.de/detlev/eric3.html"
-SRC_URI="mirror://sourceforge/eric-ide/${P}.tar.gz
-	linguas_de? ( mirror://sourceforge/eric-ide/${PN}-i18n-de-${PV}.tar.gz )
-	linguas_fr? ( mirror://sourceforge/eric-ide/${PN}-i18n-fr-${PV}.tar.gz )
-	linguas_ru? ( mirror://sourceforge/eric-ide/${PN}-i18n-ru-${PV}.tar.gz )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="idl"
-
-DEPEND=">=dev-python/PyQt-3.13
-	>=dev-python/pyxml-0.8.4
-	>=dev-python/qscintilla-1.0"
-RDEPEND=">=dev-python/PyQt-3.13
-	>=dev-python/pyxml-0.8.4
-	idl? ( !sparc? ( >=net-misc/omniORB-4.0.3 ) )"
-
-LANGS="de fr ru"
-
-python_version
-
-src_install() {
-	python install.py \
-		-b "${ROOT}usr/bin" \
-		-i "${D}" \
-		-d "${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages" \
-		-c || die "python install.py failed"
-
-	dodoc HISTORY THANKS eric/README*
-	make_desktop_entry "eric3 --nosplash" \
-			eric3 \
-			"${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/eric3/icons/default/eric.png" \
-			"Development;IDE;Qt"
-}
-
-pkg_postinst() {
-	elog "If you want to use eric3 with mod_python, have a look at"
-	elog "\"${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/eric3/patch_modpython.py\"."
-}
diff --git a/dev-util/eric/eric-3.9.5.ebuild b/dev-util/eric/eric-3.9.5.ebuild
index d256d4f4394a..71c0fd360951 100644
--- a/dev-util/eric/eric-3.9.5.ebuild
+++ b/dev-util/eric/eric-3.9.5.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-util/eric/eric-3.9.5.ebuild,v 1.2 2007/06/23 21:07:44 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-3.9.5.ebuild,v 1.3 2007/06/24 21:55:36 dev-zero Exp $
 
 NEED_PYTHON=2.3
 
@@ -40,12 +40,12 @@ src_unpack() {
 src_install() {
 	python_version
 
-	local sitedir="usr/$(get_libdir)/python${PYVER}/site-packages"
+	local sitedir="/usr/$(get_libdir)/python${PYVER}/site-packages"
 
 cat > gentoo_config.py <<- _EOF_
 
 cfg = {
-	'ericDir': r"/${sitedir}/eric3",
+	'ericDir': r"${sitedir}/eric3",
 	'ericPixDir': r"/usr/share/eric3/pixmaps",
 	'ericIconDir': r"/usr/share/eric3/icons",
 	'ericDTDDir': r"/usr/share/eric3/DTDs",
@@ -53,27 +53,27 @@ cfg = {
 	'ericDocDir': r"/usr/share/doc/${PF}/Documentation",
 	'ericExamplesDir': r"/usr/share/doc/${PF}/Examples",
 	'ericTranslationsDir': r"/usr/share/eric3/i18n",
-	'ericWizardsDir': r"/${sitedir}/Wizards",
+	'ericWizardsDir': r"${sitedir}/Wizards",
 	'ericTemplatesDir': r"/usr/share/eric3/DesignerTemplates",
-	'ericOthersDir': r"/${sitedir}/eric3",
+	'ericOthersDir': r"${sitedir}/eric3",
 	'bindir': r"/usr/bin",
-	'mdir': r"/${sitedir}"
+	'mdir': r"${sitedir}"
 }
 _EOF_
 
 
 	"${python}" install.py \
 		-f "gentoo_config.py" \
-		-b "${ROOT}usr/bin" \
+		-b "/usr/bin" \
 		-i "${D}" \
-		-d "${ROOT}${sitedir}" \
+		-d "${sitedir}" \
 		-c || die "${python} install.py failed"
 
 	dodoc ChangeLog THANKS eric/README*
 
 	make_desktop_entry "eric3 --nosplash" \
 			eric3 \
-			"${ROOT}usr/share/eric3/icons/default/eric.png" \
+			"/usr/share/eric3/icons/default/eric.png" \
 			"Development;IDE;Qt"
 }
 
@@ -82,10 +82,10 @@ pkg_postinst() {
 	elog "  \"${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/eric3/patch_modpython.py\"."
 
 	python_version
-	python_mod_optimize "${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/eric3"
+	python_mod_optimize "/usr/$(get_libdir)/python${PYVER}/site-packages/eric3"
 }
 
 pkg_postrm() {
 	python_version
-	python_mod_cleanup "${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/eric3"
+	python_mod_cleanup "/usr/$(get_libdir)/python${PYVER}/site-packages/eric3"
 }
diff --git a/dev-util/eric/files/digest-eric-3.9.4 b/dev-util/eric/files/digest-eric-3.9.4
deleted file mode 100644
index 7fcb3726b42e..000000000000
--- a/dev-util/eric/files/digest-eric-3.9.4
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 310c40b63e218c2ffd0b5c3655b29ef4 eric-3.9.4.tar.gz 1875650
-RMD160 a84a05cdfad063d4e4797a156b2d5dde8fed7dd4 eric-3.9.4.tar.gz 1875650
-SHA256 cd4197d65cc476bfb541c600b5da0184d1d34dfd158b1aa0e29422f37ca60e5e eric-3.9.4.tar.gz 1875650
-MD5 d599902a0d8453a5bb7df75ec673b261 eric-i18n-de-3.9.4.tar.gz 239706
-RMD160 c2ce71d7aa5728b154c01ef3e1c86010b5c3716f eric-i18n-de-3.9.4.tar.gz 239706
-SHA256 2732b9ca7a662144506554d8272beb3f67063775ecb8d8bf3167a42f63678113 eric-i18n-de-3.9.4.tar.gz 239706
-MD5 9131738baa4803abdae298efffee4acf eric-i18n-fr-3.9.4.tar.gz 243243
-RMD160 9f738f745667b7412c086a3df599db43eab8fe2b eric-i18n-fr-3.9.4.tar.gz 243243
-SHA256 d3bfae18d00e933d909dab2ebd6cb37f934543f0f276bd2ab01191244cb8207a eric-i18n-fr-3.9.4.tar.gz 243243
-MD5 f0d9780ed37c79aa597f304fab43a4ba eric-i18n-ru-3.9.4.tar.gz 251499
-RMD160 83c37cccb1e8714fe973b5d4b7b2a83f89dacbe4 eric-i18n-ru-3.9.4.tar.gz 251499
-SHA256 62dc67cff3bc572f7292588f45a53d97137b34f2703ac547bea25a33f611d3a5 eric-i18n-ru-3.9.4.tar.gz 251499