| 1 |
commit: b1fb32ba4813b894492d6e764e2fc8c1c3d7f230 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 29 08:36:08 2020 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 29 08:36:08 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1fb32ba |
| 7 |
|
| 8 |
dev-haskell/hsql-sqlite3: tweak for cabal-3 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 11 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 12 |
|
| 13 |
.../hsql-sqlite3/files/hsql-sqlite3-1.8.2-cabal22.patch | 14 ++++++++++++++ |
| 14 |
dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild | 6 +++++- |
| 15 |
2 files changed, 19 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..b421fbb9362 |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-haskell/hsql-sqlite3/files/hsql-sqlite3-1.8.2-cabal22.patch |
| 22 |
@@ -0,0 +1,14 @@ |
| 23 |
+--- a/Setup.lhs |
| 24 |
++++ b/Setup.lhs |
| 25 |
+@@ -3,2 +3,3 @@ |
| 26 |
+ \begin{code} |
| 27 |
++{-# LANGUAGE CPP #-} |
| 28 |
+ import Control.Monad(when) |
| 29 |
+@@ -13,3 +14,7 @@ import Distribution.PackageDescription |
| 30 |
+ ,emptyBuildInfo) |
| 31 |
++#if MIN_VERSION_Cabal(2,2,0) |
| 32 |
++import Distribution.PackageDescription.PrettyPrint(writeHookedBuildInfo) |
| 33 |
++#else |
| 34 |
+ import Distribution.PackageDescription.Parse(writeHookedBuildInfo) |
| 35 |
++#endif |
| 36 |
+ import Distribution.Simple(UserHooks(preConf,postConf) ,simpleUserHooks |
| 37 |
|
| 38 |
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 |
| 39 |
index 0f537298e79..5385305b3fd 100644 |
| 40 |
--- a/dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild |
| 41 |
+++ b/dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild |
| 42 |
@@ -1,7 +1,7 @@ |
| 43 |
# Copyright 1999-2020 Gentoo Authors |
| 44 |
# Distributed under the terms of the GNU General Public License v2 |
| 45 |
|
| 46 |
-EAPI=5 |
| 47 |
+EAPI=6 |
| 48 |
|
| 49 |
# ebuild generated by hackport 0.3.1.9999 |
| 50 |
|
| 51 |
@@ -22,3 +22,7 @@ RDEPEND=">=dev-db/sqlite-3.0 |
| 52 |
>=dev-lang/ghc-6.10.4:=" |
| 53 |
DEPEND="${RDEPEND} |
| 54 |
>=dev-haskell/cabal-0" |
| 55 |
+ |
| 56 |
+PATCHES=( |
| 57 |
+ "${FILESDIR}"/${P}-cabal22.patch |
| 58 |
+) |
Archives