Version bump (ghc-7.8 support).

Package-Manager: portage-2.2.11_p9/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

3 files changed, 84 insertions, 18 deletions

diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index b98aacf4a1d8..5b65fa0378bc 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.112 2013/09/22 06:44:28 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.113 2014/08/11 10:20:38 slyfox Exp $
+
+*haddock-2.14.3.0.7.8.3 (11 Aug 2014)
+
+  11 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
+  +haddock-2.14.3.0.7.8.3.ebuild:
+  Version bump (ghc-7.8 support).
 
   22 Sep 2013; Agostino Sarubbo <ago@gentoo.org> haddock-2.13.2-r1.ebuild:
   Stable for x86, wrt bug #483462
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index 2f3d72165e9e..84632aea3ece 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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
@@ -13,28 +13,20 @@ DIST haddock-2.10.0.tar.gz 159750 SHA256 d107dba15e8aee5abcb540b818b5dcb8ced98ba
 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.14.3.0.7.8.3.tar.gz 230282 SHA256 8bcdea48e3fbba6e38d2e629edf230da39d07421424bb1c615198c77623ff2c4 SHA512 62ae4a29c877c3b9742828fcda2f1f045357f41b4a2c495a4791a42d412d41b3d206cdcb73e2d1bd4e95c40371dae865f4eaa37031cda6c1bada5dfed963c2be WHIRLPOOL afd36c8f04aa29c007d83d7c7731098347836daa4e8307710b839ecbc764e191624075df5c3e353c8bcd9f640dfe560a07477bf7909d53ed7e13b34a806efc9a
 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 2525 SHA256 1d50c77699b3cb3137a1a8be6aa63debc4cf85a4231918236ca112e11c24e7c0 SHA512 722e33053606298af9db296a98a3884c44102cde228c15142d7173c09a396cd0130381e063948c5def2cd732b4c0a2ab430bc44910c0e4597a12c9e5ab46198a WHIRLPOOL 236f030d33088dea8cccd4fb22f8efa2f6e03d5cb3851a35449127b82ba4498d576868b41def6ac723fdd83f2ac1ba0b99fb205200e71a923af2986e6557a1a8
 EBUILD haddock-2.13.2.ebuild 2385 SHA256 d84d05a1964b922b3869e810736f6b5a8ace3e87aabd874a4d5f1947280348bd SHA512 5faf82e45a2a9f1f939542dbc0e34b1c450cf59e3565dac08257978580b8e8bee90b96013c1f3d8c09eb17453c01ff481f784bff0e490fa9e33dde183becb8c5 WHIRLPOOL 90a3f4bf8e7773e0c3d59ca3116484401cd5cfd477f9a1e1716fe112ef94fe876affeaa8e4758f0ec1274b5f7bef51edc44af54c51c610d29a7deff4d2f3a18a
+EBUILD haddock-2.14.3.0.7.8.3.ebuild 2191 SHA256 2aa9bbd9a3b759f3af1c7c7790d41f884621c99f0fd806727e5277ee45a1acb7 SHA512 642928bdf1fc66b2d656f16bb5d81ea7e3630fd3bfafec88ff87d1095d7a2ac93fa8d15f9006c932ec0a9e956130026267796aadc08ec33751ea9843ce3fa35d WHIRLPOOL 2bf167c69e8395c1e172d87b399a9b790ab3b47d8432672263fcaba4ba7f88f4603d714f5fd580392da56051dda52312d8271517033e4bac3685243d0f931627
 EBUILD haddock-2.6.1.ebuild 2561 SHA256 4d9246deba96549599b58e2d3c53cc1fe04f859c37d6926299c9085cbadf8ae7 SHA512 e6a3b4afb4211ff8070173d609fc376b1dcf5af1914515c5c3e52b9f2d5e459c8f3e0562cb7d0ccbe289cd2262dc25f1c49064f1a45af487d748b8fe75e4ea2a WHIRLPOOL 65b739aa621905b869260ad60c4f780454f08a8360206872cf470ee71765c8ec4082999c4eeab0fcd0487e801d0adb167233de59e3bd49cb66725b638c766682
-MISC ChangeLog 16302 SHA256 8dc234d90d7911e32238245a1d142c9f79603e6959cefbfa3d2ee7f5158b4170 SHA512 62ef28b0873ad5f6bd20b2ebe359317d46874019b75913374c49bdd0f93821f36d29ac212d7e4db7b6c670843211d08a2f08cf70f5257d12447644c5987db288 WHIRLPOOL f497e9ceb927f14d387fadb4d7653a818c83b82c876a33a7664553e3837a151d5609ecd7a7c2eeaf18469a0c9bb146229096fbc6793745d58516f6397a41ef7a
+MISC ChangeLog 16467 SHA256 3644dd85e61a527abf86dca6bb4d63c16cba16852f411690a5d26ebb30210196 SHA512 5b63a466cc0107229fb925f51ffdfbda7acf3b690a4ef86fc510b6a393233506546d922c612b1ba6cb076725e3c592cb32d96d4d457d200062152e90f1458efe WHIRLPOOL be7bd74293b40cf4db542296384853e1414e7f7ce2f00037a2c27125c258f92d0ec9d50c9fbbeee4b153b91180b2d775c79877ca6b026addd302be1e15194620
 MISC metadata.xml 223 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 SHA512 24765bbf1cb187cd262aa7fb3824c1cec65e2bf3f2198099de688916d96401a26458265b15408f22b1fbd6d6a2842df814a57ceda80dfa00d130b24423b7544f WHIRLPOOL 8fd6700f6198db6540eb51edf11372faeb6eb8a542a692e515badf236f62444f2c180f7d08e0f98e9fdfa23de14631b31af50543469aaa27084d6b637e2644c7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCgAGBQJSPpHLAAoJELp701BxlEWf+ZAP/isD5HzXfqxL8mcrll+Q1Ex3
-ipJISWh4gfGBdyhMCrkgY4Mz4dN97s41RMw/3IOkJUSp7Z8/5YHdaHSom4r/+f1G
-iC1feWwLOtySzn8cAQvLkJr20+Txs0BAEI4pAqpWP9IxiR853DKJAPye94Mxrjfh
-iAnYaFPRKtFVLIG2t54Mo/9GW5jf1uvBLkTRS8tPx+E3ZbYvkwj0js2upQqH1jiF
-0yJVtgobTYS+AYm7IdQ+kmP0sRVIKPwvoC8+HsLRueqIebBLwDI8JAxUxGxGmKUC
-hB6uIvX9zlGtilj+Rs5pWRVbRGVoYwVijMSqToLirE2tGMSAHzrmne+4cfm4tD7a
-u9tnIEp7cCdcZ5CjDNhcsXSaxkyUgCQ5D5bZKB+BwzI5EXZss3+qGbTwc89amlN1
-rGcJRAgUvtmBPP68rTdI8oYuOgEQ3IZCjBkVtu+q55jBZjWMX+Fd3gcIoGIaM1b8
-gd92XHcq82UcEJav4a66HM8Xz05uvMRSmLFFRXq/YYOcQk6XVMYk1fn6aG4epZr8
-ot69OekCq2JwCNoydF9mpw54f+nkVUj4FaWHHZRZQM12ZifF4odrT4ZpqnlA4ZgD
-96lezi0Msd8q54X7VbSdEjQQHhAto0fRJfoZtN/07O4NfbCeV9PH9cn8Zk204Xo8
-cWiHrFhAmlKutwD9KUfG
-=iXpx
+iEYEAREIAAYFAlPomPsACgkQcaHudmEf86pUygCfaZ/LnGp0F+MG3UjjPWzENmTS
+yskAn3Wteh9KFSMzdthAB5ZNmU7YY2wp
+=yQ/t
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/haddock/haddock-2.14.3.0.7.8.3.ebuild b/dev-haskell/haddock/haddock-2.14.3.0.7.8.3.ebuild
new file mode 100644
index 000000000000..63da31823e6a
--- /dev/null
+++ b/dev-haskell/haddock/haddock-2.14.3.0.7.8.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.14.3.0.7.8.3.ebuild,v 1.1 2014/08/11 10:20:38 slyfox Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.6.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES+=" nocabaldep"
+inherit 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"
+SRC_URI="http://code.haskell.org/~slyfox/snapshots/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/ghc-paths:=[profile?]
+	>=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
+	>=dev-lang/ghc-7.8.3:= <dev-lang/ghc-7.9:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-haskell/hspec
+		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 )
+"
+
+src_prepare() {
+	if [[ ! -e "${S}/html" ]]; then
+		ln -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 \
+		--ghc-options=-rtsopts \
+		--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}"
+}