gentoo resync : 25.08.2020

7 files changed, 14 insertions, 108 deletions

diff --git a/dev-haskell/zlib/Manifest b/dev-haskell/zlib/Manifest
index 6ba8b449631a..0277381c136b 100644
--- a/dev-haskell/zlib/Manifest
+++ b/dev-haskell/zlib/Manifest
@@ -1,12 +1,6 @@
 AUX zlib-0.6.1.2-fix-w8-tests.patch 1138 BLAKE2B 4a819faaca83aea0a6d338924907c8a02fe7d8b04a5ad57bc983e1a93cde3183c080883b97e49355a022e80dfa2f289b4cf11cc5e3e625d25b25ff7c0b6426bf SHA512 bd2f510dc6516668c130edd969d7002d178331a0d09e1e0cca9d899ff8164810f9875c652ab25cd331322ac5d369162a9c45a106b0ad9173f844bbc8f1e96bdc
-DIST zlib-0.5.4.1.tar.gz 127760 BLAKE2B 3e0ade0091a9d9e50fd4d0b9e65eba9a1fa7037fa4cfaa46d2d8b777d0d3338ddbc09c96ca12b5de8b2d7337c1a213d17b789cba971bb30b84ba1c3b34493c20 SHA512 aa3522a5704978badcf634e1d99282144f01ddee4600bd146631a3ee8b98080914eb2887869a5fa404dc9d1e438a5df87cf7d44548c2f3e1ec13ba19004ef985
 DIST zlib-0.5.4.2.tar.gz 127818 BLAKE2B 899a0edf39b9830d5223c05dce0d6e4a7884ac12b918bc54bdd820fb77c3701acde768179a1f1b1a88330c9c5ab46433eab0420744994013e9adbbe72fe451ff SHA512 9ee75d04bea192967dcc9f59f500a199c605ed6b18b7883e2876e1b3116929ef62ccff9cb7174a2d72b567241c3fc2eb794b3532831b929bd5f5a6236bc03410
-DIST zlib-0.6.1.1.tar.gz 142902 BLAKE2B 30cc774ca73fd657a9fbb00bda520855cf33932dbeae91c60f900b7c34a57014f14853535d6bd2bf0affbcda3545b896a2bbc1ebe5e289f78140244dd9ea8fb1 SHA512 b9f665308fe7887db376625d6001b5d4c511b6b0f392e366903e84f262cc7c81ed9746d9a5f0b84e9a0ec9dfdc91ed41809528dd50e067008a91ef5168cad12e
-DIST zlib-0.6.1.2.tar.gz 142413 BLAKE2B 3dac7acfc11b9e8dd00e7e9b35daa420a34f9cf58d06e7d82fb00f33025b9eb2769b966fdb9772937e8be182b16d502c14e4c6018fbdd72d942b6fca95f7d974 SHA512 0034eb1297eaf20ab64e5cbfc835cee1985d34bc248325bf57f7bf5cdf2918ab72f339fe5b8b3f5f16dee862f190e0c71612960b9021cf2ca70c951788b73fc1
-DIST zlib-0.6.2.1.tar.gz 143424 BLAKE2B 2395cb4a87943025088e343036772deae6d2d7a695cf7f6c958a37681e99da9d0a1acbe1f3191cb587d077128b9fe0f6986b3883fbdf91483f83b879b79b3e9d SHA512 cee7942a86afbd08f03c19abd88154cc866a3ccc52342264d4d5b28a71643adf30bf03ba939d6a98b7c065752f9ec326729fc38cfe72b66998551c89186048c5
-EBUILD zlib-0.5.4.1.ebuild 612 BLAKE2B f1f122b7880659c1506db897f2d6e457cb3563da33fae9a3518ee716f7acc4defe98b86eb9258234139c0794a2f7098e39525e2536795441ca815de10d9296db SHA512 1ec60c540693f9efa0e3a60a21dee96cdfc97cc86f3574e7d4058e6b6082d05f8aa18b5847d65ab595ce8b0c3cc57c1e9a7dd6066025c3f14ececfc16c341f90
-EBUILD zlib-0.5.4.2.ebuild 611 BLAKE2B 85b45841f864d5476d5ab06c867d414a0698fc535d32bb52870c5a6fc2b3d174e0b98ae6d3ef2867b96b0fa39a205a142d890047db70dc662941d5983f0c2be2 SHA512 f809dc5c1ab659d6e4cad0d3c195dfe9a3180f5508910d9da7140ffc8b31339582c1f20718f8288214d53f12093bce8aa07a97130d6978ee95abeba417e566ab
-EBUILD zlib-0.6.1.1.ebuild 819 BLAKE2B 4e2edb7173b1fde6ff3fac08ea605a8a4d8d730884533e611ca55ead333a8087dd217750a852443017d190127c90997facf122a843573b628c1b7a2bd5410840 SHA512 1f4bc0a32f578c5ac16d19354c0c5939fd22a5394302914641564baddfffc913ae546d0636fc0d9c0400288160f81b825058cb8e48c4c13ed1a6b5f3f402f09d
-EBUILD zlib-0.6.1.2.ebuild 1047 BLAKE2B bca9ea067ce28ee53d1b380b5f59a110cf1e256acd1e52a5db6e955c48fdf39860f206dda99cd8f9b6464e3fac3573170d40f4636b0e76f2ceaec7780cacd639 SHA512 a724d5e507ca2c1b1337390bdd0f559258fbdc060d4159a55a70a1753fb6cd73d2f91e6139e52b8922474da3466644deda8f1ca7183a6ff980a7bd3c8839f7e6
-EBUILD zlib-0.6.2.1.ebuild 1045 BLAKE2B 0fd56b5e8caeebc04a47f749c3147e814f0cf43b0c7670a778e3b5ce3a636c16e31468bd90927438904f289b79ce79d358f391a71341302ef2d7f7f873ef22bd SHA512 0f9eab9b244822d33cf03afa0efef3e0c9262d1bf985233d50d6ef94a16ba9b17fe4ba6934512d2a7083749c2d29ba63b21387913ae93ce19f0e0ef00dc93844
-MISC metadata.xml 824 BLAKE2B ea99ec3ad9a549c70455e91a59f38b6937da780e406c2bc18d039f93ef3cfdd08f600fb8854173c54ccbf029125204693f0da1592d30eb4554d479357299a7bb SHA512 c291a8088ad2d586390dad8cc2bb80a606fe7e558f4fdbba5c5168024693ea400f6d3a2795144f2c5af6cea51b90fe9097759027377ee8ead929296a4b4f26de
+DIST zlib-0.6.2.2.tar.gz 148178 BLAKE2B 8de5626a20f4ee2ea0dada54bdddc2340e3c3eba225ac5421a99bee9056aa6aecfd74f609745c4bc238e5cee056e6e463f0851ef7a6d5b0ec3312026f677d912 SHA512 3619b5c32e16a4fb9a68a9e6ea0beb9b14d06a4b5825811f429ee232a0ea13035335cd86c0301f8afcff126a473b86698fd310f9608e0e0ecb849714842be1ea
+EBUILD zlib-0.5.4.2.ebuild 599 BLAKE2B fb1bfb8a36a3662fb2d5650dbf3bc357f2d0a60f415615e1e667d264d2815eb3bf1ef7149e359424882523e9f660b5477d94a79ea01d62c813e3c9591a86a9bf SHA512 3a3542806f53bfc14a0e962fff5e939680eb172029ee2fb95df44b06e34ad23e9339e551ce52bc06919b3c05c0dcfe1c3cae78cb7c442f6d43be035767603c40
+EBUILD zlib-0.6.2.2.ebuild 1110 BLAKE2B ff67859d39c9353ae6a28367fe5cd70303a740201f77b45547a47f979320b136891ea7eeba2e6ed304969d3d69b8b1f1579574349be1b7491cc04baf3e743371 SHA512 daffe899a4c1bc877e3de632deee164f88ef842197db50eefce8536d99c128e71b0351cc057f569e629a9bb3104faf3ab66c1c0ebe5fc82099f5c87bc2c2e37a
+MISC metadata.xml 1169 BLAKE2B 00ccd79f20643336c55e80bf917a09ec31d214cc29629cb5cb1e838369ce8828929e7b9521d2526723ea951c97039f9135519d3cf42c07a6f547f621f4ea72fa SHA512 7955c1f302be91c1e6f864a2296d8b537c66b6b9f644c7fff67f94689e704ce182cc7d3811829883aae91b29b1fa06fb5cbe452f0b5d1e045e13bc46bf917c8c
diff --git a/dev-haskell/zlib/metadata.xml b/dev-haskell/zlib/metadata.xml
index d3253b28407a..45b44ae5f1ea 100644
--- a/dev-haskell/zlib/metadata.xml
+++ b/dev-haskell/zlib/metadata.xml
@@ -6,14 +6,16 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name='non-blocking-ffi'>Execute FFI calls in the context of haskell thread.</flag>
+		<flag name="bundled-c-zlib">Use the bundled zlib C sources. Requires pkg-config to be False. For windows, this is the default.</flag>
+		<flag name="non-blocking-ffi">The (de)compression calls can sometimes take a long time, which prevents other Haskell threads running. Enabling this flag avoids this unfairness, but with greater overall cost.</flag>
 	</use>
 	<longdescription>
 		This package provides a pure interface for compressing and
 		decompressing streams of data represented as lazy
-		'ByteString's. It uses the zlib C library so it has high
-		performance. It supports the \"zlib\", \"gzip\" and \"raw\"
-		compression formats.
+		&#39;ByteString&#39;s. It uses the
+		&lt;https://en.wikipedia.org/wiki/Zlib zlib C library&gt;
+		so it has high performance. It supports the \&quot;zlib\&quot;,
+		\&quot;gzip\&quot; and \&quot;raw\&quot; compression formats.
 		
 		It provides a convenient high level API suitable for most
 		tasks and for the few cases where more control is needed it
diff --git a/dev-haskell/zlib/zlib-0.5.4.1.ebuild b/dev-haskell/zlib/zlib-0.5.4.1.ebuild
deleted file mode 100644
index fb3dd95bc8fb..000000000000
--- a/dev-haskell/zlib/zlib-0.5.4.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Compression and decompression in the gzip and zlib formats"
-HOMEPAGE="https://hackage.haskell.org/package/zlib"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-		sys-libs/zlib"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/zlib/zlib-0.5.4.2.ebuild b/dev-haskell/zlib/zlib-0.5.4.2.ebuild
index b8bc41d79552..72e171c86f76 100644
--- a/dev-haskell/zlib/zlib-0.5.4.2.ebuild
+++ b/dev-haskell/zlib/zlib-0.5.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/zlib/zlib-0.6.1.1.ebuild b/dev-haskell/zlib/zlib-0.6.1.1.ebuild
deleted file mode 100644
index 51f1c95dc5c5..000000000000
--- a/dev-haskell/zlib/zlib-0.6.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Compression and decompression in the gzip and zlib formats"
-HOMEPAGE="https://hackage.haskell.org/package/zlib"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
-IUSE=""
-
-RESTRICT=test # needs porting to new test tools
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/quickcheck-2
-		>=dev-haskell/tasty-0.8
-		>=dev-haskell/tasty-hunit-0.8
-		>=dev-haskell/tasty-quickcheck-0.8 )
-"
diff --git a/dev-haskell/zlib/zlib-0.6.1.2.ebuild b/dev-haskell/zlib/zlib-0.6.1.2.ebuild
deleted file mode 100644
index 82afd79b82e5..000000000000
--- a/dev-haskell/zlib/zlib-0.6.1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Compression and decompression in the gzip and zlib formats"
-HOMEPAGE="https://hackage.haskell.org/package/zlib"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="non-blocking-ffi"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-		>=dev-haskell/tasty-0.8 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 )
-"
-
-PATCHES=("${FILESDIR}"/${P}-fix-w8-tests.patch)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag non-blocking-ffi non-blocking-ffi)
-}
diff --git a/dev-haskell/zlib/zlib-0.6.2.1.ebuild b/dev-haskell/zlib/zlib-0.6.2.2.ebuild
index 6f1dd928f376..0ec5d7b0d4a6 100644
--- a/dev-haskell/zlib/zlib-0.6.2.1.ebuild
+++ b/dev-haskell/zlib/zlib-0.6.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.9999
+# ebuild generated by hackport 0.6.6.9999
 #hackport: flags: +pkg-config
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
@@ -16,7 +16,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
-IUSE="non-blocking-ffi"
+IUSE="bundled-c-zlib non-blocking-ffi"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
 	sys-libs/zlib
@@ -32,6 +32,7 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	haskell-cabal_src_configure \
+		$(cabal_flag bundled-c-zlib bundled-c-zlib) \
 		$(cabal_flag non-blocking-ffi non-blocking-ffi) \
 		--flag=pkg-config
 }