diff options
| -rw-r--r-- | dev-haskell/hsql/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-haskell/hsql/files/digest-hsql-1.7 | 6 | ||||
| -rw-r--r-- | dev-haskell/hsql/hsql-1.7.ebuild | 21 |
3 files changed, 21 insertions, 11 deletions
diff --git a/dev-haskell/hsql/ChangeLog b/dev-haskell/hsql/ChangeLog index 96acb2036852..0243e9188cdf 100644 --- a/dev-haskell/hsql/ChangeLog +++ b/dev-haskell/hsql/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-haskell/hsql # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/ChangeLog,v 1.10 2007/10/31 13:03:29 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/ChangeLog,v 1.11 2007/12/13 05:41:55 dcoutts Exp $ + + 13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> hsql-1.7.ebuild: + Updates for upward compatability with cabal-1.2 and ghc-6.8 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> hsql-1.7.ebuild: Drop virtual/ghc in favour of dev-lang/ghc diff --git a/dev-haskell/hsql/files/digest-hsql-1.7 b/dev-haskell/hsql/files/digest-hsql-1.7 index 7944c41532c4..b169b35285bd 100644 --- a/dev-haskell/hsql/files/digest-hsql-1.7 +++ b/dev-haskell/hsql/files/digest-hsql-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 66d1951894695a49750ffdaf343489a6 hsql-1.7.tar.gz 7206 +RMD160 c9fe05ec190d93e15c1ddb72e63d5d68f1b66ab5 hsql-1.7.tar.gz 7206 +SHA256 894997832dad0427d4f4d0b414c7a18301d5f2abf51faf857ba50356de9e5448 hsql-1.7.tar.gz 7206 diff --git a/dev-haskell/hsql/hsql-1.7.ebuild b/dev-haskell/hsql/hsql-1.7.ebuild index 436d44a666e2..f7bbf185878a 100644 --- a/dev-haskell/hsql/hsql-1.7.ebuild +++ b/dev-haskell/hsql/hsql-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/hsql-1.7.ebuild,v 1.10 2007/10/31 13:03:29 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/hsql-1.7.ebuild,v 1.11 2007/12/13 05:41:55 dcoutts Exp $ CABAL_FEATURES="lib haddock" -inherit base eutils ghc-package haskell-cabal +inherit eutils haskell-cabal versionator DESCRIPTION="SQL bindings for Haskell" 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" @@ -16,13 +16,20 @@ IUSE="" DEPEND=">=dev-lang/ghc-6.4.1" -S="${WORKDIR}/HSQL/HSQL" - src_unpack() { - base_src_unpack + unpack "${A}" - cd ${S} + cd "${S}" epatch "${FILESDIR}/${P}-sqltext-to-int.patch" + + # Add in the extra split-base deps + if version_is_at_least "6.8" "$(ghc-version)"; then + sed -i -e '/build-depends:/a \ + , old-time' \ + -e '/extensions:/a \ + , Rank2Types, DeriveDataTypeable' \ + "${S}/hsql.cabal" + fi } pkg_postinst () { |