gentoo resync : 25.08.2020

4 files changed, 12 insertions, 14 deletions

diff --git a/dev-haskell/json/Manifest b/dev-haskell/json/Manifest
index 9349acbaa5a9..9ad46a83f836 100644
--- a/dev-haskell/json/Manifest
+++ b/dev-haskell/json/Manifest
@@ -1,6 +1,6 @@
 AUX json-0.9.3-ghc-8.8.patch 5054 BLAKE2B ed3b6efe93cb37697379e5c0b0953ead8cd270000f7c87b0db58861d834d0b8edbd6039b7de0b3d376c4b5cd5152d9982e60f93c81c31abf97879654ed644bd6 SHA512 0cdaa654826c2baecdcf1771090b58440ef4177d8fac76da774eecf7599526bed142ee6f58cf2b67fba57ed1b3c0b22b7140425712551dc8e41a99014534c206
-DIST json-0.9.1.tar.gz 22568 BLAKE2B b1c73771e24ccafb2019ffff61e392f2eec18768c4bdd09f1a5ee8275c92d8982cda3fab4d91222f726fae65324776c9e79ccd602dbd4ac9c435749d61a1015e SHA512 537257fed476683d0657c6474e465ca437e43e36b60ab132c0f584cece99a18d222ef9a33171543689ba5589434bc78cf2e0e5ff550804ff8969052d09430d57
+DIST json-0.10.tar.gz 22622 BLAKE2B 4ee854a80738b6d12e027ca8562ac365bc6192532682d9b8997a8887b70d2e19553535fec6c7ab6ecf119262d6f7d229dc4217ac867dcac8dd3158c80606c727 SHA512 4015693c363810701114a222207083ab9610ebd1196d24f0eb8dcad35af54e9067259ca412b131eaa986b8dbfbf0ce62058ca4c31aeeff29fdf21f17e8d86e90
 DIST json-0.9.3.tar.gz 22562 BLAKE2B 8947d2b4bea1ee86eea19e25b73b991d186274c7a6beaff09e8f346756e870d440c4511c599d6ee5f82df08975076e47f0f528cc03cabb5063fb768506b9a660 SHA512 836ae920ef19e0cff5b617a579090ea1d760e253513d3fb28c56650a1fa413c0bd852165be487c211a52be6246eac3241a97f729342223be10275917a34230a6
-EBUILD json-0.9.1.ebuild 939 BLAKE2B 046bcbea49ced4194453282d8e5820132a0fa89db8181774d91c4c8e0c43e3415841b0d6627a9cc13054038b50a8d1557840b4384c283f7dec2c569f877d780d SHA512 89d3f5cf001d3d8b3ab0854fe15416bc5397aa0f7342fefd9420bbea4058455db9b2fbfcdbf11cc3d8228a096ef7c9ebdf14e991ef60f60da2d90338069f7fd4
-EBUILD json-0.9.3.ebuild 934 BLAKE2B f412b14cf615bd6f257a8487b86ea54eddf1d51aee36323c5e9e5995d053df9e7fbe0026c87181b13fb02199ef8447a1d7815f143650c6b821ebce1fdba7488d SHA512 b97f1335d4aa9e0d237848d6052181265adcd390cc5189fd1258d49746f11023959878764e943670c2c8035c7678ac4a273b07328c72c9b5db72576871f678c1
-MISC metadata.xml 993 BLAKE2B 6cb77b20e36e3fb4aa09ed7f55f13b5199b4b152a2c7c625e7267b94016a2929b5064b6e38c3d0f6802cf5400dc802b4adc4e37d6de4823b2d02eea81459edbc SHA512 19724eb01ade1dac4b6e12271bfa698aab1ad16d4abc250114a4e17908ddf2bbbd788509ff5123745926bf229d0836e0046c3aa43b2ab6997088222c84a0b0a2
+EBUILD json-0.10.ebuild 868 BLAKE2B a870a5ff89c1265c22c8621918cc84c25ee5de4a4841df4fa76624321bc7cb23615c5eb526d7a6e79a1148cef402d0179c66424514e80d74a5d60f90a7956044 SHA512 75aa38da49b78111fe1ddef098a6ac278f8146f34e8516f2bfda7494b992c9953d4e90c0c0efa2bcbc7217711b4cbafd76669440792bbfb4b5f13df2be11e413
+EBUILD json-0.9.3.ebuild 927 BLAKE2B 410b8e103cc1aa6d7cb2b1ca7fe5861b235e7d5e2a271b6b7906bffe98403884791cb68f7c697086619f994cd1274321841eb1ab7b540a91f391813c43a69e41 SHA512 0802e9e4ffb77e816eee1b55fc248e04c9b0cbefe27774f0ff4284ebbc02112052c5988d3552548df7b5ffe10ea342c04bbad648abcff7860230ca1a44b54cfc
+MISC metadata.xml 902 BLAKE2B 3a7c5f63c7998cf5e9df237b45a4bd10fba1bc06e9bfa89d24d6d332743a9a6ac3c5b9d05473302236c855bc9c3576189c49f4c3e36ae8f3b007bd43125a3cbc SHA512 1e8813a4a4182c04cb81dc8670ba5017c3ec28f34f722d8a33926145d58ed6ae14203db997048208bac03eb50281020701084591d379046fb9d2c2b8018bd2ae
diff --git a/dev-haskell/json/json-0.9.1.ebuild b/dev-haskell/json/json-0.10.ebuild
index 5156dfc46bd9..55a5773eba27 100644
--- a/dev-haskell/json/json-0.9.1.ebuild
+++ b/dev-haskell/json/json-0.10.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-# ebuild generated by hackport 0.4.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -14,22 +14,21 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux"
-IUSE="+generic mapdict +parsec +pretty"
+KEYWORDS="~amd64 ~x86"
+IUSE="mapdict +parsec +pretty"
 
 RDEPEND="dev-haskell/mtl:=[profile?]
+	>=dev-haskell/syb-0.3.3:=[profile?]
 	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	generic? ( >=dev-haskell/syb-0.3.3:=[profile?] )
+	>=dev-lang/ghc-8.0.1:=
 	parsec? ( dev-haskell/parsec:=[profile?] )
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
+	>=dev-haskell/cabal-1.24.0.0
 "
 
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag generic generic) \
 		$(cabal_flag mapdict mapdict) \
 		$(cabal_flag parsec parsec) \
 		$(cabal_flag pretty pretty)
diff --git a/dev-haskell/json/json-0.9.3.ebuild b/dev-haskell/json/json-0.9.3.ebuild
index 7df4640ae52a..41198ed591a7 100644
--- a/dev-haskell/json/json-0.9.3.ebuild
+++ b/dev-haskell/json/json-0.9.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="mapdict +parsec +pretty"
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/json/metadata.xml b/dev-haskell/json/metadata.xml
index 8bb7fe90bc27..fdec5f1e3899 100644
--- a/dev-haskell/json/metadata.xml
+++ b/dev-haskell/json/metadata.xml
@@ -16,7 +16,6 @@
 		between Haskell values and JSON.
 	</longdescription>
 	<use>
-		<flag name="generic">Add support for generic encoder (<pkg>dev-haskell/syb</pkg>)</flag>
 		<flag name="mapdict">Encode Haskell maps as JSON dicts</flag>
 		<flag name="parsec">Add support for parsing with Parsec</flag>
 		<flag name="pretty">Add support for using pretty printing combinators</flag>