fix haddock-2.13.2 build in absence of alex and happy (due #471384)

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0xEAD50D64D8D3571A!

3 files changed, 94 insertions, 6 deletions

diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index 9f9ce6b99f1e..f5212f9067a5 100644
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,12 @@
 # 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.107 2013/05/26 04:07:08 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.108 2013/05/29 08:21:16 qnikst Exp $
+
+*haddock-2.13.2-r1 (29 May 2013)
+
+  29 May 2013; Alexander Vershilov <qnikst@gentoo.org>
+  +haddock-2.13.2-r1.ebuild:
+  fix haddock-2.13.2 build in absence of alex and happy (due #471384)
 
 *haddock-2.13.2 (26 May 2013)
 
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index 14b4bd60f594..3e54f9882a02 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -11,18 +11,26 @@ AUX haddock-2.6.1-cabal-1.8.patch 292 SHA256 a7bb8cf4c4b41e9be8efc0ad870cb29932a
 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.13.2-pregenerated-files.patch 206413 SHA256 dd603527692c12055d6a03c59d414f24dc43a0c56cdb815a0755126586a61f4c SHA512 447d7478365f895028fa56a06695ad71792cb3631fe06b18fb051a6d20d1c829eeff6d2c579c90d4d6b5594f245d2aa4f296bff280e5162f090b9b3f98e780c8 WHIRLPOOL 57bdf7bab4077afe003760015aa9535b4af5f2549f51db1a9d7ca87fd67faa842bd1e0adbfabceffee6ff1cb6ad9b4ec6a34b70630190e89b67900f834538e4f
 DIST haddock-2.13.2.tar.gz 174973 SHA256 25e7d5819d38cbb1c9b1ff967e2a4093c776c3defaa0a249c8eabba1e70892e3 SHA512 6b70f4cc659858e86919cd35a4e936215a53d23767262e25c7add5986cf21d04a761dc3581fe97c6510b3cb0c9867df3e6fa9668732b55e0e9d56b4932dca330 WHIRLPOOL ff06c0d092cdeaf2ddbffd225d30f53239523cd7d482c73f4b7a20100ebcc4e6b6c329bab5cf828ae2730503cff7709061b04cda29ea034939c5acc59191ac52
 DIST haddock-2.6.1.tar.gz 128158 SHA256 626bfbc51f33ada003fbbfe1b40f3147039369e9898f8e8d2f5c1c863436ea6a SHA512 afa2c1166448f313b3031718caa25e4507b3b773dfd3af3b029ce58c3d8e0fde44f823206dac1219f61ac84589ac580cade688470abd7f53fac677caab0abff0 WHIRLPOOL e719061a8f66fec8273e59d4a99f105710d3ff2f150dae4086bac4b8fc9f365a597876669ebffbb975b9b00639bbe4645f743961de26f0b102cf4485fb00c555
 EBUILD haddock-2.10.0-r2.ebuild 2564 SHA256 7d01a90b0b6154fa895ff976f3238227dba45cbd178b36f27924047b0c847c10 SHA512 2644ddf2346b2c572feaf9a5222cd5b1c2e4232475e263974fabfe40c54228dae479ca1887c2fbb529418316895755bb430193a3898803fcab0621cac3ed0746 WHIRLPOOL dd28744516861d300d7a2c4ab9396e17ba0718b39f0050c71adc21aa64bd87107e32297d31d2f1e9e3404362151f94b29c2ac6546a0dff513173fcf4c4da9663
 EBUILD haddock-2.13.1-r2.ebuild 2213 SHA256 96db7ad74c8993114c6a9f303026d2a979d851b8131353982e2ac224cdf46412 SHA512 cf433a5d2b533048bcf050cd3abcc42815710927bdfc183e95ce36aa771eaf57bb13d519d1453601034b123e7c8888d94304f01b6ff3b673bc27a78572e1c0dc WHIRLPOOL 8de8aede5da17bd1c8b270015479d9c7ad2f1b9a3e777f77066ca1333532bd6382e689c2926c00d445c20e7b2aeb7b14a7540523e1dfe81eaec9fd3ce9b7bdc8
+EBUILD haddock-2.13.2-r1.ebuild 2530 SHA256 ca4fe3db57f953829753798c0f47c3d699a54648b1acf7198019c455c2d4847b SHA512 760ee97327aa292c7f4fb9f5168b43c6b5f5ac7302e5f16aa97aeb1fd7e32fcc5a160a2a993e75ce3becc01c6ae3bc28dafa8b6c58a9cb0909849cd289a4fdb2 WHIRLPOOL f3fc23e58d1138bea7bd86717bd495a1f28616de120ca19a77e94af2146020fe77ec2495194cb17d42a7f6a0be616e99f8fe24e4ee7488258d1f35e31f4501f8
 EBUILD haddock-2.13.2.ebuild 2385 SHA256 d84d05a1964b922b3869e810736f6b5a8ace3e87aabd874a4d5f1947280348bd SHA512 5faf82e45a2a9f1f939542dbc0e34b1c450cf59e3565dac08257978580b8e8bee90b96013c1f3d8c09eb17453c01ff481f784bff0e490fa9e33dde183becb8c5 WHIRLPOOL 90a3f4bf8e7773e0c3d59ca3116484401cd5cfd477f9a1e1716fe112ef94fe876affeaa8e4758f0ec1274b5f7bef51edc44af54c51c610d29a7deff4d2f3a18a
 EBUILD haddock-2.6.1.ebuild 2561 SHA256 4d9246deba96549599b58e2d3c53cc1fe04f859c37d6926299c9085cbadf8ae7 SHA512 e6a3b4afb4211ff8070173d609fc376b1dcf5af1914515c5c3e52b9f2d5e459c8f3e0562cb7d0ccbe289cd2262dc25f1c49064f1a45af487d748b8fe75e4ea2a WHIRLPOOL 65b739aa621905b869260ad60c4f780454f08a8360206872cf470ee71765c8ec4082999c4eeab0fcd0487e801d0adb167233de59e3bd49cb66725b638c766682
-MISC ChangeLog 15653 SHA256 01e9dc919be3c81ca97d410e64222c3d75f18581fecf96cc7ba2bf4ed3d9324e SHA512 18eec89d79ff03013c9c8b85f74a949f605311110f6128883eb1a442e61c88948b0efea5fcf965eb3c12364f16e8c2f9299e4f2a758f1958206e2330ed311773 WHIRLPOOL 5e71726f2a955ec1f38d6bece31d08f467e09f13ecd621493a668f3acd62b05c110de24d3c60decf4e7c634043399f4b08dcb6ba01649a55cc273fc33f373db4
+MISC ChangeLog 15842 SHA256 bdd7cd95ddda1985a50c7aad1b700c461f40202e623d4a42355fb93839a3c181 SHA512 15e7e1069c1d15af5d18285aa47dd87339e2389b67849b427059cafda0d4460b86d96cb647689228acef120d6ecdd6f2b8a704a8a7543a3314af12783ac0a500 WHIRLPOOL 94cdf348016a45487a5b0591f6154e829a97572e8c4e8781c9d5087687054e6a2f86aa8064e3864301646c1d94ac3d270f6bb6722c25d0d097f21800394d653f
 MISC metadata.xml 223 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 SHA512 24765bbf1cb187cd262aa7fb3824c1cec65e2bf3f2198099de688916d96401a26458265b15408f22b1fbd6d6a2842df814a57ceda80dfa00d130b24423b7544f WHIRLPOOL 8fd6700f6198db6540eb51edf11372faeb6eb8a542a692e515badf236f62444f2c180f7d08e0f98e9fdfa23de14631b31af50543469aaa27084d6b637e2644c7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlGhickACgkQoBEVQmGOlx9nnQD/Qn2h/zA+WW+8SRxg+dBTG1ru
-7d4gqiMcWU4u09E+0lMA+gNLnUBclElFT/oYD7vY95kvxA2qtpxCgwirQAqD/qq8
-=kqO/
+iQF8BAEBCABmBQJRpbqCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwMTlGQTEwRTVCMUJCNjdFRDM5Qzg3RjdF
+QUQ1MEQ2NEQ4RDM1NzFBAAoJEOrVDWTY01caDiYIALCOVa5720OW2VthVMcUAEZ6
+qaETxtI8BszMtLK/dTNw56681Tadi+KcT95tdHWK+HZRJj99L4HWrQGTrK4nP36+
+Ie3hwCHI3XPhfqaa1mZwm0TfAGnVLyU9jL6wiPuPXkDwSWeT1ZdEJTxiT42kPZ1i
+U7QKQ6PmVbYwD9zEbRTWahw+yx0CqZbetQADGXGI8PAgrKlTBWih3GWg46oBwBWF
+zfBgs+X3f8BVVQt6FbzwP3k0vCEi8SeEqlC1HsIIga6eTWeGjPLi5a/hFUOy/ssU
+aJ7jWjIVXGKfALL4VVsrTNjoUM2klIEb6o0B2nQYWwV/qro+oH2iqSfW7xJ8ExU=
+=Z3N4
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/haddock/haddock-2.13.2-r1.ebuild b/dev-haskell/haddock/haddock-2.13.2-r1.ebuild
new file mode 100644
index 000000000000..580d17f4d527
--- /dev/null
+++ b/dev-haskell/haddock/haddock-2.13.2-r1.ebuild
@@ -0,0 +1,74 @@
+# 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.2-r1.ebuild,v 1.1 2013/05/29 08:21:16 qnikst Exp $
+
+EAPI=5
+
+CABAL_FEATURES="bin lib profile haddock hscolour nocabaldep"
+inherit eutils haskell-cabal pax-utils
+
+DESCRIPTION="A documentation-generation tool for Haskell libraries"
+HOMEPAGE="http://www.haskell.org/haddock/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz
+		http://dev.gentoo.org/~qnikst/patches/dev-haskell-${PN}/${P}-pregenerated-files.patch
+		"
+
+LICENSE="BSD"
+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
+# x86-fbsd is lost due xhtml
+KEYWORDS="~amd64 -ia64 ~x86"
+IUSE=""
+
+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"
+
+RESTRICT="test" # avoid depends on QC
+
+CABAL_EXTRA_BUILD_FLAGS="--ghc-options=-rtsopts"
+
+src_prepare() {
+	# we would like to avoid happy and alex depends
+	epatch "${DISTDIR}"/${P}-pregenerated-files.patch
+	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
+	if use doc && [ ! -e "${S}/html" ]; then
+		ln -s "${S}/resources/html" "${S}/html" || die "Could not create symbolic link ${S}/html"
+	fi
+}
+
+src_configure() {
+	# create a fake haddock executable. it'll set the right version to cabal
+	# configure, but will eventually get overwritten in src_compile by
+	# the real executable.
+	local exe="${S}/dist/build/haddock/haddock"
+	mkdir -p $(dirname "${exe}")
+	echo -e "#!/bin/sh\necho Haddock version ${PV}" > "${exe}"
+	chmod +x "${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() {
+	# when building the (recursive..) haddock docs, change the datadir to the
+	# current directory, as we're using haddock inplace even if it's built to be
+	# installed into the system first.
+	haddock_datadir="${S}" haskell-cabal_src_compile
+}
+
+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 "${D}/usr/bin/${PN}"
+}