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

4 files changed, 28 insertions, 174 deletions

diff --git a/dev-haskell/aeson/Manifest b/dev-haskell/aeson/Manifest
index 24d13284c30a..f4cb61377367 100644
--- a/dev-haskell/aeson/Manifest
+++ b/dev-haskell/aeson/Manifest
@@ -1,7 +1,5 @@
 AUX aeson-1.5.6.0-fix-tests-ghc_9.patch 9678 BLAKE2B 40512bbb1bbd0d8a80baad69ce70454132bb81aecedcf0011c7466c1eea81871e205af54da9f4aa51abd34ad4a64289f9ae28bdb90433dd07f03111795c54ff2 SHA512 e81925089a7bd43f9aaebaf20633afeb66b59fe5eb3c9e2b2123d5b4e790e5143a9470b0726698cfb6588132fc68296f5b60f0ccbf12bcb23fff3fe20ddbf915
-DIST aeson-1.4.7.1.tar.gz 277911 BLAKE2B bffac6e82e7220f270fce44055859b27a97740b6f012f4e51d0970acd38a7bcd40d9bc3c4f1ba1df0df4d3d38dac0b8731dfdfe1f902b07a38efeaea842587d2 SHA512 236ed1b2cc4b39d49277cea5b787b6107c7efbe1c0d73de2005d400746bacf44c6b8ef5d26619395e24844f8948115685963ec7d03a998d0b728ab992e32e705
-DIST aeson-1.5.6.0.cabal 6788 BLAKE2B b7ad53a5ef4c0a06ad39bcc6bb19c7f3635c629edafdd03acf8e45163170506d00b7843a17bc4bd062bcfb922da949e9ec562ca62f0929b74bc094ee213aadf9 SHA512 6da627332e2d7b4af33ff53718e84b4b9fa11bc8b8ba82dffc9c5ea9f290b7628aa8015e9b2c8798ad402e184ce70253b0fdf49b4f60e7e22e2346f2f319fcc0
-DIST aeson-1.5.6.0.tar.gz 286364 BLAKE2B cc9524f025144b74dc70aca13576de935b24f1ae2befa027f6ae7d93b20bae8e5f399ed0147e351f1e46579d628923ef019be934572376cbe0a3b2ea497fcb01 SHA512 31e0339945aec6d84aec230c09001fe6e7926f008d3444d12264bb323d0a050515303fdc8eeb6563733594209d930cdd2f82eb4dfe4dd4d5c573748aaa71813d
-EBUILD aeson-1.4.7.1.ebuild 3016 BLAKE2B cca901c7d0e1e3892d8f6feeec1f6466fb4b3383b29e47b4f7c39cc7a139b5dede445f2de99190ba4666be57bceb58b640a6c0da9f422b4d1b2380bd97091447 SHA512 65c1366c1d7548654a1ff11d6975cc7536ef2ef3a62fc70e63e451140d6f8ca8f2511d27d8e2eb5cef3b31e37284c0c1fd20e856c4272dacab18111f7dc957ec
-EBUILD aeson-1.5.6.0.ebuild 3408 BLAKE2B 1228d2c9eaff3dc05d4765369d939874d6256ea5bcfb1bbe87f77da4713ce45634bac116e02c73ec17b83d948cb42f3996234a4064dba93faebc9618ee4a6fc2 SHA512 02be07f319fae91c0860dff6a43b90ff838a43fe03cc68d650d098280ab3ad423caf4e8869d694132c2ad9a000a05548a23061356ac856b1072a00560b1b5d77
-MISC metadata.xml 2437 BLAKE2B 2856043d84fb9355a0a86b43b9e2e8ad83442e5b75ea13c0a7be9abfb0088711b4454da4a2775e0af406b760a3ffc1f8c07e572c6d8d62d3953b10909c375b1b SHA512 400fc3cce9f3acd57d498027425608155dfa40dfa466ec98512d37f61684fbc5ff975c22d3bd3f453dbf1df206023855bf6e6d678d5a9b1acbba281b773a8098
+DIST aeson-2.0.3.0-rev1.cabal 5867 BLAKE2B c64638d037ee4599a15c2c2c051b569649f57663312aaebc10c2a47cf2dfd834d03e8e4c909d70874737fd407f46f75744052ebe9319cde8ef56e4676115dbe0 SHA512 54b3ed453d6ec93a73d4bb639132164e1ffa698e87076577da39137ec2bb62b0c1a2f66d9412e1adad97d7d6cc32a6738e0495b0c4d312c183d7a29d01a29784
+DIST aeson-2.0.3.0.tar.gz 297283 BLAKE2B e6784fd2081c56d6f2f2fb82b383478ab743fcce77568c430c2b62a79b4ee89901b7e278b1da948215215d50ef72bbdef128fb5dfb6679c92d30586d1406302e SHA512 546adaaf864ca40012a268d71f442479f0ad7c69e9f943391801570e227a2faa652494766f1f63b77c730e019e83ebdd7511426baa12792a28fbb470eca64552
+EBUILD aeson-2.0.3.0.ebuild 3185 BLAKE2B 9bf0dcfdb4c766f99f3147315f29468177819b389f9a7ebaba8a06bb31c69f2b13237a0a4bfc7ca14315ef3e1b47cba2cf6813748fbc1b5aaf52925caf1e91b3 SHA512 736b3d9105dd665f2c66c07633c9ea6d6181586906ba43673bc164e2e9d94a46b866720fe2cb55ebf4bc9baed1d02bd11163d12af9cf69ff7bb3cbdd7187842c
+MISC metadata.xml 473 BLAKE2B 14ab26a3dbce1cc6d36ecd8e82d49f8c7c3b0ade0c498038287a6dc0acc5a959357173c0d3789e04cd85dbe78e29694f3bfe4396664da00be777670bac0630be SHA512 7bc52cb32a6dc5e20d96e40fd29ab6dbe48e1940505877b4f0b15879c1d25c8ce6d38476b3ca8b6f091288bffb9a70119431ae52a5da13becf903ccf8cc62f82
diff --git a/dev-haskell/aeson/aeson-1.4.7.1.ebuild b/dev-haskell/aeson/aeson-1.4.7.1.ebuild
deleted file mode 100644
index cbb99b44a856..000000000000
--- a/dev-haskell/aeson/aeson-1.4.7.1.ebuild
+++ /dev/null
@@ -1,65 +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.6.4.9999
-#hackport: flags: -developer,-bytestring-builder
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast JSON parsing and encoding"
-HOMEPAGE="https://github.com/bos/aeson"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="cffi fast"
-
-RDEPEND=">=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/base-compat-batteries-0.10.0:=[profile?] <dev-haskell/base-compat-batteries-0.12:=[profile?]
-	>=dev-haskell/contravariant-1.4.1:=[profile?] <dev-haskell/contravariant-1.6:=[profile?]
-	>=dev-haskell/dlist-0.8.0.4:=[profile?] <dev-haskell/dlist-0.9:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/nats-1.1.1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
-	>=dev-haskell/primitive-0.6.3.0:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
-	>=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/th-abstraction-0.2.8.0:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
-	>=dev-haskell/time-compat-1.9.2.2:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
-	>=dev-haskell/transformers-compat-0.6.2:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
-	>=dev-haskell/vector-0.12.0.1:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/base-compat
-		>=dev-haskell/base-orphans-0.5.3 <dev-haskell/base-orphans-0.9
-		dev-haskell/base16-bytestring
-		>=dev-haskell/diff-0.4 <dev-haskell/diff-0.5
-		>=dev-haskell/generic-deriving-1.10 <dev-haskell/generic-deriving-1.14
-		>=dev-haskell/hashable-time-0.2 <dev-haskell/hashable-time-0.3
-		>=dev-haskell/integer-logarithms-1 <dev-haskell/integer-logarithms-1.1
-		>=dev-haskell/quickcheck-2.10.0.1 <dev-haskell/quickcheck-2.14
-		>=dev-haskell/quickcheck-instances-0.3.21 <dev-haskell/quickcheck-instances-0.4
-		dev-haskell/tasty
-		dev-haskell/tasty-golden
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-bytestring-builder \
-		$(cabal_flag cffi cffi) \
-		--flag=-developer \
-		$(cabal_flag fast fast)
-}
diff --git a/dev-haskell/aeson/aeson-1.5.6.0.ebuild b/dev-haskell/aeson/aeson-2.0.3.0.ebuild
index e2b77cc5ad62..c07766dcf743 100644
--- a/dev-haskell/aeson/aeson-1.5.6.0.ebuild
+++ b/dev-haskell/aeson/aeson-2.0.3.0.ebuild
@@ -3,44 +3,44 @@
 
 EAPI=8
 
-# ebuild generated by hackport 0.6.7.9999
+# ebuild generated by hackport 0.7.1.2.9999
 #hackport: flags: -developer,-bytestring-builder,-fast
 
+CABAL_HACKAGE_REVISION=1
+
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-CABAL_HACKAGE_REVISION="5"
 inherit haskell-cabal
 
 DESCRIPTION="Fast JSON parsing and encoding"
 HOMEPAGE="https://github.com/haskell/aeson"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
-	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal -> ${PF}.cabal"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="cffi"
-
-#RESTRICT=test # fails on newer ghc
+IUSE="cffi +ordered-keymap"
 
-PATCHES=( "${FILESDIR}/${PN}-1.5.6.0-fix-tests-ghc_9.patch" )
-
-RDEPEND=">=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+RDEPEND=">=dev-haskell/attoparsec-0.14.2:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
 	>=dev-haskell/base-compat-batteries-0.10.0:=[profile?] <dev-haskell/base-compat-batteries-0.13:=[profile?]
 	>=dev-haskell/contravariant-1.4.1:=[profile?] <dev-haskell/contravariant-1.6:=[profile?]
-	>=dev-haskell/data-fix-0.3:=[profile?] <dev-haskell/data-fix-0.4:=[profile?]
+	>=dev-haskell/data-fix-0.3.2:=[profile?] <dev-haskell/data-fix-0.4:=[profile?]
 	>=dev-haskell/dlist-0.8.0.4:=[profile?] <dev-haskell/dlist-1.1:=[profile?]
-	>=dev-haskell/hashable-1.2.7.0:=[profile?]
-	>=dev-haskell/primitive-0.7.0.1:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
-	>=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/hashable-1.3.5.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-haskell/indexed-traversable-0.1.2:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
+	>=dev-haskell/onetuple-0.3.1:=[profile?] <dev-haskell/onetuple-0.4:=[profile?]
+	>=dev-haskell/primitive-0.7.3.0:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
+	>=dev-haskell/quickcheck-2.14.2:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?]
+	>=dev-haskell/scientific-0.3.7.0:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/semialign-1.2:=[profile?] <dev-haskell/semialign-1.3:=[profile?]
 	>=dev-haskell/strict-0.4:=[profile?] <dev-haskell/strict-0.5:=[profile?]
 	>=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/th-abstraction-0.2.8.0:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
-	>=dev-haskell/these-1.1:=[profile?] <dev-haskell/these-1.2:=[profile?]
-	>=dev-haskell/time-compat-1.9.4:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
+	>=dev-haskell/text-short-0.1.5:=[profile?] <dev-haskell/text-short-0.2:=[profile?]
+	>=dev-haskell/th-abstraction-0.3.0.0:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
+	>=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.2:=[profile?]
+	>=dev-haskell/time-compat-1.9.6:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
 	>=dev-haskell/unordered-containers-0.2.10.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
-	>=dev-haskell/vector-0.12.0.1:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/uuid-types-1.0.5:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
+	>=dev-haskell/vector-0.12.0.1:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+	>=dev-haskell/witherable-0.4.2:=[profile?] <dev-haskell/witherable-0.5:=[profile?]
 	>=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
@@ -50,36 +50,19 @@ DEPEND="${RDEPEND}
 		dev-haskell/base16-bytestring
 		>=dev-haskell/diff-0.4 <dev-haskell/diff-0.5
 		>=dev-haskell/generic-deriving-1.10 <dev-haskell/generic-deriving-1.15
-		>=dev-haskell/hashable-time-0.2.1
 		>=dev-haskell/integer-logarithms-1 <dev-haskell/integer-logarithms-1.1
-		>=dev-haskell/quickcheck-2.14.2 <dev-haskell/quickcheck-2.15
-		>=dev-haskell/quickcheck-instances-0.3.25.2 <dev-haskell/quickcheck-instances-0.4
+		>=dev-haskell/quickcheck-instances-0.3.26.1 <dev-haskell/quickcheck-instances-0.4
 		dev-haskell/tasty
 		dev-haskell/tasty-golden
 		dev-haskell/tasty-hunit
 		dev-haskell/tasty-quickcheck )
 "
-BDEPEND="app-text/dos2unix"
-
-src_prepare() {
-	# pull revised cabal from upstream
-	cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
-
-	# Convert to unix line endings
-	dos2unix "${S}/${PN}.cabal" || die
-
-	# Apply patches *after* pulling the revised cabal
-	default
-
-	cabal_chdeps \
-		'hashable-time >= 0.2.1 && <0.3' 'hashable-time >= 0.2.1' \
-		'hashable             >= 1.2.7.0  && < 1.4' 'hashable >=1.2.7.0'
-}
 
 src_configure() {
 	haskell-cabal_src_configure \
 		--flag=-bytestring-builder \
 		$(cabal_flag cffi cffi) \
 		--flag=-developer \
-		--flag=-fast
+		--flag=-fast \
+		$(cabal_flag ordered-keymap ordered-keymap)
 }
diff --git a/dev-haskell/aeson/metadata.xml b/dev-haskell/aeson/metadata.xml
index 8d64f5709b5b..ce851fc40679 100644
--- a/dev-haskell/aeson/metadata.xml
+++ b/dev-haskell/aeson/metadata.xml
@@ -5,70 +5,8 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A JSON parsing and encoding library optimized for ease of use
-		and high performance.
-
-		/Note/: if you use GHCi or Template Haskell, please see the
-		@README@ file for important details about building this package,
-		and other packages that depend on it:
-		&lt;https://github.com/mailrank/aeson#readme&gt;
-
-		Parsing performance on a late 2010 MacBook Pro (2.66GHz Core i7),
-		for mostly-English tweets from Twitter's JSON search API:
-
-		* 0.8 KB, 32-bit GHC 6.12.3: 30538 msg\/sec (24.9 MB\/sec)
-
-		* 0.8 KB, 64-bit GHC 7.0.3: 31204 msg\/sec (25.4 MB\/sec)
-
-		* 6.4 KB, 32-bit GHC 6.12.3: 6731 msg\/sec (42.3 MB\/sec)
-
-		* 6.4 KB, 64-bit GHC 7.0.3: 6627 msg\/sec (41.7 MB\/sec)
-
-		* 11.8 KB, 32-bit GHC 6.12.3: 3751 msg\/sec (43.2 MB\/sec)
-
-		* 11.8 KB, 64-bit GHC 7.0.3: 3381 msg\/sec (38.9 MB\/sec)
-
-		* 31.2 KB, 32-bit GHC 6.12.3: 1306 msg\/sec (39.8 MB\/sec)
-
-		* 31.2 KB, 64-bit GHC 7.0.3: 1132 msg\/sec (34.5 MB\/sec)
-
-		* 61.5 KB, 32-bit GHC 6.12.3: 616 msg\/sec (37.0 MB\/sec)
-
-		* 61.5 KB, 64-bit GHC 7.0.3: 534 msg\/sec (32.1 MB\/sec)
-
-		Handling heavily-escaped text is a little more work.  Here is
-		parsing performance with Japanese tweets, where much of the text
-		is entirely Unicode-escaped.
-
-		* 14.6 KB, 32-bit GHC 6.12.3: 2315 msg\/sec (33.1 MB\/sec)
-
-		* 14.6 KB, 64-bit GHC 7.0.3: 1986 msg\/sec (28.4 MB\/sec)
-
-		* 44.1 KB, 32-bit GHC 6.12.3: 712 msg\/sec (30.7 MB\/sec)
-
-		* 44.1 KB, 64-bit GHC 7.0.3: 634 msg\/sec (27.3 MB\/sec)
-
-		* 82.9 KB, 32-bit GHC 6.12.3: 377 msg\/sec (30.5 MB\/sec)
-
-		* 82.9 KB, 64-bit GHC 7.0.3: 332 msg\/sec (26.9 MB\/sec)
-
-		Encoding performance on the same machine and data:
-
-		* English, 854 bytes: 43439 msg\/sec (35.4 MB/sec)
-
-		* English, 6.4 KB: 7127 msg\/sec (44.8 MB/sec)
-
-		* Engish, 61.5 KB: 765 msg\/sec (46.0 MB/sec)
-
-		* Japanese, 14.6 KB: 4727 msg\/sec (67.5 MB/sec)
-
-		* Japanese, 44.1 KB: 1505 msg\/sec (64.8 MB/sec)
-
-		(A note on naming: in Greek mythology, Aeson was the father of Jason.)
-	</longdescription>
 	<use>
 		<flag name="cffi">Controls whether to include c-ffi bits or pure haskell. Default to False for security.</flag>
-		<flag name="fast">compile without optimizations</flag>
+		<flag name="ordered-keymap">Use ordered @Data.Map.Strict@ for KeyMap implementation.</flag>
 	</use>
 </pkgmetadata>