diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2020-08-29 09:36:08 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2020-08-29 09:36:08 +0100 |
| commit | b1fb32ba4813b894492d6e764e2fc8c1c3d7f230 (patch) | |
| tree | 31d37464498b42755188810db4de62938e171889 | |
| parent | dev-haskell/hsql-odbc: tweak for cabal-3 (diff) | |
| download | gentoo-b1fb32ba4813b894492d6e764e2fc8c1c3d7f230.tar.gz gentoo-b1fb32ba4813b894492d6e764e2fc8c1c3d7f230.tar.bz2 gentoo-b1fb32ba4813b894492d6e764e2fc8c1c3d7f230.zip | |
dev-haskell/hsql-sqlite3: tweak for cabal-3
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
| -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 +) |