diff options
| author |   Duncan Coutts <dcoutts@gentoo.org> | 2007-12-13 05:43:36 +0000 |
|---|---|---|
| committer | Duncan Coutts <dcoutts@gentoo.org> | 2007-12-13 05:43:36 +0000 |
| commit | 2aad1cea8828c798bb173af984f685fe8b257686 (patch) | |
| tree | 0441095f8983e93a10cdfee6015140a862af29ec | |
| parent | Updates for upward compatability with cabal-1.2 and ghc-6.8 (diff) | |
| download | gentoo-2-2aad1cea8828c798bb173af984f685fe8b257686.tar.gz gentoo-2-2aad1cea8828c798bb173af984f685fe8b257686.tar.bz2 gentoo-2-2aad1cea8828c798bb173af984f685fe8b257686.zip | |
Updates for upward compatability with cabal-1.2 and ghc-6.8
(Portage version: 2.1.3.19)
| -rw-r--r-- | dev-haskell/hsql-odbc/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-haskell/hsql-odbc/files/digest-hsql-odbc-1.7 | 6 | ||||
| -rw-r--r-- | dev-haskell/hsql-odbc/hsql-odbc-1.7.ebuild | 23 |
3 files changed, 19 insertions, 15 deletions
diff --git a/dev-haskell/hsql-odbc/ChangeLog b/dev-haskell/hsql-odbc/ChangeLog index 9e6eaef05b5c..d8f4d68da5f5 100644 --- a/dev-haskell/hsql-odbc/ChangeLog +++ b/dev-haskell/hsql-odbc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-haskell/hsql-odbc # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-odbc/ChangeLog,v 1.7 2007/10/31 13:04:28 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-odbc/ChangeLog,v 1.8 2007/12/13 05:43:36 dcoutts Exp $ + + 13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> hsql-odbc-1.7.ebuild: + Updates for upward compatability with cabal-1.2 and ghc-6.8 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> hsql-odbc-1.7.ebuild: Drop virtual/ghc in favour of dev-lang/ghc diff --git a/dev-haskell/hsql-odbc/files/digest-hsql-odbc-1.7 b/dev-haskell/hsql-odbc/files/digest-hsql-odbc-1.7 index 7944c41532c4..5d29124ab48d 100644 --- a/dev-haskell/hsql-odbc/files/digest-hsql-odbc-1.7 +++ b/dev-haskell/hsql-odbc/files/digest-hsql-odbc-1.7 @@ -1,3 +1,3 @@ -MD5 940c85cc1d6799eff9bc95f0224bd615 HSQL-1.7.tar.gz 37787 -RMD160 0bba6064c429480e3c95f7e41a683db981fe670f HSQL-1.7.tar.gz 37787 -SHA256 252f333f2a4ff2b58b2c9ba0c307f36ea674e77f0938e85950c2496b10ac2c2d HSQL-1.7.tar.gz 37787 +MD5 e7c2b76bfe71bfcbbf910049d58603e3 hsql-odbc-1.7.tar.gz 5701 +RMD160 fb1c1dbef4d95f8c2fe0f8549d6e2c0550b34135 hsql-odbc-1.7.tar.gz 5701 +SHA256 02331563101292e3fb4b146d98e4d1a4444edf82e0952067954e1e3328f85aa8 hsql-odbc-1.7.tar.gz 5701 diff --git a/dev-haskell/hsql-odbc/hsql-odbc-1.7.ebuild b/dev-haskell/hsql-odbc/hsql-odbc-1.7.ebuild index 8cc6d0177d07..42c5b69c59c8 100644 --- a/dev-haskell/hsql-odbc/hsql-odbc-1.7.ebuild +++ b/dev-haskell/hsql-odbc/hsql-odbc-1.7.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-odbc/hsql-odbc-1.7.ebuild,v 1.6 2007/10/31 13:04:28 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-odbc/hsql-odbc-1.7.ebuild,v 1.7 2007/12/13 05:43:36 dcoutts Exp $ CABAL_FEATURES="lib haddock" -inherit base haskell-cabal +inherit haskell-cabal versionator DESCRIPTION="ODBC driver for HSQL" HOMEPAGE="http://htoolkit.sourceforge.net/" -SRC_URI="mirror://gentoo/HSQL-${PV}.tar.gz" +SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0" @@ -18,15 +18,16 @@ DEPEND=">=dev-lang/ghc-6.4.1 ~dev-haskell/hsql-${PV} >=dev-db/unixODBC-2.2" -S="${WORKDIR}/HSQL/ODBC" - src_unpack() { - base_src_unpack + unpack "${A}" - echo '> import Distribution.Simple' > "${S}/Setup.lhs" - echo '> main = defaultMain' >> "${S}/Setup.lhs" + cabal-mksetup + sed -i -e '/cc-options:/d' "${S}/${PN}.cabal" + echo 'extra-libraries: odbc' >> "${S}/${PN}.cabal" + echo 'include-dirs: Database/HSQL' >> "${S}/${PN}.cabal" - sed -i '/cc-options:/d' "${S}/ODBC.cabal" - echo 'extra-libraries: odbc' >> "${S}/ODBC.cabal" - echo 'include-dirs: Database/HSQL' >> "${S}/ODBC.cabal" + # Add in the extra split-base deps + if version_is_at_least "6.8" "$(ghc-version)"; then + echo "build-depends: old-time" >> "${S}/${PN}.cabal" + fi } |