19 files changed, 17 insertions, 1703 deletions
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 1b81d2099374..578cb464cff7 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,42 +1,24 @@
+MD5 2dc34643e54b8f4420853dbc29cc17a9 ChangeLog 8085
+MD5 8bd70e5ba5708e31ffc18c0d3fcce1fa mysql-3.23.52-r1.ebuild 5952
 MD5 873cd30ebb693aa7732628e8d0e83789 mysql-3.23.56.ebuild 6624
 MD5 d95bde38182c7cf31940632ea48d3536 mysql-4.0.12.ebuild 6863
-MD5 de1d42fa3fa2e13885845a690fc6d34d mysql-3.23.54a-r1.ebuild 7082
-MD5 24660eb38dccd2e55edc3cdc1e8968fb mysql-3.23.53.ebuild 6081
-MD5 bf749016181bc4529387ca0ce467d908 mysql-4.0.11a-r1.ebuild 6520
-MD5 8bd70e5ba5708e31ffc18c0d3fcce1fa mysql-3.23.52-r1.ebuild 5952
-MD5 1a867a1d48e2747dcc951bfe02f2691f mysql-3.23.55.ebuild 6631
-MD5 a8d09cf83655804c6e211814bd124bf4 mysql-4.0.5_beta.ebuild 6259
-MD5 85e5fc82532d42c912b7dd4cbd86a865 mysql-4.0.11a.ebuild 6377
-MD5 fd1035a55f2c4687c7949860e2658930 mysql-3.23.54a.ebuild 6452
-MD5 2dc34643e54b8f4420853dbc29cc17a9 ChangeLog 8085
-MD5 912d5aff6850b334c88b18c0e37f2ef3 mysql-4.0.7.ebuild 6132
-MD5 b356cd7d6b5330724f0daa4c2a740f17 mysql-4.0.10.ebuild 6126
-MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477
-MD5 123826c210fa0cbdf24c3e6903212dbe files/digest-mysql-3.23.54a 68
-MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439
-MD5 707d18c98dd9d86533b53330a2daadd2 files/mysql-4.0.rc6 951
 MD5 015a823e06d7181373b0601e4a17c284 files/digest-mysql-3.23.52-r1 67
-MD5 8eaeb1372c41d2fef1622dd707a7a9d0 files/mysql-3.23-nisam.h.diff 452
-MD5 d3830060b3f74d6c0916ed85a6bbf02d files/mysql-3.23-install-db-sh.diff 1368
-MD5 7d92ba9c74a73bf3c852a5c078c16d29 files/rebuilder.sh 1557
-MD5 d3bc9aa573525019c4e9d9316f56556a files/digest-mysql-4.0.10 72
+MD5 296a01da527263926d20aca0446bc87d files/digest-mysql-3.23.56 67
 MD5 a77a12a8e251ca0d82d3027b7b50c762 files/digest-mysql-4.0.12 1371
-MD5 ee578e3021841ef9dba4175403564136 files/mysql-4.0-db-3.2.1.diff 1047
-MD5 ff80a5d8d87212046e89f2f8ae779af4 files/mysql-4.0-nisam.h.diff 452
-MD5 5bfc671c63667e6f4c8d48f9edc6076e files/mysql.init 904
-MD5 123826c210fa0cbdf24c3e6903212dbe files/digest-mysql-3.23.54a-r1 68
-MD5 997090f9cbe3e18afeb84508171cedef files/digest-mysql-4.0.7 71
-MD5 04fcbc3263b6da10d038907979ee7f96 files/digest-mysql-4.0.11a-r1 73
-MD5 e68c5d7e3c48028c4cf7e55ea8396013 files/mysql-4.0-install-db-sh.diff 1271
 MD5 47c66444b6a1e2243eadf931d52d34b2 files/my.cnf 1229
-MD5 c960c30b32f42b00c92e32a07fa923a4 files/digest-mysql-4.0.5_beta 71
+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 f49e58771365cb075ece153403811872 files/mysql-3.23.51-tcpd.patch 601
-MD5 8d51cbf3afa8349839380aa0986704c0 files/mysql-3.23-safe-mysqld-sh.diff 1557
-MD5 7a5badec9c28c2f4d434d6aed0a5103b files/mysql-3.23-my-print-defaults.diff 218
-MD5 917c1886c6f90d93178fdb3123d52458 files/digest-mysql-3.23.53 67
-MD5 a11b661dbb561774ad19036ecb2d1923 files/digest-mysql-3.23.55 67
-MD5 296a01da527263926d20aca0446bc87d files/digest-mysql-3.23.56 67
-MD5 57531ccd19e17ccca95e0e3bf833cd67 files/mysql-3.23-db-3.2.3.diff 1105
-MD5 04fcbc3263b6da10d038907979ee7f96 files/digest-mysql-4.0.11a 73
+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 707d18c98dd9d86533b53330a2daadd2 files/mysql-4.0.rc6 951
+MD5 5bfc671c63667e6f4c8d48f9edc6076e files/mysql.init 904
+MD5 7d92ba9c74a73bf3c852a5c078c16d29 files/rebuilder.sh 1557
diff --git a/dev-db/mysql/files/digest-mysql-3.23.53 b/dev-db/mysql/files/digest-mysql-3.23.53
deleted file mode 100644
index 41fe7c9f76b9..000000000000
--- a/dev-db/mysql/files/digest-mysql-3.23.53
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ad28097b22238227a813779839349f0c mysql-3.23.53.tar.gz 10877959
diff --git a/dev-db/mysql/files/digest-mysql-3.23.54a b/dev-db/mysql/files/digest-mysql-3.23.54a
deleted file mode 100644
index 811fccc8d6a3..000000000000
--- a/dev-db/mysql/files/digest-mysql-3.23.54a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4b20909fea3717e42ce113ecb6193d74 mysql-3.23.54a.tar.gz 11397615
diff --git a/dev-db/mysql/files/digest-mysql-3.23.54a-r1 b/dev-db/mysql/files/digest-mysql-3.23.54a-r1
deleted file mode 100644
index 811fccc8d6a3..000000000000
--- a/dev-db/mysql/files/digest-mysql-3.23.54a-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4b20909fea3717e42ce113ecb6193d74 mysql-3.23.54a.tar.gz 11397615
diff --git a/dev-db/mysql/files/digest-mysql-3.23.55 b/dev-db/mysql/files/digest-mysql-3.23.55
deleted file mode 100644
index 5ad6284f2acd..000000000000
--- a/dev-db/mysql/files/digest-mysql-3.23.55
+++ /dev/null
@@ -1 +0,0 @@
-MD5 259196ddc00c94051dceb9e86574d17e mysql-3.23.55.tar.gz 11328584
diff --git a/dev-db/mysql/files/digest-mysql-4.0.10 b/dev-db/mysql/files/digest-mysql-4.0.10
deleted file mode 100644
index 0091c041a820..000000000000
--- a/dev-db/mysql/files/digest-mysql-4.0.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fd66e12e7de57a6836283365107af427 mysql-4.0.10-gamma.tar.gz 12133326
diff --git a/dev-db/mysql/files/digest-mysql-4.0.11a b/dev-db/mysql/files/digest-mysql-4.0.11a
deleted file mode 100644
index 4be9f2aaf89f..000000000000
--- a/dev-db/mysql/files/digest-mysql-4.0.11a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dbe1426ed5ae1626b2b1a3ebca568200 mysql-4.0.11a-gamma.tar.gz 12317114
diff --git a/dev-db/mysql/files/digest-mysql-4.0.11a-r1 b/dev-db/mysql/files/digest-mysql-4.0.11a-r1
deleted file mode 100644
index 4be9f2aaf89f..000000000000
--- a/dev-db/mysql/files/digest-mysql-4.0.11a-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dbe1426ed5ae1626b2b1a3ebca568200 mysql-4.0.11a-gamma.tar.gz 12317114
diff --git a/dev-db/mysql/files/digest-mysql-4.0.5_beta b/dev-db/mysql/files/digest-mysql-4.0.5_beta
deleted file mode 100644
index 163b15a4194e..000000000000
--- a/dev-db/mysql/files/digest-mysql-4.0.5_beta
+++ /dev/null
@@ -1 +0,0 @@
-MD5 704248e039d853078630eba97cf617ba mysql-4.0.5a-beta.tar.gz 11990584
diff --git a/dev-db/mysql/files/digest-mysql-4.0.7 b/dev-db/mysql/files/digest-mysql-4.0.7
deleted file mode 100644
index df9d3f6fc29f..000000000000
--- a/dev-db/mysql/files/digest-mysql-4.0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 79cb998cbde4b03efb670b57da8368e0 mysql-4.0.7-gamma.tar.gz 12059003
diff --git a/dev-db/mysql/mysql-3.23.53.ebuild b/dev-db/mysql/mysql-3.23.53.ebuild
deleted file mode 100644
index 1856fa161094..000000000000
--- a/dev-db/mysql/mysql-3.23.53.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-3.23.53.ebuild,v 1.6 2003/03/11 21:11:45 seemant Exp $
-
-SVER=${PV%.*}
-#normal releases:
-SDIR=MySQL-${SVER}
-#for a pre-release:
-#SDIR=MySQL-${SVER}-Pre
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
-HOMEPAGE="http://www.mysql.com/"
-SRC_URI="ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/${SDIR}/${P}.tar.gz
-	ftp://mysql.valueclick.com/pub/mysql/Downloads/${SDIR}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static readline innodb berkdb tcpd ssl"
-KEYWORDS="~x86 ~sparc ~alpha"
-
-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"
-
-# HEY!
-# the benchmark stuff in /usr/share/mysql/sql-bench and
-# the /usr/bin/mysql_setpermission script need dev-perl/DBD-mysql.
-# Can't add it here: circ depend.  Emerge it either before or after
-# mysql; easier before, then it pulls in mysql.
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	# required for qmail-mysql
-	patch -p0 < ${FILESDIR}/mysql-3.23-nisam.h.diff || die
-	# zap startup script messages
-	patch -p1 < ${FILESDIR}/mysql-3.23.52-install-db-sh.diff || die
-	# zap binary distribution stuff
-	patch -p1 < ${FILESDIR}/mysql-3.23-safe-mysqld-sh.diff || die
-	# for correct hardcoded sysconf directory
-	patch -p1 < ${FILESDIR}/mysql-3.23-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 sparc64
-	then
-		myconf="${myconf} --without-berkeley-db"
-	else
-		use berkdb && myconf="${myconf} --with-berkeley-db=./bdb" \
-			|| myconf="${myconf} --without-berkeley-db"
-	fi
-	use readline && myconf="${myconf} --with-readline"
-	use readline || myconf="${myconf} --without-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"
-	[ -n "${DEBUGBUILD}" ] && myconf="${myconf} --with-debug"
-	[ -n "${DEBUGBUILD}" ] || myconf="${myconf} --without-debug"
-
-	# the compiler flags are as per their "official" spec ;-)
-	einfo "myconf is $myconf"
-	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 \
-		--with-mysqld-user=mysql \
-		--with-extra-charsets=all \
-		--enable-thread-safe-client \
-		--with-client-ldflags=-lstdc++ \
-		--with-comment="Gentoo ${PF}.ebuild package" \
-		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
-		${myconf} || die "bad ./configure"
-
-	make || 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
-
-	# while my broom gently sweeps...
-	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
-
-	dodoc README COPYING COPYING.LIB MIRRORS \
-		Docs/{manual.ps,manual.txt}
-	dohtml -r Docs/*
-	docinto conf-samples
-	dodoc support-files/my-*.cnf
-
-	insinto /etc/mysql
-	doins ${FILESDIR}/my.cnf scripts/mysqlaccess.conf
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mysql.init 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
-}
diff --git a/dev-db/mysql/mysql-3.23.54a-r1.ebuild b/dev-db/mysql/mysql-3.23.54a-r1.ebuild
deleted file mode 100644
index 4ee22e244073..000000000000
--- a/dev-db/mysql/mysql-3.23.54a-r1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-3.23.54a-r1.ebuild,v 1.2 2003/03/11 21:11:45 seemant Exp $
-
-# bug #11681; get b0rked code when using -march=k6 with this package.
-inherit flag-o-matic
-replace-flags "-march=k6-3" "-march=i586"
-replace-flags "-march=k6-2" "-march=i586"
-replace-flags "-march=k6" "-march=i586"
-
-SVER=${PV%.*}
-#normal releases:
-SDIR=MySQL-${SVER}
-#for a pre-release:
-#SDIR=MySQL-${SVER}-Pre
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
-HOMEPAGE="http://www.mysql.com/"
-SRC_URI="ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/${SDIR}/${P}.tar.gz
-	ftp://mysql.valueclick.com/pub/mysql/Downloads/${SDIR}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static readline innodb berkdb tcpd ssl perl"
-KEYWORDS="~x86 ~sparc ~alpha ~hppa"
-
-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"
-
-# HEY!
-# the benchmark stuff in /usr/share/mysql/sql-bench and
-# the /usr/bin/mysql_setpermission script need dev-perl/DBD-mysql.
-# Can't add it here: circ depend.  Emerge it either before or after
-# mysql; easier before, then it pulls in mysql.
-
-# The above problem should be addressed by making dev-perl/DBD-mysql
-# and dev-perl/DBI PDEPENDS here.  However, in the case where people
-# don't want perl things, this seems rather rude, so we shall make
-# this PDEPEND only active if USE="perl" is enabled, and will remove
-# /usr/bin/mysql_setpermission otherwise.  Perhaps in the future, all
-# bits that depend on perl could be removed, and the hard DEPEND on
-# perl itself could be relaxed, if enough people express interest in
-# this.
-
-PDEPEND="$DEPEND
-	perl? ( dev-perl/DBI dev-perl/DBD-mysql )"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	# required for qmail-mysql
-	patch -p0 < ${FILESDIR}/mysql-3.23-nisam.h.diff || die
-	# zap startup script messages
-	patch -p1 < ${FILESDIR}/mysql-3.23.52-install-db-sh.diff || die
-	# zap binary distribution stuff
-	patch -p1 < ${FILESDIR}/mysql-3.23-safe-mysqld-sh.diff || die
-	# for correct hardcoded sysconf directory
-	patch -p1 < ${FILESDIR}/mysql-3.23-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
-	# same for alpha (see http://www.mysql.com/doc/en/BDB_portability.html)
-	# thanks to peter@icebear.net for noticing this.
-	if use sparc || use sparc64 || 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
-	use readline && myconf="${myconf} --with-readline"
-	use readline || myconf="${myconf} --without-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"
-	[ -n "${DEBUGBUILD}" ] && myconf="${myconf} --with-debug"
-	[ -n "${DEBUGBUILD}" ] || myconf="${myconf} --without-debug"
-
-	# the compiler flags are as per their "official" spec ;-)
-	einfo "myconf is $myconf"
-	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 \
-		--with-mysqld-user=mysql \
-		--with-extra-charsets=all \
-		--enable-thread-safe-client \
-		--with-client-ldflags=-lstdc++ \
-		--with-comment="Gentoo ${PF}.ebuild package" \
-		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
-		${myconf} || die "bad ./configure"
-
-	make || 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
-
-	# while my broom gently sweeps...
-	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
-
-	if ! use perl; then
-		rm -f ${D}/usr/bin/mysql_setpermission
-	fi
-
-	dodoc README COPYING COPYING.LIB MIRRORS \
-		Docs/{manual.ps,manual.txt}
-	dohtml -r Docs/*
-	docinto conf-samples
-	dodoc support-files/my-*.cnf
-
-	insinto /etc/mysql
-	doins ${FILESDIR}/my.cnf scripts/mysqlaccess.conf
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mysql.init 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
-}
diff --git a/dev-db/mysql/mysql-3.23.54a.ebuild b/dev-db/mysql/mysql-3.23.54a.ebuild
deleted file mode 100644
index cd36ad7917e0..000000000000
--- a/dev-db/mysql/mysql-3.23.54a.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-3.23.54a.ebuild,v 1.6 2003/03/11 21:11:45 seemant Exp $
-
-# bug #11681; get b0rked code when using -march=k6 with this package.
-inherit flag-o-matic
-replace-flags "-march=k6-3" "-march=i586"
-replace-flags "-march=k6-2" "-march=i586"
-replace-flags "-march=k6" "-march=i586"
-
-SVER=${PV%.*}
-#normal releases:
-SDIR=MySQL-${SVER}
-#for a pre-release:
-#SDIR=MySQL-${SVER}-Pre
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
-HOMEPAGE="http://www.mysql.com/"
-SRC_URI="ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/${SDIR}/${P}.tar.gz
-	ftp://mysql.valueclick.com/pub/mysql/Downloads/${SDIR}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static readline innodb berkdb tcpd ssl"
-KEYWORDS="x86 ~sparc alpha hppa"
-
-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"
-
-# HEY!
-# the benchmark stuff in /usr/share/mysql/sql-bench and
-# the /usr/bin/mysql_setpermission script need dev-perl/DBD-mysql.
-# Can't add it here: circ depend.  Emerge it either before or after
-# mysql; easier before, then it pulls in mysql.
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	# required for qmail-mysql
-	patch -p0 < ${FILESDIR}/mysql-3.23-nisam.h.diff || die
-	# zap startup script messages
-	patch -p1 < ${FILESDIR}/mysql-3.23.52-install-db-sh.diff || die
-	# zap binary distribution stuff
-	patch -p1 < ${FILESDIR}/mysql-3.23-safe-mysqld-sh.diff || die
-	# for correct hardcoded sysconf directory
-	patch -p1 < ${FILESDIR}/mysql-3.23-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
-	# same for alpha (see http://www.mysql.com/doc/en/BDB_portability.html)
-	# thanks to peter@icebear.net for noticing this.
-	if use sparc || use sparc64 || 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
-	use readline && myconf="${myconf} --with-readline"
-	use readline || myconf="${myconf} --without-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"
-	[ -n "${DEBUGBUILD}" ] && myconf="${myconf} --with-debug"
-	[ -n "${DEBUGBUILD}" ] || myconf="${myconf} --without-debug"
-
-	# the compiler flags are as per their "official" spec ;-)
-	einfo "myconf is $myconf"
-	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 \
-		--with-mysqld-user=mysql \
-		--with-extra-charsets=all \
-		--enable-thread-safe-client \
-		--with-client-ldflags=-lstdc++ \
-		--with-comment="Gentoo ${PF}.ebuild package" \
-		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
-		${myconf} || die "bad ./configure"
-
-	make || 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
-
-	# while my broom gently sweeps...
-	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
-
-	dodoc README COPYING COPYING.LIB MIRRORS \
-		Docs/{manual.ps,manual.txt}
-	dohtml -r Docs/*
-	docinto conf-samples
-	dodoc support-files/my-*.cnf
-
-	insinto /etc/mysql
-	doins ${FILESDIR}/my.cnf scripts/mysqlaccess.conf
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mysql.init 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
-}
diff --git a/dev-db/mysql/mysql-3.23.55.ebuild b/dev-db/mysql/mysql-3.23.55.ebuild
deleted file mode 100644
index 3388412d18bc..000000000000
--- a/dev-db/mysql/mysql-3.23.55.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-3.23.55.ebuild,v 1.8 2003/03/11 21:11:45 seemant Exp $
-
-# bug #11681; get b0rked code when using -march=k6 with this package.
-inherit flag-o-matic
-replace-flags "-march=k6-3" "-march=i586"
-replace-flags "-march=k6-2" "-march=i586"
-replace-flags "-march=k6" "-march=i586"
-
-SVER=${PV%.*}
-#normal releases:
-SDIR=MySQL-${SVER}
-#for a pre-release:
-#SDIR=MySQL-${SVER}-Pre
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
-HOMEPAGE="http://www.mysql.com/"
-SRC_URI="ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/${SDIR}/${P}.tar.gz
-	ftp://mysql.valueclick.com/pub/mysql/Downloads/${SDIR}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static readline innodb berkdb tcpd ssl"
-KEYWORDS="~x86 ~sparc ~alpha ~hppa"
-
-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"
-
-PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	# required for qmail-mysql
-	patch -p0 < ${FILESDIR}/mysql-3.23-nisam.h.diff || die
-	# zap startup script messages
-	patch -p1 < ${FILESDIR}/mysql-3.23.52-install-db-sh.diff || die
-	# zap binary distribution stuff
-	patch -p1 < ${FILESDIR}/mysql-3.23-safe-mysqld-sh.diff || die
-	# for correct hardcoded sysconf directory
-	patch -p1 < ${FILESDIR}/mysql-3.23-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
-	# same for alpha (see http://www.mysql.com/doc/en/BDB_portability.html)
-	# thanks to peter@icebear.net for noticing this.
-	if use sparc || use sparc64 || 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"
-	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"
-	[ -n "${DEBUGBUILD}" ] && myconf="${myconf} --with-debug"
-	[ -n "${DEBUGBUILD}" ] || myconf="${myconf} --without-debug"
-
-	#glibc-2.3.2_pre fix; bug #16496
-	export CFLAGS="${CFLAGS} -DHAVE_ERRNO_AS_DEFINE=1"
-	export CXXFLAGS="${CXXFLAGS} -DHAVE_ERRNO_AS_DEFINE=1"
-
-	# the compiler flags are as per their "official" spec ;-)
-	einfo "\$myconf is $myconf"
-	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"
-
-	make || 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}
-	dohtml -r Docs/*
-	docinto conf-samples
-	dodoc support-files/my-*.cnf
-
-	insinto /etc/mysql
-	doins ${FILESDIR}/my.cnf scripts/mysqlaccess.conf
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mysql.init 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
-}
diff --git a/dev-db/mysql/mysql-4.0.10.ebuild b/dev-db/mysql/mysql-4.0.10.ebuild
deleted file mode 100644
index bd41b6a2ad51..000000000000
--- a/dev-db/mysql/mysql-4.0.10.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.10.ebuild,v 1.2 2003/03/11 21:11:45 seemant Exp $
-
-#cuckoo, cuckoo
-NEWP=${P}-gamma
-
-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://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="static readline innodb berkdb tcpd ssl"
-
-#HEY!
-#the benchmark stuff in /usr/share/mysql/sql-bench and the
-#/usr/bin/mysql_setpermission script need dev-perl/DBD-mysql.
-#Can't add it here: circ depend.  Emerge it either before or
-#after mysql; easier before, then it pulls in mysql.
-
-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"
-
-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 sparc64; then
-		myconf="${myconf} --without-berkeley-db"
-	else
-		use berkdb && myconf="${myconf} --with-berkeley-db=./bdb"
-		use berkdb || myconf="${myconf} --without-berkeley-db"
-	fi
-	use readline && myconf="${myconf} --with-readline"
-	use readline || myconf="${myconf} --without-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"
-	[ -n "${DEBUGBUILD}" ] && myconf="${myconf} --with-debug"
-	[ -n "${DEBUGBUILD}" ] || myconf="${myconf} --without-debug"
-
-	#the compiler flags are as per their "official" spec ;)
-	einfo "myconf is: $myconf"
-	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 \
-		--with-mysqld-user=mysql \
-		--with-extra-charsets=all \
-		--enable-thread-safe-client \
-		--with-client-ldflags=-lstdc++ \
-		--with-comment="Gentoo ${PF}.ebuild package" \
-		--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
-
-	#while my broom gently sweeps...
-	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
-
-	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
-}
diff --git a/dev-db/mysql/mysql-4.0.11a-r1.ebuild b/dev-db/mysql/mysql-4.0.11a-r1.ebuild
deleted file mode 100644
index 44afa569edf5..000000000000
--- a/dev-db/mysql/mysql-4.0.11a-r1.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.11a-r1.ebuild,v 1.2 2003/03/11 21:11:45 seemant Exp $
-
-#cuckoo, cuckoo
-NEWP=${P}-gamma
-
-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="static readline innodb berkdb tcpd ssl"
-
-#HEY!
-#the benchmark stuff in /usr/share/mysql/sql-bench and the
-#/usr/bin/mysql_setpermission script need dev-perl/DBD-mysql.
-#Can't add it here: circ depend.  Emerge it either before or
-#after mysql; easier before, then it pulls in mysql.
-
-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"
-
-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 sparc64 || 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"
-	[ -n "${DEBUGBUILD}" ] && myconf="${myconf} --with-debug"
-	[ -n "${DEBUGBUILD}" ] || myconf="${myconf} --without-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 ${PF}.ebuild package" \
-		--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
-
-	#while my broom gently sweeps...
-	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
-
-	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
-}
diff --git a/dev-db/mysql/mysql-4.0.11a.ebuild b/dev-db/mysql/mysql-4.0.11a.ebuild
deleted file mode 100644
index d8772bb8550f..000000000000
--- a/dev-db/mysql/mysql-4.0.11a.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.11a.ebuild,v 1.2 2003/03/11 21:11:45 seemant Exp $
-
-#cuckoo, cuckoo
-NEWP=${P}-gamma
-
-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="static readline innodb berkdb tcpd ssl"
-
-#HEY!
-#the benchmark stuff in /usr/share/mysql/sql-bench and the
-#/usr/bin/mysql_setpermission script need dev-perl/DBD-mysql.
-#Can't add it here: circ depend.  Emerge it either before or
-#after mysql; easier before, then it pulls in mysql.
-
-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"
-
-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 sparc64 || 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"
-	[ -n "${DEBUGBUILD}" ] && myconf="${myconf} --with-debug"
-	[ -n "${DEBUGBUILD}" ] || myconf="${myconf} --without-debug"
-
-	#glibc-2.3.2_pre fix; bug #16496
-	export CFLAGS="${CFLAGS} -DHAVE_ERRNO_AS_DEFINE=1"
-
-	#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 ${PF}.ebuild package" \
-		--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
-
-	#while my broom gently sweeps...
-	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
-
-	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
-}
diff --git a/dev-db/mysql/mysql-4.0.5_beta.ebuild b/dev-db/mysql/mysql-4.0.5_beta.ebuild
deleted file mode 100644
index 6f590cf57cd2..000000000000
--- a/dev-db/mysql/mysql-4.0.5_beta.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.5_beta.ebuild,v 1.5 2003/03/11 21:11:45 seemant Exp $
-
-#mysql-4.0.5a_beta.ebuild:
-# -->!!! Name error in 4.0.5a_beta: characters before _ must be numeric
-#this is cuckoo; fixme next release...
-NEWP=mysql-4.0.5a-beta
-
-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://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="static readline innodb berkdb tcpd ssl"
-
-#HEY!
-#the benchmark stuff in /usr/share/mysql/sql-bench and the
-#/usr/bin/mysql_setpermission script need dev-perl/DBD-mysql.
-#Can't add it here: circ depend.  Emerge it either before or
-#after mysql; easier before, then it pulls in mysql.
-
-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"
-
-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 sparc64; then
-		myconf="${myconf} --without-berkeley-db"
-	else
-		use berkdb && myconf="${myconf} --with-berkeley-db=./bdb"
-		use berkdb || myconf="${myconf} --without-berkeley-db"
-	fi
-	use readline && myconf="${myconf} --with-readline"
-	use readline || myconf="${myconf} --without-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"
-	[ -n "${DEBUGBUILD}" ] && myconf="${myconf} --with-debug"
-	[ -n "${DEBUGBUILD}" ] || myconf="${myconf} --without-debug"
-
-	#the compiler flags are as per their "official" spec ;)
-	einfo "myconf is: $myconf"
-	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 \
-		--with-mysqld-user=mysql \
-		--with-extra-charsets=all \
-		--enable-thread-safe-client \
-		--with-client-ldflags=-lstdc++ \
-		--with-comment="Gentoo ${PF}.ebuild package" \
-		--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
-
-	#while my broom gently sweeps...
-	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
-
-	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
-}
diff --git a/dev-db/mysql/mysql-4.0.7.ebuild b/dev-db/mysql/mysql-4.0.7.ebuild
deleted file mode 100644
index cdf5da05b4a2..000000000000
--- a/dev-db/mysql/mysql-4.0.7.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.7.ebuild,v 1.4 2003/03/11 21:11:45 seemant Exp $
-
-#cuckoo, cuckoo
-NEWP=mysql-4.0.7-gamma
-
-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://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="static readline innodb berkdb tcpd ssl"
-
-#HEY!
-#the benchmark stuff in /usr/share/mysql/sql-bench and the
-#/usr/bin/mysql_setpermission script need dev-perl/DBD-mysql.
-#Can't add it here: circ depend.  Emerge it either before or
-#after mysql; easier before, then it pulls in mysql.
-
-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"
-
-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 sparc64; then
-		myconf="${myconf} --without-berkeley-db"
-	else
-		use berkdb && myconf="${myconf} --with-berkeley-db=./bdb"
-		use berkdb || myconf="${myconf} --without-berkeley-db"
-	fi
-	use readline && myconf="${myconf} --with-readline"
-	use readline || myconf="${myconf} --without-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"
-	[ -n "${DEBUGBUILD}" ] && myconf="${myconf} --with-debug"
-	[ -n "${DEBUGBUILD}" ] || myconf="${myconf} --without-debug"
-
-	#the compiler flags are as per their "official" spec ;)
-	einfo "myconf is: $myconf"
-	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 \
-		--with-mysqld-user=mysql \
-		--with-extra-charsets=all \
-		--enable-thread-safe-client \
-		--with-client-ldflags=-lstdc++ \
-		--with-comment="Gentoo ${PF}.ebuild package" \
-		--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
-
-	#while my broom gently sweeps...
-	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
-
-	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
-}