gentoo auto-resync : 23:07:2022 - 08:50:15

4 files changed, 17 insertions, 116 deletions

diff --git a/dev-haskell/hackage-security/Manifest b/dev-haskell/hackage-security/Manifest
index cef34b5bba2d..96f87ba36e6b 100644
--- a/dev-haskell/hackage-security/Manifest
+++ b/dev-haskell/hackage-security/Manifest
@@ -1,8 +1,5 @@
 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
-EBUILD hackage-security-0.6.0.1-r1.ebuild 2560 BLAKE2B 821843587bd007c7de6b72b671d082462254a290fd866d7c7dcec186088860a6180d126f6e8c69167275493dddcf7bcec18805971989273b72c8aac595b45f28 SHA512 66780d0440e1fbdbb7fb3b8396cb10bff59bc7cebbfc618bf569c71b0dc631dbfe24d1fd34d5665b1efb1022c5a954884202bac02c929cf6d2975bbba43b35a8
-MISC metadata.xml 1320 BLAKE2B 4fc1fda9e5cd9d3b327538653cdd106cf1fc92d40673a896f47127b5e334548e776fa66d0f4967339d6bd932d4959ac92ec6815a7f59ddc736ad2984b38e671f SHA512 f0e17101d86466569d55e37146eb815d753d1dd263a5dca2bb76f1af18aeed7fc57866103b06cae9c522791dad5902f5397189f8d4e776224da375139ea6cebb
+DIST hackage-security-0.6.1.0.tar.gz 86243 BLAKE2B f28651d9c0506e4e1b9085e1efd6647ad3dd0dea4fcec2823f3072504831e7d01be34f6a14619cc352ef236214a1fd7073449f00c82c8f7ef5e95cdca1ad3133 SHA512 0a303e8c594a5fef52bf95f3ff75379aeec44fdaebc6ba78da8bf7911798040b43c3c289f0c4d7bcd2c1903d82c29d5ffa012360660c3548c0f3fb4b719a9327
+EBUILD hackage-security-0.6.1.0.ebuild 2324 BLAKE2B 4b788fcb42e4b375dd7f001f3fde38a080ad8e3f6eaf11c90e4ef13b4632c3fd3ee089b1158e64271115e1d0f556f6fd5b8ba685bdc3b0a6f94e7c370a3f0b97 SHA512 86a65171444ecf1a46d2cac5d5be960e16aac7df6037114e74232669475b14515912e6ed7bd0d624aa71e708324e59b804982795b314a62e0cd982d4e3817b59
+MISC metadata.xml 358 BLAKE2B 12d49d372b9d972b090959fa4386cd071450c6c038d3cbe5adc0b2ff5de41de6fc422cc0063382c84dc1a2e188e3eae64e2ce84504587aff452e4fc11d895b2f SHA512 ad8b0b471b64cc9dec807c71d5c2cebea90558a51794c36cff68b30c65e9f8d3f5f965c660a989e1c0a98636c2670926629913ab5b8916524609ceed4a47db91
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
deleted file mode 100644
index 2c6a4be4ebc2..000000000000
--- a/dev-haskell/hackage-security/hackage-security-0.5.3.0-r3.ebuild
+++ /dev/null
@@ -1,68 +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.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/hackage-security-0.6.0.1-r1.ebuild b/dev-haskell/hackage-security/hackage-security-0.6.1.0.ebuild
index e10ab6c3c0b5..3923c2735456 100644
--- a/dev-haskell/hackage-security/hackage-security-0.6.0.1-r1.ebuild
+++ b/dev-haskell/hackage-security/hackage-security-0.6.1.0.ebuild
@@ -1,60 +1,52 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.7.9999
-# hackport: flags: -mtl21,+use-network-uri
+# ebuild generated by hackport 0.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"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 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:=
+	>=dev-haskell/cabal-1.14:=[profile?] <dev-haskell/cabal-3.8:=[profile?]
+	>=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
 	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
+	test? ( >=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.5
 		>=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/text
 		>=dev-haskell/unordered-containers-0.2.8.0 <dev-haskell/unordered-containers-0.3
-		>=dev-haskell/vector-0.12 <dev-haskell/vector-0.13 )
+		>=dev-haskell/vector-0.12 <dev-haskell/vector-0.13
+		|| ( ( >=dev-haskell/aeson-1.4 <dev-haskell/aeson-1.5 )
+			|| ( ( >=dev-haskell/aeson-1.5 <dev-haskell/aeson-1.6 )
+				( >=dev-haskell/aeson-2.0 <dev-haskell/aeson-2.1 ) ) ) )
 "
 
-# 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) \
diff --git a/dev-haskell/hackage-security/metadata.xml b/dev-haskell/hackage-security/metadata.xml
index b6aa0a6ae2b4..67d5d614a4f2 100644
--- a/dev-haskell/hackage-security/metadata.xml
+++ b/dev-haskell/hackage-security/metadata.xml
@@ -6,26 +6,6 @@
 		<name>Gentoo Haskell</name>
 	</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
-		client utilities for securing the Hackage package server
-		(&lt;http://hackage.haskell.org/&gt;).  It is based on The Update
-		Framework (&lt;http://theupdateframework.com/&gt;), a set of
-		recommendations developed by security researchers at
-		various universities in the US as well as developers on the
-		Tor project (&lt;https://www.torproject.org/&gt;).
-		
-		The current implementation supports only index signing,
-		thereby enabling untrusted mirrors. It does not yet provide
-		facilities for author package signing.
-		
-		The library has two main entry points:
-		"Hackage.Security.Client" is the main entry point for
-		clients (the typical example being @cabal@), and
-		"Hackage.Security.Server" is the main entry point for
-		servers (the typical example being @hackage-server@).
-	</longdescription>
 </pkgmetadata>