Fix build error against nonbundled cabal (bug #435726 by Alex and Kyle Blake).

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

5 files changed, 72 insertions, 11 deletions

diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index 670ccd6a2b86..814409c7a82f 100644
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-haskell/haddock
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.93 2012/09/14 07:03:20 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.94 2012/10/21 08:04:50 slyfox Exp $
+
+*haddock-2.10.0-r2 (21 Oct 2012)
+
+  21 Oct 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/haddock-2.10.0-ticket-202.patch, +haddock-2.10.0-r2.ebuild,
+  -haddock-2.10.0-r1.ebuild, haddock-2.10.0.ebuild:
+  Fix build error against nonbundled cabal (bug #435726 by Alex and Kyle Blake).
 
   14 Sep 2012; Alexander Vershilov <qnikst@gentoo.org> haddock-2.10.0-r1.ebuild,
   haddock-2.10.0.ebuild, haddock-2.4.2.ebuild, haddock-2.6.1.ebuild,
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index 8e49f6a517a2..2facc610de53 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ghc-paths-1.0.5.0-GHC-Paths.hs 238 SHA256 a86c668fba73a97e14aa58e7dbf9c9bdbcee0c4782bff185b4d905d048c47a9e SHA512 ddf4340418e80a14bf56af88e2cbdc6d6b4180023a47003c85b98ee484c2ddd2cf5f574a03bbb8664aca4e0e7baf9434b8d5dcb32c1a21de60c71e5f403d27c9 WHIRLPOOL d537bfe31a8f340d466d72ca5d14c4aa6452085cf395b509d9f625b50b7df7c445de787ea6b5799128c41f26afc76658572c1cd9461b2317fcc7c9b2e4da25bd
 AUX haddock-2.10.0-dont-crash-on-unicode-strings-in-doc-comments.patch 942 SHA256 02e932b491ea9e8cbbd08aab15c5ff0e07874e1fd76e204aac8b1238b8c822ad SHA512 362b7fcf5cb93de6ba2da802eccd3e652aa43d1f77f10a065f19ec591369580343cbbddf392837aec2127bca8586ef5cc927e37cfeb693e2a84fadfa35f6b8a3 WHIRLPOOL b2826cf53c85898613385cf02d6b079faed3036905c0c78330d5361daca69abd3c266a00d3810ea8000224250d41de2f7c7ae64682467cc3ee0fb954a9ed807a
 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.4.2-Setup.hs 3200 SHA256 a9dd6ebc855781897d0357450859202ce553574f9cec0c5cda381c343ce1eb09 SHA512 b44b9866eafe2b779f42ceaa22901caf02150a75069d4a7a94fa11a1c74a62ac08a8338c622cceaa6ad061eb6b163bb1f503f09650f517df1a4326bdb14d30d2 WHIRLPOOL 3f2f67942728d8f4780023b48cf91b515870d8d646a6caf2ccf7118e9943b98983d618d4977c80033f76ac8b7889758005678d4b7f1688491e370da96f51ee34
 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
@@ -9,10 +13,17 @@ DIST haddock-2.10.0.tar.gz 159750 SHA256 d107dba15e8aee5abcb540b818b5dcb8ced98ba
 DIST haddock-2.4.2.tar.gz 103033 SHA256 dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547 SHA512 e2fac40070ad7a3bdb94b7f55321cfc9f283f1d281a3315c74790ccb70ada5ef2883e194b34130c2fd0e437a15884703b0f339953216c0499b27621892e05201 WHIRLPOOL f4b723d8610a60a2e7bcb1250ab279dddb9b298731933630b9ac499d0cbc18c9a111f22931786ed9e3f84083426138bd625b4171b11ff0f32009924466306deb
 DIST haddock-2.6.1.tar.gz 128158 SHA256 626bfbc51f33ada003fbbfe1b40f3147039369e9898f8e8d2f5c1c863436ea6a SHA512 afa2c1166448f313b3031718caa25e4507b3b773dfd3af3b029ce58c3d8e0fde44f823206dac1219f61ac84589ac580cade688470abd7f53fac677caab0abff0 WHIRLPOOL e719061a8f66fec8273e59d4a99f105710d3ff2f150dae4086bac4b8fc9f365a597876669ebffbb975b9b00639bbe4645f743961de26f0b102cf4485fb00c555
 DIST haddock-2.9.2.tar.gz 154040 SHA256 e8498520a4b8c8a03330141ba4c31d81e90dfd361de3ff7e320cdf71c2dd3ba1 SHA512 a3f223a11ec8d538d0d35fcb717445c2f532e47e687bb72150040592fe9f99f90d8224fca786891f3a9191cff9b8ce2ad42388cfd46a07abad5734b126891a51 WHIRLPOOL 181707ffd3dae0d329bae77e1a0c3a3f602925e0fe1d3cfaaaf69ac9e3e828dae0f0264291b497f4fc66aff37ec1ddeeee9f0f63170aad0799b064d157f27d3a
-EBUILD haddock-2.10.0-r1.ebuild 2212 SHA256 33099c68f9acc0eb9c21d8c1d1d2c54d09c63611c7044aab12f9662391da76cc SHA512 9d09aa07a945cbc241b57de31742af1016b571a42d0cc9fa437c9c4c1e0b57d2246f0f23524d30ba0dd346644a92af85582237398361dcba405fe1d22496b7e0 WHIRLPOOL 6e7dd6ec5500c400e15a529f6cb15fc3a8414a7f4fb3aa4a9cedb9c0a3bb52a9f3e521913f7d55db6f55910a2327dcebdb245124aab005f0efe6911d5280200c
-EBUILD haddock-2.10.0.ebuild 2003 SHA256 8d48d19f69f75434a904b78673e8b1f818948e47870cf10e56ab71f13c0567fd SHA512 c0eaad1f1cbb4f2a97758fe9e4b75f9f254082f0c42d573a015434eb69413fa07262ac4a35739dd7afa4d8f631bea93919d176d58cf3138e3084c9db969724c9 WHIRLPOOL 365ea36cf07aa188a39f39ff5c68a0315debe755f7d6abc03a6ed169d15e26919dc2ec8f2647eacb2c2e259aeed4cce7c4a4aaaed29a3f3ea058edd817edc230
+EBUILD haddock-2.10.0-r2.ebuild 2600 SHA256 53ab7de407395e9eb334ed974f55b2c52d0ec1a5ad0de27bfef4031b875948df SHA512 3ce19fd2930f9bb121842366ac777a878a033f00d48f7e2b868b50aa5c353a4e958ad26547b9d79885dd3f1804851aa1e2058bcc790e9cdb049ecdefb17c2333 WHIRLPOOL 539d8b269000b27957c82ad0b5a1790c760e9d668afe92e1d9532cb40c14bfdd8ff900eb9a06267de4d18914c2ad74cbc0bf2891df6601578296ec823d720408
+EBUILD haddock-2.10.0.ebuild 2216 SHA256 ca38c202163d2521081108005b787fdb1f708b9c3e97fc60960feb0ea567f85d SHA512 2968c34604302f73769a9b44e7de14fba80519c5445ccfb0a00e626443192d0ab36a81e763a61024e1617d578e802a6cbfbd59c0d8a044c8a1711db679f4acde WHIRLPOOL f2b9b0f170e309fc8f8192420a268f34fdfaf7e8037fe8a3e358355ae37107a46ce16bffd360f819d94a522d34d6b67b3f6273a31e36a6c9f6003db3041b424a
 EBUILD haddock-2.4.2.ebuild 2405 SHA256 175f3bf67cb042486e1ec9840f54444181d59af9d9a74a4f87ac4425293191b4 SHA512 f1daf247367dea3053d7a74d2120d8badec91697644156f545ca92ba809d95e714fd6fca5a9d5508d576ff7e0ff9d98a453df9e7bab9c656744e343b82a48576 WHIRLPOOL da285f3ba824d666f1bb23182d96f2f11787ad53cff83ab522b5141af46a4e4f9b9361f99bedc2e5da99a0f5efd3b61ddd457e656774174f41a500ae2c1a5b94
 EBUILD haddock-2.6.1.ebuild 2545 SHA256 387f3e7feeb036716e5432d793061f3c4a9a792818dfcec8c14ba31511456922 SHA512 304b2c50bf77bec262a0cbd69b4d1787871b84562bf34cc1a155ec708558d2d13e1a962f0a6cd50f1db85bba9ce18cab98e239722c0377df8b5041642999d3d9 WHIRLPOOL e7006d55b5f5b75d65d4c0efc881aa1ed4fc7ec7a9d3224ddc53c498f283ba0e085cd60c3fcddd62995034e4ed4ec8bbe539c014fd18eb25229390f05e252066
 EBUILD haddock-2.9.2.ebuild 2721 SHA256 68ccaeecf31796600cb37d76a71512aa0ff32dced59e793a87c48be3e11faa5b SHA512 3d927dee90571785e754a3f98fc7c01b3d7a284805fc219d8076beffee2889c231ad2cda0374b4bc7cde5727ab21a2a34528e340b7ff71555fa3be5e1d1c0b26 WHIRLPOOL 37797efccc6caea7a9eebf31ec564ec21fc739a3e8083dd035ab2220798b5e16b16b866480c370ebd4645aed330f9a74531bfffe918cb2884796ac81e2fcf1ac
-MISC ChangeLog 13496 SHA256 c8f7d0a36bd2ea33a09d2068d65267d558a588b43845f4d275d195bd93818ca4 SHA512 22265b7f58a8fd525f5a84807e7d80d6b2a6fadfbaea3bcf586f4c2f132f4308c29cc1e09e700687e4cb5e35ee0e00a5bdee7cc8cce333d357783141f7d8706d WHIRLPOOL d45cba8155d5648321875db595d2763fce9f2fcad13af27fa4d647fa72b4590f7a7f8b796ff6d9e8a36cd1e5633462ad5cbd63ab402e70270db8d693445ce44f
+MISC ChangeLog 13787 SHA256 3886e74637e1fd93eab004fa5879b73b0c1b11fff0dc67fe141a1b370f5d6e06 SHA512 31b150adc0366761749b8a31ce619aacba962cf3aa30a9a46f7422ad1d35e77ee2ddaf974d2aab6d757345779fad5f815adfef700768b58607a16c07613c57b5 WHIRLPOOL b82e746208e0d62741b6b86028b01904cb0e24b9fa9eac196e69a6ac34ac1a2c2559cb4410cabe54fb98888129a54f2372cbda98e584385bb9a4f7f7343cefda
 MISC metadata.xml 223 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 SHA512 24765bbf1cb187cd262aa7fb3824c1cec65e2bf3f2198099de688916d96401a26458265b15408f22b1fbd6d6a2842df814a57ceda80dfa00d130b24423b7544f WHIRLPOOL 8fd6700f6198db6540eb51edf11372faeb6eb8a542a692e515badf236f62444f2c180f7d08e0f98e9fdfa23de14631b31af50543469aaa27084d6b637e2644c7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlCDrJ4ACgkQcaHudmEf86pSYgCeMwg6+Vzy/IfMiNUqI3QF/3FL
+3ocAn1GufvqzRDrWrhv7jxEHXrZjADnu
+=g232
+-----END PGP SIGNATURE-----
diff --git a/dev-haskell/haddock/files/haddock-2.10.0-ticket-202.patch b/dev-haskell/haddock/files/haddock-2.10.0-ticket-202.patch
new file mode 100644
index 000000000000..744609006da7
--- /dev/null
+++ b/dev-haskell/haddock/files/haddock-2.10.0-ticket-202.patch
@@ -0,0 +1,30 @@
+--- haddock-2.10.0-orig/src/Haddock/Interface/Create.hs	2012-03-04 03:21:18.000000000 +1100
++++ haddock-2.10.0/src/Haddock/Interface/Create.hs	2012-06-27 00:05:37.874840635 +1000
+@@ -35,6 +35,7 @@
+ import Name
+ import Bag
+ import RdrName (GlobalRdrEnv)
++import TcRnTypes
+ 
+ 
+ -- | Use a 'TypecheckedModule' to produce an 'Interface'.
+@@ -50,6 +51,8 @@
+       instances     = modInfoInstances mi
+       exportedNames = modInfoExports mi
+ 
++      (TcGblEnv {tcg_rdr_env = gre}, _) = tm_internals_ tm
++
+   -- The renamed source should always be available to us, but it's best
+   -- to be on the safe side.
+   (group_, mayExports, mayDocHeader) <-
+@@ -59,10 +62,6 @@
+         return (emptyRnGroup, Nothing, Nothing)
+       Just (x, _, y, z) -> return (x, y, z)
+ 
+-  -- The pattern-match should not fail, because createInterface is only
+-  -- done on loaded modules.
+-  Just gre <- liftGhcToErrMsgGhc $ lookupLoadedHomeModuleGRE (moduleName mdl)
+-
+   opts0 <- liftErrMsg $ mkDocOpts (haddockOptions dflags) flags mdl
+   let opts
+         | Flag_IgnoreAllExports `elem` flags = OptIgnoreExports : opts0
diff --git a/dev-haskell/haddock/haddock-2.10.0-r1.ebuild b/dev-haskell/haddock/haddock-2.10.0-r2.ebuild
index 91bbc29ca024..7cfedbf0f898 100644
--- a/dev-haskell/haddock/haddock-2.10.0-r1.ebuild
+++ b/dev-haskell/haddock/haddock-2.10.0-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 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-r1.ebuild,v 1.3 2012/09/14 07:03:20 qnikst Exp $
+# $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 $
 
 EAPI="4"
 
-CABAL_FEATURES="bin lib profile haddock hscolour"
+CABAL_FEATURES="bin lib profile haddock hscolour nocabaldep"
 inherit eutils haskell-cabal pax-utils
 
 DESCRIPTION="A documentation-generation tool for Haskell libraries"
@@ -33,6 +33,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-drop-tools.patch
 	# http://www.mail-archive.com/cvs-ghc@haskell.org/msg37186.html
 	epatch "${FILESDIR}"/${P}-dont-crash-on-unicode-strings-in-doc-comments.patch
+	# http://trac.haskell.org/haddock/ticket/202 fixed by upstream in ghc-7.4
+	# branch only (fix is not in master branch on 20120626)
+	epatch "${FILESDIR}/${P}-ticket-202.patch"
 
 	for f in Lex Parse; do
 		rm "src/Haddock/$f."*
@@ -49,7 +52,12 @@ src_configure() {
 	echo -e "#!/bin/sh\necho Haddock version ${PV}" > "${exe}"
 	chmod +x "${exe}"
 
-	haskell-cabal_src_configure --with-haddock="${exe}"
+	# we use 'nocabaldep' to use ghc's bundled Cabal
+	# as external one is likely to break our haddock
+	# (known to work on 1.16.0 and breaks on 1.16.0.1!)
+	haskell-cabal_src_configure \
+		--with-haddock="${exe}" \
+		--constraint="Cabal == $(cabal-version)"
 }
 
 src_compile() {
@@ -63,5 +71,5 @@ src_install() {
 	cabal_src_install
 	# haddock uses GHC-api to process TH source.
 	# TH requires GHCi which needs mmap('rwx') (bug #299709)
-	pax-mark -m "${ED}/usr/bin/${PN}"
+	pax-mark -m "${D}/usr/bin/${PN}"
 }
diff --git a/dev-haskell/haddock/haddock-2.10.0.ebuild b/dev-haskell/haddock/haddock-2.10.0.ebuild
index 1c640a524501..beb282b65cb3 100644
--- a/dev-haskell/haddock/haddock-2.10.0.ebuild
+++ b/dev-haskell/haddock/haddock-2.10.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 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.ebuild,v 1.3 2012/09/14 07:03:20 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.10.0.ebuild,v 1.4 2012/10/21 08:04:50 slyfox Exp $
 
 EAPI="4"
 
-CABAL_FEATURES="bin lib profile haddock hscolour"
+CABAL_FEATURES="bin lib profile haddock hscolour nocabaldep"
 inherit eutils haskell-cabal pax-utils
 
 DESCRIPTION="A documentation-generation tool for Haskell libraries"
@@ -47,7 +47,12 @@ src_configure() {
 	echo -e "#!/bin/sh\necho Haddock version ${PV}" > "${exe}"
 	chmod +x "${exe}"
 
-	haskell-cabal_src_configure --with-haddock="${exe}"
+	# we use 'nocabaldep' to use ghc's bundled Cabal
+	# as external one is likely to break our haddock
+	# (known to work on 1.16.0 and breaks on 1.16.0.1!)
+	haskell-cabal_src_configure \
+		--with-haddock="${exe}" \
+		--constraint="Cabal == $(cabal-version)"
 }
 
 src_compile() {