gentoo resync : 22.05.2021

13 files changed, 18 insertions, 132 deletions

diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 7e07ab88ba1b..f0dda149eb80 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/c2hs/Manifest b/dev-haskell/c2hs/Manifest
index 83d63713a1dd..ae328336cd02 100644
--- a/dev-haskell/c2hs/Manifest
+++ b/dev-haskell/c2hs/Manifest
@@ -1,5 +1,3 @@
-DIST c2hs-0.28.6.tar.gz 204988 BLAKE2B 89bc8c588a93728abf3411cd23631b57157721213da3a2bdf96da41aa8ee28451396995f8c7bc1bea94be050e92c81a991256f73b0bf6a8dbdf3156bcf95563e SHA512 848693ddf787244cc0f100f533030889a1efcef283f06ef609574d9cd0005679fab373172a949408ce6d4b9c97d15a56b0ec11fe39b466ad3f84aa527d2ab1c9
 DIST c2hs-0.28.7.tar.gz 207782 BLAKE2B a9f29506e6aaec3400d844ad85b2a6b6e1b87cb3c6c641665ab6bc5465903da8c2c82c3511b451e54cf30dfac61092dd323f8a2af48b5daa6081a4e9c5f00c9d SHA512 69c877349ae4864763d20664edae07a67aa1c55f5d4fccc3fcb6d06e94eb14d6b4b0201fc2840a9ebbc45a2a21ab55ad0e79f9cd88c00003df67abf5c1fd62d6
-EBUILD c2hs-0.28.6.ebuild 977 BLAKE2B f912543b5b0411143f1f1534f1c2e1ee0fdb64d50ee4ed468849eba2fa635c58df0fe1872e5d7c4ee384acaaab4b47f90dddb57d6527a3e24308f72704f51048 SHA512 93b43e383b763d9acae9fbf5f3762f0012b3007dcf4e81c705a10bb7a84b336d2dc1e5275994dda95565c71d5e0e21e0bd8ac6bdc0d01b0111f62921eca4ac12
 EBUILD c2hs-0.28.7.ebuild 1113 BLAKE2B 89b6071b686da6f0116d04be90ffcf797ee06fe8f687a8d15c441fe4095dc96ed90883d0f01880be5bedb2baea4ab0a99fe10a7f9fb886436018f89cffb166b4 SHA512 c3ba90614f7e15a8911e250ed61ceebc4c456c6d7bdac83c661858e9e3457173a876d1ebbd67a24fc9931a51e020b9645b13c8d8e795830328297160db40e098
 MISC metadata.xml 774 BLAKE2B 0da02d79142cc144b8bfb9096ee19c6f1715f1431ae4205e4727157ee110d1bd363cc33d59cd08436391b65ff4af5a8cd5cd0134500c1b71d0fa4f8731ea9478 SHA512 386edcd02a6773727944eff89793daaf36bc88678123ba3b047086acdf6a89743fde55ce2afbd26a26601fccf497dc477871dd01013bdf21f00ca869fe5b2a05
diff --git a/dev-haskell/c2hs/c2hs-0.28.6.ebuild b/dev-haskell/c2hs/c2hs-0.28.6.ebuild
deleted file mode 100644
index 9f52b7a66514..000000000000
--- a/dev-haskell/c2hs/c2hs-0.28.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="" # test-suite fails to build: https://github.com/haskell/c2hs/issues/245
-inherit haskell-cabal
-
-DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety"
-HOMEPAGE="https://github.com/haskell/c2hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="regression"
-
-RESTRICT=test # broken against shelly-1.9: https://github.com/haskell/c2hs/issues/245
-
-RDEPEND="dev-haskell/dlist:=
-	dev-haskell/fail:=
-	>=dev-haskell/language-c-0.7.1:= <dev-haskell/language-c-0.9:=
-	>=dev-lang/ghc-7.4.1:=
-	regression? ( >=dev-haskell/shelly-1.0:=
-			dev-haskell/text:=
-			>=dev-haskell/yaml-0.8:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag regression regression)
-}
diff --git a/dev-haskell/cpu/Manifest b/dev-haskell/cpu/Manifest
index fd351c7035f8..89453b5efad1 100644
--- a/dev-haskell/cpu/Manifest
+++ b/dev-haskell/cpu/Manifest
@@ -1,3 +1,3 @@
 DIST cpu-0.1.2.tar.gz 4317 BLAKE2B 17d34e81432a2487e74ff0297b8126c815d0034809290d28557bcbb5180b161fc474703de29f4bbd1fcf18887a291bbd2608f362752028f910a9c61d51847517 SHA512 2dab5b956619cad1a6a99f16a6156d5f2539ef4882204e3cb1ec3e86bc00cd4d948e3a5eba4948fd0cc37dd98a27eeebc77957f87af6e51f86a65a84db1d25d3
-EBUILD cpu-0.1.2.ebuild 637 BLAKE2B 0d22fed223b03e477b4c33b56ccc8519e39db985284afb9f660d0bdc5b1fe6cdf34bec9c3fdb6ca3e6c7586363a891ee98e145a0fb631d322151af3c31f64320 SHA512 20f2951fdbf263c14beba39b6470f23bf6d573881ff2b9040fe1baaf3d25eb0fdd1a03f360a23de88cb0435e1d9a9762e60856bdacb039b7fc1e164b3df136f1
-MISC metadata.xml 539 BLAKE2B c0caba5ac36639130cb46c870bf8432d4197b6002474aea9126fde612d914639814f4b745a3d9272c8440db88fd983bcc26cc8bf8dae2d897efd790e8e56aaf5 SHA512 e1484d14f8c8e582a758f9ca8902dc1f9716b6fc37787b869c53f795050b894d4722fd4a87e8ad0d3100326334930fc04afd35d114ed033909eadcee1e10d7fa
+EBUILD cpu-0.1.2.ebuild 636 BLAKE2B 6b335e08c87f4824530bc330507d204ef9c9bce0de41f22322ad1ec3fccfe5286b07e050cebc6c559a7c10abb3c8f281724ce61c5d5a8f478f0744ece8d62333 SHA512 5f5f1a968ca79691c3680d5f366752f33ff75f3f2a256c5392faac87f87c177f66bd00386537a5148a3034c03d8c4b269ac19d1fc1324ae85bce4fda4b04fe26
+MISC metadata.xml 330 BLAKE2B 35dbbf222a56f4d3183afffa75681af128edd8f3e4dd0f4e2adb65350ed9e3bea4ff2c560696ac797db971fc4907ab4749654a8e1e54aba172eba34476ab4393 SHA512 a61cc504f900ddf35feb7c1057a2d01cf774e47add8cb255490fd5869df8c4fb61483edb71b5045d2256357b75669e51840adc6a5d5e36f7aa0b4fb069198951
diff --git a/dev-haskell/cpu/cpu-0.1.2.ebuild b/dev-haskell/cpu/cpu-0.1.2.ebuild
index 83f422c0e3b6..50373b2b7aeb 100644
--- a/dev-haskell/cpu/cpu-0.1.2.ebuild
+++ b/dev-haskell/cpu/cpu-0.1.2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.6.9999
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -executable
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -15,15 +16,14 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="executable"
 
-RDEPEND=">=dev-lang/ghc-7.4.1:=
+RDEPEND=">=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
+	>=dev-haskell/cabal-2.2.0.1
 "
 
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag executable executable)
+		--flag=-executable
 }
diff --git a/dev-haskell/cpu/metadata.xml b/dev-haskell/cpu/metadata.xml
index aa5b10119e39..1c2f3eaf5db7 100644
--- a/dev-haskell/cpu/metadata.xml
+++ b/dev-haskell/cpu/metadata.xml
@@ -5,12 +5,6 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-		<flag name="executable">build 'cpuid' tool</flag>
-	</use>
-	<longdescription>
-		Lowlevel cpu routines to get basic properties of the cpu platform, like endianness and architecture.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">vincenthz/hs-cpu</remote-id>
 	</upstream>
diff --git a/dev-haskell/gtk/Manifest b/dev-haskell/gtk/Manifest
index 7530b7bd785f..bb6e4849aab8 100644
--- a/dev-haskell/gtk/Manifest
+++ b/dev-haskell/gtk/Manifest
@@ -1,6 +1,3 @@
-AUX gtk-0.14.10-glib-2.62.patch 501 BLAKE2B c402ff8bca84a4cc5bb02ef534da715e1b2edc0c675b219f08fe8a268ed22192192a5596816b35ad514851b9ee6ae105eddb2f9f37f9bb6974ee187f5d5292a7 SHA512 2d34480a33d60038627bfe3a490a35b52918c4b772cc398058c9efc3321e8415b29e8224d011a362b67ac0d75eb5e0b250da410eed40a3c7dc53403be213edbf
-DIST gtk-0.14.10.tar.gz 677787 BLAKE2B 536b4ce1bdbb17c662342bd8cb8086354a31842e1fc39e4bb2e4c2e505fb03f4e1ad0b689fb48dcf24d61c280cf659d8f30ac0fe77083e9887054cc8ed5feb75 SHA512 857fa71391e4bc8d884f5bb5e4f072ebd35b6bbcdc3901b6e28e03e79f4732d56430cf395aabc6007d3f7b1e991dcf0c6e21c9b84ccde96b1943d26ad37243eb
 DIST gtk-0.15.5.tar.gz 678555 BLAKE2B 6110bd1a44d4b276deca20dd69580b8b0442ffca11f84b36fc19c068f4bcc1eb515cba63c98b55bd3bcd5310967d94e053b5466f25729ffb8116dc9e076c3b70 SHA512 3d0a75fd1eebcd0fa7c7bf5a0a2dfd622e28b3ab8f69e0f152e10dee9fb8e13b0f6ce7da3a9f304c3f2233cdf432a6d099afc89b47ce3fb4d1cb96c25d6da26b
-EBUILD gtk-0.14.10-r3.ebuild 1551 BLAKE2B 87f1aedf13de4afddd3d256a2455c9c97614d4ac39df5c8d744442a0b6d1d74a5337ef92a10d8bfea84ddc102a3dfcad96bc590c08d2e0599cf71b34314f1d6f SHA512 d53a6b38e5dd29b8a7862d1bafe7ee37b8f5376510c82ed35690b686aff12f3d95922c21333b219968025b096601c7baa580bf59f4436cac428591ff7bd98d92
 EBUILD gtk-0.15.5-r1.ebuild 1399 BLAKE2B cd564ffdd2d0e3784cc9757a67651b446484202ed0a0c77980af125888c2e8bd81bbc0b5a4dc6ffe812b657f6a91cc35e207cede93e7cf72c4bdca0660bc12a9 SHA512 421ba97ae530e33242629ef52708062fff8e795af288d75d34a22dda4257e4d9d60dbe1f6285efd5c0f8a9f0f6e6bb69ca6ce7e34ecef240df7369323b2da784
 MISC metadata.xml 783 BLAKE2B 03cf02ef8216abd88b601f79acf0301d104c8c788c63138378cf7cd19a5adcd6a50a4d9dcd2ea95032acd9466a7be7e81123a35c60dcd5e0b5a41457f18801f6 SHA512 9da50d73780cdfb09196111d6abc5ad9b58ac08a7e2a0ace9b55626209512b4df2812b8de969c4d3b16b4d00b82f1be5c0bf1152050d77285a2dbda09e0240b1
diff --git a/dev-haskell/gtk/files/gtk-0.14.10-glib-2.62.patch b/dev-haskell/gtk/files/gtk-0.14.10-glib-2.62.patch
deleted file mode 100644
index 78e1dc146b43..000000000000
--- a/dev-haskell/gtk/files/gtk-0.14.10-glib-2.62.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/gtk2hs/gtk2hs/issues/276
-https://bugs.gentoo.org/712988
---- a/gtk.cabal
-+++ b/gtk.cabal
-@@ -381,7 +381,7 @@ Library
-         -- needs to be imported from this module:
-         x-Signals-Import: Graphics.UI.Gtk.General.Threading
-         include-dirs:   .
--        cpp-options: -U__BLOCKS__
-+        cpp-options: -U__BLOCKS__ -D__attribute__(A)=
-         if os(darwin) || os(freebsd)
-           cpp-options: -D__attribute__(A)= -D_Nullable= -D_Nonnull=
-         if !flag(deprecated)
diff --git a/dev-haskell/gtk/gtk-0.14.10-r3.ebuild b/dev-haskell/gtk/gtk-0.14.10-r3.ebuild
deleted file mode 100644
index 885847eb5d6a..000000000000
--- a/dev-haskell/gtk/gtk-0.14.10-r3.ebuild
+++ /dev/null
@@ -1,52 +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
-#hackport: flags: have-gio:gio,-have-quartz-gtk
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Gtk+ graphical user interface library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+deprecated +fmode-binary +gio"
-
-RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
-	>=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?]
-	>=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3
-	>=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
-	virtual/pkgconfig
-"
-
-PATCHES=("${FILESDIR}"/${PN}-0.14.10-glib-2.62.patch)
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'Cabal >= 1.24 && < 2.3' 'Cabal >= 1.24 && < 3.3'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag deprecated deprecated) \
-		$(cabal_flag fmode-binary fmode-binary) \
-		$(cabal_flag gio have-gio) \
-		--flag=-have-quartz-gtk
-}
diff --git a/dev-haskell/integer-roots/Manifest b/dev-haskell/integer-roots/Manifest
index 264b7967e73a..d8dff4729c07 100644
--- a/dev-haskell/integer-roots/Manifest
+++ b/dev-haskell/integer-roots/Manifest
@@ -1,3 +1,3 @@
 DIST integer-roots-1.0.tar.gz 54399 BLAKE2B 72584c0beb74546e87867efbf54259ad236a7fde5fd239e8389e4ea4d15b292abac926319e96c04072a8fb123e0347bee986c1887ebfd642e7192fdb5163a08c SHA512 62f78ef6dbf55fe2e0487dcade557d345ae13e6b2432fc50ecd2c4998bafa0b0c033d58c6c7f4b7999f552da13a55a7a128ff4cc42859ea55da06e34440fa4f0
-EBUILD integer-roots-1.0.ebuild 923 BLAKE2B 347c661fe757f8823bdb71d255e82f5b39cdebc0f1b403e7d49e0155d4fa584c2a82a00205f0ddacd92545508ec2360f0b525d27e1af8961f1fa75688cf2663a SHA512 1563cd0a3f0ed32d1e70d595e2da81a4484d4b41df0f9a47015587e0b1270dd52783659c787084eedf974cf68b5006cfd9ec27a04b20a68713eeabd30103fed8
+EBUILD integer-roots-1.0.ebuild 928 BLAKE2B c626d65fc5386b514886e7c6298fd17c5f730d08245bc15db2c14f38263f950aecb169204952e8bb8bc6d09b99e6e70f6e9e2808c8d67fd9f249d8345ceae06e SHA512 9c6786af0097514810202733bb202f1e389527679486f53238e3a80bb639dd6124a6bfa6dc89c4016bc2bb895b4c2307cf9063365f80ad78a50b7fdab89c692c
 MISC metadata.xml 457 BLAKE2B f483c889dca73b585ce80c3ee107159ddf90ab54f31cf27bc9b3f8ad1f0f71ababa5733b9591f1c94342124d752d99c391ab7d5558d6de8268498116712f4f83 SHA512 1c727b190d8198cb2ac7446dbed0f882226c2ee2fc31f286d46abcce1946b1dcff74a3215e3e252ebeb00bc154d411fd4d70853dadc94d71b4649fa96eaba5db
diff --git a/dev-haskell/integer-roots/integer-roots-1.0.ebuild b/dev-haskell/integer-roots/integer-roots-1.0.ebuild
index 5a314b54245b..f8425642c990 100644
--- a/dev-haskell/integer-roots/integer-roots-1.0.ebuild
+++ b/dev-haskell/integer-roots/integer-roots-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ IUSE=""
 
 RESTRICT=test # requires porting to smallcheck-1.2
 
-RDEPEND=">=dev-lang/ghc-8.0.1:=
+RDEPEND=">=dev-lang/ghc-8.0.1:=[gmp]
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.24.0.0
diff --git a/dev-haskell/semirings/Manifest b/dev-haskell/semirings/Manifest
index 96e945d8ebd7..85b9438e30a5 100644
--- a/dev-haskell/semirings/Manifest
+++ b/dev-haskell/semirings/Manifest
@@ -1,3 +1,3 @@
-DIST semirings-0.5.3.tar.gz 18622 BLAKE2B 70075ef121969652ec666531f42681af759863247811425e43eef590e73b6c0d139274fb57821d28f405f0bd44cc4bed1e48506f08f880aee71f0ff986a30136 SHA512 cd038746d1ce36eb04040954b0a969f17bf67ff45750a221284550724dd0ab563896fc3012c8d58aaf5c11a008b5526088711655e165895a4dead2d054cbf5e7
-EBUILD semirings-0.5.3.ebuild 1104 BLAKE2B 916921b348516dcc88e57d50add3bd1bf14fe6a3240e3373de6225e87304b8ed76d73eb6b524e9109138cf95b8f71a10511719940735d8e4ca306c4da9620dbe SHA512 68269343481d8472e52badad3d60527c5ad5735d908c6c7635083868b66fca50e04fb59f94a34acd7cdae3f646281e4fbe4907a54eca8ea468cda96997df8ac0
+DIST semirings-0.5.4.tar.gz 18490 BLAKE2B d3d67bca474ae7cbf3e016ef17da5ead593250d9cdda051a0fcd84bdb142ced3af74a0f287921e6edcde9916dea4d128f11cc77d8a65bff85470d533565e4749 SHA512 d24a178031e494e1b337585272e0cc960da7935007affc0fea893fe1cac0acd79569a6d8dc9cfddbb7f435a48c34b7aa0d6e589a16741c7c9b5fe00d52b95441
+EBUILD semirings-0.5.4.ebuild 1046 BLAKE2B bdf5a6bba062023d5eb94f1c09171393ac75ef677a988e3095182581c12a6901c45496b9a877ee5dcd16c27456b3081888046e151da726d619cf9d43a7a9d11c SHA512 a06ce8d7f6e2d7da0cf0495aebdfad85524f166cb6776f319f87095d87b8ef8818ce0e4ee7905e3a19c7b45095aa798bbeecb797e0466dfa415f99e55b83fed6
 MISC metadata.xml 1640 BLAKE2B 354905e265e4d6dd59ee9268381eee54148798051531fee147627053192388785a883eff69f164ea64cd85729f88458d1e86ae1ed0043b77a1a7f5b49319fea9 SHA512 cdc4068b377096f334d4765f13cfd15a84364719f7c4c131b98c1da67a0d426b8a5c4b6c0a3954f0d0d64db755fe7e4c61cc20f4969829a5e6ca6e56309baaa5
diff --git a/dev-haskell/semirings/semirings-0.5.3.ebuild b/dev-haskell/semirings/semirings-0.5.4.ebuild
index dae2250aaf6c..37ae6599ef4c 100644
--- a/dev-haskell/semirings/semirings-0.5.3.ebuild
+++ b/dev-haskell/semirings/semirings-0.5.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.4.9999
+# ebuild generated by hackport 0.6.7.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -17,14 +17,13 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="+containers +hashable +unordered-containers"
 
-RDEPEND=">=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?]
-	>=dev-haskell/semigroups-0.17:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
+RDEPEND="dev-haskell/base-compat-batteries:=[profile?]
+	>=dev-lang/ghc-7.10.1:=[gmp]
 	hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
 			unordered-containers? ( >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) )
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-1.22.2.0
 "
 
 src_configure() {