Unmask latest haddock for ghc-7.6. Constraint older haddock to old ghc (bug #456410 by Tobias Klausmann).

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

5 files changed, 85 insertions, 18 deletions

diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index 3dccc95ee5c4..5fb4ed433b58 100644
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,14 @@
 # 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.97 2013/01/01 18:52:56 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.98 2013/02/10 14:23:03 slyfox Exp $
+
+*haddock-2.13.1-r2 (10 Feb 2013)
+
+  10 Feb 2013; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/haddock-2.13.1-renameType.patch, +haddock-2.13.1-r2.ebuild,
+  -haddock-2.13.1.ebuild, haddock-2.10.0-r2.ebuild:
+  Unmask latest haddock for ghc-7.6. Constraint older haddock to old ghc (bug
+  #456410 by Tobias Klausmann).
 
   01 Jan 2013; Sergei Trofimovich <slyfox@gentoo.org> -haddock-2.10.0.ebuild,
   -haddock-2.9.2.ebuild:
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index d8b5191fb2e2..65efb9531aca 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -6,20 +6,21 @@ AUX haddock-2.10.0-dont-crash-on-unicode-strings-in-doc-comments.patch 942 SHA25
 AUX haddock-2.10.0-drop-tools.patch 744 SHA256 905de70488ee2ce800b541fe97b7f906b5a7d239f275aaf914a1b39483718b10 SHA512 9e4f3216f4bd5c0b5b84c16967cc0c1f132b6c92ceeb087914f076aebb97d466e671aa28281f2a4750ad9d479b0edd6ae5f1505fbef4c18bc14ecc2234d6dc71 WHIRLPOOL 7e4441793388a1ccbf52634587586d049348f029495db18691056b3745f848148ffad871a9192a127809b6bddb39e5ba035375c1a39db7e32fb2d2aa30f8863f
 AUX haddock-2.10.0-ticket-202.patch 1097 SHA256 16b53d90ba70e8e31e6d76396aaa0cd3bd6e024e0d38210976a69601f54b94c5 SHA512 4a47182f61ac3f590c8b4b255d704f20b6755fca4a716ff1ad5562000d7ca0e811b261134d67ff3a8f22a2dacaeb9ab866dfd9dc0c2f1ec0cca1515c70348f11 WHIRLPOOL 4ecaa44ee3c8a04bc70546360e0f124c61fc3ffde4425c52f35eb8222c767e2d0ae1b5389c3ba5881081910e7826b381e72ea5866ae2b5d90ff64dcaa744da3c
 AUX haddock-2.13.1-drop-tools.patch 438 SHA256 1e7793379ff7f2b3aedc22ee133af38cc43dacf55a5efcd795fb7da3a4d0e42b SHA512 20ddff14af8e977728dfde6b6e3f5922e3805b4b216bf0aff25ceffcc06ba6b7de5049b0ee957e0ef223888c814e46555d5f059a3023805e249fadfad541bdc7 WHIRLPOOL f75ba9209968f1e71ac03da056bd9e1a00cf4c529c899431e9b872c18fbfdcbbaf6b612940cac682f320afd375a3e877ba3e871e99482749e4a7bdc1c91e775e
+AUX haddock-2.13.1-renameType.patch 2326 SHA256 d685e45f7f36d0a7a54d6c347e89a8b068edb13552bd8211538914536332111d SHA512 424a08a34ebc34ce2c771beaa3fca0c0d963dd3ad876d04e6adab0a70ae522f28d5b112412a15b1fa84b28b53225c03a978e84f7aadc5bcd472ac519f2fbe433 WHIRLPOOL ebad5069cdd6a20c65457d34e745bbaa10f79fc5532792bee109aad132100aa91162834ccee528b23b4944dcc87f3661f5e13e658a937bf00aa3c63cb77a15c2
 AUX haddock-2.6.1-cabal-1.8.patch 292 SHA256 a7bb8cf4c4b41e9be8efc0ad870cb29932ab7cfef6a1011d2c72d4f342b87fd8 SHA512 cddd28187aac863244b6d651e6dfdcdade61cf45473c98ee50f8f9c1f667fa2a4bd0d22056fab62f0fa512296477529b61f6eadd194b55729c6e1c3b215f7bcc WHIRLPOOL 7918a3eaf0055532abf1aff8e3c0812d0522b69106995657e168f9807224fde82630d23168d0563831fa8f457e1ba34e07a5af2a4bab8c3662becb9e6c0f6211
 AUX haddock-2.9.2-cabal-1.10.patch 305 SHA256 31eaf2bbaf838ca8e8b98bc52c26282bb689fbbecab4d8064338aafc1b500f55 SHA512 d620d386d5e417a46b4dc370723a89f26234bc2319ef51f661ac83ed57b72fe921b1deec65a3c723bff788ac7d64712c0272ed3b2d76291f05295061f285923a WHIRLPOOL ab33f13cc4e579c967458b43051e45bbeab948526f3f803076fe7b188224f9ac74b680a9d3d9adbd68547d7558664a1f2926b81d5c9d3f49b32d501e303e683f
 DIST haddock-2.10.0.tar.gz 159750 SHA256 d107dba15e8aee5abcb540b818b5dcb8ced98bae7d0714f50192dba26cadb410 SHA512 0680ffafce7a2e6a24ae85869694ea5c590305007da07cdffd6adb8a837164452cdf2de159c9fdcba059f76fc01f30771237dbcd71dd44d04afc0d2317e28563 WHIRLPOOL b584452acbe6e1c3474c97a62b17621e1ce0ef31574845499ca8b6ebdcf54559fed2b37d1890b80b1d526cc9b45d52b51a9acf6ae0d9472e15f93c1a7ff7ef3f
 DIST haddock-2.13.1.tar.gz 176831 SHA256 6e5e2295cd191e43a046c12544f2f4e8b4260cfda8282d48b15a7a35d8a24e7f SHA512 2cff54f4a3676c605327a6ad926df51976e7ec2bd512e464d0bf84d24f29fa3078dd5f8006329a4a6913607717c2c45f1db2b63d9e9f655d64cbbe92e0fe35fc WHIRLPOOL d1d9202767f4d5ee68ed100f3b95c9be6bff5024b3155b3dbaf3d1d690ac9dc0be2841ef1ea960c095a30005dc2bbb16046dbc4827c6047ee50ad6b1671ae38f
 DIST haddock-2.6.1.tar.gz 128158 SHA256 626bfbc51f33ada003fbbfe1b40f3147039369e9898f8e8d2f5c1c863436ea6a SHA512 afa2c1166448f313b3031718caa25e4507b3b773dfd3af3b029ce58c3d8e0fde44f823206dac1219f61ac84589ac580cade688470abd7f53fac677caab0abff0 WHIRLPOOL e719061a8f66fec8273e59d4a99f105710d3ff2f150dae4086bac4b8fc9f365a597876669ebffbb975b9b00639bbe4645f743961de26f0b102cf4485fb00c555
-EBUILD haddock-2.10.0-r2.ebuild 2600 SHA256 53ab7de407395e9eb334ed974f55b2c52d0ec1a5ad0de27bfef4031b875948df SHA512 3ce19fd2930f9bb121842366ac777a878a033f00d48f7e2b868b50aa5c353a4e958ad26547b9d79885dd3f1804851aa1e2058bcc790e9cdb049ecdefb17c2333 WHIRLPOOL 539d8b269000b27957c82ad0b5a1790c760e9d668afe92e1d9532cb40c14bfdd8ff900eb9a06267de4d18914c2ad74cbc0bf2891df6601578296ec823d720408
-EBUILD haddock-2.13.1.ebuild 2060 SHA256 f361aed253c5ac3266d9883866b36a774d3b73032371d506065a8fe39bcdaf8b SHA512 2f5ac474800899f8434cb78bfc37020d0790aafdd12d3901754e703b60f74eaf627ad4ffe51181653336c6a79fd9706b573c61fb750bfdb90be054abe7739a9f WHIRLPOOL 5afb367571d847ee814bd82f9aeb853f01cefa566081a801ce1350326d6cd0769fbfa762e92f7cc981e41cf749e4f82c2a67aa9cca7eb5856dd32f082e5e60bf
+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 14274 SHA256 73b3538a5fa5f4ac5f6346646b4b40fec673f3dc882d79054cfe5d70477b6346 SHA512 e01f55019be37595bd6003344ad394a9649c86e4eebdf2423f016eba5a2bce30e7da4ac516041b6f9f07c054fe5a0130642e722bdb7bb5ebccbc4a7a4828dcf0 WHIRLPOOL 75f1cce34b1d2d633533624787cc9a299c16f8e27d98eb298064ef9721a265a84fe86ffd89fe4957aa7dc8228045ae848fc9afee843316789cdb63ee7052231d
+MISC ChangeLog 14594 SHA256 fec86126f57375a5d4a5455feb948c34d0fb773e9f87ed1a1fea732359bc86c3 SHA512 79ef94f8a1a9a2479d283ce4502858154c7149eb90dbd836f1c798bdab3dca4b47b0005e64511594dc3b3922375c8e2c25af85264d13ddff677c5c46d6cd0b13 WHIRLPOOL bb9d56608a4503796f40bce7d260250c30954cf2ce9e195e1cef4405240a2cfc7172f905fb1f253394d462996712a29d260b44746e5b85f7d16a81f91c03df29
 MISC metadata.xml 223 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 SHA512 24765bbf1cb187cd262aa7fb3824c1cec65e2bf3f2198099de688916d96401a26458265b15408f22b1fbd6d6a2842df814a57ceda80dfa00d130b24423b7544f WHIRLPOOL 8fd6700f6198db6540eb51edf11372faeb6eb8a542a692e515badf236f62444f2c180f7d08e0f98e9fdfa23de14631b31af50543469aaa27084d6b637e2644c7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDjMHQACgkQcaHudmEf86ox0gCeK1qSsGNltbHk+ZWukH1iyaZm
-h+sAn30tZZOXDOdAU/iXrEMl/LB2H9cF
-=DK8E
+iEYEAREIAAYFAlEXrSsACgkQcaHudmEf86rYbQCeKiKcW1I4o12/Wh0HJziEurkU
+8XkAnjBe4cXe30jVQMSq9xaWmLLajg7I
+=eLrm
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/haddock/files/haddock-2.13.1-renameType.patch b/dev-haskell/haddock/files/haddock-2.13.1-renameType.patch
new file mode 100644
index 000000000000..1a4abab0cbe9
--- /dev/null
+++ b/dev-haskell/haddock/files/haddock-2.13.1-renameType.patch
@@ -0,0 +1,56 @@
+--- haddock-2.13.1-orig/src/Haddock/Interface/Rename.hs	2012-10-11 21:56:13.000000000 +1100
++++ haddock-2.13.1/src/Haddock/Interface/Rename.hs	2013-01-04 10:55:06.725718923 +1100
+@@ -271,9 +271,20 @@
+ 
+   HsTyLit x -> return (HsTyLit x)
+ 
++  HsWrapTy a b            -> HsWrapTy a <$> renameType b
++  HsRecTy a               -> HsRecTy <$> mapM renameConDeclFieldField a
++  HsCoreTy a              -> pure (HsCoreTy a)
++  HsExplicitListTy  a b   -> HsExplicitListTy  a <$> mapM renameLType b
++  HsExplicitTupleTy a b   -> HsExplicitTupleTy a <$> mapM renameLType b
++  HsQuasiQuoteTy a        -> HsQuasiQuoteTy <$> renameHsQuasiQuote a
++  HsSpliceTy _ _ _        -> error "renameType: HsSpliceTy"
++
+   _ -> error "renameType"
+ 
+ 
++renameHsQuasiQuote :: HsQuasiQuote Name -> RnM (HsQuasiQuote DocName)
++renameHsQuasiQuote (HsQuasiQuote a b c) = HsQuasiQuote <$> rename a <*> pure b <*> pure c
++
+ renameLTyVarBndrs :: LHsTyVarBndrs Name -> RnM (LHsTyVarBndrs DocName)
+ renameLTyVarBndrs (HsQTvs { hsq_kvs = _, hsq_tvs = tvs })
+   = do { tvs' <- mapM renameLTyVarBndr tvs
+@@ -398,22 +409,25 @@
+       return (decl { con_name = lname', con_qvars = ltyvars', con_cxt = lcontext'
+                    , con_details = details', con_res = restype', con_doc = mbldoc' })
+   where
+-    renameDetails (RecCon fields) = return . RecCon =<< mapM renameField fields
++    renameDetails (RecCon fields) = return . RecCon =<< mapM renameConDeclFieldField fields
+     renameDetails (PrefixCon ps) = return . PrefixCon =<< mapM renameLType ps
+     renameDetails (InfixCon a b) = do
+       a' <- renameLType a
+       b' <- renameLType b
+       return (InfixCon a' b')
+ 
+-    renameField (ConDeclField name t doc) = do
+-      name' <- renameL name
+-      t'   <- renameLType t
+-      doc' <- mapM renameLDocHsSyn doc
+-      return (ConDeclField name' t' doc')
+-
+     renameResType (ResTyH98) = return ResTyH98
+     renameResType (ResTyGADT t) = return . ResTyGADT =<< renameLType t
+ 
++
++renameConDeclFieldField :: ConDeclField Name -> RnM (ConDeclField DocName)
++renameConDeclFieldField (ConDeclField name t doc) = do
++  name' <- renameL name
++  t'   <- renameLType t
++  doc' <- mapM renameLDocHsSyn doc
++  return (ConDeclField name' t' doc')
++
++
+ renameSig :: Sig Name -> RnM (Sig DocName)
+ renameSig sig = case sig of
+   TypeSig lnames ltype -> do
diff --git a/dev-haskell/haddock/haddock-2.10.0-r2.ebuild b/dev-haskell/haddock/haddock-2.10.0-r2.ebuild
index 7cfedbf0f898..1566827d5ca8 100644
--- a/dev-haskell/haddock/haddock-2.10.0-r2.ebuild
+++ b/dev-haskell/haddock/haddock-2.10.0-r2.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.10.0-r2.ebuild,v 1.1 2012/10/21 08:04:50 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.10.0-r2.ebuild,v 1.2 2013/02/10 14:23:03 slyfox Exp $
 
 EAPI="4"
 
@@ -20,7 +20,7 @@ IUSE=""
 
 RDEPEND="dev-haskell/ghc-paths[profile?]
 		=dev-haskell/xhtml-3000.2*[profile?]
-		>=dev-lang/ghc-7.4"
+		>=dev-lang/ghc-7.4 <dev-lang/ghc-7.6"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.14"
 
diff --git a/dev-haskell/haddock/haddock-2.13.1.ebuild b/dev-haskell/haddock/haddock-2.13.1-r2.ebuild
index a38b833e3613..5e72bd90c12e 100644
--- a/dev-haskell/haddock/haddock-2.13.1.ebuild
+++ b/dev-haskell/haddock/haddock-2.13.1-r2.ebuild
@@ -1,8 +1,8 @@
-# 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.13.1.ebuild,v 1.1 2012/11/18 13:42:07 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.13.1-r2.ebuild,v 1.1 2013/02/10 14:23:03 slyfox Exp $
 
-EAPI="4"
+EAPI=5
 
 CABAL_FEATURES="bin lib profile haddock hscolour nocabaldep"
 inherit eutils haskell-cabal pax-utils
@@ -12,15 +12,15 @@ HOMEPAGE="http://www.haskell.org/haddock/"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
 # ia64 lost as we don't have ghc-7 there yet
 # ppc64 needs to be rekeyworded due to xhtml not being keyworded
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-haskell/ghc-paths[profile?]
-		=dev-haskell/xhtml-3000.2*[profile?]
-		>=dev-lang/ghc-7.6.1"
+RDEPEND="dev-haskell/ghc-paths:=[profile?]
+		=dev-haskell/xhtml-3000.2*:=[profile?]
+		>=dev-lang/ghc-7.6.1:="
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.14"
 
@@ -31,6 +31,8 @@ CABAL_EXTRA_BUILD_FLAGS="--ghc-options=-rtsopts"
 src_prepare() {
 	# we would like to avoid happy and alex depends
 	epatch "${FILESDIR}"/${PN}-2.13.1-drop-tools.patch
+	# Fix: Ticket #213 Haddock fails when advanced typesystem features are used
+	epatch "${FILESDIR}"/${PN}-2.13.1-renameType.patch
 }
 
 src_configure() {