gentoo resync : 25.08.2020

4 files changed, 85 insertions, 1 deletions

diff --git a/dev-haskell/hackage-security/Manifest b/dev-haskell/hackage-security/Manifest
index d039d5bca9c9..d8e48aa259f2 100644
--- a/dev-haskell/hackage-security/Manifest
+++ b/dev-haskell/hackage-security/Manifest
@@ -1,3 +1,6 @@
+AUX hackage-security-0.5.3.0-ghc-8.8.patch 720 BLAKE2B 1761f38642335f28a17d4bb089cf0f0de8acf4b14767e3c5987f723e520000865080c69e29d6a35870f0b5cca44f67371686beb84ff023d73fcd13fbfd89c962 SHA512 d220ea358e59a8b965695006ade99dad369a4648ab77012d0a7e3413d90d37809887f449b9e4831f97d2e871205f3b3d86fa4977ca781eb028993d393f002031
 DIST hackage-security-0.5.2.2.tar.gz 83131 BLAKE2B 4ce0ff3d4ee2647ac5311996756ce43aa91ee7989ef6a46ea94679890900811c770e5ce91acc0e39fe0e42767cdd6d21bb11bee7d385c9e3a30c642b9471f423 SHA512 5adab3c46d7aada8668128ad8c9389ca65489eec776f8571b8ee5834d74b961f19b558cb6642cbb1891ee381b2d4f2019dddf29bad13607fe23bef49a3d6f535
+DIST hackage-security-0.5.3.0.tar.gz 87119 BLAKE2B 6e69b13d3ee16fbc6488e1e9d926ba07d975555e9ad80c404ccfec60ff549e7eb2d40302ace8ac5f03ed5532c031f236f8a09edc8a3f8c7d4c2bb48743f88aa1 SHA512 57af812fb3911aed6ebdbc5de733e86a2bdc7845a07246c69346c59f654e7c4ae5bf20ad753cfe71dc1d7f47ce66a37fba49b178e8e6ff74002fc8ffb72d920d
 EBUILD hackage-security-0.5.2.2.ebuild 2032 BLAKE2B 242ff84e8aefaf864b93e461aa9d1fa1a289b5789733e346afc9a82a07e822e65016be85171dc14ba5e545ec47c33c8a2a2fe564385dbdd072681269d1c93489 SHA512 798100a59bcdb6e9a60d1b0064ff76d49ccdcb3cacbc05bf58c2ce75d65d3aa5004db88378eecbcf750a7703f829a246bb38d168c60166ed6a6944672b84e8a1
-MISC metadata.xml 1351 BLAKE2B c2977bbb8e8b408a51025c61970fe9881207ca2c91e5b7c7778a6c46caa15314c3536b2c720370c7739d37ca38c3f1693bd4c6ad024a5eaede982cd5940e0c07 SHA512 bc2b65083d43a010a500ee5d47300703dec5a0b1bd4490ad8a64a35063e15bf198124aa049eb895c3c42dfd021720d32b7c73eddbbabb105d5e851b24e78cf46
+EBUILD hackage-security-0.5.3.0-r3.ebuild 2638 BLAKE2B 3e51aaaf5e00c49d738ff7ba0157957acd79a557f7a96249048038f54789dde0e3b7b9b5217a845973e2de8e201a0d6f8f4b4a0d2d1f25482f2c5b1718d7064c SHA512 0090fb12f14d8a265d69740562e481ac5636e4daa7b97c3f2bcd97e67d7495a45f3fb08792d162b753ad07c8b55fb6e3b2d4808d9da228e6c7b7c5718003bb82
+MISC metadata.xml 1431 BLAKE2B 03fa714e5907e9f885b674cec4e11b811777b613ca9aaf59ab5ec6dcd8bf24c55f0750ebe0e6149a787d1dcc258153e52cbf4df66e4ea54befbd4f2359310c2d SHA512 cb667e67ba19c24521883b51ddc4a18d4001c0871b38f4cbaf24dbf0eebac8ba96457298d11682748d3d6039e6f5cf88e9613d7114a03c96786c49d83964e3ba
diff --git a/dev-haskell/hackage-security/files/hackage-security-0.5.3.0-ghc-8.8.patch b/dev-haskell/hackage-security/files/hackage-security-0.5.3.0-ghc-8.8.patch
new file mode 100644
index 000000000000..7c30961a4b4d
--- /dev/null
+++ b/dev-haskell/hackage-security/files/hackage-security-0.5.3.0-ghc-8.8.patch
@@ -0,0 +1,12 @@
+diff -ru hackage-security-0.5.3.0.orig/src/Hackage/Security/TUF/FileMap.hs hackage-security-0.5.3.0/src/Hackage/Security/TUF/FileMap.hs
+--- hackage-security-0.5.3.0.orig/src/Hackage/Security/TUF/FileMap.hs	2018-03-25 19:39:07.000000000 -0400
++++ hackage-security-0.5.3.0/src/Hackage/Security/TUF/FileMap.hs	2019-03-16 08:29:08.347456951 -0400
+@@ -78,7 +78,7 @@
+ lookupM :: Monad m => FileMap -> TargetPath -> m FileInfo
+ lookupM m fp =
+     case lookup fp m of
+-      Nothing  -> fail $ "No entry for " ++ pretty fp ++ " in filemap"
++      Nothing  -> error $ "No entry for " ++ pretty fp ++ " in filemap"
+       Just nfo -> return nfo
+ 
+ {-------------------------------------------------------------------------------
diff --git a/dev-haskell/hackage-security/hackage-security-0.5.3.0-r3.ebuild b/dev-haskell/hackage-security/hackage-security-0.5.3.0-r3.ebuild
new file mode 100644
index 000000000000..2c6a4be4ebc2
--- /dev/null
+++ b/dev-haskell/hackage-security/hackage-security-0.5.3.0-r3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Hackage security library"
+HOMEPAGE="https://github.com/haskell/hackage-security"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri"
+
+RESTRICT=test # QC-2.10 finds counterexamples
+
+RDEPEND=">=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
+	>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/cabal-1.14:=[profile?]
+	>=dev-haskell/cryptohash-sha256-0.11:=[profile?] <dev-haskell/cryptohash-sha256-0.12:=[profile?]
+	>=dev-haskell/ed25519-0.0:=[profile?] <dev-haskell/ed25519-0.1:=[profile?]
+	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+	>=dev-haskell/old-locale-1.0:=[profile?]
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
+				>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2.5:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( >=dev-haskell/quickcheck-2.9
+		>=dev-haskell/tasty-1.0
+		>=dev-haskell/tasty-hunit-0.10
+		>=dev-haskell/tasty-quickcheck-0.10
+		>=dev-haskell/temporary-1.2
+		!network-uri? ( dev-haskell/network-uri ) )
+"
+
+PATCHES=("${FILESDIR}"/${P}-ghc-8.8.patch)
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base              >= 4.5     && < 4.12' 'base              >= 4.5' \
+		'tasty            == 1.0.*' 'tasty            >= 1.0' \
+		'tasty-hunit      == 0.10.*' 'tasty-hunit      >= 0.10' \
+		'tasty-quickcheck == 0.10.*' 'tasty-quickcheck >= 0.10' \
+		'QuickCheck       == 2.9.*' 'QuickCheck       >= 2.9' \
+		'temporary        == 1.2.*' 'temporary        >= 1.2' \
+		'network     >= 2.6 && < 2.7' 'network     >= 2.6' \
+		'Cabal             >= 1.14    && < 2.4' 'Cabal             >= 1.14' \
+		'containers        >= 0.4     && < 0.6' 'containers        >= 0.4' \
+		'time              >= 1.2     && < 1.9' 'time              >= 1.2'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri use-network-uri)
+}
diff --git a/dev-haskell/hackage-security/metadata.xml b/dev-haskell/hackage-security/metadata.xml
index a3594f6cd4ae..4a4ad2a438d2 100644
--- a/dev-haskell/hackage-security/metadata.xml
+++ b/dev-haskell/hackage-security/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="use-network-uri">Get Network.URI from the network-uri package.</flag>
+		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
 	</use>
 	<longdescription>
 		The hackage security library provides both server and