From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 25 Nov 2020 22:39:15 +0000
Subject: gentoo resync : 25.11.2020

---
 dev-haskell/language-haskell-extract/Manifest      |  3 ++-
 .../language-haskell-extract-0.2.4-ghc-8.10.patch  | 20 +++++++++++++++++
 .../language-haskell-extract-0.2.4-r1.ebuild       | 25 ++++++++++++++++++++++
 .../language-haskell-extract-0.2.4.ebuild          | 23 --------------------
 4 files changed, 47 insertions(+), 24 deletions(-)
 create mode 100644 dev-haskell/language-haskell-extract/files/language-haskell-extract-0.2.4-ghc-8.10.patch
 create mode 100644 dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4-r1.ebuild
 delete mode 100644 dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4.ebuild

(limited to 'dev-haskell/language-haskell-extract')

diff --git a/dev-haskell/language-haskell-extract/Manifest b/dev-haskell/language-haskell-extract/Manifest
index b5be899d5ed5..930ba13a0779 100644
--- a/dev-haskell/language-haskell-extract/Manifest
+++ b/dev-haskell/language-haskell-extract/Manifest
@@ -1,3 +1,4 @@
+AUX language-haskell-extract-0.2.4-ghc-8.10.patch 761 BLAKE2B 1565bc0b79d2d45e3f191c0dff11e2552f4665b37c536c29561f0b04c500e4aff8994472f09a6c5780ffa754007fd5e6a4c692aa827e6c4cf10843b1f17b414a SHA512 a8b0f4c1bb17ff160a755a5ca004e16659a051d31d4feb6cac0d91596b69da4668bdfae4cb855f876268d47d5c0e50e1955088f4431004b9b4c6d9a4ad2e2e15
 DIST language-haskell-extract-0.2.4.tar.gz 2458 BLAKE2B 9655707a3195c82d5eda9cfbba150d3a91e103155cb522b0d9e13456e833b5530c808435d915456c230f92c438d2989512cbff956c7fd87493e481d39a53fbd8 SHA512 6408459abf9d531ccbe7d65766d38fcb93f4d3f9c77db1a706231bf6d8ad6f845fcefc4fbb03833f45c74f21f324a44760f3c89ff093c69f1f9999e64344ab4d
-EBUILD language-haskell-extract-0.2.4.ebuild 606 BLAKE2B 9d18a3ec7165b7f952d4e10922af0713678a4917ff0024955a43693c95db69bc1ac32e966c3682a6f8515f6e1409011178dabc5cfe43b61c4f723ca9f995d1ab SHA512 7e4a2702058676c15a66259b89d0ef494b1dd24430f0b8295a7b096f27bcefaf6eb5cbfff7dfb4ed35bb322357373cb0a872268cc28e109959854376254ded95
+EBUILD language-haskell-extract-0.2.4-r1.ebuild 651 BLAKE2B 0e2b5d8b60a1e99cb460b4867615bbfa52a5e9f7bde1df934a9e0b083061a2c8904db142cd52c417fcca9d417977b318dd4aa177f756f7838fc4535866b50ca3 SHA512 cdbcdb39cfccd7987077dbf22b287072afee55ab05f4c4201d6bbde56d41c6718933e78708332ecc5ef6b1a06f91f71903e1e218aba708aec78f0620f5d81167
 MISC metadata.xml 1475 BLAKE2B d0c31fb5b5c0220b46125212f7a40ab7c40f82cd58ab53d5f94931c6359178bd6b0dac93e4adeb8bf96162449cd79a106f4baac8ebbe784c6c088a20db60624a SHA512 bf65c32265a35a538f13bf8d4b2b89003077bdbc3f12ead1b6a8ee35e0d8a29da77bf37af7dfc1c2a2493b4e0d830b2664c6517c609128001065910964b75411
diff --git a/dev-haskell/language-haskell-extract/files/language-haskell-extract-0.2.4-ghc-8.10.patch b/dev-haskell/language-haskell-extract/files/language-haskell-extract-0.2.4-ghc-8.10.patch
new file mode 100644
index 000000000000..0a8dfb93fcab
--- /dev/null
+++ b/dev-haskell/language-haskell-extract/files/language-haskell-extract-0.2.4-ghc-8.10.patch
@@ -0,0 +1,20 @@
+diff --git a/src/Language/Haskell/Extract.hs b/src/Language/Haskell/Extract.hs
+index 3e8958b..43dfe04 100644
+--- a/src/Language/Haskell/Extract.hs
++++ b/src/Language/Haskell/Extract.hs
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ module Language.Haskell.Extract (
+   functionExtractor,
+   functionExtractorMap,
+@@ -25,5 +26,9 @@ extractAllFunctions pattern =
+ functionExtractor :: String -> ExpQ
+ functionExtractor pattern =
+   do functions <- extractAllFunctions pattern
+-     let makePair n = TupE [ LitE $ StringL n , VarE $ mkName n]
++     let makePair n = TupE
++#if MIN_VERSION_template_haskell(2,16,0)
++                           $ map Just
++#endif
++                           [ LitE $ StringL n , VarE $ mkName n]
+      return $ ListE $ map makePair functions
diff --git a/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4-r1.ebuild b/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4-r1.ebuild
new file mode 100644
index 000000000000..b34e2e9f9aea
--- /dev/null
+++ b/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.3.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Module to automatically extract functions from the local code"
+HOMEPAGE="https://github.com/finnsson/template-helper"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/regex-posix:=[profile?]
+		>=dev-lang/ghc-6.10.4:="
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.6"
+
+PATCHES=( ${FILESDIR}/${P}-ghc-8.10.patch )
diff --git a/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4.ebuild b/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4.ebuild
deleted file mode 100644
index ab128e10c2b6..000000000000
--- a/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4.ebuild
+++ /dev/null
@@ -1,23 +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.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Module to automatically extract functions from the local code"
-HOMEPAGE="https://github.com/finnsson/template-helper"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/regex-posix:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-- 
cgit v1.2.3