7 files changed, 122 insertions, 95 deletions
diff --git a/dev-haskell/hdbc/ChangeLog b/dev-haskell/hdbc/ChangeLog
index a38930b80e8b..c8d012ae5ca6 100644
--- a/dev-haskell/hdbc/ChangeLog
+++ b/dev-haskell/hdbc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-haskell/hdbc
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/ChangeLog,v 1.12 2010/07/11 21:21:59 slyfox Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/ChangeLog,v 1.13 2011/06/12 19:50:10 slyfox Exp $
+
+*hdbc-2.2.7.0 (12 Jun 2011)
+
+  12 Jun 2011; Sergei Trofimovich <slyfox@gentoo.org> -hdbc-1.0.0.ebuild,
+  -hdbc-1.0.1.ebuild, -hdbc-1.1.3.ebuild, +hdbc-2.2.7.0.ebuild,
+  +files/hdbc-2.2.7.0-fix-fbuildtests.patch, metadata.xml:
+  Version bump. Requested by Christopher Howard (bug #367211). Removed old
+  versions.
 
   11 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org> hdbc-1.1.3.ebuild:
   Fixed building against newer ghc (bug #296529). Thanks to Diego E.
diff --git a/dev-haskell/hdbc/files/hdbc-2.2.7.0-fix-fbuildtests.patch b/dev-haskell/hdbc/files/hdbc-2.2.7.0-fix-fbuildtests.patch
new file mode 100644
index 000000000000..e43398c6060b
--- /dev/null
+++ b/dev-haskell/hdbc/files/hdbc-2.2.7.0-fix-fbuildtests.patch
@@ -0,0 +1,37 @@
+From c68a1aac64081c14739361c87fd7d8342c5382ee Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sun, 22 May 2011 12:36:02 +0300
+Subject: [PATCH] .cabal: fix depends for 'cabal configure -fbuildtests'
+
+$ cabal configure -fbuildtests
+$ cabal build
+
+Database/HDBC/SqlValue.hs:25:17:
+    Could not find module `Data.Text.Lazy':
+      It is a member of the hidden package `text-0.11.0.6'.
+      Perhaps you need to add `text' to the build-depends in your .cabal file.
+      Use -v to see a list of the files searched for.
+
+Added missing depend for test.
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ HDBC.cabal |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/HDBC.cabal b/HDBC.cabal
+index fb7d996..5de5f3e 100644
+--- a/HDBC.cabal
++++ b/HDBC.cabal
+@@ -68,7 +68,7 @@ Executable runtests
+           Build-Depends: time<1.1.3
+       else
+         Build-Depends: base<3
+-      Build-Depends: mtl, convertible >= 1.0.9.1, utf8-string
++      Build-Depends: mtl, convertible >= 1.0.9.1, utf8-string, text
+ 
+       -- Hack for cabal-install weirdness.  cabal-install forces base 3,
+       -- though it works fine for Setup.lhs manually.  Fix.
+-- 
+1.7.3.4
+
diff --git a/dev-haskell/hdbc/hdbc-1.0.0.ebuild b/dev-haskell/hdbc/hdbc-1.0.0.ebuild
deleted file mode 100644
index c0d57dc91a9c..000000000000
--- a/dev-haskell/hdbc/hdbc-1.0.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/hdbc-1.0.0.ebuild,v 1.2 2007/10/31 13:00:06 dcoutts Exp $
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell Database Connectivity"
-HOMEPAGE="http://quux.org/devel/hdbc/"
-SRC_URI="http://quux.org/devel/hdbc/${PN}_${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="odbc postgres sqlite"
-
-DEPEND=">=dev-lang/ghc-6.4.1"
-
-PDEPEND="odbc? ( =dev-haskell/hdbc-odbc-${PV}* )
-		 postgres? ( =dev-haskell/hdbc-postgresql-${PV}* )
-		 sqlite? ( =dev-haskell/hdbc-sqlite-${PV}* )"
-
-S="${WORKDIR}/${PN}"
diff --git a/dev-haskell/hdbc/hdbc-1.0.1.ebuild b/dev-haskell/hdbc/hdbc-1.0.1.ebuild
deleted file mode 100644
index 9f7873fda1d1..000000000000
--- a/dev-haskell/hdbc/hdbc-1.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/hdbc-1.0.1.ebuild,v 1.2 2007/10/31 13:00:06 dcoutts Exp $
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell Database Connectivity"
-HOMEPAGE="http://quux.org/devel/hdbc/"
-SRC_URI="http://quux.org/devel/hdbc/${PN}_${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="odbc postgres sqlite"
-
-DEPEND=">=dev-lang/ghc-6.4.1
-	>=dev-haskell/mtl-1.0"
-
-PDEPEND="odbc? ( =dev-haskell/hdbc-odbc-${PV}* )
-		 postgres? ( =dev-haskell/hdbc-postgresql-${PV}* )
-		 sqlite? ( =dev-haskell/hdbc-sqlite-${PV}* )"
-
-S="${WORKDIR}/${PN}"
diff --git a/dev-haskell/hdbc/hdbc-1.1.3.ebuild b/dev-haskell/hdbc/hdbc-1.1.3.ebuild
deleted file mode 100644
index 3b08ca97ec8b..000000000000
--- a/dev-haskell/hdbc/hdbc-1.1.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/hdbc-1.1.3.ebuild,v 1.4 2010/07/24 18:16:34 slyfox Exp $
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal versionator
-
-MY_PN=HDBC
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Haskell Database Connectivity"
-HOMEPAGE="http://software.complete.org/hdbc"
-SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="odbc postgres sqlite"
-
-DEPEND=">=dev-lang/ghc-6.4.1
-		>=dev-haskell/mtl-1.0"
-
-PDEPEND="odbc? ( =dev-haskell/hdbc-odbc-${PV}* )
-		postgres? ( =dev-haskell/hdbc-postgresql-${PV}* )
-		sqlite? ( =dev-haskell/hdbc-sqlite-${PV}* )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-
-	sed -i -e '/GHC-Options:/d' "${S}/HDBC.cabal"
-
-	if version_is_at_least "6.8" "$(ghc-version)"; then
-		sed -i -e '/Build-Depends:/a \
-			, old-time, containers, bytestring' \
-		"${S}/HDBC.cabal"
-		echo "GHC-Options: -fglasgow-exts" >> "${S}/HDBC.cabal"
-	fi
-}
-
-CABAL_CONFIGURE_FLAGS="--constraint=base<4"
diff --git a/dev-haskell/hdbc/hdbc-2.2.7.0.ebuild b/dev-haskell/hdbc/hdbc-2.2.7.0.ebuild
new file mode 100644
index 000000000000..d73c7ab7eb68
--- /dev/null
+++ b/dev-haskell/hdbc/hdbc-2.2.7.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/hdbc-2.2.7.0.ebuild,v 1.1 2011/06/12 19:50:10 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="bin lib profile haddock hscolour"
+inherit base haskell-cabal versionator
+
+MY_PN="HDBC"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Haskell Database Connectivity"
+HOMEPAGE="http://software.complete.org/hdbc"
+SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="odbc postgres sqlite3 test"
+
+RDEPEND=">=dev-haskell/convertible-1.0.10.0
+		dev-haskell/mtl
+		dev-haskell/text
+		>=dev-haskell/time-1.1.3
+		dev-haskell/utf8-string
+		>=dev-lang/ghc-6.8.2
+	"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.8
+		test? ( dev-haskell/hunit
+			dev-haskell/quickcheck
+			dev-haskell/testpack
+		)
+	"
+
+DEPENDV="$(get_version_component_range 1-2)"
+PDEPEND="odbc? ( =dev-haskell/hdbc-odbc-${DEPENDV}* )
+		postgres? ( =dev-haskell/hdbc-postgresql-${DEPENDV}* )
+		sqlite3? ( >=dev-haskell/hdbc-sqlite-${DEPENDV} )"
+
+PATCHES=("${FILESDIR}/${PN}-2.2.7.0-fix-fbuildtests.patch")
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	cabal_src_configure $(cabal_flag test buildtests)
+}
+
+src_test() {
+	# default tests
+	haskell-cabal_src_test || die "cabal test failed"
+
+	# built custom tests
+	"${S}/dist/build/runtests/runtests" || die "unit tests failed"
+}
+
+src_install() {
+	cabal_src_install
+
+	# if tests were enabled, make sure the unit test driver is deleted
+	rm -f "${ED}/usr/bin/runtests"
+}
diff --git a/dev-haskell/hdbc/metadata.xml b/dev-haskell/hdbc/metadata.xml
index 8c66906af531..264dad1d2a84 100644
--- a/dev-haskell/hdbc/metadata.xml
+++ b/dev-haskell/hdbc/metadata.xml
@@ -1,8 +1,14 @@
 <?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>
+		HDBC provides an abstraction layer between Haskell programs and SQL
+		relational databases. This lets you write database code once, in
+		Haskell, and have it work with any number of backend SQL databases
+		(MySQL, Oracle, PostgreSQL, ODBC-compliant databases, etc.)
+	</longdescription>
 </pkgmetadata>