Change deps in older dev-haskell/haddock ebuilds to reflect their incompability with recent dev-lang/ghc versions.

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

4 files changed, 24 insertions, 10 deletions

diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index 06399c2a84fe..687151fd123f 100644
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/haddock
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.57 2009/04/19 15:20:37 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.58 2009/04/26 16:05:27 kolmodin Exp $
+
+  26 Apr 2009; Lennart Kolmodin <kolmodin@gentoo.org> haddock-0.8.ebuild,
+  haddock-0.9.ebuild:
+  Change deps so older haddock won't be used with ghc-6.10.
 
 *haddock-2.4.2 (19 Apr 2009)
 
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index f7cc87f17526..96a97ea389ff 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST haddock-0.8-src.tar.gz 162872 RMD160 80b7a582ea91fb36b97675d7ea8a027221a28b8e SHA1 e171d4446ac6fcef526cad4c688892fe587fe90e SHA256 d54078dd9dc75aa589cb05fbe1136c1fb41d4a346e30b71de948425ea7c05a55
 DIST haddock-0.9.tar.gz 163380 RMD160 27685313184e70270d7e4f043c7d671b84acfb23 SHA1 f3c5299b657b170e7a44b66ebd60d3e0947a35aa SHA256 beefd4a6da577978e7a79cabba60970accc5cd48fbb04c424a6b36ace3a9f8d0
 DIST haddock-2.4.2.tar.gz 103033 RMD160 18317b3ffd60f2b0925d635ce1ea2ab35825860c SHA1 cd1de409029bcabdf79b05b4c00c7702c836c765 SHA256 dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547
-EBUILD haddock-0.8.ebuild 1690 RMD160 8ca681879d0fb8e81c850c257dd8c2e82989485a SHA1 a7666c8d2c7f014af91c843fcdf4727f9fb892e1 SHA256 319938399688d0bcc6a4f80cb47da310132ebbfa026a5b22eb3e76c9cd894b7e
-EBUILD haddock-0.9.ebuild 1159 RMD160 7f85bedc85b9ba787227cb2da5d7cb090971a451 SHA1 0a6b800576a2999712b839ce268d0e5d660297af SHA256 7263d689bf8d2961c0b63dc1f52e0a8395f21b0b898ce4fa075d2ad148103363
+EBUILD haddock-0.8.ebuild 1691 RMD160 2275082d63a82cdf2e50b3b35ad3f4b8cc93adee SHA1 3feb6d51b114e201d48f185af86532ce859725fd SHA256 c311f887dff9e748689f969524d8e923735d1026282e95fbe5fe20c8dae2522e
+EBUILD haddock-0.9.ebuild 1160 RMD160 afbaecefe7e2e5259cb932b1057a254d6ac07ae1 SHA1 18d8b08c71a9de4be90cef743905a783221a37c7 SHA256 3a36527c9f8f772eeb65757e4574c344af79025599edf68cadde0eed6ec4203e
 EBUILD haddock-2.4.2.ebuild 1252 RMD160 142dd034d1a7f2ab587e5c57ee78936ac0ee2680 SHA1 c6724bb63ca7b9f852e5b552b96bb90b4cff36d1 SHA256 62068dc37d138c0a9ce6e487f22082549c63ab2d07d84d6145238032fe34ef0e
-MISC ChangeLog 7519 RMD160 6b23fb50465ab820ea4b94d303c10c2d6fb77a1d SHA1 70992aabcc6c8cff14b895472db48a61f4a83067 SHA256 087b637dda25ab4a442032bfdef45d8140cfd6c7c9b3f4fd75975b1b78bdc842
+MISC ChangeLog 7676 RMD160 98055f74874bacfced5cd70ea9ecf8447233a612 SHA1 cc22b4c483f3b0843db9598d3505e139bb4327fe SHA256 a96a3c16893aede000e48a0a43def1e3c95ec73d363602fd61e386a9f0130614
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkn0hlAACgkQ1n/CYbXjntIgmQCeILeo25XMfvS6tz6h+ZBgE3E9
+NesAni3yGUoj1LVB7S2n+d60BvOX1DGb
+=TjPd
+-----END PGP SIGNATURE-----
diff --git a/dev-haskell/haddock/haddock-0.8.ebuild b/dev-haskell/haddock/haddock-0.8.ebuild
index 1d58517bffb1..c8d9a12e3ec2 100644
--- a/dev-haskell/haddock/haddock-0.8.ebuild
+++ b/dev-haskell/haddock/haddock-0.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.8.ebuild,v 1.15 2008/10/04 10:12:48 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.8.ebuild,v 1.16 2009/04/26 16:05:27 kolmodin Exp $
 
 CABAL_FEATURES="bin"
 inherit haskell-cabal eutils versionator autotools
@@ -17,7 +17,7 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 
 IUSE="doc"
 
-DEPEND=">=dev-lang/ghc-6.4
+DEPEND="<dev-lang/ghc-6.10
 		>=dev-haskell/cabal-1.1.4
 	doc? (  ~app-text/docbook-xml-dtd-4.2
 			app-text/docbook-xsl-stylesheets
diff --git a/dev-haskell/haddock/haddock-0.9.ebuild b/dev-haskell/haddock/haddock-0.9.ebuild
index bf1f00e6fe40..96ff3c6d06d3 100644
--- a/dev-haskell/haddock/haddock-0.9.ebuild
+++ b/dev-haskell/haddock/haddock-0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.9.ebuild,v 1.1 2008/01/26 20:11:10 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.9.ebuild,v 1.2 2009/04/26 16:05:27 kolmodin Exp $
 
 CABAL_FEATURES="bin"
 inherit haskell-cabal eutils autotools
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
-DEPEND=">=dev-lang/ghc-6.4
+DEPEND="<dev-lang/ghc-6.10
 		>=dev-haskell/cabal-1.2
 	doc? (  ~app-text/docbook-xml-dtd-4.2
 			app-text/docbook-xsl-stylesheets