gentoo resync : 25.11.2020

3 files changed, 5 insertions, 34 deletions

diff --git a/dev-haskell/utf8-string/Manifest b/dev-haskell/utf8-string/Manifest
index a92f1324476f..6a7d3f3a7adc 100644
--- a/dev-haskell/utf8-string/Manifest
+++ b/dev-haskell/utf8-string/Manifest
@@ -1,5 +1,3 @@
-DIST utf8-string-0.3.8.tar.gz 9129 BLAKE2B 9ee624a9a1258b19134ac63e6b15fbb71a17e03e78be49c464c3c76eeaf2f052c65f8df360900a1e9badb31d7f27059aa33642e6244bd665e62519abe663065a SHA512 70f6ceaf4d9d6e6fe7b787facbb733f276ac5ba10c49c43e0da283b481f0579e0933f6343f5158973a6f0aac342f5b76258281dbd0c420bf652ad3c3787eb1fb
 DIST utf8-string-1.0.1.1.tar.gz 8667 BLAKE2B db2f899e0f78e44700cec859fd71982024e05f971ab5fef36071410c207a23dce1fa7430ce6cdeefdb5b2c28509eb5848946e2207e046ab7a4105c56e25fce16 SHA512 2dd647625478c9738b3af5e23e1e5ff92968449ad74e6d53dc308fa0f2b08b63c421a1cbe5491dd260b9b32770ec626843d320a09b80eb984211dba53934b965
-EBUILD utf8-string-0.3.8.ebuild 648 BLAKE2B dcf5e13b2b659be87d1fe7c5c74d59fce7cc1f326d39fb780266741d57d0a5cbb7ccd63338b064cdd0bdfe55e92737a39f712f3bb8e9217d977a19d79a1732d1 SHA512 d728abc6a715fa7cfb00c91a7d6ff4571e11e17d3715a66017c8ffa0087d0362d14f6411ffc75bd607a6ba70898096aee4da9a8523adc4fe3536b122593ee755
-EBUILD utf8-string-1.0.1.1.ebuild 665 BLAKE2B 057e4e97a8701be15b237cab41b141281966924adeb19e76de3c7ed1229e0b9f463f53c1fd7e1e9b0ebb93be03854e67dc039dbbf827b56b211b985c953f5802 SHA512 cab9c46ef87524a425c20ac4541d068323d79f7804c92b1a960225a7d4da0db37f69a4bf4632b4d1c6fee7b8df337e8308f274e68bb423d0d2780f06e1a9fa4b
+EBUILD utf8-string-1.0.1.1.ebuild 675 BLAKE2B 9235a7da9cb056d14ba790faf7aafa0f2b6bccc88be830644c36fcac330e888efabf9c8f960ce61d250523e3620481528a9789ab4904d92a7990520ea72621a4 SHA512 a24f890574b277b5b1f378a916f4368fc78d9e1f7ef4b6ff6716c51858ae8fc63e87e56fac38c86977eff1ad4de2a41c946f8a1fb7bde50fd9444b69c30308bc
 MISC metadata.xml 309 BLAKE2B 41ec5100a1fe355f798d48894322ecf00bc7802fac10222f95e96674335f9537e23f04c37bddc1e1cdec7728b33c3a6d3781dbaf2be464fc5643b0468e1ec4d8 SHA512 ce8b570dcd924d3409d3dd5c2d27601799b30ba8a166f502d262b66d02c63f5110bbcf92fb5ad5a610a68d4a97cd55a70bf5730d17a2a590a0df83d4e00c2deb
diff --git a/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild b/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild
deleted file mode 100644
index ebc25d83c0cf..000000000000
--- a/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild
+++ /dev/null
@@ -1,29 +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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Support for reading and writing UTF8 Strings"
-HOMEPAGE="https://github.com/glguy/utf8-string/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'base >= 3 && < 4.8' 'base >= 3'
-}
diff --git a/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild b/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild
index 104a89bac444..3d4360870a3c 100644
--- a/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild
+++ b/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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.6.9999
 
@@ -24,6 +24,8 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+	default
+
 	cabal_chdeps \
 		'base >= 4.3 && < 4.9' 'base >= 4.3'
 }