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

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

[Sergei Trofimovich]

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

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

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

 .../hsql-sqlite3/files/hsql-sqlite3-1.8.2-cabal22.patch    | 14 ++++++++++++++
 dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild      |  6 +++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/dev-haskell/hsql-sqlite3/files/hsql-sqlite3-1.8.2-cabal22.patch b/dev-haskell/hsql-sqlite3/files/hsql-sqlite3-1.8.2-cabal22.patch
new file mode 100644
index 00000000000..b421fbb9362
--- /dev/null
+++ b/dev-haskell/hsql-sqlite3/files/hsql-sqlite3-1.8.2-cabal22.patch
@@ -0,0 +1,14 @@
+--- a/Setup.lhs
++++ b/Setup.lhs
+@@ -3,2 +3,3 @@
+ \begin{code}
++{-# LANGUAGE CPP #-}
+ import Control.Monad(when)
+@@ -13,3 +14,7 @@ import Distribution.PackageDescription
+     ,emptyBuildInfo)
++#if MIN_VERSION_Cabal(2,2,0)
++import Distribution.PackageDescription.PrettyPrint(writeHookedBuildInfo)
++#else
+ import Distribution.PackageDescription.Parse(writeHookedBuildInfo)
++#endif
+ import Distribution.Simple(UserHooks(preConf,postConf) ,simpleUserHooks 

diff --git a/dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild b/dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild
index 0f537298e79..5385305b3fd 100644
--- a/dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild
+++ b/dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 # ebuild generated by hackport 0.3.1.9999
 
@@ -22,3 +22,7 @@ RDEPEND=">=dev-db/sqlite-3.0
 		>=dev-lang/ghc-6.10.4:="
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-0"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cabal22.patch
+)