New version.

Package-Manager: portage-2.1.3.19

44 files changed, 675 insertions, 24 deletions

diff --git a/dev-haskell/filepath/ChangeLog b/dev-haskell/filepath/ChangeLog
index 6806212f728c..9eb7c2a161e6 100644
--- a/dev-haskell/filepath/ChangeLog
+++ b/dev-haskell/filepath/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/filepath
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/filepath/ChangeLog,v 1.12 2007/12/13 00:43:49 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/filepath/ChangeLog,v 1.13 2007/12/13 17:16:01 dcoutts Exp $
+
+*filepath-1.1.0.0 (13 Dec 2007)
+
+  13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> +filepath-1.1.0.0.ebuild:
+  New version.
 
   12 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> filepath-1.0.ebuild:
   Remove old comment.
diff --git a/dev-haskell/filepath/filepath-1.1.0.0.ebuild b/dev-haskell/filepath/filepath-1.1.0.0.ebuild
new file mode 100644
index 000000000000..214d586a7ae0
--- /dev/null
+++ b/dev-haskell/filepath/filepath-1.1.0.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/filepath/filepath-1.1.0.0.ebuild,v 1.1 2007/12/13 17:16:01 dcoutts Exp $
+
+CABAL_FEATURES="haddock lib profile"
+inherit haskell-cabal
+
+DESCRIPTION="Library for manipulating FilePath's in a cross platform way."
+HOMEPAGE="http://www-users.cs.york.ac.uk/~ndm/projects/libraries.php"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ia64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/ghc-6.4"
+
+CABAL_CORE_LIB_GHC_PV="6.8.1 6.8.2"
diff --git a/dev-haskell/filepath/files/digest-filepath-1.1.0.0 b/dev-haskell/filepath/files/digest-filepath-1.1.0.0
new file mode 100644
index 000000000000..156e7c127270
--- /dev/null
+++ b/dev-haskell/filepath/files/digest-filepath-1.1.0.0
@@ -0,0 +1,3 @@
+MD5 0cc3f09ebafa7bde0a3c9e01d5e7c09f filepath-1.1.0.0.tar.gz 7548
+RMD160 deecc7cedc1ef803d6bb289b52de8139aa475ff3 filepath-1.1.0.0.tar.gz 7548
+SHA256 3732be8c2f3d0ba63347b772a605614967c573416340ca6382cce0c7dccf92ee filepath-1.1.0.0.tar.gz 7548
diff --git a/dev-haskell/hdbc-odbc/ChangeLog b/dev-haskell/hdbc-odbc/ChangeLog
index 018136b41d0e..7a3aaf48cefb 100644
--- a/dev-haskell/hdbc-odbc/ChangeLog
+++ b/dev-haskell/hdbc-odbc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/hdbc-odbc
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-odbc/ChangeLog,v 1.11 2007/10/31 13:00:38 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-odbc/ChangeLog,v 1.12 2007/12/13 17:19:01 dcoutts Exp $
+
+*hdbc-odbc-1.1.3.0 (13 Dec 2007)
+
+  13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> +files/hdbc-odbc-helper.h,
+  +hdbc-odbc-1.1.3.0.ebuild:
+  New version.
 
   31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> hdbc-odbc-1.0.0.0.ebuild,
   hdbc-odbc-1.0.1.1.ebuild:
diff --git a/dev-haskell/hdbc-odbc/files/digest-hdbc-odbc-1.1.3.0 b/dev-haskell/hdbc-odbc/files/digest-hdbc-odbc-1.1.3.0
new file mode 100644
index 000000000000..1f87a53ad184
--- /dev/null
+++ b/dev-haskell/hdbc-odbc/files/digest-hdbc-odbc-1.1.3.0
@@ -0,0 +1,3 @@
+MD5 ad4d3dc37f0f94da122516628355533e HDBC-odbc-1.1.3.0.tar.gz 20250
+RMD160 399fe279bc705a28b1765adcfd41c774b4074e75 HDBC-odbc-1.1.3.0.tar.gz 20250
+SHA256 890911b1f94585b2ed80a0ee51959047b957fde410331a4212d25bf7c53bae6d HDBC-odbc-1.1.3.0.tar.gz 20250
diff --git a/dev-haskell/hdbc-odbc/files/hdbc-odbc-helper.h b/dev-haskell/hdbc-odbc/files/hdbc-odbc-helper.h
new file mode 100644
index 000000000000..a9e7fac9331f
--- /dev/null
+++ b/dev-haskell/hdbc-odbc/files/hdbc-odbc-helper.h
@@ -0,0 +1,34 @@
+#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.1.3.0.ebuild b/dev-haskell/hdbc-odbc/hdbc-odbc-1.1.3.0.ebuild
new file mode 100644
index 000000000000..20b500ec0ac0
--- /dev/null
+++ b/dev-haskell/hdbc-odbc/hdbc-odbc-1.1.3.0.ebuild
@@ -0,0 +1,44 @@
+# 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.1.3.0.ebuild,v 1.1 2007/12/13 17:19:01 dcoutts 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}"
+
+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-postgresql/ChangeLog b/dev-haskell/hdbc-postgresql/ChangeLog
index c32f40ef7428..08d729e90a08 100644
--- a/dev-haskell/hdbc-postgresql/ChangeLog
+++ b/dev-haskell/hdbc-postgresql/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-haskell/hdbc-postgresql
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-postgresql/ChangeLog,v 1.10 2007/10/31 13:01:03 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-postgresql/ChangeLog,v 1.11 2007/12/13 17:21:21 dcoutts Exp $
+
+*hdbc-postgresql-1.1.3.0 (13 Dec 2007)
+
+  13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org>
+  +files/hdbc-postgresql-helper.h, +files/pgtypes.h,
+  +hdbc-postgresql-1.1.3.0.ebuild:
+  New version.
 
   31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org>
   hdbc-postgresql-1.0.0.0.ebuild, hdbc-postgresql-1.0.1.0.ebuild:
diff --git a/dev-haskell/hdbc-postgresql/files/digest-hdbc-postgresql-1.1.3.0 b/dev-haskell/hdbc-postgresql/files/digest-hdbc-postgresql-1.1.3.0
new file mode 100644
index 000000000000..8c00bfee7d5b
--- /dev/null
+++ b/dev-haskell/hdbc-postgresql/files/digest-hdbc-postgresql-1.1.3.0
@@ -0,0 +1,3 @@
+MD5 4ebeb46b12948a7ec4d9e380500c8380 HDBC-postgresql-1.1.3.0.tar.gz 20025
+RMD160 cfe56e6934bda74cb57ea50e5b6803c4e7b2ac4a HDBC-postgresql-1.1.3.0.tar.gz 20025
+SHA256 cb53d29cb88a99197b455942d3ca2f98bcb957978c1a9d8c24fe98b8e5f21bf4 HDBC-postgresql-1.1.3.0.tar.gz 20025
diff --git a/dev-haskell/hdbc-postgresql/files/hdbc-postgresql-helper.h b/dev-haskell/hdbc-postgresql/files/hdbc-postgresql-helper.h
new file mode 100644
index 000000000000..188e73ba3657
--- /dev/null
+++ b/dev-haskell/hdbc-postgresql/files/hdbc-postgresql-helper.h
@@ -0,0 +1,16 @@
+#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
new file mode 100644
index 000000000000..abf1dcdbbc99
--- /dev/null
+++ b/dev-haskell/hdbc-postgresql/files/pgtypes.h
@@ -0,0 +1,66 @@
+/* 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.1.3.0.ebuild b/dev-haskell/hdbc-postgresql/hdbc-postgresql-1.1.3.0.ebuild
new file mode 100644
index 000000000000..a90a97c10e95
--- /dev/null
+++ b/dev-haskell/hdbc-postgresql/hdbc-postgresql-1.1.3.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2007 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.1 2007/12/13 17:21:21 dcoutts 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-db/libpq-8"
+
+S="${WORKDIR}/${MY_P}"
+
+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-sqlite/ChangeLog b/dev-haskell/hdbc-sqlite/ChangeLog
index 26f326bff515..16ee969e0e0e 100644
--- a/dev-haskell/hdbc-sqlite/ChangeLog
+++ b/dev-haskell/hdbc-sqlite/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/hdbc-sqlite
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-sqlite/ChangeLog,v 1.10 2007/10/31 13:01:36 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-sqlite/ChangeLog,v 1.11 2007/12/13 17:20:20 dcoutts Exp $
+
+*hdbc-sqlite-1.1.3.0 (13 Dec 2007)
+
+  13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org>
+  +files/hdbc-sqlite3-helper.h, +hdbc-sqlite-1.1.3.0.ebuild:
+  New version.
 
   31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org>
   hdbc-sqlite-1.0.0.0.ebuild, hdbc-sqlite-1.0.1.0.ebuild:
diff --git a/dev-haskell/hdbc-sqlite/files/digest-hdbc-sqlite-1.1.3.0 b/dev-haskell/hdbc-sqlite/files/digest-hdbc-sqlite-1.1.3.0
new file mode 100644
index 000000000000..0ed5fde5f952
--- /dev/null
+++ b/dev-haskell/hdbc-sqlite/files/digest-hdbc-sqlite-1.1.3.0
@@ -0,0 +1,3 @@
+MD5 8b430c17a2544d140cff879c392ba682 HDBC-sqlite3-1.1.3.0.tar.gz 17217
+RMD160 64b3485a7800e30d1c3c4c3488288873aca410f0 HDBC-sqlite3-1.1.3.0.tar.gz 17217
+SHA256 c75ed90c222b61867e8d2bc898e0bff17d56d7faefcdfbe25ded71564205901d HDBC-sqlite3-1.1.3.0.tar.gz 17217
diff --git a/dev-haskell/hdbc-sqlite/files/hdbc-sqlite3-helper.h b/dev-haskell/hdbc-sqlite/files/hdbc-sqlite3-helper.h
new file mode 100644
index 000000000000..4bd230b85b4a
--- /dev/null
+++ b/dev-haskell/hdbc-sqlite/files/hdbc-sqlite3-helper.h
@@ -0,0 +1,28 @@
+#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.1.3.0.ebuild b/dev-haskell/hdbc-sqlite/hdbc-sqlite-1.1.3.0.ebuild
new file mode 100644
index 000000000000..df4eb73a2f35
--- /dev/null
+++ b/dev-haskell/hdbc-sqlite/hdbc-sqlite-1.1.3.0.ebuild
@@ -0,0 +1,44 @@
+# 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.1.3.0.ebuild,v 1.1 2007/12/13 17:20:20 dcoutts 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
+}
diff --git a/dev-haskell/hdbc/ChangeLog b/dev-haskell/hdbc/ChangeLog
index 98b0e907ebf0..a03d43761ef6 100644
--- a/dev-haskell/hdbc/ChangeLog
+++ b/dev-haskell/hdbc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/hdbc
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/ChangeLog,v 1.10 2007/10/31 13:00:06 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/ChangeLog,v 1.11 2007/12/13 17:17:58 dcoutts Exp $
+
+*hdbc-1.1.3 (13 Dec 2007)
+
+  13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> +hdbc-1.1.3.ebuild:
+  New version.
 
   31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> hdbc-1.0.0.ebuild,
   hdbc-1.0.1.ebuild:
diff --git a/dev-haskell/hdbc/files/digest-hdbc-1.1.3 b/dev-haskell/hdbc/files/digest-hdbc-1.1.3
new file mode 100644
index 000000000000..573b5e03a6df
--- /dev/null
+++ b/dev-haskell/hdbc/files/digest-hdbc-1.1.3
@@ -0,0 +1,3 @@
+MD5 c1012c183b5bbd673563df41f139f0f8 HDBC-1.1.3.tar.gz 23802
+RMD160 2cd5580c2e939ceb0c44d0f8a8abd86439eae95d HDBC-1.1.3.tar.gz 23802
+SHA256 a521199a5ca1681b36e1a69b4d24bcbf30dfdf51b9fbfad2d018cabad9dd5c02 HDBC-1.1.3.tar.gz 23802
diff --git a/dev-haskell/hdbc/hdbc-1.1.3.ebuild b/dev-haskell/hdbc/hdbc-1.1.3.ebuild
new file mode 100644
index 000000000000..43f531037ef0
--- /dev/null
+++ b/dev-haskell/hdbc/hdbc-1.1.3.ebuild
@@ -0,0 +1,40 @@
+# 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.1.3.ebuild,v 1.1 2007/12/13 17:17:58 dcoutts 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
+}
diff --git a/dev-haskell/hslogger/ChangeLog b/dev-haskell/hslogger/ChangeLog
index d3c503667135..d1c604bd75ad 100644
--- a/dev-haskell/hslogger/ChangeLog
+++ b/dev-haskell/hslogger/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/hslogger
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hslogger/ChangeLog,v 1.3 2007/07/27 23:46:43 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hslogger/ChangeLog,v 1.4 2007/12/13 17:22:18 dcoutts Exp $
+
+*hslogger-1.0.2 (13 Dec 2007)
+
+  13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> +hslogger-1.0.2.ebuild:
+  New version.
 
   27 Jul 2007; Duncan Coutts <dcoutts@gentoo.org> hslogger-1.0.1.ebuild:
   Add missing deps.
diff --git a/dev-haskell/hslogger/files/digest-hslogger-1.0.2 b/dev-haskell/hslogger/files/digest-hslogger-1.0.2
new file mode 100644
index 000000000000..2bff82b86a2e
--- /dev/null
+++ b/dev-haskell/hslogger/files/digest-hslogger-1.0.2
@@ -0,0 +1,3 @@
+MD5 402a0000fd59ee437377773cbe723f4f hslogger-1.0.2.tar.gz 21563
+RMD160 1d54296b7c7c9e306d9cd243f5a9429f0f7f563d hslogger-1.0.2.tar.gz 21563
+SHA256 5897772f0c59e0cdbae21c94f14e5a435a9434ce22b1951cb5e6be5fb4d90396 hslogger-1.0.2.tar.gz 21563
diff --git a/dev-haskell/hslogger/hslogger-1.0.2.ebuild b/dev-haskell/hslogger/hslogger-1.0.2.ebuild
new file mode 100644
index 000000000000..42cb22386383
--- /dev/null
+++ b/dev-haskell/hslogger/hslogger-1.0.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hslogger/hslogger-1.0.2.ebuild,v 1.1 2007/12/13 17:22:18 dcoutts Exp $
+
+CABAL_FEATURES="profile haddock lib"
+inherit haskell-cabal versionator
+
+DESCRIPTION="Versatile logging framework"
+HOMEPAGE="http://software.complete.org/hslogger"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/ghc-6.4.2
+		dev-haskell/network
+		dev-haskell/mtl"
+
+src_unpack() {
+	unpack "${A}"
+	cabal-mksetup
+	sed -i -e "s/mtl/mtl, unix/" \
+		"${S}/hslogger.cabal"
+
+	if version_is_at_least "6.8" "$(ghc-version)"; then
+		sed -i -e '/Build-Depends:/a \
+			, containers' \
+			"${S}/hslogger.cabal"
+		sed -i -e '1i{-# LANGUAGE PatternSignatures #-}' \
+			"${S}/src/System/Log/Logger.hs"
+	fi
+}
diff --git a/dev-haskell/html/ChangeLog b/dev-haskell/html/ChangeLog
index 8b3c3eff25aa..7f1115383b99 100644
--- a/dev-haskell/html/ChangeLog
+++ b/dev-haskell/html/ChangeLog
@@ -1,6 +1,11 @@
 # 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.24 2007/12/13 05:44:03 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/html/ChangeLog,v 1.25 2007/12/13 17:23:07 dcoutts Exp $
+
+*html-1.0.1.1 (13 Dec 2007)
+
+  13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> +html-1.0.1.1.ebuild:
+  New version.
 
   13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> html-1.0-r1.ebuild,
   html-1.0.1.ebuild:
diff --git a/dev-haskell/html/files/digest-html-1.0.1.1 b/dev-haskell/html/files/digest-html-1.0.1.1
new file mode 100644
index 000000000000..9eeef29b5b95
--- /dev/null
+++ b/dev-haskell/html/files/digest-html-1.0.1.1
@@ -0,0 +1,3 @@
+MD5 1aa9bc4268a6acc4c5c1714cf2652a01 html-1.0.1.1.tar.gz 10932
+RMD160 5e29e5eff30203c6c5583e9afc69258eecbe3f1d html-1.0.1.1.tar.gz 10932
+SHA256 817a73877725c91e2e377f6385db64e1f56f1fa67dc69427fd035d14aaf3ca81 html-1.0.1.1.tar.gz 10932
diff --git a/dev-haskell/html/html-1.0.1.1.ebuild b/dev-haskell/html/html-1.0.1.1.ebuild
new file mode 100644
index 000000000000..37916b439354
--- /dev/null
+++ b/dev-haskell/html/html-1.0.1.1.ebuild
@@ -0,0 +1,17 @@
+# 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.1.ebuild,v 1.1 2007/12/13 17:23:07 dcoutts Exp $
+
+CABAL_FEATURES="lib profile haddock"
+inherit haskell-cabal
+
+DESCRIPTION="HTML Haskell combinator library."
+HOMEPAGE="http://haskell.org/ghc/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/ghc-6.6"
diff --git a/dev-haskell/hunit/ChangeLog b/dev-haskell/hunit/ChangeLog
index cf050b6a1a31..08df35fba448 100644
--- a/dev-haskell/hunit/ChangeLog
+++ b/dev-haskell/hunit/ChangeLog
@@ -1,6 +1,11 @@
 # 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.24 2007/12/13 05:44:32 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hunit/ChangeLog,v 1.25 2007/12/13 17:24:40 dcoutts Exp $
+
+*hunit-1.2.0.0 (13 Dec 2007)
+
+  13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> +hunit-1.2.0.0.ebuild:
+  New version.
 
   13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> hunit-1.1-r1.ebuild,
   hunit-1.1.1.ebuild:
diff --git a/dev-haskell/hunit/files/digest-hunit-1.2.0.0 b/dev-haskell/hunit/files/digest-hunit-1.2.0.0
new file mode 100644
index 000000000000..34f2381776f6
--- /dev/null
+++ b/dev-haskell/hunit/files/digest-hunit-1.2.0.0
@@ -0,0 +1,3 @@
+MD5 edfaa41815288e58b5b324f2416ba9aa HUnit-1.2.0.0.tar.gz 6689
+RMD160 4f9522e511fb35ee5de513ff19f5f6f0a5850de0 HUnit-1.2.0.0.tar.gz 6689
+SHA256 3fc27ff83ab3a399367e99647e8a84d34c6e8895b7e89ed32e9934b3ed568e55 HUnit-1.2.0.0.tar.gz 6689
diff --git a/dev-haskell/hunit/hunit-1.2.0.0.ebuild b/dev-haskell/hunit/hunit-1.2.0.0.ebuild
new file mode 100644
index 000000000000..32996b4929b5
--- /dev/null
+++ b/dev-haskell/hunit/hunit-1.2.0.0.ebuild
@@ -0,0 +1,29 @@
+# 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.2.0.0.ebuild,v 1.1 2007/12/13 17:24:40 dcoutts Exp $
+
+CABAL_FEATURES="lib profile haddock"
+inherit base haskell-cabal
+
+MY_PN="HUnit"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A unit testing framework for Haskell."
+HOMEPAGE="http://haskell.org/ghc/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/ghc-6.4"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install () {
+	cabal_src_install
+	if use doc; then
+		dohtml -r "${S}/doc/"*
+	fi
+}
diff --git a/dev-haskell/mtl/ChangeLog b/dev-haskell/mtl/ChangeLog
index ed3ff3dd4fd7..655d168f6889 100644
--- a/dev-haskell/mtl/ChangeLog
+++ b/dev-haskell/mtl/ChangeLog
@@ -1,6 +1,11 @@
 # 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.24 2007/12/13 05:47:02 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/mtl/ChangeLog,v 1.25 2007/12/13 17:26:01 dcoutts Exp $
+
+*mtl-1.1.0.0 (13 Dec 2007)
+
+  13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> +mtl-1.1.0.0.ebuild:
+  New version.
 
   13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> mtl-1.0-r1.ebuild,
   mtl-1.0.1.ebuild:
diff --git a/dev-haskell/mtl/files/digest-mtl-1.1.0.0 b/dev-haskell/mtl/files/digest-mtl-1.1.0.0
new file mode 100644
index 000000000000..befc7e1c5e2c
--- /dev/null
+++ b/dev-haskell/mtl/files/digest-mtl-1.1.0.0
@@ -0,0 +1,3 @@
+MD5 4f40019b3b9535600c7182d3e0392b69 mtl-1.1.0.0.tar.gz 17626
+RMD160 e5df6557e66f5315fa9687eee6b3af4ae129d482 mtl-1.1.0.0.tar.gz 17626
+SHA256 ef7515fb4d9613172c9888d0c843ad26d4ac3efc6feea16989dc45a4f0f0bcb0 mtl-1.1.0.0.tar.gz 17626
diff --git a/dev-haskell/mtl/mtl-1.1.0.0.ebuild b/dev-haskell/mtl/mtl-1.1.0.0.ebuild
new file mode 100644
index 000000000000..a2b1338892bd
--- /dev/null
+++ b/dev-haskell/mtl/mtl-1.1.0.0.ebuild
@@ -0,0 +1,17 @@
+# 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.1.0.0.ebuild,v 1.1 2007/12/13 17:26:01 dcoutts Exp $
+
+CABAL_FEATURES="lib profile haddock"
+inherit haskell-cabal
+
+DESCRIPTION="Monad transformer library"
+HOMEPAGE="http://haskell.org/ghc/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/ghc-6.6"
diff --git a/dev-haskell/openal/ChangeLog b/dev-haskell/openal/ChangeLog
index 3ce5eef8848a..1827b0a96782 100644
--- a/dev-haskell/openal/ChangeLog
+++ b/dev-haskell/openal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/openal
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/openal/ChangeLog,v 1.4 2007/12/12 09:56:31 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/openal/ChangeLog,v 1.5 2007/12/13 17:27:18 dcoutts Exp $
+
+*openal-1.3.1.1 (13 Dec 2007)
+
+  13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> +openal-1.3.1.1.ebuild:
+  New version.
 
   12 Dec 2007; Christian Faulhammer <opfer@gentoo.org> openal-1.3.1.ebuild:
   quote variable
diff --git a/dev-haskell/openal/files/digest-openal-1.3.1.1 b/dev-haskell/openal/files/digest-openal-1.3.1.1
new file mode 100644
index 000000000000..c5a496f38402
--- /dev/null
+++ b/dev-haskell/openal/files/digest-openal-1.3.1.1
@@ -0,0 +1,3 @@
+MD5 c8eb60e72ae5276c962aadd12f14ed0c OpenAL-1.3.1.1.tar.gz 109173
+RMD160 dff1bac0013a2b70233c207f820f2878147d4e24 OpenAL-1.3.1.1.tar.gz 109173
+SHA256 4875e015770feb93d5127d4b6f2338eb3957a0c36f64ccb8b3846010619f89b0 OpenAL-1.3.1.1.tar.gz 109173
diff --git a/dev-haskell/openal/openal-1.3.1.1.ebuild b/dev-haskell/openal/openal-1.3.1.1.ebuild
new file mode 100644
index 000000000000..41b38dff4977
--- /dev/null
+++ b/dev-haskell/openal/openal-1.3.1.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/openal/openal-1.3.1.1.ebuild,v 1.1 2007/12/13 17:27:18 dcoutts Exp $
+
+CABAL_FEATURES="lib profile haddock"
+inherit haskell-cabal
+
+MY_PN="OpenAL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A Haskell binding to the OpenAL cross-platform 3D audio API"
+HOMEPAGE="http://haskell.org/ghc/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND=">=dev-lang/ghc-6.4
+	>=dev-haskell/opengl-2.2.1
+	media-libs/openal"
+
+S="${WORKDIR}/${MY_P}"
+
+#TODO: install examples perhaps?
diff --git a/dev-haskell/opengl/ChangeLog b/dev-haskell/opengl/ChangeLog
index 8de58301a3aa..bb8e17ac744a 100644
--- a/dev-haskell/opengl/ChangeLog
+++ b/dev-haskell/opengl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/opengl
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/opengl/ChangeLog,v 1.4 2007/12/12 13:43:56 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/opengl/ChangeLog,v 1.5 2007/12/13 17:28:14 dcoutts Exp $
+
+*opengl-2.2.1.1 (13 Dec 2007)
+
+  13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> +opengl-2.2.1.1.ebuild:
+  New version.
 
   12 Dec 2007; Ferris McCormick <fmccor@gentoo.org> opengl-2.2.1.ebuild:
   Add ~sparc keyword (completeness with bug #201984)
diff --git a/dev-haskell/opengl/files/digest-opengl-2.2.1.1 b/dev-haskell/opengl/files/digest-opengl-2.2.1.1
new file mode 100644
index 000000000000..6416e1feb1b8
--- /dev/null
+++ b/dev-haskell/opengl/files/digest-opengl-2.2.1.1
@@ -0,0 +1,3 @@
+MD5 6819d1a6910c9c7cdd387fd51c11b017 OpenGL-2.2.1.1.tar.gz 176695
+RMD160 dcbe42faa008d01ffafd4ca27341e1d2d5267b6e OpenGL-2.2.1.1.tar.gz 176695
+SHA256 926ca25cf9502cdaaeb8ade484015468cb60594e1bfbf0e04bd01235d8d9a792 OpenGL-2.2.1.1.tar.gz 176695
diff --git a/dev-haskell/opengl/opengl-2.2.1.1.ebuild b/dev-haskell/opengl/opengl-2.2.1.1.ebuild
new file mode 100644
index 000000000000..053d09f5039a
--- /dev/null
+++ b/dev-haskell/opengl/opengl-2.2.1.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/opengl/opengl-2.2.1.1.ebuild,v 1.1 2007/12/13 17:28:14 dcoutts Exp $
+
+CABAL_FEATURES="lib profile haddock"
+inherit haskell-cabal
+
+MY_PN=OpenGL
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="OpenGL bindings for haskell"
+HOMEPAGE="http://haskell.org/ghc/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND=">=dev-lang/ghc-6.4
+	virtual/opengl
+	virtual/glu
+	virtual/glut"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/uuagc/ChangeLog b/dev-haskell/uuagc/ChangeLog
index 68c89d99b588..bde45e1a9b03 100644
--- a/dev-haskell/uuagc/ChangeLog
+++ b/dev-haskell/uuagc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/uuagc
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uuagc/ChangeLog,v 1.13 2007/10/31 13:10:21 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uuagc/ChangeLog,v 1.14 2007/12/13 17:29:17 dcoutts Exp $
+
+*uuagc-0.9.5 (13 Dec 2007)
+
+  13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> +uuagc-0.9.5.ebuild:
+  New version.
 
   31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> uuagc-0.9.1.ebuild:
   Drop virtual/ghc in favour of dev-lang/ghc
diff --git a/dev-haskell/uuagc/files/digest-uuagc-0.9.5 b/dev-haskell/uuagc/files/digest-uuagc-0.9.5
new file mode 100644
index 000000000000..96df20bb41f0
--- /dev/null
+++ b/dev-haskell/uuagc/files/digest-uuagc-0.9.5
@@ -0,0 +1,3 @@
+MD5 62727961221d6f1acbb7819c351ac624 uuagc-0.9.5-src.tar.gz 254523
+RMD160 cccb1e7447a8949602e7cbf9b8cae5b9759d15a5 uuagc-0.9.5-src.tar.gz 254523
+SHA256 e6e8e6040aa52279fcac3dcefca7c675cccce98e8d53f59ba0d6bb19cb3425ca uuagc-0.9.5-src.tar.gz 254523
diff --git a/dev-haskell/uuagc/uuagc-0.9.5.ebuild b/dev-haskell/uuagc/uuagc-0.9.5.ebuild
new file mode 100644
index 000000000000..4846a6892fb2
--- /dev/null
+++ b/dev-haskell/uuagc/uuagc-0.9.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uuagc/uuagc-0.9.5.ebuild,v 1.1 2007/12/13 17:29:17 dcoutts Exp $
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal
+
+DESCRIPTION="The Utrecht University Attribute Grammar system"
+HOMEPAGE="http://www.cs.uu.nl/wiki/HUT/AttributeGrammarSystem"
+SRC_URI="http://abaris.zoo.cs.uu.nl:8080/wiki/pub/HUT/Download/${P}-src.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/ghc-6.6
+	>=dev-haskell/uulib-0.9.2"
+
+src_unpack() {
+	unpack "${A}"
+
+	sed -i -e '/Extensions:/a \
+		, MultiParamTypeClasses' \
+		"${S}/uuagc.cabal"
+
+	# Add in the extra split-base deps
+	if version_is_at_least "6.8" "$(ghc-version)"; then
+		sed -i -e '/Build-Depends:/a \
+			,containers, directory, array, bytestring' \
+			"${S}/uuagc.cabal"
+	fi
+}
diff --git a/dev-haskell/x11/Manifest b/dev-haskell/x11/Manifest
index 00acf8850bc8..d8a6bf815438 100644
--- a/dev-haskell/x11/Manifest
+++ b/dev-haskell/x11/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA1
 
 DIST X11-1.2.2.tar.gz 72793 RMD160 f04a7f05d850294fb77d1b5ebb13e3361d0729ad SHA1 f206cebbef7e2d6245670f8795a84f1acb556413 SHA256 67450351a44955966a29e282e2b8a9888ad337add432adec43f0f370b0835ed8
+DIST X11-1.4.0.tar.gz 85583 RMD160 95f9147f3fee68bdd0c393851b9bd16e3ce3745d SHA1 8bd26e814519d980c334351151604103f012f9e7 SHA256 11cd8d4c9d81a420bb4cc4400a57f760497a7a4f0899b1369b95a454063b9560
 DIST ghc-6.6-src-extralibs.tar.bz2 2015443 RMD160 63d87d02f42efc032c20de7394f3b29431fd8eed SHA1 b94974e255165703d882bb522ec44c5bdc4b0aec SHA256 1c811695d074c7560ca9bd7773523f817ccb57390044392a1ad92cf0079bea29
 DIST ghc-6.6.1-src-extralibs.tar.bz2 1928527 RMD160 1c18c85d978c4b3369132e247c823aaa90ea8530 SHA1 1398f6c35191d52410a2e066b382635dff0d8d6d SHA256 d162a82fc388fdd48c327b09bb6d778f2313d12d5282f3b120ac08a5d4e78902
 EBUILD x11-1.1.ebuild 831 RMD160 c20a53f125be3ec58354075f9853082ede46adbe SHA1 7705ab6724909a7de0564b0da850569dd1fcbfc7 SHA256 01139b34b17348b92cbd9f0fe6363c4a626fb06ebe861b7dec883f277f3d7aca
 MD5 ab034aeab42e8822adb00544ccce518d x11-1.1.ebuild 831
 RMD160 c20a53f125be3ec58354075f9853082ede46adbe x11-1.1.ebuild 831
 SHA256 01139b34b17348b92cbd9f0fe6363c4a626fb06ebe861b7dec883f277f3d7aca x11-1.1.ebuild 831
-EBUILD x11-1.2.1.ebuild 792 RMD160 e24171f2446a10b046e70fe8d062a418012fd7a7 SHA1 6403cf0c4bdebcbf5b32043ba19a219decbb0d54 SHA256 5db9d6ad47052243061822fef3225d729281b108d5172c8869c96304fdc8a3e4
-MD5 58836a3926ff6c8ff575adfa2bfc3112 x11-1.2.1.ebuild 792
-RMD160 e24171f2446a10b046e70fe8d062a418012fd7a7 x11-1.2.1.ebuild 792
-SHA256 5db9d6ad47052243061822fef3225d729281b108d5172c8869c96304fdc8a3e4 x11-1.2.1.ebuild 792
+EBUILD x11-1.2.1.ebuild 794 RMD160 f1a5bc7ddd606f3a4ab58a3e3795e462741a1811 SHA1 46a44354ccb34fb791ce9c76039f0a1a6ea909ae SHA256 6eb54912d69abbcd9836087f89278137a8958de51cc53c67a970dcb36931cf90
+MD5 e260e6a7f6d1e869b75df69e0e35cb38 x11-1.2.1.ebuild 794
+RMD160 f1a5bc7ddd606f3a4ab58a3e3795e462741a1811 x11-1.2.1.ebuild 794
+SHA256 6eb54912d69abbcd9836087f89278137a8958de51cc53c67a970dcb36931cf90 x11-1.2.1.ebuild 794
 EBUILD x11-1.2.2.ebuild 688 RMD160 3297402aa916e22b5595765755e526aee810c4ad SHA1 6f8a1cf9602307890bbb0fabf33c89ae546bd443 SHA256 3b0221f9a97f57a93ac8435cfcf651842673853a153181939914d38017f8d71b
 MD5 cf088075b06da43622edb5f3680d0f8d x11-1.2.2.ebuild 688
 RMD160 3297402aa916e22b5595765755e526aee810c4ad x11-1.2.2.ebuild 688
@@ -20,10 +21,14 @@ EBUILD x11-1.2.ebuild 609 RMD160 328f7068e69610a6bce10b9d3808f5642d970b46 SHA1 1
 MD5 d208ee4879ff43ca964ae84f98481a15 x11-1.2.ebuild 609
 RMD160 328f7068e69610a6bce10b9d3808f5642d970b46 x11-1.2.ebuild 609
 SHA256 e4146cb0b12032a2c160ef51802c3fd526c6dc22a030a49a3e1639c90952c1da x11-1.2.ebuild 609
-MISC ChangeLog 720 RMD160 33990c974e50fc59e0ab99424ce446a656aae24c SHA1 4158eee54d65f23d5ed60d3431e862ffd5e7dbb6 SHA256 0aa99274643f941f86385abec9f1fabcb5f254458c96bd72df761e2f5e56a7b1
-MD5 ed90530dfe1a930ee3676b9c566187d9 ChangeLog 720
-RMD160 33990c974e50fc59e0ab99424ce446a656aae24c ChangeLog 720
-SHA256 0aa99274643f941f86385abec9f1fabcb5f254458c96bd72df761e2f5e56a7b1 ChangeLog 720
+EBUILD x11-1.4.0.ebuild 639 RMD160 a1fa278d0faca542d5ddb423680df69f88cf451f SHA1 3207d534a19ba7cc7b9872a9f647175c25066960 SHA256 620b98e450583f26d3a3c0685baa53a671931837622b03b9d64506e203bc863c
+MD5 5cfa009fcb0ce9fc2587c478309890f9 x11-1.4.0.ebuild 639
+RMD160 a1fa278d0faca542d5ddb423680df69f88cf451f x11-1.4.0.ebuild 639
+SHA256 620b98e450583f26d3a3c0685baa53a671931837622b03b9d64506e203bc863c x11-1.4.0.ebuild 639
+MISC ChangeLog 886 RMD160 afa8e6010d24c548ae3ade5a3353dfb5b0319cc5 SHA1 47dea27d4509d88a8505250d1b019ef51ed2c427 SHA256 2be4110da1dbe95f581e255ec78fd7c4958beb9a5336d0924d3dad73b1eb9ce3
+MD5 fb9ca74d4ed8c850fbbcd688f1b64e5a ChangeLog 886
+RMD160 afa8e6010d24c548ae3ade5a3353dfb5b0319cc5 ChangeLog 886
+SHA256 2be4110da1dbe95f581e255ec78fd7c4958beb9a5336d0924d3dad73b1eb9ce3 ChangeLog 886
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
@@ -40,10 +45,13 @@ SHA256 3d9bddb04ccd984fc7bda5d589e77b4e22ecb7459580338979543bd8ed551f0b files/di
 MD5 2343b4013afe5b527eb314b8119caa64 files/digest-x11-1.2.2 226
 RMD160 35b65ff6a694db855384a36139bd940d8c05cfc9 files/digest-x11-1.2.2 226
 SHA256 d0bf61b4d64be8064209d9c81b99f62902a155e87e5a730f68dc95b649e375f0 files/digest-x11-1.2.2 226
+MD5 1c478928216364089c1840f1f47754e4 files/digest-x11-1.4.0 226
+RMD160 0d5e34ea1e44f5c3821b5b1fea23ff3937e0a8b0 files/digest-x11-1.4.0 226
+SHA256 cbdbc227659d291c4409fe36cc0b0249c8106e8ff9dea0f1e21c67af92b20a1e files/digest-x11-1.4.0 226
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHKH/inUVyUObPUL4RArYaAJ0UzPIF7e/qoAuTGUEi7snT6Ua5pQCdF4Mw
-tPN4/ul3DWzN0wYihroskdU=
-=nt6k
+iD8DBQFHYW0snUVyUObPUL4RAhotAJ4761aT5iPR7lqewF0D8/Sp+czwjACeI1wH
+UrunQ1Go82BD5qs5FvYTbEg=
+=Hm+l
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/xhtml/ChangeLog b/dev-haskell/xhtml/ChangeLog
index 619ba3243175..6f80bf56626d 100644
--- a/dev-haskell/xhtml/ChangeLog
+++ b/dev-haskell/xhtml/ChangeLog
@@ -1,6 +1,11 @@
 # 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.10 2007/12/13 05:50:33 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xhtml/ChangeLog,v 1.11 2007/12/13 17:30:12 dcoutts Exp $
+
+*xhtml-3000.0.2.1 (13 Dec 2007)
+
+  13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> +xhtml-3000.0.2.1.ebuild:
+  New version.
 
   13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> xhtml-2006.9.13.ebuild,
   xhtml-3000.0.2.ebuild:
diff --git a/dev-haskell/xhtml/files/digest-xhtml-3000.0.2.1 b/dev-haskell/xhtml/files/digest-xhtml-3000.0.2.1
new file mode 100644
index 000000000000..5b22bc9ffbee
--- /dev/null
+++ b/dev-haskell/xhtml/files/digest-xhtml-3000.0.2.1
@@ -0,0 +1,3 @@
+MD5 1b97b301ebeb7bb321308c4ebcec754a xhtml-3000.0.2.1.tar.gz 13309
+RMD160 bc07bd2b61be4a690f59bc13e1399ff81edae5fd xhtml-3000.0.2.1.tar.gz 13309
+SHA256 4cbb89d34d6b852d39d00aa4fee50824b003597e45d2858ca5dcee54d94bde86 xhtml-3000.0.2.1.tar.gz 13309
diff --git a/dev-haskell/xhtml/xhtml-3000.0.2.1.ebuild b/dev-haskell/xhtml/xhtml-3000.0.2.1.ebuild
new file mode 100644
index 000000000000..b1c9e5a81cd7
--- /dev/null
+++ b/dev-haskell/xhtml/xhtml-3000.0.2.1.ebuild
@@ -0,0 +1,17 @@
+# 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.1.ebuild,v 1.1 2007/12/13 17:30:12 dcoutts Exp $
+
+CABAL_FEATURES="lib profile haddock"
+inherit haskell-cabal
+
+DESCRIPTION="XHTML combinator library for haskell"
+HOMEPAGE="http://haskell.org/ghc/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/ghc-6.4"