Fixed $ROOT abuse (bug #167271)

Package-Manager: portage-2.1.3_rc5

6 files changed, 34 insertions, 110 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/Manifest b/dev-util/eric/Manifest
index 952385b69acd..6f5425b5bc43 100644
--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@@ -1,38 +1,27 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 3.9.5-disable_compilation.patch 3017 RMD160 cd93973f117235af31082b6c1ccce70575ec3d92 SHA1 c1f6ad2d35f8235e59f8c72c68b165ee089981c2 SHA256 2d2d797f28d4c654ba1087cea1aa770584682541e726f83f1a5124817429eca9
 MD5 716fa7bf47b5594d9248d9a019e22864 files/3.9.5-disable_compilation.patch 3017
 RMD160 cd93973f117235af31082b6c1ccce70575ec3d92 files/3.9.5-disable_compilation.patch 3017
 SHA256 2d2d797f28d4c654ba1087cea1aa770584682541e726f83f1a5124817429eca9 files/3.9.5-disable_compilation.patch 3017
 DIST eric-3.7.2.tar.gz 1733560 RMD160 2bbcdcdd74fe88c0d28f935e9c1b46886eb6988d SHA1 f8733c9c02bbf5bcba9b49b57f0edc43cff975b8 SHA256 d6cd4863fb20e4003eec95f20a8949f35e6c6664bdcab655bbee92a8a142aa5b
-DIST eric-3.9.4.tar.gz 1875650 RMD160 a84a05cdfad063d4e4797a156b2d5dde8fed7dd4 SHA1 57c657dd4e3b545732a1c11865bcf0a73680c9c0 SHA256 cd4197d65cc476bfb541c600b5da0184d1d34dfd158b1aa0e29422f37ca60e5e
 DIST eric-3.9.5.tar.gz 1875948 RMD160 702ba0fd40626d8bf3f35f350454112ba7d0c2d8 SHA1 bc67b3093576eb1952d6e7c40e52fd0368c365a7 SHA256 6dd9f001ac399d1fc81a54c6428bed065a07955d9087a11bbfd118f4f93020b5
 DIST eric-i18n-de-3.7.2.tar.gz 209704 RMD160 a588258c1f6fcd3b6c8d72923ad85905b6e31d72 SHA1 0c3cd90034c6c24611deccf91b7e1ed555f1530f SHA256 329c1e782db4104c3a5807bf0c1a200643f4f63ece676b2ef8f1a385dc258364
-DIST eric-i18n-de-3.9.4.tar.gz 239706 RMD160 c2ce71d7aa5728b154c01ef3e1c86010b5c3716f SHA1 01878a568801a7b3665c1aab7fddae00e8cd921e SHA256 2732b9ca7a662144506554d8272beb3f67063775ecb8d8bf3167a42f63678113
 DIST eric-i18n-de-3.9.5.tar.gz 239701 RMD160 083c59ff7dcdbbc1826d0c7141f3e32b71e9b577 SHA1 ac8aba11e9b1875329692c41c43c220bb62d9232 SHA256 087df0258059b2865574e44df48a91079e02817b8e1cecdbfdd12630cddf3cfb
 DIST eric-i18n-fr-3.7.2.tar.gz 212608 RMD160 11961481cd3476a2d87f2d049704c8aad6bf6761 SHA1 2b811725a32370ac280646c78eb5c830f32aee7c SHA256 4d7242eb43689a167755da945dfa4b5a3b6583c8e98e1ec840608a4871a68251
-DIST eric-i18n-fr-3.9.4.tar.gz 243243 RMD160 9f738f745667b7412c086a3df599db43eab8fe2b SHA1 b977a1f66c56d6da3f0aa54ee421dfdb17e0ebb8 SHA256 d3bfae18d00e933d909dab2ebd6cb37f934543f0f276bd2ab01191244cb8207a
 DIST eric-i18n-fr-3.9.5.tar.gz 243243 RMD160 f3339f6161e2d10102590486c1c49d9efe92494a SHA1 2ea11fb5aca45a71dff0d071dc4f01de432706bc SHA256 8e4f2dba0b2dd246ab376f6bfd510b8c8e593286a514cb31ff9cad6144459fcf
 DIST eric-i18n-ru-3.7.2.tar.gz 221137 RMD160 3abdfa2ff76c10311fa42d9f407001969970e4fc SHA1 f71f201ae9417929478df7e893fdb21c49367d29 SHA256 15fb7ce2d5160a33f7173dc6d9ad7bb207e816806f427a4b8509cfa5c6779315
-DIST eric-i18n-ru-3.9.4.tar.gz 251499 RMD160 83c37cccb1e8714fe973b5d4b7b2a83f89dacbe4 SHA1 2c0aec9e18e6a8953394db91535603ffcd7cd42f SHA256 62dc67cff3bc572f7292588f45a53d97137b34f2703ac547bea25a33f611d3a5
 DIST eric-i18n-ru-3.9.5.tar.gz 251500 RMD160 5a3f0923fae810401afba0d7c9288844571ba660 SHA1 871578b4f30b5963f4a6c7bb8c6f438e19a74931 SHA256 5e0dbaad9b193f6d26721a4931e02d4079da73091661a5f008d98b65f9c497a7
-EBUILD eric-3.7.2-r1.ebuild 1956 RMD160 5f3b1b946a16b9296fac9dc9d9f14184bfa91853 SHA1 2f5fd18b89d1ffc8c4e9a492d2e6337208ef40a7 SHA256 6931ae9add6a835c6f21671adc38790b938fca2fdb6437e0d7d1bd0ab8b9b6b9
-MD5 468617becc38106d25f025a37cba7516 eric-3.7.2-r1.ebuild 1956
-RMD160 5f3b1b946a16b9296fac9dc9d9f14184bfa91853 eric-3.7.2-r1.ebuild 1956
-SHA256 6931ae9add6a835c6f21671adc38790b938fca2fdb6437e0d7d1bd0ab8b9b6b9 eric-3.7.2-r1.ebuild 1956
-EBUILD eric-3.9.4.ebuild 1546 RMD160 1b8c047c624eaa56e265cdf753ffdcfa63c51c49 SHA1 8bf28f943c0ee3f59bab78fb472bd71c9743e100 SHA256 a0ce393ca1be93fca9129bc0a5526bf41802068532747499dae997eed4175497
-MD5 116f9949d93e02d86b8c556755b3344d eric-3.9.4.ebuild 1546
-RMD160 1b8c047c624eaa56e265cdf753ffdcfa63c51c49 eric-3.9.4.ebuild 1546
-SHA256 a0ce393ca1be93fca9129bc0a5526bf41802068532747499dae997eed4175497 eric-3.9.4.ebuild 1546
-EBUILD eric-3.9.5.ebuild 2578 RMD160 a3770a35d79a17030b0cb8b949c2ae6eb67f3b1b SHA1 08d6fb10b6e3a1a4ffdcf18968be4900caddf1b8 SHA256 1058ebcae3a9b95003796cd87654a5883681b3df0d03c7320642e49d50e94277
-MD5 31a854ca77fa094f5aac744748a60f6f eric-3.9.5.ebuild 2578
-RMD160 a3770a35d79a17030b0cb8b949c2ae6eb67f3b1b eric-3.9.5.ebuild 2578
-SHA256 1058ebcae3a9b95003796cd87654a5883681b3df0d03c7320642e49d50e94277 eric-3.9.5.ebuild 2578
-MISC ChangeLog 5318 RMD160 a2d3f32b4b31e60056b411dee3a95e24cfac6f36 SHA1 0bddd4e9ac961bcb9aabea41e277a23bf013b94a SHA256 7ccd9a5479f338b33cdee46efc5f5b957eba5cf22f792b6c297e86463a46094b
-MD5 abf94f82840c893be2656cc05bc9d7c1 ChangeLog 5318
-RMD160 a2d3f32b4b31e60056b411dee3a95e24cfac6f36 ChangeLog 5318
-SHA256 7ccd9a5479f338b33cdee46efc5f5b957eba5cf22f792b6c297e86463a46094b ChangeLog 5318
+EBUILD eric-3.7.2-r1.ebuild 1955 RMD160 c1752bc9f77af6ce3b1d1531487511f6993145ad SHA1 a78f5d4b007ee94c0496764373fabc66012667f3 SHA256 f616b4d29600b5db45c9f4dc8e41f7b99d70ca4b0f4cfbca80ebb87b551c18b7
+MD5 4cec23aae4d58ff2b6df50bf4369624a eric-3.7.2-r1.ebuild 1955
+RMD160 c1752bc9f77af6ce3b1d1531487511f6993145ad eric-3.7.2-r1.ebuild 1955
+SHA256 f616b4d29600b5db45c9f4dc8e41f7b99d70ca4b0f4cfbca80ebb87b551c18b7 eric-3.7.2-r1.ebuild 1955
+EBUILD eric-3.9.5.ebuild 2546 RMD160 286fa75e72ea0dddb05dce28406d16769f840461 SHA1 c54d408ea871de166eefdc282753175609a8fd03 SHA256 b51b646197151312d35238e2bc608c0ba7e4a4fb4fb625d43a490bcedfa8f33e
+MD5 c0f343dd94b635de780b09db3a465794 eric-3.9.5.ebuild 2546
+RMD160 286fa75e72ea0dddb05dce28406d16769f840461 eric-3.9.5.ebuild 2546
+SHA256 b51b646197151312d35238e2bc608c0ba7e4a4fb4fb625d43a490bcedfa8f33e eric-3.9.5.ebuild 2546
+MISC ChangeLog 5471 RMD160 ae3275bdbc1d3c3ec37cc6647dcaf4ee103a6f1f SHA1 be8577f82771f4996343ae7a5b137c707e5aa954 SHA256 2c1235367757d312284fcbf46de2c5709391154778a918d67b5710a44e65ae0d
+MD5 d9660e441b2981c14c6acf33a782facf ChangeLog 5471
+RMD160 ae3275bdbc1d3c3ec37cc6647dcaf4ee103a6f1f ChangeLog 5471
+SHA256 2c1235367757d312284fcbf46de2c5709391154778a918d67b5710a44e65ae0d ChangeLog 5471
 MISC metadata.xml 175 RMD160 220bb3f470a506fe50312f4b69c2e5df90b7c282 SHA1 a17b5760bd5ecd4be11ca0a15698fc6d3f3cc76e SHA256 815ada75b169c0b450bdb3429137e6edd42429656bb6369d42e89fd652bdf7c2
 MD5 56ad59727dbcdbf30e7ed8282d3913e5 metadata.xml 175
 RMD160 220bb3f470a506fe50312f4b69c2e5df90b7c282 metadata.xml 175
@@ -40,16 +29,6 @@ SHA256 815ada75b169c0b450bdb3429137e6edd42429656bb6369d42e89fd652bdf7c2 metadata
 MD5 07c0b3d8ac2bf82495101c2022a04778 files/digest-eric-3.7.2-r1 1003
 RMD160 4ffbe6ed1ead3a08655813306fb6f03fc9c778b3 files/digest-eric-3.7.2-r1 1003
 SHA256 a0a1be6e4521ff88c52ddf38c528ce85beb2bed28eb35e6a758ff1761b4bba0d files/digest-eric-3.7.2-r1 1003
-MD5 f06f87aafc877565c06e599884abf00f files/digest-eric-3.9.4 1003
-RMD160 4efdc75ede332a09cbafff8da84e0be70fa1f025 files/digest-eric-3.9.4 1003
-SHA256 974634bba00a8aa9f4a257e95f38f796419a48bb49f6a0acfa46dc92fea4226c files/digest-eric-3.9.4 1003
 MD5 0d1758f4c30fdf274569ebbd2a514557 files/digest-eric-3.9.5 1003
 RMD160 d98ce371bfcc3e13dbfdf6b694ae3c64e708477d files/digest-eric-3.9.5 1003
 SHA256 efdc6d9d5bc02435ff0b3051dda2b6345a85e82e9e6a41e40e8504fabc71da0b files/digest-eric-3.9.5 1003
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGfYuu2jLqHNfbg2URAssHAKDPg7eT65/OjO7XJ2fd7nQWFZV9agCgo9u1
-i4+Pv2YeRbkDG1/o/A+K1fg=
-=IuYQ
------END PGP SIGNATURE-----
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