Version bump. Requested by Christopher Howard (bug #367211). Removed old versions.

Package-Manager: portage-2.1.10.1/cvs/Linux x86_64

27 files changed, 341 insertions, 545 deletions

diff --git a/dev-haskell/hdbc-odbc/ChangeLog b/dev-haskell/hdbc-odbc/ChangeLog
index 69bf33279221..e491753bcf11 100644
--- a/dev-haskell/hdbc-odbc/ChangeLog
+++ b/dev-haskell/hdbc-odbc/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-haskell/hdbc-odbc
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-odbc/ChangeLog,v 1.13 2010/07/12 13:16:28 slyfox Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-odbc/ChangeLog,v 1.14 2011/06/12 19:51:22 slyfox Exp $
+
+*hdbc-odbc-2.2.3.2 (12 Jun 2011)
+
+  12 Jun 2011; Sergei Trofimovich <slyfox@gentoo.org>
+  -hdbc-odbc-1.0.0.0.ebuild, -hdbc-odbc-1.0.1.1.ebuild,
+  -hdbc-odbc-1.1.3.0.ebuild, +hdbc-odbc-2.2.3.2.ebuild,
+  -files/hdbc-odbc-helper.h, metadata.xml:
+  Version bump. Requested by Christopher Howard (bug #367211). Removed old
+  versions.
 
   12 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org>
   hdbc-odbc-1.1.3.0.ebuild:
diff --git a/dev-haskell/hdbc-odbc/files/hdbc-odbc-helper.h b/dev-haskell/hdbc-odbc/files/hdbc-odbc-helper.h
deleted file mode 100644
index a9e7fac9331f..000000000000
--- a/dev-haskell/hdbc-odbc/files/hdbc-odbc-helper.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifdef mingw32_HOST_OS
-#include <windows.h>
-#endif
-#include <sql.h>
-
-extern int sqlSucceeded(SQLRETURN ret);
-extern SQLRETURN sqlFreeHandleEnv(SQLHANDLE hdl);
-
-typedef struct TAG_finalizeonce {
-  void *encapobj;
-  int refcount;
-  int isfinalized;
-  void *extrainfo;
-  struct TAG_finalizeonce *parent;
-} finalizeonce;
-
-extern finalizeonce *wrapobjodbc(void *obj, finalizeonce *parentobj);
-extern finalizeonce *wrapobjodbc_extra(void *obj, void *extra,
-                                       finalizeonce *parentobj);
-
-extern SQLRETURN sqlFreeHandleDbc_app(finalizeonce *res);
-extern void sqlFreeHandleDbc_finalizer(finalizeonce *res);
-
-extern void sqlFreeHandleSth_app(finalizeonce *res);
-extern void sqlFreeHandleSth_finalizer(finalizeonce *res);
-
-extern SQLINTEGER nullData;
-extern void *getSqlOvOdbc3(void);
-
-extern SQLRETURN disableAutoCommit(SQLHDBC conn);
-extern SQLRETURN simpleSqlTables(SQLHSTMT stmt);
-extern SQLRETURN simpleSqlColumns(SQLHSTMT stmt, SQLCHAR *tablename, 
-                                  SQLSMALLINT tnlen);
-
diff --git a/dev-haskell/hdbc-odbc/hdbc-odbc-1.0.0.0.ebuild b/dev-haskell/hdbc-odbc/hdbc-odbc-1.0.0.0.ebuild
deleted file mode 100644
index e31542c40a41..000000000000
--- a/dev-haskell/hdbc-odbc/hdbc-odbc-1.0.0.0.ebuild
+++ /dev/null
@@ -1,32 +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-odbc/hdbc-odbc-1.0.0.0.ebuild,v 1.2 2007/10/31 13:00:38 dcoutts Exp $
-
-CABAL_FEATURES="lib profile haddock"
-inherit base haskell-cabal versionator
-
-DESCRIPTION="ODBC database driver for HDBC"
-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=""
-
-hdbc_PV=$(get_version_component_range 1-3)
-
-DEPEND=">=dev-lang/ghc-6.4.1
-	~dev-haskell/hdbc-${hdbc_PV}
-	>=dev-db/unixODBC-2.2"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	base_src_unpack
-
-	# temp patch for missing #include. It seems different versions of
-	# dev-db/unixODBC #include their headers in each other differently.
-	sed -i 's/#include <sqlext.h>/#include <sqlext.h>\n#include <sqlucode.h>/' \
-		"${S}/Database/HDBC/ODBC/TypeConv.hsc"
-}
diff --git a/dev-haskell/hdbc-odbc/hdbc-odbc-1.0.1.1.ebuild b/dev-haskell/hdbc-odbc/hdbc-odbc-1.0.1.1.ebuild
deleted file mode 100644
index 50eb12d1799a..000000000000
--- a/dev-haskell/hdbc-odbc/hdbc-odbc-1.0.1.1.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-odbc/hdbc-odbc-1.0.1.1.ebuild,v 1.2 2007/10/31 13:00:38 dcoutts Exp $
-
-CABAL_FEATURES="lib profile haddock"
-inherit base haskell-cabal versionator
-
-DESCRIPTION="ODBC database driver for HDBC"
-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=""
-
-hdbc_PV=$(get_version_component_range 1-3)
-
-DEPEND=">=dev-lang/ghc-6.4.1
-	~dev-haskell/hdbc-${hdbc_PV}
-	>=dev-db/unixODBC-2.2"
-
-S="${WORKDIR}/${PN}"
diff --git a/dev-haskell/hdbc-odbc/hdbc-odbc-1.1.3.0.ebuild b/dev-haskell/hdbc-odbc/hdbc-odbc-1.1.3.0.ebuild
deleted file mode 100644
index c87e83547aa8..000000000000
--- a/dev-haskell/hdbc-odbc/hdbc-odbc-1.1.3.0.ebuild
+++ /dev/null
@@ -1,46 +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-odbc/hdbc-odbc-1.1.3.0.ebuild,v 1.3 2010/07/12 13:18:10 slyfox Exp $
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal versionator
-
-MY_PN=HDBC-odbc
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="ODBC database driver for HDBC"
-HOMEPAGE="http://software.complete.org/hdbc-odbc"
-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=""
-
-hdbc_PV=$(get_version_component_range 1-3)
-
-DEPEND=">=dev-lang/ghc-6.4.1
-		dev-haskell/mtl
-		=dev-haskell/hdbc-${hdbc_PV}*
-		>=dev-db/unixODBC-2.2"
-
-S="${WORKDIR}/${MY_P}"
-
-CABAL_CONFIGURE_FLAGS="--constraint=base<4"
-
-src_unpack() {
-	unpack ${A}
-
-	cp "${FILESDIR}/hdbc-odbc-helper.h" "${S}/"
-
-	cabal-mksetup
-	echo "Extra-Libraries: odbc" >> "${S}/${MY_PN}.cabal"
-	sed -i -e 's/GHC-Options: -O2 -Wall/GHC-Options: -fvia-C/' \
-		 -e '/^Extensions:/a \
-			, ForeignFunctionInterface' \
-	 "${S}/${MY_PN}.cabal"
-
-	if version_is_at_least "6.8" "$(ghc-version)"; then
-		echo "GHC-Options: -XPatternSignatures" >> "${S}/${MY_PN}.cabal"
-	fi
-}
diff --git a/dev-haskell/hdbc-odbc/hdbc-odbc-2.2.3.2.ebuild b/dev-haskell/hdbc-odbc/hdbc-odbc-2.2.3.2.ebuild
new file mode 100644
index 000000000000..168e90d593d5
--- /dev/null
+++ b/dev-haskell/hdbc-odbc/hdbc-odbc-2.2.3.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-odbc/hdbc-odbc-2.2.3.2.ebuild,v 1.1 2011/06/12 19:51:22 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="bin lib profile haddock hscolour"
+inherit haskell-cabal
+
+MY_PN="HDBC-odbc"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="ODBC driver for HDBC"
+HOMEPAGE="http://software.complete.org/hdbc-odbc"
+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="test"
+RESTRICT="test" # requires configured ODBC
+
+hdbc_PV=$(get_version_component_range 1-2)
+
+RDEPEND=">=dev-lang/ghc-6.10
+		=dev-haskell/hdbc-${hdbc_PV}*
+		dev-haskell/mtl
+		dev-haskell/utf8-string
+		>=dev-db/unixODBC-2.2
+	"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2.3
+		test? ( dev-haskell/convertible
+			dev-haskell/hunit
+			dev-haskell/quickcheck
+			dev-haskell/testpack
+			dev-haskell/time
+		)
+	"
+
+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-odbc/metadata.xml b/dev-haskell/hdbc-odbc/metadata.xml
index 8c66906af531..398cee0b8192 100644
--- a/dev-haskell/hdbc-odbc/metadata.xml
+++ b/dev-haskell/hdbc-odbc/metadata.xml
@@ -1,8 +1,13 @@
 <?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>
+		It is cross-platform and supports unixODBC on Unix/Linux/POSIX platforms
+		and Microsoft ODBC on Windows.  It is also the preferred way to access
+		MySQL databases from Haskell.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/hdbc-postgresql/ChangeLog b/dev-haskell/hdbc-postgresql/ChangeLog
index fc934be69392..e0380544ae0f 100644
--- a/dev-haskell/hdbc-postgresql/ChangeLog
+++ b/dev-haskell/hdbc-postgresql/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-haskell/hdbc-postgresql
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-postgresql/ChangeLog,v 1.14 2010/07/12 13:11:43 slyfox Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-postgresql/ChangeLog,v 1.15 2011/06/12 19:53:43 slyfox Exp $
+
+*hdbc-postgresql-2.2.3.3 (12 Jun 2011)
+
+  12 Jun 2011; Sergei Trofimovich <slyfox@gentoo.org>
+  -hdbc-postgresql-1.0.0.0.ebuild, -hdbc-postgresql-1.0.1.0.ebuild,
+  -hdbc-postgresql-1.1.3.0.ebuild, +hdbc-postgresql-2.2.3.3.ebuild,
+  -files/hdbc-postgresql-helper.h, -files/pgtypes.h:
+  Version bump. Requested by Christopher Howard (bug #367211). Removed old
+  versions.
 
   12 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org>
   hdbc-postgresql-1.1.3.0.ebuild:
diff --git a/dev-haskell/hdbc-postgresql/files/hdbc-postgresql-helper.h b/dev-haskell/hdbc-postgresql/files/hdbc-postgresql-helper.h
deleted file mode 100644
index 188e73ba3657..000000000000
--- a/dev-haskell/hdbc-postgresql/files/hdbc-postgresql-helper.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <libpq-fe.h>
-
-typedef struct TAG_finalizeonce {
-  void *encapobj;
-  int refcount;
-  int isfinalized;
-  struct TAG_finalizeonce *parent;
-} finalizeonce;
-
-extern finalizeonce *wrapobjpg(void *obj, finalizeonce *parentobj);
-
-extern void PQfinish_app(finalizeonce *conn);
-extern void PQfinish_finalizer(finalizeonce *conn);
-
-extern void PQclear_app(finalizeonce *res);
-extern void PQclear_finalizer(finalizeonce *res);
diff --git a/dev-haskell/hdbc-postgresql/files/pgtypes.h b/dev-haskell/hdbc-postgresql/files/pgtypes.h
deleted file mode 100644
index abf1dcdbbc99..000000000000
--- a/dev-haskell/hdbc-postgresql/files/pgtypes.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* File:			pgtypes.h
- *
- * Description:		See "pgtypes.c"
- *
- * Comments:		See "notice.txt" for copyright and license information.
- *
- */
-
-#ifndef __PGTYPES_H__
-#define __PGTYPES_H__
-
-/* the type numbers are defined by the OID's of the types' rows */
-/* in table pg_type */
-
-
-#if 0
-#define PG_TYPE_LO				????	/* waiting for permanent type */
-#endif
-
-#define PG_TYPE_BOOL			16
-#define PG_TYPE_BYTEA			17
-#define PG_TYPE_CHAR			18
-#define PG_TYPE_NAME			19
-#define PG_TYPE_INT8			20
-#define PG_TYPE_INT2			21
-#define PG_TYPE_INT2VECTOR		22
-#define PG_TYPE_INT4			23
-#define PG_TYPE_REGPROC			24
-#define PG_TYPE_TEXT			25
-#define PG_TYPE_OID				26
-#define PG_TYPE_TID				27
-#define PG_TYPE_XID				28
-#define PG_TYPE_CID				29
-#define PG_TYPE_OIDVECTOR		30
-#define PG_TYPE_SET				32
-#define PG_TYPE_CHAR2			409
-#define PG_TYPE_CHAR4			410
-#define PG_TYPE_CHAR8			411
-#define PG_TYPE_POINT			600
-#define PG_TYPE_LSEG			601
-#define PG_TYPE_PATH			602
-#define PG_TYPE_BOX				603
-#define PG_TYPE_POLYGON			604
-#define PG_TYPE_FILENAME		605
-#define PG_TYPE_FLOAT4			700
-#define PG_TYPE_FLOAT8			701
-#define PG_TYPE_ABSTIME			702
-#define PG_TYPE_RELTIME			703
-#define PG_TYPE_TINTERVAL		704
-#define PG_TYPE_UNKNOWN			705
-#define PG_TYPE_MONEY			790
-#define PG_TYPE_OIDINT2			810
-#define PG_TYPE_OIDINT4			910
-#define PG_TYPE_OIDNAME			911
-#define PG_TYPE_BPCHAR			1042
-#define PG_TYPE_VARCHAR			1043
-#define PG_TYPE_DATE			1082
-#define PG_TYPE_TIME			1083
-#define PG_TYPE_TIMESTAMP_NO_TMZONE	1114		/* since 7.2 */
-#define PG_TYPE_DATETIME		1184
-#define PG_TYPE_TIME_WITH_TMZONE	1266		/* since 7.1 */
-#define PG_TYPE_TIMESTAMP		1296	/* deprecated since 7.0 */
-#define PG_TYPE_NUMERIC			1700
-#define INTERNAL_ASIS_TYPE		(-9999)
-
-#endif
diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-1.0.0.0.ebuild b/dev-haskell/hdbc-postgresql/hdbc-postgresql-1.0.0.0.ebuild
deleted file mode 100644
index 6661d0a5220f..000000000000
--- a/dev-haskell/hdbc-postgresql/hdbc-postgresql-1.0.0.0.ebuild
+++ /dev/null
@@ -1,23 +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-postgresql/hdbc-postgresql-1.0.0.0.ebuild,v 1.4 2010/06/17 18:19:51 patrick Exp $
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal versionator
-
-DESCRIPTION="PostgreSQL database driver for HDBC"
-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 ~x86 ~sparc"
-IUSE=""
-
-hdbc_PV=$(get_version_component_range 1-3)
-
-DEPEND=">=dev-lang/ghc-6.4.1
-	~dev-haskell/hdbc-${hdbc_PV}
-	>=dev-db/postgresql-base-8"
-
-S="${WORKDIR}/${PN}"
diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-1.0.1.0.ebuild b/dev-haskell/hdbc-postgresql/hdbc-postgresql-1.0.1.0.ebuild
deleted file mode 100644
index 0ffe7aad2c80..000000000000
--- a/dev-haskell/hdbc-postgresql/hdbc-postgresql-1.0.1.0.ebuild
+++ /dev/null
@@ -1,23 +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-postgresql/hdbc-postgresql-1.0.1.0.ebuild,v 1.4 2010/06/17 18:19:51 patrick Exp $
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal versionator
-
-DESCRIPTION="PostgreSQL database driver for HDBC"
-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 ~x86 ~sparc"
-IUSE=""
-
-hdbc_PV=$(get_version_component_range 1-3)
-
-DEPEND=">=dev-lang/ghc-6.4.1
-	~dev-haskell/hdbc-${hdbc_PV}
-	>=dev-db/postgresql-base-8"
-
-S="${WORKDIR}/${PN}"
diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-1.1.3.0.ebuild b/dev-haskell/hdbc-postgresql/hdbc-postgresql-1.1.3.0.ebuild
deleted file mode 100644
index ecd3129fe3be..000000000000
--- a/dev-haskell/hdbc-postgresql/hdbc-postgresql-1.1.3.0.ebuild
+++ /dev/null
@@ -1,49 +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-postgresql/hdbc-postgresql-1.1.3.0.ebuild,v 1.4 2010/07/12 13:11:43 slyfox Exp $
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal versionator
-
-MY_PN=HDBC-postgresql
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="PostgreSQL database driver for HDBC"
-HOMEPAGE="http://software.complete.org/hdbc-postgresql"
-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=""
-
-hdbc_PV=$(get_version_component_range 1-3)
-
-DEPEND=">=dev-lang/ghc-6.4.1
-		dev-haskell/mtl
-		=dev-haskell/hdbc-${hdbc_PV}*
-		dev-haskell/parsec
-		>=dev-db/postgresql-base-8"
-
-S="${WORKDIR}/${MY_P}"
-
-CABAL_CONFIGURE_FLAGS="--constraint=base<4"
-
-src_unpack() {
-	unpack ${A}
-
-	cp "${FILESDIR}/hdbc-postgresql-helper.h" "${FILESDIR}/pgtypes.h" "${S}/"
-	sed -i -e 's/GHC-Options: -O2 -Wall/GHC-Options: -fvia-C/' \
-		-e '/include-dirs:/d' \
-		-e '/^Extensions:/a \
-			, ForeignFunctionInterface' \
-		"${S}/${MY_PN}.cabal"
-	echo "include-dirs: $(pg_config --includedir)," >> "${S}/${MY_PN}.cabal"
-	echo "     $(pg_config --includedir-server), ." >> "${S}/${MY_PN}.cabal"
-
-	if version_is_at_least "6.8" "$(ghc-version)"; then
-		sed -i -e '/Build-Depends:/a \
-			, old-time' \
-			"${S}/${MY_PN}.cabal"
-	fi
-}
diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.2.3.3.ebuild b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.2.3.3.ebuild
new file mode 100644
index 000000000000..7ce73f37ee8e
--- /dev/null
+++ b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.2.3.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.2.3.3.ebuild,v 1.1 2011/06/12 19:53:43 slyfox Exp $
+
+# ebuild generated by hackport 0.2.12
+
+EAPI="2"
+
+CABAL_FEATURES="bin lib profile haddock hscolour"
+inherit haskell-cabal
+
+MY_PN="HDBC-postgresql"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PostgreSQL driver for HDBC"
+HOMEPAGE="http://software.complete.org/hdbc-postgresql"
+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="test"
+RESTRICT="test" # requires configured postgresql
+
+hdbc_PV=$(get_version_component_range 1-2)
+
+RDEPEND=">=dev-lang/ghc-6.8.2
+		=dev-haskell/hdbc-${hdbc_PV}*
+		dev-haskell/mtl
+		dev-haskell/parsec
+		dev-haskell/time
+		dev-haskell/utf8-string
+		>=dev-db/postgresql-base-8"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.8
+		test? ( dev-haskell/convertible
+			dev-haskell/hunit
+			dev-haskell/quickcheck
+			dev-haskell/testpack
+		)
+		"
+
+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-sqlite/ChangeLog b/dev-haskell/hdbc-sqlite/ChangeLog
index 9ed1e219eaa8..282894b1fc25 100644
--- a/dev-haskell/hdbc-sqlite/ChangeLog
+++ b/dev-haskell/hdbc-sqlite/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-haskell/hdbc-sqlite
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-sqlite/ChangeLog,v 1.12 2010/07/11 21:36:50 slyfox Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-sqlite/ChangeLog,v 1.13 2011/06/12 19:52:57 slyfox Exp $
+
+*hdbc-sqlite-2.3.0.0 (12 Jun 2011)
+
+  12 Jun 2011; Sergei Trofimovich <slyfox@gentoo.org>
+  -files/hdbc-sqlite3-helper.h, -hdbc-sqlite-1.0.0.0.ebuild,
+  -hdbc-sqlite-1.0.1.0.ebuild, -hdbc-sqlite-1.1.3.0.ebuild,
+  +hdbc-sqlite-2.3.0.0.ebuild:
+  Version bump. Requested by Christopher Howard (bug #367211). Removed old
+  versions.
 
   11 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org>
   hdbc-sqlite-1.1.3.0.ebuild:
diff --git a/dev-haskell/hdbc-sqlite/files/hdbc-sqlite3-helper.h b/dev-haskell/hdbc-sqlite/files/hdbc-sqlite3-helper.h
deleted file mode 100644
index 4bd230b85b4a..000000000000
--- a/dev-haskell/hdbc-sqlite/files/hdbc-sqlite3-helper.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <sqlite3.h>
-
-extern int sqlite3_bind_text2(sqlite3_stmt* a, int b, const char *c, int d);
-
-/* Clever trick: the obj is the first element in the struct, so the pointer
-   to the struct is the same as the pointer to the obj. */
-
-typedef struct TAG_finalizeonce {
-  void *encapobj;
-  int refcount;
-  int isfinalized;
-  struct TAG_finalizeonce *parent;
-} finalizeonce;
-
-
-extern int sqlite3_open2(const char *filename, finalizeonce **ppo);
-extern int sqlite3_close_app(finalizeonce *ppdb);
-extern void sqlite3_close_finalizer(finalizeonce *ppdb);
-extern void sqlite3_conditional_finalizer(finalizeonce *ppdb);
-
-extern void sqlite3_busy_timeout2(finalizeonce *ppdb, int ms);
-extern int sqlite3_prepare2(finalizeonce *fdb, const char *zSql,
-                            int nBytes, finalizeonce **ppo,
-                            const char **pzTail);
-extern int sqlite3_finalize_app(finalizeonce *ppst);
-extern void sqlite3_finalize_finalizer(finalizeonce *ppst);
-
-
diff --git a/dev-haskell/hdbc-sqlite/hdbc-sqlite-1.0.0.0.ebuild b/dev-haskell/hdbc-sqlite/hdbc-sqlite-1.0.0.0.ebuild
deleted file mode 100644
index 402bbc8bef79..000000000000
--- a/dev-haskell/hdbc-sqlite/hdbc-sqlite-1.0.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-sqlite/hdbc-sqlite-1.0.0.0.ebuild,v 1.2 2007/10/31 13:01:36 dcoutts Exp $
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal versionator
-
-DESCRIPTION="Sqlite v3 database driver for HDBC"
-HOMEPAGE="http://quux.org/devel/hdbc/"
-SRC_URI="http://quux.org/devel/hdbc/${PN}3_${PV}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~sparc"
-IUSE=""
-
-hdbc_PV=$(get_version_component_range 1-3)
-
-DEPEND=">=dev-lang/ghc-6.4.1
-	~dev-haskell/hdbc-${hdbc_PV}
-	>=dev-db/sqlite-3.2"
-
-S="${WORKDIR}/${PN}3"
diff --git a/dev-haskell/hdbc-sqlite/hdbc-sqlite-1.0.1.0.ebuild b/dev-haskell/hdbc-sqlite/hdbc-sqlite-1.0.1.0.ebuild
deleted file mode 100644
index b6e4ccdd500f..000000000000
--- a/dev-haskell/hdbc-sqlite/hdbc-sqlite-1.0.1.0.ebuild
+++ /dev/null
@@ -1,31 +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-sqlite/hdbc-sqlite-1.0.1.0.ebuild,v 1.2 2007/10/31 13:01:36 dcoutts Exp $
-
-CABAL_FEATURES="lib profile haddock"
-inherit base haskell-cabal versionator
-
-DESCRIPTION="Sqlite v3 database driver for HDBC"
-HOMEPAGE="http://quux.org/devel/hdbc/"
-SRC_URI="http://quux.org/devel/hdbc/${PN}3_${PV}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~sparc"
-IUSE=""
-
-hdbc_PV=$(get_version_component_range 1-3)
-
-DEPEND=">=dev-lang/ghc-6.4.1
-	~dev-haskell/hdbc-${hdbc_PV}
-	>=dev-db/sqlite-3.2"
-
-S="${WORKDIR}/${PN}3"
-
-src_unpack() {
-	base_src_unpack
-
-	# Fix haddock markup
-	sed -i -e 's|execute/fetchrow|execute\\/fetchrow|' \
-		"${S}/Database/HDBC/Sqlite3/Statement.hsc"
-}
diff --git a/dev-haskell/hdbc-sqlite/hdbc-sqlite-1.1.3.0.ebuild b/dev-haskell/hdbc-sqlite/hdbc-sqlite-1.1.3.0.ebuild
deleted file mode 100644
index 3b9d8ea1b315..000000000000
--- a/dev-haskell/hdbc-sqlite/hdbc-sqlite-1.1.3.0.ebuild
+++ /dev/null
@@ -1,46 +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-sqlite/hdbc-sqlite-1.1.3.0.ebuild,v 1.3 2010/07/24 18:18:43 slyfox Exp $
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal versionator
-
-MY_PN=HDBC-sqlite3
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Sqlite v3 database driver for HDBC"
-HOMEPAGE="http://software.complete.org/hdbc-sqlite3"
-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=""
-
-hdbc_PV=$(get_version_component_range 1-3)
-
-DEPEND=">=dev-lang/ghc-6.4.1
-		dev-haskell/mtl
-		=dev-haskell/hdbc-${hdbc_PV}*
-		>=dev-db/sqlite-3.2"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-
-	cp "${FILESDIR}/hdbc-sqlite3-helper.h" "${S}/"
-	sed -i -e 's/GHC-Options: -O2 -Wall/GHC-Options: -fvia-C/' \
-		-e '/^Extensions:/a \
-		, ForeignFunctionInterface, EmptyDataDecls' \
-		"${S}/${MY_PN}.cabal"
-
-	if version_is_at_least "6.8" "$(ghc-version)"; then
-		sed -i -e '/Build-Depends:/a \
-			, bytestring' \
-		"${S}/${MY_PN}.cabal"
-		echo "GHC-Options: -XPatternSignatures" >> "${S}/${MY_PN}.cabal"
-	fi
-}
-
-CABAL_CONFIGURE_FLAGS="--constraint=base<4"
diff --git a/dev-haskell/hdbc-sqlite/hdbc-sqlite-2.3.0.0.ebuild b/dev-haskell/hdbc-sqlite/hdbc-sqlite-2.3.0.0.ebuild
new file mode 100644
index 000000000000..823a936fba47
--- /dev/null
+++ b/dev-haskell/hdbc-sqlite/hdbc-sqlite-2.3.0.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-sqlite/hdbc-sqlite-2.3.0.0.ebuild,v 1.1 2011/06/12 19:52:57 slyfox Exp $
+
+CABAL_FEATURES="bin lib profile haddock hscolour"
+inherit haskell-cabal
+
+MY_PN="HDBC-sqlite3"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Sqlite v3 driver for HDBC"
+HOMEPAGE="http://software.complete.org/hdbc-sqlite3"
+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="test"
+RESTRICT="test" # not all files are bundled
+
+RDEPEND=">=dev-lang/ghc-6.10
+		>=dev-haskell/hdbc-2.2
+		dev-haskell/mtl
+		dev-haskell/utf8-string
+		>=dev-db/sqlite-3.2"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2.3
+		test? ( dev-haskell/convertible
+			dev-haskell/hunit
+			dev-haskell/testpack
+			dev-haskell/time
+		)
+	"
+
+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/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>