Remove old versions.

Package-Manager: portage-2.0.51.19

12 files changed, 7 insertions, 1043 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 7839e785102b..b2a5f418551c 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.194 2005/04/21 16:35:17 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.195 2005/04/23 23:54:38 robbat2 Exp $
+
+  23 Apr 2005; Robin H. Johnson <robbat2@gentoo.org>
+  -mysql-3.23.52-r1.ebuild, -mysql-3.23.56.ebuild, -mysql-3.23.57.ebuild,
+  -mysql-3.23.57-r1.ebuild, -mysql-4.1.7.ebuild:
+  Remove old versions.
 
   21 Apr 2005; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.22-r1.ebuild,
   mysql-4.0.22-r2.ebuild, mysql-4.0.22.ebuild, mysql-4.0.23-r1.ebuild,
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 386ceff50648..1b53ea9ca9d8 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,29 +1,22 @@
-MD5 5e7e5e28c0f5cbd2860be6174f486877 mysql-3.23.57-r1.ebuild 6642
-MD5 0366a5e11c40efa437416a4cb6fd7b1f mysql-3.23.56.ebuild 6685
 MD5 a088b749386760cae4d09caf14f39c84 mysql-4.0.22-r1.ebuild 9269
-MD5 bd6591b520239d3e44a03951ef08fb71 mysql-4.1.7.ebuild 8801
 MD5 ca4242e577d3b1b6f69cfa80142c320f mysql-3.23.58.ebuild 6640
 MD5 a4e6b738e389c33c3c9e19b8fb5b8fa3 mysql-4.0.23.ebuild 9040
-MD5 e1033fa49047a578ba121b90fdb2b233 mysql-3.23.52-r1.ebuild 6000
 MD5 80c210f51c3c19afc810c5fb9fc67c7b mysql-4.0.23-r2.ebuild 9407
 MD5 4092ca053ad5303b7515246f47106e02 mysql-4.1.8-r1.ebuild 9225
 MD5 1173ba95403d2a99a6d38d6ae5bde41a mysql-4.0.24-r1.ebuild 11899
-MD5 8176095e06106185dd2a904061f651bd mysql-3.23.57.ebuild 6688
 MD5 75aca22d48ce2becdbebffb7afcad049 mysql-4.0.22.ebuild 8757
 MD5 9bb11a2e8c8e579009cb712fd7a8bf66 mysql-4.0.22-r2.ebuild 9602
 MD5 d436e793baae2f71669b96381ce2959b mysql-3.23.58-r1.ebuild 6759
 MD5 4fb914207484ca4c92ced570610a9647 mysql-4.1.8.ebuild 9087
 MD5 be85068e1f8dd9340882814ae10e1763 mysql-4.0.23-r1.ebuild 9160
 MD5 f26f6906248f45f5f0d23248a39c03a4 mysql-4.0.24.ebuild 9816
-MD5 077d78c8fddddd2ab9655e42222c34ea ChangeLog 30341
+MD5 f012c7aebe8ba2c095dc004fc8c64ff4 ChangeLog 30541
 MD5 a5dda17df0286cd82cae42d117784903 metadata.xml 163
 MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477
 MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439
 MD5 e37e03b4ce894ff87fda12ce6f7b31a6 files/mysql-4.0.21-install-db-sh.diff 585
 MD5 3e399acddc48f209b53e260eec64938c files/mysql-4.0.rc6 933
 MD5 625b4007f035e3da9a4f1eeee1db6b9c files/mysql-4.0.15.rc6 1187
-MD5 015a823e06d7181373b0601e4a17c284 files/digest-mysql-3.23.52-r1 67
-MD5 dcd899fe185459da4cb9e71c75c3bda3 files/digest-mysql-3.23.57-r1 67
 MD5 6e0ae36e30287df25336d8bd71c0e764 files/digest-mysql-3.23.58-r1 67
 MD5 8eaeb1372c41d2fef1622dd707a7a9d0 files/mysql-3.23-nisam.h.diff 452
 MD5 d3830060b3f74d6c0916ed85a6bbf02d files/mysql-3.23-install-db-sh.diff 1368
@@ -40,7 +33,6 @@ MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886
 MD5 6d4fc135a2143e95681416795d1948d9 files/mysql-4.0.23-install-db-sh.diff 1055
 MD5 d20c23adca5b8731ebfab4d1b5771dab files/mysql-4.0.18-mysqld-safe-sh.diff 1307
 MD5 fc80f877fa97f0f3a52ee684ce7f54b2 files/mysql-4.0.16-mysqld-safe-sh.diff 1562
-MD5 85b95c8a74c219d70135c924b541ca20 files/digest-mysql-4.1.7 65
 MD5 5701dee85af16e5d7aa821853ec8cda5 files/digest-mysql-4.1.8 65
 MD5 f635289f8422fdf26ba3c3dbdf99c4e2 files/mysql-4.0.14-mysqld-safe-sh.diff 1503
 MD5 6f8de46485ea7dcf886e1747fb117427 files/mysql-gentoo-nptl.diff 654
@@ -59,8 +51,6 @@ MD5 f599e8b3eb4636bb61721525dc15f5f5 files/mysql-4.0.18-thrssl.patch 723
 MD5 8d51cbf3afa8349839380aa0986704c0 files/mysql-3.23-safe-mysqld-sh.diff 1557
 MD5 7a5badec9c28c2f4d434d6aed0a5103b files/mysql-3.23-my-print-defaults.diff 218
 MD5 a76ec36b83c2f0dbfba65c993f75d135 files/mysql-4.0.18-mysqlbugsecurity.diff 672
-MD5 296a01da527263926d20aca0446bc87d files/digest-mysql-3.23.56 67
-MD5 dcd899fe185459da4cb9e71c75c3bda3 files/digest-mysql-3.23.57 67
 MD5 6e0ae36e30287df25336d8bd71c0e764 files/digest-mysql-3.23.58 67
 MD5 d0fbdf4e41f2b52210eef6cb3a53e128 files/mysql-4.0.24-r1.rc6 1662
 MD5 977be6c68f6231cbcf1febd3305ade5d files/mysql-4.0.14-r1-tcpd-vars-fix.diff 465
diff --git a/dev-db/mysql/files/digest-mysql-3.23.52-r1 b/dev-db/mysql/files/digest-mysql-3.23.52-r1
deleted file mode 100644
index 5f333c8bd85a..000000000000
--- a/dev-db/mysql/files/digest-mysql-3.23.52-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 88705b7f38e64b5c21ebb68c77b75e5a mysql-3.23.52.tar.gz 10861399
diff --git a/dev-db/mysql/files/digest-mysql-3.23.56 b/dev-db/mysql/files/digest-mysql-3.23.56
deleted file mode 100644
index cb44b0ca0c87..000000000000
--- a/dev-db/mysql/files/digest-mysql-3.23.56
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9d506468dc19bef79cbb106b20196a2f mysql-3.23.56.tar.gz 11434746
diff --git a/dev-db/mysql/files/digest-mysql-3.23.57 b/dev-db/mysql/files/digest-mysql-3.23.57
deleted file mode 100644
index 2ee8fd90da1d..000000000000
--- a/dev-db/mysql/files/digest-mysql-3.23.57
+++ /dev/null
@@ -1 +0,0 @@
-MD5 892f7d97af1ce7502e89d824031abd05 mysql-3.23.57.tar.gz 11738262
diff --git a/dev-db/mysql/files/digest-mysql-3.23.57-r1 b/dev-db/mysql/files/digest-mysql-3.23.57-r1
deleted file mode 100644
index 2ee8fd90da1d..000000000000
--- a/dev-db/mysql/files/digest-mysql-3.23.57-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 892f7d97af1ce7502e89d824031abd05 mysql-3.23.57.tar.gz 11738262
diff --git a/dev-db/mysql/files/digest-mysql-4.1.7 b/dev-db/mysql/files/digest-mysql-4.1.7
deleted file mode 100644
index 7d4c3c1e4435..000000000000
--- a/dev-db/mysql/files/digest-mysql-4.1.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 04c08d2a5cc39050d9fa4727f8f197e8 mysql-4.1.7.tar.gz 19849046
diff --git a/dev-db/mysql/mysql-3.23.52-r1.ebuild b/dev-db/mysql/mysql-3.23.52-r1.ebuild
deleted file mode 100644
index eddec03b016c..000000000000
--- a/dev-db/mysql/mysql-3.23.52-r1.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-3.23.52-r1.ebuild,v 1.23 2005/03/03 17:08:35 ciaranm 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 debug"
-KEYWORDS="ppc x86 sparc ~alpha"
-
-DEPEND="readline? ( >=sys-libs/readline-4.1 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	>=sys-libs/zlib-1.1.3
-	dev-lang/perl
-	sys-process/procps"
-RDEPEND=""
-
-# 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() {
-	use innodb || ewarn "InnoDB support is not selected to be compiled in."
-	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}/${P}-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
-	myconf="--with-thread-safe-client"
-# 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
-	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"
-	myconf="${myconf} `use_with 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 \
-		--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 /bin/false -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
-	use innodb || ewarn "InnoDB support is not selected to be compiled in."
-}
diff --git a/dev-db/mysql/mysql-3.23.56.ebuild b/dev-db/mysql/mysql-3.23.56.ebuild
deleted file mode 100644
index 36be70a6525d..000000000000
--- a/dev-db/mysql/mysql-3.23.56.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-3.23.56.ebuild,v 1.13 2005/03/03 17:08:35 ciaranm 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="berkdb debug innodb perl readline ssl static tcpd"
-KEYWORDS="x86 sparc alpha hppa ppc"
-
-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-process/procps"
-
-PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )"
-
-src_unpack() {
-	use innodb || ewarn "InnoDB support is not selected to be compiled in."
-	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 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"
-	myconf="${myconf} `use_with 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 /bin/false -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
-	use innodb || ewarn "InnoDB support is not selected to be compiled in."
-}
diff --git a/dev-db/mysql/mysql-3.23.57-r1.ebuild b/dev-db/mysql/mysql-3.23.57-r1.ebuild
deleted file mode 100644
index 8f1227121314..000000000000
--- a/dev-db/mysql/mysql-3.23.57-r1.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-3.23.57-r1.ebuild,v 1.13 2005/03/03 17:08:35 ciaranm Exp $
-
-inherit flag-o-matic eutils
-
-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"
-KEYWORDS="x86 ~sparc ~alpha ~hppa ppc"
-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-process/procps"
-PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )"
-
-src_unpack() {
-	use innodb || ewarn "InnoDB support is not selected to be compiled in."
-	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
-	epatch ${FILESDIR}/mysql-4.0.14-security-28394.patch
-}
-
-src_compile() {
-	# bug #11681; get b0rked code when using -march=k6 with this package.
-	replace-cpu-flags k6 k6-2 k6-3 i586
-
-	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 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"
-	myconf="${myconf} `use_with 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 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 /bin/false -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
-	use innodb || ewarn "InnoDB support is not selected to be compiled in."
-}
diff --git a/dev-db/mysql/mysql-3.23.57.ebuild b/dev-db/mysql/mysql-3.23.57.ebuild
deleted file mode 100644
index b28f9ab64c13..000000000000
--- a/dev-db/mysql/mysql-3.23.57.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-3.23.57.ebuild,v 1.13 2005/03/03 17:08:35 ciaranm 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="berkdb debug innodb perl readline ssl static tcpd"
-KEYWORDS="x86 ~sparc ~alpha ~hppa ppc"
-
-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-process/procps"
-
-PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )"
-
-src_unpack() {
-	use innodb || ewarn "InnoDB support is not selected to be compiled in."
-	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 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"
-	myconf="${myconf} `use_with 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 /bin/false -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
-	use innodb || ewarn "InnoDB support is not selected to be compiled in."
-}
diff --git a/dev-db/mysql/mysql-4.1.7.ebuild b/dev-db/mysql/mysql-4.1.7.ebuild
deleted file mode 100644
index 884224b1c1f6..000000000000
--- a/dev-db/mysql/mysql-4.1.7.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.7.ebuild,v 1.11 2005/04/21 16:35:17 robbat2 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="~amd64 ~x86"
-IUSE="static readline innodb berkdb tcpd ssl perl ruby selinux debug cluster"
-
-DEPEND="
-	!<dev-db/mysql-4.1*
-	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-process/procps
-	>=sys-apps/texinfo-4.7
-	>=sys-apps/sed-4"
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
-		 ruby? ( >=dev-ruby/mysql-ruby-2.5 )"
-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
-	ewarn "TODO: you must also follow the official upgrade instructions (research and write this up here)"
-	epause 5
-}
-
-pkg_setup() {
-	use innodb || ewarn "InnoDB support is not selected to be compiled in."
-	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
-
-	cd ${S}
-	autoreconf --install --force
-	# Saving this for a rainy day, in case we need it again
-	#WANT_AUTOMAKE=1.7 automake
-	gnuconfig_update
-
-	# upstream bug http://bugs.mysql.com/bug.php?id=7971
-	# names conflict with stuff in 2.6.10 kernel headers
-	echo ${S}/client/mysqltest.c ${S}/extra/replace.c | xargs -n1 \
-	sed -i \
-		-e "s/set_bit/my__set_bit/g" \
-		-e "s/clear_bit/my__clear_bit/g" \
-	    || die "Failed to fix bitops"
-}
-
-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`"
-
-	# MySQL CLuster UseFlag
-	if use cluster; then
-		myconf="${myconf} --with-ndbcluster"
-	fi
-
-	#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 /bin/false /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
-	use innodb || ewarn "InnoDB support is not selected to be compiled in."
-}