gentoo resync : 25.08.2020

4 files changed, 7 insertions, 84 deletions

diff --git a/dev-haskell/zip-archive/Manifest b/dev-haskell/zip-archive/Manifest
index 8205ce6aa029..833cfbf65019 100644
--- a/dev-haskell/zip-archive/Manifest
+++ b/dev-haskell/zip-archive/Manifest
@@ -1,7 +1,3 @@
-DIST zip-archive-0.1.3.4.tar.gz 11250 BLAKE2B 830cce7d1600b66833e53584da68b07bfbb0417e9a752bedeca02b436e287ce187477851660d426104f392b6e508409a79abb70b0c781523100d7d547a155e4a SHA512 8476041bd3674a42c3777c54243037162d3fdf6f8e0c0bcb9577a4cd76a41d6d9dbdddc482845256858b284bd2bb6ad06cce8208c5584e60553ae659386f8165
-DIST zip-archive-0.2.3.7.tar.gz 12902 BLAKE2B a9b5563034cebb36c604752691950577996bf04e33bafd449019b08532f99635959502b4147ecf8e282d5a9379e6f09d2d2fe730579595e4d2991c152dcbe836 SHA512 3849a9ac806d69b496bfd2973ba8908b981cd72f900565fc9aea8a2b4080ec7c6fe8c579158c22da0ddc398faecf77a7ae1793eecf4d3054d0bdc06fde2aa7cc
-DIST zip-archive-0.3.3.tar.gz 18229 BLAKE2B ed15ccb0c80308afa246c7c7e805f01df050242af4fa881863ee07f9b52496a5ea7f41c9a9e01db5cab2734055c5d7399a0d955a35a3c3dc16fe9dd54c96c1cf SHA512 f799c5e324ea40313c312649f5c2b2e96128fc70b52f86a51fa9475354488d8c3b85220b297bc557728a1c0dd5c0827ead8b4613aef16edae7071bbf250ad25d
-EBUILD zip-archive-0.1.3.4.ebuild 909 BLAKE2B 3439afe054e796d10dd06a792f700bf211eb5a190bfc685fb13706a4ed835f5b10a1009abc7b3b6105dad9692e8b9e6dc7ebe42d985789059a607d7c5d21176f SHA512 8ac66c15c5c169c87c6e5ce4d285a0d66bf334c8bedd1acdbac3cb4fa9da241a5c37f7bb067796732fd1746336ca3fe2d8994f51ed341f1dfd84f3e0e43fea56
-EBUILD zip-archive-0.2.3.7.ebuild 951 BLAKE2B 4a6420b2233adea4106a4d9796e6944bcdaa10e5a21ca4d31c6a2793ef4693245cbcac807602788edc7d1e14ecabb9b5d5b03a16564788639a11ce514dae4155 SHA512 6c36f294fae72dae94dd470667ad4bd28a031f678afa4c661619291aea29afee8c67bc21b87b889474664e6de0f214b4097b0c88dbc74e99ced873ec44a69168
-EBUILD zip-archive-0.3.3.ebuild 940 BLAKE2B 47f5b5d6c6c56c54ea96aa2e30fdb9a1d313ab56c92a28ad053050426b531bcbee97300c359787ff7e1273887d7ff7d3fe81ba8ca23f65a757cc66df72350b29 SHA512 6774a9837a1cb710288f76044f7c256574c70381c653e682d54a530197eedeeb93cc3ab3a0fbe601af236a6660bb9596aac5d362206d852c2429f252f14d69ce
+DIST zip-archive-0.4.1.tar.gz 20967 BLAKE2B 0e1276aa9dabf70a36041c5acb6d83a571d067bdb40a8be30b35a2943ec28da92225d8f586101bfa87602186025fd5c61347bf8855216ce2a0101e9ff70a81b4 SHA512 216555bd73a46da5061291c2c071e9c71239bd5ae253ac06ee80ade65bb1871366cc8e4dffbad983c5b6a7f4b0cb2a1439dfa5971db3e183124fa90442a73f0c
+EBUILD zip-archive-0.4.1.ebuild 907 BLAKE2B 58d77e359a6ed3f82746b2bec3487a0887f2d25c856755e772f28117b51019df5d3ddbccccd2d3558c6fbda1b11fb7d56d6a7c325465b5f27b763ebc342ad5f2 SHA512 417e880d12e9cb6cb263910a8990349ae9b80dc87c19eb751200fd549fd0cc63540d1cf11694124675d4fe0b43be20205c01ea27c9a7ee0a1da93cf3bf134cbe
 MISC metadata.xml 554 BLAKE2B c174354f44b6718bb8fe11bd45e5ab1474362828356539197f38160104c2589fcfddd691d120294d65f14a1a7659c5777f018e96b1cbddb9aa952e688c3c119d SHA512 0dd9cdbf572293e8e8aef46bc393c2cdb672b09170e383bc1a18100275061369abb875d38a8d00a7da5a7babe45ea827d551e19e49053649daad9fdd4201e5cb
diff --git a/dev-haskell/zip-archive/zip-archive-0.1.3.4.ebuild b/dev-haskell/zip-archive/zip-archive-0.1.3.4.ebuild
deleted file mode 100644
index a918e39f8b99..000000000000
--- a/dev-haskell/zip-archive/zip-archive-0.1.3.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Library for creating and modifying zip archives"
-HOMEPAGE="https://github.com/jgm/zip-archive"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="executable"
-
-RDEPEND=">=dev-haskell/binary-0.5:=[profile?]
-		>=dev-haskell/digest-0.0.0.1:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		>=dev-haskell/utf8-string-0.3.1:=[profile?]
-		dev-haskell/zlib:=[profile?]
-		>=dev-lang/ghc-7.0.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10
-		test? ( dev-haskell/hunit
-			app-arch/zip
-		)"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable)
-}
diff --git a/dev-haskell/zip-archive/zip-archive-0.2.3.7.ebuild b/dev-haskell/zip-archive/zip-archive-0.2.3.7.ebuild
deleted file mode 100644
index 5e9aadcd5d00..000000000000
--- a/dev-haskell/zip-archive/zip-archive-0.2.3.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Library for creating and modifying zip archives"
-HOMEPAGE="https://github.com/jgm/zip-archive"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="executable"
-
-RDEPEND=">=dev-haskell/binary-0.5:=[profile?]
-	>=dev-haskell/digest-0.0.0.1:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( app-arch/zip
-		dev-haskell/hunit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable)
-}
diff --git a/dev-haskell/zip-archive/zip-archive-0.3.3.ebuild b/dev-haskell/zip-archive/zip-archive-0.4.1.ebuild
index a883f504333b..8774d5580de2 100644
--- a/dev-haskell/zip-archive/zip-archive-0.3.3.ebuild
+++ b/dev-haskell/zip-archive/zip-archive-0.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-# ebuild generated by hackport 0.5.6.9999
+# ebuild generated by hackport 0.6.2
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -24,12 +24,11 @@ RDEPEND=">=dev-haskell/digest-0.0.0.1:=[profile?]
 	>=dev-lang/ghc-7.8.2:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-2.0
 	test? ( dev-haskell/hunit
 		dev-haskell/temporary )
 "
-
-# non-haskell depend i always forget about
+# non-haskell depend
 DEPEND="${DEPEND}
 	test? ( app-arch/zip )
 "