gentoo resync : 25.11.2020

3 files changed, 9 insertions, 53 deletions

diff --git a/dev-haskell/lens-family-th/Manifest b/dev-haskell/lens-family-th/Manifest
index 2dc8c2becb57..49a385ab9ee6 100644
--- a/dev-haskell/lens-family-th/Manifest
+++ b/dev-haskell/lens-family-th/Manifest
@@ -1,4 +1,3 @@
-AUX lens-family-th-0.4.1.0-ghc-8.patch 1528 BLAKE2B f32cbeca8419edfe2172312c785f9b17123551028276e0a141aa8e649846660b22fba64781819062a255a711c12635a9e432d199011d63c12d52086e0828f82a SHA512 752aaae5a9a174a67329a16e999a4e1606da1ed11c1c3244d84b07171cfbcb2384f5015ad6f57b718733878a789c59da7e148ab3be015284c5703f2670708dd8
-DIST lens-family-th-0.4.1.0.tar.gz 4562 BLAKE2B 1affa13291e8e610018761b4174bc45ac8cfcc23bbece8e82844a6660e997c5ab1916762bd65d2befa1aa5b0f19cdce1023111d2d7a6d765ff158aa726de6fdd SHA512 ab4283fcb833c68a838f006a71d30ed129c1d5f8ba030c4cbec6443ebeedc83e09a707a609c3c30c4420675bf5187227ce11f39218a3afb7ee563ad26104b774
-EBUILD lens-family-th-0.4.1.0.ebuild 605 BLAKE2B c5494ab0f435a4cf4e5e01849ef615767b0526da367cc2387f0cd97dc232bed2ffa0bc18257896c822d1cf89885964aea85f089fed1a034b797a3bd0b13fd064 SHA512 2c365d5969263f5a7653f0630a3468ec57c701d58bffc5c97269995247a7255a514c01a5c213339105fa5ecb3b5d77c35916c88d7e06266144773a6607bd47b6
+DIST lens-family-th-0.5.1.0.tar.gz 5724 BLAKE2B eec0a853e47fd4283a809c97d11d5b12fc5eda26d6d7fc136db230a518b8c99b9eeda40cbafad9ae5ba7916ef77d1d73b509324c407d96df6a8b5819f18703fa SHA512 0b38de8c6270478e7b8933def57288c8d938ba359f880b8e002f0871b56de4cac887b37d0a99c8ccc62ccc0e51416a7d4d3cea1d110477b7ade4ee0e9f799077
+EBUILD lens-family-th-0.5.1.0.ebuild 592 BLAKE2B 72daaa4ea37546553bff41d23b553a74ffee38bb3fc63d7be1da5668840ef57420a84e525be52f80fabf37239c26a230ee36252c1ff74b808a42afde2aeda94f SHA512 51428c1ead2d5cef15bbe4357be2edef1b14a53aba7992c4590578ca64b49a97c560fa41b08246e089afa8a6721d4ffd3b31e9bafce2307ba9f582f246cc22fd
 MISC metadata.xml 690 BLAKE2B d2cd7aa52cc8d336c744531618a66539841aa72e58678277937dafe5099c1a5ee827335cc65723df473c59ad72d71adbfd3873450f624eea158df7692a4be0f5 SHA512 55dc29a781ac230cf03c0d8f5907ddf60199804f9a37ceea31f361b3ce544b20a06c03b89615fe1076708ad76fe501c3dacf1907ba5f09ba345357ba68a80824
diff --git a/dev-haskell/lens-family-th/files/lens-family-th-0.4.1.0-ghc-8.patch b/dev-haskell/lens-family-th/files/lens-family-th-0.4.1.0-ghc-8.patch
deleted file mode 100644
index 06be29a8131b..000000000000
--- a/dev-haskell/lens-family-th/files/lens-family-th-0.4.1.0-ghc-8.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/Lens/Family/THCore.hs b/Lens/Family/THCore.hs
-index d4f2740..2f53db6 100644
---- a/Lens/Family/THCore.hs
-+++ b/Lens/Family/THCore.hs
-@@ -1 +1,2 @@
-+{-# LANGUAGE CPP #-}
- {-# LANGUAGE TemplateHaskell #-}
-@@ -52,4 +53,9 @@ extractLensTypeInfo datatype = do
-   return $ case i of
-+#if MIN_VERSION_template_haskell(2,11,0)
-+    TyConI (DataD    _ n ts _ _ _) -> (n, ts)
-+    TyConI (NewtypeD _ n ts _ _ _) -> (n, ts)
-+#else
-     TyConI (DataD    _ n ts _ _) -> (n, ts)
-     TyConI (NewtypeD _ n ts _ _) -> (n, ts)
-+#endif
-     _ -> error $ "Can't derive Lens for: "  ++ datatypeStr
-@@ -63,2 +69,8 @@ extractConstructorFields datatype = do
-   return $ case i of
-+#if MIN_VERSION_template_haskell(2,11,0)
-+    TyConI (DataD    _ _ _ _ [RecC _ fs] _) -> fs
-+    TyConI (NewtypeD _ _ _ _ (RecC _ fs) _) -> fs
-+    TyConI (DataD    _ _ _ _ [_]         _) ->
-+      error $ "Can't derive Lens without record selectors: " ++ datatypeStr
-+#else
-     TyConI (DataD    _ _ _ [RecC _ fs] _) -> fs
-@@ -67,2 +79,3 @@ extractConstructorFields datatype = do
-       error $ "Can't derive Lens without record selectors: " ++ datatypeStr
-+#endif
-     TyConI NewtypeD{} ->
-@@ -134,4 +147,9 @@ extractConstructorInfo datatype = do
-   return $ case i of
-+#if MIN_VERSION_template_haskell(2,11,0)
-+    TyConI (DataD    _ _ _ _ fs _) -> fs
-+    TyConI (NewtypeD _ _ _ _ f  _) -> [f]
-+#else
-     TyConI (DataD    _ _ _ fs _) -> fs
-     TyConI (NewtypeD _ _ _ f  _) -> [f]
-+#endif
-     _ -> error $ "Can't derive traversal for: " ++ datatypeStr
diff --git a/dev-haskell/lens-family-th/lens-family-th-0.4.1.0.ebuild b/dev-haskell/lens-family-th/lens-family-th-0.5.1.0.ebuild
index 784a93e87893..f8d4fb0e7583 100644
--- a/dev-haskell/lens-family-th/lens-family-th-0.4.1.0.ebuild
+++ b/dev-haskell/lens-family-th/lens-family-th-0.5.1.0.ebuild
@@ -1,11 +1,11 @@
-# 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.7.9999
+# ebuild generated by hackport 0.6.5.9999
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Generate lens-family style lenses"
@@ -17,12 +17,9 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-7.4.1:=
+RDEPEND=">=dev-lang/ghc-8.0.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( dev-haskell/hspec )
 "
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-8.patch
-}