[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hsql-odbc/files/, dev-haskell/hsql-odbc/

[Sergei Trofimovich]

commit:     d1c6a03f51e3acf5edfa541e730f40b633726c1f
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 29 08:34:08 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Aug 29 08:34:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1c6a03f

dev-haskell/hsql-odbc: tweak for cabal-3

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-haskell/hsql-odbc/files/hsql-odbc-1.8.2-cabal22.patch | 13 +++++++++++++
 dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild              | 10 +++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

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 00000000000..1c6c599b9cd
--- /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 0e404b50ee5..ed0ebe28b8f 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
+)