gentoo resync : 31.01.2021

5 files changed, 8 insertions, 38 deletions

diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 135fe657d40d..3a996af79d79 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/linear/Manifest b/dev-haskell/linear/Manifest
index f034edfd1357..cf29aa98000d 100644
--- a/dev-haskell/linear/Manifest
+++ b/dev-haskell/linear/Manifest
@@ -1,4 +1,4 @@
 AUX linear-1.20.9-base-orphans-0.8.3.patch 350 BLAKE2B 59f54e2808e4b67e83418f72c96995eacb610496a94fcbe8431be188181f562ddfda26de2a2883b3e621b73e172c92d9a849cc4419c826f60d145fbc48942acf SHA512 979bc685b09f5adb7bf40eaac9121f2d0fae0add1ac70770a10d99ee9a0711fb0a107d3831b1edf8791a3b9a005fb81bf13857fcc590686dce78c3a2aa52284e
-DIST linear-1.20.9.tar.gz 49250 BLAKE2B ae51a3d7c7570ffa2e43ba9c7170c53f010050ab83ffe5f99f6717c76c4b78e462919f3938a0b7db5f654d4a65241abe87dc167ac5dba78db0097d8a806ee33d SHA512 4b3fc0d1f0cfc79b67cb3c0fe823ca7f1f02b7b3deab98c32ec56b12f5764a6a18db9cbe2218e91b3efa5deea6675d4ddf166a1600a9aa8b7ad3f1da68cb6f52
-EBUILD linear-1.20.9.ebuild 2266 BLAKE2B 8e0a3e3b0b7fb41f5f61cf69dece6802db610bcb0c16514939060073f3e6ed8bc112a96e52506f46533f9d34aa9b7a6927fdb61b1354c4ef4994075f90c1eed2 SHA512 a69bbb2e17a82f7edb9d312d514fdc128606ae544a408ddc2c9da980612646b65bcbededf6dbc2b7623695a54780f9029f80e0d64297d92b2b9b9e8faff9db2a
+DIST linear-1.21.3.tar.gz 54001 BLAKE2B debc60d15256947f9134f5debff4b07b206aa5d1aac3e63fb5ae239b881987369b5d2766a658dcdc5225a978f4b464b65c76a0fbb00312b650d7c13bf818e25b SHA512 0fc979f1e2cad5d24ea9385469d8b230f53976e9405b762dfe2d2cafb40239d7785e2ef5ad0dd1b482718e05023ba1e79fad0ce3e6886c1510c76f27a2a5ff02
+EBUILD linear-1.21.3.ebuild 2283 BLAKE2B 7b6043349f58a2d2706363d21e710df110dc36c7cb8ca7dc74970a7dd4faaadc982e17e3d0c2bc75aff264e7266ee62595019d556f30151fc80a792c498e9e1e SHA512 4c0aa82e96d3eee06aea29d4226c0e2034719308d65dd5c53f7894fef8ee3bbf35bd0d1925b8b3940e9a582d097c98d6d4ea59ff9e7a0141f10ceb3e6f99ec74
 MISC metadata.xml 608 BLAKE2B 8ed930ec4abd2b09493c29bfeb3c29599f27e2082f7f627801800453ca89ddac037d5832f7995b1a65e81af5fa42ff091397dd762c7f614716b3a11512f75394 SHA512 69f2d315538225a3e43f805a857521803f1a68a928baad43a5197adf4cd2fcac36b1f44fd8714da7ae2c38ec973795689bf3859570b215b997483421b9c9ddbc
diff --git a/dev-haskell/linear/linear-1.20.9.ebuild b/dev-haskell/linear/linear-1.21.3.ebuild
index 2a04c9081129..033a163d5e5a 100644
--- a/dev-haskell/linear/linear-1.20.9.ebuild
+++ b/dev-haskell/linear/linear-1.21.3.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=7
 
-# ebuild generated by hackport 0.6.9999
+# ebuild generated by hackport 0.6.7.9999
 #hackport: flags: -herbie
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite rebuild-after-doc-workaround"
 inherit haskell-cabal
 
 DESCRIPTION="Linear Algebra"
@@ -18,15 +18,14 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="+template-haskell"
 
-RESTRICT=test # broken on USE=doc
-
 RDEPEND=">=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[profile?]
-	>=dev-haskell/base-orphans-0.5:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
+	>=dev-haskell/base-orphans-0.8.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
 	>=dev-haskell/bytes-0.15:=[profile?] <dev-haskell/bytes-1:=[profile?]
 	>=dev-haskell/cereal-0.4.1.1:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
 	>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
 	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
 	>=dev-haskell/lens-4.15.2:=[profile?] <dev-haskell/lens-5:=[profile?]
+	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?]
 	>=dev-haskell/reflection-1.3.2:=[profile?] <dev-haskell/reflection-3:=[profile?]
 	>=dev-haskell/semigroupoids-5.2.1:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
 	>=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?]
@@ -40,15 +39,13 @@ RDEPEND=">=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[pr
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.18.1.3
 	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
-	test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17
+	test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.18
 		>=dev-haskell/hunit-1.2.5
 		>=dev-haskell/simple-reflect-0.3.1
 		>=dev-haskell/test-framework-0.8
 		>=dev-haskell/test-framework-hunit-0.3 )
 "
 
-PATCHES=("${FILESDIR}"/${P}-base-orphans-0.8.3.patch)
-
 src_configure() {
 	haskell-cabal_src_configure \
 		--flag=-herbie \
diff --git a/dev-haskell/zlib/Manifest b/dev-haskell/zlib/Manifest
index dc70d50fc997..514aeb18793b 100644
--- a/dev-haskell/zlib/Manifest
+++ b/dev-haskell/zlib/Manifest
@@ -1,5 +1,3 @@
-DIST zlib-0.5.4.2.tar.gz 127818 BLAKE2B 899a0edf39b9830d5223c05dce0d6e4a7884ac12b918bc54bdd820fb77c3701acde768179a1f1b1a88330c9c5ab46433eab0420744994013e9adbbe72fe451ff SHA512 9ee75d04bea192967dcc9f59f500a199c605ed6b18b7883e2876e1b3116929ef62ccff9cb7174a2d72b567241c3fc2eb794b3532831b929bd5f5a6236bc03410
 DIST zlib-0.6.2.2.tar.gz 148178 BLAKE2B 8de5626a20f4ee2ea0dada54bdddc2340e3c3eba225ac5421a99bee9056aa6aecfd74f609745c4bc238e5cee056e6e463f0851ef7a6d5b0ec3312026f677d912 SHA512 3619b5c32e16a4fb9a68a9e6ea0beb9b14d06a4b5825811f429ee232a0ea13035335cd86c0301f8afcff126a473b86698fd310f9608e0e0ecb849714842be1ea
-EBUILD zlib-0.5.4.2.ebuild 588 BLAKE2B 6b8a73f2f86c51527d23f8c9088338b3d5818613b8a9fbea927ba4bb6da178703bec8731640b227adbf4b9c839bf105e1b45d5e72a272d53e10b6d026decca7a SHA512 97108383c2611eba396ea3755fa39ae834364ae86360d6f377403fb49361da7953dfdf3f44407310bdc0f8aeb97ce27394a92fa1b4ee8805552b8e1811868065
 EBUILD zlib-0.6.2.2.ebuild 1099 BLAKE2B 3a861ecc21cf9fee1abdf10d6cf9286edcb311d6c9298b275e79d4447d68c8a6f061ed1602c47064d5de263da533769428972e510f71297d263abfb9e7e65c4f SHA512 6da795f3b91902d54d0f459174da7df8f4586896f046714a7c320c53c98307399c49946f43ba228dc3b21d30a9f9daecbd0eb4908922612e9320b34f22950694
 MISC metadata.xml 1169 BLAKE2B 00ccd79f20643336c55e80bf917a09ec31d214cc29629cb5cb1e838369ce8828929e7b9521d2526723ea951c97039f9135519d3cf42c07a6f547f621f4ea72fa SHA512 7955c1f302be91c1e6f864a2296d8b537c66b6b9f644c7fff67f94689e704ce182cc7d3811829883aae91b29b1fa06fb5cbe452f0b5d1e045e13bc46bf917c8c
diff --git a/dev-haskell/zlib/zlib-0.5.4.2.ebuild b/dev-haskell/zlib/zlib-0.5.4.2.ebuild
deleted file mode 100644
index df1644803e2a..000000000000
--- a/dev-haskell/zlib/zlib-0.5.4.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 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="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 ~x86 ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"