From 459f94804a203364afe4c42abb36c68d2d4fb2ea Mon Sep 17 00:00:00 2001 From: Duncan Coutts Date: Thu, 13 Dec 2007 05:50:33 +0000 Subject: Updates for upward compatability with cabal-1.2 and ghc-6.8 Package-Manager: portage-2.1.3.19 --- dev-haskell/haddock/ChangeLog | 5 +++- dev-haskell/haddock/haddock-0.8.ebuild | 22 +++++++++++++++- dev-haskell/haskell-src-exts/ChangeLog | 6 ++++- .../haskell-src-exts/haskell-src-exts-0.2.ebuild | 17 +++++++++---- dev-haskell/haskell-src/ChangeLog | 6 ++++- dev-haskell/haskell-src/haskell-src-1.0-r1.ebuild | 7 +++++- dev-haskell/haskell-src/haskell-src-1.0.1.ebuild | 5 ++-- dev-haskell/hsql-mysql/ChangeLog | 5 +++- dev-haskell/hsql-mysql/files/digest-hsql-mysql-1.7 | 6 ++--- dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild | 29 +++++++++++----------- dev-haskell/hsql-odbc/ChangeLog | 5 +++- dev-haskell/hsql-odbc/files/digest-hsql-odbc-1.7 | 6 ++--- dev-haskell/hsql-odbc/hsql-odbc-1.7.ebuild | 23 +++++++++-------- dev-haskell/hsql-postgresql/ChangeLog | 6 ++++- .../files/digest-hsql-postgresql-1.7 | 6 ++--- .../hsql-postgresql/hsql-postgresql-1.7.ebuild | 21 ++++++++-------- dev-haskell/hsql-sqlite/ChangeLog | 5 +++- .../hsql-sqlite/files/digest-hsql-sqlite-1.7 | 6 ++--- dev-haskell/hsql-sqlite/hsql-sqlite-1.7.ebuild | 19 +++++++------- dev-haskell/hsql/ChangeLog | 5 +++- dev-haskell/hsql/files/digest-hsql-1.7 | 6 ++--- dev-haskell/hsql/hsql-1.7.ebuild | 21 ++++++++++------ dev-haskell/html/ChangeLog | 6 ++++- dev-haskell/html/html-1.0-r1.ebuild | 7 +++++- dev-haskell/html/html-1.0.1.ebuild | 5 ++-- dev-haskell/hunit/ChangeLog | 6 ++++- dev-haskell/hunit/hunit-1.1-r1.ebuild | 7 +++++- dev-haskell/hunit/hunit-1.1.1.ebuild | 5 ++-- dev-haskell/missingh/ChangeLog | 5 +++- dev-haskell/missingh/missingh-0.18.6.ebuild | 20 +++++++++++++-- dev-haskell/mtl/ChangeLog | 6 ++++- dev-haskell/mtl/mtl-1.0-r1.ebuild | 7 +++++- dev-haskell/mtl/mtl-1.0.1.ebuild | 5 ++-- dev-haskell/network/ChangeLog | 6 ++++- dev-haskell/network/network-2.0.1.ebuild | 7 ++---- dev-haskell/network/network-2.0.ebuild | 7 +++++- dev-haskell/quickcheck/ChangeLog | 6 ++++- dev-haskell/quickcheck/quickcheck-1.0-r1.ebuild | 7 +++++- dev-haskell/quickcheck/quickcheck-1.0.1.ebuild | 5 ++-- dev-haskell/time/ChangeLog | 6 ++++- dev-haskell/time/time-1.0.ebuild | 7 +++++- dev-haskell/time/time-1.1.1.ebuild | 8 ++---- dev-haskell/uulib/ChangeLog | 5 +++- dev-haskell/uulib/uulib-0.9.2.ebuild | 3 ++- dev-haskell/xhtml/ChangeLog | 6 ++++- dev-haskell/xhtml/xhtml-2006.9.13.ebuild | 7 +++++- dev-haskell/xhtml/xhtml-3000.0.2.ebuild | 5 ++-- 47 files changed, 272 insertions(+), 129 deletions(-) (limited to 'dev-haskell') diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog index 91bf6dcd0e81..efd2f5651893 100644 --- a/dev-haskell/haddock/ChangeLog +++ b/dev-haskell/haddock/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-haskell/haddock # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.51 2007/12/13 00:45:33 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.52 2007/12/13 05:40:31 dcoutts Exp $ + + 13 Dec 2007; Duncan Coutts haddock-0.8.ebuild: + Updates for upward compatability with cabal-1.2 and ghc-6.8 12 Dec 2007; Duncan Coutts haddock-0.7.ebuild: Remove unnecessary blocker. diff --git a/dev-haskell/haddock/haddock-0.8.ebuild b/dev-haskell/haddock/haddock-0.8.ebuild index 05d4a36777d9..9cf839c445da 100644 --- a/dev-haskell/haddock/haddock-0.8.ebuild +++ b/dev-haskell/haddock/haddock-0.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.8.ebuild,v 1.11 2007/12/13 00:45:33 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.8.ebuild,v 1.12 2007/12/13 05:40:31 dcoutts Exp $ CABAL_FEATURES="bin" inherit haskell-cabal eutils versionator @@ -26,6 +26,26 @@ RDEPEND="" S="${WORKDIR}/${MY_PF}" +src_unpack () { + unpack "${A}" + + #FIXME: remove the following two workarounds when haddock-0.9 is released + + # Cabal 1.2 expects the pre-processed sources in a different location: + mkdir -p "${S}/dist/build/haddock/haddock-tmp/" + cp "${S}/src/HaddockLex.hs" \ + "${S}/src/HaddockParse.hs" \ + "${S}/src/HsParser.hs" \ + "${S}/dist/build/haddock/haddock-tmp/" + + # Add in the extra split-base deps + if version_is_at_least "6.8" "$(ghc-version)"; then + sed -i -e '/build-depends:/a \ + ,array, containers, directory, pretty, process' \ + "${S}/haddock.cabal" + fi +} + src_compile () { cabal_src_compile if use doc; then diff --git a/dev-haskell/haskell-src-exts/ChangeLog b/dev-haskell/haskell-src-exts/ChangeLog index ac97c0c89638..0e0a500d33f9 100644 --- a/dev-haskell/haskell-src-exts/ChangeLog +++ b/dev-haskell/haskell-src-exts/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/haskell-src-exts # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src-exts/ChangeLog,v 1.10 2007/10/31 12:59:13 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src-exts/ChangeLog,v 1.11 2007/12/13 05:41:30 dcoutts Exp $ + + 13 Dec 2007; Duncan Coutts + haskell-src-exts-0.2.ebuild: + Updates for upward compatability with cabal-1.2 and ghc-6.8 31 Oct 2007; Duncan Coutts haskell-src-exts-0.2.ebuild: diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-0.2.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-0.2.ebuild index f56928046c0a..476a1d60b5f9 100644 --- a/dev-haskell/haskell-src-exts/haskell-src-exts-0.2.ebuild +++ b/dev-haskell/haskell-src-exts/haskell-src-exts-0.2.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src-exts/haskell-src-exts-0.2.ebuild,v 1.10 2007/10/31 12:59:13 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src-exts/haskell-src-exts-0.2.ebuild,v 1.11 2007/12/13 05:41:30 dcoutts Exp $ CABAL_FEATURES="lib happy" -inherit base haskell-cabal eutils +inherit base haskell-cabal eutils versionator DESCRIPTION="An extension to haskell-src that handles most common syntactic extensions to Haskell" HOMEPAGE="http://www.cs.chalmers.se/~d00nibro/haskell-src-exts/" @@ -28,8 +28,15 @@ src_unpack() { # Make it work with ghc pre-6.4 sed -i 's/{-# OPTIONS_GHC /{-# OPTIONS /' \ - ${S}/Language/Haskell/Hsx/Syntax.hs \ - ${S}/Language/Haskell/Hsx/Pretty.hs + "${S}/Language/Haskell/Hsx/Syntax.hs" \ + "${S}/Language/Haskell/Hsx/Pretty.hs" sed -i 's/#ifdef __GLASGOW_HASKELL__/#if __GLASGOW_HASKELL__>=604/' \ - ${S}/Language/Haskell/Hsx/Syntax.hs + "${S}/Language/Haskell/Hsx/Syntax.hs" + + if version_is_at_least "6.8" "$(ghc-version)"; then + sed -i -e '/Build-Depends:/a \ + , array, pretty' \ + "${S}/${PN}.cabal" + fi + } diff --git a/dev-haskell/haskell-src/ChangeLog b/dev-haskell/haskell-src/ChangeLog index da1426c21388..f09348dce2c0 100644 --- a/dev-haskell/haskell-src/ChangeLog +++ b/dev-haskell/haskell-src/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/haskell-src # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src/ChangeLog,v 1.23 2007/12/13 00:46:10 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src/ChangeLog,v 1.24 2007/12/13 05:41:04 dcoutts Exp $ + + 13 Dec 2007; Duncan Coutts haskell-src-1.0-r1.ebuild, + haskell-src-1.0.1.ebuild: + Updates for upward compatability with cabal-1.2 and ghc-6.8 12 Dec 2007; Duncan Coutts haskell-src-1.0.ebuild: Remove unnecessary blocker. diff --git a/dev-haskell/haskell-src/haskell-src-1.0-r1.ebuild b/dev-haskell/haskell-src/haskell-src-1.0-r1.ebuild index e1a70998de04..4a328c77d590 100644 --- a/dev-haskell/haskell-src/haskell-src-1.0-r1.ebuild +++ b/dev-haskell/haskell-src/haskell-src-1.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src/haskell-src-1.0-r1.ebuild,v 1.4 2007/07/08 15:36:08 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src/haskell-src-1.0-r1.ebuild,v 1.5 2007/12/13 05:41:04 dcoutts Exp $ CABAL_FEATURES="lib profile haddock" inherit base haskell-cabal @@ -19,3 +19,8 @@ IUSE="" DEPEND=">=dev-lang/ghc-6.6" S="${WORKDIR}/ghc-${GHC_PV}/libraries/${PN}" + +src_unpack() { + unpack "${A}" + cabal-mksetup +} diff --git a/dev-haskell/haskell-src/haskell-src-1.0.1.ebuild b/dev-haskell/haskell-src/haskell-src-1.0.1.ebuild index 11a03f7cdfa9..58adb023c932 100644 --- a/dev-haskell/haskell-src/haskell-src-1.0.1.ebuild +++ b/dev-haskell/haskell-src/haskell-src-1.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src/haskell-src-1.0.1.ebuild,v 1.5 2007/12/12 14:08:55 fmccor Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src/haskell-src-1.0.1.ebuild,v 1.6 2007/12/13 05:41:04 dcoutts Exp $ CABAL_FEATURES="lib profile haddock" inherit base haskell-cabal @@ -20,8 +20,7 @@ DEPEND=">=dev-lang/ghc-6.6" S="${WORKDIR}/ghc-${GHC_PV}/libraries/${PN}" -# Sadly Setup.hs in the ghc-6.6.1 extralibs was not tested with Cabal-1.1.6.x src_unpack() { unpack "${A}" - sed -i -e "/type Hook/ s/UserHooks/Maybe UserHooks/" "${S}/Setup.hs" + cabal-mksetup } 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 hsql-mysql-1.7.ebuild: + Updates for upward compatability with cabal-1.2 and ghc-6.8 31 Oct 2007; Duncan Coutts 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 } 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 hsql-odbc-1.7.ebuild: + Updates for upward compatability with cabal-1.2 and ghc-6.8 31 Oct 2007; Duncan Coutts 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 } 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 + hsql-postgresql-1.7.ebuild: + Updates for upward compatability with cabal-1.2 and ghc-6.8 31 Oct 2007; Duncan Coutts 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 } diff --git a/dev-haskell/hsql-sqlite/ChangeLog b/dev-haskell/hsql-sqlite/ChangeLog index d323e0605f2a..5b01c3ef04f0 100644 --- a/dev-haskell/hsql-sqlite/ChangeLog +++ b/dev-haskell/hsql-sqlite/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-haskell/hsql-sqlite # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-sqlite/ChangeLog,v 1.8 2007/10/31 13:05:25 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-sqlite/ChangeLog,v 1.9 2007/12/13 05:43:11 dcoutts Exp $ + + 13 Dec 2007; Duncan Coutts hsql-sqlite-1.7.ebuild: + Updates for upward compatability with cabal-1.2 and ghc-6.8 31 Oct 2007; Duncan Coutts hsql-sqlite-1.7.ebuild: Drop virtual/ghc in favour of dev-lang/ghc diff --git a/dev-haskell/hsql-sqlite/files/digest-hsql-sqlite-1.7 b/dev-haskell/hsql-sqlite/files/digest-hsql-sqlite-1.7 index 7944c41532c4..fc5e37bab061 100644 --- a/dev-haskell/hsql-sqlite/files/digest-hsql-sqlite-1.7 +++ b/dev-haskell/hsql-sqlite/files/digest-hsql-sqlite-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 3c9830c1e3dda9e8b6b35b12652b274d hsql-sqlite3-1.7.tar.gz 3207 +RMD160 f38c8a833652829696ce7555ef21054f125d82b6 hsql-sqlite3-1.7.tar.gz 3207 +SHA256 06c7fbcab758231e21c62f81ab42a6b9fde0c10057463ce40780317b5fbef32d hsql-sqlite3-1.7.tar.gz 3207 diff --git a/dev-haskell/hsql-sqlite/hsql-sqlite-1.7.ebuild b/dev-haskell/hsql-sqlite/hsql-sqlite-1.7.ebuild index ab69a3e0c2bf..bbef73e92801 100644 --- a/dev-haskell/hsql-sqlite/hsql-sqlite-1.7.ebuild +++ b/dev-haskell/hsql-sqlite/hsql-sqlite-1.7.ebuild @@ -1,13 +1,16 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-sqlite/hsql-sqlite-1.7.ebuild,v 1.6 2007/10/31 13:05:25 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-sqlite/hsql-sqlite-1.7.ebuild,v 1.7 2007/12/13 05:43:11 dcoutts Exp $ CABAL_FEATURES="lib haddock" -inherit base haskell-cabal +inherit haskell-cabal + +MY_PN=hsql-sqlite3 +MY_P=${MY_PN}-${PV} DESCRIPTION="SQLite3 driver HSQL" HOMEPAGE="http://htoolkit.sourceforge.net/" -SRC_URI="mirror://gentoo/HSQL-${PV}.tar.gz" +SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" @@ -18,13 +21,11 @@ DEPEND=">=dev-lang/ghc-6.4.1 ~dev-haskell/hsql-${PV} >=dev-db/sqlite-3.0" -S="${WORKDIR}/HSQL/SQLite3" +S="${WORKDIR}/${MY_P}" src_unpack() { - base_src_unpack - - echo '> import Distribution.Simple' > "${S}/Setup.lhs" - echo '> main = defaultMain' >> "${S}/Setup.lhs" + unpack "${A}" - echo 'extra-libraries: sqlite3' >> "${S}/SQLite3.cabal" + cabal-mksetup + echo 'extra-libraries: sqlite3' >> "${S}/hsql-sqlite3.cabal" } 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 hsql-1.7.ebuild: + Updates for upward compatability with cabal-1.2 and ghc-6.8 31 Oct 2007; Duncan Coutts 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 () { diff --git a/dev-haskell/html/ChangeLog b/dev-haskell/html/ChangeLog index 5264fd41cc5d..8b3c3eff25aa 100644 --- a/dev-haskell/html/ChangeLog +++ b/dev-haskell/html/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/html # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/html/ChangeLog,v 1.23 2007/12/13 00:48:50 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/html/ChangeLog,v 1.24 2007/12/13 05:44:03 dcoutts Exp $ + + 13 Dec 2007; Duncan Coutts html-1.0-r1.ebuild, + html-1.0.1.ebuild: + Updates for upward compatability with cabal-1.2 and ghc-6.8 13 Dec 2007; Duncan Coutts html-1.0.ebuild: Remove unnecessary blocker. diff --git a/dev-haskell/html/html-1.0-r1.ebuild b/dev-haskell/html/html-1.0-r1.ebuild index a7e2c1b1ef75..278a1b6dfb0d 100644 --- a/dev-haskell/html/html-1.0-r1.ebuild +++ b/dev-haskell/html/html-1.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/html/html-1.0-r1.ebuild,v 1.4 2007/07/08 15:36:36 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/html/html-1.0-r1.ebuild,v 1.5 2007/12/13 05:44:03 dcoutts Exp $ CABAL_FEATURES="lib profile haddock" inherit haskell-cabal @@ -19,3 +19,8 @@ IUSE="" DEPEND=">=dev-lang/ghc-6.6" S="${WORKDIR}/ghc-${GHC_PV}/libraries/${PN}" + +src_unpack() { + unpack "${A}" + cabal-mksetup +} diff --git a/dev-haskell/html/html-1.0.1.ebuild b/dev-haskell/html/html-1.0.1.ebuild index 90fdee49bbb9..019596adcb9f 100644 --- a/dev-haskell/html/html-1.0.1.ebuild +++ b/dev-haskell/html/html-1.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/html/html-1.0.1.ebuild,v 1.5 2007/12/12 13:50:54 fmccor Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/html/html-1.0.1.ebuild,v 1.6 2007/12/13 05:44:03 dcoutts Exp $ CABAL_FEATURES="lib profile haddock" inherit haskell-cabal @@ -20,8 +20,7 @@ DEPEND=">=dev-lang/ghc-6.6" S="${WORKDIR}/ghc-${GHC_PV}/libraries/${PN}" -# Sadly Setup.hs in the ghc-6.6.1 extralibs was not tested with Cabal-1.1.6.x src_unpack() { unpack "${A}" - sed -i -e "/type Hook/ s/UserHooks/Maybe UserHooks/" "${S}/Setup.hs" + cabal-mksetup } diff --git a/dev-haskell/hunit/ChangeLog b/dev-haskell/hunit/ChangeLog index d73d3a0c7c20..cf050b6a1a31 100644 --- a/dev-haskell/hunit/ChangeLog +++ b/dev-haskell/hunit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/hunit # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hunit/ChangeLog,v 1.23 2007/12/13 00:49:38 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hunit/ChangeLog,v 1.24 2007/12/13 05:44:32 dcoutts Exp $ + + 13 Dec 2007; Duncan Coutts hunit-1.1-r1.ebuild, + hunit-1.1.1.ebuild: + Updates for upward compatability with cabal-1.2 and ghc-6.8 13 Dec 2007; Duncan Coutts hunit-1.1.ebuild: Remove unnecessary blocker. diff --git a/dev-haskell/hunit/hunit-1.1-r1.ebuild b/dev-haskell/hunit/hunit-1.1-r1.ebuild index 278aa46dae5f..d850d240f480 100644 --- a/dev-haskell/hunit/hunit-1.1-r1.ebuild +++ b/dev-haskell/hunit/hunit-1.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hunit/hunit-1.1-r1.ebuild,v 1.5 2007/12/13 00:49:38 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hunit/hunit-1.1-r1.ebuild,v 1.6 2007/12/13 05:44:32 dcoutts Exp $ CABAL_FEATURES="lib profile haddock" inherit base haskell-cabal @@ -21,6 +21,11 @@ DEPEND=">=dev-lang/ghc-6.6" S="${WORKDIR}/ghc-${GHC_PV}/libraries/${MY_PN}" +src_unpack() { + unpack "${A}" + cabal-mksetup +} + src_install () { cabal_src_install if use doc; then diff --git a/dev-haskell/hunit/hunit-1.1.1.ebuild b/dev-haskell/hunit/hunit-1.1.1.ebuild index 57e5a7138e32..28e95b1dbdeb 100644 --- a/dev-haskell/hunit/hunit-1.1.1.ebuild +++ b/dev-haskell/hunit/hunit-1.1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hunit/hunit-1.1.1.ebuild,v 1.5 2007/12/12 13:57:32 fmccor Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hunit/hunit-1.1.1.ebuild,v 1.6 2007/12/13 05:44:32 dcoutts Exp $ CABAL_FEATURES="lib profile haddock" inherit base haskell-cabal @@ -21,10 +21,9 @@ DEPEND=">=dev-lang/ghc-6.6" S="${WORKDIR}/ghc-${GHC_PV}/libraries/${MY_PN}" -# Sadly Setup.hs in the ghc-6.6.1 extralibs was not tested with Cabal-1.1.6.x src_unpack() { unpack "${A}" - sed -i -e "/type Hook/ s/UserHooks/Maybe UserHooks/" "${S}/Setup.hs" + cabal-mksetup } src_install () { diff --git a/dev-haskell/missingh/ChangeLog b/dev-haskell/missingh/ChangeLog index 618a6efc4787..28f53b803a3c 100644 --- a/dev-haskell/missingh/ChangeLog +++ b/dev-haskell/missingh/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-haskell/missingh # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/missingh/ChangeLog,v 1.7 2007/10/31 13:08:35 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/missingh/ChangeLog,v 1.8 2007/12/13 05:46:34 dcoutts Exp $ + + 13 Dec 2007; Duncan Coutts missingh-0.18.6.ebuild: + Updates for upward compatability with cabal-1.2 and ghc-6.8 31 Oct 2007; Duncan Coutts missingh-0.14.4.ebuild, missingh-0.16.0.ebuild: diff --git a/dev-haskell/missingh/missingh-0.18.6.ebuild b/dev-haskell/missingh/missingh-0.18.6.ebuild index c079cf383319..d5777a99576c 100644 --- a/dev-haskell/missingh/missingh-0.18.6.ebuild +++ b/dev-haskell/missingh/missingh-0.18.6.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/missingh/missingh-0.18.6.ebuild,v 1.1 2007/07/26 16:38:47 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/missingh/missingh-0.18.6.ebuild,v 1.2 2007/12/13 05:46:34 dcoutts Exp $ CABAL_FEATURES="lib profile haddock" -inherit base haskell-cabal +inherit haskell-cabal versionator DESCRIPTION="Collection of Haskell-related utilities" HOMEPAGE="http://software.complete.org/missingh" @@ -24,3 +24,19 @@ DEPEND=">=dev-lang/ghc-6.4.2 >=dev-haskell/hunit-1.1 >=dev-haskell/network-1.0 >=dev-haskell/quickcheck-1.0" + +src_unpack() { + unpack "${A}" + + cabal-mksetup + sed -i -e 's/GHC-Options: -O2/GHC-Options: -fglasgow-exts/' \ + -e 's/Build-Depends:/Build-Depends: unix,/' \ + "${S}/MissingH.cabal" + + if version_is_at_least "6.8" "$(ghc-version)"; then + sed -i -e '/Build-Depends:/a \ + directory, random, process, old-time, \ + containers, old-locale, array,' \ + "${S}/MissingH.cabal" + fi +} diff --git a/dev-haskell/mtl/ChangeLog b/dev-haskell/mtl/ChangeLog index e74744e2a7e2..ed3ff3dd4fd7 100644 --- a/dev-haskell/mtl/ChangeLog +++ b/dev-haskell/mtl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/mtl # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/mtl/ChangeLog,v 1.23 2007/12/13 00:50:15 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/mtl/ChangeLog,v 1.24 2007/12/13 05:47:02 dcoutts Exp $ + + 13 Dec 2007; Duncan Coutts mtl-1.0-r1.ebuild, + mtl-1.0.1.ebuild: + Updates for upward compatability with cabal-1.2 and ghc-6.8 13 Dec 2007; Duncan Coutts mtl-1.0.ebuild: Remove unnecessary blocker. diff --git a/dev-haskell/mtl/mtl-1.0-r1.ebuild b/dev-haskell/mtl/mtl-1.0-r1.ebuild index e7b8fa4924e6..5f4d2933d3b5 100644 --- a/dev-haskell/mtl/mtl-1.0-r1.ebuild +++ b/dev-haskell/mtl/mtl-1.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/mtl/mtl-1.0-r1.ebuild,v 1.4 2007/07/08 15:48:32 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/mtl/mtl-1.0-r1.ebuild,v 1.5 2007/12/13 05:47:02 dcoutts Exp $ CABAL_FEATURES="lib profile haddock" inherit haskell-cabal @@ -19,3 +19,8 @@ IUSE="" DEPEND=">=dev-lang/ghc-6.6" S="${WORKDIR}/ghc-${GHC_PV}/libraries/${PN}" + +src_unpack() { + unpack "${A}" + cabal-mksetup +} diff --git a/dev-haskell/mtl/mtl-1.0.1.ebuild b/dev-haskell/mtl/mtl-1.0.1.ebuild index e9781804cea7..872462b5f302 100644 --- a/dev-haskell/mtl/mtl-1.0.1.ebuild +++ b/dev-haskell/mtl/mtl-1.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/mtl/mtl-1.0.1.ebuild,v 1.5 2007/12/12 13:24:30 fmccor Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/mtl/mtl-1.0.1.ebuild,v 1.6 2007/12/13 05:47:02 dcoutts Exp $ CABAL_FEATURES="lib profile haddock" inherit haskell-cabal @@ -20,8 +20,7 @@ DEPEND=">=dev-lang/ghc-6.6" S="${WORKDIR}/ghc-${GHC_PV}/libraries/${PN}" -# Sadly Setup.hs in the ghc-6.6.1 extralibs was not tested with Cabal-1.1.6.x src_unpack() { unpack "${A}" - sed -i -e "/type Hook/ s/UserHooks/Maybe UserHooks/" "${S}/Setup.hs" + cabal-mksetup } diff --git a/dev-haskell/network/ChangeLog b/dev-haskell/network/ChangeLog index 45f10ecd7963..2dcb3edeefb8 100644 --- a/dev-haskell/network/ChangeLog +++ b/dev-haskell/network/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/network # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/ChangeLog,v 1.23 2007/12/13 00:50:53 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/ChangeLog,v 1.24 2007/12/13 05:48:45 dcoutts Exp $ + + 13 Dec 2007; Duncan Coutts network-2.0.ebuild, + network-2.0.1.ebuild: + Updates for upward compatability with cabal-1.2 and ghc-6.8 13 Dec 2007; Duncan Coutts network-1.0.ebuild: Remove unnecessary blocker. diff --git a/dev-haskell/network/network-2.0.1.ebuild b/dev-haskell/network/network-2.0.1.ebuild index 8cfa34e5b2fb..32c37abe2629 100644 --- a/dev-haskell/network/network-2.0.1.ebuild +++ b/dev-haskell/network/network-2.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/network-2.0.1.ebuild,v 1.5 2007/12/12 13:16:06 fmccor Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/network-2.0.1.ebuild,v 1.6 2007/12/13 05:48:45 dcoutts Exp $ CABAL_FEATURES="lib profile haddock" inherit haskell-cabal @@ -20,10 +20,7 @@ DEPEND=">=dev-lang/ghc-6.6" S="${WORKDIR}/ghc-${GHC_PV}/libraries/${PN}" -# Sadly Setup.hs in the ghc-6.6.1 extralibs was not tested with Cabal-1.1.6.x src_unpack() { unpack "${A}" - sed -e "/type Hook/ s/UserHooks/Maybe UserHooks/" \ - -e "/^add_configure_options ::/ d" \ - -i "${S}/Setup.hs" + cabal-mksetup } diff --git a/dev-haskell/network/network-2.0.ebuild b/dev-haskell/network/network-2.0.ebuild index 4879eba18993..2e26bd4139ee 100644 --- a/dev-haskell/network/network-2.0.ebuild +++ b/dev-haskell/network/network-2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/network-2.0.ebuild,v 1.4 2007/07/08 15:49:01 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/network-2.0.ebuild,v 1.5 2007/12/13 05:48:45 dcoutts Exp $ CABAL_FEATURES="lib profile haddock" inherit haskell-cabal @@ -19,3 +19,8 @@ IUSE="" DEPEND=">=dev-lang/ghc-6.6" S="${WORKDIR}/ghc-${GHC_PV}/libraries/${PN}" + +src_unpack() { + unpack "${A}" + cabal-mksetup +} diff --git a/dev-haskell/quickcheck/ChangeLog b/dev-haskell/quickcheck/ChangeLog index 2d1dcdbdde6d..ce86f8315f43 100644 --- a/dev-haskell/quickcheck/ChangeLog +++ b/dev-haskell/quickcheck/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/quickcheck # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/ChangeLog,v 1.23 2007/12/13 00:51:30 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/ChangeLog,v 1.24 2007/12/13 05:49:14 dcoutts Exp $ + + 13 Dec 2007; Duncan Coutts quickcheck-1.0-r1.ebuild, + quickcheck-1.0.1.ebuild: + Updates for upward compatability with cabal-1.2 and ghc-6.8 13 Dec 2007; Duncan Coutts quickcheck-1.0.ebuild: Remove unnecessary blocker. diff --git a/dev-haskell/quickcheck/quickcheck-1.0-r1.ebuild b/dev-haskell/quickcheck/quickcheck-1.0-r1.ebuild index 761238a2e8a3..aab73b1a4c77 100644 --- a/dev-haskell/quickcheck/quickcheck-1.0-r1.ebuild +++ b/dev-haskell/quickcheck/quickcheck-1.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/quickcheck-1.0-r1.ebuild,v 1.4 2007/07/08 15:49:29 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/quickcheck-1.0-r1.ebuild,v 1.5 2007/12/13 05:49:14 dcoutts Exp $ CABAL_FEATURES="lib profile haddock" inherit base haskell-cabal @@ -20,3 +20,8 @@ IUSE="" DEPEND=">=dev-lang/ghc-6.6" S="${WORKDIR}/ghc-${GHC_PV}/libraries/${MY_PN}" + +src_unpack() { + unpack "${A}" + cabal-mksetup +} diff --git a/dev-haskell/quickcheck/quickcheck-1.0.1.ebuild b/dev-haskell/quickcheck/quickcheck-1.0.1.ebuild index 7ff2ccf14cc9..1352979991ea 100644 --- a/dev-haskell/quickcheck/quickcheck-1.0.1.ebuild +++ b/dev-haskell/quickcheck/quickcheck-1.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/quickcheck-1.0.1.ebuild,v 1.5 2007/12/12 14:01:52 fmccor Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/quickcheck-1.0.1.ebuild,v 1.6 2007/12/13 05:49:14 dcoutts Exp $ CABAL_FEATURES="lib profile haddock" inherit base haskell-cabal @@ -21,8 +21,7 @@ DEPEND=">=dev-lang/ghc-6.6" S="${WORKDIR}/ghc-${GHC_PV}/libraries/${MY_PN}" -# Sadly Setup.hs in the ghc-6.6.1 extralibs was not tested with Cabal-1.1.6.x src_unpack() { unpack "${A}" - sed -i -e "/type Hook/ s/UserHooks/Maybe UserHooks/" "${S}/Setup.hs" + cabal-mksetup } diff --git a/dev-haskell/time/ChangeLog b/dev-haskell/time/ChangeLog index ca779e86429f..cd93e9c5fb1b 100644 --- a/dev-haskell/time/ChangeLog +++ b/dev-haskell/time/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/time # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/time/ChangeLog,v 1.9 2007/12/12 13:55:04 fmccor Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/time/ChangeLog,v 1.10 2007/12/13 05:49:41 dcoutts Exp $ + + 13 Dec 2007; Duncan Coutts time-1.0.ebuild, + time-1.1.1.ebuild: + Updates for upward compatability with cabal-1.2 and ghc-6.8 12 Dec 2007; Ferris McCormick time-1.1.1.ebuild: Sparc stable --- part of Bug #201984. diff --git a/dev-haskell/time/time-1.0.ebuild b/dev-haskell/time/time-1.0.ebuild index 52001c379135..ee012836e98d 100644 --- a/dev-haskell/time/time-1.0.ebuild +++ b/dev-haskell/time/time-1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/time/time-1.0.ebuild,v 1.4 2007/07/08 15:49:56 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/time/time-1.0.ebuild,v 1.5 2007/12/13 05:49:41 dcoutts Exp $ CABAL_FEATURES="lib profile haddock" inherit haskell-cabal @@ -19,3 +19,8 @@ IUSE="" DEPEND=">=dev-lang/ghc-6.6" S="${WORKDIR}/ghc-${GHC_PV}/libraries/${PN}" + +src_unpack() { + unpack "${A}" + cabal-mksetup +} diff --git a/dev-haskell/time/time-1.1.1.ebuild b/dev-haskell/time/time-1.1.1.ebuild index 6a2bbbde02e2..94373e1529c8 100644 --- a/dev-haskell/time/time-1.1.1.ebuild +++ b/dev-haskell/time/time-1.1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/time/time-1.1.1.ebuild,v 1.5 2007/12/12 13:55:04 fmccor Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/time/time-1.1.1.ebuild,v 1.6 2007/12/13 05:49:41 dcoutts Exp $ CABAL_FEATURES="lib profile haddock" inherit haskell-cabal @@ -20,11 +20,7 @@ DEPEND=">=dev-lang/ghc-6.6" S="${WORKDIR}/ghc-${GHC_PV}/libraries/${PN}" -# Sadly Setup.hs in the ghc-6.6.1 extralibs was not tested with Cabal-1.1.6.x src_unpack() { unpack "${A}" - sed -e "/type Hook/ s/UserHooks/Maybe UserHooks/" \ - -e "/^runTestScript ::/ d" \ - -e "s/maybeExit \\\$ //" \ - -i "${S}/Setup.hs" + cabal-mksetup } diff --git a/dev-haskell/uulib/ChangeLog b/dev-haskell/uulib/ChangeLog index be9fa8db3bc7..52e58bcb719b 100644 --- a/dev-haskell/uulib/ChangeLog +++ b/dev-haskell/uulib/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-haskell/uulib # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uulib/ChangeLog,v 1.14 2007/10/31 13:10:46 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uulib/ChangeLog,v 1.15 2007/12/13 05:50:07 dcoutts Exp $ + + 13 Dec 2007; Duncan Coutts uulib-0.9.2.ebuild: + Updates for upward compatability with cabal-1.2 and ghc-6.8 31 Oct 2007; Duncan Coutts uulib-0.9.2.ebuild: Drop virtual/ghc in favour of dev-lang/ghc diff --git a/dev-haskell/uulib/uulib-0.9.2.ebuild b/dev-haskell/uulib/uulib-0.9.2.ebuild index dbc4ba393699..a1719089166b 100644 --- a/dev-haskell/uulib/uulib-0.9.2.ebuild +++ b/dev-haskell/uulib/uulib-0.9.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uulib/uulib-0.9.2.ebuild,v 1.10 2007/10/31 13:10:46 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uulib/uulib-0.9.2.ebuild,v 1.11 2007/12/13 05:50:07 dcoutts Exp $ CABAL_FEATURES="haddock lib" inherit base haskell-cabal @@ -21,4 +21,5 @@ src_unpack() { # GHC 6.6 is stricter in some class instance stuff sed -i 's/Extensions:/Extensions: UndecidableInstances/' "${S}/uulib.cabal" + echo "ghc-options: -fglasgow-exts" >> "${S}/uulib.cabal" } diff --git a/dev-haskell/xhtml/ChangeLog b/dev-haskell/xhtml/ChangeLog index 9519c6843ff3..619ba3243175 100644 --- a/dev-haskell/xhtml/ChangeLog +++ b/dev-haskell/xhtml/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/xhtml # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xhtml/ChangeLog,v 1.9 2007/12/12 13:17:42 fmccor Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xhtml/ChangeLog,v 1.10 2007/12/13 05:50:33 dcoutts Exp $ + + 13 Dec 2007; Duncan Coutts xhtml-2006.9.13.ebuild, + xhtml-3000.0.2.ebuild: + Updates for upward compatability with cabal-1.2 and ghc-6.8 12 Dec 2007; Ferris McCormick xhtml-3000.0.2.ebuild: Sparc stable --- part of Bug #201984. diff --git a/dev-haskell/xhtml/xhtml-2006.9.13.ebuild b/dev-haskell/xhtml/xhtml-2006.9.13.ebuild index 7f622e648967..3c3ff59a85df 100644 --- a/dev-haskell/xhtml/xhtml-2006.9.13.ebuild +++ b/dev-haskell/xhtml/xhtml-2006.9.13.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xhtml/xhtml-2006.9.13.ebuild,v 1.4 2007/07/08 15:50:26 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xhtml/xhtml-2006.9.13.ebuild,v 1.5 2007/12/13 05:50:33 dcoutts Exp $ CABAL_FEATURES="lib profile haddock" inherit haskell-cabal @@ -19,3 +19,8 @@ IUSE="" DEPEND=">=dev-lang/ghc-6.6" S="${WORKDIR}/ghc-${GHC_PV}/libraries/${PN}" + +src_unpack() { + unpack "${A}" + cabal-mksetup +} diff --git a/dev-haskell/xhtml/xhtml-3000.0.2.ebuild b/dev-haskell/xhtml/xhtml-3000.0.2.ebuild index 6d71bc7702c5..148d17f12b01 100644 --- a/dev-haskell/xhtml/xhtml-3000.0.2.ebuild +++ b/dev-haskell/xhtml/xhtml-3000.0.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xhtml/xhtml-3000.0.2.ebuild,v 1.5 2007/12/12 13:17:42 fmccor Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xhtml/xhtml-3000.0.2.ebuild,v 1.6 2007/12/13 05:50:33 dcoutts Exp $ CABAL_FEATURES="lib profile haddock" inherit haskell-cabal @@ -20,8 +20,7 @@ DEPEND=">=dev-lang/ghc-6.6" S="${WORKDIR}/ghc-${GHC_PV}/libraries/${PN}" -# Sadly Setup.hs in the ghc-6.6.1 extralibs was not tested with Cabal-1.1.6.x src_unpack() { unpack "${A}" - sed -i -e "/type Hook/ s/UserHooks/Maybe UserHooks/" "${S}/Setup.hs" + cabal-mksetup } -- cgit v1.2.3-65-gdbad