version bump for MySQL-5.0 ; changed comments in patches

(Portage version: 2.0.51.22-r2)

11 files changed, 94 insertions, 612 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 5b5d43f8d624..8219da05cad6 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,17 @@
 # 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.226 2005/09/03 19:23:23 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.227 2005/09/05 22:12:12 vivo Exp $
+
+*mysql-5.0.12_beta (05 Sep 2005)
+
+  05 Sep 2005; Francesco Riosa <vivo@gentoo.org>
+  files/035_x86_asm-pic-fixes-r1.patch,
+  files/035_x86_asm-pic-fixes-r2.patch,
+  files/010_all_my-print-defaults-r2.patch,
+  files/701_all_test-myisam-geometry.patch, -mysql-5.0.9_beta-r2.ebuild,
+  -mysql-5.0.10_beta.ebuild, +mysql-5.0.12_beta.ebuild:
+  version bump for MySQL-5.0
+  changed comments in patches
 
   03 Sep 2005; Markus Rothe <corsair@gentoo.org> mysql-4.0.25-r2.ebuild:
   Stable on ppc64
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 4a4f441e038d..ba5e22c5d611 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,52 +1,50 @@
-MD5 eb0cb8a9df88c05e8f3b04ead1c17fb5 ChangeLog 39068
-MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158
-MD5 82eebc79341497bc468d529ecac22ab1 mysql-3.23.58-r1.ebuild 7064
+MD5 f8baddc1be50d90ca3b9dcec46c4a5ce mysql-5.0.12_beta.ebuild 17066
 MD5 26109dc9429cc2fb578813e3dc04bc79 mysql-4.1.14.ebuild 16330
-MD5 c28056421db550a09a548ad1dff517f5 mysql-4.0.22-r2.ebuild 9613
+MD5 0dfa3f1c8accfc384b42caf169f8948c mysql-4.1.13-r1.ebuild 16277
 MD5 d168c71df57729ea0eeadab3c6a59f43 mysql-4.0.22.ebuild 8768
+MD5 c28056421db550a09a548ad1dff517f5 mysql-4.0.22-r2.ebuild 9613
+MD5 82eebc79341497bc468d529ecac22ab1 mysql-3.23.58-r1.ebuild 7064
 MD5 240fc6da2d2c2d7dd224b147db251f80 mysql-4.0.24.ebuild 9827
-MD5 0dfa3f1c8accfc384b42caf169f8948c mysql-4.1.13-r1.ebuild 16277
-MD5 d798b2f1ab735fcf347f892581801b8e mysql-5.0.9_beta-r2.ebuild 16659
+MD5 eb0cb8a9df88c05e8f3b04ead1c17fb5 ChangeLog 39068
+MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158
 MD5 630544f322676eaca90b99f8d7e6aaf3 mysql-4.0.25-r2.ebuild 13770
-MD5 e398d112504a353aa7e7354fe023271f mysql-5.0.10_beta.ebuild 16657
-MD5 c3668d812a8ad7ed9a0a3fac57520115 files/digest-mysql-4.1.14 66
+MD5 a755fb5a3ed724046a4f83fafd819c77 files/mysql-test-myisam-geometry.patch 1217
+MD5 76446c512e91b2f8e9e69a0379178e5c files/mysql-4.0.25-r2-asm-pic-fixes.patch 7295
+MD5 e37e03b4ce894ff87fda12ce6f7b31a6 files/mysql-4.0.21-install-db-sh.diff 585
+MD5 ad883e978e48b2040477a12951c01806 files/digest-mysql-4.1.13-r1 66
+MD5 237315cdafd5415390df78dec50669e9 files/035_x86_asm-pic-fixes-r2.patch 8201
+MD5 625b4007f035e3da9a4f1eeee1db6b9c files/mysql-4.0.15.rc6 1187
 MD5 6e0ae36e30287df25336d8bd71c0e764 files/digest-mysql-3.23.58-r1 67
+MD5 8eaeb1372c41d2fef1622dd707a7a9d0 files/mysql-3.23-nisam.h.diff 452
+MD5 58c4d09c5c2712254b1881a6fcc7abff files/mysql-4.0.18-gentoo-nptl.diff 587
+MD5 4bf867b7a623f33de25be8763e1afe10 files/digest-mysql-5.0.12_beta 144
+MD5 087f3fbbe8e3385f5408d91cb661aace files/mysql-4.0-mysqlhotcopy-security.patch 1394
 MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22 66
-MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22-r2 66
 MD5 547fab43da8e59a03a5f3e4a500cca45 files/digest-mysql-4.0.24 66
+MD5 c3668d812a8ad7ed9a0a3fac57520115 files/digest-mysql-4.1.14 66
+MD5 ff80a5d8d87212046e89f2f8ae779af4 files/mysql-4.0-nisam.h.diff 452
+MD5 9209843349ac5e9560f9ad7450c49769 files/703_all_test-rpl_rotate_logs.patch 802
+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 d3f7b593978d1620e8070552ab4f86bb files/010_all_my-print-defaults-r2.patch 908
 MD5 d200345efa421d012cf858134d2c8884 files/logrotate.mysql 440
 MD5 f1fc8bfe540d6f1268b53b7cad275080 files/my.cnf 1231
-MD5 a8f89d11a0913332c5f8c1da5a21cc3f files/my.cnf-4.0.14-r1 2816
-MD5 9946a8f7163970ec4f6a713c97eadbe0 files/my.cnf-4.0.24-r1 4271
-MD5 277705080f05b5b98b815487e080e562 files/my.cnf-4.1 4068
-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 50629599f478b26b4ca82c7c553feae0 files/mysql-3.23.52-install-db-sh.diff 1366
 MD5 d1e79f7a155e45c69558f083fcb1139d files/mysql-4.0-my-print-defaults.diff 240
-MD5 087f3fbbe8e3385f5408d91cb661aace files/mysql-4.0-mysqlhotcopy-security.patch 1394
-MD5 ff80a5d8d87212046e89f2f8ae779af4 files/mysql-4.0-nisam.h.diff 452
-MD5 977be6c68f6231cbcf1febd3305ade5d files/mysql-4.0.14-r1-tcpd-vars-fix.diff 465
-MD5 625b4007f035e3da9a4f1eeee1db6b9c files/mysql-4.0.15.rc6 1187
-MD5 58c4d09c5c2712254b1881a6fcc7abff files/mysql-4.0.18-gentoo-nptl.diff 587
-MD5 d20c23adca5b8731ebfab4d1b5771dab files/mysql-4.0.18-mysqld-safe-sh.diff 1307
-MD5 e37e03b4ce894ff87fda12ce6f7b31a6 files/mysql-4.0.21-install-db-sh.diff 585
+MD5 3d755bbd0b109ec0397b0ce50b4a554d files/mysql-accesstmp.patch 3393
 MD5 8af497943e1a29aa0a0c6b17af54b116 files/mysql-4.0.21-thrssl.patch 318
-MD5 6d4fc135a2143e95681416795d1948d9 files/mysql-4.0.23-install-db-sh.diff 1055
-MD5 c6ff193b0612040bab879d2085b6edea files/mysql-4.0.24-manual.texi.patch 603
+MD5 277705080f05b5b98b815487e080e562 files/my.cnf-4.1 4068
+MD5 8d51cbf3afa8349839380aa0986704c0 files/mysql-3.23-safe-mysqld-sh.diff 1557
+MD5 7a5badec9c28c2f4d434d6aed0a5103b files/mysql-3.23-my-print-defaults.diff 218
+MD5 c46a8d39ac5d7568ff42b7c3ccce5e1d files/701_all_test-myisam-geometry.patch 1259
+MD5 66b1e90f93ae0adc106e7b62a2c4043b files/mysql-4.1.9-thrssl.patch 905
 MD5 d0fbdf4e41f2b52210eef6cb3a53e128 files/mysql-4.0.24-r1.rc6 1662
 MD5 08f1246e8107e4140378d429ff9773af files/mysql-4.0.24-r2.rc6 2123
-MD5 66b1e90f93ae0adc106e7b62a2c4043b files/mysql-4.1.9-thrssl.patch 905
-MD5 3d755bbd0b109ec0397b0ce50b4a554d files/mysql-accesstmp.patch 3393
-MD5 a755fb5a3ed724046a4f83fafd819c77 files/mysql-test-myisam-geometry.patch 1217
-MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886
-MD5 46b0857fe11abf1015f0db6da26614ff files/010_all_my-print-defaults-r2.patch 907
-MD5 c5fcb05dcc3f2d093efd55bd96af2423 files/035_x86_asm-pic-fixes-r1.patch 4093
-MD5 a9f61fe89f1a43f6c5a8de100176d2dc files/701_all_test-myisam-geometry.patch 1239
-MD5 9209843349ac5e9560f9ad7450c49769 files/703_all_test-rpl_rotate_logs.patch 802
-MD5 ad883e978e48b2040477a12951c01806 files/digest-mysql-4.1.13-r1 66
-MD5 93827506c0de13cf7b5023847a4afd95 files/digest-mysql-5.0.9_beta-r2 70
+MD5 977be6c68f6231cbcf1febd3305ade5d files/mysql-4.0.14-r1-tcpd-vars-fix.diff 465
+MD5 c6ff193b0612040bab879d2085b6edea files/mysql-4.0.24-manual.texi.patch 603
+MD5 a8f89d11a0913332c5f8c1da5a21cc3f files/my.cnf-4.0.14-r1 2816
+MD5 9946a8f7163970ec4f6a713c97eadbe0 files/my.cnf-4.0.24-r1 4271
+MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22-r2 66
 MD5 06a7c1ead0dfe570f7c67d525c45f7c3 files/digest-mysql-4.0.25-r2 66
-MD5 76446c512e91b2f8e9e69a0379178e5c files/mysql-4.0.25-r2-asm-pic-fixes.patch 7295
-MD5 2a38459933c8b182b2b7ee08ac4e4509 files/035_x86_asm-pic-fixes-r2.patch 8162
-MD5 49aaf02181386f4a7d8c97c7e21f7d66 files/digest-mysql-5.0.10_beta 71
+MD5 a868ff3e6a328acbed6842fdd17c8cdf files/035_x86_asm-pic-fixes-r1.patch 4102
diff --git a/dev-db/mysql/files/010_all_my-print-defaults-r2.patch b/dev-db/mysql/files/010_all_my-print-defaults-r2.patch
index 6c0ac1a425e0..656930de04ec 100644
--- a/dev-db/mysql/files/010_all_my-print-defaults-r2.patch
+++ b/dev-db/mysql/files/010_all_my-print-defaults-r2.patch
@@ -1,4 +1,4 @@
-###MY_VER_RANGE  [5.0.6_beta)
+###MY_VER_RANGE  [5.0.6_beta,)
 --- mysql.old/mysys/default.c	2005-05-22 02:35:25.000000000 +0200
 +++ mysql/mysys/default.c	2005-05-22 02:36:17.000000000 +0200
 @@ -823,19 +823,19 @@
diff --git a/dev-db/mysql/files/035_x86_asm-pic-fixes-r1.patch b/dev-db/mysql/files/035_x86_asm-pic-fixes-r1.patch
index 34858394c5e8..6d6293d7a1a5 100644
--- a/dev-db/mysql/files/035_x86_asm-pic-fixes-r1.patch
+++ b/dev-db/mysql/files/035_x86_asm-pic-fixes-r1.patch
@@ -1,4 +1,4 @@
-###MY_VER_RANGE [4.1,)
+###MY_VER_RANGE [4.1,4.1.13-r1)
 diff -Nurp mysql/strings/longlong2str-x86.s mysql-fixed/strings/longlong2str-x86.s
 --- mysql/strings/longlong2str-x86.s	2005-05-13 12:32:11.000000000 +0100
 +++ mysql-fixed/strings/longlong2str-x86.s	2005-05-25 01:19:32.000000000 +0100
diff --git a/dev-db/mysql/files/035_x86_asm-pic-fixes-r2.patch b/dev-db/mysql/files/035_x86_asm-pic-fixes-r2.patch
index cc91a57d72f5..4a089a315f68 100644
--- a/dev-db/mysql/files/035_x86_asm-pic-fixes-r2.patch
+++ b/dev-db/mysql/files/035_x86_asm-pic-fixes-r2.patch
@@ -1,4 +1,4 @@
-###MY_VER_RANGE [4.1.13-r1,)
+###MY_VER_RANGE [4.1.13-r1,4.1.13-r1] [5.0.9_beta-r2,5.0.9_beta-r2]
 diff -aur mysql.orig/strings/longlong2str-x86.s mysql.notextrel/strings/longlong2str-x86.s
 --- mysql.orig/strings/longlong2str-x86.s	2005-07-26 17:52:18.000000000 +0200
 +++ mysql.notextrel/strings/longlong2str-x86.s	2005-07-26 19:29:23.000000000 +0200
diff --git a/dev-db/mysql/files/701_all_test-myisam-geometry.patch b/dev-db/mysql/files/701_all_test-myisam-geometry.patch
index a9acb6b85193..536c92a14b10 100644
--- a/dev-db/mysql/files/701_all_test-myisam-geometry.patch
+++ b/dev-db/mysql/files/701_all_test-myisam-geometry.patch
@@ -1,4 +1,4 @@
-###MY_VER_RANGE [4.1.3_alpha,)
+###MY_VER_RANGE [4.1.3_alpha,4.1.14_alpha20050808)
 
 # MySQL Bugs: #11083: myisam.test fail w/ --without-geometry
 
diff --git a/dev-db/mysql/files/digest-mysql-5.0.10_beta b/dev-db/mysql/files/digest-mysql-5.0.10_beta
deleted file mode 100644
index f24f83d13f50..000000000000
--- a/dev-db/mysql/files/digest-mysql-5.0.10_beta
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9f228e9975153ac9872a79398c17e7c1 mysql-5.0.10-beta.tar.gz 18759927
diff --git a/dev-db/mysql/files/digest-mysql-5.0.12_beta b/dev-db/mysql/files/digest-mysql-5.0.12_beta
new file mode 100644
index 000000000000..ee21687e3251
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-5.0.12_beta
@@ -0,0 +1,2 @@
+MD5 52ce66773505a9128accc64b44d1ecf2 mysql-5.0.12-beta.tar.gz 18798040
+MD5 e167a2121e8f26de0052071dd873a397 mysql-extras-20050904.tar.bz2 44313
diff --git a/dev-db/mysql/files/digest-mysql-5.0.9_beta-r2 b/dev-db/mysql/files/digest-mysql-5.0.9_beta-r2
deleted file mode 100644
index f39b28da0a77..000000000000
--- a/dev-db/mysql/files/digest-mysql-5.0.9_beta-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8899d591d549d1d8ca61f5741bff490c mysql-5.0.9-beta.tar.gz 18615183
diff --git a/dev-db/mysql/mysql-5.0.10_beta.ebuild b/dev-db/mysql/mysql-5.0.12_beta.ebuild
index 8a595af20669..5d9f73125569 100644
--- a/dev-db/mysql/mysql-5.0.10_beta.ebuild
+++ b/dev-db/mysql/mysql-5.0.12_beta.ebuild
@@ -1,6 +1,6 @@
 # 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-5.0.10_beta.ebuild,v 1.3 2005/08/29 12:55:19 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.12_beta.ebuild,v 1.1 2005/09/05 22:12:13 vivo Exp $
 
 inherit eutils flag-o-matic versionator
 
@@ -15,18 +15,17 @@ S="${WORKDIR}/${PN}"
 
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 HOMEPAGE="http://www.mysql.com/"
-SRC_URI="mirror://mysql/Downloads/MySQL-${SVER}/${NEWP}.tar.gz"
+SRC_URI="mirror://mysql/Downloads/MySQL-${SVER}/${NEWP}.tar.gz
+	mirror://gentoo/mysql-extras-20050904.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64 ~sparc ~ia64 ~ppc ~ppc64"
-
-IUSE="debug doc minimal perl readline selinux ssl static tcpd big-tables"
+IUSE="big-tables berkdb debug doc minimal perl readline selinux ssl static"
 RESTRICT="primaryuri"
 
 DEPEND="readline? ( >=sys-libs/readline-4.1 )
 	bdb? ( sys-apps/ed )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
 	ssl? ( >=dev-libs/openssl-0.9.6d )
 	perl? ( dev-lang/perl )
 	>=sys-libs/zlib-1.2.3
@@ -41,6 +40,10 @@ if version_is_at_least "4.1.3" ; then
 	IUSE="${IUSE} cluster utf8 geometry extraengine"
 fi
 
+shopt -s extglob
+export LC_ALL="C"
+unset LC_COLLATE
+
 mysql_upgrade_error() {
 	mysql_get_datadir
 	ewarn "Sorry plain upgrade from version of MySQL before 4.1.4 is NOT supported."
@@ -96,6 +99,7 @@ mysql_get_datadir() {
 }
 
 pkg_setup() {
+
 	mysql_get_datadir
 	if ! useq minimal && version_is_at_least "4.1.4"; then
 		if has_version "<=dev-db/mysql-4.1.4" \
@@ -109,7 +113,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	if use static && use ssl; then
+	if useq static && useq ssl; then
 		local msg="MySQL does not support building statically with SSL support"
 		eerror "${msg}"
 		die "${msg}"
@@ -127,11 +131,14 @@ src_unpack() {
 
 	mv "${WORKDIR}/${NEWP}" "${S}"
 	cd "${S}"
+	rm -rf "${S}/zlib"
+	sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
 
-	epatch "${FILESDIR}/010_all_my-print-defaults-r2.patch"
-	epatch "${FILESDIR}/035_x86_asm-pic-fixes-r2.patch"
-	epatch "${FILESDIR}/701_all_test-myisam-geometry.patch"
-	epatch "${FILESDIR}/703_all_test-rpl_rotate_logs.patch"
+	epatch "${WORKDIR}/mysql-extras/010_all_my-print-defaults-r2.patch" || die
+	epatch "${WORKDIR}/mysql-extras/035_x86_asm-pic-fixes-r7.patch" || die
+	#epatch "${WORKDIR}/mysql-extras/040_all_tcpd-vars-fix-r1.patch" || die
+	epatch "${WORKDIR}/mysql-extras/703_all_test-rpl_rotate_logs.patch" || die
+	epatch "${WORKDIR}/mysql-extras/705_all_view_geometry.patch" || die
 
 	find . -name Makefile -o -name Makefile.in -o -name configure -exec rm {} \;
 	aclocal && autoheader \
@@ -140,9 +147,11 @@ src_unpack() {
 		|| die "failed reconfigure step 02"
 	automake --force --add-missing && autoconf \
 		|| die "failed reconfigure step 03"
-	pushd innobase && aclocal && autoheader && autoconf && automake \
-		|| die "failed innobase reconfigure"
-	popd
+	if ! version_is_at_least "5.1_alpha" ; then
+		pushd innobase && aclocal && autoheader && autoconf && automake \
+			|| die "failed innobase reconfigure"
+		popd
+	fi
 	pushd bdb/dist && sh s_all \
 		|| die "failed bdb reconfigure"
 	popd
@@ -165,7 +174,8 @@ src_compile() {
 		myconf="${myconf} --enable-shared --enable-static"
 	fi
 
-	myconf="${myconf} `use_with tcpd libwrap`"
+	#myconf="${myconf} `use_with tcpd libwrap`"
+	myconf="${myconf} --without-libwrap"
 
 	if useq ssl ; then
 		# --with-vio is not needed anymore, it's on by default and
@@ -206,12 +216,15 @@ src_compile() {
 			myconf="${myconf} --with-${i}"
 		done
 
-		# this one break things at least in mysql [5.0,5.0.6_beta]
-		#if version_is_at_least "4.1.3" && use utf8; then
-		#	myconf="${myconf} --with-charset=utf8 --with-collation=utf8_general_ci"
-		#else
-		#	myconf="${myconf} --with-charset=latin1 --with-collation=latin1_swedish_ci"
-		#fi
+		if ! version_is_at_least "5.0_alpha" ; then
+			if version_is_at_least "4.1_alpha" && useq utf8; then
+				myconf="${myconf} --with-charset=utf8"
+				myconf="${myconf} --with-collation=utf8_general_ci"
+			else
+				myconf="${myconf} --with-charset=latin1"
+				myconf="${myconf} --with-collation=latin1_swedish_ci"
+			fi
+		fi
 
 		# lots of chars
 		myconf="${myconf} --with-extra-charsets=all"
@@ -223,7 +236,7 @@ src_compile() {
 		then
 			myconf="${myconf} --without-berkeley-db"
 		else
-			use berkdb \
+			useq berkdb \
 				&& myconf="${myconf} --with-berkeley-db=./bdb" \
 				|| myconf="${myconf} --without-berkeley-db"
 		fi
@@ -245,7 +258,7 @@ src_compile() {
 	# documentation
 	myconf="${myconf} `use_with doc docs`"
 
-	if version_is_at_least "4.1.3" && use extraengine; then
+	if version_is_at_least "4.1.3" && useq extraengine; then
 		# http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
 		myconf="${myconf} --with-archive-storage-engine"
 		# http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
@@ -269,7 +282,9 @@ src_compile() {
 
 	#the compiler flags are as per their "official" spec ;)
 	#CFLAGS="${CFLAGS/-O?/} -O3" \
-	export CXXFLAGS="${CXXFLAGS} -fno-implicit-templates -felide-constructors -fno-exceptions -fno-rtti"
+	export CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti"
+	version_is_at_least "5.0_alpha" \
+	&& export CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
 
 	econf \
 		--libexecdir=/usr/sbin \
@@ -340,7 +355,7 @@ src_install() {
 	rm -f ${D}/usr/share/mysql/my-*.cnf # Put them elsewhere
 
 	# All of these (ab)use Perl.
-	if ! use perl; then
+	if ! useq perl; then
 		rm -f ${D}/usr/bin/{mysqlhotcopy,mysql_find_rows,mysql_convert_table_format,mysqld_multi,mysqlaccess,mysql_fix_extensions,mysqldumpslow,mysql_zap,mysql_explain_log,mysql_tableinfo,mysql_setpermission}
 		rm -f ${D}/usr/bin/mysqlhotcopy
 		rm -rf ${D}/usr/share/mysql/sql-bench
@@ -361,8 +376,8 @@ src_install() {
 
 	newins "${FILESDIR}/my.cnf-4.1" my.cnf
 
-	if version_is_at_least "4.1.3" && ! use utf8; then
-		sed --in-place "s/utf8/latin1/" \
+	if version_is_at_least "4.1.3" && ! useq utf8; then
+		sed --in-place -e "s/utf8/latin1/" \
 			${D}/etc/mysql/my.cnf
 	fi
 
diff --git a/dev-db/mysql/mysql-5.0.9_beta-r2.ebuild b/dev-db/mysql/mysql-5.0.9_beta-r2.ebuild
deleted file mode 100644
index 57eac6ae4465..000000000000
--- a/dev-db/mysql/mysql-5.0.9_beta-r2.ebuild
+++ /dev/null
@@ -1,542 +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-5.0.9_beta-r2.ebuild,v 1.5 2005/08/29 12:55:19 vivo Exp $
-
-inherit eutils flag-o-matic versionator
-
-SVER=${PV%.*}
-NEWP="${PN}-${PV}"
-NEWP="${NEWP/_beta/-beta}"
-
-
-# shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/${PN}"
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-HOMEPAGE="http://www.mysql.com/"
-SRC_URI="mirror://mysql/Downloads/MySQL-${SVER}/${NEWP}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc ~ia64 ~ppc ~ppc64"
-
-IUSE="debug doc minimal perl readline selinux ssl static tcpd big-tables"
-RESTRICT="primaryuri"
-
-DEPEND="readline? ( >=sys-libs/readline-4.1 )
-	bdb? ( sys-apps/ed )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( dev-lang/perl )
-	>=sys-libs/zlib-1.2.3
-	>=sys-apps/texinfo-4.7-r1
-	sys-process/procps
-	>=sys-apps/sed-4"
-RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-mysql )"
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-if version_is_at_least "4.1.3" ; then
-	IUSE="${IUSE} cluster utf8 geometry extraengine"
-fi
-
-mysql_upgrade_error() {
-	mysql_get_datadir
-	ewarn "Sorry plain upgrade from version of MySQL before 4.1.4 is NOT supported."
-	ewarn "Be sure to read \"Upgrading from version 4.0 to 4.1\" section"
-	ewarn "http://dev.mysql.com/doc/mysql/en/upgrading-from-4-0.html"
-	ewarn "then unmerge previous version of MySQL with"
-	ewarn "#emerge -C dev-db/mysql"
-	ewarn "move your data out of \"${DATADIR}\""
-	ewarn "#emerge =dev-db/${P}"
-	ewarn "reload data you dumped with \"mysqldump\" Because you have read "
-	ewarn "the documentation on how to upgrade"
-	ewarn ""
-	ewarn "You can also choose to preview some new MySQL 4.1 behaviour"
-	ewarn "adding a section \"[mysqld-4.0]\" followed by the word \"new\""
-	ewarn "into /etc/mysql/my.cnf (you need a recent MySQL version)"
-}
-
-mysql_upgrade_warning() {
-	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."
-}
-
-mysql_get_datadir() {
-	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 2>/dev/null | sed -ne '/datadir/s|^--datadir=||p' | tail -n1`
-	fi
-	if [ -z "${DATADIR}" ]; then
-		DATADIR="/var/lib/mysql/"
-		einfo "Using default DATADIR"
-	fi
-	einfo "MySQL DATADIR is ${DATADIR}"
-
-	if [ -z "${PREVIOUS_DATADIR}" ] ; then
-		if [ -a "${DATADIR}" ] ; then
-			ewarn "Previous datadir found, it's YOUR job to change"
-			ewarn "ownership and have care of it"
-			PREVIOUS_DATADIR="yes"
-			export PREVIOUS_DATADIR
-		else
-			PREVIOUS_DATADIR="no"
-			export PREVIOUS_DATADIR
-		fi
-	fi
-
-	export DATADIR
-}
-
-pkg_setup() {
-	mysql_get_datadir
-	if ! useq minimal && version_is_at_least "4.1.4"; then
-		if has_version "<=dev-db/mysql-4.1.4" \
-		&& ! built_with_use dev-db/mysql minimal \
-		&& [ -d "${DATADIR}/mysql" ]; then
-			mysql_upgrade_error
-			die
-		fi
-	fi
-	mysql_upgrade_warning
-}
-
-src_unpack() {
-	if use static && use ssl; then
-		local msg="MySQL does not support building statically with SSL support"
-		eerror "${msg}"
-		die "${msg}"
-	fi
-
-	if version_is_at_least "4.1.3" \
-	&& useq cluster \
-	|| useq geometry \
-	|| useq extraengine \
-	&& useq minimal ; then
-		die "USEs cluster, geometry, extraengine conflicts with \"minimal\""
-	fi
-
-	unpack ${A} || die
-
-	mv "${WORKDIR}/${NEWP}" "${S}"
-	cd "${S}"
-
-	epatch "${FILESDIR}/010_all_my-print-defaults-r2.patch"
-	epatch "${FILESDIR}/035_x86_asm-pic-fixes-r1.patch"
-	epatch "${FILESDIR}/701_all_test-myisam-geometry.patch"
-	epatch "${FILESDIR}/703_all_test-rpl_rotate_logs.patch"
-
-	find . -name Makefile -o -name Makefile.in -o -name configure -exec rm {} \;
-	aclocal && autoheader \
-		|| die "failed reconfigure step 01"
-	libtoolize --automake --force \
-		|| die "failed reconfigure step 02"
-	automake --force --add-missing && autoconf \
-		|| die "failed reconfigure step 03"
-	pushd innobase && aclocal && autoheader && autoconf && automake \
-		|| die "failed innobase reconfigure"
-	popd
-	pushd bdb/dist && sh s_all \
-		|| die "failed bdb reconfigure"
-	popd
-}
-
-src_compile() {
-	local myconf
-
-	# 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
-	useq readline && myconf="${myconf} --without-readline"
-	useq readline || myconf="${myconf} --with-readline"
-
-	if useq static ; then
-		myconf="${myconf} --with-mysqld-ldflags=-all-static"
-		myconf="${myconf} --with-client-ldflags=-all-static"
-		myconf="${myconf} --disable-shared"
-	else
-		myconf="${myconf} --enable-shared --enable-static"
-	fi
-
-	myconf="${myconf} `use_with tcpd libwrap`"
-
-	if useq ssl ; then
-		# --with-vio is not needed anymore, it's on by default and
-		# has been removed from configure
-		version_is_at_least "5.0.4_beta" || myconf="${myconf} --with-vio"
-		if version_is_at_least "5.0.6_beta" ; then
-			# yassl-0.96 is young break with gcc-4.0 || amd64
-			#myconf="${myconf} --with-yassl"
-			myconf="${myconf} --with-openssl"
-		else
-			myconf="${myconf} --with-openssl"
-		fi
-	else
-		myconf="${myconf} --without-openssl"
-	fi
-
-	if useq debug; then
-		myconf="${myconf} --with-debug=full"
-	else
-		myconf="${myconf} --without-debug"
-		version_is_at_least "4.1.3" && useq cluster && myconf="${myconf} --without-ndb-debug"
-	fi
-
-	# benchmarking stuff needs perl
-	# and shouldn't be bothered with on minimal builds
-	if useq perl && ! useq minimal; then
-		myconf="${myconf} --with-bench"
-	else
-		myconf="${myconf} --without-bench"
-	fi
-
-	# these are things we exclude from a minimal build
-	# note that the server actually does get built and installed
-	# but we then delete it before packaging.
-	local minimal_exclude_list="server embedded-server extra-tools innodb raid"
-	if ! useq minimal; then
-		for i in ${minimal_exclude_list}; do
-			myconf="${myconf} --with-${i}"
-		done
-
-		# this one break things at least in mysql [5.0,5.0.6_beta]
-		#if version_is_at_least "4.1.3" && use utf8; then
-		#	myconf="${myconf} --with-charset=utf8 --with-collation=utf8_general_ci"
-		#else
-		#	myconf="${myconf} --with-charset=latin1 --with-collation=latin1_swedish_ci"
-		#fi
-
-		# lots of chars
-		myconf="${myconf} --with-extra-charsets=all"
-
-		#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
-		# it comes down to non-64-bit safety problems
-		if useq sparc || useq alpha || useq hppa || useq mips || useq amd64
-		then
-			myconf="${myconf} --without-berkeley-db"
-		else
-			use berkdb \
-				&& myconf="${myconf} --with-berkeley-db=./bdb" \
-				|| myconf="${myconf} --without-berkeley-db"
-		fi
-
-		if version_is_at_least "4.1.3" ; then
-			myconf="${myconf} $(use_with geometry)"
-			myconf="${myconf} $(use_with cluster ndbcluster)"
-		fi
-
-		version_is_at_least "4.1.11_alpha20050403" &&  myconf="${myconf} --with-big-tables"
-	else
-		for i in ${minimal_exclude_list}; do
-			myconf="${myconf} --without-${i}"
-		done
-		myconf="${myconf} --without-berkeley-db"
-		myconf="${myconf} --with-extra-charsets=none"
-	fi
-
-	# documentation
-	myconf="${myconf} `use_with doc docs`"
-
-	if version_is_at_least "4.1.3" && use extraengine; then
-		# http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
-		myconf="${myconf} --with-archive-storage-engine"
-		# http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
-		version_is_at_least "4.1.4" \
-		&& myconf="${myconf} --with-csv-storage-engine"
-		# http://dev.mysql.com/doc/mysql/en/federated-description.html
-		# http://dev.mysql.com/doc/mysql/en/federated-limitations.html
-		if version_is_at_least "5.0.3" ; then
-			einfo "before to use federated engine be sure to read"
-			einfo "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
-			myconf="${myconf} --with-federated-storage-engine"
-		fi
-		version_is_at_least "4.1.11_alpha20050403" \
-		&&  myconf="${myconf} --with-blackhole-storage-engine"
-	fi
-
-	myconf="${myconf} `use_with big-tables`"
-
-	#glibc-2.3.2_pre fix; bug #16496
-	append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
-
-	#the compiler flags are as per their "official" spec ;)
-	#CFLAGS="${CFLAGS/-O?/} -O3" \
-	export CXXFLAGS="${CXXFLAGS} -fno-implicit-templates -felide-constructors -fno-exceptions -fno-rtti"
-
-	econf \
-		--libexecdir=/usr/sbin \
-		--sysconfdir=/etc/mysql \
-		--localstatedir=/var/lib/mysql \
-		--with-low-memory \
-		--enable-assembler \
-		--enable-local-infile \
-		--with-mysqld-user=mysql \
-		--with-client-ldflags=-lstdc++ \
-		--enable-thread-safe-client \
-		--with-comment="Gentoo Linux ${PF}" \
-		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
-		--with-zlib-dir=/usr \
-		--with-lib-ccflags="-fPIC" \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-
-	make install DESTDIR="${D}" benchdir_root="/usr/share/mysql" || die
-
-	enewgroup mysql 60 || die "problem adding group mysql"
-	enewuser mysql 60 -1 /dev/null mysql \
-	|| die "problem adding user mysql"
-
-	diropts "-m0750"
-	if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
-		dodir "${DATADIR}"
-		keepdir "${DATADIR}"
-		chown -R mysql:mysql "${D}/${DATADIR}"
-	fi
-
-	dodir /var/log/mysql
-
-	diropts "-m0755"
-	dodir /var/run/mysqld
-
-	keepdir /var/run/mysqld /var/log/mysql
-	chown -R mysql:mysql \
-		${D}/var/run/mysqld \
-		${D}/var/log/mysql
-
-	# move client libs, install a couple of missing headers
-	local lib=$(get_libdir)
-	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/bin/make*distribution
-	rm -f ${D}/usr/share/mysql/make_*_distribution
-	rm -f ${D}/usr/share/mysql/mysql.server
-	rm -f ${D}/usr/share/mysql/binary-configure
-	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/{mysqlhotcopy,mysql_find_rows,mysql_convert_table_format,mysqld_multi,mysqlaccess,mysql_fix_extensions,mysqldumpslow,mysql_zap,mysql_explain_log,mysql_tableinfo,mysql_setpermission}
-		rm -f ${D}/usr/bin/mysqlhotcopy
-		rm -rf ${D}/usr/share/mysql/sql-bench
-	fi
-
-	# clean up stuff for a minimal build
-	# this is anything server-specific
-	if useq minimal; then
-		rm -rf ${D}/usr/share/mysql/{mysql-test,sql-bench}
-		rm -f ${D}/usr/bin/{mysql_install_db,mysqlmanager*,mysql_secure_installation,mysql_fix_privilege_tables,mysqlhotcopy,mysql_convert_table_format,mysqld_multi,mysql_fix_extensions,mysql_zap,mysql_explain_log,mysql_tableinfo,mysqld_safe,myisam*,isam*,mysql_install,mysql_waitpid,mysqlbinlog,mysqltest,pack_isam}
-		rm -f ${D}/usr/sbin/mysqld
-		rm -f ${D}/usr/lib/mysql/lib{heap,merge,nisam,mysys,mystrings,mysqld,myisammrg,vio,dbug,myisam}.a
-	fi
-
-	# config stuff
-	insinto /etc/mysql
-	doins scripts/mysqlaccess.conf
-
-	newins "${FILESDIR}/my.cnf-4.1" my.cnf
-
-	if version_is_at_least "4.1.3" && ! use utf8; then
-		sed --in-place "s/utf8/latin1/" \
-			${D}/etc/mysql/my.cnf
-	fi
-
-	# minimal builds don't have the server
-	if ! useq minimal; then
-		exeinto /etc/init.d
-		newexe "${FILESDIR}/mysql-4.0.24-r2.rc6" mysql
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/logrotate.mysql" mysql
-	fi
-
-	# docs
-	dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
-	# minimal builds don't have the server
-	if useq doc && ! useq minimal; then
-		dohtml Docs/*.html
-		dodoc Docs/manual.{txt,ps}
-		docinto conf-samples
-		dodoc support-files/my-*.cnf
-	fi
-}
-
-src_test() {
-	cd ${S}
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	make check || die "make check failed"
-	if ! useq minimal; then
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		version_is_at_least "5.0.6_beta" \
-		&& make test-force \
-		|| make test
-		retstatus=$?
-
-		# to be sure ;)
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-		[[ $retstatus -eq 0 ]] || die "make test failed"
-	else
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
-
-pkg_config() {
-	mysql_get_datadir
-
-	if built_with_use dev-db/mysql minimal; then
-		die "Minimal builds do NOT include the MySQL server"
-	fi
-
-	if [[ "$(pgrep mysqld)" != "" ]] ; then
-		die "Oops you already have a mysql daemon running!"
-	fi
-
-	local pwd1="a"
-	local pwd2="b"
-	local maxtry=5
-
-	if [[ -d "${DATADIR}/mysql" ]] ; then
-		ewarn "You have already a MySQL database in place."
-		ewarn "Please rename it or delete it if you wish to replace it."
-		die "MySQL database already exists!"
-	fi
-
-	einfo "Creating the mysql database and setting proper"
-	einfo "permissions on it..."
-
-	einfo "Insert a password for the mysql 'root' user"
-	ewarn "the password will be visible on the screen"
-
-	echo -n "    >" && read -r pwd1
-	einfo "Check the password"
-	echo -n "    >" && read -r pwd2
-
-	if ((  pwd1 != pwd2 )) ; then
-		die "Passwords are not the same"
-	fi
-
-	${ROOT}/usr/bin/mysql_install_db || die "MySQL databases not installed"
-
-	# MySQL 5.0 don't need this
-	chown -R mysql:mysql ${DATADIR}
-	chmod 0750 ${ROOT}/${DATADIR}
-
-	local options=""
-	local sqltmp="$(emktemp)"
-	local help_tables="${ROOT}/usr/share/mysql/fill_help_tables.sql"
-
-	if version_is_at_least "4.1.3" ; then
-		options="--skip-ndbcluster"
-
-		# Filling timezones, see
-		# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
-		${ROOT}/usr/bin/mysql_tzinfo_to_sql ${ROOT}/usr/share/zoneinfo \
-		> "${sqltmp}"
-
-		if [[ -r "${help_tables}" ]] ; then
-			cat "${help_tables}" >> "${sqltmp}"
-		fi
-	fi
-
-	local socket=${ROOT}/var/run/mysqld/mysqld.sock
-	local mysqld="${ROOT}/usr/sbin/mysqld \
-		${options} \
-		--skip-grant-tables \
-		--basedir=${ROOT}/usr \
-		--datadir=${ROOT}/var/lib/mysql \
-		--skip-innodb \
-		--skip-bdb \
-		--max_allowed_packet=8M \
-		--net_buffer_length=16K \
-		--socket=${socket} \
-		--pid-file=${ROOT}/var/run/mysqld/mysqld.pid"
-
-	$mysqld &
-	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]]
-	do
-		maxtry=$(($maxtry-1))
-		echo -n "."
-		sleep 1
-	done
-
-	# do this from memory we don't want clear text password in temp files
-	local sql="UPDATE mysql.user SET Password = PASSWORD('${pwd1}') WHERE USER='root'"
-	${ROOT}/usr/bin/mysql \
-		--socket=${ROOT}/var/run/mysqld/mysqld.sock \
-		-hlocalhost \
-		-e "${sql}"
-
-	einfo "Loading \"zoneinfo\" this step may require few seconds"
-
-	${ROOT}/usr/bin/mysql \
-		--socket=${socket} \
-		-hlocalhost \
-		-uroot \
-		-p"${pwd1}" \
-		mysql < "${sqltmp}"
-
-	kill $( cat ${ROOT}/var/run/mysqld/mysqld.pid )
-	rm  "${sqltmp}"
-	einfo "done"
-}
-
-pkg_postinst() {
-	mysql_get_datadir
-
-	if ! useq minimal; then
-		#empty dirs...
-		[[ "${PREVIOUS_DATADIR}" != "yes" ]] \
-		&& [ -d "${ROOT}/${DATADIR}" ] || install -d -m0750 -o mysql -g mysql ${ROOT}/var/lib/mysql
-		[ -d "${ROOT}/var/run/mysqld" ] || install -d -m0755 -o mysql -g mysql ${ROOT}/var/run/mysqld
-		[ -d "${ROOT}/var/log/mysql" ] || 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}/${DATADIR}
-
-		# 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
-		if [[ "${PREVIOUS_DATADIR}" == "yes" ]] ; then
-			ewarn "Previous datadir found, it's YOUR job to change"
-			ewarn "ownership and have care of it"
-		fi
-	fi
-
-	mysql_upgrade_warning
-	einfo "InnoDB is not optional as of MySQL-4.0.24, at the request of upstream."
-}