gentoo resync : 12.07.2021

7 files changed, 53 insertions, 29 deletions

diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 3b0e5f7efe6f..57da1d936079 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/c2hs/Manifest b/dev-haskell/c2hs/Manifest
index ae328336cd02..8c589b2e2ac0 100644
--- a/dev-haskell/c2hs/Manifest
+++ b/dev-haskell/c2hs/Manifest
@@ -1,3 +1,5 @@
 DIST c2hs-0.28.7.tar.gz 207782 BLAKE2B a9f29506e6aaec3400d844ad85b2a6b6e1b87cb3c6c641665ab6bc5465903da8c2c82c3511b451e54cf30dfac61092dd323f8a2af48b5daa6081a4e9c5f00c9d SHA512 69c877349ae4864763d20664edae07a67aa1c55f5d4fccc3fcb6d06e94eb14d6b4b0201fc2840a9ebbc45a2a21ab55ad0e79f9cd88c00003df67abf5c1fd62d6
+DIST c2hs-0.28.8.tar.gz 207816 BLAKE2B 6d912fd93c6076ccd86ed62e075f1addb7b44378c82acc0cbaf04b6b91a2ed4530cde60a9139316d928a2867474bafde5c14aedb4ab9e78e5faaa99830276a71 SHA512 ff9119acecddd853f2f797385f971c249bcd92d4b141e8e7ea5f5d3e63aa257502c80ded2720a46e3186260026b94c9e518f08f8e452a64c9f888d0183ee1749
 EBUILD c2hs-0.28.7.ebuild 1113 BLAKE2B 89b6071b686da6f0116d04be90ffcf797ee06fe8f687a8d15c441fe4095dc96ed90883d0f01880be5bedb2baea4ab0a99fe10a7f9fb886436018f89cffb166b4 SHA512 c3ba90614f7e15a8911e250ed61ceebc4c456c6d7bdac83c661858e9e3457173a876d1ebbd67a24fc9931a51e020b9645b13c8d8e795830328297160db40e098
+EBUILD c2hs-0.28.8.ebuild 1070 BLAKE2B df0bc48723b18b29d5327d1170f9b795a28edc447bb6b829fe0f1553e3e0dbe0d8f724c7364664a9924be1e1322acec642aa8d5059209fabe308cfd0a2ec10a6 SHA512 28866de33b5b71c47e75f6ec63e7313c7b578d56435e4d9960210eefa5e89af79490738724f2fdcbf7f09d4064872aaf3a032fcce9a555a512e6aca4c994788a
 MISC metadata.xml 774 BLAKE2B 0da02d79142cc144b8bfb9096ee19c6f1715f1431ae4205e4727157ee110d1bd363cc33d59cd08436391b65ff4af5a8cd5cd0134500c1b71d0fa4f8731ea9478 SHA512 386edcd02a6773727944eff89793daaf36bc88678123ba3b047086acdf6a89743fde55ce2afbd26a26601fccf497dc477871dd01013bdf21f00ca869fe5b2a05
diff --git a/dev-haskell/c2hs/c2hs-0.28.8.ebuild b/dev-haskell/c2hs/c2hs-0.28.8.ebuild
new file mode 100644
index 000000000000..38703f4aa688
--- /dev/null
+++ b/dev-haskell/c2hs/c2hs-0.28.8.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="test-suite"
+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 # needs unprefixed 'cpp'
+
+RDEPEND="dev-haskell/dlist:=
+	>=dev-haskell/language-c-0.7.1:= <dev-haskell/language-c-0.10:=
+	>=dev-lang/ghc-8.4.3:=
+	regression? ( >=dev-haskell/shelly-1.9.0:= <dev-haskell/shelly-1.10.0:=
+			dev-haskell/text:=
+			>=dev-haskell/yaml-0.8:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/hunit
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit
+		!regression? ( >=dev-haskell/shelly-1.9.0 <dev-haskell/shelly-1.10.0
+				dev-haskell/text ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag regression regression)
+}
diff --git a/dev-haskell/hakyll/Manifest b/dev-haskell/hakyll/Manifest
index d3fa2d5b47d0..3d581cb0e3d2 100644
--- a/dev-haskell/hakyll/Manifest
+++ b/dev-haskell/hakyll/Manifest
@@ -1,3 +1,3 @@
 DIST hakyll-4.14.0.0.tar.gz 109807 BLAKE2B e1e6e541f5783571740744b9eee1bcd9edd79eec69b5556de39ef7a47f86e23fa0284ccb83ff9212ff4b07b7e2519eff67946ebdbf90663421cf98ea9761c529 SHA512 5f3f7a952b085cf1a59a646c15e42f29c89d4ed0a5a96f55156d19b86340c2361da6c19ff7a70bde98122423e237dc7082bfcc84bc5e96ab9421fdaef84a8cce
 EBUILD hakyll-4.14.0.0-r1.ebuild 4319 BLAKE2B 97d6aedc4e496f7696f6c1f306d07af9730f56749c54f65f45dabc2246491c700da386b566d2aefa715bf1d1c9f7cb0088b40354805eaa4375c4b26497860d0e SHA512 be78272f30ccb8188f6834a2ce4dd86966b32db04ec164c790fdfbc7bb92fd5bd45f521dac51dc0f24ba5ae32b8c65a892038214aec1d9aa9d67ca5282932cbc
-MISC metadata.xml 1181 BLAKE2B a22ae826a948f6941e935e93f5381bffb53ec0c532e571d5c903ce5670cdc615a1a4915b2b0b66530e21877e57eb55d2947a5d54da18df8e0030aeb6e369dd8b SHA512 104a8d369da505e931d184a37661832fa99c27412b4e4e8c2dca8b857aaba48258a0fa52d47fafeb964b1633255a38b72383fa439038e948631730da02f07a8d
+MISC metadata.xml 589 BLAKE2B 02dbb5047dd47f3f91d2951f28220d020e8b130316d4afe4aa2e5bfc66ae80c8e71995dca64004e85d2be8eb88cdd477994dd7223af1dd77c72c64c804bbb85f SHA512 954cc1f3709c94b8a0e0945a743f938e0d8de9770a3da5229487cbb31e18d2aaadd67a8e4180ceb9f0a38285c7f7033547c422a16016ebb0ec1fbec465ba7cad
diff --git a/dev-haskell/hakyll/metadata.xml b/dev-haskell/hakyll/metadata.xml
index 75fb004f1986..4136091ce602 100644
--- a/dev-haskell/hakyll/metadata.xml
+++ b/dev-haskell/hakyll/metadata.xml
@@ -12,21 +12,4 @@
 		<flag name="watchserver">wait for filesystem changes and rebuild pages</flag>
 		<flag name="usepandoc">Include Pandoc support</flag>
 	</use>
-	<longdescription>
-		Hakyll is a static website compiler library. It provides you with the tools to
-		create a simple or advanced static website using a Haskell DSL and formats
-		such as markdown or RST. You can find more information, including a tutorial,
-		on the website:
-		
-		* &lt;http://jaspervdj.be/hakyll&gt;
-		
-		If you seek assistance, there's:
-		
-		* A google group: &lt;http://groups.google.com/group/hakyll&gt;
-		
-		* An IRC channel, @#hakyll@ on freenode
-		
-		Additionally, there's the Haddock documentation in the different modules,
-		meant as a reference.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/unixutils/Manifest b/dev-haskell/unixutils/Manifest
index d6ae83034be3..b333ea80a0e3 100644
--- a/dev-haskell/unixutils/Manifest
+++ b/dev-haskell/unixutils/Manifest
@@ -1,3 +1,3 @@
-DIST Unixutils-1.54.1.tar.gz 12177 BLAKE2B d330150c36ac3cdfb3b9eea4a26109cb76a96207c5db40d306479696082fe2017e1ae3892fa06571af96ae5cd4c3204e56860ab204ad9192fc5160d18f663bc3 SHA512 b8395cf6778c18a2f36a45a927d24042fd144ab70c6c092e1be36b22c59bbd1f0151cbe703d9db98dc769eba41ca9eb89cf60e87f5a6bbb32d6b64ef97c45665
-EBUILD unixutils-1.54.1.ebuild 874 BLAKE2B b2f18abd9cebd2a975dd9122134ef475344607eb1cf2c619a55e197de5dd3897033f790d0d4e87885c1744aca932db9de1998ea6de4df13d3224c37577f791be SHA512 a48f6c9f90b4901d563c85de36a9fd77decbaa589756b7df1ce95fd7b59d324d05caf9fde2750a9147a941f6867ac634cb616161920ecedebb87717507a705cc
+DIST Unixutils-1.54.2.tar.gz 12299 BLAKE2B a31f3cc3657ef3a5fc02dec19720e876ac3df0a7fb4f559cce849099ff887bb8b5dd7df35cf7077d42d1ba1c18448945ccc343cfd89e12dddcc110c9ccc8aedb SHA512 7d8e652ed6d7a19082ae5fb4ca4e05f808fc7d6599b7a41652743dfbd53f0ebd3333168ea76e480127b554bbaab7466ed8ac6c066edd6651fe9f54e69ea4f5df
+EBUILD unixutils-1.54.2-r1.ebuild 868 BLAKE2B feb5f3da3da2b995745f3b7c2f0e0c198faee8d6166f24584799a81d6f44121624d2a5bb8aac48f777563a60c453cb73c8ba52eb3fb1cc4896c8a0ebba02dd0b SHA512 8872a1d8f1e8ebc0770578e6b91333479bc8afa07fba8770b90fd5f1332b500a97697f74d38d67107c8ae98ffa9504954b8c4e413c014684eab24c8d44ca0e04
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/unixutils/unixutils-1.54.1.ebuild b/dev-haskell/unixutils/unixutils-1.54.2-r1.ebuild
index 118d852db460..648a5f9271ec 100644
--- a/dev-haskell/unixutils/unixutils-1.54.1.ebuild
+++ b/dev-haskell/unixutils/unixutils-1.54.2-r1.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.6.9999
+# ebuild generated by hackport 0.7
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 MY_PN="Unixutils"
 MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="A crude interface between Haskell and Unix-like operating systems"
 HOMEPAGE="https://github.com/seereason/haskell-unixutils.git"
@@ -18,7 +19,6 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="dev-haskell/exceptions:=[profile?]
 	dev-haskell/mtl:=[profile?]
@@ -26,11 +26,9 @@ RDEPEND="dev-haskell/exceptions:=[profile?]
 	dev-haskell/puremd5:=[profile?]
 	dev-haskell/regex-tdfa:=[profile?]
 	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	virtual/libc
+	>=dev-lang/ghc-8.4.3:=
+	virtual/libcrypt:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
+	>=dev-haskell/cabal-2.2.0.1
 "
-
-S="${WORKDIR}/${MY_P}"