Further cleanup, slotting totally removed now, an overlay will be set up ASAP.

(Portage version: 2.1_pre6-r1)

12 files changed, 42 insertions, 292 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index b1ec2efd40e7..cf83d50b1e40 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.309 2006/03/16 20:39:43 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.310 2006/03/17 20:18:06 vivo Exp $
+
+  17 Mar 2006; Francesco Riosa <vivo@gentoo.org> -mysql-4.1.18-r30.ebuild,
+  mysql-4.1.18-r60.ebuild, -mysql-5.0.18-r30.ebuild, mysql-5.0.19.ebuild,
+  mysql-5.1.7_beta.ebuild:
+  Further cleanup, slotting totally removed now, an overlay will be set up ASAP.
 
   16 Mar 2006; Francesco Riosa <vivo@gentoo.org> +files/mysql.conf.d-r1,
   +files/mysql.rc6-r3, -files/mysql-slot.conf.d,
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index f7d2b81252b7..d3514c7b8b4b 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c4ab53e674b00401a05fa2b1d782169a ChangeLog 63930
-RMD160 95d67766b081765914f7d35054f106377e75496f ChangeLog 63930
-SHA256 0321d17f3902230ee6ba430393bfa8be20573e776f1bee528a2c53095f606945 ChangeLog 63930
+MD5 71474219246576e7b3a7f4f2f69a0737 ChangeLog 64188
+RMD160 3531d23354cb1f0ba533eb2ed3fa2201b3f9faeb ChangeLog 64188
+SHA256 481227b4fcbd21f3ee88985708d94b7bb60f122c125d3444493beba9dc33a742 ChangeLog 64188
 MD5 7a9b202499409304a68680f9d749ec8d files/digest-mysql-3.23.58-r1 512
 RMD160 5d30edca2748f16b2092021823c1377da2007194 files/digest-mysql-3.23.58-r1 512
 SHA256 348bceaedc24580dd89d90afb52164a26487574c59e855e2483468d5f1584eec files/digest-mysql-3.23.58-r1 512
@@ -16,24 +13,18 @@ SHA256 e4e4320bbb1b04818e364c0ad68e3df6fa8149e57d0ed3359bd3cd1dcedad96a files/di
 MD5 76b0ff7ee0c64222a2cc9f09f0306a93 files/digest-mysql-4.1.14 509
 RMD160 7413311cadac22b111cc049e49b0a86f734537d7 files/digest-mysql-4.1.14 509
 SHA256 580756dca82c751758e5ecd856b3c8883876a94306304f52eef62a24fd3c45ab files/digest-mysql-4.1.14 509
-MD5 9cc8cf047c6784b87d9ffc2f9bdbeec3 files/digest-mysql-4.1.18-r30 509
-RMD160 f19f66a83eb82c60a5384d58ff0d0da932ad11f5 files/digest-mysql-4.1.18-r30 509
-SHA256 ee801d4d2f1f3d2f86ae1cf267ed32a662bc80488da29c5348e28f1cd4b5abd3 files/digest-mysql-4.1.18-r30 509
-MD5 3ca576554af70984f5bbbbdbf1de91e9 files/digest-mysql-4.1.18-r60 509
-RMD160 4bd2d873ef19fb3a50729285c16c47252ae7f5f5 files/digest-mysql-4.1.18-r60 509
-SHA256 15eb9398057e36a260ed9f8a20b52131879844f3589bf2bddfe043b154714d19 files/digest-mysql-4.1.18-r60 509
-MD5 9ea44731bd30b0dd36a7572c044696e9 files/digest-mysql-5.0.18-r30 509
-RMD160 4589dd0c639033b3de7055f6fce456381d670209 files/digest-mysql-5.0.18-r30 509
-SHA256 de83a353e7d4d66bfd5186afe2f8b461ed00d6ad7a3a47bcd8f55172cb949c5d files/digest-mysql-5.0.18-r30 509
+MD5 8bc5dfb3309efc25fe2f13d1311120e4 files/digest-mysql-4.1.18-r60 506
+RMD160 2c4ee85734bd3aaebed23015c96259611ab10d6f files/digest-mysql-4.1.18-r60 506
+SHA256 82f834ad174ae5f145850aa2b3e29a3fbb2bb0fbdf286b1a823ab9ae8385b705 files/digest-mysql-4.1.18-r60 506
 MD5 7a544a6b81a17eb80fa76295f359eb8d files/digest-mysql-5.0.18-r60 509
 RMD160 a831fb74493358ceb6c31c38b2255f147e2814ed files/digest-mysql-5.0.18-r60 509
 SHA256 8452746c8a037308db01b41828d700bdfe04a82e4fc4c25b5576b9eddac3a419 files/digest-mysql-5.0.18-r60 509
-MD5 e4aa51e405f90c2d979e7314ba910a5e files/digest-mysql-5.0.19 509
-RMD160 f18a80267aa2887ba7f2e1c492106c454ccb94c4 files/digest-mysql-5.0.19 509
-SHA256 63251f66978a9cb3b2f5b01e629ec12c6d8274a7c95cb7aa8677045e4534e377 files/digest-mysql-5.0.19 509
-MD5 5aa028806767e63171b5d4520015571f files/digest-mysql-5.1.7_beta 521
-RMD160 ddc150c4236d6701433ff50849b13da45ae4b23c files/digest-mysql-5.1.7_beta 521
-SHA256 6eb6bcce4bf607148a63b84928ee5a1e887fafd127898f14ca54443680cabce8 files/digest-mysql-5.1.7_beta 521
+MD5 32bc3210c24c601b06c897fbbd204d6a files/digest-mysql-5.0.19 506
+RMD160 72e4dc7a0be4bc3e48c2705498ea11e2e2e491e7 files/digest-mysql-5.0.19 506
+SHA256 c5082ff62026d5da2cc68da6bb575d1335cda5fe5003092ba3e4a7f50f48e4c8 files/digest-mysql-5.0.19 506
+MD5 7d57efe901ac369be51d2b49c1082970 files/digest-mysql-5.1.7_beta 518
+RMD160 ded433dfee471f54e087c3cda2b336fe546e18bd files/digest-mysql-5.1.7_beta 518
+SHA256 8d351a2ab082329fbb778120d9ebae13d64eab0fa84d373d083d108783326477 files/digest-mysql-5.1.7_beta 518
 MD5 631d741e2c56442abacaa4c1ca5db499 files/logrotate-slot.mysql 502
 RMD160 733fca29244c8e86503c9e4e4f7f2fc7df97be69 files/logrotate-slot.mysql 502
 SHA256 a83b0adc3cde04c4ee2f430d732d094bb2f35ff74d65ca173714768455249879 files/logrotate-slot.mysql 502
@@ -94,28 +85,15 @@ SHA256 a8f336963e9034dc8bb622d1b1acebdb44b474bfb232e015c96965ba9e49bf8a mysql-4.
 MD5 ba3537b01eaaaac66366eb84d573a370 mysql-4.1.14.ebuild 18832
 RMD160 a05497bd54b072eb38a47bc4da947c142ce24661 mysql-4.1.14.ebuild 18832
 SHA256 a88ae368bee8a109a2affe84b1c952b51d53f5ca9457937cf5f39b05ffd05aad mysql-4.1.14.ebuild 18832
-MD5 9df67f755fb4daf4f7da5dc96a59531c mysql-4.1.18-r30.ebuild 2062
-RMD160 0594e52b0889f3dc26d695ea68c51817d76cba35 mysql-4.1.18-r30.ebuild 2062
-SHA256 74413770684726b78c82f27a1fe5e812f49727f27658294e870c7e7d6c3cbb02 mysql-4.1.18-r30.ebuild 2062
-MD5 fcc9df991a062caa9c4026e54639d179 mysql-4.1.18-r60.ebuild 2069
-RMD160 b4f0dc06133b87cb9b23c73a47d3eb9c096d785c mysql-4.1.18-r60.ebuild 2069
-SHA256 c654b4f236374bdd2743fbf720ab6b12c0b06b0882c094d45602c8662b8859a5 mysql-4.1.18-r60.ebuild 2069
-MD5 09f6c62cd80d2dc46d0b0dc7c57873b3 mysql-5.0.18-r30.ebuild 2065
-RMD160 39942cdaa6e3ce821b782bd08d00018821a2041a mysql-5.0.18-r30.ebuild 2065
-SHA256 4ecddc90a006eac39436aa345fbcb608706af27517d6db67019234f2a8b63ddb mysql-5.0.18-r30.ebuild 2065
+MD5 efcf2cb395b20b6f8500cebce68834e8 mysql-4.1.18-r60.ebuild 892
+RMD160 a272c4d5f7b95c0e703971eddc87231dafc0a6a0 mysql-4.1.18-r60.ebuild 892
+SHA256 d9afb2e24fc882d1c4b526418ab00b5716413922201bc1382780204cf3b8403b mysql-4.1.18-r60.ebuild 892
 MD5 fcacdb77a568e41ee9387604b2fe91f9 mysql-5.0.18-r60.ebuild 2072
 RMD160 d0c3282ea4c8d310cb68020e6ecf79b4a9135546 mysql-5.0.18-r60.ebuild 2072
 SHA256 71881207007193709f935da54a67a4c27fed00836d49e1780113cd258807629b mysql-5.0.18-r60.ebuild 2072
-MD5 34bf5f3fed2d2b77dd44b3c0bb28d39c mysql-5.0.19.ebuild 2068
-RMD160 83159a20fd36a8c435427ef6652b5182c58f1b9d mysql-5.0.19.ebuild 2068
-SHA256 b029268b01f10a1861a65667bb9878d5b38b8ba5103d27c7ac38dc5e022541ff mysql-5.0.19.ebuild 2068
-MD5 3afe047568e65a91f01ec766e588cad5 mysql-5.1.7_beta.ebuild 2072
-RMD160 1ac81a589e8d75e9b3c354a0ce09de4204e6740b mysql-5.1.7_beta.ebuild 2072
-SHA256 40629470b8b992952b536fdfa7f5a20c560a943b7999dbce849967a8b8175174 mysql-5.1.7_beta.ebuild 2072
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEGc4qKolR564NvWYRAlN2AJ9VeIq2WhcyweQyj+CJBA3VG+6wzgCgyU4v
-lMOXaXhzONFWyG7HPOF+gb4=
-=9Vp4
------END PGP SIGNATURE-----
+MD5 26c846fab71a897777722be7c27a47b6 mysql-5.0.19.ebuild 888
+RMD160 47ad6af594a74039e7fc3d90bbf79d5243be7142 mysql-5.0.19.ebuild 888
+SHA256 124fbd79706ba4504169f6e4a0f4b1453eb96cc6def4d427b711a9132e60e6d4 mysql-5.0.19.ebuild 888
+MD5 3f85df9edb84b193f9e16f906194543c mysql-5.1.7_beta.ebuild 892
+RMD160 0eceed272abde84d610853c6664b2d827d48bbbb mysql-5.1.7_beta.ebuild 892
+SHA256 fd9064d44f4ab4788a0dedbd42406bd94f95f066931bc5044132a3974e4e8f34 mysql-5.1.7_beta.ebuild 892
diff --git a/dev-db/mysql/files/digest-mysql-4.1.18-r30 b/dev-db/mysql/files/digest-mysql-4.1.18-r30
deleted file mode 100644
index b6d4d95da5e1..000000000000
--- a/dev-db/mysql/files/digest-mysql-4.1.18-r30
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 a2db4edb3e1e3b8e0f8c2242225ea513 mysql-4.1.18.tar.gz 17172994
-RMD160 6a761803092d9e34c15a18bad7e2c1c46f2e2429 mysql-4.1.18.tar.gz 17172994
-SHA256 7744d78131619b73a82adb6f73d6cfc6bad11a6ad2806c0f5130f88fe88ac9dd mysql-4.1.18.tar.gz 17172994
-MD5 d4e55fc358750d878ddb3c9450a95a5c mysql-extras-20060115.tar.bz2 78365
-RMD160 8ea4c995b3b3dbb7fe2f86418f0d327496ace99d mysql-extras-20060115.tar.bz2 78365
-SHA256 6a53bcd68b16de2f1990c2f523b898120f8fc32d28ad589e70452930391a6f09 mysql-extras-20060115.tar.bz2 78365
diff --git a/dev-db/mysql/files/digest-mysql-4.1.18-r60 b/dev-db/mysql/files/digest-mysql-4.1.18-r60
index d6cb50b58e4e..61be5ff5244a 100644
--- a/dev-db/mysql/files/digest-mysql-4.1.18-r60
+++ b/dev-db/mysql/files/digest-mysql-4.1.18-r60
@@ -1,6 +1,6 @@
 MD5 a2db4edb3e1e3b8e0f8c2242225ea513 mysql-4.1.18.tar.gz 17172994
 RMD160 6a761803092d9e34c15a18bad7e2c1c46f2e2429 mysql-4.1.18.tar.gz 17172994
 SHA256 7744d78131619b73a82adb6f73d6cfc6bad11a6ad2806c0f5130f88fe88ac9dd mysql-4.1.18.tar.gz 17172994
-MD5 e47aad78a132dcde074b763c19cb2ac8 mysql-extras-20060304.tar.bz2 78284
-RMD160 1c709ec33758587fb9c6a261dde1d58e1ef5ebc0 mysql-extras-20060304.tar.bz2 78284
-SHA256 92f47ed28745b129b122836546ebda65ae87abcf5b1ca7628f44bcca1ed6af74 mysql-extras-20060304.tar.bz2 78284
+MD5 a986948fcbb3dd9cd5dd8a79289f90ac mysql-extras-20060316.tar.bz2 4719
+RMD160 e4434ee53990bf9622e4a8bdedba63ecad35524e mysql-extras-20060316.tar.bz2 4719
+SHA256 9c5552d40f6ca77ad47f74dd55306ab4d318f24b3f69f2910595b5d480d661d3 mysql-extras-20060316.tar.bz2 4719
diff --git a/dev-db/mysql/files/digest-mysql-5.0.18-r30 b/dev-db/mysql/files/digest-mysql-5.0.18-r30
deleted file mode 100644
index a462fa2db156..000000000000
--- a/dev-db/mysql/files/digest-mysql-5.0.18-r30
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 f18153b0239aaa03fc5a751f2d82cb71 mysql-5.0.18.tar.gz 19169082
-RMD160 1987df6d9446637c8e353f61e269e9a57d995803 mysql-5.0.18.tar.gz 19169082
-SHA256 bd3d4b56de636eb14330be20e58f6fc58b015ff9d43926661e2e688ca7b6188a mysql-5.0.18.tar.gz 19169082
-MD5 d4e55fc358750d878ddb3c9450a95a5c mysql-extras-20060115.tar.bz2 78365
-RMD160 8ea4c995b3b3dbb7fe2f86418f0d327496ace99d mysql-extras-20060115.tar.bz2 78365
-SHA256 6a53bcd68b16de2f1990c2f523b898120f8fc32d28ad589e70452930391a6f09 mysql-extras-20060115.tar.bz2 78365
diff --git a/dev-db/mysql/files/digest-mysql-5.0.19 b/dev-db/mysql/files/digest-mysql-5.0.19
index 973f09ae7e44..59e7d7b0af5d 100644
--- a/dev-db/mysql/files/digest-mysql-5.0.19
+++ b/dev-db/mysql/files/digest-mysql-5.0.19
@@ -1,6 +1,6 @@
 MD5 d8a922fe657cca3b03d390e5f13d60a8 mysql-5.0.19.tar.gz 19454023
 RMD160 6d3fe75b11fd553652563f637476da8d2502c315 mysql-5.0.19.tar.gz 19454023
 SHA256 4e8faa4268b48c77a94792a637e785e87840513a316fe1b7eb8d0a5be77469a2 mysql-5.0.19.tar.gz 19454023
-MD5 e47aad78a132dcde074b763c19cb2ac8 mysql-extras-20060304.tar.bz2 78284
-RMD160 1c709ec33758587fb9c6a261dde1d58e1ef5ebc0 mysql-extras-20060304.tar.bz2 78284
-SHA256 92f47ed28745b129b122836546ebda65ae87abcf5b1ca7628f44bcca1ed6af74 mysql-extras-20060304.tar.bz2 78284
+MD5 a986948fcbb3dd9cd5dd8a79289f90ac mysql-extras-20060316.tar.bz2 4719
+RMD160 e4434ee53990bf9622e4a8bdedba63ecad35524e mysql-extras-20060316.tar.bz2 4719
+SHA256 9c5552d40f6ca77ad47f74dd55306ab4d318f24b3f69f2910595b5d480d661d3 mysql-extras-20060316.tar.bz2 4719
diff --git a/dev-db/mysql/files/digest-mysql-5.1.7_beta b/dev-db/mysql/files/digest-mysql-5.1.7_beta
index 91da6d9a46f0..58087ca215aa 100644
--- a/dev-db/mysql/files/digest-mysql-5.1.7_beta
+++ b/dev-db/mysql/files/digest-mysql-5.1.7_beta
@@ -1,6 +1,6 @@
 MD5 2949350c8719d49fcda5bc4fa8221348 mysql-5.1.7-beta.tar.gz 17360288
 RMD160 40638de7c8cd67560dfb4698cea52a863c8460b2 mysql-5.1.7-beta.tar.gz 17360288
 SHA256 5360cce9237dcd61a29d2f14a8545607c18945a74272570d42ef5ce27b13f8d6 mysql-5.1.7-beta.tar.gz 17360288
-MD5 e47aad78a132dcde074b763c19cb2ac8 mysql-extras-20060304.tar.bz2 78284
-RMD160 1c709ec33758587fb9c6a261dde1d58e1ef5ebc0 mysql-extras-20060304.tar.bz2 78284
-SHA256 92f47ed28745b129b122836546ebda65ae87abcf5b1ca7628f44bcca1ed6af74 mysql-extras-20060304.tar.bz2 78284
+MD5 a986948fcbb3dd9cd5dd8a79289f90ac mysql-extras-20060316.tar.bz2 4719
+RMD160 e4434ee53990bf9622e4a8bdedba63ecad35524e mysql-extras-20060316.tar.bz2 4719
+SHA256 9c5552d40f6ca77ad47f74dd55306ab4d318f24b3f69f2910595b5d480d661d3 mysql-extras-20060316.tar.bz2 4719
diff --git a/dev-db/mysql/mysql-4.1.18-r30.ebuild b/dev-db/mysql/mysql-4.1.18-r30.ebuild
deleted file mode 100644
index 093a7edb09be..000000000000
--- a/dev-db/mysql/mysql-4.1.18-r30.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.18-r30.ebuild,v 1.4 2006/03/03 01:31:54 vivo Exp $
-
-# MYSQL_VERSION_ID will be
-# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo magic number, all [0..99]
-# this is an important piece, becouse from this variable depends many of the
-# choices the ebuild will do.
-# in particular the code below work only with PVR like "5.0.18-r3"
-# the result with the previous PVR is "5001803"
-MYSQL_VERSION_ID=""
-tpv=( ${PV//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
-for vatom in 0 1 2 3; do
-	# pad to lenght 2
-	tpv[${vatom}]="00${tpv[${vatom}]}"
-	MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
-done
-# strip leading "0" (otherwise it's considered an octal number from bash)
-MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
-
-# for future use ...
-NDB_VERSION_ID=$(( ${MYSQL_VERSION_ID} / 100 ))
-MY_EXTRAS_VER="20060115"
-
-inherit mysql
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-DEPEND="${DEPEND}
-	>=sys-libs/readline-4.1
-	berkdb? ( sys-apps/ed )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	userland_GNU? ( sys-process/procps )
-	>=sys-libs/zlib-1.2.3
-	>=sys-apps/texinfo-4.7-r1
-	>=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 )"
-
-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
-
-		cd mysql-test
-		sed -i -e "s|MYSQL_TCP_PORT=3306|MYSQL_TCP_PORT=3307|" mysql-test-run
-		./mysql-test-run
-		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
-}
diff --git a/dev-db/mysql/mysql-4.1.18-r60.ebuild b/dev-db/mysql/mysql-4.1.18-r60.ebuild
index 446d28ff0e40..7c3bdee79c21 100644
--- a/dev-db/mysql/mysql-4.1.18-r60.ebuild
+++ b/dev-db/mysql/mysql-4.1.18-r60.ebuild
@@ -1,42 +1,9 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.18-r60.ebuild,v 1.1 2006/03/09 14:00:20 vivo Exp $
-
-# MYSQL_VERSION_ID will be
-# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo magic number, all [0..99]
-# this is an important piece, becouse from this variable depends many of the
-# choices the ebuild will do.
-# in particular the code below work only with PVR like "5.0.18-r3"
-# the result with the previous PVR is "5001803"
-MYSQL_VERSION_ID=""
-tpv=( ${PV//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
-for vatom in 0 1 2 3; do
-	# pad to lenght 2
-	tpv[${vatom}]="00${tpv[${vatom}]}"
-	MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
-done
-# strip leading "0" (otherwise it's considered an octal number from bash)
-MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
-
-# for future use ...
-NDB_VERSION_ID=$(( ${MYSQL_VERSION_ID} / 100 ))
-MY_EXTRAS_VER="20060304"
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.18-r60.ebuild,v 1.2 2006/03/17 20:18:06 vivo Exp $
 
 inherit mysql
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-SLOT=0
-
-DEPEND="${DEPEND}
-	>=sys-libs/readline-4.1
-	berkdb? ( sys-apps/ed )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	userland_GNU? ( sys-process/procps )
-	>=sys-libs/zlib-1.2.3
-	>=sys-apps/texinfo-4.7-r1
-	>=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 )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 src_test() {
 	cd ${S}
diff --git a/dev-db/mysql/mysql-5.0.18-r30.ebuild b/dev-db/mysql/mysql-5.0.18-r30.ebuild
deleted file mode 100644
index 3fa53a80ea54..000000000000
--- a/dev-db/mysql/mysql-5.0.18-r30.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.18-r30.ebuild,v 1.8 2006/03/03 01:31:54 vivo Exp $
-
-# MYSQL_VERSION_ID will be
-# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo magic number, all [0..99]
-# this is an important piece, becouse from this variable depends many of the
-# choices the ebuild will do.
-# in particular the code below work only with PVR like "5.0.18-r3"
-# the result with the previous PVR is "5001803"
-MYSQL_VERSION_ID=""
-tpv=( ${PV//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
-for vatom in 0 1 2 3; do
-	# pad to lenght 2
-	tpv[${vatom}]="00${tpv[${vatom}]}"
-	MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
-done
-# strip leading "0" (otherwise it's considered an octal number from bash)
-MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
-
-# for future use ...
-NDB_VERSION_ID=$(( ${MYSQL_VERSION_ID} / 100 ))
-MY_EXTRAS_VER="20060115"
-
-inherit mysql_fx mysql
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-DEPEND="${DEPEND}
-	>=sys-libs/readline-4.1
-	berkdb? ( sys-apps/ed )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	userland_GNU? ( sys-process/procps )
-	>=sys-libs/zlib-1.2.3
-	>=sys-apps/texinfo-4.7-r1
-	>=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 )"
-
-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
-
-		cd mysql-test
-		sed -i -e "s|MYSQL_TCP_PORT=3306|MYSQL_TCP_PORT=3307|" mysql-test-run
-		./mysql-test-run
-		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
-}
diff --git a/dev-db/mysql/mysql-5.0.19.ebuild b/dev-db/mysql/mysql-5.0.19.ebuild
index c5fd3ea3fd59..2ce202a1f915 100644
--- a/dev-db/mysql/mysql-5.0.19.ebuild
+++ b/dev-db/mysql/mysql-5.0.19.ebuild
@@ -1,42 +1,9 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.19.ebuild,v 1.1 2006/03/09 14:00:20 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.19.ebuild,v 1.2 2006/03/17 20:18:06 vivo Exp $
 
-# MYSQL_VERSION_ID will be
-# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo magic number, all [0..99]
-# this is an important piece, becouse from this variable depends many of the
-# choices the ebuild will do.
-# in particular the code below work only with PVR like "5.0.18-r3"
-# the result with the previous PVR is "5001803"
-MYSQL_VERSION_ID=""
-tpv=( ${PV//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
-for vatom in 0 1 2 3; do
-	# pad to lenght 2
-	tpv[${vatom}]="00${tpv[${vatom}]}"
-	MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
-done
-# strip leading "0" (otherwise it's considered an octal number from bash)
-MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
-
-# for future use ...
-NDB_VERSION_ID=$(( ${MYSQL_VERSION_ID} / 100 ))
-MY_EXTRAS_VER="20060304"
-
-inherit mysql_fx mysql
+inherit mysql
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-SLOT=0
-
-DEPEND="${DEPEND}
-	>=sys-libs/readline-4.1
-	berkdb? ( sys-apps/ed )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	userland_GNU? ( sys-process/procps )
-	>=sys-libs/zlib-1.2.3
-	>=sys-apps/texinfo-4.7-r1
-	>=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 )"
 
 src_test() {
 	cd ${S}
diff --git a/dev-db/mysql/mysql-5.1.7_beta.ebuild b/dev-db/mysql/mysql-5.1.7_beta.ebuild
index 559bb1ae4869..493152e75ad5 100644
--- a/dev-db/mysql/mysql-5.1.7_beta.ebuild
+++ b/dev-db/mysql/mysql-5.1.7_beta.ebuild
@@ -1,43 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.7_beta.ebuild,v 1.1 2006/03/03 01:31:54 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.7_beta.ebuild,v 1.2 2006/03/17 20:18:06 vivo Exp $
 
-# MYSQL_VERSION_ID will be
-# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo magic number, all [0..99]
-# this is an important piece, becouse from this variable depends many of the
-# choices the ebuild will do.
-# in particular the code below work only with PVR like "5.0.18-r3"
-# the result with the previous PVR is "5001803"
-MYSQL_VERSION_ID=""
-tpv=( ${PV//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
-for vatom in 0 1 2 3; do
-	# pad to lenght 2
-	tpv[${vatom}]="00${tpv[${vatom}]}"
-	MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
-done
-# strip leading "0" (otherwise it's considered an octal number from bash)
-MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
-
-# for future use ...
-NDB_VERSION_ID=$(( ${MYSQL_VERSION_ID} / 100 ))
-MY_EXTRAS_VER="20060304"
-
-inherit mysql_fx mysql
-SLOT=0
+inherit mysql
 KEYWORDS="-alpha -amd64 -arm -hppa -ia64 -ppc -ppc64 -s390 -sh -sparc -x86"
 
-DEPEND="${DEPEND}
-	>=sys-libs/readline-4.1
-	berkdb? ( sys-apps/ed )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	userland_GNU? ( sys-process/procps )
-	>=sys-libs/zlib-1.2.3
-	>=sys-apps/texinfo-4.7-r1
-	>=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 )"
-
 src_test() {
 	cd ${S}
 	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"