cleaned out old 4.0 ebuilds

33 files changed, 9 insertions, 3965 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index e46d3f291599..68c9755a0f4a 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.147 2004/11/03 17:29:25 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.148 2004/11/13 00:41:54 mr_bones_ Exp $
+
+  12 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> -mysql-4.0.12.ebuild,
+  -mysql-4.0.13-r4.ebuild, -mysql-4.0.14-r1.ebuild, -mysql-4.0.14-r2.ebuild,
+  -mysql-4.0.14.ebuild, -mysql-4.0.15-r1.ebuild, -mysql-4.0.15.ebuild,
+  -mysql-4.0.16.ebuild, -mysql-4.0.17.ebuild, -mysql-4.0.18-r1.ebuild,
+  -mysql-4.0.18-r2.ebuild, -mysql-4.0.18.ebuild, -mysql-4.0.19.ebuild,
+  -mysql-4.0.20-r1.ebuild, -mysql-4.0.20.ebuild, -mysql-4.0.21.ebuild:
+  cleaned out old 4.0 ebuilds (ok'd by rac)
 
   03 Nov 2004; Bret Curtis <psi29a@gentoo.org> mysql-4.0.22.ebuild:
   marked as stable on mips
diff --git a/dev-db/mysql/files/digest-mysql-4.0.12 b/dev-db/mysql/files/digest-mysql-4.0.12
deleted file mode 100644
index 17716f6d1d4b..000000000000
--- a/dev-db/mysql/files/digest-mysql-4.0.12
+++ /dev/null
@@ -1,19 +0,0 @@
-MD5 47c66444b6a1e2243eadf931d52d34b2 /files/my.cnf 1229
-MD5 57531ccd19e17ccca95e0e3bf833cd67 /files/mysql-3.23-db-3.2.3.diff 1105
-MD5 d3830060b3f74d6c0916ed85a6bbf02d /files/mysql-3.23-install-db-sh.diff 1368
-MD5 7a5badec9c28c2f4d434d6aed0a5103b /files/mysql-3.23-my-print-defaults.diff 218
-MD5 8eaeb1372c41d2fef1622dd707a7a9d0 /files/mysql-3.23-nisam.h.diff 452
-MD5 8d51cbf3afa8349839380aa0986704c0 /files/mysql-3.23-safe-mysqld-sh.diff 1557
-MD5 f49e58771365cb075ece153403811872 /files/mysql-3.23.51-tcpd.patch 601
-MD5 50629599f478b26b4ca82c7c553feae0 /files/mysql-3.23.52-install-db-sh.diff 1366
-MD5 ee578e3021841ef9dba4175403564136 /files/mysql-4.0-db-3.2.1.diff 1047
-MD5 e68c5d7e3c48028c4cf7e55ea8396013 /files/mysql-4.0-install-db-sh.diff 1271
-MD5 d1e79f7a155e45c69558f083fcb1139d /files/mysql-4.0-my-print-defaults.diff 240
-MD5 4541e130a1b0fa90db8612973b0adb75 /files/mysql-4.0-mysqld-safe-sh.diff 1477
-MD5 ff80a5d8d87212046e89f2f8ae779af4 /files/mysql-4.0-nisam.h.diff 452
-MD5 36aa23522b241aafdb833ac4f11c4fd1 /files/mysql-4.0.4-install-db-sh.diff 1439
-MD5 ab635bcf4258a01740f5a08dacf03618 /files/mysql-4.0.rc6 947
-MD5 0338ee6f7c85abdc67088a27d7a72a61 /files/mysql.init 900
-MD5 6b07111a6f3a3ffc295c69c2ec15bb91 /files/rebuilder.sh 974
-MD5 f70f1b50a6921cbddba0c7afa2e9ba4a /mysql-4.0.12.ebuild 6840
-MD5 7d7696ecad5018939735049c0e87132f mysql-4.0.12.tar.gz 12361707
diff --git a/dev-db/mysql/files/digest-mysql-4.0.13-r4 b/dev-db/mysql/files/digest-mysql-4.0.13-r4
deleted file mode 100644
index 414dd6203f34..000000000000
--- a/dev-db/mysql/files/digest-mysql-4.0.13-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4bad6dae73f53c16bfcf41c704681059 mysql-4.0.13.tar.gz 12511177
diff --git a/dev-db/mysql/files/digest-mysql-4.0.14 b/dev-db/mysql/files/digest-mysql-4.0.14
deleted file mode 100644
index f06a075ffd2a..000000000000
--- a/dev-db/mysql/files/digest-mysql-4.0.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9764f09c89692345d3b7800ab014f822 mysql-4.0.14.tar.gz 12712324
diff --git a/dev-db/mysql/files/digest-mysql-4.0.14-r1 b/dev-db/mysql/files/digest-mysql-4.0.14-r1
deleted file mode 100644
index f06a075ffd2a..000000000000
--- a/dev-db/mysql/files/digest-mysql-4.0.14-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9764f09c89692345d3b7800ab014f822 mysql-4.0.14.tar.gz 12712324
diff --git a/dev-db/mysql/files/digest-mysql-4.0.14-r2 b/dev-db/mysql/files/digest-mysql-4.0.14-r2
deleted file mode 100644
index f06a075ffd2a..000000000000
--- a/dev-db/mysql/files/digest-mysql-4.0.14-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9764f09c89692345d3b7800ab014f822 mysql-4.0.14.tar.gz 12712324
diff --git a/dev-db/mysql/files/digest-mysql-4.0.15 b/dev-db/mysql/files/digest-mysql-4.0.15
deleted file mode 100644
index 022a6c3697b3..000000000000
--- a/dev-db/mysql/files/digest-mysql-4.0.15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a6ce917730e8778ef7c9e1f7b5053b2d mysql-4.0.15.tar.gz 12771603
diff --git a/dev-db/mysql/files/digest-mysql-4.0.15-r1 b/dev-db/mysql/files/digest-mysql-4.0.15-r1
deleted file mode 100644
index 022a6c3697b3..000000000000
--- a/dev-db/mysql/files/digest-mysql-4.0.15-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a6ce917730e8778ef7c9e1f7b5053b2d mysql-4.0.15.tar.gz 12771603
diff --git a/dev-db/mysql/files/digest-mysql-4.0.16 b/dev-db/mysql/files/digest-mysql-4.0.16
deleted file mode 100644
index cdcd0ec8d086..000000000000
--- a/dev-db/mysql/files/digest-mysql-4.0.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ddc959b9cdc2f5e30dc6a4d3650d3db5 mysql-4.0.16.tar.gz 12830094
diff --git a/dev-db/mysql/files/digest-mysql-4.0.17 b/dev-db/mysql/files/digest-mysql-4.0.17
deleted file mode 100644
index 98c4a9cf8cad..000000000000
--- a/dev-db/mysql/files/digest-mysql-4.0.17
+++ /dev/null
@@ -1 +0,0 @@
-MD5 141511e1b7cab3a886fb68bbb507a1ab mysql-4.0.17.tar.gz 12959051
diff --git a/dev-db/mysql/files/digest-mysql-4.0.18 b/dev-db/mysql/files/digest-mysql-4.0.18
deleted file mode 100644
index 4cb0175f1633..000000000000
--- a/dev-db/mysql/files/digest-mysql-4.0.18
+++ /dev/null
@@ -1 +0,0 @@
-MD5 702151a3e21d9e5f32e8850032aefdad mysql-4.0.18.tar.gz 13422686
diff --git a/dev-db/mysql/files/digest-mysql-4.0.18-r1 b/dev-db/mysql/files/digest-mysql-4.0.18-r1
deleted file mode 100644
index 4cb0175f1633..000000000000
--- a/dev-db/mysql/files/digest-mysql-4.0.18-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 702151a3e21d9e5f32e8850032aefdad mysql-4.0.18.tar.gz 13422686
diff --git a/dev-db/mysql/files/digest-mysql-4.0.18-r2 b/dev-db/mysql/files/digest-mysql-4.0.18-r2
deleted file mode 100644
index 4cb0175f1633..000000000000
--- a/dev-db/mysql/files/digest-mysql-4.0.18-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 702151a3e21d9e5f32e8850032aefdad mysql-4.0.18.tar.gz 13422686
diff --git a/dev-db/mysql/files/digest-mysql-4.0.19 b/dev-db/mysql/files/digest-mysql-4.0.19
deleted file mode 100644
index 0134b5bdce1d..000000000000
--- a/dev-db/mysql/files/digest-mysql-4.0.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d3c7f0e7a88ffdb52ba59cff73c79ed6 mysql-4.0.19.tar.gz 13802895
diff --git a/dev-db/mysql/files/digest-mysql-4.0.20 b/dev-db/mysql/files/digest-mysql-4.0.20
deleted file mode 100644
index 72e609213891..000000000000
--- a/dev-db/mysql/files/digest-mysql-4.0.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7c75ac74e23396bd228dbc2c2d1131df mysql-4.0.20.tar.gz 13807983
diff --git a/dev-db/mysql/files/digest-mysql-4.0.20-r1 b/dev-db/mysql/files/digest-mysql-4.0.20-r1
deleted file mode 100644
index 72e609213891..000000000000
--- a/dev-db/mysql/files/digest-mysql-4.0.20-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7c75ac74e23396bd228dbc2c2d1131df mysql-4.0.20.tar.gz 13807983
diff --git a/dev-db/mysql/files/digest-mysql-4.0.21 b/dev-db/mysql/files/digest-mysql-4.0.21
deleted file mode 100644
index b07ccf6390d0..000000000000
--- a/dev-db/mysql/files/digest-mysql-4.0.21
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0a3dae16519afa5e59d8b9e252181243 mysql-4.0.21.tar.gz 14107388
diff --git a/dev-db/mysql/mysql-4.0.12.ebuild b/dev-db/mysql/mysql-4.0.12.ebuild
deleted file mode 100644
index 1e0af4dc53c7..000000000000
--- a/dev-db/mysql/mysql-4.0.12.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.12.ebuild,v 1.14 2004/09/06 18:05:24 ciaranm Exp $
-
-inherit eutils
-
-#to accomodate -laadeedah releases
-NEWP=${P}
-
-SVER=${PV%.*}
-#normal releases:
-SDIR=MySQL-${SVER}
-#for a pre-release:
-#SDIR=MySQL-${SVER}-Pre
-
-S=${WORKDIR}/${NEWP}
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-HOMEPAGE="http://www.mysql.com/"
-SRC_URI="ftp://mirror.mcs.anl.gov/pub/mysql/Downloads/${SDIR}/${NEWP}.tar.gz
-	ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/${SDIR}/${NEWP}.tar.gz
-	ftp://mysql.valueclick.com/pub/mysql/Downloads/${SDIR}/${NEWP}.tar.gz"
-
-KEYWORDS="~x86 ~sparc ppc"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="berkdb debug innodb perl readline ssl static tcpd"
-
-DEPEND="readline? ( >=sys-libs/readline-4.1 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	>=sys-libs/zlib-1.1.3
-	dev-lang/perl
-	sys-apps/procps
-	app-portage/gentoolkit"
-PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )"
-
-warning() {
-	ewarn
-	ewarn "If you're upgrading from MySQL-3.x, you must recompile the other"
-	ewarn "packages on your system that link with libmysqlclient after the"
-	ewarn "upgrade completes.  To obtain such a list of packages for your"
-	ewarn "system, you may use the: ${FILESDIR}/rebuilder.sh"
-	ewarn "script."
-	ewarn
-	epause 5
-}
-
-pkg_setup() {
-	warning
-}
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	#required for qmail-mysql
-	patch -p0 < ${FILESDIR}/mysql-4.0-nisam.h.diff || die
-	#zap startup script messages
-	patch -p1 < ${FILESDIR}/mysql-4.0.4-install-db-sh.diff || die
-	#zap binary distribution stuff
-	patch -p1 < ${FILESDIR}/mysql-4.0-mysqld-safe-sh.diff || die
-	#for correct hardcoded sysconf directory
-	patch -p1 < ${FILESDIR}/mysql-4.0-my-print-defaults.diff || die
-	#patch -p1 < ${FILESDIR}/mysql-3.23.51-tcpd.patch || die
-}
-
-src_compile() {
-	local myconf
-	#The following fix is due to a bug with bdb on sparc's. See: 
-	#http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
-	if use sparc || use alpha || use hppa
-	then
-		myconf="${myconf} --without-berkeley-db"
-	else
-		use berkdb && myconf="${myconf} --with-berkeley-db=./bdb"
-		use berkdb || myconf="${myconf} --without-berkeley-db"
-	fi
-	#readline pair reads backwards on purpose, DONT change it around, Ok?
-	use readline && myconf="${myconf} --without-readline"
-	use readline || myconf="${myconf} --with-readline"
-	use static && myconf="${myconf} --with-mysqld-ldflags=-all-static --disable-shared"
-	use static || myconf="${myconf} --enable-shared --enable-static"
-	use tcpd && myconf="${myconf} --with-libwrap"
-	use tcpd || myconf="${myconf} --without-libwrap"
-	use innodb && myconf="${myconf} --with-innodb"
-	use innodb || myconf="${myconf} --without-innodb"
-	use ssl && myconf="${myconf} --with-vio --with-openssl"
-	use ssl || myconf="${myconf} --without-openssl"
-	myconf="${myconf} `use_with debug`"
-
-	#glibc-2.3.2_pre fix; bug #16496
-	export CFLAGS="${CFLAGS} -DHAVE_ERRNO_AS_DEFINE=1"
-
-	#bug fix for #15099, should make this api backward compatible, thanks dragon
-	export CFLAGS="${CFLAGS} -DUSE_OLD_FUNCTIONS"
-
-	#the compiler flags are as per their "official" spec ;)
-	CFLAGS="${CFLAGS/-O?/} -O3" \
-	CXXFLAGS="${CXXFLAGS/-O?/} -O3 -felide-constructors -fno-exceptions -fno-rtti" \
-	econf \
-		--libexecdir=/usr/sbin \
-		--sysconfdir=/etc/mysql \
-		--localstatedir=/var/lib/mysql \
-		--with-raid \
-		--with-low-memory \
-		--enable-assembler \
-		--with-charset=latin1 \
-		--enable-local-infile \
-		--with-mysqld-user=mysql \
-		--with-extra-charsets=all \
-		--enable-thread-safe-client \
-		--with-client-ldflags=-lstdc++ \
-		--with-comment="Gentoo Linux ${PF}" \
-		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make install DESTDIR=${D} benchdir_root=/usr/share/mysql || die
-
-	#eeek, not sure whats going on here.. are these needed by anything?
-#	use innodb && insinto /usr/lib/mysql && doins ${WORKDIR}/../libs/*
-
-	#move client libs, install a couple of missing headers
-	mv ${D}/usr/lib/mysql/libmysqlclient*.so* ${D}/usr/lib
-	dosym ../libmysqlclient.so /usr/lib/mysql/libmysqlclient.so
-	dosym ../libmysqlclient_r.so /usr/lib/mysql/libmysqlclient_r.so
-	insinto /usr/include/mysql ; doins include/{my_config.h,my_dir.h}
-
-	#convenience links
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlanalyze
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlrepair
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqloptimize
-
-	#various junk
-	rm -f ${D}/usr/share/mysql/binary-configure
-	rm -f ${D}/usr/share/mysql/mysql.server
-	rm -f ${D}/usr/share/mysql/make_binary_distribution
-	rm -f ${D}/usr/share/mysql/mi_test_all*
-	rm -f ${D}/usr/share/mysql/mysql-log-rotate
-	rm -f ${D}/usr/share/mysql/mysql*.spec
-	rm -f ${D}/usr/share/mysql/my-*.cnf
-
-	#hmm what about all the very nice benchmark/test scripts
-	#in /usr/share/mysql/sql-bench
-	if ! use perl; then
-		rm -f ${D}/usr/bin/mysql_setpermission
-	fi
-
-	dodoc README COPYING COPYING.LIB MIRRORS Docs/{manual.ps,manual.txt}
-	docinto conf-samples ; dodoc support-files/my-*.cnf
-	dohtml -r Docs/*
-
-	insinto /etc/mysql
-	doins ${FILESDIR}/my.cnf scripts/mysqlaccess.conf
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mysql-4.0.rc6 mysql
-}
-
-pkg_config() {
-	if [ ! -d ${ROOT}/var/lib/mysql/mysql ] ; then
-		einfo "Press ENTER to create the mysql database and set proper"
-		einfo "permissions on it, or Control-C to abort now..."
-		read
-		${ROOT}/usr/bin/mysql_install_db #>>/var/log/mysql/mysql.err 2>&1
-	else
-		einfo "Hmm, it appears as though you already have the mysql"
-		einfo "database in place.  If you are having problems trying"
-		einfo "to start mysqld, perhaps you need to manually run"
-		einfo "/usr/bin/mysql_install_db and/or check your config"
-		einfo "file(s) and/or database(s) and/or logfile(s)."
-	fi
-}
-
-pkg_preinst() {
-	if ! groupmod mysql; then
-		groupadd -g 60 mysql || die "problem adding group mysql"
-	fi
-
-	if ! id mysql; then
-		useradd -g mysql -s /dev/null -d /var/lib/mysql -c "mysql" mysql
-		assert "problem adding user mysql"
-	fi
-}
-
-pkg_postinst() {
-	#empty dirs...
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/lib/mysql
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/run/mysqld
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
-
-	#secure the logfiles... does this bother anybody?
-	touch ${ROOT}/var/log/mysql/mysql.{log,err}
-	chown mysql:mysql ${ROOT}/var/log/mysql/mysql.{log,err}
-	chmod 0660 ${ROOT}/var/log/mysql/mysql.{log,err}
-
-	#your friendly public service announcement...
-	einfo
-	einfo "You might want to run:"
-	einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\""
-	einfo "if this is a new install."
-	einfo
-
-	warning
-}
diff --git a/dev-db/mysql/mysql-4.0.13-r4.ebuild b/dev-db/mysql/mysql-4.0.13-r4.ebuild
deleted file mode 100644
index cc04958990d3..000000000000
--- a/dev-db/mysql/mysql-4.0.13-r4.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.13-r4.ebuild,v 1.8 2004/09/06 18:05:24 ciaranm Exp $
-
-inherit eutils
-#to accomodate -laadeedah releases
-NEWP=${P}
-
-SVER=${PV%.*}
-#normal releases:
-SDIR=MySQL-${SVER}
-#for a pre-release:
-#SDIR=MySQL-${SVER}-Pre
-
-S=${WORKDIR}/${NEWP}
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-HOMEPAGE="http://www.mysql.com/"
-SRC_URI="mirror://mysql/Downloads/${SDIR}/${NEWP}.tar.gz"
-RESTRICT="nomirror"
-
-KEYWORDS="x86 sparc ppc amd64 hppa"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static readline innodb berkdb tcpd ssl perl debug"
-
-DEPEND="readline? ( >=sys-libs/readline-4.1 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( dev-lang/perl )
-	>=sys-libs/zlib-1.1.3
-	sys-apps/procps
-	>=sys-apps/sed-4"
-PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )"
-
-warning() {
-	ewarn
-	ewarn "If you're upgrading from MySQL-3.x, you must recompile the other"
-	ewarn "packages on your system that link with libmysqlclient after the"
-	ewarn "upgrade completes.  To obtain such a list of packages for your"
-	ewarn "system, you may use 'revdep-rebuild' from app-portage/gentoolkit."
-	ewarn
-	epause 5
-}
-
-pkg_setup() {
-	warning
-}
-
-src_unpack() {
-	if use static && use ssl; then
-		local msg="MySQL does not support building statically with SSL support"
-		eerror "${msg}"
-		die "${msg}"
-	fi
-	if use ssl; then
-		ewarn "SSL connections are broken in MySQL-4.0.13. See MySQL bug #673"
-		ewarn "(http://bugs.mysql.com/bug.php?id=673&error=no). If you need SSL"
-		ewarn "connections, you should revert to 4.0.12."
-	fi
-	unpack ${A} || die
-	cd ${S} || die
-	#required for qmail-mysql
-	patch -p0 < ${FILESDIR}/mysql-4.0-nisam.h.diff || die
-	#zap startup script messages
-	patch -p1 < ${FILESDIR}/mysql-4.0.4-install-db-sh.diff || die
-	#zap binary distribution stuff
-	patch -p1 < ${FILESDIR}/mysql-4.0-mysqld-safe-sh.diff || die
-	#for correct hardcoded sysconf directory
-	patch -p1 < ${FILESDIR}/mysql-4.0-my-print-defaults.diff || die
-	#patch -p1 < ${FILESDIR}/mysql-3.23.51-tcpd.patch || die
-
-	# attempt to get libmysqlclient_r linked against ssl if USE="ssl" enabled
-	# i would really prefer to fix this at the Makefile.am level, but can't
-	# get the software to autoreconf as distributed - too many missing files
-	# Robert Coie <rac@gentoo.org> 2003.06.12
-	patch -p0 < ${FILESDIR}/${P}-thrssl.patch || die
-
-	# fix buffer overflow in mysql 4 prior to 4.0.15 bug #28394
-	[ "$PV" == "4.0.13" ] &&
-		epatch ${FILESDIR}/mysql-4.0.14-security-28394.patch
-}
-
-src_compile() {
-	local myconf
-
-	#The following fix is due to a bug with bdb on sparc's. See:
-	#http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
-	if use sparc || use alpha || use hppa
-	then
-		myconf="${myconf} --without-berkeley-db"
-	else
-		use berkdb \
-			&& myconf="${myconf} --with-berkeley-db=./bdb" \
-			|| myconf="${myconf} --without-berkeley-db"
-	fi
-
-	#readline pair reads backwards on purpose, DONT change it around, Ok?
-	use readline && myconf="${myconf} --without-readline"
-	use readline || myconf="${myconf} --with-readline"
-
-	use static \
-		&& myconf="${myconf} --with-mysqld-ldflags=-all-static --disable-shared" \
-		|| myconf="${myconf} --enable-shared --enable-static"
-
-	myconf="${myconf} `use_with tcpd libwrap`"
-	myconf="${myconf} `use_with innodb`"
-
-	use ssl \
-		&& myconf="${myconf} --with-vio --with-openssl" \
-		|| myconf="${myconf} --without-openssl"
-
-	myconf="${myconf} `use_with debug`"
-
-	#glibc-2.3.2_pre fix; bug #16496
-	export CFLAGS="${CFLAGS} -DHAVE_ERRNO_AS_DEFINE=1"
-
-	#bug fix for #15099, should make this api backward compatible
-	export CFLAGS="${CFLAGS} -DUSE_OLD_FUNCTIONS"
-
-	#the compiler flags are as per their "official" spec ;)
-	#CFLAGS="${CFLAGS/-O?/} -O3" \
-	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti" \
-	econf \
-		--libexecdir=/usr/sbin \
-		--sysconfdir=/etc/mysql \
-		--localstatedir=/var/lib/mysql \
-		--with-raid \
-		--with-low-memory \
-		--enable-assembler \
-		--with-charset=latin1 \
-		--enable-local-infile \
-		--with-mysqld-user=mysql \
-		--with-extra-charsets=all \
-		--enable-thread-safe-client \
-		--with-client-ldflags=-lstdc++ \
-		--with-comment="Gentoo Linux ${PF}" \
-		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
-		--with-embedded-server \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make install DESTDIR=${D} benchdir_root=/usr/share/mysql || die
-
-	#move client libs, install a couple of missing headers
-	mv ${D}/usr/lib/mysql/libmysqlclient*.so* ${D}/usr/lib
-	dosym ../libmysqlclient.so /usr/lib/mysql/libmysqlclient.so
-	dosym ../libmysqlclient_r.so /usr/lib/mysql/libmysqlclient_r.so
-	insinto /usr/include/mysql ; doins include/{my_config.h,my_dir.h}
-
-	#convenience links
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlanalyze
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlrepair
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqloptimize
-
-	#various junk
-	rm -f ${D}/usr/share/mysql/mysql.server
-	rm -f ${D}/usr/share/mysql/binary-configure
-	rm -f ${D}/usr/share/mysql/make_binary_distribution
-	rm -f ${D}/usr/share/mysql/mysql-log-rotate
-	rm -f ${D}/usr/share/mysql/{post,pre}install
-	rm -f ${D}/usr/share/mysql/mi_test*
-	rm -f ${D}/usr/share/mysql/*.spec # Redhat gunk
-	rm -f ${D}/usr/share/mysql/*.plist # Apple gunk
-	rm -f ${D}/usr/share/mysql/my-*.cnf # Put them elsewhere
-
-	# All of these (ab)use Perl.
-	if ! use perl; then
-		rm -f ${D}/usr/bin/mysql_setpermission
-		rm -rf ${D}/usr/share/mysql/sql-bench
-	fi
-
-	dodoc README COPYING COPYING.LIB MIRRORS Docs/manual.*
-	docinto conf-samples
-	dodoc support-files/my-*.cnf
-	dohtml -r Docs/*
-
-	insinto /etc/mysql
-	doins ${FILESDIR}/my.cnf scripts/mysqlaccess.conf
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mysql-4.0.rc6 mysql
-}
-
-pkg_config() {
-	if [ ! -d ${ROOT}/var/lib/mysql/mysql ] ; then
-		einfo "Press ENTER to create the mysql database and set proper"
-		einfo "permissions on it, or Control-C to abort now..."
-		read
-		${ROOT}/usr/bin/mysql_install_db #>>/var/log/mysql/mysql.err 2>&1
-	else
-		einfo "Hmm, it appears as though you already have the mysql"
-		einfo "database in place.  If you are having problems trying"
-		einfo "to start mysqld, perhaps you need to manually run"
-		einfo "/usr/bin/mysql_install_db and/or check your config"
-		einfo "file(s) and/or database(s) and/or logfile(s)."
-	fi
-}
-
-pkg_preinst() {
-	if ! groupmod mysql; then
-		groupadd -g 60 mysql || die "problem adding group mysql"
-	fi
-
-	if ! id mysql; then
-		useradd -g mysql -s /dev/null -d /var/lib/mysql -c "mysql" mysql
-		assert "problem adding user mysql"
-	fi
-}
-
-pkg_postinst() {
-	#empty dirs...
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/lib/mysql
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/run/mysqld
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
-
-	#secure the logfiles... does this bother anybody?
-	touch ${ROOT}/var/log/mysql/mysql.{log,err}
-	chown mysql:mysql ${ROOT}/var/log/mysql/mysql.{log,err}
-	chmod 0660 ${ROOT}/var/log/mysql/mysql.{log,err}
-
-	#your friendly public service announcement...
-	einfo
-	einfo "You might want to run:"
-	einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\""
-	einfo "if this is a new install."
-	einfo
-
-	warning
-}
diff --git a/dev-db/mysql/mysql-4.0.14-r1.ebuild b/dev-db/mysql/mysql-4.0.14-r1.ebuild
deleted file mode 100644
index f0ac77fbbec3..000000000000
--- a/dev-db/mysql/mysql-4.0.14-r1.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.14-r1.ebuild,v 1.15 2004/09/06 18:05:24 ciaranm Exp $
-
-inherit eutils
-
-#to accomodate -laadeedah releases
-NEWP=${P}
-
-SVER=${PV%.*}
-#normal releases:
-SDIR=MySQL-${SVER}
-#for a pre-release:
-#SDIR=MySQL-${SVER}-Pre
-
-S=${WORKDIR}/${NEWP}
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-HOMEPAGE="http://www.mysql.com/"
-SRC_URI="mirror://mysql/Downloads/${SDIR}/${NEWP}.tar.gz"
-RESTRICT="nomirror"
-
-KEYWORDS="~x86 ~sparc ppc ~amd64 ~hppa"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static readline innodb berkdb tcpd ssl perl debug"
-
-DEPEND="readline? ( >=sys-libs/readline-4.1 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( dev-lang/perl )
-	>=sys-libs/zlib-1.1.3
-	sys-apps/procps
-	>=sys-apps/sed-4"
-PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )"
-
-warning() {
-	ewarn
-	ewarn "If you're upgrading from MySQL-3.x, you must recompile the other"
-	ewarn "packages on your system that link with libmysqlclient after the"
-	ewarn "upgrade completes.  To obtain such a list of packages for your"
-	ewarn "system, you may use 'revdep-rebuild' from app-portage/gentoolkit."
-	ewarn
-	epause 5
-}
-
-pkg_setup() {
-	warning
-}
-
-src_unpack() {
-	if use static && use ssl; then
-		local msg="MySQL does not support building statically with SSL support"
-		eerror "${msg}"
-		die "${msg}"
-	fi
-	unpack ${A} || die
-	cd ${S} || die
-	#required for qmail-mysql
-	patch -p0 < ${FILESDIR}/${PN}-4.0-nisam.h.diff || die
-	#zap startup script messages
-	patch -p1 < ${FILESDIR}/${PN}-4.0.4-install-db-sh.diff || die
-	#zap binary distribution stuff
-	patch -p1 < ${FILESDIR}/${PN}-4.0.14-mysqld-safe-sh.diff || die
-	#for correct hardcoded sysconf directory
-	patch -p1 < ${FILESDIR}/${PN}-4.0-my-print-defaults.diff || die
-	#patch -p1 < ${FILESDIR}/mysql-3.23.51-tcpd.patch || die
-
-	# attempt to get libmysqlclient_r linked against ssl if USE="ssl" enabled
-	# i would really prefer to fix this at the Makefile.am level, but can't
-	# get the software to autoreconf as distributed - too many missing files
-	# Robert Coie <rac@gentoo.org> 2003.06.12
-	patch -p0 < ${FILESDIR}/${PN}-4.0.13-thrssl.patch || die
-
-	if use tcpd; then
-		patch -p1 -d ${S} < ${FILESDIR}/mysql-4.0.14-r1-tcpd-vars-fix.diff || die
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	#The following fix is due to a bug with bdb on sparc's. See:
-	#http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
-	if use sparc || use alpha || use hppa
-	then
-		myconf="${myconf} --without-berkeley-db"
-	else
-		use berkdb \
-			&& myconf="${myconf} --with-berkeley-db=./bdb" \
-			|| myconf="${myconf} --without-berkeley-db"
-	fi
-
-	#readline pair reads backwards on purpose, DONT change it around, Ok?
-	use readline && myconf="${myconf} --without-readline"
-	use readline || myconf="${myconf} --with-readline"
-
-	use static \
-		&& myconf="${myconf} --with-mysqld-ldflags=-all-static --disable-shared" \
-		|| myconf="${myconf} --enable-shared --enable-static"
-
-	myconf="${myconf} `use_with tcpd libwrap`"
-	myconf="${myconf} `use_with innodb`"
-
-	use ssl \
-		&& myconf="${myconf} --with-vio --with-openssl" \
-		|| myconf="${myconf} --without-openssl"
-
-	myconf="${myconf} `use_with debug`"
-
-	#glibc-2.3.2_pre fix; bug #16496
-	export CFLAGS="${CFLAGS} -DHAVE_ERRNO_AS_DEFINE=1"
-
-	#bug fix for #15099, should make this api backward compatible
-	export CFLAGS="${CFLAGS} -DUSE_OLD_FUNCTIONS"
-
-	#the compiler flags are as per their "official" spec ;)
-	#CFLAGS="${CFLAGS/-O?/} -O3" \
-	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti" \
-	econf \
-		--libexecdir=/usr/sbin \
-		--sysconfdir=/etc/mysql \
-		--localstatedir=/var/lib/mysql \
-		--with-raid \
-		--with-low-memory \
-		--enable-assembler \
-		--with-charset=latin1 \
-		--enable-local-infile \
-		--with-mysqld-user=mysql \
-		--with-extra-charsets=all \
-		--enable-thread-safe-client \
-		--with-client-ldflags=-lstdc++ \
-		--with-comment="Gentoo Linux ${PF}" \
-		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
-		--with-embedded-server \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make install DESTDIR=${D} benchdir_root=/usr/share/mysql || die
-
-	#move client libs, install a couple of missing headers
-	mv ${D}/usr/lib/mysql/libmysqlclient*.so* ${D}/usr/lib
-	dosym ../libmysqlclient.so /usr/lib/mysql/libmysqlclient.so
-	dosym ../libmysqlclient_r.so /usr/lib/mysql/libmysqlclient_r.so
-	insinto /usr/include/mysql ; doins include/{my_config.h,my_dir.h}
-
-	#convenience links
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlanalyze
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlrepair
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqloptimize
-
-	#various junk
-	rm -f ${D}/usr/share/mysql/mysql.server
-	rm -f ${D}/usr/share/mysql/binary-configure
-	rm -f ${D}/usr/share/mysql/make_binary_distribution
-	rm -f ${D}/usr/share/mysql/mysql-log-rotate
-	rm -f ${D}/usr/share/mysql/{post,pre}install
-	rm -f ${D}/usr/share/mysql/mi_test*
-	rm -f ${D}/usr/share/mysql/*.spec # Redhat gunk
-	rm -f ${D}/usr/share/mysql/*.plist # Apple gunk
-	rm -f ${D}/usr/share/mysql/my-*.cnf # Put them elsewhere
-
-	# All of these (ab)use Perl.
-	if ! use perl; then
-		rm -f ${D}/usr/bin/mysql_setpermission
-		rm -rf ${D}/usr/share/mysql/sql-bench
-	fi
-
-	dodoc README COPYING COPYING.LIB Docs/manual.*
-	docinto conf-samples
-	dodoc support-files/my-*.cnf
-	dohtml -r Docs/*
-
-	insinto /etc/mysql
-	newins ${FILESDIR}/my.cnf-4.0.14-r1 my.cnf
-	doins scripts/mysqlaccess.conf
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mysql-4.0.rc6 mysql
-}
-
-pkg_config() {
-	if [ ! -d ${ROOT}/var/lib/mysql/mysql ] ; then
-		einfo "Press ENTER to create the mysql database and set proper"
-		einfo "permissions on it, or Control-C to abort now..."
-		read
-		${ROOT}/usr/bin/mysql_install_db #>>/var/log/mysql/mysql.err 2>&1
-		# changing ownership of newly created databases to mysql.mysql
-		local DATADIR=""
-		if [ -f '/etc/mysql/my.cnf' ] ; then
-			#DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'`
-			DATADIR=`/usr/sbin/mysqld  --help |grep '^datadir' | awk '{print $2}'`
-		fi
-		if [ -z "${DATADIR}" ]; then
-			DATADIR="/var/lib/mysql/"
-		fi
-		chown -R mysql:mysql ${DATADIR}
-	else
-		einfo "Hmm, it appears as though you already have the mysql"
-		einfo "database in place.  If you are having problems trying"
-		einfo "to start mysqld, perhaps you need to manually run"
-		einfo "/usr/bin/mysql_install_db and/or check your config"
-		einfo "file(s) and/or database(s) and/or logfile(s)."
-	fi
-}
-
-pkg_preinst() {
-	if ! groupmod mysql; then
-		groupadd -g 60 mysql || die "problem adding group mysql"
-	fi
-
-	if ! id mysql; then
-		useradd -g mysql -s /dev/null -d /var/lib/mysql -c "mysql" mysql
-		assert "problem adding user mysql"
-	fi
-}
-
-pkg_postinst() {
-	#empty dirs...
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/lib/mysql
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/run/mysqld
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
-
-	#secure the logfiles... does this bother anybody?
-	touch ${ROOT}/var/log/mysql/mysql.{log,err}
-	chown mysql:mysql ${ROOT}/var/log/mysql/mysql.{log,err}
-	chmod 0660 ${ROOT}/var/log/mysql/mysql.{log,err}
-
-	#your friendly public service announcement...
-	einfo
-	einfo "You might want to run:"
-	einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\""
-	einfo "if this is a new install."
-	einfo
-
-	warning
-}
diff --git a/dev-db/mysql/mysql-4.0.14-r2.ebuild b/dev-db/mysql/mysql-4.0.14-r2.ebuild
deleted file mode 100644
index 5b220806a60c..000000000000
--- a/dev-db/mysql/mysql-4.0.14-r2.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.14-r2.ebuild,v 1.13 2004/09/06 18:05:24 ciaranm Exp $
-
-inherit eutils
-#to accomodate -laadeedah releases
-NEWP=${P}
-
-SVER=${PV%.*}
-#normal releases:
-SDIR=MySQL-${SVER}
-#for a pre-release:
-#SDIR=MySQL-${SVER}-Pre
-
-S=${WORKDIR}/${NEWP}
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-HOMEPAGE="http://www.mysql.com/"
-SRC_URI="mirror://mysql/Downloads/${SDIR}/${NEWP}.tar.gz"
-RESTRICT="nomirror"
-
-KEYWORDS="x86 sparc ppc ~amd64 ~hppa"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static readline innodb berkdb tcpd ssl perl debug"
-
-DEPEND="readline? ( >=sys-libs/readline-4.1 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( dev-lang/perl )
-	>=sys-libs/zlib-1.1.3
-	sys-apps/procps
-	>=sys-apps/sed-4"
-PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )"
-
-warning() {
-	ewarn
-	ewarn "If you're upgrading from MySQL-3.x, you must recompile the other"
-	ewarn "packages on your system that link with libmysqlclient after the"
-	ewarn "upgrade completes.  To obtain such a list of packages for your"
-	ewarn "system, you may use 'revdep-rebuild' from app-portage/gentoolkit."
-	ewarn
-	epause 5
-}
-
-pkg_setup() {
-	warning
-}
-
-src_unpack() {
-	if use static && use ssl; then
-		local msg="MySQL does not support building statically with SSL support"
-		eerror "${msg}"
-		die "${msg}"
-	fi
-	unpack ${A} || die
-	cd ${S} || die
-	#required for qmail-mysql
-	patch -p0 < ${FILESDIR}/${PN}-4.0-nisam.h.diff || die
-	#zap startup script messages
-	patch -p1 < ${FILESDIR}/${PN}-4.0.4-install-db-sh.diff || die
-	#zap binary distribution stuff
-	patch -p1 < ${FILESDIR}/${PN}-4.0.14-mysqld-safe-sh.diff || die
-	#for correct hardcoded sysconf directory
-	patch -p1 < ${FILESDIR}/${PN}-4.0-my-print-defaults.diff || die
-	#patch -p1 < ${FILESDIR}/mysql-3.23.51-tcpd.patch || die
-
-	# attempt to get libmysqlclient_r linked against ssl if USE="ssl" enabled
-	# i would really prefer to fix this at the Makefile.am level, but can't
-	# get the software to autoreconf as distributed - too many missing files
-	# Robert Coie <rac@gentoo.org> 2003.06.12
-	patch -p0 < ${FILESDIR}/${PN}-4.0.13-thrssl.patch || die
-
-	if use tcpd; then
-		patch -p1 -d ${S} < ${FILESDIR}/mysql-4.0.14-r1-tcpd-vars-fix.diff || die
-	fi
-	# fix buffer overflow in mysql4 prior to 4.0.15 bug #28394
-	[ "$PV" == "4.0.14" ] &&
-		 epatch ${FILESDIR}/mysql-${PV}-security-28394.patch
-}
-
-src_compile() {
-	local myconf
-
-	#The following fix is due to a bug with bdb on sparc's. See:
-	#http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
-	if use sparc || use alpha || use hppa
-	then
-		myconf="${myconf} --without-berkeley-db"
-	else
-		use berkdb \
-			&& myconf="${myconf} --with-berkeley-db=./bdb" \
-			|| myconf="${myconf} --without-berkeley-db"
-	fi
-
-	#readline pair reads backwards on purpose, DONT change it around, Ok?
-	use readline && myconf="${myconf} --without-readline"
-	use readline || myconf="${myconf} --with-readline"
-
-	use static \
-		&& myconf="${myconf} --with-mysqld-ldflags=-all-static --disable-shared" \
-		|| myconf="${myconf} --enable-shared --enable-static"
-
-	myconf="${myconf} `use_with tcpd libwrap`"
-	myconf="${myconf} `use_with innodb`"
-
-	use ssl \
-		&& myconf="${myconf} --with-vio --with-openssl" \
-		|| myconf="${myconf} --without-openssl"
-
-	myconf="${myconf} `use_with debug`"
-
-	#glibc-2.3.2_pre fix; bug #16496
-	export CFLAGS="${CFLAGS} -DHAVE_ERRNO_AS_DEFINE=1"
-
-	#bug fix for #15099, should make this api backward compatible
-	export CFLAGS="${CFLAGS} -DUSE_OLD_FUNCTIONS"
-
-	#the compiler flags are as per their "official" spec ;)
-	#CFLAGS="${CFLAGS/-O?/} -O3" \
-	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti" \
-	econf \
-		--libexecdir=/usr/sbin \
-		--sysconfdir=/etc/mysql \
-		--localstatedir=/var/lib/mysql \
-		--with-raid \
-		--with-low-memory \
-		--enable-assembler \
-		--with-charset=latin1 \
-		--enable-local-infile \
-		--with-mysqld-user=mysql \
-		--with-extra-charsets=all \
-		--enable-thread-safe-client \
-		--with-client-ldflags=-lstdc++ \
-		--with-comment="Gentoo Linux ${PF}" \
-		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
-		--with-embedded-server \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make install DESTDIR=${D} benchdir_root=/usr/share/mysql || die
-
-	#move client libs, install a couple of missing headers
-	mv ${D}/usr/lib/mysql/libmysqlclient*.so* ${D}/usr/lib
-	dosym ../libmysqlclient.so /usr/lib/mysql/libmysqlclient.so
-	dosym ../libmysqlclient_r.so /usr/lib/mysql/libmysqlclient_r.so
-	insinto /usr/include/mysql ; doins include/{my_config.h,my_dir.h}
-
-	#convenience links
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlanalyze
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlrepair
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqloptimize
-
-	#various junk
-	rm -f ${D}/usr/share/mysql/mysql.server
-	rm -f ${D}/usr/share/mysql/binary-configure
-	rm -f ${D}/usr/share/mysql/make_binary_distribution
-	rm -f ${D}/usr/share/mysql/mysql-log-rotate
-	rm -f ${D}/usr/share/mysql/{post,pre}install
-	rm -f ${D}/usr/share/mysql/mi_test*
-	rm -f ${D}/usr/share/mysql/*.spec # Redhat gunk
-	rm -f ${D}/usr/share/mysql/*.plist # Apple gunk
-	rm -f ${D}/usr/share/mysql/my-*.cnf # Put them elsewhere
-
-	# All of these (ab)use Perl.
-	if ! use perl; then
-		rm -f ${D}/usr/bin/mysql_setpermission
-		rm -rf ${D}/usr/share/mysql/sql-bench
-	fi
-
-	dodoc README COPYING COPYING.LIB Docs/manual.*
-	docinto conf-samples
-	dodoc support-files/my-*.cnf
-	dohtml -r Docs/*
-
-	insinto /etc/mysql
-	newins ${FILESDIR}/my.cnf-4.0.14-r1 my.cnf
-	doins scripts/mysqlaccess.conf
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mysql-4.0.rc6 mysql
-}
-
-pkg_config() {
-	if [ ! -d ${ROOT}/var/lib/mysql/mysql ] ; then
-		einfo "Press ENTER to create the mysql database and set proper"
-		einfo "permissions on it, or Control-C to abort now..."
-		read
-		${ROOT}/usr/bin/mysql_install_db #>>/var/log/mysql/mysql.err 2>&1
-		# changing ownership of newly created databases to mysql.mysql
-		local DATADIR=""
-		if [ -f '/etc/mysql/my.cnf' ] ; then
-			#DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'`
-			DATADIR=`/usr/sbin/mysqld  --help |grep '^datadir' | awk '{print $2}'`
-		fi
-		if [ -z "${DATADIR}" ]; then
-			DATADIR="/var/lib/mysql/"
-		fi
-		chown -R mysql:mysql ${DATADIR}
-	else
-		einfo "Hmm, it appears as though you already have the mysql"
-		einfo "database in place.  If you are having problems trying"
-		einfo "to start mysqld, perhaps you need to manually run"
-		einfo "/usr/bin/mysql_install_db and/or check your config"
-		einfo "file(s) and/or database(s) and/or logfile(s)."
-	fi
-}
-
-pkg_preinst() {
-	if ! groupmod mysql; then
-		groupadd -g 60 mysql || die "problem adding group mysql"
-	fi
-
-	if ! id mysql; then
-		useradd -g mysql -s /dev/null -d /var/lib/mysql -c "mysql" mysql
-		assert "problem adding user mysql"
-	fi
-}
-
-pkg_postinst() {
-	#empty dirs...
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/lib/mysql
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/run/mysqld
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
-
-	#secure the logfiles... does this bother anybody?
-	touch ${ROOT}/var/log/mysql/mysql.{log,err}
-	chown mysql:mysql ${ROOT}/var/log/mysql/mysql.{log,err}
-	chmod 0660 ${ROOT}/var/log/mysql/mysql.{log,err}
-
-	#your friendly public service announcement...
-	einfo
-	einfo "You might want to run:"
-	einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\""
-	einfo "if this is a new install."
-	einfo
-
-	warning
-}
diff --git a/dev-db/mysql/mysql-4.0.14.ebuild b/dev-db/mysql/mysql-4.0.14.ebuild
deleted file mode 100644
index 248439ad58a3..000000000000
--- a/dev-db/mysql/mysql-4.0.14.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.14.ebuild,v 1.16 2004/09/06 18:05:24 ciaranm Exp $
-
-inherit eutils
-
-#to accomodate -laadeedah releases
-NEWP=${P}
-
-SVER=${PV%.*}
-#normal releases:
-SDIR=MySQL-${SVER}
-#for a pre-release:
-#SDIR=MySQL-${SVER}-Pre
-
-S=${WORKDIR}/${NEWP}
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-HOMEPAGE="http://www.mysql.com/"
-SRC_URI="mirror://mysql/Downloads/${SDIR}/${NEWP}.tar.gz"
-RESTRICT="nomirror"
-
-KEYWORDS="~x86 ~sparc ppc ~amd64 ~hppa"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static readline innodb berkdb tcpd ssl perl debug"
-
-DEPEND="readline? ( >=sys-libs/readline-4.1 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( dev-lang/perl )
-	>=sys-libs/zlib-1.1.3
-	sys-apps/procps
-	>=sys-apps/sed-4"
-PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )"
-
-warning() {
-	ewarn
-	ewarn "If you're upgrading from MySQL-3.x, you must recompile the other"
-	ewarn "packages on your system that link with libmysqlclient after the"
-	ewarn "upgrade completes.  To obtain such a list of packages for your"
-	ewarn "system, you may use 'revdep-rebuild' from app-portage/gentoolkit."
-	ewarn
-	epause 5
-}
-
-pkg_setup() {
-	warning
-}
-
-src_unpack() {
-	if use static && use ssl; then
-		local msg="MySQL does not support building statically with SSL support"
-		eerror "${msg}"
-		die "${msg}"
-	fi
-	unpack ${A} || die
-	cd ${S} || die
-	#required for qmail-mysql
-	patch -p0 < ${FILESDIR}/${PN}-4.0-nisam.h.diff || die
-	#zap startup script messages
-	patch -p1 < ${FILESDIR}/${PN}-4.0.4-install-db-sh.diff || die
-	#zap binary distribution stuff
-	patch -p1 < ${FILESDIR}/${PN}-4.0.14-mysqld-safe-sh.diff || die
-	#for correct hardcoded sysconf directory
-	patch -p1 < ${FILESDIR}/${PN}-4.0-my-print-defaults.diff || die
-	#patch -p1 < ${FILESDIR}/mysql-3.23.51-tcpd.patch || die
-
-	# attempt to get libmysqlclient_r linked against ssl if USE="ssl" enabled
-	# i would really prefer to fix this at the Makefile.am level, but can't
-	# get the software to autoreconf as distributed - too many missing files
-	# Robert Coie <rac@gentoo.org> 2003.06.12
-	patch -p0 < ${FILESDIR}/${PN}-4.0.13-thrssl.patch || die
-}
-
-src_compile() {
-	local myconf
-
-	#The following fix is due to a bug with bdb on sparc's. See:
-	#http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
-	if use sparc || use alpha || use hppa
-	then
-		myconf="${myconf} --without-berkeley-db"
-	else
-		use berkdb \
-			&& myconf="${myconf} --with-berkeley-db=./bdb" \
-			|| myconf="${myconf} --without-berkeley-db"
-	fi
-
-	#readline pair reads backwards on purpose, DONT change it around, Ok?
-	use readline && myconf="${myconf} --without-readline"
-	use readline || myconf="${myconf} --with-readline"
-
-	use static \
-		&& myconf="${myconf} --with-mysqld-ldflags=-all-static --disable-shared" \
-		|| myconf="${myconf} --enable-shared --enable-static"
-
-	myconf="${myconf} `use_with tcpd libwrap`"
-	myconf="${myconf} `use_with innodb`"
-
-	use ssl \
-		&& myconf="${myconf} --with-vio --with-openssl" \
-		|| myconf="${myconf} --without-openssl"
-
-	myconf="${myconf} `use_with debug`"
-
-	#glibc-2.3.2_pre fix; bug #16496
-	export CFLAGS="${CFLAGS} -DHAVE_ERRNO_AS_DEFINE=1"
-
-	#bug fix for #15099, should make this api backward compatible
-	export CFLAGS="${CFLAGS} -DUSE_OLD_FUNCTIONS"
-
-	#the compiler flags are as per their "official" spec ;)
-	#CFLAGS="${CFLAGS/-O?/} -O3" \
-	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti" \
-	econf \
-		--libexecdir=/usr/sbin \
-		--sysconfdir=/etc/mysql \
-		--localstatedir=/var/lib/mysql \
-		--with-raid \
-		--with-low-memory \
-		--enable-assembler \
-		--with-charset=latin1 \
-		--enable-local-infile \
-		--with-mysqld-user=mysql \
-		--with-extra-charsets=all \
-		--enable-thread-safe-client \
-		--with-client-ldflags=-lstdc++ \
-		--with-comment="Gentoo Linux ${PF}" \
-		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
-		--with-embedded-server \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make install DESTDIR=${D} benchdir_root=/usr/share/mysql || die
-
-	#move client libs, install a couple of missing headers
-	mv ${D}/usr/lib/mysql/libmysqlclient*.so* ${D}/usr/lib
-	dosym ../libmysqlclient.so /usr/lib/mysql/libmysqlclient.so
-	dosym ../libmysqlclient_r.so /usr/lib/mysql/libmysqlclient_r.so
-	insinto /usr/include/mysql ; doins include/{my_config.h,my_dir.h}
-
-	#convenience links
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlanalyze
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlrepair
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqloptimize
-
-	#various junk
-	rm -f ${D}/usr/share/mysql/mysql.server
-	rm -f ${D}/usr/share/mysql/binary-configure
-	rm -f ${D}/usr/share/mysql/make_binary_distribution
-	rm -f ${D}/usr/share/mysql/mysql-log-rotate
-	rm -f ${D}/usr/share/mysql/{post,pre}install
-	rm -f ${D}/usr/share/mysql/mi_test*
-	rm -f ${D}/usr/share/mysql/*.spec # Redhat gunk
-	rm -f ${D}/usr/share/mysql/*.plist # Apple gunk
-	rm -f ${D}/usr/share/mysql/my-*.cnf # Put them elsewhere
-
-	# All of these (ab)use Perl.
-	if ! use perl; then
-		rm -f ${D}/usr/bin/mysql_setpermission
-		rm -rf ${D}/usr/share/mysql/sql-bench
-	fi
-
-	dodoc README COPYING COPYING.LIB Docs/manual.*
-	docinto conf-samples
-	dodoc support-files/my-*.cnf
-	dohtml -r Docs/*
-
-	insinto /etc/mysql
-	doins ${FILESDIR}/my.cnf scripts/mysqlaccess.conf
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mysql-4.0.rc6 mysql
-}
-
-pkg_config() {
-	if [ ! -d ${ROOT}/var/lib/mysql/mysql ] ; then
-		einfo "Press ENTER to create the mysql database and set proper"
-		einfo "permissions on it, or Control-C to abort now..."
-		read
-		${ROOT}/usr/bin/mysql_install_db #>>/var/log/mysql/mysql.err 2>&1
-	else
-		einfo "Hmm, it appears as though you already have the mysql"
-		einfo "database in place.  If you are having problems trying"
-		einfo "to start mysqld, perhaps you need to manually run"
-		einfo "/usr/bin/mysql_install_db and/or check your config"
-		einfo "file(s) and/or database(s) and/or logfile(s)."
-	fi
-}
-
-pkg_preinst() {
-	if ! groupmod mysql; then
-		groupadd -g 60 mysql || die "problem adding group mysql"
-	fi
-
-	if ! id mysql; then
-		useradd -g mysql -s /dev/null -d /var/lib/mysql -c "mysql" mysql
-		assert "problem adding user mysql"
-	fi
-}
-
-pkg_postinst() {
-	#empty dirs...
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/lib/mysql
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/run/mysqld
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
-
-	#secure the logfiles... does this bother anybody?
-	touch ${ROOT}/var/log/mysql/mysql.{log,err}
-	chown mysql:mysql ${ROOT}/var/log/mysql/mysql.{log,err}
-	chmod 0660 ${ROOT}/var/log/mysql/mysql.{log,err}
-
-	#your friendly public service announcement...
-	einfo
-	einfo "You might want to run:"
-	einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\""
-	einfo "if this is a new install."
-	einfo
-
-	warning
-}
diff --git a/dev-db/mysql/mysql-4.0.15-r1.ebuild b/dev-db/mysql/mysql-4.0.15-r1.ebuild
deleted file mode 100644
index 630b41197fbb..000000000000
--- a/dev-db/mysql/mysql-4.0.15-r1.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.15-r1.ebuild,v 1.7 2004/09/06 18:05:24 ciaranm Exp $
-
-inherit eutils
-#to accomodate -laadeedah releases
-NEWP=${P}
-
-SVER=${PV%.*}
-#normal releases:
-SDIR=MySQL-${SVER}
-#for a pre-release:
-#SDIR=MySQL-${SVER}-Pre
-
-S=${WORKDIR}/${NEWP}
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-HOMEPAGE="http://www.mysql.com/"
-SRC_URI="mirror://mysql/Downloads/${SDIR}/${NEWP}.tar.gz"
-RESTRICT="nomirror"
-
-KEYWORDS="ia64 ~x86 ~sparc ppc ~amd64 ~hppa"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static readline innodb berkdb tcpd ssl perl debug"
-
-DEPEND="readline? ( >=sys-libs/readline-4.1 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( dev-lang/perl )
-	>=sys-libs/zlib-1.1.3
-	sys-apps/procps
-	>=sys-apps/sed-4"
-PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )"
-
-warning() {
-	ewarn
-	ewarn "If you're upgrading from MySQL-3.x, you must recompile the other"
-	ewarn "packages on your system that link with libmysqlclient after the"
-	ewarn "upgrade completes.  To obtain such a list of packages for your"
-	ewarn "system, you may use 'revdep-rebuild' from app-portage/gentoolkit."
-	ewarn
-	epause 5
-}
-
-pkg_setup() {
-	warning
-}
-
-src_unpack() {
-	if use static && use ssl; then
-		local msg="MySQL does not support building statically with SSL support"
-		eerror "${msg}"
-		die "${msg}"
-	fi
-	unpack ${A} || die
-	cd ${S} || die
-	#required for qmail-mysql
-	patch -p0 < ${FILESDIR}/${PN}-4.0-nisam.h.diff || die
-	#zap startup script messages
-	patch -p1 < ${FILESDIR}/${PN}-4.0.4-install-db-sh.diff || die
-	#zap binary distribution stuff
-	patch -p1 < ${FILESDIR}/${PN}-4.0.14-mysqld-safe-sh.diff || die
-	#for correct hardcoded sysconf directory
-	patch -p1 < ${FILESDIR}/${PN}-4.0-my-print-defaults.diff || die
-	#patch -p1 < ${FILESDIR}/mysql-3.23.51-tcpd.patch || die
-
-	# attempt to get libmysqlclient_r linked against ssl if USE="ssl" enabled
-	# i would really prefer to fix this at the Makefile.am level, but can't
-	# get the software to autoreconf as distributed - too many missing files
-	# Robert Coie <rac@gentoo.org> 2003.06.12
-	patch -p0 < ${FILESDIR}/${PN}-4.0.13-thrssl.patch || die
-
-	if use tcpd; then
-		patch -p1 -d ${S} < ${FILESDIR}/mysql-4.0.14-r1-tcpd-vars-fix.diff || die
-	fi
-	# fix buffer overflow in mysql4 prior to 4.0.15 bug #28394
-	[ "$PV" == "4.0.14" ] &&
-		 epatch ${FILESDIR}/mysql-${PV}-security-28394.patch
-}
-
-src_compile() {
-	local myconf
-
-	#The following fix is due to a bug with bdb on sparc's. See:
-	#http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
-	if use sparc || use alpha || use hppa
-	then
-		myconf="${myconf} --without-berkeley-db"
-	else
-		use berkdb \
-			&& myconf="${myconf} --with-berkeley-db=./bdb" \
-			|| myconf="${myconf} --without-berkeley-db"
-	fi
-
-	#readline pair reads backwards on purpose, DONT change it around, Ok?
-	# this is because it refers to the building of a bundled readline
-	# versus the system copy
-	use readline && myconf="${myconf} --without-readline"
-	use readline || myconf="${myconf} --with-readline"
-
-	use static \
-		&& myconf="${myconf} --with-mysqld-ldflags=-all-static --disable-shared" \
-		|| myconf="${myconf} --enable-shared --enable-static"
-
-	myconf="${myconf} `use_with tcpd libwrap`"
-	myconf="${myconf} `use_with innodb`"
-
-	use ssl \
-		&& myconf="${myconf} --with-vio --with-openssl" \
-		|| myconf="${myconf} --without-openssl"
-
-	myconf="${myconf} `use_with debug`"
-
-	#glibc-2.3.2_pre fix; bug #16496
-	export CFLAGS="${CFLAGS} -DHAVE_ERRNO_AS_DEFINE=1"
-
-	#bug fix for #15099, should make this api backward compatible
-	export CFLAGS="${CFLAGS} -DUSE_OLD_FUNCTIONS"
-
-	#the compiler flags are as per their "official" spec ;)
-	#CFLAGS="${CFLAGS/-O?/} -O3" \
-	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti" \
-	econf \
-		--libexecdir=/usr/sbin \
-		--sysconfdir=/etc/mysql \
-		--localstatedir=/var/lib/mysql \
-		--with-raid \
-		--with-low-memory \
-		--enable-assembler \
-		--with-charset=latin1 \
-		--enable-local-infile \
-		--with-mysqld-user=mysql \
-		--with-extra-charsets=all \
-		--enable-thread-safe-client \
-		--with-client-ldflags=-lstdc++ \
-		--with-comment="Gentoo Linux ${PF}" \
-		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
-		--with-embedded-server \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make install DESTDIR=${D} benchdir_root=/usr/share/mysql || die
-
-	#move client libs, install a couple of missing headers
-	mv ${D}/usr/lib/mysql/libmysqlclient*.so* ${D}/usr/lib
-	dosym ../libmysqlclient.so /usr/lib/mysql/libmysqlclient.so
-	dosym ../libmysqlclient_r.so /usr/lib/mysql/libmysqlclient_r.so
-	insinto /usr/include/mysql ; doins include/{my_config.h,my_dir.h}
-
-	#convenience links
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlanalyze
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlrepair
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqloptimize
-
-	#various junk
-	rm -f ${D}/usr/share/mysql/mysql.server
-	rm -f ${D}/usr/share/mysql/binary-configure
-	rm -f ${D}/usr/share/mysql/make_binary_distribution
-	rm -f ${D}/usr/share/mysql/mysql-log-rotate
-	rm -f ${D}/usr/share/mysql/{post,pre}install
-	rm -f ${D}/usr/share/mysql/mi_test*
-	rm -f ${D}/usr/share/mysql/*.spec # Redhat gunk
-	rm -f ${D}/usr/share/mysql/*.plist # Apple gunk
-	rm -f ${D}/usr/share/mysql/my-*.cnf # Put them elsewhere
-
-	# All of these (ab)use Perl.
-	if ! use perl; then
-		rm -f ${D}/usr/bin/mysql_setpermission
-		rm -rf ${D}/usr/share/mysql/sql-bench
-	fi
-
-	dohtml Docs/*.html
-	rm -f Docs/*.html
-	dodoc README COPYING COPYING.LIB Docs/manual.*
-	docinto conf-samples
-	dodoc support-files/my-*.cnf
-
-	insinto /etc/mysql
-	newins ${FILESDIR}/my.cnf-4.0.14-r1 my.cnf
-	doins scripts/mysqlaccess.conf
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mysql-4.0.15.rc6 mysql
-}
-
-pkg_config() {
-	if [ ! -d ${ROOT}/var/lib/mysql/mysql ] ; then
-		einfo "Press ENTER to create the mysql database and set proper"
-		einfo "permissions on it, or Control-C to abort now..."
-		read
-		${ROOT}/usr/bin/mysql_install_db #>>/var/log/mysql/mysql.err 2>&1
-		# changing ownership of newly created databases to mysql.mysql
-		local DATADIR=""
-		if [ -f '/etc/mysql/my.cnf' ] ; then
-			#DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'`
-			DATADIR=`/usr/sbin/mysqld  --help |grep '^datadir' | awk '{print $2}'`
-		fi
-		if [ -z "${DATADIR}" ]; then
-			DATADIR="/var/lib/mysql/"
-		fi
-		chown -R mysql:mysql ${DATADIR}
-	else
-		einfo "Hmm, it appears as though you already have the mysql"
-		einfo "database in place.  If you are having problems trying"
-		einfo "to start mysqld, perhaps you need to manually run"
-		einfo "/usr/bin/mysql_install_db and/or check your config"
-		einfo "file(s) and/or database(s) and/or logfile(s)."
-	fi
-}
-
-pkg_preinst() {
-	if ! groupmod mysql; then
-		groupadd -g 60 mysql || die "problem adding group mysql"
-	fi
-
-	if ! id mysql; then
-		useradd -g mysql -s /dev/null -d /var/lib/mysql -c "mysql" mysql
-		assert "problem adding user mysql"
-	fi
-}
-
-pkg_postinst() {
-	#empty dirs...
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/lib/mysql
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/run/mysqld
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
-
-	#secure the logfiles... does this bother anybody?
-	touch ${ROOT}/var/log/mysql/mysql.{log,err}
-	chown mysql:mysql ${ROOT}/var/log/mysql/mysql.{log,err}
-	chmod 0660 ${ROOT}/var/log/mysql/mysql.{log,err}
-
-	#your friendly public service announcement...
-	einfo
-	einfo "You might want to run:"
-	einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\""
-	einfo "if this is a new install."
-	einfo
-
-	warning
-}
diff --git a/dev-db/mysql/mysql-4.0.15.ebuild b/dev-db/mysql/mysql-4.0.15.ebuild
deleted file mode 100644
index 5ab31d4b2f4a..000000000000
--- a/dev-db/mysql/mysql-4.0.15.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.15.ebuild,v 1.11 2004/09/06 18:05:24 ciaranm Exp $
-
-inherit eutils
-#to accomodate -laadeedah releases
-NEWP=${P}
-
-SVER=${PV%.*}
-#normal releases:
-SDIR=MySQL-${SVER}
-#for a pre-release:
-#SDIR=MySQL-${SVER}-Pre
-
-S=${WORKDIR}/${NEWP}
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-HOMEPAGE="http://www.mysql.com/"
-SRC_URI="mirror://mysql/Downloads/${SDIR}/${NEWP}.tar.gz"
-RESTRICT="nomirror"
-
-KEYWORDS="ia64 x86 ~sparc ppc ~amd64 ~hppa"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static readline innodb berkdb tcpd ssl perl debug"
-
-DEPEND="readline? ( >=sys-libs/readline-4.1 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( dev-lang/perl )
-	>=sys-libs/zlib-1.1.3
-	sys-apps/procps
-	>=sys-apps/sed-4"
-PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )"
-
-warning() {
-	ewarn
-	ewarn "If you're upgrading from MySQL-3.x, you must recompile the other"
-	ewarn "packages on your system that link with libmysqlclient after the"
-	ewarn "upgrade completes.  To obtain such a list of packages for your"
-	ewarn "system, you may use 'revdep-rebuild' from app-portage/gentoolkit."
-	ewarn
-	epause 5
-}
-
-pkg_setup() {
-	warning
-}
-
-src_unpack() {
-	if use static && use ssl; then
-		local msg="MySQL does not support building statically with SSL support"
-		eerror "${msg}"
-		die "${msg}"
-	fi
-	unpack ${A} || die
-	cd ${S} || die
-	#required for qmail-mysql
-	patch -p0 < ${FILESDIR}/${PN}-4.0-nisam.h.diff || die
-	#zap startup script messages
-	patch -p1 < ${FILESDIR}/${PN}-4.0.4-install-db-sh.diff || die
-	#zap binary distribution stuff
-	patch -p1 < ${FILESDIR}/${PN}-4.0.14-mysqld-safe-sh.diff || die
-	#for correct hardcoded sysconf directory
-	patch -p1 < ${FILESDIR}/${PN}-4.0-my-print-defaults.diff || die
-	#patch -p1 < ${FILESDIR}/mysql-3.23.51-tcpd.patch || die
-
-	# attempt to get libmysqlclient_r linked against ssl if USE="ssl" enabled
-	# i would really prefer to fix this at the Makefile.am level, but can't
-	# get the software to autoreconf as distributed - too many missing files
-	# Robert Coie <rac@gentoo.org> 2003.06.12
-	patch -p0 < ${FILESDIR}/${PN}-4.0.13-thrssl.patch || die
-
-	if use tcpd; then
-		patch -p1 -d ${S} < ${FILESDIR}/mysql-4.0.14-r1-tcpd-vars-fix.diff || die
-	fi
-	# fix buffer overflow in mysql4 prior to 4.0.15 bug #28394
-	[ "$PV" == "4.0.14" ] &&
-		 epatch ${FILESDIR}/mysql-${PV}-security-28394.patch
-}
-
-src_compile() {
-	local myconf
-
-	#The following fix is due to a bug with bdb on sparc's. See:
-	#http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
-	if use sparc || use alpha || use hppa
-	then
-		myconf="${myconf} --without-berkeley-db"
-	else
-		use berkdb \
-			&& myconf="${myconf} --with-berkeley-db=./bdb" \
-			|| myconf="${myconf} --without-berkeley-db"
-	fi
-
-	#readline pair reads backwards on purpose, DONT change it around, Ok?
-	use readline && myconf="${myconf} --without-readline"
-	use readline || myconf="${myconf} --with-readline"
-
-	use static \
-		&& myconf="${myconf} --with-mysqld-ldflags=-all-static --disable-shared" \
-		|| myconf="${myconf} --enable-shared --enable-static"
-
-	myconf="${myconf} `use_with tcpd libwrap`"
-	myconf="${myconf} `use_with innodb`"
-
-	use ssl \
-		&& myconf="${myconf} --with-vio --with-openssl" \
-		|| myconf="${myconf} --without-openssl"
-
-	myconf="${myconf} `use_with debug`"
-
-	#glibc-2.3.2_pre fix; bug #16496
-	export CFLAGS="${CFLAGS} -DHAVE_ERRNO_AS_DEFINE=1"
-
-	#bug fix for #15099, should make this api backward compatible
-	export CFLAGS="${CFLAGS} -DUSE_OLD_FUNCTIONS"
-
-	#the compiler flags are as per their "official" spec ;)
-	#CFLAGS="${CFLAGS/-O?/} -O3" \
-	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti" \
-	econf \
-		--libexecdir=/usr/sbin \
-		--sysconfdir=/etc/mysql \
-		--localstatedir=/var/lib/mysql \
-		--with-raid \
-		--with-low-memory \
-		--enable-assembler \
-		--with-charset=latin1 \
-		--enable-local-infile \
-		--with-mysqld-user=mysql \
-		--with-extra-charsets=all \
-		--enable-thread-safe-client \
-		--with-client-ldflags=-lstdc++ \
-		--with-comment="Gentoo Linux ${PF}" \
-		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
-		--with-embedded-server \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make install DESTDIR=${D} benchdir_root=/usr/share/mysql || die
-
-	#move client libs, install a couple of missing headers
-	mv ${D}/usr/lib/mysql/libmysqlclient*.so* ${D}/usr/lib
-	dosym ../libmysqlclient.so /usr/lib/mysql/libmysqlclient.so
-	dosym ../libmysqlclient_r.so /usr/lib/mysql/libmysqlclient_r.so
-	insinto /usr/include/mysql ; doins include/{my_config.h,my_dir.h}
-
-	#convenience links
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlanalyze
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlrepair
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqloptimize
-
-	#various junk
-	rm -f ${D}/usr/share/mysql/mysql.server
-	rm -f ${D}/usr/share/mysql/binary-configure
-	rm -f ${D}/usr/share/mysql/make_binary_distribution
-	rm -f ${D}/usr/share/mysql/mysql-log-rotate
-	rm -f ${D}/usr/share/mysql/{post,pre}install
-	rm -f ${D}/usr/share/mysql/mi_test*
-	rm -f ${D}/usr/share/mysql/*.spec # Redhat gunk
-	rm -f ${D}/usr/share/mysql/*.plist # Apple gunk
-	rm -f ${D}/usr/share/mysql/my-*.cnf # Put them elsewhere
-
-	# All of these (ab)use Perl.
-	if ! use perl; then
-		rm -f ${D}/usr/bin/mysql_setpermission
-		rm -rf ${D}/usr/share/mysql/sql-bench
-	fi
-
-	dodoc README COPYING COPYING.LIB Docs/manual.*
-	docinto conf-samples
-	dodoc support-files/my-*.cnf
-	dohtml -r Docs/*
-
-	insinto /etc/mysql
-	newins ${FILESDIR}/my.cnf-4.0.14-r1 my.cnf
-	doins scripts/mysqlaccess.conf
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mysql-4.0.15.rc6 mysql
-}
-
-pkg_config() {
-	if [ ! -d ${ROOT}/var/lib/mysql/mysql ] ; then
-		einfo "Press ENTER to create the mysql database and set proper"
-		einfo "permissions on it, or Control-C to abort now..."
-		read
-		${ROOT}/usr/bin/mysql_install_db #>>/var/log/mysql/mysql.err 2>&1
-		# changing ownership of newly created databases to mysql.mysql
-		local DATADIR=""
-		if [ -f '/etc/mysql/my.cnf' ] ; then
-			#DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'`
-			DATADIR=`/usr/sbin/mysqld  --help |grep '^datadir' | awk '{print $2}'`
-		fi
-		if [ -z "${DATADIR}" ]; then
-			DATADIR="/var/lib/mysql/"
-		fi
-		chown -R mysql:mysql ${DATADIR}
-	else
-		einfo "Hmm, it appears as though you already have the mysql"
-		einfo "database in place.  If you are having problems trying"
-		einfo "to start mysqld, perhaps you need to manually run"
-		einfo "/usr/bin/mysql_install_db and/or check your config"
-		einfo "file(s) and/or database(s) and/or logfile(s)."
-	fi
-}
-
-pkg_preinst() {
-	if ! groupmod mysql; then
-		groupadd -g 60 mysql || die "problem adding group mysql"
-	fi
-
-	if ! id mysql; then
-		useradd -g mysql -s /dev/null -d /var/lib/mysql -c "mysql" mysql
-		assert "problem adding user mysql"
-	fi
-}
-
-pkg_postinst() {
-	#empty dirs...
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/lib/mysql
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/run/mysqld
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
-
-	#secure the logfiles... does this bother anybody?
-	touch ${ROOT}/var/log/mysql/mysql.{log,err}
-	chown mysql:mysql ${ROOT}/var/log/mysql/mysql.{log,err}
-	chmod 0660 ${ROOT}/var/log/mysql/mysql.{log,err}
-
-	#your friendly public service announcement...
-	einfo
-	einfo "You might want to run:"
-	einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\""
-	einfo "if this is a new install."
-	einfo
-
-	warning
-}
diff --git a/dev-db/mysql/mysql-4.0.16.ebuild b/dev-db/mysql/mysql-4.0.16.ebuild
deleted file mode 100644
index 42b3be86e668..000000000000
--- a/dev-db/mysql/mysql-4.0.16.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.16.ebuild,v 1.11 2004/09/06 18:05:24 ciaranm Exp $
-
-inherit eutils
-#to accomodate -laadeedah releases
-NEWP=${P}
-
-SVER=${PV%.*}
-#normal releases:
-SDIR=MySQL-${SVER}
-#for a pre-release:
-#SDIR=MySQL-${SVER}-Pre
-
-S=${WORKDIR}/${NEWP}
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-HOMEPAGE="http://www.mysql.com/"
-SRC_URI="mirror://mysql/Downloads/${SDIR}/${NEWP}.tar.gz"
-RESTRICT="nomirror"
-
-KEYWORDS="ia64 x86 sparc ppc ~amd64 hppa alpha"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static readline innodb berkdb tcpd ssl perl debug"
-
-DEPEND="readline? ( >=sys-libs/readline-4.1 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( dev-lang/perl )
-	>=sys-libs/zlib-1.1.3
-	sys-apps/procps
-	>=sys-apps/sed-4"
-PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )"
-
-warning() {
-	ewarn
-	ewarn "If you're upgrading from MySQL-3.x, you must recompile the other"
-	ewarn "packages on your system that link with libmysqlclient after the"
-	ewarn "upgrade completes.  To obtain such a list of packages for your"
-	ewarn "system, you may use 'revdep-rebuild' from app-portage/gentoolkit."
-	ewarn
-	epause 5
-}
-
-pkg_setup() {
-	warning
-}
-
-src_unpack() {
-	if use static && use ssl; then
-		local msg="MySQL does not support building statically with SSL support"
-		eerror "${msg}"
-		die "${msg}"
-	fi
-	unpack ${A} || die
-
-	#zap startup script messages
-	epatch ${FILESDIR}/${PN}-4.0.16-install-db-sh.diff
-	#zap binary distribution stuff
-	epatch ${FILESDIR}/${PN}-4.0.16-mysqld-safe-sh.diff
-	#required for qmail-mysql
-	EPATCH_OPTS="-p0 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0-nisam.h.diff
-	#for correct hardcoded sysconf directory
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0-my-print-defaults.diff
-
-	# attempt to get libmysqlclient_r linked against ssl if USE="ssl" enabled
-	# i would really prefer to fix this at the Makefile.am level, but can't
-	# get the software to autoreconf as distributed - too many missing files
-	# Robert Coie <rac@gentoo.org> 2003.06.12
-	EPATCH_OPTS="-p0 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.13-thrssl.patch
-
-	if use tcpd; then
-		EPATCH_OPTS="-p1 -d ${S}" \
-		epatch ${FILESDIR}/${PN}-4.0.14-r1-tcpd-vars-fix.diff
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	#The following fix is due to a bug with bdb on sparc's. See:
-	#http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
-	if use sparc || use alpha || use hppa
-	then
-		myconf="${myconf} --without-berkeley-db"
-	else
-		use berkdb \
-			&& myconf="${myconf} --with-berkeley-db=./bdb" \
-			|| myconf="${myconf} --without-berkeley-db"
-	fi
-
-	#readline pair reads backwards on purpose, DONT change it around, Ok?
-	# this is because it refers to the building of a bundled readline
-	# versus the system copy
-	use readline && myconf="${myconf} --without-readline"
-	use readline || myconf="${myconf} --with-readline"
-
-	use static \
-		&& myconf="${myconf} --with-mysqld-ldflags=-all-static --disable-shared" \
-		|| myconf="${myconf} --enable-shared --enable-static"
-
-	myconf="${myconf} `use_with tcpd libwrap`"
-	myconf="${myconf} `use_with innodb`"
-
-	use ssl \
-		&& myconf="${myconf} --with-vio --with-openssl" \
-		|| myconf="${myconf} --without-openssl"
-
-	myconf="${myconf} `use_with debug`"
-
-	#glibc-2.3.2_pre fix; bug #16496
-	export CFLAGS="${CFLAGS} -DHAVE_ERRNO_AS_DEFINE=1"
-
-	#bug fix for #15099, should make this api backward compatible
-	export CFLAGS="${CFLAGS} -DUSE_OLD_FUNCTIONS"
-
-	#the compiler flags are as per their "official" spec ;)
-	#CFLAGS="${CFLAGS/-O?/} -O3" \
-	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti" \
-	econf \
-		--libexecdir=/usr/sbin \
-		--sysconfdir=/etc/mysql \
-		--localstatedir=/var/lib/mysql \
-		--with-raid \
-		--with-low-memory \
-		--enable-assembler \
-		--with-charset=latin1 \
-		--enable-local-infile \
-		--with-mysqld-user=mysql \
-		--with-extra-charsets=all \
-		--enable-thread-safe-client \
-		--with-client-ldflags=-lstdc++ \
-		--with-comment="Gentoo Linux ${PF}" \
-		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
-		--with-embedded-server \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make install DESTDIR=${D} benchdir_root=/usr/share/mysql || die
-
-	#move client libs, install a couple of missing headers
-	mv ${D}/usr/lib/mysql/libmysqlclient*.so* ${D}/usr/lib
-	dosym ../libmysqlclient.so /usr/lib/mysql/libmysqlclient.so
-	dosym ../libmysqlclient_r.so /usr/lib/mysql/libmysqlclient_r.so
-	insinto /usr/include/mysql ; doins include/{my_config.h,my_dir.h}
-
-	#convenience links
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlanalyze
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlrepair
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqloptimize
-
-	#various junk
-	rm -f ${D}/usr/share/mysql/mysql.server
-	rm -f ${D}/usr/share/mysql/binary-configure
-	rm -f ${D}/usr/share/mysql/make_binary_distribution
-	rm -f ${D}/usr/share/mysql/mysql-log-rotate
-	rm -f ${D}/usr/share/mysql/{post,pre}install
-	rm -f ${D}/usr/share/mysql/mi_test*
-	rm -f ${D}/usr/share/mysql/*.spec # Redhat gunk
-	rm -f ${D}/usr/share/mysql/*.plist # Apple gunk
-	rm -f ${D}/usr/share/mysql/my-*.cnf # Put them elsewhere
-
-	# All of these (ab)use Perl.
-	if ! use perl; then
-		rm -f ${D}/usr/bin/mysql_setpermission
-		rm -rf ${D}/usr/share/mysql/sql-bench
-	fi
-
-	dohtml Docs/*.html
-	rm -f Docs/*.html
-	dodoc README COPYING COPYING.LIB Docs/manual.*
-	docinto conf-samples
-	dodoc support-files/my-*.cnf
-
-	insinto /etc/mysql
-	newins ${FILESDIR}/my.cnf-4.0.14-r1 my.cnf
-	doins scripts/mysqlaccess.conf
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mysql-4.0.15.rc6 mysql
-}
-
-pkg_config() {
-	if [ ! -d ${ROOT}/var/lib/mysql/mysql ] ; then
-		einfo "Press ENTER to create the mysql database and set proper"
-		einfo "permissions on it, or Control-C to abort now..."
-		read
-		${ROOT}/usr/bin/mysql_install_db #>>/var/log/mysql/mysql.err 2>&1
-		# changing ownership of newly created databases to mysql.mysql
-		local DATADIR=""
-		if [ -f '/etc/mysql/my.cnf' ] ; then
-			#DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'`
-			DATADIR=`/usr/sbin/mysqld  --help |grep '^datadir' | awk '{print $2}'`
-		fi
-		if [ -z "${DATADIR}" ]; then
-			DATADIR="/var/lib/mysql/"
-		fi
-		chown -R mysql:mysql ${DATADIR}
-	else
-		einfo "Hmm, it appears as though you already have the mysql"
-		einfo "database in place.  If you are having problems trying"
-		einfo "to start mysqld, perhaps you need to manually run"
-		einfo "/usr/bin/mysql_install_db and/or check your config"
-		einfo "file(s) and/or database(s) and/or logfile(s)."
-	fi
-}
-
-pkg_preinst() {
-	if ! groupmod mysql; then
-		groupadd -g 60 mysql || die "problem adding group mysql"
-	fi
-
-	if ! id mysql; then
-		useradd -g mysql -s /dev/null -d /var/lib/mysql -c "mysql" mysql
-		assert "problem adding user mysql"
-	fi
-}
-
-pkg_postinst() {
-	#empty dirs...
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/lib/mysql
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/run/mysqld
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
-
-	#secure the logfiles... does this bother anybody?
-	touch ${ROOT}/var/log/mysql/mysql.{log,err}
-	chown mysql:mysql ${ROOT}/var/log/mysql/mysql.{log,err}
-	chmod 0660 ${ROOT}/var/log/mysql/mysql.{log,err}
-
-	#your friendly public service announcement...
-	einfo
-	einfo "You might want to run:"
-	einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\""
-	einfo "if this is a new install."
-	einfo
-
-	warning
-}
diff --git a/dev-db/mysql/mysql-4.0.17.ebuild b/dev-db/mysql/mysql-4.0.17.ebuild
deleted file mode 100644
index d10dd21d7769..000000000000
--- a/dev-db/mysql/mysql-4.0.17.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.17.ebuild,v 1.14 2004/09/06 18:05:24 ciaranm Exp $
-
-inherit eutils
-#to accomodate -laadeedah releases
-NEWP=${P}
-
-SVER=${PV%.*}
-#normal releases:
-SDIR=MySQL-${SVER}
-#for a pre-release:
-#SDIR=MySQL-${SVER}-Pre
-
-S=${WORKDIR}/${NEWP}
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-HOMEPAGE="http://www.mysql.com/"
-SRC_URI="mirror://mysql/Downloads/${SDIR}/${NEWP}.tar.gz"
-RESTRICT="nomirror"
-
-KEYWORDS="ia64 x86 sparc ppc amd64 hppa ~alpha mips"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static readline innodb berkdb tcpd ssl perl debug"
-
-DEPEND="readline? ( >=sys-libs/readline-4.1 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( dev-lang/perl )
-	>=sys-libs/zlib-1.1.3
-	sys-apps/procps
-	>=sys-apps/sed-4"
-PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )"
-
-warning() {
-	ewarn
-	ewarn "If you're upgrading from MySQL-3.x, you must recompile the other"
-	ewarn "packages on your system that link with libmysqlclient after the"
-	ewarn "upgrade completes.  To obtain such a list of packages for your"
-	ewarn "system, you may use 'revdep-rebuild' from app-portage/gentoolkit."
-	ewarn
-	epause 5
-}
-
-pkg_setup() {
-	warning
-
-	# MySQL on mips cannot link to berkdb due to issues.
-	if use mips; then
-		if use berkdb; then
-			echo -e ""
-			eerror "You cannot link MySQL into berkeley db on mips.  Please remove the \"berkdb\""
-			eerror "flag from your USE settings and try again."
-			echo -e ""
-		fi
-	fi
-}
-
-src_unpack() {
-	if use static && use ssl; then
-		local msg="MySQL does not support building statically with SSL support"
-		eerror "${msg}"
-		die "${msg}"
-	fi
-	unpack ${A} || die
-
-	#zap startup script messages
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.16-install-db-sh.diff
-	#zap binary distribution stuff
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.16-mysqld-safe-sh.diff
-	#required for qmail-mysql
-	EPATCH_OPTS="-p0 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0-nisam.h.diff
-	#for correct hardcoded sysconf directory
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0-my-print-defaults.diff
-	#
-	unset EPATCH_OPTS
-	epatch ${FILESDIR}/${PN}-gentoo-nptl.diff
-
-	# attempt to get libmysqlclient_r linked against ssl if USE="ssl" enabled
-	# i would really prefer to fix this at the Makefile.am level, but can't
-	# get the software to autoreconf as distributed - too many missing files
-	# Robert Coie <rac@gentoo.org> 2003.06.12
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.17-thrssl.patch
-
-	if use tcpd; then
-		EPATCH_OPTS="-p1 -d ${S}" \
-		epatch ${FILESDIR}/${PN}-4.0.14-r1-tcpd-vars-fix.diff
-	fi
-
-	cd ${S}
-	autoconf
-	automake
-}
-
-src_compile() {
-	local myconf
-
-	#The following fix is due to a bug with bdb on sparc's. See:
-	#http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
-	if use sparc || use alpha || use hppa
-	then
-		myconf="${myconf} --without-berkeley-db"
-	else
-		use berkdb \
-			&& myconf="${myconf} --with-berkeley-db=./bdb" \
-			|| myconf="${myconf} --without-berkeley-db"
-	fi
-
-	#readline pair reads backwards on purpose, DONT change it around, Ok?
-	# this is because it refers to the building of a bundled readline
-	# versus the system copy
-	use readline && myconf="${myconf} --without-readline"
-	use readline || myconf="${myconf} --with-readline"
-
-	use static \
-		&& myconf="${myconf} --with-mysqld-ldflags=-all-static --disable-shared" \
-		|| myconf="${myconf} --enable-shared --enable-static"
-
-	myconf="${myconf} `use_with tcpd libwrap`"
-	myconf="${myconf} `use_with innodb`"
-
-	use ssl \
-		&& myconf="${myconf} --with-vio --with-openssl" \
-		|| myconf="${myconf} --without-openssl"
-
-	myconf="${myconf} `use_with debug`"
-
-	#glibc-2.3.2_pre fix; bug #16496
-	export CFLAGS="${CFLAGS} -DHAVE_ERRNO_AS_DEFINE=1"
-
-	#bug fix for #15099, should make this api backward compatible
-	export CFLAGS="${CFLAGS} -DUSE_OLD_FUNCTIONS"
-
-	#the compiler flags are as per their "official" spec ;)
-	#CFLAGS="${CFLAGS/-O?/} -O3" \
-	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti" \
-	econf \
-		--libexecdir=/usr/sbin \
-		--sysconfdir=/etc/mysql \
-		--localstatedir=/var/lib/mysql \
-		--with-raid \
-		--with-low-memory \
-		--enable-assembler \
-		--with-charset=latin1 \
-		--enable-local-infile \
-		--with-mysqld-user=mysql \
-		--with-extra-charsets=all \
-		--enable-thread-safe-client \
-		--with-client-ldflags=-lstdc++ \
-		--with-comment="Gentoo Linux ${PF}" \
-		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
-		--with-embedded-server \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make install DESTDIR=${D} benchdir_root=/usr/share/mysql || die
-
-	#move client libs, install a couple of missing headers
-	mv ${D}/usr/lib/mysql/libmysqlclient*.so* ${D}/usr/lib
-	dosym ../libmysqlclient.so /usr/lib/mysql/libmysqlclient.so
-	dosym ../libmysqlclient_r.so /usr/lib/mysql/libmysqlclient_r.so
-	insinto /usr/include/mysql ; doins include/{my_config.h,my_dir.h}
-
-	#convenience links
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlanalyze
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlrepair
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqloptimize
-
-	#various junk
-	rm -f ${D}/usr/share/mysql/mysql.server
-	rm -f ${D}/usr/share/mysql/binary-configure
-	rm -f ${D}/usr/share/mysql/make_binary_distribution
-	rm -f ${D}/usr/share/mysql/mysql-log-rotate
-	rm -f ${D}/usr/share/mysql/{post,pre}install
-	rm -f ${D}/usr/share/mysql/mi_test*
-	rm -f ${D}/usr/share/mysql/*.spec # Redhat gunk
-	rm -f ${D}/usr/share/mysql/*.plist # Apple gunk
-	rm -f ${D}/usr/share/mysql/my-*.cnf # Put them elsewhere
-
-	# All of these (ab)use Perl.
-	if ! use perl; then
-		rm -f ${D}/usr/bin/mysql_setpermission
-		rm -rf ${D}/usr/share/mysql/sql-bench
-	fi
-
-	dohtml Docs/*.html
-	rm -f Docs/*.html
-	dodoc README COPYING COPYING.LIB Docs/manual.*
-	docinto conf-samples
-	dodoc support-files/my-*.cnf
-
-	insinto /etc/mysql
-	newins ${FILESDIR}/my.cnf-4.0.14-r1 my.cnf
-	doins scripts/mysqlaccess.conf
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mysql-4.0.15.rc6 mysql
-}
-
-pkg_config() {
-	if [ ! -d ${ROOT}/var/lib/mysql/mysql ] ; then
-		einfo "Press ENTER to create the mysql database and set proper"
-		einfo "permissions on it, or Control-C to abort now..."
-		read
-		${ROOT}/usr/bin/mysql_install_db #>>/var/log/mysql/mysql.err 2>&1
-		# changing ownership of newly created databases to mysql.mysql
-		local DATADIR=""
-		if [ -f '/etc/mysql/my.cnf' ] ; then
-			#DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'`
-			DATADIR=`/usr/sbin/mysqld  --help |grep '^datadir' | awk '{print $2}'`
-		fi
-		if [ -z "${DATADIR}" ]; then
-			DATADIR="/var/lib/mysql/"
-		fi
-		chown -R mysql:mysql ${DATADIR}
-	else
-		einfo "Hmm, it appears as though you already have the mysql"
-		einfo "database in place.  If you are having problems trying"
-		einfo "to start mysqld, perhaps you need to manually run"
-		einfo "/usr/bin/mysql_install_db and/or check your config"
-		einfo "file(s) and/or database(s) and/or logfile(s)."
-	fi
-}
-
-pkg_preinst() {
-	if ! groupmod mysql; then
-		groupadd -g 60 mysql || die "problem adding group mysql"
-	fi
-
-	if ! id mysql; then
-		useradd -g mysql -s /dev/null -d /var/lib/mysql -c "mysql" mysql
-		assert "problem adding user mysql"
-	fi
-}
-
-pkg_postinst() {
-	#empty dirs...
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/lib/mysql
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/run/mysqld
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
-
-	#secure the logfiles... does this bother anybody?
-	touch ${ROOT}/var/log/mysql/mysql.{log,err}
-	chown mysql:mysql ${ROOT}/var/log/mysql/mysql.{log,err}
-	chmod 0660 ${ROOT}/var/log/mysql/mysql.{log,err}
-
-	#your friendly public service announcement...
-	einfo
-	einfo "You might want to run:"
-	einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\""
-	einfo "if this is a new install."
-	einfo
-
-	warning
-}
diff --git a/dev-db/mysql/mysql-4.0.18-r1.ebuild b/dev-db/mysql/mysql-4.0.18-r1.ebuild
deleted file mode 100644
index 13763894a6e7..000000000000
--- a/dev-db/mysql/mysql-4.0.18-r1.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.18-r1.ebuild,v 1.11 2004/09/06 18:05:24 ciaranm Exp $
-
-inherit eutils
-#to accomodate -laadeedah releases
-NEWP=${P}
-
-SVER=${PV%.*}
-#normal releases:
-SDIR=MySQL-${SVER}
-#for a pre-release:
-#SDIR=MySQL-${SVER}-Pre
-
-S=${WORKDIR}/${NEWP}
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-HOMEPAGE="http://www.mysql.com/"
-SRC_URI="mirror://mysql/Downloads/${SDIR}/${NEWP}.tar.gz"
-RESTRICT="nomirror"
-
-KEYWORDS="~ia64 x86 sparc ppc amd64 hppa alpha ~mips s390"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static readline innodb berkdb tcpd ssl perl debug"
-
-DEPEND="readline? ( >=sys-libs/readline-4.1 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( dev-lang/perl )
-	>=sys-libs/zlib-1.1.3
-	sys-apps/procps
-	>=sys-apps/sed-4"
-PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )"
-
-warning() {
-	ewarn
-	ewarn "If you're upgrading from MySQL-3.x, you must recompile the other"
-	ewarn "packages on your system that link with libmysqlclient after the"
-	ewarn "upgrade completes.  To obtain such a list of packages for your"
-	ewarn "system, you may use 'revdep-rebuild' from app-portage/gentoolkit."
-	ewarn
-	epause 5
-}
-
-pkg_setup() {
-	warning
-}
-
-src_unpack() {
-	if use static && use ssl; then
-		local msg="MySQL does not support building statically with SSL support"
-		eerror "${msg}"
-		die "${msg}"
-	fi
-	unpack ${A} || die
-
-	#zap startup script messages
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-install-db-sh.diff
-	#zap binary distribution stuff
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-mysqld-safe-sh.diff
-	#required for qmail-mysql
-	EPATCH_OPTS="-p0 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0-nisam.h.diff
-	#for correct hardcoded sysconf directory
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0-my-print-defaults.diff
-	#
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-gentoo-nptl.diff
-
-	# attempt to get libmysqlclient_r linked against ssl if USE="ssl" enabled
-	# i would really prefer to fix this at the Makefile.am level, but can't
-	# get the software to autoreconf as distributed - too many missing files
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-thrssl.patch
-
-	# Security fix for bug #46242, upstream fix pending for 4.0.19
-	EPATH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-mysqlbugsecurity.diff
-
-	if use tcpd; then
-		EPATCH_OPTS="-p1 -d ${S}" \
-		epatch ${FILESDIR}/${PN}-4.0.14-r1-tcpd-vars-fix.diff
-	fi
-
-	cd ${S}
-	autoconf
-	#WANT_AUTOMAKE=1.7 automake
-}
-
-src_compile() {
-	local myconf
-
-	#The following fix is due to a bug with bdb on sparc's. See:
-	#http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
-	if use sparc || use alpha || use hppa || use mips
-	then
-		myconf="${myconf} --without-berkeley-db"
-	else
-		use berkdb \
-			&& myconf="${myconf} --with-berkeley-db=./bdb" \
-			|| myconf="${myconf} --without-berkeley-db"
-	fi
-
-	#readline pair reads backwards on purpose, DONT change it around, Ok?
-	# this is because it refers to the building of a bundled readline
-	# versus the system copy
-	use readline && myconf="${myconf} --without-readline"
-	use readline || myconf="${myconf} --with-readline"
-
-	use static \
-		&& myconf="${myconf} --with-mysqld-ldflags=-all-static --disable-shared" \
-		|| myconf="${myconf} --enable-shared --enable-static"
-
-	myconf="${myconf} `use_with tcpd libwrap`"
-	myconf="${myconf} `use_with innodb`"
-
-	use ssl \
-		&& myconf="${myconf} --with-vio --with-openssl" \
-		|| myconf="${myconf} --without-openssl"
-
-	myconf="${myconf} `use_with debug`"
-
-	#glibc-2.3.2_pre fix; bug #16496
-	export CFLAGS="${CFLAGS} -DHAVE_ERRNO_AS_DEFINE=1"
-
-	#bug fix for #15099, should make this api backward compatible
-	export CFLAGS="${CFLAGS} -DUSE_OLD_FUNCTIONS"
-
-	#the compiler flags are as per their "official" spec ;)
-	#CFLAGS="${CFLAGS/-O?/} -O3" \
-	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti" \
-	econf \
-		--libexecdir=/usr/sbin \
-		--sysconfdir=/etc/mysql \
-		--localstatedir=/var/lib/mysql \
-		--with-raid \
-		--with-low-memory \
-		--enable-assembler \
-		--with-charset=latin1 \
-		--enable-local-infile \
-		--with-mysqld-user=mysql \
-		--with-extra-charsets=all \
-		--enable-thread-safe-client \
-		--with-client-ldflags=-lstdc++ \
-		--with-comment="Gentoo Linux ${PF}" \
-		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
-		--with-embedded-server \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make install DESTDIR=${D} benchdir_root=/usr/share/mysql || die
-
-	#move client libs, install a couple of missing headers
-	mv ${D}/usr/lib/mysql/libmysqlclient*.so* ${D}/usr/lib
-	dosym ../libmysqlclient.so /usr/lib/mysql/libmysqlclient.so
-	dosym ../libmysqlclient_r.so /usr/lib/mysql/libmysqlclient_r.so
-	insinto /usr/include/mysql ; doins include/{my_config.h,my_dir.h}
-
-	#convenience links
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlanalyze
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlrepair
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqloptimize
-
-	#various junk
-	rm -f ${D}/usr/share/mysql/mysql.server
-	rm -f ${D}/usr/share/mysql/binary-configure
-	rm -f ${D}/usr/share/mysql/make_binary_distribution
-	rm -f ${D}/usr/share/mysql/mysql-log-rotate
-	rm -f ${D}/usr/share/mysql/{post,pre}install
-	rm -f ${D}/usr/share/mysql/mi_test*
-	rm -f ${D}/usr/share/mysql/*.spec # Redhat gunk
-	rm -f ${D}/usr/share/mysql/*.plist # Apple gunk
-	rm -f ${D}/usr/share/mysql/my-*.cnf # Put them elsewhere
-
-	# All of these (ab)use Perl.
-	if ! use perl; then
-		rm -f ${D}/usr/bin/mysql_setpermission
-		rm -rf ${D}/usr/share/mysql/sql-bench
-	fi
-
-	dohtml Docs/*.html
-	rm -f Docs/*.html
-	dodoc README COPYING COPYING.LIB Docs/manual.*
-	docinto conf-samples
-	dodoc support-files/my-*.cnf
-
-	insinto /etc/mysql
-	newins ${FILESDIR}/my.cnf-4.0.14-r1 my.cnf
-	doins scripts/mysqlaccess.conf
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mysql-4.0.15.rc6 mysql
-}
-
-pkg_config() {
-	if [ ! -d ${ROOT}/var/lib/mysql/mysql ] ; then
-		einfo "Press ENTER to create the mysql database and set proper"
-		einfo "permissions on it, or Control-C to abort now..."
-		read
-		${ROOT}/usr/bin/mysql_install_db #>>/var/log/mysql/mysql.err 2>&1
-		# changing ownership of newly created databases to mysql.mysql
-		local DATADIR=""
-		if [ -f '/etc/mysql/my.cnf' ] ; then
-			#DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'`
-			DATADIR=`/usr/sbin/mysqld  --help |grep '^datadir' | awk '{print $2}'`
-		fi
-		if [ -z "${DATADIR}" ]; then
-			DATADIR="/var/lib/mysql/"
-		fi
-		chown -R mysql:mysql ${DATADIR}
-	else
-		einfo "Hmm, it appears as though you already have the mysql"
-		einfo "database in place.  If you are having problems trying"
-		einfo "to start mysqld, perhaps you need to manually run"
-		einfo "/usr/bin/mysql_install_db and/or check your config"
-		einfo "file(s) and/or database(s) and/or logfile(s)."
-	fi
-}
-
-pkg_preinst() {
-	if ! groupmod mysql; then
-		groupadd -g 60 mysql || die "problem adding group mysql"
-	fi
-
-	if ! id mysql; then
-		useradd -g mysql -s /dev/null -d /var/lib/mysql -c "mysql" mysql
-		assert "problem adding user mysql"
-	fi
-}
-
-pkg_postinst() {
-	#empty dirs...
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/lib/mysql
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/run/mysqld
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
-
-	#secure the logfiles... does this bother anybody?
-	touch ${ROOT}/var/log/mysql/mysql.{log,err}
-	chown mysql:mysql ${ROOT}/var/log/mysql/mysql.{log,err}
-	chmod 0660 ${ROOT}/var/log/mysql/mysql.{log,err}
-
-	#your friendly public service announcement...
-	einfo
-	einfo "You might want to run:"
-	einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\""
-	einfo "if this is a new install."
-	einfo
-
-	warning
-}
diff --git a/dev-db/mysql/mysql-4.0.18-r2.ebuild b/dev-db/mysql/mysql-4.0.18-r2.ebuild
deleted file mode 100644
index 29bb0f663e19..000000000000
--- a/dev-db/mysql/mysql-4.0.18-r2.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.18-r2.ebuild,v 1.7 2004/09/06 18:05:24 ciaranm Exp $
-
-inherit eutils
-#to accomodate -laadeedah releases
-NEWP=${P}
-
-SVER=${PV%.*}
-#normal releases:
-SDIR=MySQL-${SVER}
-#for a pre-release:
-#SDIR=MySQL-${SVER}-Pre
-
-S=${WORKDIR}/${NEWP}
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-HOMEPAGE="http://www.mysql.com/"
-SRC_URI="mirror://mysql/Downloads/${SDIR}/${NEWP}.tar.gz"
-RESTRICT="nomirror"
-
-KEYWORDS="~ia64 x86 sparc ppc amd64 hppa alpha mips s390"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static readline innodb berkdb tcpd ssl perl debug"
-
-DEPEND="readline? ( >=sys-libs/readline-4.1 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( dev-lang/perl )
-	>=sys-libs/zlib-1.1.3
-	sys-apps/procps
-	>=sys-apps/sed-4"
-PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )"
-
-warning() {
-	ewarn
-	ewarn "If you're upgrading from MySQL-3.x, you must recompile the other"
-	ewarn "packages on your system that link with libmysqlclient after the"
-	ewarn "upgrade completes.  To obtain such a list of packages for your"
-	ewarn "system, you may use 'revdep-rebuild' from app-portage/gentoolkit."
-	ewarn
-	epause 5
-}
-
-pkg_setup() {
-	warning
-}
-
-src_unpack() {
-	if use static && use ssl; then
-		local msg="MySQL does not support building statically with SSL support"
-		eerror "${msg}"
-		die "${msg}"
-	fi
-	unpack ${A} || die
-
-	#zap startup script messages
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-install-db-sh.diff
-	#zap binary distribution stuff
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-mysqld-safe-sh.diff
-	#required for qmail-mysql
-	EPATCH_OPTS="-p0 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0-nisam.h.diff
-	#for correct hardcoded sysconf directory
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0-my-print-defaults.diff
-	#
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-gentoo-nptl.diff
-
-	# attempt to get libmysqlclient_r linked against ssl if USE="ssl" enabled
-	# i would really prefer to fix this at the Makefile.am level, but can't
-	# get the software to autoreconf as distributed - too many missing files
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-thrssl.patch
-
-	# Security fix for bug #46242, upstream fix pending for 4.0.19
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-mysqlbugsecurity.diff
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-mysqldmultisecurity.diff
-
-	if use tcpd; then
-		EPATCH_OPTS="-p1 -d ${S}" \
-		epatch ${FILESDIR}/${PN}-4.0.14-r1-tcpd-vars-fix.diff
-	fi
-
-	cd ${S}
-	autoconf
-	#WANT_AUTOMAKE=1.7 automake
-}
-
-src_compile() {
-	local myconf
-
-	#The following fix is due to a bug with bdb on sparc's. See:
-	#http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
-	if use sparc || use alpha || use hppa || use mips
-	then
-		myconf="${myconf} --without-berkeley-db"
-	else
-		use berkdb \
-			&& myconf="${myconf} --with-berkeley-db=./bdb" \
-			|| myconf="${myconf} --without-berkeley-db"
-	fi
-
-	#readline pair reads backwards on purpose, DONT change it around, Ok?
-	# this is because it refers to the building of a bundled readline
-	# versus the system copy
-	use readline && myconf="${myconf} --without-readline"
-	use readline || myconf="${myconf} --with-readline"
-
-	use static \
-		&& myconf="${myconf} --with-mysqld-ldflags=-all-static --disable-shared" \
-		|| myconf="${myconf} --enable-shared --enable-static"
-
-	myconf="${myconf} `use_with tcpd libwrap`"
-	myconf="${myconf} `use_with innodb`"
-
-	use ssl \
-		&& myconf="${myconf} --with-vio --with-openssl" \
-		|| myconf="${myconf} --without-openssl"
-
-	myconf="${myconf} `use_with debug`"
-
-	#glibc-2.3.2_pre fix; bug #16496
-	export CFLAGS="${CFLAGS} -DHAVE_ERRNO_AS_DEFINE=1"
-
-	#bug fix for #15099, should make this api backward compatible
-	export CFLAGS="${CFLAGS} -DUSE_OLD_FUNCTIONS"
-
-	#the compiler flags are as per their "official" spec ;)
-	#CFLAGS="${CFLAGS/-O?/} -O3" \
-	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti" \
-	econf \
-		--libexecdir=/usr/sbin \
-		--sysconfdir=/etc/mysql \
-		--localstatedir=/var/lib/mysql \
-		--with-raid \
-		--with-low-memory \
-		--enable-assembler \
-		--with-charset=latin1 \
-		--enable-local-infile \
-		--with-mysqld-user=mysql \
-		--with-extra-charsets=all \
-		--enable-thread-safe-client \
-		--with-client-ldflags=-lstdc++ \
-		--with-comment="Gentoo Linux ${PF}" \
-		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
-		--with-embedded-server \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make install DESTDIR=${D} benchdir_root=/usr/share/mysql || die
-
-	#move client libs, install a couple of missing headers
-	mv ${D}/usr/lib/mysql/libmysqlclient*.so* ${D}/usr/lib
-	dosym ../libmysqlclient.so /usr/lib/mysql/libmysqlclient.so
-	dosym ../libmysqlclient_r.so /usr/lib/mysql/libmysqlclient_r.so
-	insinto /usr/include/mysql ; doins include/{my_config.h,my_dir.h}
-
-	#convenience links
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlanalyze
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlrepair
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqloptimize
-
-	#various junk
-	rm -f ${D}/usr/share/mysql/mysql.server
-	rm -f ${D}/usr/share/mysql/binary-configure
-	rm -f ${D}/usr/share/mysql/make_binary_distribution
-	rm -f ${D}/usr/share/mysql/mysql-log-rotate
-	rm -f ${D}/usr/share/mysql/{post,pre}install
-	rm -f ${D}/usr/share/mysql/mi_test*
-	rm -f ${D}/usr/share/mysql/*.spec # Redhat gunk
-	rm -f ${D}/usr/share/mysql/*.plist # Apple gunk
-	rm -f ${D}/usr/share/mysql/my-*.cnf # Put them elsewhere
-
-	# All of these (ab)use Perl.
-	if ! use perl; then
-		rm -f ${D}/usr/bin/mysql_setpermission
-		rm -rf ${D}/usr/share/mysql/sql-bench
-	fi
-
-	dohtml Docs/*.html
-	rm -f Docs/*.html
-	dodoc README COPYING COPYING.LIB Docs/manual.*
-	docinto conf-samples
-	dodoc support-files/my-*.cnf
-
-	insinto /etc/mysql
-	newins ${FILESDIR}/my.cnf-4.0.14-r1 my.cnf
-	doins scripts/mysqlaccess.conf
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mysql-4.0.15.rc6 mysql
-}
-
-pkg_config() {
-	if [ ! -d ${ROOT}/var/lib/mysql/mysql ] ; then
-		einfo "Press ENTER to create the mysql database and set proper"
-		einfo "permissions on it, or Control-C to abort now..."
-		read
-		${ROOT}/usr/bin/mysql_install_db #>>/var/log/mysql/mysql.err 2>&1
-		# changing ownership of newly created databases to mysql.mysql
-		local DATADIR=""
-		if [ -f '/etc/mysql/my.cnf' ] ; then
-			#DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'`
-			DATADIR=`/usr/sbin/mysqld  --help |grep '^datadir' | awk '{print $2}'`
-		fi
-		if [ -z "${DATADIR}" ]; then
-			DATADIR="/var/lib/mysql/"
-		fi
-		chown -R mysql:mysql ${DATADIR}
-	else
-		einfo "Hmm, it appears as though you already have the mysql"
-		einfo "database in place.  If you are having problems trying"
-		einfo "to start mysqld, perhaps you need to manually run"
-		einfo "/usr/bin/mysql_install_db and/or check your config"
-		einfo "file(s) and/or database(s) and/or logfile(s)."
-	fi
-}
-
-pkg_preinst() {
-	enewgroup mysql 60 || die "problem adding group mysql"
-	enewuser mysql 60 /dev/null /var/lib/mysql mysql || die "problem adding user mysql"
-}
-
-pkg_postinst() {
-	#empty dirs...
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/lib/mysql
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/run/mysqld
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
-
-	#secure the logfiles... does this bother anybody?
-	touch ${ROOT}/var/log/mysql/mysql.{log,err}
-	chown mysql:mysql ${ROOT}/var/log/mysql/mysql.{log,err}
-	chmod 0660 ${ROOT}/var/log/mysql/mysql.{log,err}
-
-	#your friendly public service announcement...
-	einfo
-	einfo "You might want to run:"
-	einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\""
-	einfo "if this is a new install."
-	einfo
-
-	warning
-}
diff --git a/dev-db/mysql/mysql-4.0.18.ebuild b/dev-db/mysql/mysql-4.0.18.ebuild
deleted file mode 100644
index 7327baba1cac..000000000000
--- a/dev-db/mysql/mysql-4.0.18.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.18.ebuild,v 1.8 2004/09/06 18:05:24 ciaranm Exp $
-
-inherit eutils
-#to accomodate -laadeedah releases
-NEWP=${P}
-
-SVER=${PV%.*}
-#normal releases:
-SDIR=MySQL-${SVER}
-#for a pre-release:
-#SDIR=MySQL-${SVER}-Pre
-
-S=${WORKDIR}/${NEWP}
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-HOMEPAGE="http://www.mysql.com/"
-SRC_URI="mirror://mysql/Downloads/${SDIR}/${NEWP}.tar.gz"
-RESTRICT="nomirror"
-
-KEYWORDS="ia64 x86 sparc ppc amd64 hppa ~alpha ~mips s390"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static readline innodb berkdb tcpd ssl perl debug"
-
-DEPEND="readline? ( >=sys-libs/readline-4.1 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( dev-lang/perl )
-	>=sys-libs/zlib-1.1.3
-	sys-apps/procps
-	>=sys-apps/sed-4"
-PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )"
-
-warning() {
-	ewarn
-	ewarn "If you're upgrading from MySQL-3.x, you must recompile the other"
-	ewarn "packages on your system that link with libmysqlclient after the"
-	ewarn "upgrade completes.  To obtain such a list of packages for your"
-	ewarn "system, you may use 'revdep-rebuild' from app-portage/gentoolkit."
-	ewarn
-	epause 5
-}
-
-pkg_setup() {
-	warning
-}
-
-src_unpack() {
-	if use static && use ssl; then
-		local msg="MySQL does not support building statically with SSL support"
-		eerror "${msg}"
-		die "${msg}"
-	fi
-	unpack ${A} || die
-
-	#zap startup script messages
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-install-db-sh.diff
-	#zap binary distribution stuff
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-mysqld-safe-sh.diff
-	#required for qmail-mysql
-	EPATCH_OPTS="-p0 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0-nisam.h.diff
-	#for correct hardcoded sysconf directory
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0-my-print-defaults.diff
-	#
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-gentoo-nptl.diff
-
-	# attempt to get libmysqlclient_r linked against ssl if USE="ssl" enabled
-	# i would really prefer to fix this at the Makefile.am level, but can't
-	# get the software to autoreconf as distributed - too many missing files
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-thrssl.patch
-
-	if use tcpd; then
-		EPATCH_OPTS="-p1 -d ${S}" \
-		epatch ${FILESDIR}/${PN}-4.0.14-r1-tcpd-vars-fix.diff
-	fi
-
-	cd ${S}
-	autoconf
-	automake
-}
-
-src_compile() {
-	local myconf
-
-	#The following fix is due to a bug with bdb on sparc's. See:
-	#http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
-	if use sparc || use alpha || use hppa || use mips
-	then
-		myconf="${myconf} --without-berkeley-db"
-	else
-		use berkdb \
-			&& myconf="${myconf} --with-berkeley-db=./bdb" \
-			|| myconf="${myconf} --without-berkeley-db"
-	fi
-
-	#readline pair reads backwards on purpose, DONT change it around, Ok?
-	# this is because it refers to the building of a bundled readline
-	# versus the system copy
-	use readline && myconf="${myconf} --without-readline"
-	use readline || myconf="${myconf} --with-readline"
-
-	use static \
-		&& myconf="${myconf} --with-mysqld-ldflags=-all-static --disable-shared" \
-		|| myconf="${myconf} --enable-shared --enable-static"
-
-	myconf="${myconf} `use_with tcpd libwrap`"
-	myconf="${myconf} `use_with innodb`"
-
-	use ssl \
-		&& myconf="${myconf} --with-vio --with-openssl" \
-		|| myconf="${myconf} --without-openssl"
-
-	myconf="${myconf} `use_with debug`"
-
-	#glibc-2.3.2_pre fix; bug #16496
-	export CFLAGS="${CFLAGS} -DHAVE_ERRNO_AS_DEFINE=1"
-
-	#bug fix for #15099, should make this api backward compatible
-	export CFLAGS="${CFLAGS} -DUSE_OLD_FUNCTIONS"
-
-	#the compiler flags are as per their "official" spec ;)
-	#CFLAGS="${CFLAGS/-O?/} -O3" \
-	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti" \
-	econf \
-		--libexecdir=/usr/sbin \
-		--sysconfdir=/etc/mysql \
-		--localstatedir=/var/lib/mysql \
-		--with-raid \
-		--with-low-memory \
-		--enable-assembler \
-		--with-charset=latin1 \
-		--enable-local-infile \
-		--with-mysqld-user=mysql \
-		--with-extra-charsets=all \
-		--enable-thread-safe-client \
-		--with-client-ldflags=-lstdc++ \
-		--with-comment="Gentoo Linux ${PF}" \
-		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
-		--with-embedded-server \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make install DESTDIR=${D} benchdir_root=/usr/share/mysql || die
-
-	#move client libs, install a couple of missing headers
-	mv ${D}/usr/lib/mysql/libmysqlclient*.so* ${D}/usr/lib
-	dosym ../libmysqlclient.so /usr/lib/mysql/libmysqlclient.so
-	dosym ../libmysqlclient_r.so /usr/lib/mysql/libmysqlclient_r.so
-	insinto /usr/include/mysql ; doins include/{my_config.h,my_dir.h}
-
-	#convenience links
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlanalyze
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlrepair
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqloptimize
-
-	#various junk
-	rm -f ${D}/usr/share/mysql/mysql.server
-	rm -f ${D}/usr/share/mysql/binary-configure
-	rm -f ${D}/usr/share/mysql/make_binary_distribution
-	rm -f ${D}/usr/share/mysql/mysql-log-rotate
-	rm -f ${D}/usr/share/mysql/{post,pre}install
-	rm -f ${D}/usr/share/mysql/mi_test*
-	rm -f ${D}/usr/share/mysql/*.spec # Redhat gunk
-	rm -f ${D}/usr/share/mysql/*.plist # Apple gunk
-	rm -f ${D}/usr/share/mysql/my-*.cnf # Put them elsewhere
-
-	# All of these (ab)use Perl.
-	if ! use perl; then
-		rm -f ${D}/usr/bin/mysql_setpermission
-		rm -rf ${D}/usr/share/mysql/sql-bench
-	fi
-
-	dohtml Docs/*.html
-	rm -f Docs/*.html
-	dodoc README COPYING COPYING.LIB Docs/manual.*
-	docinto conf-samples
-	dodoc support-files/my-*.cnf
-
-	insinto /etc/mysql
-	newins ${FILESDIR}/my.cnf-4.0.14-r1 my.cnf
-	doins scripts/mysqlaccess.conf
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mysql-4.0.15.rc6 mysql
-}
-
-pkg_config() {
-	if [ ! -d ${ROOT}/var/lib/mysql/mysql ] ; then
-		einfo "Press ENTER to create the mysql database and set proper"
-		einfo "permissions on it, or Control-C to abort now..."
-		read
-		${ROOT}/usr/bin/mysql_install_db #>>/var/log/mysql/mysql.err 2>&1
-		# changing ownership of newly created databases to mysql.mysql
-		local DATADIR=""
-		if [ -f '/etc/mysql/my.cnf' ] ; then
-			#DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'`
-			DATADIR=`/usr/sbin/mysqld  --help |grep '^datadir' | awk '{print $2}'`
-		fi
-		if [ -z "${DATADIR}" ]; then
-			DATADIR="/var/lib/mysql/"
-		fi
-		chown -R mysql:mysql ${DATADIR}
-	else
-		einfo "Hmm, it appears as though you already have the mysql"
-		einfo "database in place.  If you are having problems trying"
-		einfo "to start mysqld, perhaps you need to manually run"
-		einfo "/usr/bin/mysql_install_db and/or check your config"
-		einfo "file(s) and/or database(s) and/or logfile(s)."
-	fi
-}
-
-pkg_preinst() {
-	if ! groupmod mysql; then
-		groupadd -g 60 mysql || die "problem adding group mysql"
-	fi
-
-	if ! id mysql; then
-		useradd -g mysql -s /dev/null -d /var/lib/mysql -c "mysql" mysql
-		assert "problem adding user mysql"
-	fi
-}
-
-pkg_postinst() {
-	#empty dirs...
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/lib/mysql
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/run/mysqld
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
-
-	#secure the logfiles... does this bother anybody?
-	touch ${ROOT}/var/log/mysql/mysql.{log,err}
-	chown mysql:mysql ${ROOT}/var/log/mysql/mysql.{log,err}
-	chmod 0660 ${ROOT}/var/log/mysql/mysql.{log,err}
-
-	#your friendly public service announcement...
-	einfo
-	einfo "You might want to run:"
-	einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\""
-	einfo "if this is a new install."
-	einfo
-
-	warning
-}
diff --git a/dev-db/mysql/mysql-4.0.19.ebuild b/dev-db/mysql/mysql-4.0.19.ebuild
deleted file mode 100644
index 5f5313fbf5f6..000000000000
--- a/dev-db/mysql/mysql-4.0.19.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.19.ebuild,v 1.6 2004/09/06 18:05:24 ciaranm Exp $
-
-inherit eutils
-#to accomodate -laadeedah releases
-NEWP=${P}
-
-SVER=${PV%.*}
-#normal releases:
-SDIR=MySQL-${SVER}
-#for a pre-release:
-#SDIR=MySQL-${SVER}-Pre
-
-S=${WORKDIR}/${NEWP}
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-HOMEPAGE="http://www.mysql.com/"
-SRC_URI="mirror://mysql/Downloads/${SDIR}/${NEWP}.tar.gz"
-RESTRICT="nomirror"
-
-KEYWORDS="~ia64 ~x86 ~sparc ppc ~amd64 ~hppa ~alpha ~mips ~s390"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static readline innodb berkdb tcpd ssl perl debug"
-
-DEPEND="readline? ( >=sys-libs/readline-4.1 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( dev-lang/perl )
-	>=sys-libs/zlib-1.1.3
-	sys-apps/procps
-	>=sys-apps/sed-4"
-PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )"
-
-warning() {
-	ewarn
-	ewarn "If you're upgrading from MySQL-3.x, you must recompile the other"
-	ewarn "packages on your system that link with libmysqlclient after the"
-	ewarn "upgrade completes.  To obtain such a list of packages for your"
-	ewarn "system, you may use 'revdep-rebuild' from app-portage/gentoolkit."
-	ewarn
-	epause 5
-}
-
-pkg_setup() {
-	warning
-}
-
-src_unpack() {
-	if use static && use ssl; then
-		local msg="MySQL does not support building statically with SSL support"
-		eerror "${msg}"
-		die "${msg}"
-	fi
-	unpack ${A} || die
-
-	#zap startup script messages
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-install-db-sh.diff
-	#zap binary distribution stuff
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-mysqld-safe-sh.diff
-	#required for qmail-mysql
-	EPATCH_OPTS="-p0 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0-nisam.h.diff
-	#for correct hardcoded sysconf directory
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0-my-print-defaults.diff
-	#
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-gentoo-nptl.diff
-
-	# attempt to get libmysqlclient_r linked against ssl if USE="ssl" enabled
-	# i would really prefer to fix this at the Makefile.am level, but can't
-	# get the software to autoreconf as distributed - too many missing files
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-thrssl.patch
-
-	# Security fix for bug #46242, upstream fix pending for 4.0.19
-	#EPATCH_OPTS="-p1 -d ${S}" \
-	#epatch ${FILESDIR}/${PN}-4.0.18-mysqlbugsecurity.diff
-	#EPATCH_OPTS="-p1 -d ${S}" \
-	#epatch ${FILESDIR}/${PN}-4.0.18-mysqldmultisecurity.diff
-
-	if use tcpd; then
-		EPATCH_OPTS="-p1 -d ${S}" \
-		epatch ${FILESDIR}/${PN}-4.0.14-r1-tcpd-vars-fix.diff
-	fi
-
-	cd ${S}
-	autoconf
-	#WANT_AUTOMAKE=1.7 automake
-}
-
-src_compile() {
-	local myconf
-
-	#The following fix is due to a bug with bdb on sparc's. See:
-	#http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
-	if use sparc || use alpha || use hppa || use mips
-	then
-		myconf="${myconf} --without-berkeley-db"
-	else
-		use berkdb \
-			&& myconf="${myconf} --with-berkeley-db=./bdb" \
-			|| myconf="${myconf} --without-berkeley-db"
-	fi
-
-	#readline pair reads backwards on purpose, DONT change it around, Ok?
-	# this is because it refers to the building of a bundled readline
-	# versus the system copy
-	use readline && myconf="${myconf} --without-readline"
-	use readline || myconf="${myconf} --with-readline"
-
-	use static \
-		&& myconf="${myconf} --with-mysqld-ldflags=-all-static --disable-shared" \
-		|| myconf="${myconf} --enable-shared --enable-static"
-
-	myconf="${myconf} `use_with tcpd libwrap`"
-	myconf="${myconf} `use_with innodb`"
-
-	use ssl \
-		&& myconf="${myconf} --with-vio --with-openssl" \
-		|| myconf="${myconf} --without-openssl"
-
-	myconf="${myconf} `use_with debug`"
-
-	#glibc-2.3.2_pre fix; bug #16496
-	export CFLAGS="${CFLAGS} -DHAVE_ERRNO_AS_DEFINE=1"
-
-	#bug fix for #15099, should make this api backward compatible
-	export CFLAGS="${CFLAGS} -DUSE_OLD_FUNCTIONS"
-
-	#the compiler flags are as per their "official" spec ;)
-	#CFLAGS="${CFLAGS/-O?/} -O3" \
-	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti" \
-	econf \
-		--libexecdir=/usr/sbin \
-		--sysconfdir=/etc/mysql \
-		--localstatedir=/var/lib/mysql \
-		--with-raid \
-		--with-low-memory \
-		--enable-assembler \
-		--with-charset=latin1 \
-		--enable-local-infile \
-		--with-mysqld-user=mysql \
-		--with-extra-charsets=all \
-		--enable-thread-safe-client \
-		--with-client-ldflags=-lstdc++ \
-		--with-comment="Gentoo Linux ${PF}" \
-		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
-		--with-embedded-server \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make install DESTDIR=${D} benchdir_root=/usr/share/mysql || die
-
-	#move client libs, install a couple of missing headers
-	mv ${D}/usr/lib/mysql/libmysqlclient*.so* ${D}/usr/lib
-	dosym ../libmysqlclient.so /usr/lib/mysql/libmysqlclient.so
-	dosym ../libmysqlclient_r.so /usr/lib/mysql/libmysqlclient_r.so
-	insinto /usr/include/mysql ; doins include/{my_config.h,my_dir.h}
-
-	#convenience links
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlanalyze
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlrepair
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqloptimize
-
-	#various junk
-	rm -f ${D}/usr/share/mysql/mysql.server
-	rm -f ${D}/usr/share/mysql/binary-configure
-	rm -f ${D}/usr/share/mysql/make_binary_distribution
-	rm -f ${D}/usr/share/mysql/mysql-log-rotate
-	rm -f ${D}/usr/share/mysql/{post,pre}install
-	rm -f ${D}/usr/share/mysql/mi_test*
-	rm -f ${D}/usr/share/mysql/*.spec # Redhat gunk
-	rm -f ${D}/usr/share/mysql/*.plist # Apple gunk
-	rm -f ${D}/usr/share/mysql/my-*.cnf # Put them elsewhere
-
-	# All of these (ab)use Perl.
-	if ! use perl; then
-		rm -f ${D}/usr/bin/mysql_setpermission
-		rm -rf ${D}/usr/share/mysql/sql-bench
-	fi
-
-	dohtml Docs/*.html
-	rm -f Docs/*.html
-	dodoc README COPYING COPYING.LIB Docs/manual.*
-	docinto conf-samples
-	dodoc support-files/my-*.cnf
-
-	insinto /etc/mysql
-	newins ${FILESDIR}/my.cnf-4.0.14-r1 my.cnf
-	doins scripts/mysqlaccess.conf
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mysql-4.0.15.rc6 mysql
-}
-
-pkg_config() {
-	if [ ! -d ${ROOT}/var/lib/mysql/mysql ] ; then
-		einfo "Press ENTER to create the mysql database and set proper"
-		einfo "permissions on it, or Control-C to abort now..."
-		read
-		${ROOT}/usr/bin/mysql_install_db #>>/var/log/mysql/mysql.err 2>&1
-		# changing ownership of newly created databases to mysql.mysql
-		local DATADIR=""
-		if [ -f '/etc/mysql/my.cnf' ] ; then
-			#DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'`
-			DATADIR=`/usr/sbin/mysqld  --help |grep '^datadir' | awk '{print $2}'`
-		fi
-		if [ -z "${DATADIR}" ]; then
-			DATADIR="/var/lib/mysql/"
-		fi
-		chown -R mysql:mysql ${DATADIR}
-	else
-		einfo "Hmm, it appears as though you already have the mysql"
-		einfo "database in place.  If you are having problems trying"
-		einfo "to start mysqld, perhaps you need to manually run"
-		einfo "/usr/bin/mysql_install_db and/or check your config"
-		einfo "file(s) and/or database(s) and/or logfile(s)."
-	fi
-}
-
-pkg_preinst() {
-	if ! groupmod mysql; then
-		groupadd -g 60 mysql || die "problem adding group mysql"
-	fi
-
-	if ! id mysql; then
-		useradd -g mysql -s /dev/null -d /var/lib/mysql -c "mysql" mysql
-		assert "problem adding user mysql"
-	fi
-}
-
-pkg_postinst() {
-	#empty dirs...
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/lib/mysql
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/run/mysqld
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
-
-	#secure the logfiles... does this bother anybody?
-	touch ${ROOT}/var/log/mysql/mysql.{log,err}
-	chown mysql:mysql ${ROOT}/var/log/mysql/mysql.{log,err}
-	chmod 0660 ${ROOT}/var/log/mysql/mysql.{log,err}
-
-	#your friendly public service announcement...
-	einfo
-	einfo "You might want to run:"
-	einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\""
-	einfo "if this is a new install."
-	einfo
-
-	warning
-}
diff --git a/dev-db/mysql/mysql-4.0.20-r1.ebuild b/dev-db/mysql/mysql-4.0.20-r1.ebuild
deleted file mode 100644
index 9400297ea718..000000000000
--- a/dev-db/mysql/mysql-4.0.20-r1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.20-r1.ebuild,v 1.12 2004/09/27 03:50:37 tgall Exp $
-
-inherit eutils gnuconfig
-#to accomodate -laadeedah releases
-NEWP=${P}
-
-SVER=${PV%.*}
-#normal releases:
-SDIR=MySQL-${SVER}
-#for a pre-release:
-#SDIR=MySQL-${SVER}-Pre
-
-S=${WORKDIR}/${NEWP}
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-HOMEPAGE="http://www.mysql.com/"
-SRC_URI="mirror://mysql/Downloads/${SDIR}/${NEWP}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ia64 x86 sparc ppc amd64 hppa alpha mips s390 arm ppc64"
-IUSE="static readline innodb berkdb tcpd ssl perl debug selinux"
-RESTRICT="nomirror"
-
-DEPEND="readline? ( >=sys-libs/readline-4.1 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( dev-lang/perl )
-	>=sys-libs/zlib-1.1.3
-	sys-apps/procps
-	>=sys-apps/sed-4"
-PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )"
-RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-mysql )"
-
-warning() {
-	ewarn
-	ewarn "If you're upgrading from MySQL-3.x to 4.0, or 4.0.x to 4.1.x, you"
-	ewarn "must recompile the other packages on your system that link with"
-	ewarn "libmysqlclient after the upgrade completes.  To obtain such a list"
-	ewarn "of packages for your system, you may use 'revdep-rebuild' from"
-	ewarn "app-portage/gentoolkit."
-	ewarn
-	epause 5
-}
-
-pkg_setup() {
-	warning
-}
-
-src_unpack() {
-	if use static && use ssl; then
-		local msg="MySQL does not support building statically with SSL support"
-		eerror "${msg}"
-		die "${msg}"
-	fi
-	unpack ${A} || die
-
-	#zap startup script messages
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-install-db-sh.diff
-	#zap binary distribution stuff
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-mysqld-safe-sh.diff
-	#required for qmail-mysql
-	EPATCH_OPTS="-p0 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0-nisam.h.diff
-	#for correct hardcoded sysconf directory
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0-my-print-defaults.diff
-	#
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-gentoo-nptl.diff
-
-	# attempt to get libmysqlclient_r linked against ssl if USE="ssl" enabled
-	# i would really prefer to fix this at the Makefile.am level, but can't
-	# get the software to autoreconf as distributed - too many missing files
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-thrssl.patch
-
-	# Security fix for bug #46242, upstream fix pending for 4.0.19
-	#EPATCH_OPTS="-p1 -d ${S}" \
-	#epatch ${FILESDIR}/${PN}-4.0.18-mysqlbugsecurity.diff
-	#EPATCH_OPTS="-p1 -d ${S}" \
-	#epatch ${FILESDIR}/${PN}-4.0.18-mysqldmultisecurity.diff
-
-	if use tcpd; then
-		EPATCH_OPTS="-p1 -d ${S}" \
-		epatch ${FILESDIR}/${PN}-4.0.14-r1-tcpd-vars-fix.diff
-	fi
-
-	# security fix from http://lists.mysql.com/internals/15185
-	# gentoo bug #60744
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-4.0-mysqlhotcopy-security.patch
-
-	cd ${S}
-	autoconf
-	#WANT_AUTOMAKE=1.7 automake
-	gnuconfig_update
-}
-
-src_compile() {
-	local myconf
-
-	#The following fix is due to a bug with bdb on sparc's. See:
-	#http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
-	if use sparc || use alpha || use hppa || use mips
-	then
-		myconf="${myconf} --without-berkeley-db"
-	else
-		use berkdb \
-			&& myconf="${myconf} --with-berkeley-db=./bdb" \
-			|| myconf="${myconf} --without-berkeley-db"
-	fi
-
-	#readline pair reads backwards on purpose, DONT change it around, Ok?
-	# this is because it refers to the building of a bundled readline
-	# versus the system copy
-	use readline && myconf="${myconf} --without-readline"
-	use readline || myconf="${myconf} --with-readline"
-
-	use static \
-		&& myconf="${myconf} --with-mysqld-ldflags=-all-static --disable-shared" \
-		|| myconf="${myconf} --enable-shared --enable-static"
-
-	myconf="${myconf} `use_with tcpd libwrap`"
-	myconf="${myconf} `use_with innodb`"
-
-	use ssl \
-		&& myconf="${myconf} --with-vio --with-openssl" \
-		|| myconf="${myconf} --without-openssl"
-
-	myconf="${myconf} `use_with debug`"
-
-	#glibc-2.3.2_pre fix; bug #16496
-	export CFLAGS="${CFLAGS} -DHAVE_ERRNO_AS_DEFINE=1"
-
-	#bug fix for #15099, should make this api backward compatible
-	export CFLAGS="${CFLAGS} -DUSE_OLD_FUNCTIONS"
-
-	#the compiler flags are as per their "official" spec ;)
-	#CFLAGS="${CFLAGS/-O?/} -O3" \
-	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti" \
-	econf \
-		--libexecdir=/usr/sbin \
-		--sysconfdir=/etc/mysql \
-		--localstatedir=/var/lib/mysql \
-		--with-raid \
-		--with-low-memory \
-		--enable-assembler \
-		--with-charset=latin1 \
-		--enable-local-infile \
-		--with-mysqld-user=mysql \
-		--with-extra-charsets=all \
-		--enable-thread-safe-client \
-		--with-client-ldflags=-lstdc++ \
-		--with-comment="Gentoo Linux ${PF}" \
-		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
-		--with-embedded-server \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make install DESTDIR=${D} benchdir_root=/usr/share/mysql || die
-
-	#move client libs, install a couple of missing headers
-	mv ${D}/usr/$(get_libdir)/mysql/libmysqlclient*.so* ${D}/usr/$(get_libdir)
-	dosym ../libmysqlclient.so /usr/$(get_libdir)/mysql/libmysqlclient.so
-	dosym ../libmysqlclient_r.so /usr/$(get_libdir)/mysql/libmysqlclient_r.so
-	insinto /usr/include/mysql ; doins include/{my_config.h,my_dir.h}
-
-	#convenience links
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlanalyze
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlrepair
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqloptimize
-
-	#various junk
-	rm -f ${D}/usr/share/mysql/mysql.server
-	rm -f ${D}/usr/share/mysql/binary-configure
-	rm -f ${D}/usr/share/mysql/make_binary_distribution
-	rm -f ${D}/usr/share/mysql/mysql-log-rotate
-	rm -f ${D}/usr/share/mysql/{post,pre}install
-	rm -f ${D}/usr/share/mysql/mi_test*
-	rm -f ${D}/usr/share/mysql/*.spec # Redhat gunk
-	rm -f ${D}/usr/share/mysql/*.plist # Apple gunk
-	rm -f ${D}/usr/share/mysql/my-*.cnf # Put them elsewhere
-
-	# All of these (ab)use Perl.
-	if ! use perl; then
-		rm -f ${D}/usr/bin/mysql_setpermission
-		rm -rf ${D}/usr/share/mysql/sql-bench
-	fi
-
-	dohtml Docs/*.html
-	rm -f Docs/*.html
-	dodoc README COPYING COPYING.LIB Docs/manual.*
-	docinto conf-samples
-	dodoc support-files/my-*.cnf
-
-	insinto /etc/mysql
-	newins ${FILESDIR}/my.cnf-4.0.14-r1 my.cnf
-	doins scripts/mysqlaccess.conf
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mysql-4.0.15.rc6 mysql
-}
-
-pkg_config() {
-	if [ ! -d ${ROOT}/var/lib/mysql/mysql ] ; then
-		einfo "Press ENTER to create the mysql database and set proper"
-		einfo "permissions on it, or Control-C to abort now..."
-		read
-		${ROOT}/usr/bin/mysql_install_db #>>/var/log/mysql/mysql.err 2>&1
-		# changing ownership of newly created databases to mysql.mysql
-		local DATADIR=""
-		if [ -f '/etc/mysql/my.cnf' ] ; then
-			#DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'`
-			#DATADIR=`/usr/sbin/mysqld  --help |grep '^datadir' | awk '{print $2}'`
-			#DATADIR=`my_print_defaults mysqld | grep -- '^--datadir' | tail -n1 | sed -e 's|^--datadir=||'`
-			DATADIR=`my_print_defaults mysqld | sed -ne '/datadir/s|^--datadir=||p' | tail -n1`
-		fi
-		if [ -z "${DATADIR}" ]; then
-			DATADIR="/var/lib/mysql/"
-		fi
-		chown -R mysql:mysql ${DATADIR}
-		chmod 0750 ${DATADIR}
-	else
-		einfo "Hmm, it appears as though you already have the mysql"
-		einfo "database in place.  If you are having problems trying"
-		einfo "to start mysqld, perhaps you need to manually run"
-		einfo "/usr/bin/mysql_install_db and/or check your config"
-		einfo "file(s) and/or database(s) and/or logfile(s)."
-	fi
-}
-
-pkg_preinst() {
-	enewgroup mysql 60 || die "problem adding group mysql"
-	enewuser mysql 60 /dev/null /var/lib/mysql mysql || die "problem adding user mysql"
-}
-
-pkg_postinst() {
-	#empty dirs...
-	install -d -m0750 -o mysql -g mysql ${ROOT}/var/lib/mysql
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/run/mysqld
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
-
-	#secure the logfiles... does this bother anybody?
-	touch ${ROOT}/var/log/mysql/mysql.{log,err}
-	chown mysql:mysql ${ROOT}/var/log/mysql/mysql*
-	chmod 0660 ${ROOT}/var/log/mysql/mysql*
-	# secure some directories
-	chmod 0750 ${ROOT}/var/log/mysql ${ROOT}/var/lib/mysql
-
-	#your friendly public service announcement...
-	einfo
-	einfo "You might want to run:"
-	einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\""
-	einfo "if this is a new install."
-	einfo
-
-	warning
-}
diff --git a/dev-db/mysql/mysql-4.0.20.ebuild b/dev-db/mysql/mysql-4.0.20.ebuild
deleted file mode 100644
index f6cede850bb0..000000000000
--- a/dev-db/mysql/mysql-4.0.20.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.20.ebuild,v 1.14 2004/09/06 18:05:24 ciaranm Exp $
-
-inherit eutils gnuconfig
-#to accomodate -laadeedah releases
-NEWP=${P}
-
-SVER=${PV%.*}
-#normal releases:
-SDIR=MySQL-${SVER}
-#for a pre-release:
-#SDIR=MySQL-${SVER}-Pre
-
-S=${WORKDIR}/${NEWP}
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-HOMEPAGE="http://www.mysql.com/"
-SRC_URI="mirror://mysql/Downloads/${SDIR}/${NEWP}.tar.gz"
-RESTRICT="nomirror"
-
-KEYWORDS="~ia64 x86 sparc ppc ~amd64 hppa alpha mips ~s390 arm ppc64"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static readline innodb berkdb tcpd ssl perl debug"
-
-DEPEND="readline? ( >=sys-libs/readline-4.1 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( dev-lang/perl )
-	>=sys-libs/zlib-1.1.3
-	sys-apps/procps
-	>=sys-apps/sed-4"
-PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )"
-
-warning() {
-	ewarn
-	ewarn "If you're upgrading from MySQL-3.x, you must recompile the other"
-	ewarn "packages on your system that link with libmysqlclient after the"
-	ewarn "upgrade completes.  To obtain such a list of packages for your"
-	ewarn "system, you may use 'revdep-rebuild' from app-portage/gentoolkit."
-	ewarn
-	epause 5
-}
-
-pkg_setup() {
-	warning
-}
-
-src_unpack() {
-	if use static && use ssl; then
-		local msg="MySQL does not support building statically with SSL support"
-		eerror "${msg}"
-		die "${msg}"
-	fi
-	unpack ${A} || die
-
-	#zap startup script messages
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-install-db-sh.diff
-	#zap binary distribution stuff
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-mysqld-safe-sh.diff
-	#required for qmail-mysql
-	EPATCH_OPTS="-p0 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0-nisam.h.diff
-	#for correct hardcoded sysconf directory
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0-my-print-defaults.diff
-	#
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-gentoo-nptl.diff
-
-	# attempt to get libmysqlclient_r linked against ssl if USE="ssl" enabled
-	# i would really prefer to fix this at the Makefile.am level, but can't
-	# get the software to autoreconf as distributed - too many missing files
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-thrssl.patch
-
-	# Security fix for bug #46242, upstream fix pending for 4.0.19
-	#EPATCH_OPTS="-p1 -d ${S}" \
-	#epatch ${FILESDIR}/${PN}-4.0.18-mysqlbugsecurity.diff
-	#EPATCH_OPTS="-p1 -d ${S}" \
-	#epatch ${FILESDIR}/${PN}-4.0.18-mysqldmultisecurity.diff
-
-	if use tcpd; then
-		EPATCH_OPTS="-p1 -d ${S}" \
-		epatch ${FILESDIR}/${PN}-4.0.14-r1-tcpd-vars-fix.diff
-	fi
-
-	cd ${S}
-	autoconf
-	#WANT_AUTOMAKE=1.7 automake
-	gnuconfig_update
-}
-
-src_compile() {
-	local myconf
-
-	#The following fix is due to a bug with bdb on sparc's. See:
-	#http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
-	if use sparc || use alpha || use hppa || use mips
-	then
-		myconf="${myconf} --without-berkeley-db"
-	else
-		use berkdb \
-			&& myconf="${myconf} --with-berkeley-db=./bdb" \
-			|| myconf="${myconf} --without-berkeley-db"
-	fi
-
-	#readline pair reads backwards on purpose, DONT change it around, Ok?
-	# this is because it refers to the building of a bundled readline
-	# versus the system copy
-	use readline && myconf="${myconf} --without-readline"
-	use readline || myconf="${myconf} --with-readline"
-
-	use static \
-		&& myconf="${myconf} --with-mysqld-ldflags=-all-static --disable-shared" \
-		|| myconf="${myconf} --enable-shared --enable-static"
-
-	myconf="${myconf} `use_with tcpd libwrap`"
-	myconf="${myconf} `use_with innodb`"
-
-	use ssl \
-		&& myconf="${myconf} --with-vio --with-openssl" \
-		|| myconf="${myconf} --without-openssl"
-
-	myconf="${myconf} `use_with debug`"
-
-	#glibc-2.3.2_pre fix; bug #16496
-	export CFLAGS="${CFLAGS} -DHAVE_ERRNO_AS_DEFINE=1"
-
-	#bug fix for #15099, should make this api backward compatible
-	export CFLAGS="${CFLAGS} -DUSE_OLD_FUNCTIONS"
-
-	#the compiler flags are as per their "official" spec ;)
-	#CFLAGS="${CFLAGS/-O?/} -O3" \
-	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti" \
-	econf \
-		--libexecdir=/usr/sbin \
-		--sysconfdir=/etc/mysql \
-		--localstatedir=/var/lib/mysql \
-		--with-raid \
-		--with-low-memory \
-		--enable-assembler \
-		--with-charset=latin1 \
-		--enable-local-infile \
-		--with-mysqld-user=mysql \
-		--with-extra-charsets=all \
-		--enable-thread-safe-client \
-		--with-client-ldflags=-lstdc++ \
-		--with-comment="Gentoo Linux ${PF}" \
-		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
-		--with-embedded-server \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make install DESTDIR=${D} benchdir_root=/usr/share/mysql || die
-
-	#move client libs, install a couple of missing headers
-	mv ${D}/usr/lib/mysql/libmysqlclient*.so* ${D}/usr/lib
-	dosym ../libmysqlclient.so /usr/lib/mysql/libmysqlclient.so
-	dosym ../libmysqlclient_r.so /usr/lib/mysql/libmysqlclient_r.so
-	insinto /usr/include/mysql ; doins include/{my_config.h,my_dir.h}
-
-	#convenience links
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlanalyze
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlrepair
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqloptimize
-
-	#various junk
-	rm -f ${D}/usr/share/mysql/mysql.server
-	rm -f ${D}/usr/share/mysql/binary-configure
-	rm -f ${D}/usr/share/mysql/make_binary_distribution
-	rm -f ${D}/usr/share/mysql/mysql-log-rotate
-	rm -f ${D}/usr/share/mysql/{post,pre}install
-	rm -f ${D}/usr/share/mysql/mi_test*
-	rm -f ${D}/usr/share/mysql/*.spec # Redhat gunk
-	rm -f ${D}/usr/share/mysql/*.plist # Apple gunk
-	rm -f ${D}/usr/share/mysql/my-*.cnf # Put them elsewhere
-
-	# All of these (ab)use Perl.
-	if ! use perl; then
-		rm -f ${D}/usr/bin/mysql_setpermission
-		rm -rf ${D}/usr/share/mysql/sql-bench
-	fi
-
-	dohtml Docs/*.html
-	rm -f Docs/*.html
-	dodoc README COPYING COPYING.LIB Docs/manual.*
-	docinto conf-samples
-	dodoc support-files/my-*.cnf
-
-	insinto /etc/mysql
-	newins ${FILESDIR}/my.cnf-4.0.14-r1 my.cnf
-	doins scripts/mysqlaccess.conf
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mysql-4.0.15.rc6 mysql
-}
-
-pkg_config() {
-	if [ ! -d ${ROOT}/var/lib/mysql/mysql ] ; then
-		einfo "Press ENTER to create the mysql database and set proper"
-		einfo "permissions on it, or Control-C to abort now..."
-		read
-		${ROOT}/usr/bin/mysql_install_db #>>/var/log/mysql/mysql.err 2>&1
-		# changing ownership of newly created databases to mysql.mysql
-		local DATADIR=""
-		if [ -f '/etc/mysql/my.cnf' ] ; then
-			#DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'`
-			DATADIR=`/usr/sbin/mysqld  --help |grep '^datadir' | awk '{print $2}'`
-		fi
-		if [ -z "${DATADIR}" ]; then
-			DATADIR="/var/lib/mysql/"
-		fi
-		chown -R mysql:mysql ${DATADIR}
-	else
-		einfo "Hmm, it appears as though you already have the mysql"
-		einfo "database in place.  If you are having problems trying"
-		einfo "to start mysqld, perhaps you need to manually run"
-		einfo "/usr/bin/mysql_install_db and/or check your config"
-		einfo "file(s) and/or database(s) and/or logfile(s)."
-	fi
-}
-
-pkg_preinst() {
-	enewgroup mysql 60 || die "problem adding group mysql"
-	enewuser mysql 60 /dev/null /var/lib/mysql mysql || die "problem adding user mysql"
-}
-
-pkg_postinst() {
-	#empty dirs...
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/lib/mysql
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/run/mysqld
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
-
-	#secure the logfiles... does this bother anybody?
-	touch ${ROOT}/var/log/mysql/mysql.{log,err}
-	chown mysql:mysql ${ROOT}/var/log/mysql/mysql.{log,err}
-	chmod 0660 ${ROOT}/var/log/mysql/mysql.{log,err}
-
-	#your friendly public service announcement...
-	einfo
-	einfo "You might want to run:"
-	einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\""
-	einfo "if this is a new install."
-	einfo
-
-	warning
-}
diff --git a/dev-db/mysql/mysql-4.0.21.ebuild b/dev-db/mysql/mysql-4.0.21.ebuild
deleted file mode 100644
index 5fb54b0436eb..000000000000
--- a/dev-db/mysql/mysql-4.0.21.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.21.ebuild,v 1.11 2004/10/31 01:41:22 vapier Exp $
-
-inherit eutils gnuconfig
-#to accomodate -laadeedah releases
-NEWP=${P}
-
-SVER=${PV%.*}
-#normal releases:
-SDIR=MySQL-${SVER}
-#for a pre-release:
-#SDIR=MySQL-${SVER}-Pre
-
-S=${WORKDIR}/${NEWP}
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-HOMEPAGE="http://www.mysql.com/"
-SRC_URI="mirror://mysql/Downloads/${SDIR}/${NEWP}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ia64 x86 sparc ppc amd64 hppa alpha mips s390 arm ppc64"
-IUSE="static readline innodb berkdb tcpd ssl perl debug selinux"
-RESTRICT="nomirror"
-
-DEPEND="readline? ( >=sys-libs/readline-4.1 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( dev-lang/perl )
-	>=sys-libs/zlib-1.1.3
-	sys-apps/procps
-	>=sys-apps/sed-4"
-PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )"
-RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-mysql )"
-
-warning() {
-	ewarn
-	ewarn "If you're upgrading from MySQL-3.x to 4.0, or 4.0.x to 4.1.x, you"
-	ewarn "must recompile the other packages on your system that link with"
-	ewarn "libmysqlclient after the upgrade completes.  To obtain such a list"
-	ewarn "of packages for your system, you may use 'revdep-rebuild' from"
-	ewarn "app-portage/gentoolkit."
-	ewarn
-	epause 5
-}
-
-pkg_setup() {
-	warning
-}
-
-src_unpack() {
-	if use static && use ssl; then
-		local msg="MySQL does not support building statically with SSL support"
-		eerror "${msg}"
-		die "${msg}"
-	fi
-	unpack ${A} || die
-
-	#zap startup script messages
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.21-install-db-sh.diff
-	#zap binary distribution stuff
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-mysqld-safe-sh.diff
-	#required for qmail-mysql
-	EPATCH_OPTS="-p0 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0-nisam.h.diff
-	#for correct hardcoded sysconf directory
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0-my-print-defaults.diff
-	# NPTL support
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-gentoo-nptl.diff
-
-	# attempt to get libmysqlclient_r linked against ssl if USE="ssl" enabled
-	# i would really prefer to fix this at the Makefile.am level, but can't
-	# get the software to autoreconf as distributed - too many missing files
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.21-thrssl.patch
-
-	if use tcpd; then
-		EPATCH_OPTS="-p1 -d ${S}" \
-		epatch ${FILESDIR}/${PN}-4.0.14-r1-tcpd-vars-fix.diff
-	fi
-
-	# security fix from http://lists.mysql.com/internals/15185
-	# gentoo bug #60744
-	#EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-4.0-mysqlhotcopy-security.patch
-	# Already included upstream in 4.0.21
-
-	cd ${S}
-	autoconf
-	# Saving this for a rainy day, in case we need it again
-	#WANT_AUTOMAKE=1.7 automake
-	gnuconfig_update
-}
-
-src_compile() {
-	local myconf
-
-	#The following fix is due to a bug with bdb on sparc's. See:
-	#http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
-	if use sparc || use alpha || use hppa || use mips
-	then
-		myconf="${myconf} --without-berkeley-db"
-	else
-		use berkdb \
-			&& myconf="${myconf} --with-berkeley-db=./bdb" \
-			|| myconf="${myconf} --without-berkeley-db"
-	fi
-
-	#readline pair reads backwards on purpose, DONT change it around, Ok?
-	# this is because it refers to the building of a bundled readline
-	# versus the system copy
-	use readline && myconf="${myconf} --without-readline"
-	use readline || myconf="${myconf} --with-readline"
-
-	use static \
-		&& myconf="${myconf} --with-mysqld-ldflags=-all-static --disable-shared" \
-		|| myconf="${myconf} --enable-shared --enable-static"
-
-	myconf="${myconf} `use_with tcpd libwrap`"
-	myconf="${myconf} `use_with innodb`"
-
-	use ssl \
-		&& myconf="${myconf} --with-vio --with-openssl" \
-		|| myconf="${myconf} --without-openssl"
-
-	myconf="${myconf} `use_with debug`"
-
-	#glibc-2.3.2_pre fix; bug #16496
-	export CFLAGS="${CFLAGS} -DHAVE_ERRNO_AS_DEFINE=1"
-
-	#bug fix for #15099, should make this api backward compatible
-	export CFLAGS="${CFLAGS} -DUSE_OLD_FUNCTIONS"
-
-	#the compiler flags are as per their "official" spec ;)
-	#CFLAGS="${CFLAGS/-O?/} -O3" \
-	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti" \
-	econf \
-		--libexecdir=/usr/sbin \
-		--sysconfdir=/etc/mysql \
-		--localstatedir=/var/lib/mysql \
-		--with-raid \
-		--with-low-memory \
-		--enable-assembler \
-		--with-charset=latin1 \
-		--enable-local-infile \
-		--with-mysqld-user=mysql \
-		--with-extra-charsets=all \
-		--enable-thread-safe-client \
-		--with-client-ldflags=-lstdc++ \
-		--with-comment="Gentoo Linux ${PF}" \
-		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
-		--with-embedded-server \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make install DESTDIR=${D} benchdir_root=/usr/share/mysql || die
-
-	#move client libs, install a couple of missing headers
-	mv ${D}/usr/$(get_libdir)/mysql/libmysqlclient*.so* ${D}/usr/$(get_libdir)
-	dosym ../libmysqlclient.so /usr/$(get_libdir)/mysql/libmysqlclient.so
-	dosym ../libmysqlclient_r.so /usr/$(get_libdir)/mysql/libmysqlclient_r.so
-	insinto /usr/include/mysql ; doins include/{my_config.h,my_dir.h}
-
-	#convenience links
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlanalyze
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqlrepair
-	dosym /usr/bin/mysqlcheck /usr/bin/mysqloptimize
-
-	#various junk
-	rm -f ${D}/usr/share/mysql/mysql.server
-	rm -f ${D}/usr/share/mysql/binary-configure
-	rm -f ${D}/usr/share/mysql/make_binary_distribution
-	rm -f ${D}/usr/share/mysql/mysql-log-rotate
-	rm -f ${D}/usr/share/mysql/{post,pre}install
-	rm -f ${D}/usr/share/mysql/mi_test*
-	rm -f ${D}/usr/share/mysql/*.spec # Redhat gunk
-	rm -f ${D}/usr/share/mysql/*.plist # Apple gunk
-	rm -f ${D}/usr/share/mysql/my-*.cnf # Put them elsewhere
-
-	# All of these (ab)use Perl.
-	if ! use perl; then
-		rm -f ${D}/usr/bin/mysql_setpermission
-		rm -rf ${D}/usr/share/mysql/sql-bench
-	fi
-
-	dohtml Docs/*.html
-	rm -f Docs/*.html
-	dodoc README COPYING Docs/manual.*
-	docinto conf-samples
-	dodoc support-files/my-*.cnf
-
-	insinto /etc/mysql
-	newins ${FILESDIR}/my.cnf-4.0.14-r1 my.cnf
-	doins scripts/mysqlaccess.conf
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mysql-4.0.15.rc6 mysql
-}
-
-pkg_config() {
-	if [ ! -d ${ROOT}/var/lib/mysql/mysql ] ; then
-		einfo "Press ENTER to create the mysql database and set proper"
-		einfo "permissions on it, or Control-C to abort now..."
-		read
-		${ROOT}/usr/bin/mysql_install_db #>>/var/log/mysql/mysql.err 2>&1
-		# changing ownership of newly created databases to mysql.mysql
-		local DATADIR=""
-		if [ -f '/etc/mysql/my.cnf' ] ; then
-			#DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'`
-			#DATADIR=`/usr/sbin/mysqld  --help |grep '^datadir' | awk '{print $2}'`
-			#DATADIR=`my_print_defaults mysqld | grep -- '^--datadir' | tail -n1 | sed -e 's|^--datadir=||'`
-			DATADIR=`my_print_defaults mysqld | sed -ne '/datadir/s|^--datadir=||p' | tail -n1`
-		fi
-		if [ -z "${DATADIR}" ]; then
-			DATADIR="/var/lib/mysql/"
-		fi
-		chown -R mysql:mysql ${DATADIR}
-		chmod 0750 ${DATADIR}
-	else
-		einfo "Hmm, it appears as though you already have the mysql"
-		einfo "database in place.  If you are having problems trying"
-		einfo "to start mysqld, perhaps you need to manually run"
-		einfo "/usr/bin/mysql_install_db and/or check your config"
-		einfo "file(s) and/or database(s) and/or logfile(s)."
-	fi
-}
-
-pkg_preinst() {
-	enewgroup mysql 60 || die "problem adding group mysql"
-	enewuser mysql 60 /dev/null /var/lib/mysql mysql || die "problem adding user mysql"
-}
-
-pkg_postinst() {
-	#empty dirs...
-	install -d -m0750 -o mysql -g mysql ${ROOT}/var/lib/mysql
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/run/mysqld
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
-
-	#secure the logfiles... does this bother anybody?
-	touch ${ROOT}/var/log/mysql/mysql.{log,err}
-	chown mysql:mysql ${ROOT}/var/log/mysql/mysql*
-	chmod 0660 ${ROOT}/var/log/mysql/mysql*
-	# secure some directories
-	chmod 0750 ${ROOT}/var/log/mysql ${ROOT}/var/lib/mysql
-
-	#your friendly public service announcement...
-	einfo
-	einfo "You might want to run:"
-	einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\""
-	einfo "if this is a new install."
-	einfo
-
-	warning
-}