MySQL 5.1 support, cleanup, thanks to vivo!

(Portage version: 2.1.2_pre3-r4)
 (Unsigned Manifest commit)

5 files changed, 12 insertions, 106 deletions

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 67a11178b15a..8cf79f1f355f 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -38,15 +38,12 @@ DIST mysql-3.23.58.tar.gz 12039843 RMD160 b7d436ac7aaa9238e724bf3c62c5f837bef676
 DIST mysql-4.0.25.tar.gz 11159288 RMD160 9c32ff5b7332712929eb2eb8eb58ae1f4be7ad46 SHA1 65315c7659c75fcc9f3d9f749dbed26581f6da9c SHA256 5cf5e35e4c887cc6bee19881566afb07fcf5ef711ddfc79f7b9d2c4e00c8412b
 DIST mysql-4.0.27.tar.gz 11152643 RMD160 00cf895eab192e3e0ab526587ccab3e81c6c9070 SHA1 9cce3b92c47d17bf58ec6cdefebfdf953b5ce2c4 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f
 DIST mysql-4.1.21.tar.gz 17624947 RMD160 a8e92bb3b1371cde3fd938482b34cb597403debf SHA1 ec761b42d640e4dd051bff939fdcd2895b0e2591 SHA256 43a23ab44fdbd4893e1f5076a2f7fa1540afbaa617e772202099acd24af0e3c5
-DIST mysql-5.0.24a.tar.gz 19993102 RMD160 892376fc617dadfd34cbfe8c15f53ad2784131c5 SHA1 4bd685e6dda903b321afb8c36e0eac4a2d915f78 SHA256 1400d02f58ffe1c1570bd5590b75143bec270ad15fc98c868bbb82e7f59f70f2
 DIST mysql-5.0.26.tar.gz 25986952 RMD160 98ee85457de4bc8c8f8acddc8b6f0dc7687f32c7 SHA1 7197159f9214722aa41b82ad80f87b4af5d232ce SHA256 4266fe6a3593700d4157b8cc4278fa8ae98837d4757735fc6ed70d9df6bb2680
-DIST mysql-5.1.7-beta.tar.gz 17360288 RMD160 40638de7c8cd67560dfb4698cea52a863c8460b2 SHA1 32d835ff57176d077482eee4400230c39259b9d1 SHA256 5360cce9237dcd61a29d2f14a8545607c18945a74272570d42ef5ce27b13f8d6
+DIST mysql-5.1.13-bk-20061018.tar.gz 15866253 RMD160 707f1636d5e58f4c0e34809adfe19d04bf510530 SHA1 b265bcbd7a2c95976fb60142f819f7f136238eef SHA256 2dd77660688fec0bec3bb812fa85de059c983296d69f0e1e51f3669dca118770
 DIST mysql-extras-20050920.tar.bz2 51007 RMD160 27e8eaaf09bf8a6cc1fbec2678d756bad102c1ea SHA1 3b73c69526ef85eb7be53b54c85bb20dc36650d3 SHA256 f75922eac6229593508c4adace441b53d7bc68e82282fc80f1174612418bb8fc
 DIST mysql-patchset-4.0.27-r1.tar.bz2 4716 RMD160 362a1e2816c0606c47449c9e869a2a06459f3109 SHA1 0049ce4e08adc4fffc449a6286fb35512de5f460 SHA256 2cc1def725861a30c6146c63b68eb54356524d1b901eb7ae50742dcc93ea5e40
 DIST mysql-patchset-4.1.21-r1.tar.bz2 3851 RMD160 61ea4ef8d630f5e9fad1daa9e0d4204b2b6a94bf SHA1 6c0176beb3fcb6eb5633f8523d40a198e862dec9 SHA256 68a161055ae75a5668bea4534586261638f3471c30ee52cd6e2f0b4f6835751e
-DIST mysql-patchset-5.0.24-r2.tar.bz2 1687 RMD160 25c9862d20751b312a7ae5deae583ce3682bb9e0 SHA1 6424902debfdfa66c0f6c4776c129a42038e268f SHA256 35d8e1071617fe4b478137791c20b1c8e90c6ca63e29620769a9fe6d086f850f
 DIST mysql-patchset-5.0.26-r1.tar.bz2 1127 RMD160 d4fe6cd98d68efd4dd54a7f60accaa691e1eb01b SHA1 6ec029a9fb215e8bfeadfa6800d65ba2863ee3ce SHA256 3f581b2eea3e849c8cc7381c58b420f4da3847e2a21205c9ba21376a9efd9d02
-DIST mysql-patchset-5.1.7-r1.tar.bz2 1719 RMD160 3fe2d5295d8404ae98220a39208d210aaf1e8b48 SHA1 a4037c3b76346a11d809af9aeff6c3476e8986d8 SHA256 7fde97c1999d95a1a50632bb4f9c017fbcad96c05ec257da7847b2503d28ecfb
 EBUILD mysql-3.23.58-r1.ebuild 7232 RMD160 8dccb272ad58c1338c219aeb0327ad45522b05bf SHA1 738295742f30ed0fe8cdc1a7b33cf92f2a1e67bf SHA256 6d461c9d360a41d4c9c7dafbc5744a3222a00a417fe439da4aebee276c956b38
 MD5 0a98ffc228fea2a1a073880b2120dc68 mysql-3.23.58-r1.ebuild 7232
 RMD160 8dccb272ad58c1338c219aeb0327ad45522b05bf mysql-3.23.58-r1.ebuild 7232
@@ -63,22 +60,18 @@ EBUILD mysql-4.1.21.ebuild 1045 RMD160 997d68dc58a375caddc664c79b802ddb4c02b4af
 MD5 7e2f89c049a24f46360402745e06a2a2 mysql-4.1.21.ebuild 1045
 RMD160 997d68dc58a375caddc664c79b802ddb4c02b4af mysql-4.1.21.ebuild 1045
 SHA256 d96f168ac319995d0e65b411fa61ff34431cb31e1309a7bcf6b0914f2b47636e mysql-4.1.21.ebuild 1045
-EBUILD mysql-5.0.24-r1.ebuild 1053 RMD160 677612d08b260e8318d4261069ed8b9c647f4936 SHA1 2b38314ef3d487f898d56f5bd2d3abb57f6a7a27 SHA256 c9c43877b5f7b3043e1ce358551ededb63da1d6fe5565b86b79a9a5e5ad4b3df
-MD5 6b790ee7634066307bb85c65953f839d mysql-5.0.24-r1.ebuild 1053
-RMD160 677612d08b260e8318d4261069ed8b9c647f4936 mysql-5.0.24-r1.ebuild 1053
-SHA256 c9c43877b5f7b3043e1ce358551ededb63da1d6fe5565b86b79a9a5e5ad4b3df mysql-5.0.24-r1.ebuild 1053
 EBUILD mysql-5.0.26.ebuild 1051 RMD160 405cd8de70691eb9d6afe803efbd078b7f93f10b SHA1 3946655fc744eef0f79adda792a2995839b72446 SHA256 f9074bbaac9d649a13ceec70ac6febde7ddc097a27f7c850a10265c4bd74f660
 MD5 280597fa36c3b48f789f53769ddfaddd mysql-5.0.26.ebuild 1051
 RMD160 405cd8de70691eb9d6afe803efbd078b7f93f10b mysql-5.0.26.ebuild 1051
 SHA256 f9074bbaac9d649a13ceec70ac6febde7ddc097a27f7c850a10265c4bd74f660 mysql-5.0.26.ebuild 1051
-EBUILD mysql-5.1.7_beta.ebuild 983 RMD160 8784b24d65ac7384a8c49df32c3337387b56e6fb SHA1 3a0ddf7cbd69cd1819f8157bdd838c92709e42d6 SHA256 d751d3657687295e69bffc904c767313565921bec7056a76f40dedc428106b8b
-MD5 367c04951ef775fd054278c86643c035 mysql-5.1.7_beta.ebuild 983
-RMD160 8784b24d65ac7384a8c49df32c3337387b56e6fb mysql-5.1.7_beta.ebuild 983
-SHA256 d751d3657687295e69bffc904c767313565921bec7056a76f40dedc428106b8b mysql-5.1.7_beta.ebuild 983
-MISC ChangeLog 72892 RMD160 86343fd3071507462c3acecccdff4d4942984799 SHA1 ef8d0f722258fe44ff6b6153d3840dd29b3370a4 SHA256 9ecfffa8ddc1d61df2ee1bb87c4b38f852612c0b0daaed23086a7b97f9228c09
-MD5 243bb0ac255089588c0592080ed059c9 ChangeLog 72892
-RMD160 86343fd3071507462c3acecccdff4d4942984799 ChangeLog 72892
-SHA256 9ecfffa8ddc1d61df2ee1bb87c4b38f852612c0b0daaed23086a7b97f9228c09 ChangeLog 72892
+EBUILD mysql-5.1.13_alpha20061018.ebuild 616 RMD160 8712e3c0a3a814cd388b0285af30db9e2b39bac4 SHA1 b89c1f4c7e0e7eb8c3df8adffce958541a96ac55 SHA256 9b26a62348af2dc7b66100762408df94c4dc2b6215489c9b696f0203aed502a3
+MD5 dda22462bbb4b17bd02f8a0fa75a11a0 mysql-5.1.13_alpha20061018.ebuild 616
+RMD160 8712e3c0a3a814cd388b0285af30db9e2b39bac4 mysql-5.1.13_alpha20061018.ebuild 616
+SHA256 9b26a62348af2dc7b66100762408df94c4dc2b6215489c9b696f0203aed502a3 mysql-5.1.13_alpha20061018.ebuild 616
+MISC ChangeLog 73200 RMD160 c16aa8ad4437556c2e5971d4be22b1ff05359e5a SHA1 3fd30599fbc2bfafb55d8cc98d218c6d0acf1e6b SHA256 e9fa79392d5a62eae412f507f880df34cd14fdaca58b634d70bd114f76f74465
+MD5 c6ba1fb036551a1d4fc55bbd995728c8 ChangeLog 73200
+RMD160 c16aa8ad4437556c2e5971d4be22b1ff05359e5a ChangeLog 73200
+SHA256 e9fa79392d5a62eae412f507f880df34cd14fdaca58b634d70bd114f76f74465 ChangeLog 73200
 MISC metadata.xml 159 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee SHA1 5eb253a678d6faa0f1c6b3c5720a804ed8923566 SHA256 5cfd5aa0e8104c0326b5f4c9205a6449a94e0f6f6abfd2626f1e7a8fe77b98b7
 MD5 f1c86d989c7ea2451931e7e2c3530f8c metadata.xml 159
 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee metadata.xml 159
@@ -95,12 +88,9 @@ SHA256 a6d30a80a2ef1831b3651f841d37b65f7d8dde499a3c4d94f6a54ff3c74f4076 files/di
 MD5 5a3217fe3d3e05349a307bdd87171fdd files/digest-mysql-4.1.21 515
 RMD160 faefb1769127fc12c2d09c2a38f8093ba75d913b files/digest-mysql-4.1.21 515
 SHA256 c1435b926cc99e0d324580a3ce6df1d8c2c2a9d991e80ebf8296467e536450a4 files/digest-mysql-4.1.21 515
-MD5 e94264a2fc2b68b5b7c1919622d19d0d files/digest-mysql-5.0.24-r1 518
-RMD160 8b2720e3b4d3e05c84ca455f9b56d63bdf9d7717 files/digest-mysql-5.0.24-r1 518
-SHA256 7438d227a78a76a3d98469d9f7c7635bc5d2568c27eb321e7455151d810efd1f files/digest-mysql-5.0.24-r1 518
 MD5 c15647c8aacdb7c28ab9bc5752aedbfc files/digest-mysql-5.0.26 515
 RMD160 d40cd89b972583010340856c42b55bcf33b01409 files/digest-mysql-5.0.26 515
 SHA256 da6f55fabb7c174695d8805855d12bbc5c5ab16dd7072ba8ba9c301eed4f4125 files/digest-mysql-5.0.26 515
-MD5 1519456352bc71fb066801abd63f5fb5 files/digest-mysql-5.1.7_beta 524
-RMD160 7773670b4a9e64ddac9a5a4efa4186ae3a5f3221 files/digest-mysql-5.1.7_beta 524
-SHA256 c81ef36206e9dfae30185ede12aaf985e90663df9547b6e0187f57a2f6399548 files/digest-mysql-5.1.7_beta 524
+MD5 5b1a20d6a4cc2b82b91161be043099ad files/digest-mysql-5.1.13_alpha20061018 280
+RMD160 6647bb65ed37800a236b1cf6f0873ee129ba0758 files/digest-mysql-5.1.13_alpha20061018 280
+SHA256 a3b9a24c9133b65ba097615211ac40a0f7f466456ccf9b39920956866eed4bee files/digest-mysql-5.1.13_alpha20061018 280
diff --git a/dev-db/mysql/files/digest-mysql-5.0.24-r1 b/dev-db/mysql/files/digest-mysql-5.0.24-r1
deleted file mode 100644
index e17e22a7a5b9..000000000000
--- a/dev-db/mysql/files/digest-mysql-5.0.24-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 6b07546389f75c52611adb7af38c3667 mysql-5.0.24a.tar.gz 19993102
-RMD160 892376fc617dadfd34cbfe8c15f53ad2784131c5 mysql-5.0.24a.tar.gz 19993102
-SHA256 1400d02f58ffe1c1570bd5590b75143bec270ad15fc98c868bbb82e7f59f70f2 mysql-5.0.24a.tar.gz 19993102
-MD5 15c099e3dbdf4e7933dfb750b4ccf9a7 mysql-patchset-5.0.24-r2.tar.bz2 1687
-RMD160 25c9862d20751b312a7ae5deae583ce3682bb9e0 mysql-patchset-5.0.24-r2.tar.bz2 1687
-SHA256 35d8e1071617fe4b478137791c20b1c8e90c6ca63e29620769a9fe6d086f850f mysql-patchset-5.0.24-r2.tar.bz2 1687
diff --git a/dev-db/mysql/files/digest-mysql-5.1.7_beta b/dev-db/mysql/files/digest-mysql-5.1.7_beta
deleted file mode 100644
index b7fece795b66..000000000000
--- a/dev-db/mysql/files/digest-mysql-5.1.7_beta
+++ /dev/null
@@ -1,6 +0,0 @@
-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 df78e0e04b3aafe36d630494d102431e mysql-patchset-5.1.7-r1.tar.bz2 1719
-RMD160 3fe2d5295d8404ae98220a39208d210aaf1e8b48 mysql-patchset-5.1.7-r1.tar.bz2 1719
-SHA256 7fde97c1999d95a1a50632bb4f9c017fbcad96c05ec257da7847b2503d28ecfb mysql-patchset-5.1.7-r1.tar.bz2 1719
diff --git a/dev-db/mysql/mysql-5.0.24-r1.ebuild b/dev-db/mysql/mysql-5.0.24-r1.ebuild
deleted file mode 100644
index 8f9c1b3596db..000000000000
--- a/dev-db/mysql/mysql-5.0.24-r1.ebuild
+++ /dev/null
@@ -1,36 +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.24-r1.ebuild,v 1.2 2006/10/10 21:21:30 vivo Exp $
-
-# Leave this empty
-MYSQL_VERSION_ID=""
-MYSQL_RERELEASE="a"
-# Set the patchset revision to use, must be either empty or a decimal number
-MYSQL_PATCHSET_REV="2"
-
-inherit mysql
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-
-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|PORT=3306|PORT=3307|g" mysql-test-run
-		./mysql-test-run
-		retstatus=$?
-
-		# Just 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.1.7_beta.ebuild b/dev-db/mysql/mysql-5.1.7_beta.ebuild
deleted file mode 100644
index 256a83b5472b..000000000000
--- a/dev-db/mysql/mysql-5.1.7_beta.ebuild
+++ /dev/null
@@ -1,36 +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.1.7_beta.ebuild,v 1.8 2006/08/31 21:53:12 chtekk Exp $
-
-# Leave this empty
-MYSQL_VERSION_ID=""
-MYSQL_RERELEASE=""
-# Set the patchset revision to use, must be either empty or a decimal number
-MYSQL_PATCHSET_REV="1"
-
-inherit mysql
-
-KEYWORDS="-*"
-
-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|PORT=3306|PORT=3307|g" mysql-test-run
-		./mysql-test-run
-		retstatus=$?
-
-		# Just 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
-}