gentoo resync : 20.03.2021

4 files changed, 13 insertions, 156 deletions

diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index 75b1fc491097..dc7423b48ab0 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -1,9 +1,5 @@
-DIST haddock-2.14.3.0.7.8.3.tar.gz 230282 BLAKE2B cb5336c72e0fa3036bf7ceaa202ff35e1d104fcb05c4317f16e78c0517b27529c1fab28e2ee4f2e14cbf2db592ff88a6b01d1840193c9a69233230fec1ffc423 SHA512 62ae4a29c877c3b9742828fcda2f1f045357f41b4a2c495a4791a42d412d41b3d206cdcb73e2d1bd4e95c40371dae865f4eaa37031cda6c1bada5dfed963c2be
-DIST haddock-2.16.1.tar.gz 216323 BLAKE2B feddc77d8072dfafb4b06486f57db89a0136ed53644efb0336a26e6c3f31789cf57e302e7bbfbfb9af036a00cbf801c47398347bd664333f0a35debdf794ada3 SHA512 709af410f8746819c8c067f3549d79ba0ecaa312fb6b19acf670a9a3e4c94e94b8e546493e08293eceeb488bc0891a8ebe033a58411c4af935b445cd7f3014b8
-DIST haddock-2.17.2.tar.gz 245690 BLAKE2B dc6f646a5972add1a5ac0e2a2a4119df5f8f0604984f0fa3f828e72bca96f8ec98b09ce65de6bb94a2714c64680a79ae3dd49f60a27cbf5483cb71f239180c87 SHA512 f8f06abd3b231fae36b900d54a70107dcd6718bab7726ad7bd8392c9053700b96672cf9efa0854033a5c1473dcdf00c390f253bc244ff5f4d25e70dd76c8ea1d
 DIST haddock-2.23.1.tar.gz 302698 BLAKE2B 1dae0019ddc08c537aec2f0fa71f5bd1570db4061d22bf53f05aa0e211c3280d09c6a6481f704c34895e0bf70fd2b5ac95644dab23b05cc2b6fec59c845f86c5 SHA512 e69b3b5f2dcadeccc33696ee8d0646387860b98d86c08d4c07d829e3eabc4159adac0a11d408850ef54face5fa835ab8217d1057b14d8de8d758efbfc7a700db
-EBUILD haddock-2.14.3.0.7.8.3.ebuild 2043 BLAKE2B a29324b23bef8dbe8c0b98c016b52fd03abed1fb4a98207da810fca269849f1477d5e1a714b03e8bd0740d722cd82ccdf80b56bfa71bacc477fd5557cc62bb5d SHA512 b621458d9f193609c91455ba10ec2f2739d02d615b6e5036810fc55b0857089b65738112b110fd8e1b9ce1dd7b7f3d73dc9b0eae6f6db915d8905ccee74d779a
-EBUILD haddock-2.16.1.ebuild 1929 BLAKE2B 425c9d7869257bb06c50187025028083c3ccb4951c1c01682b2ab3d941f1649362926092b1e8ab323545332011f22ee12e365f91179e1c7ae3ee41f634b98510 SHA512 72ea7e1422c97b5496f306b150a2b90751ac65c3886040b83f27014fa97c04315da2636a83dc97535e0fe62aad589f5aff059385ca249d472c040a94d5685516
-EBUILD haddock-2.17.2.ebuild 802 BLAKE2B 8498ed4ea1900e4e28c5a76977bc33c74010ebea30f9376230e1cc839e60df7fd9b7a972594f75b7050647f60220910280ca162a2266aad782cce89010a7b3b7 SHA512 c0291127f88ab1ae5134343eb2eea1fd7890efe128835e1f2208f44fc04b5b690ea7913eae4ae3784ee9ca9f56b94f40a903769318d9d83706f2c3667edf59a7
+DIST haddock-2.24.0.tar.gz 303382 BLAKE2B 3e0c9a92f4f96949ffbdcba4ae26643b715ca8bf930bb26610a3a4b73ddec9a361b00c9c5f529b79fe6e981f23bb9b95d3b0adeff52d1223d97653c7f2573036 SHA512 52748ea2c785faeb9af7c09f9da991e4db8d5b2703eee3824ee1f6c14c82d24b7939746359f147cbc940b2be0d6aac2a1c8ffe2f1b9746e3bc543252859a4003
 EBUILD haddock-2.23.1.ebuild 815 BLAKE2B 9bc7ba6da63c4f8befb46acbe62384a58fd2b766d2561ce3d1fb5a66e9b9c20fa1392a34b93af1de0f8feae0c0a517e1cba4e476db5865489ba7c9c9cb4ea21d SHA512 6b9f03e5bdea82ec6defd6e32b35ab67ba097e07e0fa24b9022dbe75b081e927b7f84422617d8bb281b54675f86af67e04bd83bd2f61a6552ea8dc494e5ffede
+EBUILD haddock-2.24.0.ebuild 823 BLAKE2B b5ddbb9e087fc2066abdc54b48051b4e0e3fb5a7e9ae98a72aaeb60ac941c9ad1ead665107890c100f38c3abc5737886e2d6b2a38912a046f4f7fc96f759287e SHA512 8ab5b3f12c55fed3b777de550ab0fc707c6d5f7c7a75b1a885c9623eb047ef19266d0af34abd534a5ea4a2e3ede0bc30a3f2a4439cae9ff7713459be4d44bb65
 MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
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
deleted file mode 100644
index c1349a930c8e..000000000000
--- a/dev-haskell/haddock/haddock-2.14.3.0.7.8.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# 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="https://www.haskell.org/haddock/"
-#SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-SRC_URI="http://code.haskell.org/~slyfox/snapshots/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # many test depends are not keyworded yet
-
-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}
-"
-
-src_prepare() {
-	default
-
-	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}"
-}
diff --git a/dev-haskell/haddock/haddock-2.16.1.ebuild b/dev-haskell/haddock/haddock-2.16.1.ebuild
deleted file mode 100644
index 9e61f53b16b1..000000000000
--- a/dev-haskell/haddock/haddock-2.16.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# 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="https://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${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() {
-	default
-
-	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}"
-}
diff --git a/dev-haskell/haddock/haddock-2.17.2.ebuild b/dev-haskell/haddock/haddock-2.24.0.ebuild
index e37d8cb4a761..08f165ce877f 100644
--- a/dev-haskell/haddock/haddock-2.17.2.ebuild
+++ b/dev-haskell/haddock/haddock-2.24.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-# ebuild generated by hackport 0.5.9999
+# ebuild generated by hackport 0.6.1.9999
 #hackport: flags: -in-ghc-tree
 
-CABAL_FEATURES="bin test-suite"
+CABAL_FEATURES="" # broken test-suite
 inherit haskell-cabal
 
 DESCRIPTION="A documentation-generation tool for Haskell libraries"
@@ -15,18 +15,19 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-#keep in sync with ghc-8.0.1
+# keep in sync with ghc-8.10
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RESTRICT=test # there is no haddock-test on hackage yet
+RESTRICT=test # test suite unavailable on hackage
 
-RDEPEND=">=dev-haskell/haddock-api-2.17:= <dev-haskell/haddock-api-2.18:=
-	>=dev-lang/ghc-7.4.1:=
+RDEPEND="~dev-haskell/haddock-api-2.24.0:=
+	>=dev-lang/ghc-8.10.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
+	>=dev-haskell/cabal-3.0.0.0"
+#	test? ( ~dev-haskell/haddock-test-0.0.1 )
+#"
 
 src_configure() {
 	haskell-cabal_src_configure \