Constrained older haddock release ot use ghc-6.12 (bug #454442 by fffaaaaew).

Package-Manager: portage-2.2.0_alpha153_p6/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

3 files changed, 12 insertions, 9 deletions

diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index 5fb4ed433b58..c9e91881cf2e 100644
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-haskell/haddock
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.98 2013/02/10 14:23:03 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.99 2013/02/10 14:26:06 slyfox Exp $
+
+  10 Feb 2013; Sergei Trofimovich <slyfox@gentoo.org> haddock-2.6.1.ebuild:
+  Constrained older haddock release ot use ghc-6.12 (bug #454442 by fffaaaaew).
 
 *haddock-2.13.1-r2 (10 Feb 2013)
 
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index 65efb9531aca..328d3199a9e7 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -14,13 +14,13 @@ DIST haddock-2.13.1.tar.gz 176831 SHA256 6e5e2295cd191e43a046c12544f2f4e8b4260cf
 DIST haddock-2.6.1.tar.gz 128158 SHA256 626bfbc51f33ada003fbbfe1b40f3147039369e9898f8e8d2f5c1c863436ea6a SHA512 afa2c1166448f313b3031718caa25e4507b3b773dfd3af3b029ce58c3d8e0fde44f823206dac1219f61ac84589ac580cade688470abd7f53fac677caab0abff0 WHIRLPOOL e719061a8f66fec8273e59d4a99f105710d3ff2f150dae4086bac4b8fc9f365a597876669ebffbb975b9b00639bbe4645f743961de26f0b102cf4485fb00c555
 EBUILD haddock-2.10.0-r2.ebuild 2618 SHA256 06abb7e8f562b03dd2d96b895abdcd1245d8df1e84184ba43f2ea9302a98add6 SHA512 979f1ac6ec1714176bd1850e047deae4d5686cebf5247ec58b99e458486eead615e201752f7cd9eb5a66d5d821b6a07eeb33eab65f16aa04b16afa88cecf40b4 WHIRLPOOL 40c00e0fcd167466253093cf58673f78ba7d9e3675e9a89ad73ed6d74352485149f9b074bb43a9138476100fdf2741e37ae9ae3ab9be6d9b109ad54d9c0e2ab1
 EBUILD haddock-2.13.1-r2.ebuild 2213 SHA256 96db7ad74c8993114c6a9f303026d2a979d851b8131353982e2ac224cdf46412 SHA512 cf433a5d2b533048bcf050cd3abcc42815710927bdfc183e95ce36aa771eaf57bb13d519d1453601034b123e7c8888d94304f01b6ff3b673bc27a78572e1c0dc WHIRLPOOL 8de8aede5da17bd1c8b270015479d9c7ad2f1b9a3e777f77066ca1333532bd6382e689c2926c00d445c20e7b2aeb7b14a7540523e1dfe81eaec9fd3ce9b7bdc8
-EBUILD haddock-2.6.1.ebuild 2545 SHA256 387f3e7feeb036716e5432d793061f3c4a9a792818dfcec8c14ba31511456922 SHA512 304b2c50bf77bec262a0cbd69b4d1787871b84562bf34cc1a155ec708558d2d13e1a962f0a6cd50f1db85bba9ce18cab98e239722c0377df8b5041642999d3d9 WHIRLPOOL e7006d55b5f5b75d65d4c0efc881aa1ed4fc7ec7a9d3224ddc53c498f283ba0e085cd60c3fcddd62995034e4ed4ec8bbe539c014fd18eb25229390f05e252066
-MISC ChangeLog 14594 SHA256 fec86126f57375a5d4a5455feb948c34d0fb773e9f87ed1a1fea732359bc86c3 SHA512 79ef94f8a1a9a2479d283ce4502858154c7149eb90dbd836f1c798bdab3dca4b47b0005e64511594dc3b3922375c8e2c25af85264d13ddff677c5c46d6cd0b13 WHIRLPOOL bb9d56608a4503796f40bce7d260250c30954cf2ce9e195e1cef4405240a2cfc7172f905fb1f253394d462996712a29d260b44746e5b85f7d16a81f91c03df29
+EBUILD haddock-2.6.1.ebuild 2561 SHA256 4d9246deba96549599b58e2d3c53cc1fe04f859c37d6926299c9085cbadf8ae7 SHA512 e6a3b4afb4211ff8070173d609fc376b1dcf5af1914515c5c3e52b9f2d5e459c8f3e0562cb7d0ccbe289cd2262dc25f1c49064f1a45af487d748b8fe75e4ea2a WHIRLPOOL 65b739aa621905b869260ad60c4f780454f08a8360206872cf470ee71765c8ec4082999c4eeab0fcd0487e801d0adb167233de59e3bd49cb66725b638c766682
+MISC ChangeLog 14751 SHA256 cea8b67d8022bda11d15a99fdfffd83c599501d0a05fef059c96539a2cb94c02 SHA512 9ca9eda96d313e42c77f4c389dcfef82af7058ece00a08ab66616e44d317050cbb9c4825c9e0d05965de941acabe5151cb1c5191e6aa8becf1bac9d09f192b01 WHIRLPOOL c6d6a8418003c4446bc2cf08f8efdae0b24f22a7e4559ded3fbd088abb9e29decb02f999d7b75cdb9d39afa593f9da7f803b565a2635c8b860cf5154c5e45cab
 MISC metadata.xml 223 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 SHA512 24765bbf1cb187cd262aa7fb3824c1cec65e2bf3f2198099de688916d96401a26458265b15408f22b1fbd6d6a2842df814a57ceda80dfa00d130b24423b7544f WHIRLPOOL 8fd6700f6198db6540eb51edf11372faeb6eb8a542a692e515badf236f62444f2c180f7d08e0f98e9fdfa23de14631b31af50543469aaa27084d6b637e2644c7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEXrSsACgkQcaHudmEf86rYbQCeKiKcW1I4o12/Wh0HJziEurkU
-8XkAnjBe4cXe30jVQMSq9xaWmLLajg7I
-=eLrm
+iEYEAREIAAYFAlEXreEACgkQcaHudmEf86rs3QCbBC4THCg6Y5IR+FiMwbuA4iMO
+2nUAoIYwf87obbwHvWmD3WwOW04pupto
+=GEMq
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/haddock/haddock-2.6.1.ebuild b/dev-haskell/haddock/haddock-2.6.1.ebuild
index 00c1dd109e7e..72adfdc0a71c 100644
--- a/dev-haskell/haddock/haddock-2.6.1.ebuild
+++ b/dev-haskell/haddock/haddock-2.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.6.1.ebuild,v 1.15 2012/09/14 07:03:20 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.6.1.ebuild,v 1.16 2013/02/10 14:26:06 slyfox Exp $
 
 CABAL_FEATURES="bin lib"
 # don't enable profiling as the 'ghc' package is not built with profiling
@@ -19,7 +19,7 @@ IUSE="doc"
 # package. ghc-paths would like to be compiled with USE=doc, which pulls in
 # haddock, which requires ghc-paths, which pulls in haddock...
 
-RDEPEND=">=dev-lang/ghc-6.12"
+RDEPEND=">=dev-lang/ghc-6.12 <dev-lang/ghc-7"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.6
 		doc? (  ~app-text/docbook-xml-dtd-4.2