summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2020-08-29 09:34:08 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2020-08-29 09:34:13 +0100
commitd1c6a03f51e3acf5edfa541e730f40b633726c1f (patch)
treed8d87392d109f7a54bcdd15e093588b666f979a0 /dev-haskell/hsql-odbc
parentsys-apps/portage: 3.0.4-r1 ppc64 stable, bug #739446 (diff)
downloadgentoo-d1c6a03f51e3acf5edfa541e730f40b633726c1f.tar.gz
gentoo-d1c6a03f51e3acf5edfa541e730f40b633726c1f.tar.bz2
gentoo-d1c6a03f51e3acf5edfa541e730f40b633726c1f.zip
dev-haskell/hsql-odbc: tweak for cabal-3
Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'dev-haskell/hsql-odbc')
-rw-r--r--dev-haskell/hsql-odbc/files/hsql-odbc-1.8.2-cabal22.patch13
-rw-r--r--dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild10
2 files changed, 20 insertions, 3 deletions
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
new file mode 100644
index 000000000000..1c6c599b9cd7
--- /dev/null
+++ b/dev-haskell/hsql-odbc/files/hsql-odbc-1.8.2-cabal22.patch
@@ -0,0 +1,13 @@
+--- a/Setup.lhs
++++ b/Setup.lhs
+@@ -3,5 +3,10 @@
+ \begin{code}
++{-# LANGUAGE CPP #-}
+ import Distribution.Simple(defaultMainWithHooks ,simpleUserHooks ,preConf)
+ import Distribution.Simple.Setup(ConfigFlags)
++#if MIN_VERSION_Cabal(2,2,0)
++import Distribution.PackageDescription.PrettyPrint(writeHookedBuildInfo)
++#else
+ import Distribution.PackageDescription.Parse(writeHookedBuildInfo)
++#endif
+ import Distribution.PackageDescription
diff --git a/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild b/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild
index 0e404b50ee54..ed0ebe28b8f6 100644
--- a/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild
+++ b/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild
@@ -3,7 +3,7 @@
# ebuild generated by hackport 0.2.13
-EAPI=4
+EAPI=6
CABAL_FEATURES="lib profile haddock hscolour hoogle"
inherit haskell-cabal
@@ -17,8 +17,12 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-RDEPEND=">=dev-haskell/hsql-1.8.2[profile?]
- >=dev-lang/ghc-6.10.1
+RDEPEND=">=dev-haskell/hsql-1.8.2:=[profile?]
+ >=dev-lang/ghc-6.10.1:=
>=dev-db/unixODBC-2.2"
DEPEND="${RDEPEND}
dev-haskell/cabal"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-cabal22.patch
+)