fix misc ROOT/Prefix issues

(Portage version: 2.2.01.18125-prefix/cvs/Darwin powerpc)

6 files changed, 31 insertions, 24 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/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 \