From b17a3ef12038de50228bade1f05502c74e135321 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 2 Sep 2020 14:09:07 +0100
Subject: gentoo resync : 02.09.2020

---
 dev-haskell/hsql-odbc/Manifest                            |  3 ++-
 dev-haskell/hsql-odbc/files/hsql-odbc-1.8.2-cabal22.patch | 13 +++++++++++++
 dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild              | 10 +++++++---
 3 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 dev-haskell/hsql-odbc/files/hsql-odbc-1.8.2-cabal22.patch

(limited to 'dev-haskell/hsql-odbc')

diff --git a/dev-haskell/hsql-odbc/Manifest b/dev-haskell/hsql-odbc/Manifest
index bf29a7b20962..42da19553458 100644
--- a/dev-haskell/hsql-odbc/Manifest
+++ b/dev-haskell/hsql-odbc/Manifest
@@ -1,3 +1,4 @@
+AUX hsql-odbc-1.8.2-cabal22.patch 435 BLAKE2B de29d70a76cb295dc9e088db974dc0b7d1a1cf1d5d0f523cc967131f0dca2790ce3b9bcf8ad2dbdcd91474279394c9e1e47ee387e4530c7fed810887b9eeb8f0 SHA512 f1c68fe436fbf33cd60e5d195c0b1d3472ed21f96d053ddb0091f1eb3643712137293c9754c5929127ca78a4298966ba557ab39f6ed81f4676543a485c4a1be9
 DIST hsql-odbc-1.8.2.tar.gz 8041 BLAKE2B 80b3881297218b7dadfc7826acdb19e9f61d41124f5ca2d5a589ceabdfb03a6b64020432b43579e9fc9af82956e64147354b35ac5fb08b8e6eccd13e0f10afd1 SHA512 78f91ee63007e02820eefd1bd9ae08b9659667aa70f545ef83ff6d83d592c7f542339db129bb6c3ad14f4cdde320b3a4e1251c25267db716dbd88cbb5931a6d5
-EBUILD hsql-odbc-1.8.2.ebuild 579 BLAKE2B 4121f41f0a22da1e0e849cc6c27e474ec32bfc278e65d3600e82b86434d5d31920ce5e630b896c21d4dee44ef3e73d30809c91ef01e6c51dfaf42ff750ee3b06 SHA512 2962ce6e7deecef9ef62c516085e2a548edc691308e3dc39b3916a2c99d4c9e1e3f74fd57e5461e886b7d141ee905d0f1112a27d79296a99e69390df0ab19cf8
+EBUILD hsql-odbc-1.8.2.ebuild 630 BLAKE2B 66e7d2bb52b548d0f4a770d802fcb434a44acfc6c2ea3ac5e0aaf8ad3573df86b646c708bf1ea1e4674bc1c34904de3eb020d3de28d958e13836fc7d645dabce SHA512 8af1eb2747ad2435bbd2c7c9eae44ed745ad9ba8b095835c7d49fd4809ce8cabc419c2d6fb659fdeb1eee945424ab7807f752d461bfb8cea4db9334806cebfeb
 MISC metadata.xml 312 BLAKE2B 32b0d8d9d9bd075ada8a8aa688d088fedc4a2012f2595c435b1431df4ed7f3c6ea84910847ec59ac728a2a4a7322ac6839b8edd6a8651953e37e4b43a245d6d1 SHA512 45f671f7f757de6d1e94cb82e6c791aa1b9e97f0f2a78a84cbba3b433ed190befa0c3c9930e990251bedfbfa15bf6f75fd087db40235882171d7cc1176b97d94
diff --git a/dev-haskell/hsql-odbc/files/hsql-odbc-1.8.2-cabal22.patch b/dev-haskell/hsql-odbc/files/hsql-odbc-1.8.2-cabal22.patch
new file mode 100644
index 000000000000..1c6c599b9cd7
--- /dev/null
+++ b/dev-haskell/hsql-odbc/files/hsql-odbc-1.8.2-cabal22.patch
@@ -0,0 +1,13 @@
+--- a/Setup.lhs
++++ b/Setup.lhs
+@@ -3,5 +3,10 @@
+ \begin{code}
++{-# LANGUAGE CPP #-}
+ import Distribution.Simple(defaultMainWithHooks ,simpleUserHooks ,preConf)
+ import Distribution.Simple.Setup(ConfigFlags)
++#if MIN_VERSION_Cabal(2,2,0)
++import Distribution.PackageDescription.PrettyPrint(writeHookedBuildInfo)
++#else
+ import Distribution.PackageDescription.Parse(writeHookedBuildInfo)
++#endif
+ import Distribution.PackageDescription
diff --git a/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild b/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild
index 0e404b50ee54..ed0ebe28b8f6 100644
--- a/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild
+++ b/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild
@@ -3,7 +3,7 @@
 
 # ebuild generated by hackport 0.2.13
 
-EAPI=4
+EAPI=6
 
 CABAL_FEATURES="lib profile haddock hscolour hoogle"
 inherit haskell-cabal
@@ -17,8 +17,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-haskell/hsql-1.8.2[profile?]
-		>=dev-lang/ghc-6.10.1
+RDEPEND=">=dev-haskell/hsql-1.8.2:=[profile?]
+		>=dev-lang/ghc-6.10.1:=
 		>=dev-db/unixODBC-2.2"
 DEPEND="${RDEPEND}
 		dev-haskell/cabal"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cabal22.patch
+)
-- 
cgit v1.2.3