Fix for dev-lang/ghc-bin in bug #173884. Patch by Andres Loeh <kosmikus@gentoo.org>.

(Portage version: 2.1.2.3)

7 files changed, 24 insertions, 24 deletions

diff --git a/dev-lang/ghc-bin/ChangeLog b/dev-lang/ghc-bin/ChangeLog
index a6ca6fca4a32..c7c7776d8905 100644
--- a/dev-lang/ghc-bin/ChangeLog
+++ b/dev-lang/ghc-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ghc-bin
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ChangeLog,v 1.67 2007/04/05 20:28:38 cparrott Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ChangeLog,v 1.68 2007/04/12 18:07:11 kolmodin Exp $
+
+  12 Apr 2007; Lennart Kolmodin <kolmodin@gentoo.org> ghc-bin-6.2.2-r1.ebuild,
+  ghc-bin-6.4.1.ebuild, ghc-bin-6.4.1-r1.ebuild, ghc-bin-6.4.2.ebuild,
+  ghc-bin-6.4.2-r1.ebuild, ghc-bin-6.6.ebuild:
+  Fixes bug #173884, patch by Andres Loeh <kosmikus@gentoo.org>.
 
   05 Apr 2007; Chris Parrott <cparrott@gentoo.org> ghc-bin-6.6.ebuild:
   added ~sparc and ~ppc keywords for new builds
diff --git a/dev-lang/ghc-bin/ghc-bin-6.2.2-r1.ebuild b/dev-lang/ghc-bin/ghc-bin-6.2.2-r1.ebuild
index 418107522fa5..5aef599d8003 100644
--- a/dev-lang/ghc-bin/ghc-bin-6.2.2-r1.ebuild
+++ b/dev-lang/ghc-bin/ghc-bin-6.2.2-r1.ebuild
@@ -1,6 +1,6 @@
-# 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-lang/ghc-bin/ghc-bin-6.2.2-r1.ebuild,v 1.6 2006/02/09 21:36:32 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ghc-bin-6.2.2-r1.ebuild,v 1.7 2007/04/12 18:07:11 kolmodin Exp $
 
 IUSE="" # use the non-binary version if you want to have more choice
 
@@ -37,6 +37,6 @@ src_compile() {
 
 src_install () {
 	mv * ${D}
-	insinto /etc/env.d
-	doins ${FILESDIR}/10ghc
+
+	doenvd "${FILESDIR}/10ghc"
 }
diff --git a/dev-lang/ghc-bin/ghc-bin-6.4.1-r1.ebuild b/dev-lang/ghc-bin/ghc-bin-6.4.1-r1.ebuild
index 8c6493d47935..a8efe7caa2c0 100644
--- a/dev-lang/ghc-bin/ghc-bin-6.4.1-r1.ebuild
+++ b/dev-lang/ghc-bin/ghc-bin-6.4.1-r1.ebuild
@@ -1,6 +1,6 @@
-# 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-lang/ghc-bin/ghc-bin-6.4.1-r1.ebuild,v 1.3 2006/05/19 16:17:50 cparrott Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ghc-bin-6.4.1-r1.ebuild,v 1.4 2007/04/12 18:07:11 kolmodin Exp $
 
 # Note to users of hardened gcc-3.x:
 #
@@ -139,8 +139,7 @@ src_install () {
 	mkdir "${D}/opt"
 	mv "${S}/usr" "${D}/opt/ghc"
 
-	insinto /etc/env.d
-	doins "${FILESDIR}/10ghc"
+	doenvd "${FILESDIR}/10ghc"
 }
 
 pkg_postinst () {
diff --git a/dev-lang/ghc-bin/ghc-bin-6.4.1.ebuild b/dev-lang/ghc-bin/ghc-bin-6.4.1.ebuild
index 9c215ff65596..f454fe93503c 100644
--- a/dev-lang/ghc-bin/ghc-bin-6.4.1.ebuild
+++ b/dev-lang/ghc-bin/ghc-bin-6.4.1.ebuild
@@ -1,6 +1,6 @@
-# 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-lang/ghc-bin/ghc-bin-6.4.1.ebuild,v 1.14 2006/05/21 17:18:51 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ghc-bin-6.4.1.ebuild,v 1.15 2007/04/12 18:07:11 kolmodin Exp $
 
 inherit base multilib ghc-package
 
@@ -90,8 +90,7 @@ src_install () {
 	into /opt/ghc
 	dosbin ${FILESDIR}/ghc-updater
 
-	insinto /etc/env.d
-	doins "${FILESDIR}/10ghc"
+	doenvd "${FILESDIR}/10ghc"
 }
 
 pkg_postinst () {
diff --git a/dev-lang/ghc-bin/ghc-bin-6.4.2-r1.ebuild b/dev-lang/ghc-bin/ghc-bin-6.4.2-r1.ebuild
index f42b06729c3d..0b105300033e 100644
--- a/dev-lang/ghc-bin/ghc-bin-6.4.2-r1.ebuild
+++ b/dev-lang/ghc-bin/ghc-bin-6.4.2-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-lang/ghc-bin/ghc-bin-6.4.2-r1.ebuild,v 1.1 2007/03/29 14:53:37 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ghc-bin-6.4.2-r1.ebuild,v 1.2 2007/04/12 18:07:11 kolmodin Exp $
 
 # Note to users of hardened gcc-3.x:
 #
@@ -129,8 +129,7 @@ src_install () {
 	mkdir "${D}/opt"
 	mv "${S}/usr" "${D}/opt/ghc"
 
-	insinto /etc/env.d
-	doins "${FILESDIR}/10ghc"
+	doenvd "${FILESDIR}/10ghc"
 }
 
 pkg_postinst () {
diff --git a/dev-lang/ghc-bin/ghc-bin-6.4.2.ebuild b/dev-lang/ghc-bin/ghc-bin-6.4.2.ebuild
index 7cf385cc710d..702ee468d130 100644
--- a/dev-lang/ghc-bin/ghc-bin-6.4.2.ebuild
+++ b/dev-lang/ghc-bin/ghc-bin-6.4.2.ebuild
@@ -1,6 +1,6 @@
-# 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-lang/ghc-bin/ghc-bin-6.4.2.ebuild,v 1.13 2006/08/28 16:46:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ghc-bin-6.4.2.ebuild,v 1.14 2007/04/12 18:07:11 kolmodin Exp $
 
 # Note to users of hardened gcc-3.x:
 #
@@ -20,7 +20,7 @@ DESCRIPTION="Glasgow Haskell Compiler"
 HOMEPAGE="http://www.haskell.org/ghc/"
 # list all arches for proper digest building:
 SRC_URI="alpha?		( mirror://gentoo/${P}-alpha.tbz2 )
-	     amd64?		( mirror://gentoo/${P}-amd64.tbz2 )
+		 amd64?		( mirror://gentoo/${P}-amd64.tbz2 )
 		 hppa?		( mirror://gentoo/${P}-hppa.tbz2 )
 		 ppc?		( mirror://gentoo/${P}-ppc.tbz2 )
 		 ppc64?		( mirror://gentoo/${P}-ppc64.tbz2 )
@@ -136,8 +136,7 @@ src_install () {
 	mkdir "${D}/opt"
 	mv "${S}/usr" "${D}/opt/ghc"
 
-	insinto /etc/env.d
-	doins "${FILESDIR}/10ghc"
+	doenvd "${FILESDIR}/10ghc"
 }
 
 pkg_postinst () {
diff --git a/dev-lang/ghc-bin/ghc-bin-6.6.ebuild b/dev-lang/ghc-bin/ghc-bin-6.6.ebuild
index 6ae6b08db057..3af5fcb986c6 100644
--- a/dev-lang/ghc-bin/ghc-bin-6.6.ebuild
+++ b/dev-lang/ghc-bin/ghc-bin-6.6.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-lang/ghc-bin/ghc-bin-6.6.ebuild,v 1.3 2007/04/05 20:28:38 cparrott Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ghc-bin-6.6.ebuild,v 1.4 2007/04/12 18:07:11 kolmodin Exp $
 
 # Note to users of hardened gcc-3.x:
 #
@@ -135,8 +135,7 @@ src_install () {
 	mkdir "${D}/opt"
 	mv "${S}/usr" "${D}/opt/ghc"
 
-	insinto /etc/env.d
-	doins "${FILESDIR}/10ghc"
+	doenvd "${FILESDIR}/10ghc"
 }
 
 pkg_postinst () {