Bump hsql to 1.8.2. Patch hsql 1.8.1 to build with ghc 7.4.1.

(Portage version: 2.1.10.56/cvs/Linux x86_64)

5 files changed, 69 insertions, 11 deletions

diff --git a/dev-haskell/hsql/ChangeLog b/dev-haskell/hsql/ChangeLog
index 4321f0920e0a..2bcf541f175b 100644
--- a/dev-haskell/hsql/ChangeLog
+++ b/dev-haskell/hsql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/hsql
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/ChangeLog,v 1.15 2011/08/04 13:04:38 slyfox Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/ChangeLog,v 1.16 2012/04/15 10:02:17 gienah Exp $
+
+*hsql-1.8.2 (15 Apr 2012)
+
+  15 Apr 2012; Mark Wright <gienah@gentoo.org> +files/hsql-1.8.1-ghc-7.4.patch,
+  +hsql-1.8.2.ebuild, hsql-1.8.1.ebuild, metadata.xml:
+  Bump hsql to 1.8.2. Patch hsql 1.8.1 to build with ghc 7.4.1.
 
   04 Aug 2011; Sergei Trofimovich <slyfox@gentoo.org> -hsql-1.7.ebuild,
   -hsql-1.7.1.ebuild, -files/hsql-1.7-sqltext-to-int.patch:
diff --git a/dev-haskell/hsql/files/hsql-1.8.1-ghc-7.4.patch b/dev-haskell/hsql/files/hsql-1.8.1-ghc-7.4.patch
new file mode 100644
index 000000000000..c8af51d865de
--- /dev/null
+++ b/dev-haskell/hsql/files/hsql-1.8.1-ghc-7.4.patch
@@ -0,0 +1,13 @@
+diff --git a/hsql.cabal b/hsql.cabal
+index 6595eee..7e198e9 100644
+--- a/hsql.cabal
++++ b/hsql.cabal
+@@ -19,7 +19,7 @@ exposed-modules:
+ 	Database.HSQL.Types
+ build-depends:	base==4.*, old-time
+ extensions: CPP, ForeignFunctionInterface, DeriveDataTypeable, RankNTypes,
+-			ScopedTypeVariables
++			ScopedTypeVariables, FlexibleInstances
+ build-type: Simple
+ license-file: LICENSE
+ cabal-version: >= 1.6
diff --git a/dev-haskell/hsql/hsql-1.8.1.ebuild b/dev-haskell/hsql/hsql-1.8.1.ebuild
index ef015b48d68d..e5a42ee5dfce 100644
--- a/dev-haskell/hsql/hsql-1.8.1.ebuild
+++ b/dev-haskell/hsql/hsql-1.8.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/hsql-1.8.1.ebuild,v 1.1 2011/08/04 12:44:56 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/hsql-1.8.1.ebuild,v 1.2 2012/04/15 10:02:16 gienah Exp $
 
 # ebuild generated by hackport 0.2.13
 
-EAPI="3"
+EAPI=4
 
-CABAL_FEATURES="lib profile haddock hscolour"
-inherit haskell-cabal
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit base haskell-cabal
 
 DESCRIPTION="Simple library for database access from Haskell."
 HOMEPAGE="http://hackage.haskell.org/package/hsql"
@@ -22,6 +22,8 @@ RDEPEND=">=dev-lang/ghc-6.10.1"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.6"
 
+PATCHES=("${FILESDIR}"/${P}-ghc-7.4.patch)
+
 pkg_postinst () {
 	ghc-package_pkg_postinst
 
diff --git a/dev-haskell/hsql/hsql-1.8.2.ebuild b/dev-haskell/hsql/hsql-1.8.2.ebuild
new file mode 100644
index 000000000000..0e2126320ba0
--- /dev/null
+++ b/dev-haskell/hsql/hsql-1.8.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/hsql-1.8.2.ebuild,v 1.1 2012/04/15 10:02:16 gienah Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI=4
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit base haskell-cabal
+
+DESCRIPTION="Database access from Haskell."
+HOMEPAGE="http://hackage.haskell.org/package/hsql"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-6.10.1"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.10"
+
+pkg_postinst () {
+	ghc-package_pkg_postinst
+
+	elog "You will probably want to emerge one or more HSQL backend."
+	elog "These backends are available:"
+	elog "		hsql-postgresql"
+	elog "		hsql-mysql"
+	elog "		hsql-sqlite"
+	elog "		hsql-odbc"
+}
diff --git a/dev-haskell/hsql/metadata.xml b/dev-haskell/hsql/metadata.xml
index 8c66906af531..99edff7d89fe 100644
--- a/dev-haskell/hsql/metadata.xml
+++ b/dev-haskell/hsql/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
-<maintainer>
-  <email>haskell@gentoo.org</email>
-</maintainer>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Simple library for database access from Haskell.
+	</longdescription>
 </pkgmetadata>