Version bump.

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

3 files changed, 82 insertions, 5 deletions

diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index 413f9b9c97c5..df0cac9a953a 100644
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/haddock
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.116 2015/01/02 23:16:40 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.117 2015/08/01 21:23:32 slyfox Exp $
+
+*haddock-2.16.1 (01 Aug 2015)
+
+  01 Aug 2015; Sergei Trofimovich <slyfox@gentoo.org> +haddock-2.16.1.ebuild:
+  Version bump.
 
   02 Jan 2015; Sergei Trofimovich <slyfox@gentoo.org>
   -files/ghc-paths-1.0.5.0-GHC-Paths.hs, -files/haddock-2.6.1-cabal-1.8.patch,
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index ce3484ef002b..6d1c872e8abf 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -13,18 +13,20 @@ DIST haddock-2.13.2-pregenerated-files.patch 206413 SHA256 dd603527692c12055d6a0
 DIST haddock-2.13.2.1.tar.gz 208851 SHA256 c9cfe2bd2e8e1201870f88bc9a2ccdb0173315d0a8c734b459ec344feb1af34e SHA512 91e451264ff1c82c801f32a48f33d9fd808d22135e0ca6c73a0bd5b515ec69f2530ca9566ee11109cdf67005c4f794cf5e12b7743cf72e34e1e76f094a5744e2 WHIRLPOOL 42f4c9e37ed928403b4d228a3288f6c95372965b8875e97106482bbe0163a124b3c6a6fc727030ca5c04d7d5cc8f092c5b304147fc763971f81135a380e8fd70
 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.16.1.tar.gz 216323 SHA256 46ecd130cb5ad2b5c7452c843f9b75e976f1416d1cf17e6436d65c2c0bdbd6d6 SHA512 709af410f8746819c8c067f3549d79ba0ecaa312fb6b19acf670a9a3e4c94e94b8e546493e08293eceeb488bc0891a8ebe033a58411c4af935b445cd7f3014b8 WHIRLPOOL 0f60978d1e4303d6586b164ab40236f949c14308a0b0ddec9e63ff9b332835ca846187b65de8c122203ace666450f40d55955a3c287f576611d7df2bc6c9161c
 EBUILD haddock-2.10.0-r2.ebuild 2574 SHA256 1af5f024cae97db2cd07a2a94bf09080494c903c606512ffb0f24c57b4c79e93 SHA512 33361afaa6e9995457553067873c968f3e02332541540ffbb4ddeca518bda0c6912b17114aab380abf1dc2ff920c7e219a8f39fc5a6f0a6ed7a378809053eb06 WHIRLPOOL 90009c143458f1a6a1446aeceab7da48c10c3bb63ce97890f6cf31272a538a32a737e4aa7b046080cf87059653bbab37ff00ea69d69a267b1bfbd62d946945c1
 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.1.ebuild 2550 SHA256 8884878afedd104a4e71b34f1ae50a84b03b40e50394084e0ef0150f18035237 SHA512 8d3f9dede29920e4a805aa8467c988d4b595df0cb82c2ca6b5288c3af6bf935afa60db53a85367823e0321820fd79b0ab984b834a6542ebe8a58f7c9649ef56e WHIRLPOOL de560e8d224961285553eaaba000aabe228257a303f547ec654cf6a3afbed02605a40e6183f4d114a9071716822d3701185d43bf9f020453cf2cbe44e76f7b05
 EBUILD haddock-2.13.2.ebuild 2402 SHA256 0bf2de9ca32bbc484ca1889b01021428d650660a95d6263c315e24cd32738b2b SHA512 f4bd1db42164531af49daeda88a3633559fd07b1c704fb4402ab5566336f70288689776d4fc855f90d5d720d3b93341e32fe6c84a721e09918737c1c5829f2a9 WHIRLPOOL 18e479da37fdc1c0a929397aa560dbae0eee09cbdb32081d88478895d60d485265d548d840e0593865eddd3552c0a3e091590202539c5ffa9d6e5f1118bbbac0
 EBUILD haddock-2.14.3.0.7.8.3.ebuild 2191 SHA256 2aa9bbd9a3b759f3af1c7c7790d41f884621c99f0fd806727e5277ee45a1acb7 SHA512 642928bdf1fc66b2d656f16bb5d81ea7e3630fd3bfafec88ff87d1095d7a2ac93fa8d15f9006c932ec0a9e956130026267796aadc08ec33751ea9843ce3fa35d WHIRLPOOL 2bf167c69e8395c1e172d87b399a9b790ab3b47d8432672263fcaba4ba7f88f4603d714f5fd580392da56051dda52312d8271517033e4bac3685243d0f931627
-MISC ChangeLog 16984 SHA256 a21b07c5918a5502a8253794fb5c6a93f142f2ed3550a192021e3c17d4ca1fa0 SHA512 e2f43918bc443faa75c8e568df1064d957d1fc11bb9cd50d344763c96d2ac431898548e669da233ba036420abbf075e5a0a2bd93bc57430c5842ec6155164ab9 WHIRLPOOL 645bf96ae28bacd858dbdc7033b8e016792094b436c974b1ca8c7d6a5163292daab00848e3f245c7b5206385ae345cb4e07f90cd4b458c28881266da5f3f5f0e
+EBUILD haddock-2.16.1.ebuild 2042 SHA256 4ace6ff6331248a5830a5b32ebb348b55d2012a0b334738a1bf55766dd9e66b4 SHA512 244bb99f9d0e91da5581e7d17b4051c9b53662dcfe725a6fc138137e3dc2ddb0a02c992987a08eb4e6e42575c5d86f932d82eb9d100eba7527efc7205871d411 WHIRLPOOL d5410fe966451aa9b6f29031769428cb755f44fa7914502d31154a7060be9d7f867a4dd5a2bf32bfd8ce8a7a66630d8f34b130b646ec745752dd6838c22a93b3
+MISC ChangeLog 17110 SHA256 4ded4b4e5d355568f53f102056ccbb473c707c1f6cf5f7e98079f20d6e235f66 SHA512 c1c48f1817015c2d0163a1629973104a7e96729a339e595fc949cc2da0538fca03cd96254346842d2f94068dce74e93f0df88f4013b97b66da377c4b4eb7b501 WHIRLPOOL 47d49b95c5160c80269e570d56492903e7f5ce0b313791e9883b0138f8961dd1dfcf6f90d060f0a33238229a6e8a9a97fb703b4b6f7873f9227a6635dd0df837
 MISC metadata.xml 223 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 SHA512 24765bbf1cb187cd262aa7fb3824c1cec65e2bf3f2198099de688916d96401a26458265b15408f22b1fbd6d6a2842df814a57ceda80dfa00d130b24423b7544f WHIRLPOOL 8fd6700f6198db6540eb51edf11372faeb6eb8a542a692e515badf236f62444f2c180f7d08e0f98e9fdfa23de14631b31af50543469aaa27084d6b637e2644c7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSnJtkACgkQcaHudmEf86rClwCdGd48ZKTBlEQUjryy2KJPRrn4
-EAAAn3JmGOt9Mg8KK0QcUDa6lpKRRW6y
-=QIFA
+iEYEAREIAAYFAlW9ONUACgkQcaHudmEf86pJVwCffoSwGCpOlLVWyuvIxCcb0Hyu
+R2sAn3333wmTgYco9I+WMcLgSl0YgBih
+=ZOTG
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/haddock/haddock-2.16.1.ebuild b/dev-haskell/haddock/haddock-2.16.1.ebuild
new file mode 100644
index 000000000000..ececce37a506
--- /dev/null
+++ b/dev-haskell/haddock/haddock-2.16.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.16.1.ebuild,v 1.1 2015/08/01 21:23:32 slyfox Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="bin 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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RESTRICT=test # tests are outdated
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	>=dev-lang/ghc-7.4.1
+	~dev-haskell/haddock-api-2.16.1
+"
+
+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 \
+		--flags=-in-ghc-tree \
+		--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
+	pax-mark -m "${S}/dist/build/haddock"
+}
+
+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}"
+}