added another ghc-6.4 block, and haddock-0.6-r3 now inherits ghc-package.eclass, hopefully fixing bug #86214

Package-Manager: portage-2.0.51.19

5 files changed, 39 insertions, 10 deletions

diff --git a/dev-haskell/alex/Manifest b/dev-haskell/alex/Manifest
index 0676468acaf2..69cfe1bc32cf 100644
--- a/dev-haskell/alex/Manifest
+++ b/dev-haskell/alex/Manifest
@@ -1,4 +1,16 @@
-MD5 cedee965652f741e3e98328bb42b092e ChangeLog 996
-MD5 9583507bc7b241f82ab2f80676e22523 alex-2.0.ebuild 2165
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 becc0aeac0301718ffdd85aefaf4d647 alex-2.0.ebuild 2185
+MD5 b2e1cda171e0b3839fcc0887b6d42a8b alex-2.0.1.ebuild 1784
+MD5 637e3cb68bc9e6e808f5e3280b2e48a1 ChangeLog 1199
 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
 MD5 382124e3a01f9c689abce012ade88a67 files/digest-alex-2.0 65
+MD5 630f9dad69d0e845886e2401d2db1c06 files/digest-alex-2.0.1 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCQXl2OKSBj1ObwosRAlkTAJ9zzCO2USHykGcImwtI/c9M3xZdAACgnAyK
+f7T0/IMBYjsaGMw3PBxx8mM=
+=XNlH
+-----END PGP SIGNATURE-----
diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index 609107b34f73..b1e21926b701 100644
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/haddock
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.19 2005/02/23 19:32:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.20 2005/03/23 14:03:58 kosmikus Exp $
+
+  23 Mar 2005; Andres Loeh <kosmikus@gentoo.org> haddock-0.6-r2.ebuild,
+  haddock-0.6-r3.ebuild:
+  haddock is currently blocked by ghc-6.4, and haddock-0.6-r3 now inherits
+  ghc-package.eclass, hopefully fixing bug #86214.
 
   23 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> haddock-0.6-r2.ebuild,
   haddock-0.6-r3.ebuild:
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index 847dc14aaace..dee05c583cb3 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -1,7 +1,17 @@
-MD5 2746e20d6625bebd1480e3a4b11a3c42 ChangeLog 3093
-MD5 18cb718753703d22bfba1e814f683948 haddock-0.6-r3.ebuild 2240
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 128b9a894439f7226495b06aa0ea7b3c haddock-0.6-r2.ebuild 1981
+MD5 ab4ffb3f071cdfebb0878a7eb65bb810 haddock-0.6-r3.ebuild 2271
+MD5 1334c64c4c586cb3a857c729283e029e ChangeLog 3316
 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
-MD5 dd553876d6071966757f62a7a67d9a33 haddock-0.6-r2.ebuild 1962
+MD5 6c35081e22594c96591797459c28da01 files/digest-haddock-0.6-r2 67
 MD5 6c35081e22594c96591797459c28da01 files/digest-haddock-0.6-r3 67
 MD5 bd211a7c5442dadeee6975dbb15f2e45 files/haddock-0.6-gcc3.4.patch 1967
-MD5 6c35081e22594c96591797459c28da01 files/digest-haddock-0.6-r2 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCQXh5OKSBj1ObwosRAvNvAJ4pqfzAoE+dS9C1xgQ7GceUOnkbsgCfcRL3
+GatqCM3g1VGzYI6wC8Kx/P4=
+=w933
+-----END PGP SIGNATURE-----
diff --git a/dev-haskell/haddock/haddock-0.6-r2.ebuild b/dev-haskell/haddock/haddock-0.6-r2.ebuild
index 72b727a64eba..a3090bd419d5 100644
--- a/dev-haskell/haddock/haddock-0.6-r2.ebuild
+++ b/dev-haskell/haddock/haddock-0.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.6-r2.ebuild,v 1.11 2005/02/23 19:32:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.6-r2.ebuild,v 1.12 2005/03/23 14:03:58 kosmikus Exp $
 #
 # USE variable summary:
 #   doc    - Build extra documenation from DocBook sources,
@@ -20,6 +20,7 @@ KEYWORDS="x86 ppc"
 LICENSE="as-is"
 
 DEPEND="virtual/ghc
+	!>=virtual/ghc-6.4
 	doc? ( >=app-text/openjade-1.3.1
 		>=app-text/sgml-common-0.6.3
 		~app-text/docbook-sgml-dtd-3.1
diff --git a/dev-haskell/haddock/haddock-0.6-r3.ebuild b/dev-haskell/haddock/haddock-0.6-r3.ebuild
index 754293645b33..2c70754d80c5 100644
--- a/dev-haskell/haddock/haddock-0.6-r3.ebuild
+++ b/dev-haskell/haddock/haddock-0.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.6-r3.ebuild,v 1.4 2005/02/23 19:32:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.6-r3.ebuild,v 1.5 2005/03/23 14:03:58 kosmikus Exp $
 #
 # USE variable summary:
 #   doc    - Build extra documenation from DocBook sources,
@@ -8,7 +8,7 @@
 #   tetex  - Build the above docs as PostScript as well.
 
 
-inherit base eutils
+inherit base eutils ghc-package
 IUSE="doc tetex"
 
 DESCRIPTION="A documentation tool for Haskell"
@@ -20,6 +20,7 @@ KEYWORDS="x86 ~ppc ~amd64"
 LICENSE="as-is"
 
 DEPEND="virtual/ghc
+	!>=virtual/ghc-6.4
 	doc? ( >=app-text/openjade-1.3.1
 		>=app-text/sgml-common-0.6.3
 		~app-text/docbook-sgml-dtd-3.1