gentoo resync : 20.03.2021

4 files changed, 83 insertions, 7 deletions

diff --git a/dev-haskell/hackage-security/Manifest b/dev-haskell/hackage-security/Manifest
index 4a8f14183fe8..fb2e81ffaebe 100644
--- a/dev-haskell/hackage-security/Manifest
+++ b/dev-haskell/hackage-security/Manifest
@@ -1,4 +1,8 @@
 AUX hackage-security-0.5.3.0-ghc-8.8.patch 720 BLAKE2B 1761f38642335f28a17d4bb089cf0f0de8acf4b14767e3c5987f723e520000865080c69e29d6a35870f0b5cca44f67371686beb84ff023d73fcd13fbfd89c962 SHA512 d220ea358e59a8b965695006ade99dad369a4648ab77012d0a7e3413d90d37809887f449b9e4831f97d2e871205f3b3d86fa4977ca781eb028993d393f002031
+AUX hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch 602 BLAKE2B 114b64c1e15b260b64ca68b2aadb1b4f462f160ec58cad2669d496083f28757f87474f76f6b8bbf203c80bb75106d16bab451af528f81edbf7a323a290c24cf7 SHA512 0380ed545b38e3a6f8c6b0232be2417a8e54a2f9027551247d3e796a82424cce21e62897a1f55924b757b19c391c5d411495c1e279821b5f6be27fcf57179c85
 DIST hackage-security-0.5.3.0.tar.gz 87119 BLAKE2B 6e69b13d3ee16fbc6488e1e9d926ba07d975555e9ad80c404ccfec60ff549e7eb2d40302ace8ac5f03ed5532c031f236f8a09edc8a3f8c7d4c2bb48743f88aa1 SHA512 57af812fb3911aed6ebdbc5de733e86a2bdc7845a07246c69346c59f654e7c4ae5bf20ad753cfe71dc1d7f47ce66a37fba49b178e8e6ff74002fc8ffb72d920d
+DIST hackage-security-0.6.0.1-r1.cabal 12313 BLAKE2B 41dbb4a5b175fe49ab65dba01aa1cbd1a43fbf55fc9cd06697dc984f9a3917d3da5c9c3234e336b78372899848b0fa5adf09f0507617ed0835dfad1443eb62ab SHA512 f4a8d2adde837af18587d74cf4191bc12dec22802aaafc4cd86968d893a41bf912d3649be339503063f8c698a4b8a62888ad50e0e58d3836cc55de100ca51e30
+DIST hackage-security-0.6.0.1.tar.gz 86006 BLAKE2B 6d057da569beb4e30f91a630ec37247fd47a3467e6037ebf0c4391ff58d95d5477bea09f7d66ab6d0bbe49a445ea15d53ded884f9ea7922583a03ba7497cdd9a SHA512 b83fdda3712c58bcc4237965e40bea16b9ce08f30c0671f45967e69a2eb85488e78a41c8d12b9f339f78f30cc50770a72e9e9a46e5ddf740a20bce4ea4e96fdb
 EBUILD hackage-security-0.5.3.0-r3.ebuild 2638 BLAKE2B 3e51aaaf5e00c49d738ff7ba0157957acd79a557f7a96249048038f54789dde0e3b7b9b5217a845973e2de8e201a0d6f8f4b4a0d2d1f25482f2c5b1718d7064c SHA512 0090fb12f14d8a265d69740562e481ac5636e4daa7b97c3f2bcd97e67d7495a45f3fb08792d162b753ad07c8b55fb6e3b2d4808d9da228e6c7b7c5718003bb82
-MISC metadata.xml 1347 BLAKE2B 4b6d1718cd6cc1ce9c455413eb9c96079ef724007f997b7495c6886161dfef3dd835d8371943a6962c108b8636f0c430cd0e572a70d6ec6d4f02188bc756a2a2 SHA512 d3e388264352de1ace5022bd843c68454476c65bf8475f4e00dc455da01f128b36d2b1122c452227157d3ca9529d2a8e14df5fc8cb51c6f53bea2c3770f17469
+EBUILD hackage-security-0.6.0.1-r1.ebuild 2560 BLAKE2B 821843587bd007c7de6b72b671d082462254a290fd866d7c7dcec186088860a6180d126f6e8c69167275493dddcf7bcec18805971989273b72c8aac595b45f28 SHA512 66780d0440e1fbdbb7fb3b8396cb10bff59bc7cebbfc618bf569c71b0dc631dbfe24d1fd34d5665b1efb1022c5a954884202bac02c929cf6d2975bbba43b35a8
+MISC metadata.xml 1319 BLAKE2B cfadd7855c2ac34d82c8e824219403207a705a52761b9faa7c002706a1d4379f0763a503778ccb6b51fd0c882efbab4bf2e95e4a8e034160158a54b1bb1284a8 SHA512 72182d8681d39c56c436cb898105409f749c4fcc12b5be91f250127989f57e989da9eedef29af0aa0467fb03f522e1617e01314f61af44a499f68f3914a0f8ae
diff --git a/dev-haskell/hackage-security/files/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch b/dev-haskell/hackage-security/files/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch
new file mode 100644
index 000000000000..fd83a5113c56
--- /dev/null
+++ b/dev-haskell/hackage-security/files/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/TestSuite.hs b/tests/TestSuite.hs
+index 598e151..f62f1c5 100644
+--- a/tests/TestSuite.hs
++++ b/tests/TestSuite.hs
+@@ -70,7 +70,7 @@ tests = testGroup "hackage-security" [
+           testProperty "prop_roundtrip_canonical" JSON.prop_roundtrip_canonical
+         , testProperty "prop_roundtrip_pretty"    JSON.prop_roundtrip_pretty
+         , testProperty "prop_canonical_pretty"    JSON.prop_canonical_pretty
+-        , testProperty "prop_aeson_canonical"     JSON.prop_aeson_canonical
++        -- , testProperty "prop_aeson_canonical"     JSON.prop_aeson_canonical
+         ]
+   ]
+ 
diff --git a/dev-haskell/hackage-security/hackage-security-0.6.0.1-r1.ebuild b/dev-haskell/hackage-security/hackage-security-0.6.0.1-r1.ebuild
new file mode 100644
index 000000000000..e10ab6c3c0b5
--- /dev/null
+++ b/dev-haskell/hackage-security/hackage-security-0.6.0.1-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+# hackport: flags: -mtl21,+use-network-uri
+
+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
+	https://hackage.haskell.org/package/${P}/revision/4.cabal -> ${PF}.cabal"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+# keep in sync with ghc-8.10
+KEYWORDS="~amd64 ~x86"
+IUSE="+lukko"
+
+RDEPEND=">=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-bytestring-1.1:=[profile?]
+	>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?]
+	>=dev-haskell/cabal-1.14:=[profile?] <dev-haskell/cabal-3.6:=[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/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[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-8.4.3:=
+	lukko? ( >=dev-haskell/lukko-0.1:=[profile?] <dev-haskell/lukko-0.2:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/aeson-1.4 <dev-haskell/aeson-1.6
+		>=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.4
+		>=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11
+		>=dev-haskell/temporary-1.2 <dev-haskell/temporary-1.4
+		>=dev-haskell/unordered-containers-0.2.8.0 <dev-haskell/unordered-containers-0.3
+		>=dev-haskell/vector-0.12 <dev-haskell/vector-0.13 )
+"
+
+# See upstream issue #247 for more details, https://github.com/haskell/hackage-security/issues/
+PATCHES=( "${FILESDIR}/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch"  )
+
+src_prepare() {
+	default
+
+	cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag lukko lukko) \
+		--flag=-mtl21 \
+		--flag=use-network-uri
+}
diff --git a/dev-haskell/hackage-security/metadata.xml b/dev-haskell/hackage-security/metadata.xml
index 47b37051ae7f..9f0ec91b2400 100644
--- a/dev-haskell/hackage-security/metadata.xml
+++ b/dev-haskell/hackage-security/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
+		<flag name="lukko">Use @lukko@ for file-locking, otherwise use @GHC.IO.Handle.Lock@</flag>
 	</use>
 	<longdescription>
 		The hackage security library provides both server and
@@ -26,10 +27,5 @@
 		clients (the typical example being @cabal@), and
 		"Hackage.Security.Server" is the main entry point for
 		servers (the typical example being @hackage-server@).
-		
-		This is a beta release.
 	</longdescription>
-	<upstream>
-		<remote-id type="github">well-typed/hackage-security</remote-id>
-	</upstream>
 </pkgmetadata>