diff options
| author |   Duncan Coutts <dcoutts@gentoo.org> | 2007-12-13 05:42:46 +0000 |
|---|---|---|
| committer | Duncan Coutts <dcoutts@gentoo.org> | 2007-12-13 05:42:46 +0000 |
| commit | 8e9c32694cd1322c32c8d8d26adf17ef64345df9 (patch) | |
| tree | 9bc0770fc2e31983b01e9ac999e2fe50dddd05d4 /dev-haskell | |
| parent | Updates for upward compatability with cabal-1.2 and ghc-6.8 (diff) | |
| download | gentoo-2-8e9c32694cd1322c32c8d8d26adf17ef64345df9.tar.gz gentoo-2-8e9c32694cd1322c32c8d8d26adf17ef64345df9.tar.bz2 gentoo-2-8e9c32694cd1322c32c8d8d26adf17ef64345df9.zip | |
Updates for upward compatability with cabal-1.2 and ghc-6.8
(Portage version: 2.1.3.19)
Diffstat (limited to 'dev-haskell')
| -rw-r--r-- | dev-haskell/hsql-postgresql/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-haskell/hsql-postgresql/files/digest-hsql-postgresql-1.7 | 6 | ||||
| -rw-r--r-- | dev-haskell/hsql-postgresql/hsql-postgresql-1.7.ebuild | 21 |
3 files changed, 19 insertions, 14 deletions
diff --git a/dev-haskell/hsql-postgresql/ChangeLog b/dev-haskell/hsql-postgresql/ChangeLog index a5c3e899733d..32d4ab3a96b3 100644 --- a/dev-haskell/hsql-postgresql/ChangeLog +++ b/dev-haskell/hsql-postgresql/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/hsql-postgresql # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-postgresql/ChangeLog,v 1.7 2007/10/31 13:04:59 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-postgresql/ChangeLog,v 1.8 2007/12/13 05:42:46 dcoutts Exp $ + + 13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> + hsql-postgresql-1.7.ebuild: + Updates for upward compatability with cabal-1.2 and ghc-6.8 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> hsql-postgresql-1.7.ebuild: diff --git a/dev-haskell/hsql-postgresql/files/digest-hsql-postgresql-1.7 b/dev-haskell/hsql-postgresql/files/digest-hsql-postgresql-1.7 index 7944c41532c4..8f57d359b2d0 100644 --- a/dev-haskell/hsql-postgresql/files/digest-hsql-postgresql-1.7 +++ b/dev-haskell/hsql-postgresql/files/digest-hsql-postgresql-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 af0a8c039b61331a77c9e723489d5b3c hsql-postgresql-1.7.tar.gz 4167 +RMD160 c01c0e434e24eb9f9bec6c44d5e84f9f09d69656 hsql-postgresql-1.7.tar.gz 4167 +SHA256 cced24f0bf8f1ca0f4c9bf2b2c1dab0cd39a2285d067040bd5305d7299420ca0 hsql-postgresql-1.7.tar.gz 4167 diff --git a/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.ebuild b/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.ebuild index f54d3b5f0e6d..bfbfd30e4d92 100644 --- a/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.ebuild +++ b/dev-haskell/hsql-postgresql/hsql-postgresql-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-postgresql/hsql-postgresql-1.7.ebuild,v 1.6 2007/10/31 13:04:59 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.ebuild,v 1.7 2007/12/13 05:42:46 dcoutts Exp $ CABAL_FEATURES="lib haddock" -inherit base haskell-cabal +inherit haskell-cabal versionator DESCRIPTION="PostgreSQL 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,14 +18,15 @@ DEPEND=">=dev-lang/ghc-6.4.1 ~dev-haskell/hsql-${PV} >=dev-db/libpq-7" -S="${WORKDIR}/HSQL/PostgreSQL" - src_unpack() { - base_src_unpack + unpack "${A}" - echo '> import Distribution.Simple' > "${S}/Setup.lhs" - echo '> main = defaultMain' >> "${S}/Setup.lhs" + cabal-mksetup + echo >> "${S}/${PN}.cabal" + echo 'include-dirs: /usr/include/postgresql/server' >> "${S}/${PN}.cabal" - ( echo; echo 'include-dirs: /usr/include/postgresql/server' ) \ - >> "${S}/PostgreSQL.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 } |