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

Package-Manager: portage-2.1.2.3

diff --git a/dev-lang/ghc-bin/ChangeLog b/dev-lang/ghc-bin/ChangeLog
index a6ca6fca4a32c3614b17c64a838ef1a301cbfe89..c7c7776d89050ed8bdb1a20f71dd0855ab660b40 100644 (file)
--- 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/Manifest b/dev-lang/ghc-bin/Manifest
index b4a7f361f5a09c25641ec500c5ab83ead8d92f01..4f54e8cbcc258c631d544d34b3b6ca2e271fb926 100644 (file)
--- a/dev-lang/ghc-bin/Manifest
+++ b/dev-lang/ghc-bin/Manifest
@@ -34,34 +34,34 @@ DIST ghc-bin-6.6-amd64.tbz2 26093530 RMD160 b44c90a8e3f99a462af0400d0d31c3158336
 DIST ghc-bin-6.6-ppc.tbz2 34668445 RMD160 33f811104146dc8ef4d2839f71d39eb821128515 SHA1 b7ab12fe30ada669b7241bd604280674d94a8284 SHA256 f0bc5583396666da4f03f519cec9fc239e96ae06d5fdb5bd951de8dae1cb1d79
 DIST ghc-bin-6.6-sparc.tbz2 30576579 RMD160 0392fc6529f48f34a009dc9d4cd51da68db072eb SHA1 4d748c4b5b504245f1d9c793f57dc0008466371c SHA256 7588d5adc444cf82dfeaa336b4bd6ccf6dbc4621f929ad664ae6742836229503
 DIST ghc-bin-6.6-x86.tbz2 24960612 RMD160 086a7784e616d0d789be8ceb3b3ba01832d3430b SHA1 4f51e60c73e1f256dc4954a2f3191415361436c5 SHA256 38f58d9fef8ccf2544c4da75c4ce6e04393cf261a2de2e253bcafbdaf4e8ea72
-EBUILD ghc-bin-6.2.2-r1.ebuild 1032 RMD160 461f55af3bb3f3476e728c13dd74218b92e7f3f5 SHA1 9721f298f1789c4725ead3b37a7340d6c5382681 SHA256 c9ab4aff68caa9f4aba1dd53d170d462546fce28edd78435595666ad60e9332b
-MD5 d4c41357e843c4af8ce3e6a4c1596627 ghc-bin-6.2.2-r1.ebuild 1032
-RMD160 461f55af3bb3f3476e728c13dd74218b92e7f3f5 ghc-bin-6.2.2-r1.ebuild 1032
-SHA256 c9ab4aff68caa9f4aba1dd53d170d462546fce28edd78435595666ad60e9332b ghc-bin-6.2.2-r1.ebuild 1032
-EBUILD ghc-bin-6.4.1-r1.ebuild 4799 RMD160 e45443e937a4a5fe89025d4eb8b6f2650386a8bc SHA1 2fd13a788b29ab6a57d030aab452f8a0d7f48239 SHA256 9ebac227cd2e3769135a0d1c44e76b4a37db50ac910008774e51ce66aa788c36
-MD5 536c15fa91b0f70ee6b0121894e9a825 ghc-bin-6.4.1-r1.ebuild 4799
-RMD160 e45443e937a4a5fe89025d4eb8b6f2650386a8bc ghc-bin-6.4.1-r1.ebuild 4799
-SHA256 9ebac227cd2e3769135a0d1c44e76b4a37db50ac910008774e51ce66aa788c36 ghc-bin-6.4.1-r1.ebuild 4799
-EBUILD ghc-bin-6.4.1.ebuild 3273 RMD160 6fc9a181061633b490eb5d5b32465125a2bfaa1b SHA1 6fa400dad4ec3eb1162c789beeb868fdd8b031b3 SHA256 66a00c94edb2bdc5df0c6f425d445b5a647bdc9d0dc953397673cc8b872a8fdf
-MD5 ca36109ccca48e4e9fad822344d96275 ghc-bin-6.4.1.ebuild 3273
-RMD160 6fc9a181061633b490eb5d5b32465125a2bfaa1b ghc-bin-6.4.1.ebuild 3273
-SHA256 66a00c94edb2bdc5df0c6f425d445b5a647bdc9d0dc953397673cc8b872a8fdf ghc-bin-6.4.1.ebuild 3273
-EBUILD ghc-bin-6.4.2-r1.ebuild 4313 RMD160 8a86a9c20d58f22f416bb95039052854209a1e01 SHA1 47a4c8d97f5370df8bb50d5c86af71ec78e4735a SHA256 886140ccb7f7df8b8598b2e9a87232e64c6fe4eef8555d6bb5bde093a3324c4f
-MD5 53f3211b7cc11a1bb79d5b9795cf2723 ghc-bin-6.4.2-r1.ebuild 4313
-RMD160 8a86a9c20d58f22f416bb95039052854209a1e01 ghc-bin-6.4.2-r1.ebuild 4313
-SHA256 886140ccb7f7df8b8598b2e9a87232e64c6fe4eef8555d6bb5bde093a3324c4f ghc-bin-6.4.2-r1.ebuild 4313
-EBUILD ghc-bin-6.4.2.ebuild 4677 RMD160 d5737f21013b75a72c3eed772268bfa30fe2cb66 SHA1 a7069b22805c8ebbc597b5c708691b946fdf7a2f SHA256 59b66cea5bfb07e506c14e37db4f38453548a4502eb7e101650c34382c1e354c
-MD5 f241412591c83d188f71b50b8adc3ea9 ghc-bin-6.4.2.ebuild 4677
-RMD160 d5737f21013b75a72c3eed772268bfa30fe2cb66 ghc-bin-6.4.2.ebuild 4677
-SHA256 59b66cea5bfb07e506c14e37db4f38453548a4502eb7e101650c34382c1e354c ghc-bin-6.4.2.ebuild 4677
-EBUILD ghc-bin-6.6.ebuild 4557 RMD160 d690357ff4dc9e8336588d3b26e684caaab6cfa6 SHA1 c866ae3244f6fb25e81d36e4c88f9c8fe95756b7 SHA256 09bc6135cde827125f527bcbd99d8a246a504d6081c552a047581b9ae60a2d2a
-MD5 63ae716613527ccb95e45cbbf4767cf5 ghc-bin-6.6.ebuild 4557
-RMD160 d690357ff4dc9e8336588d3b26e684caaab6cfa6 ghc-bin-6.6.ebuild 4557
-SHA256 09bc6135cde827125f527bcbd99d8a246a504d6081c552a047581b9ae60a2d2a ghc-bin-6.6.ebuild 4557
-MISC ChangeLog 10316 RMD160 8f84da6bd34d3029c5bd3313b3e0f75a4162a135 SHA1 caf176d67f4bea12d43873604d537d77b0a73347 SHA256 dff10e386d1ea7c9b9f0457544dbcc53442bac803b5633365c7ee54cd6f27cf8
-MD5 39963741db5167cabbc5e18ae52f5dba ChangeLog 10316
-RMD160 8f84da6bd34d3029c5bd3313b3e0f75a4162a135 ChangeLog 10316
-SHA256 dff10e386d1ea7c9b9f0457544dbcc53442bac803b5633365c7ee54cd6f27cf8 ChangeLog 10316
+EBUILD ghc-bin-6.2.2-r1.ebuild 1017 RMD160 c17b9d25cfec229294b08cbac3c9152e2fc2a996 SHA1 fc4223376786572dc1f9e5d6f56a16e579a66831 SHA256 5f79d795b24775cd18db6678b1a351075dc4937a3c0d1dce8b2d2108b18d12d4
+MD5 9770e733c2e4cbcc1210e8b747282997 ghc-bin-6.2.2-r1.ebuild 1017
+RMD160 c17b9d25cfec229294b08cbac3c9152e2fc2a996 ghc-bin-6.2.2-r1.ebuild 1017
+SHA256 5f79d795b24775cd18db6678b1a351075dc4937a3c0d1dce8b2d2108b18d12d4 ghc-bin-6.2.2-r1.ebuild 1017
+EBUILD ghc-bin-6.4.1-r1.ebuild 4780 RMD160 2f3771f57c9dfbd356e73bbb5988e26e6d53d8e0 SHA1 1868221a80ccd95bcfbec8cfa00cf53a7687e29c SHA256 cc7bacd9594675c9ee338db9f8a64deddcdd6a5ccb301952a8bc3679080303ae
+MD5 5fb667fb615a40355a2e9bc523fc1b58 ghc-bin-6.4.1-r1.ebuild 4780
+RMD160 2f3771f57c9dfbd356e73bbb5988e26e6d53d8e0 ghc-bin-6.4.1-r1.ebuild 4780
+SHA256 cc7bacd9594675c9ee338db9f8a64deddcdd6a5ccb301952a8bc3679080303ae ghc-bin-6.4.1-r1.ebuild 4780
+EBUILD ghc-bin-6.4.1.ebuild 3255 RMD160 5ab1235983827a660fa8e2fb2bada9d7e1257bc3 SHA1 097135a880dab0c6fd6534f24f59928f87e61fb2 SHA256 a374f8830c3cfa2f78be5ea27af7fe2e62834258cfd23e331a9385f9d20751d8
+MD5 1da3b090c1f84893e143a767c4628a0a ghc-bin-6.4.1.ebuild 3255
+RMD160 5ab1235983827a660fa8e2fb2bada9d7e1257bc3 ghc-bin-6.4.1.ebuild 3255
+SHA256 a374f8830c3cfa2f78be5ea27af7fe2e62834258cfd23e331a9385f9d20751d8 ghc-bin-6.4.1.ebuild 3255
+EBUILD ghc-bin-6.4.2-r1.ebuild 4295 RMD160 7d07b343998fbda43472bcab3b7a9b411cadf1be SHA1 a8eca292047cb2daec9be4bdfe2ac27c27b950aa SHA256 63017243c5b3f23ac5b8374561a38a636c6d333a90654c6b9efac876145e786d
+MD5 cf00990035640ff0070aa236522bf446 ghc-bin-6.4.2-r1.ebuild 4295
+RMD160 7d07b343998fbda43472bcab3b7a9b411cadf1be ghc-bin-6.4.2-r1.ebuild 4295
+SHA256 63017243c5b3f23ac5b8374561a38a636c6d333a90654c6b9efac876145e786d ghc-bin-6.4.2-r1.ebuild 4295
+EBUILD ghc-bin-6.4.2.ebuild 4660 RMD160 e8afd561c2f5533e0ee2f2b53fc39224f8a528ad SHA1 566f9f657df6a99c8975ca1b0842c948f3fd4552 SHA256 3c118975a33567007d94e9d999b34b5baac7d9041c73dde9c75b365882d0af29
+MD5 1fbbeb7f2412264d39f61c8361836d85 ghc-bin-6.4.2.ebuild 4660
+RMD160 e8afd561c2f5533e0ee2f2b53fc39224f8a528ad ghc-bin-6.4.2.ebuild 4660
+SHA256 3c118975a33567007d94e9d999b34b5baac7d9041c73dde9c75b365882d0af29 ghc-bin-6.4.2.ebuild 4660
+EBUILD ghc-bin-6.6.ebuild 4538 RMD160 8928f716f3fdd1f5e103c7693c84d992dfdd68d5 SHA1 df039813c287b070bd6b9212ddf25648be2afbff SHA256 f5e0820052f9be281ebc72896ffd53ae8ab793876ede19f9a77e116d4804f230
+MD5 6223b1204376df11811da5c92e6945d6 ghc-bin-6.6.ebuild 4538
+RMD160 8928f716f3fdd1f5e103c7693c84d992dfdd68d5 ghc-bin-6.6.ebuild 4538
+SHA256 f5e0820052f9be281ebc72896ffd53ae8ab793876ede19f9a77e116d4804f230 ghc-bin-6.6.ebuild 4538
+MISC ChangeLog 10579 RMD160 1a3bf2ed16187917e3f5813a167bcda3f72dcbd6 SHA1 7b3caf7ab98e62c41473d7492c02944cf09a0b4b SHA256 b5bc66c0eea575688f11dd9e2bc7674523c68c4db24d6f9366b7346082e87ae8
+MD5 f3015e097a44d8d8b4fe09a6b0814044 ChangeLog 10579
+RMD160 1a3bf2ed16187917e3f5813a167bcda3f72dcbd6 ChangeLog 10579
+SHA256 b5bc66c0eea575688f11dd9e2bc7674523c68c4db24d6f9366b7346082e87ae8 ChangeLog 10579
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
@@ -85,9 +85,9 @@ MD5 b540825824e9f4f168b10b123f73bdd7 files/digest-ghc-bin-6.6 1253
 RMD160 1103a477cb5b42d5fab834c5e5cc00ece93e396e files/digest-ghc-bin-6.6 1253
 SHA256 8b439e2c73d60848d846cacff579bf0efd31a8061db646cb4459a5481530499d files/digest-ghc-bin-6.6 1253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFGFVyYvQKeoJXyEaERApUyAJwIF8PlOrVQmdzQT7RZUtC5VQputwCfaMf7
-0TgWSysrhFBsslDYCDOd+pc=
-=HsHc
+iD8DBQFGHnWe1n/CYbXjntIRAvw2AKCxUioa492zOsUpAp0p2nA3gJ39PQCeKBr/
+NSx5rZ6T6PoTAEB5mJ9Nf0g=
+=vKcC
 -----END PGP SIGNATURE-----

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 418107522fa52eeb1d69bc507229f9a5213cf754..5aef599d800362824f7680d5b5fa44f6be91291f 100644 (file)
--- 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 8c6493d47935ac85f4ad1c6c37c36fbaaabf3ab4..a8efe7caa2c0f4217bd6c806dca1049e573b4c59 100644 (file)
--- 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 9c215ff655968d585e4205f79a07c44f2ad904cf..f454fe93503caa4b65773910b9dd1149b9f7e234 100644 (file)
--- 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 f42b06729c3d529884cfbe6d29582ab115516e39..0b105300033e66b2e0c0f95d307f7e45ba2b3bd5 100644 (file)
--- 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 7cf385cc710d17100bde5819960b9d7183744a4f..702ee468d130b8cdb95d993d5ae8a4bd6fd4e8de 100644 (file)
--- 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 6ae6b08db057e6efc859729f8d2a73fd453274b9..3af5fcb986c68afb1ff48584b17e3f05e566cfd1 100644 (file)
--- 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 () {