| 1 |
commit: d1c6a03f51e3acf5edfa541e730f40b633726c1f |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 29 08:34:08 2020 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 29 08:34:13 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1c6a03f |
| 7 |
|
| 8 |
dev-haskell/hsql-odbc: 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 |
dev-haskell/hsql-odbc/files/hsql-odbc-1.8.2-cabal22.patch | 13 +++++++++++++ |
| 14 |
dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild | 10 +++++++--- |
| 15 |
2 files changed, 20 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..1c6c599b9cd |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-haskell/hsql-odbc/files/hsql-odbc-1.8.2-cabal22.patch |
| 22 |
@@ -0,0 +1,13 @@ |
| 23 |
+--- a/Setup.lhs |
| 24 |
++++ b/Setup.lhs |
| 25 |
+@@ -3,5 +3,10 @@ |
| 26 |
+ \begin{code} |
| 27 |
++{-# LANGUAGE CPP #-} |
| 28 |
+ import Distribution.Simple(defaultMainWithHooks ,simpleUserHooks ,preConf) |
| 29 |
+ import Distribution.Simple.Setup(ConfigFlags) |
| 30 |
++#if MIN_VERSION_Cabal(2,2,0) |
| 31 |
++import Distribution.PackageDescription.PrettyPrint(writeHookedBuildInfo) |
| 32 |
++#else |
| 33 |
+ import Distribution.PackageDescription.Parse(writeHookedBuildInfo) |
| 34 |
++#endif |
| 35 |
+ import Distribution.PackageDescription |
| 36 |
|
| 37 |
diff --git a/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild b/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild |
| 38 |
index 0e404b50ee5..ed0ebe28b8f 100644 |
| 39 |
--- a/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild |
| 40 |
+++ b/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild |
| 41 |
@@ -3,7 +3,7 @@ |
| 42 |
|
| 43 |
# ebuild generated by hackport 0.2.13 |
| 44 |
|
| 45 |
-EAPI=4 |
| 46 |
+EAPI=6 |
| 47 |
|
| 48 |
CABAL_FEATURES="lib profile haddock hscolour hoogle" |
| 49 |
inherit haskell-cabal |
| 50 |
@@ -17,8 +17,12 @@ SLOT="0" |
| 51 |
KEYWORDS="~amd64 ~x86" |
| 52 |
IUSE="" |
| 53 |
|
| 54 |
-RDEPEND=">=dev-haskell/hsql-1.8.2[profile?] |
| 55 |
- >=dev-lang/ghc-6.10.1 |
| 56 |
+RDEPEND=">=dev-haskell/hsql-1.8.2:=[profile?] |
| 57 |
+ >=dev-lang/ghc-6.10.1:= |
| 58 |
>=dev-db/unixODBC-2.2" |
| 59 |
DEPEND="${RDEPEND} |
| 60 |
dev-haskell/cabal" |
| 61 |
+ |
| 62 |
+PATCHES=( |
| 63 |
+ "${FILESDIR}"/${P}-cabal22.patch |
| 64 |
+) |
Archives