fix misc ROOT/Prefix issues

Package-Manager: portage-2.2.01.18125-prefix/cvs/Darwin powerpc

7 files changed, 37 insertions, 30 deletions

diff --git a/dev-lang/parrot/ChangeLog b/dev-lang/parrot/ChangeLog
index 6e05cfbd297f..0ed171104b24 100644
--- a/dev-lang/parrot/ChangeLog
+++ b/dev-lang/parrot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/parrot
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/ChangeLog,v 1.40 2011/01/19 12:59:31 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/ChangeLog,v 1.41 2011/03/26 09:33:26 grobian Exp $
+
+  26 Mar 2011; Fabian Groffen <grobian@gentoo.org> parrot-2.6.0.ebuild,
+  parrot-2.7.0.ebuild, parrot-2.9.1.ebuild, parrot-2.11.0.ebuild,
+  parrot-3.0.0.ebuild:
+  make install: don't use ${ROOT} for install locations
+  offset: don't use ED with DESTDIR in make install
+  insinto: don't use ${ROOT} with helpers
 
 *parrot-3.0.0 (19 Jan 2011)
 
diff --git a/dev-lang/parrot/Manifest b/dev-lang/parrot/Manifest
index cb691e8e4d14..2339422666a8 100644
--- a/dev-lang/parrot/Manifest
+++ b/dev-lang/parrot/Manifest
@@ -3,10 +3,10 @@ DIST parrot-2.6.0.tar.bz2 3322447 RMD160 4aae88642ac4b8b147441718a8999329d0643c0
 DIST parrot-2.7.0.tar.bz2 3341745 RMD160 8ce14d0daeae959dc9fb9b626e9ad4c3e264ace3 SHA1 1c58241c25b551eb102126324d4236a1d5637a91 SHA256 46296ad1a60c5933fc229ec64f638f2abb66de23bb9b01b3e7c7b248c2b32df0
 DIST parrot-2.9.1.tar.bz2 3360641 RMD160 f1d9abe6cc002726118c0b746babc48a2d83d2c6 SHA1 19459af92d27c19238ac6e34b6ff29af27251968 SHA256 0617c2fa9e86c0a6cfea3db75f4549bbdc37b7d9d8874ea8eabcb53044beae06
 DIST parrot-3.0.0.tar.bz2 3210017 RMD160 c76d1ce8e43099d0b1e0794b364d7a8c0abbf0ba SHA1 0611296e1c2f239f34601afa5c900ff944157ca8 SHA256 20be15504420ea37b2a1e19343c3905c68af01c3f9700b868a9c42097cbbef80
-EBUILD parrot-2.11.0.ebuild 2334 RMD160 0acf40842282e6f9f5edcdb0447242e75c1fe231 SHA1 e5341cc1a6b926278ad9690ee4cb06aa27a98fe1 SHA256 aa170b076ee085cd70177700bd6ab17f7ce72931a786394afed2518c59dc14d1
-EBUILD parrot-2.6.0.ebuild 2339 RMD160 2f619071f6c6c64f7a5a4970e58eb0412cb368d3 SHA1 a71fc3fb86b92e53c8c4cc3b151b734ee02abf84 SHA256 b2a722baaf0047773136b183270cc2f8917c8da7816a382d8ccad96b741b4a14
-EBUILD parrot-2.7.0.ebuild 2415 RMD160 130f3af3cd6d88fe7258f0531d3c803028d6ab38 SHA1 d223a1d6cdd08f061d72bc2950c923e05a92e14c SHA256 cd437a45d203a532c8e732622dcfe06594ef676cd431579a2b19e237c6b9f72d
-EBUILD parrot-2.9.1.ebuild 2415 RMD160 ebf22b2a3e383e8a0d5c7e9d97c353c4109774cb SHA1 d493befb7d067acf3249d326e130a9115100e9dd SHA256 5a83a037ae611d586a78fc80a2e7ab827e86e8fb4f327a384270b2712668efe9
-EBUILD parrot-3.0.0.ebuild 2415 RMD160 85594cd764c8cd134af5a7be783fdb1df83544bb SHA1 762b0f900c7f9b5f6a55482450195e2be3196a25 SHA256 2c7f2fd499587e9cb3c7436f6c4c3a8ae4f0297affdad86ffb5ad284c1a349ec
-MISC ChangeLog 5890 RMD160 2064943b603fdc2d3399ee3e1abdfab4d7e6048f SHA1 a91e0975204c6fcac2159566e32d8b060167d0cb SHA256 82624ffdf78224286c7c1a7a94edc7f6fd49e2939556aec555aaaca0ca9784fa
+EBUILD parrot-2.11.0.ebuild 2319 RMD160 8149a7b8536656af1eccb7b128248927417e036f SHA1 21826803792edf65456acd6aaf71c651d14abe93 SHA256 344c93cd2ce777a1c0a0997fe62bb536dcae60a192f8e9360ff8fcee7e7c9a76
+EBUILD parrot-2.6.0.ebuild 2322 RMD160 6b84bc089c6a2356b9b4a562056f58149d526cfd SHA1 81fe64e33af68fc178ca96dfc976513057730932 SHA256 6c2dc23bc293dbd5b9b5c47bdbcdfc00f280e304690ac8e16f4aa3b0572aa717
+EBUILD parrot-2.7.0.ebuild 2398 RMD160 382e646394aec5239f8cd59541dbde4e7031028d SHA1 c8ccd6d4f8cf85fee9d423f517f590396794b800 SHA256 377f37e7f5333a0e2e0bea0908bdf53214dd80b2f7562193f8ea20bda0693f3c
+EBUILD parrot-2.9.1.ebuild 2400 RMD160 ffbb42e3011d5c2cfc81e239afc7b6e2aa7b0b58 SHA1 22a2e9e8b56679d2a732dcf6e0093298361f8b08 SHA256 a6a9c576d72bbd9695286b7336ca80ec4fda9cddb11f9dbdf34d3d24a411dd5e
+EBUILD parrot-3.0.0.ebuild 2400 RMD160 ec14cd0225b5abb53458f8c2fb207834dd45014a SHA1 26c49134597517b07d43cb319de82ec1de6cd5c4 SHA256 04db3cbe03a2b2b3d5feae90601fcd5d628954185027dfbc5f24f0ad09e5fdec
+MISC ChangeLog 6202 RMD160 68751fb75ee2fee093afb1ffaa014574ce9bb41e SHA1 24e9cb53f87a3facaf00bf1db71dbf1df208e21c SHA256 0d1fb66ae0a740ded3b2017d054cca773de6a4c0b4bcaff11325a945ca325977
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
diff --git a/dev-lang/parrot/parrot-2.11.0.ebuild b/dev-lang/parrot/parrot-2.11.0.ebuild
index c35fb6edced7..061d6155603c 100644
--- a/dev-lang/parrot/parrot-2.11.0.ebuild
+++ b/dev-lang/parrot/parrot-2.11.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-2.11.0.ebuild,v 1.1 2011/01/16 13:15:52 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-2.11.0.ebuild,v 1.2 2011/03/26 09:33:26 grobian Exp $
 
 EAPI=3
 
@@ -63,14 +63,14 @@ src_test() {
 }
 
 src_install() {
-	emake -j1 install-dev DESTDIR="${ED}" DOC_DIR="${EROOT}/usr/share/doc/${PF}" || die
+	emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die
 	dodoc CREDITS DEPRECATED.pod DONORS.pod NEWS PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die
 	if use examples; then
-		insinto "${EROOT}/usr/share/doc/${PF}/examples"
+		insinto "/usr/share/doc/${PF}/examples"
 		doins -r examples/* || die
 	fi
 	if use doc; then
-		insinto "${EROOT}/usr/share/doc/${PF}/editor"
+		insinto "/usr/share/doc/${PF}/editor"
 		doins -r editor || die
 		cd docs/html
 		dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \
diff --git a/dev-lang/parrot/parrot-2.6.0.ebuild b/dev-lang/parrot/parrot-2.6.0.ebuild
index 2a3007a3fe28..203137a3d2fa 100644
--- a/dev-lang/parrot/parrot-2.6.0.ebuild
+++ b/dev-lang/parrot/parrot-2.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-2.6.0.ebuild,v 1.3 2010/09/16 16:40:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-2.6.0.ebuild,v 1.4 2011/03/26 09:33:26 grobian Exp $
 
 EAPI=3
 
@@ -63,14 +63,14 @@ src_test() {
 }
 
 src_install() {
-	emake -j1 install-dev DESTDIR="${ED}" DOC_DIR="${EROOT}/usr/share/doc/${PF}" || die
+	emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die
 	dodoc CREDITS DEPRECATED.pod DONORS.pod NEWS PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die
 	if use examples; then
-		insinto "${EROOT}/usr/share/doc/${PF}/examples"
+		insinto "/usr/share/doc/${PF}/examples"
 		doins -r examples/* || die
 	fi
 	if use doc; then
-		insinto "${EROOT}/usr/share/doc/${PF}/editor"
+		insinto "/usr/share/doc/${PF}/editor"
 		doins -r editor || die
 		cd docs/html
 		dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \
diff --git a/dev-lang/parrot/parrot-2.7.0.ebuild b/dev-lang/parrot/parrot-2.7.0.ebuild
index 726118307a15..e735c84f25c4 100644
--- a/dev-lang/parrot/parrot-2.7.0.ebuild
+++ b/dev-lang/parrot/parrot-2.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-2.7.0.ebuild,v 1.2 2010/09/16 16:40:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-2.7.0.ebuild,v 1.3 2011/03/26 09:33:26 grobian Exp $
 
 EAPI=3
 
@@ -64,14 +64,14 @@ src_test() {
 }
 
 src_install() {
-	emake -j1 install-dev DESTDIR="${ED}" DOC_DIR="${EROOT}/usr/share/doc/${PF}" || die
+	emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die
 	dodoc CREDITS DEPRECATED.pod DONORS.pod NEWS PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die
 	if use examples; then
-		insinto "${EROOT}/usr/share/doc/${PF}/examples"
+		insinto "/usr/share/doc/${PF}/examples"
 		doins -r examples/* || die
 	fi
 	if use doc; then
-		insinto "${EROOT}/usr/share/doc/${PF}/editor"
+		insinto "/usr/share/doc/${PF}/editor"
 		doins -r editor || die
 		cd docs/html
 		dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \
diff --git a/dev-lang/parrot/parrot-2.9.1.ebuild b/dev-lang/parrot/parrot-2.9.1.ebuild
index 435c961f44b1..f0661e484ea9 100644
--- a/dev-lang/parrot/parrot-2.9.1.ebuild
+++ b/dev-lang/parrot/parrot-2.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-2.9.1.ebuild,v 1.1 2010/11/01 13:38:21 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-2.9.1.ebuild,v 1.2 2011/03/26 09:33:26 grobian Exp $
 
 EAPI=3
 
@@ -64,14 +64,14 @@ src_test() {
 }
 
 src_install() {
-	emake -j1 install-dev DESTDIR="${ED}" DOC_DIR="${EROOT}/usr/share/doc/${PF}" || die
+	emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die
 	dodoc CREDITS DEPRECATED.pod DONORS.pod NEWS PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die
 	if use examples; then
-		insinto "${EROOT}/usr/share/doc/${PF}/examples"
+		insinto "/usr/share/doc/${PF}/examples"
 		doins -r examples/* || die
 	fi
 	if use doc; then
-		insinto "${EROOT}/usr/share/doc/${PF}/editor"
+		insinto "/usr/share/doc/${PF}/editor"
 		doins -r editor || die
 		cd docs/html
 		dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \
diff --git a/dev-lang/parrot/parrot-3.0.0.ebuild b/dev-lang/parrot/parrot-3.0.0.ebuild
index 363f0f7e009b..7872ab8599ed 100644
--- a/dev-lang/parrot/parrot-3.0.0.ebuild
+++ b/dev-lang/parrot/parrot-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-3.0.0.ebuild,v 1.1 2011/01/19 12:59:31 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-3.0.0.ebuild,v 1.2 2011/03/26 09:33:26 grobian Exp $
 
 EAPI=3
 
@@ -64,14 +64,14 @@ src_test() {
 }
 
 src_install() {
-	emake -j1 install-dev DESTDIR="${ED}" DOC_DIR="${EROOT}/usr/share/doc/${PF}" || die
+	emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die
 	dodoc CREDITS DEPRECATED.pod DONORS.pod NEWS PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die
 	if use examples; then
-		insinto "${EROOT}/usr/share/doc/${PF}/examples"
+		insinto "/usr/share/doc/${PF}/examples"
 		doins -r examples/* || die
 	fi
 	if use doc; then
-		insinto "${EROOT}/usr/share/doc/${PF}/editor"
+		insinto "/usr/share/doc/${PF}/editor"
 		doins -r editor || die
 		cd docs/html
 		dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \