diff --git a/app-forensics/xmount/Manifest b/app-forensics/xmount/Manifest
index f6ac43a8f..990881863 100644
--- a/app-forensics/xmount/Manifest
+++ b/app-forensics/xmount/Manifest
@@ -1,2 +1 @@
-DIST xmount-0.5.0.tar.gz 157318 SHA256 a67d9856645d8d83ab5b806a350c646497cd70a107e20a8a016fc2f1f85952f7 SHA512 007eac3d07443ac779cdd5e0a4bbf54c31d1af52a2697671262b035a33fb1ba3c7f33c7a73bc80400d87de808706e93ebab3a02accfc9e3935d341ca2d3e3856 WHIRLPOOL 71e51a0e18007d99bfbe7ef2e66b1fcaf24a5469ab46b49ceee017562c5eea4e95202fb62f28ac3e75d938fda0bb45bc64281c5a6280d11c132f97a77418f10e
 DIST xmount-0.7.3.tar.gz 109850 SHA256 9702b99b6ca72e74726cc08cd0a3cbf98f66d204f6ba4113c0d4468111764ded SHA512 d75e8775a7cfa7172b1bd04a0742fea9f5792b9e76f507df6b444cd094ae7f9b8c0ebe8a03356eb6956ce851a24edff73e3f73afe0ef1433b7f4a9e488fcf586 WHIRLPOOL bba40d7cf790b9df5f03324a8ba6607e5029feb923df5e0b975f53c99546ba88fbfbb005e3f0f9e0c9b31bd5c1195e3755af9731da79ef78589ee7dc5b19f4c6
diff --git a/app-forensics/xmount/xmount-0.5.0.ebuild b/app-forensics/xmount/xmount-0.5.0.ebuild
deleted file mode 100644
index d69cbb5af..000000000
--- a/app-forensics/xmount/xmount-0.5.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools
-
-DESCRIPTION="Convert on-the-fly between multiple input and output harddisk image types"
-HOMEPAGE="https://www.pinguin.lu/xmount"
-#SRC_URI="http://files.pinguin.lu/${P}.tar.gz"
-SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/xmount_${PV}.orig.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+aff +ewf"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="sys-fs/fuse
-	aff? ( app-forensics/afflib )
-	ewf? ( app-forensics/libewf )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare(){
-	epatch "${FILESDIR}"/configure.ac.diff
-	epatch "${FILESDIR}"/configure.diff
-	eautomake
-}
-
-src_configure() {
-	use aff || export ac_cv_lib_afflib_af_open=no
-	use ewf || export ac_cv_lib_ewf_libewf_open=no
-	econf
-}
diff --git a/app-forensics/xmount/xmount-0.7.3.ebuild b/app-forensics/xmount/xmount-0.7.3.ebuild
index 58cb98c7b..a4655661b 100644
--- a/app-forensics/xmount/xmount-0.7.3.ebuild
+++ b/app-forensics/xmount/xmount-0.7.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=5
+EAPI=6
+
 inherit eutils cmake-utils
 
 DESCRIPTION="Convert on-the-fly between multiple input and output harddisk image types"
diff --git a/dev-util/calpp/Manifest b/dev-util/calpp/Manifest
index 71737a1b6..2c229da70 100644
--- a/dev-util/calpp/Manifest
+++ b/dev-util/calpp/Manifest
@@ -1,2 +1 @@
-DIST calpp-0.87.tar.gz 71093 SHA256 f87ea1af25aac4462dac1847851287813d89151c3bb2c9705d2a5105cc31d519
 DIST calpp-0.90.tar.gz 94015 SHA256 2c26fa667efd2326cefe475c951cd80055d515959c73203340dbab933aad05c4
diff --git a/dev-util/calpp/calpp-0.87-r1.ebuild b/dev-util/calpp/calpp-0.87-r1.ebuild
deleted file mode 100644
index 64cc5e430..000000000
--- a/dev-util/calpp/calpp-0.87-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/radare/radare-1.5-r1.ebuild,v 1.2 2010/09/25 15:18:56 eva Exp $
-
-EAPI="2"
-
-inherit cmake-utils
-
-DESCRIPTION="A library for efficient use of ATI CAL with C++"
-HOMEPAGE="http://calpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-RDEPEND="dev-util/ati-stream-sdk-bin
-	 x11-drivers/ati-drivers"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	dev-util/cmake
-"
-
-src_configure() {
-	cmake-utils_src_configure
-}
-
diff --git a/dev-util/calpp/calpp-0.90-r1.ebuild b/dev-util/calpp/calpp-0.90-r1.ebuild
index 0c0b8bd10..f5fa194c2 100644
--- a/dev-util/calpp/calpp-0.90-r1.ebuild
+++ b/dev-util/calpp/calpp-0.90-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/radare/radare-1.5-r1.ebuild,v 1.2 2010/09/25 15:18:56 eva Exp $
 
-EAPI="2"
+EAPI=6
 
 inherit cmake-utils
 
diff --git a/dev-util/calpp/calpp-0.90.ebuild b/dev-util/calpp/calpp-0.90.ebuild
deleted file mode 100644
index 64cc5e430..000000000
--- a/dev-util/calpp/calpp-0.90.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/radare/radare-1.5-r1.ebuild,v 1.2 2010/09/25 15:18:56 eva Exp $
-
-EAPI="2"
-
-inherit cmake-utils
-
-DESCRIPTION="A library for efficient use of ATI CAL with C++"
-HOMEPAGE="http://calpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-RDEPEND="dev-util/ati-stream-sdk-bin
-	 x11-drivers/ati-drivers"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	dev-util/cmake
-"
-
-src_configure() {
-	cmake-utils_src_configure
-}
-
diff --git a/dev-util/collabreate/Manifest b/dev-util/collabreate/Manifest
deleted file mode 100644
index 67a7a89d0..000000000
--- a/dev-util/collabreate/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST collabreate-0.2.0.tgz 1977300 SHA256 3bd340342dcd5befc161dd1ec025b9b2a8f809adbdebfc86f89a559043ebeb4f
-DIST collabreate-0.3.0.tgz 1492003 SHA256 faf94549e4d5a3d5a3b1c4f00893e86303a14deea65649b9b57b8168714fde39
diff --git a/dev-util/collabreate/collabreate-0.2.0.ebuild b/dev-util/collabreate/collabreate-0.2.0.ebuild
deleted file mode 100644
index b9ca42bae..000000000
--- a/dev-util/collabreate/collabreate-0.2.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/radare/radare-1.5-r1.ebuild,v 1.2 2010/09/25 15:18:56 eva Exp $
-
-EAPI="2"
-
-inherit cmake-utils
-
-DESCRIPTION="A library for efficient use of ATI CAL with C++"
-HOMEPAGE="http://www.idabook.com/collabreate/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="mysql postgres"
-
-RDEPEND="virtual/jdk
-	 mysql? ( dev-db/mysql )
-	 postgres? ( dev-db/postgresql-base )"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}"
-
-src_configure() {
-	cd "${S}"
-	mv trunk "${PN}"
-	epatch "${FILESDIR}/mysql-deterministic-${PV}.patch"
-}
-
-src_compile() {
-	cd "${S}"/"${PN}"/server
-	sh build_jar.sh
-}
-
-src_install() {
-	cd "${S}"/"${PN}"/server
-	dodir /opt/collabreate/server
-	insinto /opt/collabreate/server
-	doins *.jar
-	doins *.conf
-	doins *.sql
-	doins launch_*
-	dodoc README
-}
-
-pkg_postinst() {
-	elog "Read the readme file in the doc dir"
-}
diff --git a/dev-util/collabreate/collabreate-0.3.0-r1.ebuild b/dev-util/collabreate/collabreate-0.3.0-r1.ebuild
deleted file mode 100644
index a2a427ede..000000000
--- a/dev-util/collabreate/collabreate-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/radare/radare-1.5-r1.ebuild,v 1.2 2010/09/25 15:18:56 eva Exp $
-
-EAPI="2"
-
-inherit cmake-utils
-
-DESCRIPTION="A library for efficient use of ATI CAL with C++"
-HOMEPAGE="http://www.idabook.com/collabreate/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-#IUSE="+mysql"
-IUSE="mysql +postgres"
-
-RDEPEND="virtual/jdk
-	 mysql? ( dev-db/mysql
-		  dev-java/jdbc-mysql )
-	 postgres? ( dev-db/postgresql-server
-		     dev-java/jdbc-postgresql )"
-
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}/trunk"
-
-src_configure() {
-	cd "${S}"
-	epatch "${FILESDIR}/mysql-deterministic-${PV}.patch"
-}
-
-src_compile() {
-	cd "${S}"/"${PN}"/server
-	use mysql && [ -e /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ] && cp /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ./
-	use postgres && [ -e /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ] && cp /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ./
-	sh build_jar.sh* || die 'failed to build server'
-}
-
-src_install() {
-	cd "${S}"/"${PN}"/server
-	dodir /opt/collabreate/server
-	insinto /opt/collabreate/server
-	doins *.jar
-	doins *.conf
-	doins *.sql
-	doins launch_*
-	dodoc README
-}
-
-pkg_postinst() {
-	elog "Read the readme file in the doc dir"
-	if use postgres; then
-		elog "For postgresql, you need to create a user and a db for collabreate"
-		elog "go in /opt/collabreate/server and do the following:"
-		elog "su postgres"
-		elog "createuser -s -d -R collab"
-		elog "createdb -U collab collabDB"
-		elog "psql -q -U collab -d collabDB -f dbschema.sql"
-		elog "now edit your server.conf and setup collabreate"
-	fi
-}
diff --git a/dev-util/collabreate/collabreate-0.3.0-r2.ebuild b/dev-util/collabreate/collabreate-0.3.0-r2.ebuild
deleted file mode 100644
index 4fe6813a3..000000000
--- a/dev-util/collabreate/collabreate-0.3.0-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/radare/radare-1.5-r1.ebuild,v 1.2 2010/09/25 15:18:56 eva Exp $
-
-EAPI="2"
-
-inherit cmake-utils
-
-DESCRIPTION="A plugin for IDA Pro designed to provide collaborative reverse engineering"
-HOMEPAGE="http://www.idabook.com/collabreate/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-#IUSE="+mysql"
-IUSE="mysql +postgres"
-
-RDEPEND="virtual/jdk
-	 mysql? ( dev-db/mysql
-		  dev-java/jdbc-mysql )
-	 postgres? ( dev-db/postgresql-server
-		     dev-java/jdbc-postgresql )"
-
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}/trunk"
-
-src_configure() {
-	cd "${S}"
-	epatch "${FILESDIR}/mysql-deterministic-${PV}.patch"
-}
-
-src_compile() {
-	cd "${S}"/"${PN}"/server
-	use mysql && [ -e /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ] && cp /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ./
-	use postgres && [ -e /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ] && cp /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ./
-	sh build_jar.sh* || die 'failed to build server'
-}
-
-src_install() {
-	cd "${S}"/"${PN}"/server
-	dodir /opt/collabreate/server
-	insinto /opt/collabreate/server
-	doins *.jar
-	doins *.conf
-	doins *.sql
-	doins launch_*
-	dodoc README
-}
-
-pkg_postinst() {
-	elog "Read the readme file in the doc dir"
-	if use postgres; then
-		elog "For postgresql, you need to create a user and a db for collabreate"
-		elog "go in /opt/collabreate/server and do the following:"
-		elog "su postgres"
-		elog "createuser -s -d -R collab"
-		elog "createdb -U collab collabDB"
-		elog "psql -q -U collab -d collabDB -f dbschema.sql"
-		elog "now edit your server.conf and setup collabreate"
-	fi
-}
diff --git a/dev-util/collabreate/collabreate-0.3.0.1.ebuild b/dev-util/collabreate/collabreate-0.3.0.1.ebuild
deleted file mode 100644
index 1fe42c635..000000000
--- a/dev-util/collabreate/collabreate-0.3.0.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/radare/radare-1.5-r1.ebuild,v 1.2 2010/09/25 15:18:56 eva Exp $
-
-EAPI="2"
-
-inherit subversion
-
-DESCRIPTION="A library for efficient use of ATI CAL with C++"
-HOMEPAGE="http://www.idabook.com/collabreate/"
-ESVN_REPO_URI="https://collabreate.svn.sourceforge.net/svnroot/collabreate/trunk@13"
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-#IUSE="+mysql"
-IUSE=""
-
-RDEPEND="virtual/jdk
-	 dev-db/postgresql-server
-	 dev-java/jdbc-postgresql"
-
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}/trunk"
-
-src_compile() {
-	cd "${S}"/"${PN}"/server
-	cp /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ./ || die "jdbc-postgresql.jar not found!!!"
-	sh build_jar.sh* || die 'failed to build server'
-}
-
-src_install() {
-	cd "${S}"/"${PN}"/server
-	dodir /opt/collabreate/server
-	insinto /opt/collabreate/server
-	doins *.jar
-	doins *.conf
-	doins *.sql
-	doins launch_*
-	dodoc README
-}
-
-pkg_postinst() {
-	elog "Read the readme file in the doc dir"
-	elog "For postgresql, you need to create a user and a db for collabreate"
-	elog "go in /opt/collabreate/server and do the following:"
-	elog "su postgres"
-	elog "createuser -s -d -R collab"
-	elog "createdb -U collab collabDB"
-	elog "Launch postgresql client"
-	elog "psql"
-	elog "ALTER DATABASE \"collabDB\" SET escape_string_warning=off;"
-	elog "ALTER DATABASE \"collabDB\" SET standard_conforming_strings=off;"
-	elog "\q"
-	elog "Then import the schema"
-	elog "psql -q -U collab -d collabDB -f dbschema.sql"
-	elog "now edit your server.conf and setup collabreate"
-}
diff --git a/dev-util/collabreate/collabreate-0.3.0.ebuild b/dev-util/collabreate/collabreate-0.3.0.ebuild
deleted file mode 100644
index e0e3046b4..000000000
--- a/dev-util/collabreate/collabreate-0.3.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/radare/radare-1.5-r1.ebuild,v 1.2 2010/09/25 15:18:56 eva Exp $
-
-EAPI="2"
-
-inherit cmake-utils
-
-DESCRIPTION="A library for efficient use of ATI CAL with C++"
-HOMEPAGE="http://www.idabook.com/collabreate/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="+mysql"
-#IUSE="mysql postgres"
-
-RDEPEND="virtual/jdk
-	 mysql? ( dev-db/mysql
-		  dev-java/jdbc-mysql )"
-#	 postgres? ( dev-db/postgresql-base
-#		     dev-java/jdbc-postgresql )"
-
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}/trunk"
-
-src_configure() {
-	cd "${S}"
-	epatch "${FILESDIR}/mysql-deterministic-${PV}.patch"
-}
-
-src_compile() {
-	cd "${S}"/"${PN}"/server
-	use mysql && [ -e /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ] && cp /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ./
-	sh build_jar.sh* || die 'failed to build server'
-}
-
-src_install() {
-	cd "${S}"/"${PN}"/server
-	dodir /opt/collabreate/server
-	insinto /opt/collabreate/server
-	doins *.jar
-	doins *.conf
-	doins *.sql
-	doins launch_*
-	dodoc README
-}
-
-pkg_postinst() {
-	elog "Read the readme file in the doc dir"
-}
diff --git a/dev-util/collabreate/collabreate-0.3.0.1-r1.ebuild b/dev-util/collabreate/collabreate-0.4.0_p20140528.ebuild
similarity index 89%
rename from dev-util/collabreate/collabreate-0.3.0.1-r1.ebuild
rename to dev-util/collabreate/collabreate-0.4.0_p20140528.ebuild
index 7ed82da44..4f7da0168 100644
--- a/dev-util/collabreate/collabreate-0.3.0.1-r1.ebuild
+++ b/dev-util/collabreate/collabreate-0.4.0_p20140528.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/radare/radare-1.5-r1.ebuild,v 1.2 2010/09/25 15:18:56 eva Exp $
 
-EAPI="2"
+EAPI=6
 
 inherit subversion
 
 DESCRIPTION="A plugin for IDA Pro designed to provide collaborative reverse engineering"
 HOMEPAGE="http://www.idabook.com/collabreate/"
-ESVN_REPO_URI="https://collabreate.svn.sourceforge.net/svnroot/collabreate/trunk@13"
+ESVN_REPO_URI="https://collabreate.svn.sourceforge.net/svnroot/collabreate/trunk@20"
 #SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
@@ -25,18 +25,18 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${PN}/trunk"
 
 src_compile() {
-	cd "${S}"/"${PN}"/server
+	cd "${S}"/server/java/collabreate/server
 	cp /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ./ || die "jdbc-postgresql.jar not found!!!"
 	sh build_jar.sh* || die 'failed to build server'
 }
 
 src_install() {
-	cd "${S}"/"${PN}"/server
+	doins database/postgresql/*.sql
+	cd "${S}"/server/java/collabreate/server
 	dodir /opt/collabreate/server
 	insinto /opt/collabreate/server
 	doins *.jar
 	doins *.conf
-	doins *.sql
 	doins launch_*
 	dodoc README
 }
diff --git a/dev-util/collabreate/files/mysql-deterministic-0.2.0.patch b/dev-util/collabreate/files/mysql-deterministic-0.2.0.patch
deleted file mode 100755
index 7b453d628..000000000
--- a/dev-util/collabreate/files/mysql-deterministic-0.2.0.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- collabreate.orig/server/my_dbschema.sql	2010-10-09 20:06:49.000000000 +0000
-+++ collabreate/server/my_dbschema.sql	2011-07-01 13:39:57.000000000 +0000
-@@ -62,6 +62,7 @@
- 
- delimiter //
- CREATE FUNCTION nextid() RETURNS BIGINT
-+DETERMINISTIC
- BEGIN
-    DECLARE temp BIGINT;
-    SELECT seq into temp FROM updateid;
-@@ -83,6 +84,7 @@
- 
- delimiter //
- CREATE FUNCTION insertUpdate(uid INTEGER, proj_id INTEGER, command INTEGER, value BLOB) RETURNS BIGINT
-+DETERMINISTIC
- BEGIN
-    DECLARE temp BIGINT;
-    SELECT nextid() INTO temp;
-@@ -94,6 +96,7 @@
- 
- delimiter //
- CREATE PROCEDURE copyUpdates(old_pid int, max_update int, new_pid int)
-+DETERMINISTIC
- BEGIN
-    CREATE TEMPORARY TABLE tmptable (LIKE updates);
-    INSERT INTO tmptable SELECT * FROM updates WHERE pid = old_pid AND updateid <= max_update;
-@@ -113,6 +116,7 @@
- 
- delimiter //
- CREATE FUNCTION addUserQuery(user varchar(32), pw varchar(64), p BIGINT, s BIGINT) RETURNS INTEGER
-+DETERMINISTIC
- BEGIN
-   insert into users (username,pwhash,pub,sub) values (user, pw, p, s);
-   return LAST_INSERT_ID();
-@@ -120,6 +124,7 @@
- //
- 
- CREATE FUNCTION updateUserQuery(user varchar(32), pw varchar(64), p BIGINT, s BIGINT, uid INTEGER) RETURNS INTEGER
-+DETERMINISTIC
- BEGIN
-   update users set username=user,pwhash=pw,pub=p,sub=s where userid=uid;
-   return LAST_INSERT_ID();
-@@ -127,6 +132,7 @@
- //
- 
- CREATE FUNCTION addProjectQuery(hash varchar(64), gpid varchar(128), descr text, owner int, p BIGINT, s BIGINT) RETURNS INTEGER
-+DETERMINISTIC
- BEGIN
-   insert into projects (hash,gpid,description,owner,pub,sub) values (hash, gpid, descr, owner, p, s);
-   return LAST_INSERT_ID();
-@@ -134,6 +140,7 @@
- //
- 
- CREATE FUNCTION addProjectSnapQuery(hash varchar(64), gpid varchar(128), descr text, owner int, snapid BIGINT) RETURNS INTEGER
-+DETERMINISTIC
- BEGIN
-   insert into projects (hash,gpid,description,owner,snapupdateid) values (hash, gpid, descr, owner, snapid);
-   return LAST_INSERT_ID();
-@@ -141,6 +148,7 @@
- //
- 
- CREATE FUNCTION addProjectForkQuery(child int, parent int) RETURNS INTEGER
-+DETERMINISTIC
- BEGIN
-   insert into forklist (child,parent) values (child, parent);
-   return LAST_INSERT_ID();
diff --git a/dev-util/collabreate/files/mysql-deterministic-0.3.0.patch b/dev-util/collabreate/files/mysql-deterministic-0.3.0.patch
deleted file mode 100644
index 8079d9fb0..000000000
--- a/dev-util/collabreate/files/mysql-deterministic-0.3.0.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -Naur collabreate.orig/server/my_dbschema.sql collabreate/server/my_dbschema.sql
---- collabreate.orig/server/my_dbschema.sql	2011-09-09 20:53:16.000000000 +0000
-+++ collabreate/server/my_dbschema.sql	2011-09-22 14:05:13.000000000 +0000
-@@ -63,6 +63,7 @@
- 
- delimiter //
- CREATE FUNCTION nextid() RETURNS BIGINT
-+DETERMINISTIC
- BEGIN
-    DECLARE temp BIGINT;
-    SELECT seq into temp FROM updateid;
-@@ -84,6 +85,7 @@
- 
- delimiter //
- CREATE FUNCTION insertUpdate(uid INTEGER, proj_id INTEGER, command INTEGER, value BLOB) RETURNS BIGINT
-+DETERMINISTIC
- BEGIN
-    DECLARE temp BIGINT;
-    SELECT nextid() INTO temp;
-@@ -95,6 +97,7 @@
- 
- delimiter //
- CREATE PROCEDURE copyUpdates(old_pid int, max_update int, new_pid int)
-+DETERMINISTIC
- BEGIN
-    CREATE TEMPORARY TABLE tmptable (LIKE updates);
-    INSERT INTO tmptable SELECT * FROM updates WHERE pid = old_pid AND updateid <= max_update;
-@@ -114,6 +117,7 @@
- 
- delimiter //
- CREATE FUNCTION addUserQuery(user varchar(32), pw varchar(64), p BIGINT, s BIGINT) RETURNS INTEGER
-+DETERMINISTIC
- BEGIN
-   insert into users (username,pwhash,pub,sub) values (user, pw, p, s);
-   return LAST_INSERT_ID();
-@@ -121,6 +125,7 @@
- //
- 
- CREATE FUNCTION updateUserQuery(user varchar(32), pw varchar(64), p BIGINT, s BIGINT, uid INTEGER) RETURNS INTEGER
-+DETERMINISTIC
- BEGIN
-   update users set username=user,pwhash=pw,pub=p,sub=s where userid=uid;
-   return LAST_INSERT_ID();
-@@ -128,6 +133,7 @@
- //
- 
- CREATE FUNCTION addProjectQuery(hash varchar(64), gpid varchar(128), descr text, owner int, p BIGINT, s BIGINT, protocol INTEGER) RETURNS INTEGER
-+DETERMINISTIC
- BEGIN
-   insert into projects (hash,gpid,description,owner,pub,sub,protocol) values (hash, gpid, descr, owner, p, s);
-   return LAST_INSERT_ID();
-@@ -135,6 +141,7 @@
- //
- 
- CREATE FUNCTION addProjectSnapQuery(hash varchar(64), gpid varchar(128), descr text, owner int, snapid BIGINT, protocol INTEGER) RETURNS INTEGER
-+DETERMINISTIC
- BEGIN
-   insert into projects (hash,gpid,description,owner,snapupdateid,protocol) values (hash, gpid, descr, owner, snapid, protocol);
-   return LAST_INSERT_ID();
-@@ -142,6 +149,7 @@
- //
- 
- CREATE FUNCTION addProjectForkQuery(child int, parent int) RETURNS INTEGER
-+DETERMINISTIC
- BEGIN
-   insert into forklist (child,parent) values (child, parent);
-   return LAST_INSERT_ID();