diff options
| author |   Duncan Coutts <dcoutts@gentoo.org> | 2007-12-13 05:50:33 +0000 |
|---|---|---|
| committer | Duncan Coutts <dcoutts@gentoo.org> | 2007-12-13 05:50:33 +0000 |
| commit | 459f94804a203364afe4c42abb36c68d2d4fb2ea (patch) | |
| tree | e00b22a80c2fb56561d252bb0b5ecf32c355f33b /dev-haskell/hsql-mysql | |
| parent | fix deps and checks (diff) | |
| download | historical-459f94804a203364afe4c42abb36c68d2d4fb2ea.tar.gz historical-459f94804a203364afe4c42abb36c68d2d4fb2ea.tar.bz2 historical-459f94804a203364afe4c42abb36c68d2d4fb2ea.zip | |
Updates for upward compatability with cabal-1.2 and ghc-6.8
Package-Manager: portage-2.1.3.19
Diffstat (limited to 'dev-haskell/hsql-mysql')
| -rw-r--r-- | dev-haskell/hsql-mysql/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-haskell/hsql-mysql/files/digest-hsql-mysql-1.7 | 6 | ||||
| -rw-r--r-- | dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild | 29 |
3 files changed, 22 insertions, 18 deletions
diff --git a/dev-haskell/hsql-mysql/ChangeLog b/dev-haskell/hsql-mysql/ChangeLog index 5092e9f5b029..70ee616e575b 100644 --- a/dev-haskell/hsql-mysql/ChangeLog +++ b/dev-haskell/hsql-mysql/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-haskell/hsql-mysql # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-mysql/ChangeLog,v 1.7 2007/10/31 13:03:59 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-mysql/ChangeLog,v 1.8 2007/12/13 05:42:21 dcoutts Exp $ + + 13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> hsql-mysql-1.7.ebuild: + Updates for upward compatability with cabal-1.2 and ghc-6.8 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> hsql-mysql-1.7.ebuild: Drop virtual/ghc in favour of dev-lang/ghc diff --git a/dev-haskell/hsql-mysql/files/digest-hsql-mysql-1.7 b/dev-haskell/hsql-mysql/files/digest-hsql-mysql-1.7 index 7944c41532c4..08ce8b66858f 100644 --- a/dev-haskell/hsql-mysql/files/digest-hsql-mysql-1.7 +++ b/dev-haskell/hsql-mysql/files/digest-hsql-mysql-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 de59a23b4be907c966925693344a7ec9 hsql-mysql-1.7.tar.gz 4157 +RMD160 930221ad3516ab2bd1a32d60582f6ef81c0e5c3b hsql-mysql-1.7.tar.gz 4157 +SHA256 08fb54512457b41d7afa707f0cfe115df3d7935f6a6919325fd52c9edc2ac2b5 hsql-mysql-1.7.tar.gz 4157 diff --git a/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild b/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild index a114102dd5a2..f109b222710e 100644 --- a/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild +++ b/dev-haskell/hsql-mysql/hsql-mysql-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-mysql/hsql-mysql-1.7.ebuild,v 1.7 2007/10/31 13:03:59 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild,v 1.8 2007/12/13 05:42:21 dcoutts Exp $ CABAL_FEATURES="lib haddock" -inherit base haskell-cabal +inherit haskell-cabal versionator DESCRIPTION="MySQL 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,16 +18,17 @@ DEPEND=">=dev-lang/ghc-6.4.1 ~dev-haskell/hsql-${PV} >=virtual/mysql-4.0" -S="${WORKDIR}/HSQL/MySQL" - src_unpack() { - base_src_unpack - - echo '> import Distribution.Simple' > "${S}/Setup.lhs" - echo '> main = defaultMain' >> "${S}/Setup.lhs" - - sed -i '/cc-options:/d' "${S}/MySQL.cabal" - echo 'extra-libraries: mysqlclient' >> "${S}/MySQL.cabal" - echo 'ld-options: -L/usr/lib/mysql' >> "${S}/MySQL.cabal" - echo 'include-dirs: Database/HSQL /usr/include/mysql' >> "${S}/MySQL.cabal" + unpack "${A}" + + cabal-mksetup + sed -i '/cc-options:/d' "${S}/${PN}.cabal" + echo 'extra-libraries: mysqlclient' >> "${S}/${PN}.cabal" + echo 'ld-options: -L/usr/lib/mysql' >> "${S}/${PN}.cabal" + echo 'include-dirs: Database/HSQL /usr/include/mysql' >> "${S}/${PN}.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 } |