Backport latest release from Gentoo/Alt:Prefix overlay. Keep it still masked as it needs to be tested non-prefix first. Remove old non-compiling cruft.

(Portage version: 2.1.3.9)

25 files changed, 317 insertions, 735 deletions

diff --git a/dev-db/monetdb/ChangeLog b/dev-db/monetdb/ChangeLog
index 7b81d95cdb7a..527ae1c014e9 100644
--- a/dev-db/monetdb/ChangeLog
+++ b/dev-db/monetdb/ChangeLog
@@ -1,6 +1,35 @@
 # ChangeLog for dev-db/monetdb
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/monetdb/ChangeLog,v 1.14 2007/04/28 22:07:02 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/monetdb/ChangeLog,v 1.15 2007/11/06 10:44:06 grobian Exp $
+
+*monetdb-5.2.0 (06 Nov 2007)
+
+  06 Nov 2007; Fabian Groffen <grobian@gentoo.org>
+  +files/xquery-0.20.0-bool-undeclared.patch, -files/monetdb.conf-4.8.2,
+  -files/monetdb.init-4.8.2, -files/monetdb-4.8.2-startup.mil,
+  -files/monetdb.JdbcClient-4.10.0,
+  -files/monetdb-4.10.2-gentoo-MapiClient.patch,
+  -files/monetdb-4.10.2-gentoo-conf.patch,
+  -files/monetdb-4.12.0-gentoo-MapiClient.patch,
+  -files/monetdb-4.12.0-gentoo-conf.patch,
+  -files/monetdb-4.12.0-startup.mil, +files/monetdb.conf-5.2.0,
+  +files/monetdb.init-5.2.0, -files/monetdb-start.sh,
+  -files/monetdb-stop.sh, -files/monetdb_config.sh, metadata.xml,
+  -monetdb-4.10.2.ebuild, -monetdb-4.12.0.ebuild, +monetdb-4.20.0.ebuild,
+  +monetdb-5.2.0.ebuild:
+  Backport latest release from Gentoo/Alt:Prefix overlay. Keep it still masked
+  as it needs to be tested non-prefix first.  Remove old non-compiling
+  cruft.
+
+  06 Nov 2007; Fabian Groffen <grobian@gentoo.org> monetdb-5.2.0.ebuild,
+  monetdb-5.2.0.ebuild:
+  Create dbfarm, as upstream doesn't do that for us
+
+*monetdb-4.20.0 (05 Nov 2007)
+
+  05 Nov 2007; Fabian Groffen <fabian@gentoo.org>
+  +files/xquery-0.20.0-bool-undeclared.patch, +monetdb-4.20.0.ebuild:
+  Latest release, completely rewritten ebuilds.  M5/SQL and M4/XQuery
 
   28 Apr 2007; Torsten Veller <tove@gentoo.org> monetdb-4.10.2.ebuild,
   monetdb-4.12.0.ebuild:
diff --git a/dev-db/monetdb/files/digest-monetdb-4.10.2 b/dev-db/monetdb/files/digest-monetdb-4.10.2
deleted file mode 100644
index 79893d270cbe..000000000000
--- a/dev-db/monetdb/files/digest-monetdb-4.10.2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 855e17f84fac0fbe345131009f168fda MonetDB-4.10.2.tar.gz 6505286
-RMD160 84882bdac8987497e1357a74f7746964fac40e13 MonetDB-4.10.2.tar.gz 6505286
-SHA256 e66dfb81b9fd5c222c2ec846a21a966bbd8cd9e78321467319d4b68ccd97764b MonetDB-4.10.2.tar.gz 6505286
-MD5 cfc2605e25a965c0a7ffab70d7ade322 MonetDB-SQL-2.10.2.tar.gz 13129287
-RMD160 cb1dc3e600293c13ca49421fad58089608dcca86 MonetDB-SQL-2.10.2.tar.gz 13129287
-SHA256 08d5f1d973445060e5fe6041fb7fb33109e6880aa21383922c5b032b34c822ad MonetDB-SQL-2.10.2.tar.gz 13129287
-MD5 fc86e09a7067ea2ee97c8dc3b7395e23 MonetDB-XQuery-0.10.2.tar.gz 5039724
-RMD160 15825aebf9af51a18f886643899809580ed59f6c MonetDB-XQuery-0.10.2.tar.gz 5039724
-SHA256 fe5ba620a0fc5ecee0a1a468f2efaf3aa75c469dc2a65528b85ee0ff5e1360b2 MonetDB-XQuery-0.10.2.tar.gz 5039724
diff --git a/dev-db/monetdb/files/digest-monetdb-4.12.0 b/dev-db/monetdb/files/digest-monetdb-4.12.0
deleted file mode 100644
index dabe39c94715..000000000000
--- a/dev-db/monetdb/files/digest-monetdb-4.12.0
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 189eb93b08d21238dd50e71408dc0a69 MonetDB-4.12.0.tar.gz 6573810
-RMD160 80f3eec8db50a27b44596cd66ec251df158dfc6f MonetDB-4.12.0.tar.gz 6573810
-SHA256 7626b0b033f3a67ed249390fab9e7140cf3d704fd781d4c649291242af1e0903 MonetDB-4.12.0.tar.gz 6573810
-MD5 1a71813504da964122877db9885fe077 MonetDB-SQL-2.12.0.tar.gz 13232765
-RMD160 d83cd2dba8b99c9f9a18fe86c9e3ff7a01fd0cfd MonetDB-SQL-2.12.0.tar.gz 13232765
-SHA256 bd53b8a97f204969d8587a9d6ac14d713abd234ca0ad9a9a208275e3f844a0bc MonetDB-SQL-2.12.0.tar.gz 13232765
-MD5 bae37d704947155b24d3489074f68eee MonetDB-XQuery-0.12.0.tar.gz 5112297
-RMD160 bbaf492132592b56fd863c3a54d2c79152fe693a MonetDB-XQuery-0.12.0.tar.gz 5112297
-SHA256 40d799c9ef03411a743107f55fbcf4fa3860dc04a6810f6ed56d73d4f43dfa5d MonetDB-XQuery-0.12.0.tar.gz 5112297
diff --git a/dev-db/monetdb/files/digest-monetdb-4.20.0 b/dev-db/monetdb/files/digest-monetdb-4.20.0
new file mode 100644
index 000000000000..353ed70ef1f4
--- /dev/null
+++ b/dev-db/monetdb/files/digest-monetdb-4.20.0
@@ -0,0 +1,6 @@
+MD5 c02cf6a018acc16983b49ac9411e872f MonetDB4-4.20.0.tar.gz 5613616
+RMD160 e6152d192bbc94962914ba2776229c3f5cf94c81 MonetDB4-4.20.0.tar.gz 5613616
+SHA256 4cfc8991723d6824fb2fc749dd524e1308a45e79e6b03a952f8336c9f1673ff0 MonetDB4-4.20.0.tar.gz 5613616
+MD5 d26334e63df4db2581653c5ad7b0ee98 pathfinder-0.20.0.tar.gz 29828492
+RMD160 907ad6e68425cf9ac097c0cd8369adfbe4f85042 pathfinder-0.20.0.tar.gz 29828492
+SHA256 d36474319f85f42eed20210072d42c24dcd7caa436a3764a43ea7b565dac2f1d pathfinder-0.20.0.tar.gz 29828492
diff --git a/dev-db/monetdb/files/digest-monetdb-5.2.0 b/dev-db/monetdb/files/digest-monetdb-5.2.0
new file mode 100644
index 000000000000..88211bf977f8
--- /dev/null
+++ b/dev-db/monetdb/files/digest-monetdb-5.2.0
@@ -0,0 +1,12 @@
+MD5 f35f6a6ee73aae0171bbd71a5ed1436f MonetDB-1.20.0.tar.gz 1187205
+RMD160 fd2a3ec77568ca6fac845c60a27182b58903bd10 MonetDB-1.20.0.tar.gz 1187205
+SHA256 f465ddb5674ea1a64594922404dcd359907bafc39efb6cf9800eb9f7a63739c7 MonetDB-1.20.0.tar.gz 1187205
+MD5 27402bc7744a96b024a21c45340998e5 MonetDB5-5.2.0.tar.gz 4290306
+RMD160 406592af8a7ccb43cae92e86e009749824065121 MonetDB5-5.2.0.tar.gz 4290306
+SHA256 0d94e2222038ef977cf79f71519fe16d6470a36eac7c6b2a9c3976dcd9c8c65a MonetDB5-5.2.0.tar.gz 4290306
+MD5 873b1611054e40b0c3e0606f54b8fcbd clients-1.20.0.tar.gz 1072346
+RMD160 b992f929739b5ea7478afb9228fe8b0e871474e9 clients-1.20.0.tar.gz 1072346
+SHA256 3c5f549b7f64bc2004296f223c24d435d36c908590a23f97ad4008529f47eca2 clients-1.20.0.tar.gz 1072346
+MD5 38a0b72d56215288c47fa22064e3f87a sql-2.20.0.tar.gz 14281686
+RMD160 8cf16013bc13dedf56e9d918e1bee4a43ce0df6e sql-2.20.0.tar.gz 14281686
+SHA256 0ccb003b3713daefa0c415f5a1dae513e3108c970eeeb9379f57145f9c902298 sql-2.20.0.tar.gz 14281686
diff --git a/dev-db/monetdb/files/monetdb-4.10.2-gentoo-MapiClient.patch b/dev-db/monetdb/files/monetdb-4.10.2-gentoo-MapiClient.patch
deleted file mode 100644
index 7f1d2ed8cb2d..000000000000
--- a/dev-db/monetdb/files/monetdb-4.10.2-gentoo-MapiClient.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- MonetDB-4.10.2/src/mapi/clients/C/MapiClient.c
-+++ MonetDB-4.10.2/src/mapi/clients/C/MapiClient.c
-@@ -1175,7 +1175,7 @@
- {
- 	opt *set = NULL;
- 	int setlen;
--	char *language = "mil";
-+	char *language = "sql";
- 	int port = 0;
- 	char *user = NULL;
- 	char *passwd = NULL;
diff --git a/dev-db/monetdb/files/monetdb-4.10.2-gentoo-conf.patch b/dev-db/monetdb/files/monetdb-4.10.2-gentoo-conf.patch
deleted file mode 100644
index 1c8fab677d23..000000000000
--- a/dev-db/monetdb/files/monetdb-4.10.2-gentoo-conf.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- MonetDB-4.10.2/conf/MonetDB.conf.in
-+++ MonetDB-4.10.2/conf/MonetDB.conf.in
-@@ -20,7 +20,7 @@
- # the name of the database to use below.  Note that you can use
- # multiple databases, but that you have to edit the database name
- # and restart MonetDB.
--gdk_dbname=demo
-+gdk_dbname=default
- 
- # The options below deal with various aspects of memory usage behaviour.
- # If you don't know what these values mean, you should leave them alone.
-@@ -72,11 +72,6 @@
- #
- #gdk_version <ver>		create BATs in old formats[out of date?]
- 
--
--# General client Section
--#=======================
--#host=localhost				#the host the server runs on
--
- # MonetDB Section
- #================
- # Administrator user name 
-@@ -89,7 +84,7 @@
- # Where do the MonetDB modules reside? The second path is for windows dlls.
- monet_mod_path=@Xlibdir@@DIRSEP@@PACKAGE@@PATHSEP@@Xlibdir@@DIRSEP@bin
- # Start Mserver in daemon mode, or start with MIL interactive interface?
--monet_daemon=no
-+monet_daemon=yes
- 
- # Monet Application Interface Section
- #====================================
-@@ -101,7 +96,7 @@
- mapi_debug=0
- # The number of concurrent clients can be set using mapi_clients
- # (smaller than 1 is not very useful)
--#mapi_clients=2
-+mapi_clients=10
- 
- # SQL Interface Section
- #======================
-@@ -118,9 +113,6 @@
- # default port to address an Mserver for an XQuery session
- xquery_port=45789
- 
--# default port to address the HTTP server for pathfinder
--pf_httpd_port=8080
--
- #output mode "dm" = pretty printed, 
- #            "xml" = enforce XML with enclosing <XQueryResult> tags
- xquery_output=dm                          
diff --git a/dev-db/monetdb/files/monetdb-4.12.0-gentoo-MapiClient.patch b/dev-db/monetdb/files/monetdb-4.12.0-gentoo-MapiClient.patch
deleted file mode 100644
index 758dc9c3bb1f..000000000000
--- a/dev-db/monetdb/files/monetdb-4.12.0-gentoo-MapiClient.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- MonetDB-4.12.0/src/mapi/clients/C/MapiClient.c
-+++ MonetDB-4.12.0/src/mapi/clients/C/MapiClient.c
-@@ -35,7 +35,7 @@
- #endif
- 
- static FILE *toConsole;
--static char *language = "mil";
-+static char *language = "sql";
- 
- char *command = NULL;
- 
diff --git a/dev-db/monetdb/files/monetdb-4.12.0-gentoo-conf.patch b/dev-db/monetdb/files/monetdb-4.12.0-gentoo-conf.patch
deleted file mode 100644
index bb4aa026b467..000000000000
--- a/dev-db/monetdb/files/monetdb-4.12.0-gentoo-conf.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- MonetDB-4.12.0/conf/MonetDB.conf.in
-+++ MonetDB-4.12.0/conf/MonetDB.conf.in
-@@ -20,7 +20,7 @@
- # the name of the database to use below.  Note that you can use
- # multiple databases, but that you have to edit the database name
- # and restart MonetDB.
--gdk_dbname=demo
-+gdk_dbname=default
- 
- # The options below deal with various aspects of memory usage behaviour.
- # If you don't know what these values mean, you should leave them alone.
-@@ -70,10 +70,6 @@
- # 4194304 = show result size estimations (for join,select)
- # 8388608 = extended property checking: tells also about not set properties
- 
--# General client Section
--#=======================
--#host=localhost				#the host the server runs on
--
- # MonetDB Section
- #================
- # Administrator user name 
-@@ -86,7 +82,7 @@
- # Where do the MonetDB modules reside? The second path is for windows dlls.
- monet_mod_path=@Xlibdir@@DIRSEP@@PACKAGE@@PATHSEP@@Xlibdir@@DIRSEP@bin
- # Start Mserver in daemon mode, or start with MIL interactive interface?
--monet_daemon=no
-+monet_daemon=yes
- 
- # Monet Application Interface Section
- #====================================
-@@ -98,7 +94,7 @@
- mapi_debug=0
- # The number of concurrent clients can be set using mapi_clients
- # (smaller than 1 is not very useful)
--#mapi_clients=2
-+mapi_clients=10
- 
- # SQL Interface Section
- #======================
diff --git a/dev-db/monetdb/files/monetdb-4.12.0-startup.mil b/dev-db/monetdb/files/monetdb-4.12.0-startup.mil
deleted file mode 100644
index 40a21283adbe..000000000000
--- a/dev-db/monetdb/files/monetdb-4.12.0-startup.mil
+++ /dev/null
@@ -1,25 +0,0 @@
-# Gentoo MonetDB startup.mil script -- Fabian Groffen grobian@gentoo.org
-#
-# This script starts the SQL, XQuery and Mapi modules and activates a
-# listening socket for all of them on their default port.  This results
-# in three ports of your system being occupied.  By default the ports
-# are as follows:
-# SQL server:    45123
-# XQuery server: 45789
-# Mapi server:   50000
-
-# should connections be bound to localhost or 0.0.0.0?  Set to true here
-# to allow foreign connections.  Defaults to false (only local).
-var allow_foreign_connections := false;
-
-#
-# If were only looking for whatever you could change, you can stop
-# reading at this point and save your changes.  Don't change anything
-# below if you don't know what you're doing.
-#
-
-module(sql_server);
-module(pathfinder);
-mapi_start(allow_foreign_connections);
-mapi_register(sql_frontend());
-mapi_register(xquery_frontend());
diff --git a/dev-db/monetdb/files/monetdb-4.8.2-startup.mil b/dev-db/monetdb/files/monetdb-4.8.2-startup.mil
deleted file mode 100644
index 4698229c174d..000000000000
--- a/dev-db/monetdb/files/monetdb-4.8.2-startup.mil
+++ /dev/null
@@ -1,28 +0,0 @@
-# Gentoo MonetDB startup.mil script -- Fabian Groffen grobian@gentoo.org
-#
-# This script starts the SQL, XQuery and Mapi modules and activates a
-# listening socket for all of them on their default port.  This results
-# in three ports of your system being occupied.  By default the ports
-# are as follows:
-# SQL server:    45123
-# XQuery server: 45789
-# Mapi server:   50000
-
-# should connections be bound to localhost or 0.0.0.0?  Set to true here
-# to allow foreign connections.  Defaults to false (only local).
-var allow_foreign_connections := false;
-
-#
-# If were only looking for whatever you could change, you can stop
-# reading at this point and save your changes.  Don't change anything
-# below if you don't know what you're doing.
-#
-
-module(sql_server);
-sql_server_start(allow_foreign_connections);
-
-module(pathfinder);
-xquery_server_start(allow_foreign_connections);
-
-module(mapi);
-mapi_start(allow_foreign_connections);
diff --git a/dev-db/monetdb/files/monetdb-start.sh b/dev-db/monetdb/files/monetdb-start.sh
deleted file mode 100644
index d9f25ad106c4..000000000000
--- a/dev-db/monetdb/files/monetdb-start.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh
-
-LOG=/var/log/monetdb/Mserver.log
-echo `date` Starting MonetDB >> $LOG
-/usr/bin/Mserver $@ >> $LOG 2>&1 &
-MPID=$!
-echo `date` Mserver started, PID: $MPID >> $LOG
-rm -f ~monetdb/Mserver.pid > /dev/null
-sleep 2
-ALIVE=`ps --no-heading --format pid -p $MPID | sed 's- --'`
-if [ "$ALIVE" = "$MPID" ]; then
-	echo $MPID > ~monetdb/Mserver.pid
-else
-	echo Mserver died immediately
-	exit -1
-fi
diff --git a/dev-db/monetdb/files/monetdb-stop.sh b/dev-db/monetdb/files/monetdb-stop.sh
deleted file mode 100644
index aa562e814f98..000000000000
--- a/dev-db/monetdb/files/monetdb-stop.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh
-
-LOG=/var/log/monetdb/Mserver.log
-if [ -f ~monetdb/Mserver.pid ]; then
-	MPID=`cat ~monetdb/Mserver.pid`
-else
-	echo "No Mserver PID found"
-	exit -1
-fi
-
-echo `date` Stopping MonetDB \(PID: $MPID\) >> $LOG
-kill -TERM $MPID || exit -1
-sleep 1
-ALIVE=`ps --no-heading --format pid -p $MPID`
-if [ "$ALIVE" = "$MPID" ]; then
-	echo Mserver still alive after TERM, trying KILL... >> $LOG
-	kill -KILL $MPID
-	sleep 2
-	ALIVE=`ps --no-heading --format pid -p $MPID`
-	if [ "$ALIVE" = "$MPID" ]; then
-		echo "Failed to stop process $MPID"
-		exit -1
-	fi
-fi
-echo `date` Mserver stopped >> $LOG
-rm -f ~monetdb/Mserver.pid > /dev/null
diff --git a/dev-db/monetdb/files/monetdb.JdbcClient-4.10.0 b/dev-db/monetdb/files/monetdb.JdbcClient-4.10.0
deleted file mode 100644
index 22ba9a3836a8..000000000000
--- a/dev-db/monetdb/files/monetdb.JdbcClient-4.10.0
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-java -jar /usr/share/MonetDB/lib/jdbcclient-1.3.jar $*
diff --git a/dev-db/monetdb/files/monetdb.conf-4.8.2 b/dev-db/monetdb/files/monetdb.conf-4.8.2
deleted file mode 100644
index cfc4abd12099..000000000000
--- a/dev-db/monetdb/files/monetdb.conf-4.8.2
+++ /dev/null
@@ -1,15 +0,0 @@
-# The user to run the MonetDB database as.  It is recommended to
-# leave this as is, portage created this user during installation
-MDB_USER=monetdb
-MDB_GROUP=monetdb
-
-# MonetDB must be started with a startup script which tells it what
-# to do.  Most users will not want to change this startup script
-# as it loads the SQL, XQuery (pathfinder) and Mapi modules which
-# allow for SQL, XQuery and MIL connections.
-# If you have special demands, point this variable to your own script
-# which contains the desired commands.
-# Note: for security reasons by default all listening connections are
-# bound to 127.0.0.1.  If you need connections to be bound at 0.0.0.0
-# have a look at the default startup script to enable this.
-MDB_STARTUPSCRIPTS=~monetdb/monetdb-startup.mil
diff --git a/dev-db/monetdb/files/monetdb.conf-5.2.0 b/dev-db/monetdb/files/monetdb.conf-5.2.0
new file mode 100644
index 000000000000..32096a25e772
--- /dev/null
+++ b/dev-db/monetdb/files/monetdb.conf-5.2.0
@@ -0,0 +1,7 @@
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/monetdb/files/monetdb.conf-5.2.0,v 1.1 2007/11/06 10:44:07 grobian Exp $
+
+# The user to run the MonetDB database as.  It is recommended to
+# leave this as is, portage created this user during installation
+MDB_USER=monetdb
+MDB_GROUP=monetdb
diff --git a/dev-db/monetdb/files/monetdb.init-4.8.2 b/dev-db/monetdb/files/monetdb.init-4.8.2
deleted file mode 100644
index 5b58a8bcc4e5..000000000000
--- a/dev-db/monetdb/files/monetdb.init-4.8.2
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	use net
-}
-
-start() {
-	ebegin "Starting MonetDB"
-	start-stop-daemon -c $MDB_USER:$MDB_GROUP --start --exec ~monetdb/monetdb-start.sh -- $MDB_STARTUPSCRIPTS
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping MonetDB"
-	start-stop-daemon -c $MDB_USER:$MDB_GROUP --start --exec ~monetdb/monetdb-stop.sh
-	eend $?
-}
diff --git a/dev-db/monetdb/files/monetdb.init-5.2.0 b/dev-db/monetdb/files/monetdb.init-5.2.0
new file mode 100644
index 000000000000..df816bdd711d
--- /dev/null
+++ b/dev-db/monetdb/files/monetdb.init-5.2.0
@@ -0,0 +1,28 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/monetdb/files/monetdb.init-5.2.0,v 1.1 2007/11/06 10:44:07 grobian Exp $
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting MonetDB/SQL"
+	# -b can go away next release, hopefully, see:
+	# http://sourceforge.net/tracker/index.php?func=detail&aid=1825922&group_id=56967&atid=482471
+	start-stop-daemon --start \
+		-c $MDB_USER:$MDB_GROUP \
+		-b \
+		-m -p /var/run/merovingian \
+		--exec /usr/bin/merovingian
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping MonetDB/SQL"
+	start-stop-daemon --stop \
+		-c $MDB_USER:$MDB_GROUP \
+		-p /var/run/merovingian \
+		--exec /usr/bin/merovingian
+	eend $?
+}
diff --git a/dev-db/monetdb/files/monetdb_config.sh b/dev-db/monetdb/files/monetdb_config.sh
deleted file mode 100644
index eab7f36cc5f5..000000000000
--- a/dev-db/monetdb/files/monetdb_config.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh
-
-MYINCLUDES="-I$_MONETDB_INCLUDEDIR \
-			-I$_MONETDB_INCLUDEDIR/common \
-			-I$_MONETDB_INCLUDEDIR/gdk \
-			-I$_MONETDB_INCLUDEDIR/monet \
-			-I$_MONETDB_INCLUDEDIR/plain \
-			-I$_MONETDB_INCLUDEDIR/contrib \
-			-I$_MONETDB_INCLUDEDIR/mapi \
-			-I$_MONETDB_INCLUDEDIR/C"
-
-case $1 in
-	--version )	echo $_MONETDB_VERSION; break;;
-	--cflags )	echo $MYINCLUDES; break;;
-	--includes )	echo $MYINCLUDES; break;;
-	--pkgincludedir )	echo $_MONETDB_INCLUDEDIR; break;;
-	--libs )	echo $_MONETDB_LIBS; break;;
-	--modpath )	echo $_MONETDB_MOD_PATH; break;;
-	--prefix )	echo $_MONETDB_PREFIX; break;;
-	--classpath )	echo $_MONETDB_CLASSPATH; break;;
-esac
diff --git a/dev-db/monetdb/files/xquery-0.20.0-bool-undeclared.patch b/dev-db/monetdb/files/xquery-0.20.0-bool-undeclared.patch
new file mode 100644
index 000000000000..c6d47bcc1b68
--- /dev/null
+++ b/dev-db/monetdb/files/xquery-0.20.0-bool-undeclared.patch
@@ -0,0 +1,21 @@
+* <grobian@gentoo.org>: upstream has a better/different fix, but it
+                        involves a lot more patching as much more has
+						changed since the release
+
+--- pathfinder-0.20.0/compiler/include/qname.h
++++ pathfinder-0.20.0/compiler/include/qname.h
+@@ -38,6 +38,14 @@
+ 
+ /* PFns_t */
+ #include "ns.h"
++/* boolean type `bool' and constants `true', `false' */
++#ifdef HAVE_STDBOOL_H
++#include <stdbool.h>
++#elif !defined(HAVE_BOOL)
++#define bool    char
++#define true    (char)1
++#define false   (char)0
++#endif
+ 
+ typedef unsigned int PFqname_t ;
+ 
diff --git a/dev-db/monetdb/metadata.xml b/dev-db/monetdb/metadata.xml
index d242c945a7ce..fdbfc564d418 100644
--- a/dev-db/monetdb/metadata.xml
+++ b/dev-db/monetdb/metadata.xml
@@ -4,17 +4,13 @@
 	<herd>no-herd</herd>
 	<maintainer>
 		<email>grobian@gentoo.org</email>
-		<name>Fabian Groffen</name>
 	</maintainer>
 	<longdescription>
-		MonetDB is a main-memory database developed at CWI the
+		MonetDB is a main-memory database developed at CWI, the
 		Netherlands.  The main-memory focus of the database has resulted
 		in a column based way of dealing with relational tables.  Due to
 		this unconventional approach, MonetDB can be a very fast
 		database for complex queries, and as such in use (and perfectly
 		suitable) for intensive data-mining tasks.
-		MonetDB 4 supports its own kernel language, MIL, the
-		conventional SQL query language and the relatively new XML
-		querying language, XQuery.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-db/monetdb/monetdb-4.10.2.ebuild b/dev-db/monetdb/monetdb-4.10.2.ebuild
deleted file mode 100644
index ba75cc844d29..000000000000
--- a/dev-db/monetdb/monetdb-4.10.2.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/monetdb/monetdb-4.10.2.ebuild,v 1.9 2007/04/28 22:07:02 tove Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="A main-memory relational database for SQL, XQuery and MIL"
-HOMEPAGE="http://monetdb.cwi.nl/"
-IUSE="java readline debug"
-PV_SQL=2.10.2
-PV_XQ=0.10.2
-PV_M=${PV}
-SRC_URI="mirror://sourceforge/monetdb/MonetDB-${PV_M}.tar.gz
-	mirror://sourceforge/monetdb/MonetDB-SQL-${PV_SQL}.tar.gz
-	mirror://sourceforge/monetdb/MonetDB-XQuery-${PV_XQ}.tar.gz"
-LICENSE="MonetDBPL-1.1 PathfinderPL-1.1"
-SLOT="0"
-KEYWORDS="ppc x86"
-RESTRICT="test"
-
-DEPEND="virtual/libc
-		>=sys-devel/gcc-3.3
-		java? ( >=virtual/jdk-1.4 )
-		java? ( dev-java/ant-core )
-		readline? ( >=sys-libs/readline-4.1 )
-		dev-libs/libxml2
-		>=dev-libs/libpcre-5"
-
-DATA_DIR="/var/lib/MonetDB"
-
-pkg_setup() {
-	# see if we have a dbfarm, and whether there is a version of monetdb
-	# installed which is not a version that we can 'upgrade' to.
-	if [ -x "${DATA_DIR}/dbfarm" ] || [ -x "${DATA_DIR}/log" ];
-	then
-		if [ -x "/usr/bin/monetdb-config" ] && \
-			[ "`/usr/bin/monetdb-config --version`" != "${PV_M}" ];
-		then
-			while read line; do eerror "${line}"; done <<EOF
-MonetDB ${MY_PV} cannot upgrade your existing SQL databases.  You must
-export your existing SQL databases to a file using "JdbcClient -D" and
-then restore them when you have upgraded completey using
-"JdbcClient -f".  Dumping and restoring of MIL and XQuery databases
-unfortunately is not possible at the moment.
-
-You must remove your entire database directory to continue.
-(database directory = ${DATA_DIR}).
-See the following url for more information on dumping and
-restoring your database:
-http://monetdb.cwi.nl/TechDocs/FrontEnds/SQL/upgrade/
-EOF
-			die "Cannot upgrade automatically."
-		fi
-	fi
-
-	enewgroup monetdb
-	enewuser monetdb -1 /bin/bash "${DATA_DIR}" monetdb
-}
-
-src_unpack() {
-	unpack ${A} || die
-
-	epatch "${FILESDIR}/${PN}-${PV_M}"-gentoo-MapiClient.patch
-	epatch "${FILESDIR}/${PN}-${PV_M}"-gentoo-conf.patch
-}
-
-src_compile() {
-	# The tar has capitals, the ebuild doesn't...
-	cd "${WORKDIR}/MonetDB-${PV_M}"
-
-	# setting these respects the user's CFLAGS and disables -Werror etc.
-	local myconf="--disable-optimize --disable-debug"
-	sed -i \
-		-e 's|CFLAGS="\$CFLAGS \\\$(X_CFLAGS)"||' \
-		configure || die "failed fixing configure"
-
-	# Gentoo's amd64 doesn't allow 32-bits monetdb to compile, hence we switch
-	# to 64-bits Mserver here.  Note that this also gives 64-bits OIDs.
-	use amd64 && myconf="${myconf} --enable-bits=64"
-
-	myconf="${myconf} $(use_with java)"
-	myconf="${myconf} $(use_with readline)"
-	myconf="${myconf} $(use_enable debug assert)"
-
-	econf ${myconf} || die "econf monetdb failed"
-
-	# NOTE: the Makefiles have serious issues with parallel builds.
-	# Nothing is guaranteed to work but a single process build.
-	emake -j1 || die "emake monetdb failed"
-
-	# make the header files available to the sql and xquery compilation
-	mkdir include
-	cd include
-	ln -s ../src/common
-	ln -s ../src/gdk
-	ln -s ../src/monet
-	ln -s ../src/modules/plain
-	ln -s ../src/modules/contrib
-	ln -s ../src/mapi
-	ln -s ../src/mapi/clients/C
-	ln -s ../monetdb_config.h
-	ln -s ../sysdefs.h
-
-	cd "${WORKDIR}/MonetDB-${PV_M}"
-	mkdir -p lib/MonetDB
-	cd lib/MonetDB
-	find ../.. -name "lib_*" -exec ln -s {} ';' >& /dev/null
-	ln -s . .libs
-
-	cd "${WORKDIR}/MonetDB-${PV_M}/lib"
-	find .. -name "lib*" -exec ln -s {} ';' >& /dev/null
-	ln -s . .libs
-
-	# enable the fool-script
-	mkdir -p "${WORKDIR}/MonetDB-${PV_M}/bin"
-	MYWD=`echo ${WORKDIR} | sed -re 's/\//\\\\\//g'`
-	sed -r \
-		-e "s/\\$\_MONETDB\_INCLUDEDIR/${MYWD}\/MonetDB-${PV_M}\/include/g" \
-		-e "s/\\$\_MONETDB\_VERSION/${PV_M}/g" \
-		-e "s/\\$\_MONETDB\_LIBS/-L${MYWD}\/MonetDB-${PV_M}\/lib\/MonetDB -L${MYWD}\/MonetDB-${PV_M}\/lib/g" \
-		-e "s/\\$\_MONETDB\_MOD_PATH/${MYWD}\/MonetDB-${PV_M}\/include/g" \
-		-e "s/\\$\_MONETDB\_PREFIX/${MYWD}\/MonetDB-${PV_M}/g" \
-		-e "s/\\$\_MONETDB\_CLASSPATH/${MYWD}\/MonetDB-${PV_M}\/src\/mapi\/clients\/java\/mapi.jar/g" \
-		"${FILESDIR}/monetdb_config.sh" > \
-			"${WORKDIR}/MonetDB-${PV_M}/bin/monetdb-config"
-	chmod 744 "${WORKDIR}/MonetDB-${PV_M}/bin/monetdb-config"
-
-	# configure and make SQL
-	cd "${WORKDIR}/sql-${PV_SQL}"
-	econf MONETDB_CONFIG="${WORKDIR}/MonetDB-${PV_M}/bin/monetdb-config" \
-		"--with-monet=${WORKDIR}/MonetDB-${PV_M}" \
-		${myconf} \
-		|| die
-	emake -j1 || die "emake sql failed"
-
-	# configure and make XQuery
-	cd "${WORKDIR}/pathfinder-${PV_XQ}"
-	econf MONETDB_CONFIG="${WORKDIR}/MonetDB-${PV_M}/bin/monetdb-config" \
-		"--with-monet=${WORKDIR}/MonetDB-${PV_M} " \
-		${myconf} || die
-	emake -j1 || die "emake xquery failed"
-}
-
-src_install() {
-	# The tar has capitals, the ebuild doesn't...
-	cd "${WORKDIR}/MonetDB-${PV_M}"
-	emake -j1 DESTDIR="${D}" install || die "failed to install monetdb"
-
-	cd "${WORKDIR}/sql-${PV_SQL}"
-	emake -j1 DESTDIR="${D}" install || die "failed to install sql"
-
-	cd "${WORKDIR}/pathfinder-${PV_XQ}"
-	emake -j1 DESTDIR="${D}" install || die "failed to install xquery"
-
-	newinitd "${FILESDIR}/${PN}.init-4.8.2" monetdb || die "init.d script"
-	newconfd "${FILESDIR}/${PN}.conf-4.8.2" monetdb || die "conf.d file"
-
-	diropts -m750
-	dodir "${DATA_DIR}" "/var/log/${PN}"
-
-	exeinto "${DATA_DIR}"
-	newexe "${FILESDIR}/${PN}-start.sh" "${PN}-start.sh" || die "start script"
-	newexe "${FILESDIR}/${PN}-stop.sh" "${PN}-stop.sh" || die "stop script"
-
-	insinto "${DATA_DIR}"
-	newins "${FILESDIR}/${PN}-4.8.2-startup.mil" "${PN}-startup.mil" \
-		|| die "startup MIL script"
-
-	if use java;
-	then
-		exeinto /usr/bin
-		newexe "${FILESDIR}/${PN}.JdbcClient-4.10.0" "JdbcClient" \
-			|| die "JdbcClient alias"
-	fi
-
-	# set right permissions
-	chown -R monetdb:monetdb "${D}/${DATA_DIR}" \
-		|| die "setting ownership on ${DATA_DIR} failed"
-	fowners monetdb:monetdb "/var/log/${PN}" \
-		|| die "setting ownership on /var/log/${PN} failed"
-
-	# remove testing framework and compiled tests
-	rm -f \
-		"${D}/usr/bin/Mapprove.py" \
-		"${D}/usr/bin/Mdiff" \
-		"${D}/usr/bin/Mfilter.py" \
-		"${D}/usr/bin/MkillUsers" \
-		"${D}/usr/bin/Mlog" \
-		"${D}/usr/bin/Mprofile.py" \
-		"${D}/usr/bin/Mtest.py" \
-		"${D}/usr/bin/Mtimeout" \
-		"${D}/usr/bin/prof.py" \
-		"${D}/usr/share/MonetDB/Mprofile-commands.lst" \
-		|| die "removing testing tools"
-	rm -Rf \
-		"${D}/usr/lib/MonetDB/Tests" \
-		"${D}/usr/lib/sql/Tests" \
-		"${D}/usr/share/MonetDB/Tests" \
-		"${D}/usr/share/sql/Tests" \
-		|| die "removing tests"
-	# remove pf_burk, upstream only compiles it, but doesn't use it
-	rm -f \
-		"${D}/usr/lib/MonetDB/pf_burk.mil" \
-		"${D}/usr/lib/MonetDB/lib_pf_burk.so.0.0.0" \
-		"${D}/usr/lib/MonetDB/lib_pf_burk.so.0" \
-		"${D}/usr/lib/MonetDB/lib_pf_burk.so" \
-		"${D}/usr/lib/MonetDB/lib_pf_burk.la" \
-		|| die "removing incomplete Burkowski step support"
-	# remove windows cruft
-	find "${D}" -name "*.bat" | xargs rm -f || die "removing windows stuff"
-}
-
-src_test() {
-	# Upstream has tests that work in their "lab-setting".  They prefer to wait
-	# using it when they provide a set of tests that is meant to be used
-	# outside their "labs".  Those tests will also be supposed not to fail...
-	true
-}
-
-pkg_postinst() {
-	while read line; do elog "${line}"; done <<EOF
-MonetDB has been installed on your system, using data directory
-${DATA_DIR}.
-To get started using SQL, XQuery or MIL see:
-
-http://monetdb.cwi.nl/GettingStarted/
-EOF
-}
diff --git a/dev-db/monetdb/monetdb-4.12.0.ebuild b/dev-db/monetdb/monetdb-4.12.0.ebuild
deleted file mode 100644
index 9a07524ca677..000000000000
--- a/dev-db/monetdb/monetdb-4.12.0.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/monetdb/monetdb-4.12.0.ebuild,v 1.5 2007/04/28 22:07:02 tove Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="A main-memory relational database for SQL, XQuery and MIL"
-HOMEPAGE="http://monetdb.cwi.nl/"
-IUSE="java readline debug"
-PV_SQL=${PV/4./2.}
-PV_XQ=${PV/4./0.}
-PV_M=${PV}
-SRC_URI="mirror://sourceforge/monetdb/MonetDB-${PV_M}.tar.gz
-	mirror://sourceforge/monetdb/MonetDB-SQL-${PV_SQL}.tar.gz
-	mirror://sourceforge/monetdb/MonetDB-XQuery-${PV_XQ}.tar.gz"
-LICENSE="MonetDBPL-1.1 PathfinderPL-1.1"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-RESTRICT="test"
-
-DEPEND="virtual/libc
-		>=sys-devel/gcc-3.3
-		java? ( >=virtual/jdk-1.4 )
-		java? ( dev-java/ant-core )
-		readline? ( >=sys-libs/readline-4.1 )
-		dev-libs/libxml2
-		>=dev-libs/libpcre-5"
-
-DATA_DIR="/var/lib/MonetDB"
-
-pkg_setup() {
-	# see if we have a dbfarm, and whether there is a version of monetdb
-	# installed which is not a version that we can 'upgrade' to.
-	if [ -x "${DATA_DIR}/dbfarm" ] || [ -x "${DATA_DIR}/log" ];
-	then
-		if [ -x "/usr/bin/monetdb-config" ] && \
-			[ "`/usr/bin/monetdb-config --version`" != "${PV_M}" ];
-		then
-			while read line; do eerror "${line}"; done <<EOF
-MonetDB ${MY_PV} cannot upgrade your existing SQL databases.  You must
-export your existing SQL databases to a file using "JdbcClient -D" and
-then restore them when you have upgraded completey using
-"JdbcClient -f".  Dumping and restoring of MIL and XQuery databases
-unfortunately is not possible at the moment.
-
-You must remove your entire database directory to continue.
-(database directory = ${DATA_DIR}).
-See the following url for more information on dumping and
-restoring your database:
-http://monetdb.cwi.nl/TechDocs/FrontEnds/SQL/upgrade/
-EOF
-			die "Cannot upgrade automatically."
-		fi
-	fi
-
-	enewgroup monetdb
-	enewuser monetdb -1 /bin/bash "${DATA_DIR}" monetdb
-}
-
-src_unpack() {
-	unpack ${A} || die
-
-	epatch "${FILESDIR}/${PN}-${PV_M}"-gentoo-MapiClient.patch
-	epatch "${FILESDIR}/${PN}-${PV_M}"-gentoo-conf.patch
-}
-
-src_compile() {
-	# The tar has capitals, the ebuild doesn't...
-	cd "${WORKDIR}/MonetDB-${PV_M}"
-
-	# setting these respects the user's CFLAGS and disables -Werror etc.
-	local myconf="--disable-optimize --disable-debug"
-	sed -i \
-		-e 's|CFLAGS="\$CFLAGS \\\$(X_CFLAGS)"||' \
-		configure || die "failed fixing configure"
-
-	# Gentoo's amd64 doesn't allow 32-bits monetdb to compile, hence we switch
-	# to 64-bits Mserver here.  Note that this also gives 64-bits OIDs.
-	use amd64 && myconf="${myconf} --enable-bits=64"
-
-	myconf="${myconf} $(use_with java)"
-	myconf="${myconf} $(use_with readline)"
-	myconf="${myconf} $(use_enable debug assert)"
-
-	econf ${myconf} || die "econf monetdb failed"
-
-	# NOTE: the Makefiles have serious issues with parallel builds.
-	# Nothing is guaranteed to work but a single process build.
-	emake -j1 || die "emake monetdb failed"
-
-	# make the header files available to the sql and xquery compilation
-	mkdir include
-	cd include
-	ln -s ../src/common
-	ln -s ../src/gdk
-	ln -s ../src/monet
-	ln -s ../src/modules/plain
-	ln -s ../src/modules/contrib
-	ln -s ../src/mapi
-	ln -s ../src/mapi/clients/C
-	ln -s ../monetdb_config.h
-	ln -s ../sysdefs.h
-
-	cd "${WORKDIR}/MonetDB-${PV_M}"
-	mkdir -p lib/MonetDB
-	cd lib/MonetDB
-	find ../.. -name "lib_*" -exec ln -s {} ';' >& /dev/null
-	ln -s . .libs
-
-	cd "${WORKDIR}/MonetDB-${PV_M}/lib"
-	find .. -name "lib*" -exec ln -s {} ';' >& /dev/null
-	ln -s . .libs
-
-	# enable the fool-script
-	mkdir -p "${WORKDIR}/MonetDB-${PV_M}/bin"
-	MYWD=`echo ${WORKDIR} | sed -re 's/\//\\\\\//g'`
-	sed -r \
-		-e "s/\\$\_MONETDB\_INCLUDEDIR/${MYWD}\/MonetDB-${PV_M}\/include/g" \
-		-e "s/\\$\_MONETDB\_VERSION/${PV_M}/g" \
-		-e "s/\\$\_MONETDB\_LIBS/-L${MYWD}\/MonetDB-${PV_M}\/lib\/MonetDB -L${MYWD}\/MonetDB-${PV_M}\/lib/g" \
-		-e "s/\\$\_MONETDB\_MOD_PATH/${MYWD}\/MonetDB-${PV_M}\/include/g" \
-		-e "s/\\$\_MONETDB\_PREFIX/${MYWD}\/MonetDB-${PV_M}/g" \
-		-e "s/\\$\_MONETDB\_CLASSPATH/${MYWD}\/MonetDB-${PV_M}\/src\/mapi\/clients\/java\/mapi.jar/g" \
-		"${FILESDIR}/monetdb_config.sh" > \
-			"${WORKDIR}/MonetDB-${PV_M}/bin/monetdb-config"
-	chmod 744 "${WORKDIR}/MonetDB-${PV_M}/bin/monetdb-config"
-
-	# configure and make SQL
-	cd "${WORKDIR}/sql-${PV_SQL}"
-	econf MONETDB_CONFIG="${WORKDIR}/MonetDB-${PV_M}/bin/monetdb-config" \
-		"--with-monet=${WORKDIR}/MonetDB-${PV_M}" \
-		${myconf} \
-		|| die
-	emake -j1 || die "emake sql failed"
-
-	# configure and make XQuery
-	cd "${WORKDIR}/pathfinder-${PV_XQ}"
-	econf MONETDB_CONFIG="${WORKDIR}/MonetDB-${PV_M}/bin/monetdb-config" \
-		"--with-monet=${WORKDIR}/MonetDB-${PV_M} " \
-		${myconf} || die
-	emake -j1 || die "emake xquery failed"
-}
-
-src_install() {
-	# The tar has capitals, the ebuild doesn't...
-	cd "${WORKDIR}/MonetDB-${PV_M}"
-	emake -j1 DESTDIR="${D}" install || die "failed to install monetdb"
-
-	cd "${WORKDIR}/sql-${PV_SQL}"
-	emake -j1 DESTDIR="${D}" install || die "failed to install sql"
-
-	cd "${WORKDIR}/pathfinder-${PV_XQ}"
-	emake -j1 DESTDIR="${D}" install || die "failed to install xquery"
-
-	newinitd "${FILESDIR}/${PN}.init-4.8.2" monetdb || die "init.d script"
-	newconfd "${FILESDIR}/${PN}.conf-4.8.2" monetdb || die "conf.d file"
-
-	diropts -m750
-	dodir "${DATA_DIR}" "/var/log/${PN}"
-
-	exeinto "${DATA_DIR}"
-	newexe "${FILESDIR}/${PN}-start.sh" "${PN}-start.sh" || die "start script"
-	newexe "${FILESDIR}/${PN}-stop.sh" "${PN}-stop.sh" || die "stop script"
-
-	insinto "${DATA_DIR}"
-	newins "${FILESDIR}/${PN}-${PV_M}-startup.mil" "${PN}-startup.mil" \
-		|| die "startup MIL script"
-
-	if use java;
-	then
-		exeinto /usr/bin
-		newexe "${FILESDIR}/${PN}.JdbcClient-4.10.0" "JdbcClient" \
-			|| die "JdbcClient alias"
-	fi
-
-	# set right permissions
-	chown -R monetdb:monetdb "${D}/${DATA_DIR}" \
-		|| die "setting ownership on ${DATA_DIR} failed"
-	fowners monetdb:monetdb "/var/log/${PN}" \
-		|| die "setting ownership on /var/log/${PN} failed"
-
-	# remove testing framework and compiled tests
-	rm -f \
-		"${D}/usr/bin/Mapprove.py" \
-		"${D}/usr/bin/Mdiff" \
-		"${D}/usr/bin/Mfilter.py" \
-		"${D}/usr/bin/MkillUsers" \
-		"${D}/usr/bin/Mlog" \
-		"${D}/usr/bin/Mprofile.py" \
-		"${D}/usr/bin/Mtest.py" \
-		"${D}/usr/bin/Mtimeout" \
-		"${D}/usr/bin/prof.py" \
-		"${D}/usr/share/MonetDB/Mprofile-commands.lst" \
-		|| die "removing testing tools"
-	rm -Rf \
-		"${D}/usr/lib/MonetDB/Tests" \
-		"${D}/usr/lib/sql/Tests" \
-		"${D}/usr/share/MonetDB/Tests" \
-		"${D}/usr/share/sql/Tests" \
-		|| die "removing tests"
-	# remove windows cruft
-	find "${D}" -name "*.bat" | xargs rm -f || die "removing windows stuff"
-}
-
-src_test() {
-	# Upstream has tests that work in their "lab-setting".  They prefer to wait
-	# using it when they provide a set of tests that is meant to be used
-	# outside their "labs".  Those tests will also be supposed not to fail...
-	true
-}
-
-pkg_postinst() {
-	while read line; do elog "${line}"; done <<EOF
-MonetDB has been installed on your system, using data directory
-${DATA_DIR}.
-To get started using SQL, XQuery or MIL see:
-
-http://monetdb.cwi.nl/GettingStarted/
-EOF
-}
diff --git a/dev-db/monetdb/monetdb-4.20.0.ebuild b/dev-db/monetdb/monetdb-4.20.0.ebuild
new file mode 100644
index 000000000000..b4e04a24451b
--- /dev/null
+++ b/dev-db/monetdb/monetdb-4.20.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/monetdb/monetdb-4.20.0.ebuild,v 1.1 2007/11/06 10:44:06 grobian Exp $
+
+inherit eutils flag-o-matic
+
+M4_PV=4.20.0
+XQ_PV=0.20.0
+
+DESCRIPTION="MonetDB/SQL is a main-memory column-store database"
+HOMEPAGE="http://monetdb.cwi.nl/"
+SRC_URI="mirror://sourceforge/monetdb/MonetDB4-${M4_PV}.tar.gz
+	mirror://sourceforge/monetdb/pathfinder-${XQ_PV}.tar.gz"
+
+LICENSE="MonetDBPL-1.1 PathfinderPL-1.1"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="java boehmgc"
+
+S=${WORKDIR}
+
+DEPEND="dev-libs/libpcre
+	dev-libs/openssl
+	sys-libs/readline
+	dev-libs/libxml2
+	java? ( dev-java/ant >=virtual/jdk-1.5 )
+	boehmgc? ( dev-libs/boehm-gc )
+	>=dev-db/monetdb-5"
+RDEPEND="${DEPEND}"
+
+pkg_preinst() {
+	# should already exist, but for completeness here
+	enewgroup monetdb
+	enewuser monetdb
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/xquery-0.20.0-bool-undeclared.patch
+}
+
+src_compile() {
+	local myconf=
+	# Upstream likes to stick things like -O6 and what more in CFLAGS
+	myconf="${myconf} --disable-strict --disable-optimize --disable-assert"
+	myconf="${myconf} $(use_with java)"
+	myconf="${myconf} --without-php"
+	myconf="${myconf} $(use_with boehmgc gc)"
+
+	cd "${S}"/MonetDB4-${M4_PV} || die
+	econf --with-monetdb="${EPREFIX}" ${myconf} || die
+	emake || die "MonetDB4"
+
+	mkdir "${T}"/bin
+	cp conf/monetdb4-config "${T}"/bin/monetdb4-config
+	chmod 755 "${T}"/bin/monetdb4-config
+
+	append-flags -I"${S}"/MonetDB4-${M4_PV}
+	append-flags -I"${S}"/MonetDB4-${M4_PV}/src/monet
+	append-ldflags -L"${S}"/MonetDB4-${M4_PV}/src/monet/.libs
+	append-flags -I"${S}"/MonetDB4-${M4_PV}/src
+	append-ldflags -L"${S}"/MonetDB4-${M4_PV}/src/mapi/.libs
+	append-flags -I"${S}"/MonetDB4-${M4_PV}/src/modules/plain
+	append-ldflags -L"${S}"/MonetDB4-${M4_PV}/src/modules/plain/.libs
+	append-flags -I"${S}"/MonetDB4-${M4_PV}/src/modules/contrib
+	append-ldflags -L"${S}"/MonetDB4-${M4_PV}/src/modules/contrib/.libs
+	cd "${S}"/pathfinder-${XQ_PV} || die
+	econf --with-monetdb="${EPREFIX}" --with-monetdb4="${T}" ${myconf} || die
+	emake || die "xquery"
+}
+
+src_install() {
+	cd "${S}"/MonetDB4-${M4_PV} || die
+	emake DESTDIR="${D}" install || die "MonetDB4"
+
+	cd "${S}"/pathfinder-${XQ_PV} || die
+	emake DESTDIR="${D}" install || die "xquery"
+
+	# remove windows cruft
+	find "${D}" -name "*.bat" | xargs rm -f || die "removing windows stuff"
+}
diff --git a/dev-db/monetdb/monetdb-5.2.0.ebuild b/dev-db/monetdb/monetdb-5.2.0.ebuild
new file mode 100644
index 000000000000..7071905e9e80
--- /dev/null
+++ b/dev-db/monetdb/monetdb-5.2.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/monetdb/monetdb-5.2.0.ebuild,v 1.1 2007/11/06 10:44:06 grobian Exp $
+
+inherit flag-o-matic
+
+COMMON_PV=1.20.0
+CLIENTS_PV=1.20.0
+M5_PV=5.2.0
+SQL_PV=2.20.0
+
+DESCRIPTION="MonetDB/SQL is a main-memory column-store database"
+HOMEPAGE="http://monetdb.cwi.nl/"
+SRC_URI="mirror://sourceforge/monetdb/MonetDB-${COMMON_PV}.tar.gz
+	mirror://sourceforge/monetdb/clients-${CLIENTS_PV}.tar.gz
+	mirror://sourceforge/monetdb/MonetDB5-${M5_PV}.tar.gz
+	mirror://sourceforge/monetdb/sql-${SQL_PV}.tar.gz"
+
+LICENSE="MonetDBPL-1.1"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="python perl php java"
+
+S=${WORKDIR}
+
+DEPEND="dev-libs/libpcre
+	dev-libs/openssl
+	sys-libs/readline
+	python? ( dev-lang/python )
+	perl? ( dev-lang/perl )
+	php? ( dev-lang/php )
+	java? ( dev-java/ant >=virtual/jdk-1.4 <=virtual/jdk-1.6 )"
+RDEPEND="${DEPEND}"
+
+pkg_preinst() {
+	enewgroup monetdb
+	enewuser monetdb
+}
+
+src_compile() {
+	local myconf=
+	# Upstream likes to stick things like -O6 and what more in CFLAGS
+	myconf="${myconf} --disable-strict --disable-optimize --disable-assert"
+	# Deal with auto-dependencies
+	myconf="${myconf} $(use_with python)"
+	myconf="${myconf} $(use_with perl)"
+	myconf="${myconf} $(use_with php)"
+	myconf="${myconf} $(use_with java)"
+
+	cd "${S}"/MonetDB-${COMMON_PV} || die
+	econf ${myconf} || die
+	emake || die "common"
+
+	mkdir "${T}"/bin
+	cp conf/monetdb-config "${T}"/bin/monetdb-config
+	chmod 755 "${T}"/bin/monetdb-config
+
+	append-flags -I"${S}"/MonetDB-${COMMON_PV}/src/common
+	append-ldflags -L"${S}"/MonetDB-${COMMON_PV}/src/common/.libs
+	cd "${S}"/clients-${CLIENTS_PV} || die
+	econf --with-monetdb="${T}" ${myconf} || die
+	emake || die "clients"
+
+	append-flags -I"${S}"/MonetDB-${COMMON_PV}/src/gdk
+	append-ldflags -L"${S}"/MonetDB-${COMMON_PV}/src/gdk/.libs
+	append-flags -I"${S}"/clients-${CLIENTS_PV}/src
+	append-ldflags -L"${S}"/clients-${CLIENTS_PV}/src/mapilib/.libs
+	cd "${S}"/MonetDB5-${M5_PV} || die
+	econf --with-monetdb="${T}" ${myconf} || die
+	emake || die "MonetDB5"
+
+	cp conf/monetdb5-config "${T}"/bin/monetdb5-config
+	chmod 755 "${T}"/bin/monetdb5-config
+
+	append-flags -I"${S}"/MonetDB5-${M5_PV}
+	append-flags -I"${S}"/MonetDB5-${M5_PV}/src/{mal,optimizer,scheduler}
+	append-ldflags -L"${S}"/MonetDB5-${M5_PV}/src/{mal,optimizer,scheduler}/.libs
+	append-flags -I"${S}"/MonetDB5-${M5_PV}/src/modules/{atoms,kernel,mal}
+	append-ldflags -L"${S}"/MonetDB5-${M5_PV}/src/modules/{atoms,kernel,mal}/.libs
+	cd "${S}"/sql-${SQL_PV} || die
+	econf --with-monetdb="${T}" --with-monetdb5="${T}" ${myconf} || die
+	emake || die "sql"
+}
+
+src_install() {
+	cd "${S}"/MonetDB-${COMMON_PV} || die
+	emake DESTDIR="${D}" install || die "common"
+
+	cd "${S}"/clients-${CLIENTS_PV} || die
+	emake DESTDIR="${D}" install || die "clients"
+
+	cd "${S}"/MonetDB5-${M5_PV} || die
+	# parallel is broken here
+	emake -j1 DESTDIR="${D}" install || die "MonetDB5"
+
+	cd "${S}"/sql-${SQL_PV} || die
+	emake DESTDIR="${D}" install || die "sql"
+
+	# remove testing framework and compiled tests
+	rm -f \
+		"${D}/usr/bin/Mapprove.py" \
+		"${D}/usr/bin/Mdiff" \
+		"${D}/usr/bin/Mfilter.py" \
+		"${D}/usr/bin/MkillUsers" \
+		"${D}/usr/bin/Mlog" \
+		"${D}/usr/bin/Mprofile.py" \
+		"${D}/usr/bin/Mtest.py" \
+		"${D}/usr/bin/Mtimeout" \
+		"${D}/usr/bin/prof.py" \
+		"${D}/usr/share/MonetDB/Mprofile-commands.lst" \
+		"${D}/usr/MonetDB/subprocess26.py" \
+		"${D}/usr/MonetDB/trace.py" \
+		"${D}/usr/MonetDB/__init__.py" \
+		"${D}/usr/MonetDB/monet_options.py" \
+		|| die "removing testing tools"
+	rm -Rf \
+		"${D}/usr/lib/MonetDB/Tests" \
+		"${D}/usr/lib/sql/Tests" \
+		"${D}/usr/share/MonetDB/Tests" \
+		"${D}/usr/share/sql/Tests" \
+		|| die "removing tests"
+	# remove windows cruft
+	find "${D}" -name "*.bat" | xargs rm -f || die "removing windows stuff"
+
+	newinitd "${FILESDIR}/${PN}.init-5.2.0" monetdb || die "init.d script"
+	newconfd "${FILESDIR}/${PN}.conf-5.2.0" monetdb || die "conf.d file"
+
+	# merovingian needs this
+	keepdir /var/lib/MonetDB5/dbfarm
+}