diff options
-rw-r--r-- | dev-haskell/hsql-sqlite3/files/hsql-sqlite3-1.8.2-cabal22.patch | 14 | ||||
-rw-r--r-- | dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild | 6 |
2 files changed, 19 insertions, 1 deletions
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 000000000000..b421fbb9362a --- /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 0f537298e791..5385305b3fd8 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 +) |