force revision bump, needed to fix/discover bugs introuduced during last working days.

(Portage version: 2.1.2_rc4-r1)
 (Unsigned Manifest commit)

11 files changed, 46 insertions, 1067 deletions

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index bcf1f65590df..caa7b917a8ea 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -14,26 +14,10 @@ AUX my.cnf-4.1 4212 RMD160 86a7b4aaf70b4a4321419a7616c6f8276a1530a1 SHA1 5c68c2c
 MD5 a81fb39bb23727683a8d8a717cb74a9d files/my.cnf-4.1 4212
 RMD160 86a7b4aaf70b4a4321419a7616c6f8276a1530a1 files/my.cnf-4.1 4212
 SHA256 7460667229e18b1f0e446105431e7ae31177e3e7774ff6736eba8b057cd3fc80 files/my.cnf-4.1 4212
-AUX mysql.conf.d 3273 RMD160 a2661c832c1091b2d05e599fc58cce6f686c7f31 SHA1 64e9bb80099bf6e14a07764fcb69bb02682aee0b SHA256 ee049781a3885305ce9999371198ff54f97fee4d2ad0814ba3aa3a03abc2724c
-MD5 092bb6cad90a875da8899e104304c969 files/mysql.conf.d 3273
-RMD160 a2661c832c1091b2d05e599fc58cce6f686c7f31 files/mysql.conf.d 3273
-SHA256 ee049781a3885305ce9999371198ff54f97fee4d2ad0814ba3aa3a03abc2724c files/mysql.conf.d 3273
 AUX mysql.init 886 RMD160 26b8aa45af3f930db01f0db731865b9293626fb1 SHA1 d7d99a3f45fa807d1fb57ab04b35800a69cae430 SHA256 2d7faf6d88fd13e5c10368a20074fdb59554635f8b1fd17e088d82208e611c12
 MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886
 RMD160 26b8aa45af3f930db01f0db731865b9293626fb1 files/mysql.init 886
 SHA256 2d7faf6d88fd13e5c10368a20074fdb59554635f8b1fd17e088d82208e611c12 files/mysql.init 886
-AUX mysql.rc6 10624 RMD160 29e5ff0a795fe5788b39a1cb27ed297db37a4ad0 SHA1 adabb3184ccf42d58ab25f63377d30e94adfb132 SHA256 f840b9718ac957fd513021b0bc5b22d067e221f96cd9d797b94eae0c03c3c236
-MD5 f1adf5702b9517ad43157c7291fda3e8 files/mysql.rc6 10624
-RMD160 29e5ff0a795fe5788b39a1cb27ed297db37a4ad0 files/mysql.rc6 10624
-SHA256 f840b9718ac957fd513021b0bc5b22d067e221f96cd9d797b94eae0c03c3c236 files/mysql.rc6 10624
-AUX mysqlmanager.conf.d 1009 RMD160 b443dc0cd1cb7fb054fe7229a52b8d093e634652 SHA1 0d82531df24ba4f0d957176b6fa0076a1cae0356 SHA256 35353f585cc9d3f97bbcfe77224d183e0fedcf4134377b8bff4c278462577cc7
-MD5 c94178cadec3be56c4e6c7ec9812cfcf files/mysqlmanager.conf.d 1009
-RMD160 b443dc0cd1cb7fb054fe7229a52b8d093e634652 files/mysqlmanager.conf.d 1009
-SHA256 35353f585cc9d3f97bbcfe77224d183e0fedcf4134377b8bff4c278462577cc7 files/mysqlmanager.conf.d 1009
-AUX mysqlmanager.rc6 6617 RMD160 a1306938ff11e18a9852a2546aaec34490d8a5e9 SHA1 62033f95762be615b451ffa89b5e1538aed82392 SHA256 bf83fdd06ca9615545e6aafd7a3abb06cac92a5854284bdde337f77d98329e55
-MD5 44dff672094af9d6c679a6aa8d9411b3 files/mysqlmanager.rc6 6617
-RMD160 a1306938ff11e18a9852a2546aaec34490d8a5e9 files/mysqlmanager.rc6 6617
-SHA256 bf83fdd06ca9615545e6aafd7a3abb06cac92a5854284bdde337f77d98329e55 files/mysqlmanager.rc6 6617
 DIST mysql-3.23.58.tar.gz 12039843 RMD160 b7d436ac7aaa9238e724bf3c62c5f837bef676b6 SHA1 f3383e41e8926c040a295173881414a1e96e0266 SHA256 8dcc6a613820701221b787419c32c1c717562194cfd296187da0e87454252acc
 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
@@ -53,38 +37,38 @@ EBUILD mysql-4.0.25-r2.ebuild 1052 RMD160 1244b3d41c7d75ab362ab7f0cd2879ee526ec1
 MD5 38fe984720492709610f2553586d595c mysql-4.0.25-r2.ebuild 1052
 RMD160 1244b3d41c7d75ab362ab7f0cd2879ee526ec1f9 mysql-4.0.25-r2.ebuild 1052
 SHA256 35c79833731375511354d6a4ced90fee73082ca5e7066a7880ef6d2212c2e1a6 mysql-4.0.25-r2.ebuild 1052
-EBUILD mysql-4.0.27.ebuild 1042 RMD160 6908f802f64cbeff71142a947eeb7e11f4005b7f SHA1 a5982575cff195247b44e2be7770ae31d030f144 SHA256 fff9b9bc18e6e653131dbee71498c86b12f40005a33bbcc7fc856689f2b2efe4
-MD5 e64fd248150de4d007c471afafa44606 mysql-4.0.27.ebuild 1042
-RMD160 6908f802f64cbeff71142a947eeb7e11f4005b7f mysql-4.0.27.ebuild 1042
-SHA256 fff9b9bc18e6e653131dbee71498c86b12f40005a33bbcc7fc856689f2b2efe4 mysql-4.0.27.ebuild 1042
+EBUILD mysql-4.0.27-r1.ebuild 1044 RMD160 ac142e15b7b65c00995fe4a3dce097add1d7e0cd SHA1 b8face83d2621bca58b9786abdbe1f11250e2e0a SHA256 6c9db6b52c76736933eed7dd4570c6e99be74d4b57742f5279942705d7addf82
+MD5 ab1cbf5fbd62c410f80ac9375c05d179 mysql-4.0.27-r1.ebuild 1044
+RMD160 ac142e15b7b65c00995fe4a3dce097add1d7e0cd mysql-4.0.27-r1.ebuild 1044
+SHA256 6c9db6b52c76736933eed7dd4570c6e99be74d4b57742f5279942705d7addf82 mysql-4.0.27-r1.ebuild 1044
 EBUILD mysql-4.1.21.ebuild 1051 RMD160 af944b29fa2e722f4e5355f54aab9dc98205c79e SHA1 fa35f4328f51dcab384a568d670c57ee864d3c64 SHA256 5225568a5129a619719a43d5b3ed41d8a3cc054250d05531d4fcce567f81d748
 MD5 215e7b4ad72d2bb18bb30205aa2a7309 mysql-4.1.21.ebuild 1051
 RMD160 af944b29fa2e722f4e5355f54aab9dc98205c79e mysql-4.1.21.ebuild 1051
 SHA256 5225568a5129a619719a43d5b3ed41d8a3cc054250d05531d4fcce567f81d748 mysql-4.1.21.ebuild 1051
-EBUILD mysql-4.1.22.ebuild 1271 RMD160 9f2edb67469c13a29e55a17a1f6882c67650cacf SHA1 99bf639607b0915363a36ee42695461e7c645739 SHA256 4b6e1cf9f1bb09f26dd582016fbc183da6775db9496585d4d8d31d893cbd54a6
-MD5 d5d37082dc3ffa4ec0f5b0c8ce1db6a7 mysql-4.1.22.ebuild 1271
-RMD160 9f2edb67469c13a29e55a17a1f6882c67650cacf mysql-4.1.22.ebuild 1271
-SHA256 4b6e1cf9f1bb09f26dd582016fbc183da6775db9496585d4d8d31d893cbd54a6 mysql-4.1.22.ebuild 1271
-EBUILD mysql-4.1.23_alpha20070101-r60.ebuild 1180 RMD160 5a3205deeeb55bd7b272f735506eb8ef843969ce SHA1 ad0fd381921dd3fb9e62671d4ec2295c87b8a587 SHA256 0b97a5a4bf7cdec447801a64efdea070152407b97ec8557dcc588cf7942870b4
-MD5 80278e2dc718674b23083fd7fc06afad mysql-4.1.23_alpha20070101-r60.ebuild 1180
-RMD160 5a3205deeeb55bd7b272f735506eb8ef843969ce mysql-4.1.23_alpha20070101-r60.ebuild 1180
-SHA256 0b97a5a4bf7cdec447801a64efdea070152407b97ec8557dcc588cf7942870b4 mysql-4.1.23_alpha20070101-r60.ebuild 1180
-EBUILD mysql-5.0.26-r1.ebuild 1946 RMD160 8653e5a6d59d75c9d89b4e1221253b364469ae05 SHA1 a723bc521a43e01329fd335cd3cbdddda72142a2 SHA256 33b9c2b804954df600a7592f3e888ea5dee1df0233521fa84918cd98994f3cea
-MD5 5d2805bc8626475098a13e5fd52bc4f0 mysql-5.0.26-r1.ebuild 1946
-RMD160 8653e5a6d59d75c9d89b4e1221253b364469ae05 mysql-5.0.26-r1.ebuild 1946
-SHA256 33b9c2b804954df600a7592f3e888ea5dee1df0233521fa84918cd98994f3cea mysql-5.0.26-r1.ebuild 1946
-EBUILD mysql-5.0.30.ebuild 1946 RMD160 7f6d723b0b65405180318fcbbdd5f0d85b988cca SHA1 3d57190ecded33ff0816cfd6b0f570b04cf1e4b7 SHA256 b84a8a3e01e2bc819d1c74be1ca57c135f89b59b36e764f08fb04c13d1ab0a13
-MD5 b91c0d3a55c68104492aeaa896e10265 mysql-5.0.30.ebuild 1946
-RMD160 7f6d723b0b65405180318fcbbdd5f0d85b988cca mysql-5.0.30.ebuild 1946
-SHA256 b84a8a3e01e2bc819d1c74be1ca57c135f89b59b36e764f08fb04c13d1ab0a13 mysql-5.0.30.ebuild 1946
-EBUILD mysql-5.0.34_alpha20070101-r60.ebuild 2508 RMD160 30e400e771319c5fc737c54530855c0fdbe4051f SHA1 07b4be407a00502be6db9341ef9e9d36da4aa37e SHA256 a808feca1c775f409f229f14135562146024add18afa71890b0c7dbfc49e0ee2
-MD5 12a87a30da1fc6dd07bf34a20d4fc445 mysql-5.0.34_alpha20070101-r60.ebuild 2508
-RMD160 30e400e771319c5fc737c54530855c0fdbe4051f mysql-5.0.34_alpha20070101-r60.ebuild 2508
-SHA256 a808feca1c775f409f229f14135562146024add18afa71890b0c7dbfc49e0ee2 mysql-5.0.34_alpha20070101-r60.ebuild 2508
-MISC ChangeLog 77364 RMD160 1b5cb8e1505bcdc4ea827a333878916a70765f68 SHA1 5040847e6008fb800387e441786a163c66e82fed SHA256 16f2048708870c7c2ee2a28adf9ac7f66133a7a4e95d6417ba90febba1fb80c3
-MD5 aa842dfb38d87abd2641d67d8d116b1e ChangeLog 77364
-RMD160 1b5cb8e1505bcdc4ea827a333878916a70765f68 ChangeLog 77364
-SHA256 16f2048708870c7c2ee2a28adf9ac7f66133a7a4e95d6417ba90febba1fb80c3 ChangeLog 77364
+EBUILD mysql-4.1.22-r1.ebuild 1274 RMD160 f2ef75a4ed0b4085377f51370d21b7e45e1ea055 SHA1 d8b983d8b13609c438a2d39e385aaed7d61a9602 SHA256 c7ee2210e51162573375b06535664d309490f08c4685a0826b50d0ca56063b79
+MD5 aeb9323fa432354480dc4254e19a03fe mysql-4.1.22-r1.ebuild 1274
+RMD160 f2ef75a4ed0b4085377f51370d21b7e45e1ea055 mysql-4.1.22-r1.ebuild 1274
+SHA256 c7ee2210e51162573375b06535664d309490f08c4685a0826b50d0ca56063b79 mysql-4.1.22-r1.ebuild 1274
+EBUILD mysql-4.1.23_alpha20070101-r61.ebuild 1180 RMD160 4b4326ec73b19f62d6fdd5fe03039265af7971df SHA1 d78989bf10186040193223c438e0fb6bc6d9c589 SHA256 0c11bf73ffb431ca18119cc302a0ca5b057045effc3b6eea758fa732b04e010b
+MD5 f7decc476e441637805ac4beb1b33588 mysql-4.1.23_alpha20070101-r61.ebuild 1180
+RMD160 4b4326ec73b19f62d6fdd5fe03039265af7971df mysql-4.1.23_alpha20070101-r61.ebuild 1180
+SHA256 0c11bf73ffb431ca18119cc302a0ca5b057045effc3b6eea758fa732b04e010b mysql-4.1.23_alpha20070101-r61.ebuild 1180
+EBUILD mysql-5.0.26-r2.ebuild 1945 RMD160 117bebf9817866defc37eb7982c580d33438bec1 SHA1 8815b37b36ad8d1e5c2fef5ef76ffab6e23ca351 SHA256 3fc469d01f513a8076aae5697e6af73a6b34449e0a3d663b695627fa8b3bb850
+MD5 e0208eb59cdaa2b13bf8a97a90764fd9 mysql-5.0.26-r2.ebuild 1945
+RMD160 117bebf9817866defc37eb7982c580d33438bec1 mysql-5.0.26-r2.ebuild 1945
+SHA256 3fc469d01f513a8076aae5697e6af73a6b34449e0a3d663b695627fa8b3bb850 mysql-5.0.26-r2.ebuild 1945
+EBUILD mysql-5.0.30-r1.ebuild 1949 RMD160 cc5c1b5583f2e746dc95abb94e8ca3a7b7c54e27 SHA1 e5b2632bf1d156b88834400d158f1ae6047c9d36 SHA256 f8bc3c57be8be6a0e48f40b832db71ff9d7c5db3c6459a98838743d1dd1bb340
+MD5 13c8b73ae6d3c22515c0e4d706cfa88c mysql-5.0.30-r1.ebuild 1949
+RMD160 cc5c1b5583f2e746dc95abb94e8ca3a7b7c54e27 mysql-5.0.30-r1.ebuild 1949
+SHA256 f8bc3c57be8be6a0e48f40b832db71ff9d7c5db3c6459a98838743d1dd1bb340 mysql-5.0.30-r1.ebuild 1949
+EBUILD mysql-5.0.34_alpha20070101-r61.ebuild 2508 RMD160 0b0d2b985b8de64c3a7362248fb444e2b76b57f7 SHA1 e7cd7cae92030c50093428ba8b8d25746bb6b77d SHA256 0601f4f052a811df8190330b120c4c8989ed2a44a043f3717530cee66e3b963e
+MD5 254e192ac6c73114f22284c525a32a08 mysql-5.0.34_alpha20070101-r61.ebuild 2508
+RMD160 0b0d2b985b8de64c3a7362248fb444e2b76b57f7 mysql-5.0.34_alpha20070101-r61.ebuild 2508
+SHA256 0601f4f052a811df8190330b120c4c8989ed2a44a043f3717530cee66e3b963e mysql-5.0.34_alpha20070101-r61.ebuild 2508
+MISC ChangeLog 78180 RMD160 a38f1621f0a05efdd4f398871a5ef50f3e7e939d SHA1 32bed6daaa31da1a7c5f8be2c104844ca5f12aa4 SHA256 31151c13f0e5c0268d7622691cc8da36c9760765678a4040125fc3909e1ecb51
+MD5 27355bd038fb5760372e63c6927b00ad ChangeLog 78180
+RMD160 a38f1621f0a05efdd4f398871a5ef50f3e7e939d ChangeLog 78180
+SHA256 31151c13f0e5c0268d7622691cc8da36c9760765678a4040125fc3909e1ecb51 ChangeLog 78180
 MISC metadata.xml 159 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee SHA1 5eb253a678d6faa0f1c6b3c5720a804ed8923566 SHA256 5cfd5aa0e8104c0326b5f4c9205a6449a94e0f6f6abfd2626f1e7a8fe77b98b7
 MD5 f1c86d989c7ea2451931e7e2c3530f8c metadata.xml 159
 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee metadata.xml 159
@@ -95,24 +79,24 @@ SHA256 df65c65648e29af5cf3df09407521acb4a0160106247cb14d0f23b3ec3c5de74 files/di
 MD5 e4fa263d3b35f5f4f23856868bdf2950 files/digest-mysql-4.0.25-r2 509
 RMD160 882fe3b4bc916f2a66a7854b5fb96fc03e31efe7 files/digest-mysql-4.0.25-r2 509
 SHA256 5355aa6145f94d54b17a3c0c486862945dd56bd3d4b50b4143c07d78163f3312 files/digest-mysql-4.0.25-r2 509
-MD5 0a8ffd929bdf0c5524211fa07b8ca049 files/digest-mysql-4.0.27 509
-RMD160 fcb19ef585d0c1cd8f0b60d17078de35a5aa614f files/digest-mysql-4.0.27 509
-SHA256 ded131d259a85cf0589bb9d572e56829402edbd65676aac87d7bfdecca7a583d files/digest-mysql-4.0.27 509
+MD5 0a8ffd929bdf0c5524211fa07b8ca049 files/digest-mysql-4.0.27-r1 509
+RMD160 fcb19ef585d0c1cd8f0b60d17078de35a5aa614f files/digest-mysql-4.0.27-r1 509
+SHA256 ded131d259a85cf0589bb9d572e56829402edbd65676aac87d7bfdecca7a583d files/digest-mysql-4.0.27-r1 509
 MD5 d0599ca0548d446bda87a00920a056c0 files/digest-mysql-4.1.21 509
 RMD160 c2e28497185a5960b5449fd225c4738f1b1aa331 files/digest-mysql-4.1.21 509
 SHA256 dcdd5bc586db79418cc5214d71825306cc22db2a7c24487fc12278ec0384a52e files/digest-mysql-4.1.21 509
-MD5 b115c41dd6ad161b69a46aee9fce436c files/digest-mysql-4.1.22 509
-RMD160 f89dc74e8d9eb254f3b4f349d0a6aa862de0eae4 files/digest-mysql-4.1.22 509
-SHA256 ae3b48f45d48fc69a0197d6020801a0422ed69bf76307cc232b1c1becd49f1b5 files/digest-mysql-4.1.22 509
-MD5 2131975c8b05704e3c0cffec893c4602 files/digest-mysql-4.1.23_alpha20070101-r60 548
-RMD160 0e89601b33db8a0f9d477d2bd1a6a0b06f811b61 files/digest-mysql-4.1.23_alpha20070101-r60 548
-SHA256 b38017bdff7d53137af64a03c6b7ddf2351203df21f3d0a01b28309b14246f07 files/digest-mysql-4.1.23_alpha20070101-r60 548
-MD5 5cccd323d243a1dba0bcb0a825e44c78 files/digest-mysql-5.0.26-r1 509
-RMD160 d693916c51f14b3ab7d4d8f2cb82b45f841ff0ff files/digest-mysql-5.0.26-r1 509
-SHA256 025d369bf41c4103bd3735396ca64301ce0188ae1539e5c2a4ff664d23db4656 files/digest-mysql-5.0.26-r1 509
-MD5 203ef39bd08fcaa8119f843c99f44c49 files/digest-mysql-5.0.30 509
-RMD160 79b4d96be7a0dd882efb9f11e642b52bb9732a68 files/digest-mysql-5.0.30 509
-SHA256 5a152952ae7701949ac62be0d703b14888ab2a248a1ef1fb77bf765b4f75c05c files/digest-mysql-5.0.30 509
-MD5 98acb9810f87773a30a14a1f25346b14 files/digest-mysql-5.0.34_alpha20070101-r60 548
-RMD160 6cf44dc446065e6e890dcbd59291cb4c6f99ba0d files/digest-mysql-5.0.34_alpha20070101-r60 548
-SHA256 06652eba0cd954daf34a7cbeaee9fdd5ed23bd416c5324bafc385363448277e3 files/digest-mysql-5.0.34_alpha20070101-r60 548
+MD5 b115c41dd6ad161b69a46aee9fce436c files/digest-mysql-4.1.22-r1 509
+RMD160 f89dc74e8d9eb254f3b4f349d0a6aa862de0eae4 files/digest-mysql-4.1.22-r1 509
+SHA256 ae3b48f45d48fc69a0197d6020801a0422ed69bf76307cc232b1c1becd49f1b5 files/digest-mysql-4.1.22-r1 509
+MD5 2131975c8b05704e3c0cffec893c4602 files/digest-mysql-4.1.23_alpha20070101-r61 548
+RMD160 0e89601b33db8a0f9d477d2bd1a6a0b06f811b61 files/digest-mysql-4.1.23_alpha20070101-r61 548
+SHA256 b38017bdff7d53137af64a03c6b7ddf2351203df21f3d0a01b28309b14246f07 files/digest-mysql-4.1.23_alpha20070101-r61 548
+MD5 5cccd323d243a1dba0bcb0a825e44c78 files/digest-mysql-5.0.26-r2 509
+RMD160 d693916c51f14b3ab7d4d8f2cb82b45f841ff0ff files/digest-mysql-5.0.26-r2 509
+SHA256 025d369bf41c4103bd3735396ca64301ce0188ae1539e5c2a4ff664d23db4656 files/digest-mysql-5.0.26-r2 509
+MD5 203ef39bd08fcaa8119f843c99f44c49 files/digest-mysql-5.0.30-r1 509
+RMD160 79b4d96be7a0dd882efb9f11e642b52bb9732a68 files/digest-mysql-5.0.30-r1 509
+SHA256 5a152952ae7701949ac62be0d703b14888ab2a248a1ef1fb77bf765b4f75c05c files/digest-mysql-5.0.30-r1 509
+MD5 98acb9810f87773a30a14a1f25346b14 files/digest-mysql-5.0.34_alpha20070101-r61 548
+RMD160 6cf44dc446065e6e890dcbd59291cb4c6f99ba0d files/digest-mysql-5.0.34_alpha20070101-r61 548
+SHA256 06652eba0cd954daf34a7cbeaee9fdd5ed23bd416c5324bafc385363448277e3 files/digest-mysql-5.0.34_alpha20070101-r61 548
diff --git a/dev-db/mysql/files/mysql.conf.d b/dev-db/mysql/files/mysql.conf.d
deleted file mode 100644
index 15ff170cc98a..000000000000
--- a/dev-db/mysql/files/mysql.conf.d
+++ /dev/null
@@ -1,80 +0,0 @@
-#  Here is where we define which server(s) to start.
-#  Additional parameters to be passed to mysqld at startup may be added here,
-#  which will override the ones in "my.cnf".
-#
-#  Below are described some suggested parameters to use.
-#  The parameters not recognized will be passed through to the mysqld daemon
-#  directly!
-#  To avoid starting a server just comment it's definition.
-#
-#  Last but not least, SPACES are NOT allowed inside the parameters!
-#
-#  Parameter      : description
-# ----------------+-----------------------------------------------------------
-# nice            : integer [-20 .. 19 ] default 0
-#                 : change the priority of the server -20 (high) to 19 (low)
-#                 : see "man nice 1" for description
-# ----------------+-----------------------------------------------------------
-# mycnf           : string [full path to my.cnf]
-#                 : specify the path to my.cnf file to be used
-# ----------------+-----------------------------------------------------------
-# startup_timeout : integer [seconds] default 15
-#                 : time to wait for mysqld up and running, after this it's
-#                 : marked as failed
-# ----------------+-----------------------------------------------------------
-#
-#  Additional parameters
-#  Parameter      : description
-# ----------------+-----------------------------------------------------------
-# server-id       : integer [1 .. 255]
-#                 : Uniquely identifies the server instance in the community
-#                 : of replication partners.
-# ----------------+-----------------------------------------------------------
-# port            : integer [1025 .. 65535] default 3306
-#                 : Port number to use for connection.
-#                 : Looses any meaning if skip-networking is set.
-# ----------------+-----------------------------------------------------------
-# skip-networking : NULL
-#                 : Don't allow connection through TCP/IP.
-# ----------------+-----------------------------------------------------------
-# log-bin         : string [name of the binlog files]
-#                 : Log update queries in binary format. Optional (but
-#                 : strongly recommended to avoid replication problems if
-#                 : server's hostname changes) argument should be the chosen
-#                 : location for the binary log files.
-# ----------------+-----------------------------------------------------------
-# Additionally the following variables are recognized:
-#
-# Be more verbose, accepts values from 1 to 4
-#DEBUG=4
-#
-# The default location for the "master" pid file
-#MYSQL_GLOB_PID_FILE="/var/run/svc-started-mysqld"
-#
-# The timeout for a failed attempt to stop a server
-#STOPTIMEOUT=120
-#
-
-# The parameters are passed in a bash array variable,
-# the variable name is mysql_slot_0_[server-num]
-# "server-num" is an optional number used to start multiple servers
-#
-# Examples:
-#
-# start a default server with default options:
-#mysql_slot_0=()
-#
-# start MySQL reniced, overriding some start parameters
-#mysql_slot_0=(
-#   "nice=-5"
-#   "server-id=123"
-#   "log-bin="myhost"
-#   "port=3307"
-#)
-#
-# start another server, different my.cnf
-#mysql_slot_0_1=(
-#   "mycnf=/home/test/my.cnf"
-#   "server-id=124"
-#)
-#
diff --git a/dev-db/mysql/files/mysql.rc6 b/dev-db/mysql/files/mysql.rc6
deleted file mode 100644
index d18d5a6b3aa5..000000000000
--- a/dev-db/mysql/files/mysql.rc6
+++ /dev/null
@@ -1,357 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql.rc6,v 1.5 2006/10/13 19:51:09 chtekk Exp $
-
-# external binaries used: which, sed, tac
-
-# int in_list(char * elem, char * list)
-function in_list() {
-	local elem=${1:-"none"}
-	local list=${2:-","}
-
-	[[ "${list}" == "${list/,${elem},/}" ]] \
-	&& return 1 \
-	|| return 0
-}
-
-function wdebug() {
-	if [[ "${DEBUG}" -ge "${1}" ]] ; then
-		shift
-		echo "dbg:  ${@}"
-	fi
-}
-
-depend() {
-	use dns net localmount netmount nfsmount
-}
-
-do_escape() {
-	# Ihatethisreallyverymuch
-	#echo "$1" | sed -e "s|'| |" -e "s|=|='|" -e "s|$|'|"
-	echo "$1"
-}
-
-# int get_slot_config(srv_slot=0, srv_num)
-get_slot_config() {
-	wdebug 4 ">>> get_slot_config()"
-
-	local srv srv_slot srv_num
-	srv_slot="${1:-"0"}"
-	srv_num="${2}"
-	MY_SUFFIX="-${srv_slot}"
-	# srv=array(0 => [srv_slot], 1 => [srv_num] )
-	srv=( ${srv_slot} ${srv_num} )
-
-	local tmp_eval="mysql_slot_${srv_slot}${srv_num:+"_"}${srv_num}[@]"
-	local conf_d_parameters="${!tmp_eval}"
-	if [[ "${srv_slot}" == "0" ]] ; then
-		MY_SUFFIX=''
-		# try some other default for the default server
-		[[ -z "${conf_d_parameters[@]}" ]] && conf_d_parameters=${mysql_slot[@]}
-	fi
-	[[ -z "${conf_d_parameters[@]}" ]] && conf_d_parameters=( )
-	basedir="" datadir="" pidfile="" socket=""
-	CHROOT="" NICE="" STARTUPTIMEOUT=5 STOPTIMEOUT=120
-
-	wdebug 3 "srv                ${srv[@]}"
-	wdebug 3 "srv_slot           ${srv_slot}"
-	wdebug 3 "srv_num            ${srv_num}"
-	wdebug 3 "tmp_eval           ${tmp_eval}"
-	wdebug 3 "conf_d_parameters  ${conf_d_parameters[@]}"
-	wdebug 3 "MY_SUFFIX          ${MY_SUFFIX}"
-
-	local tmp_eval="mysql_slot_${srv_slot}${srv_num:+"_"}${srv_num}[@]"
-	local conf_d_parameters="${!tmp_eval}"
-	# collations need to be defined *after* the character sets,
-	# so we will duplicate them
-	local collations=""
-	[[ ${conf_d_parameters[*]} == '()' ]] && conf_d_parameters=''
-
-	MY_CNF="/etc/mysql${MY_SUFFIX}/my.cnf"
-	# summa of unmanaged parameters
-	# some parameters may be present multiple times
-	unmanagedparams=""
-
-	# grab the parameters from conf.d/mysql definition
-	for my_default in ${conf_d_parameters[*]} ; do
-		case "${my_default}" in
-			nice=*)
-				NICE="${my_default#nice=}"
-				nice -n $NICE ls /tmp &>/dev/null || NICE=""
-				;;
-			mycnf=*) MY_CNF="${my_default#mycnf=}" ;;
-			startup_timeout=*)
-				STARTUPTIMEOUT="${my_default#startup_timeout=}"	;;
-			basedir=*) basedir="${my_default#basedir=}" ;;
-			datadir=*) datadir="${my_default#datadir=}" ;;
-			pid-file=*) pidfile="${my_default#pid-file=}" ;;
-			socket=*) socket="${my_default#socket=}" ;;
-			*collation*=)
-				collations="${collations} --$( do_escape "${my_default}" )"
-				;;
-			*=*)
-				# list of parameters we already have
-				# prepend "--" because my_print_defaults do it
-				unmanagedparams="${unmanagedparams} --$( do_escape "${my_default}" )"
-				;;
-			*)
-				unmanagedparams="${unmanagedparams} --${my_default}"
-				;;
-		esac
-	done
-
-	if [[ ! -r "${MY_CNF}" ]] ; then
-		ewarn "Cannot access ${MY_CNF} !"
-		MY_CNF=""
-		my_defaults=""
-	else
-		local my_print_defaults="$(which my_print_defaults${MY_SUFFIX} 2>/dev/null)"
-		if [[ ! -x "${my_print_defaults}" ]] ; then
-			eerror "my_print_defaults NOT found or not executable"
-			my_defaults=""
-		else
-			my_defaults=$( ${my_print_defaults} \
-			--loose-verbose \
-			--config-file="${MY_CNF}" \
-			mysqld server )
-		fi
-	fi
-
-	# grab needed parameters from my.cnf, don't override the ones from
-	# conf.d/mysql
-	for my_default in ${my_defaults} ; do
-		case "${my_default}" in
-			--basedir=*)
-				[[ -z "${basedir}" ]] && basedir="${my_default#--basedir=}" ;;
-			--datadir=*)
-				[[ -z "${datadir}" ]] && datadir="${my_default#--datadir=}" ;;
-			--pid-file=*)
-				[[ -z "${pidfile}" ]] && pidfile="${my_default#--pid-file=}" ;;
-			--socket=*)
-				[[ -z "${socket}" ]] && socket="${my_default#--socket=}" ;;
-			--*collation*=)
-				# the order is inversed because we want the conf.d ones overriden
-				collations="$( do_escape "${my_default}" ) ${collations}"
-				;;
-		esac
-	done
-
-	# some parameters
-	basedir="${basedir:-"/usr"}"
-	datadir="${datadir:-"/var/lib/mysql${MY_SUFFIX}"}"
-	pidfile="${pidfile:-"/var/run/mysqld/mysqld${MY_SUFFIX}.pid"}"
-	socket="${socket:-"/var/run/mysqld/mysqld${MY_SUFFIX}.sock"}"
-	unmanagedparams="${unmanagedparams} ${collations}"
-
-	wdebug 3 "chroot dir => ${CHROOT}"
-	wdebug 3 "niceness   => ${NICE}"
-	wdebug 3 "basedir    => ${basedir}"
-	wdebug 3 "datadir    => ${datadir}"
-	wdebug 3 "pidfile    => ${pidfile}"
-	wdebug 3 "socket     => ${socket}"
-	wdebug 3 "Unamanged  => ${unmanagedparams}"
-
-	# extension for sleep tenth of seconds, not very portable so check it before
-	if sleep 0.01 ; then
-		STARTUPTIMEOUT=$(( STARTUPTIMEOUT * 10 ))
-		STOPTIMEOUT=$(( STOPTIMEOUT * 10 ))
-		TIMEUNIT=0.1
-	else
-		TIMEUNIT=1
-	fi
-
-	# push these out to the script
-	export MY_SUFFIX NICE MY_CNF pidfile datadir basedir socket CHROOT
-	export unmanagedparams STARTUPTIMEOUT STOPTIMEOUT TIMEUNIT
-	wdebug 4 "<<< get_slot_config() ok"
-	return 0
-}
-
-checkconfig() {
-	wdebug 4 ">>> checkconfig(\"${1}\")"
-	local datadir="${1}" pidfile="${2}" socket="${3}"
-
-	if [[ -n "${NOCHECK}" ]] ; then
-		rm -f "${pidfile}" "${socket}"
-		return 0
-	fi
-
-	if [[ ! -d "${datadir}" ]] ; then
-		eerror "MySQL datadir is empty or invalid"
-		eerror "Please check your my.cnf : ${MY_CNF}"
-		wdebug 4 "<<< checkconfig() KO"
-		return 1
-	fi
-
-	if [[ ! -d "${datadir}/mysql" ]] ; then
-		eerror "You don't appear to have the mysql database installed yet."
-		eerror "Please run /usr/bin/mysql_install_db to have this done..."
-		wdebug 4 "<<< checkconfig() KO"
-		return 1
-	fi
-
-	if [[ -f "${pidfile}" ]] ; then
-		kill -15 $(< ${pidfile}) 2>/dev/null
-		if [[ $? -eq 0 ]] ; then
-			# the process exist, we have a problem
-			eerror "\"${pidfile}\" is still present and the process is running."
-			eerror "Please stop it \"kill $(< ${pidfile})\" maybe ?"
-			wdebug 4 "<<< checkconfig() KO"
-			return 1
-		else
-			rm -f "${pidfile}"
-		fi
-	fi
-
-	if [[ -S "${socket}" ]] ; then
-		ewarn "Strange, the socket file already exist in \"${socket}\""
-		ewarn "it will be removed now and re-created by the MySQL server"
-		ewarn "BUT please make your checks."
-		rm -f "${socket}"
-	fi
-
-	wdebug 4 "<<< checkconfig() ok"
-	return 0
-}
-
-start() {
-	wdebug 4 ">>> start()"
-
-	MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-${SVCNAME/mysql/mysqld}"}
-	# servers are defined in /etc/conf.d/mysql
-	local serverlist=${!mysql_slot_*}
-	# provide default for empty conf.d/mysql
-	if [[ -z "${serverlist}" ]] ; then
-		serverlist=0
-		export mysql_slot_0=( )
-	fi
-	local retstatus timeout
-	local globretstatus=1
-	local srv_slot srv_num
-	# server MUST NOT share same location for these
-	local pidfilelist=',' datadirlist=',' socketlist=','
-	local ssd_thing=1
-	local mysqld_thing tmpnice
-
-	ebegin "Starting ${myservice}"
-	# try to start each server
-	for srv in ${serverlist[*]} ; do
-
-		srv_slot="${srv#mysql_slot_}"
-		if [[ "${srv_slot}" == "${srv_slot#*_}" ]] ; then
-			srv_num=''
-		else
-			srv_num="${srv_slot#*_}"
-		fi
-		srv_slot="${srv_slot%%_*}"
-
-		retstatus=0
-		get_slot_config "${srv_slot}" "${srv_num}" || retstatus=1
-
-		# checks
-		if ! checkconfig "${datadir}" "${pidfile}" "${socket}" ; then
-			retstatus=2 ; continue
-		fi
-		if in_list "${pidfile}" "${pidfilelist}" ; then
-			eerror "Sorry, won't start with same pid-file: ${pidfile}"
-			retstatus=3 ; continue
-		fi
-		if in_list "${datadir}" "${datadirlist}" ; then
-			eerror "Sorry, won't start with same datadir: ${datadir}"
-			retstatus=4 ; continue
-		fi
-		if in_list "${socket}" "${socketlist}" ; then
-			eerror "Sorry, won't start with same socket: ${socket}"
-			retstatus=5 ; continue
-		fi
-
-		einfo "Starting ${myservice} (${MY_CNF})"
-
-		mysqld_thing="${MY_CNF:+"--defaults-file="}${MY_CNF}"
-		mysqld_thing="${mysqld_thing} ${unmanagedparams}"
-		mysqld_thing="${mysqld_thing} --basedir=${basedir}"
-		mysqld_thing="${mysqld_thing} --datadir=${datadir}"
-		mysqld_thing="${mysqld_thing} --pid-file=${pidfile}"
-		mysqld_thing="${mysqld_thing} --socket=${socket}"
-
-		wdebug 2 "starting mysqld with: ${mysqld_thing}"
-
-		if [[ ${ssd_thing} -eq 1 ]] ; then
-			tmpnice="${NICE:+"--nicelevel "}${NICE}"
-			start-stop-daemon --quiet ${DEBUG/*/"--verbose"} --start \
-			--background ${tmpnice} --pidfile ${pidfile} \
-			--exec ${basedir}/sbin/mysqld${MY_SUFFIX} -- ${mysqld_thing}
-			retstatus=$?
-		else
-			tmpnice="${NICE:+"nice -n "}${NICE}"
-			${tmpnice} ${basedir}/sbin/mysqld${MY_SUFFIX} ${mysqld_thing} &
-			retstatus=0
-		fi
-
-		# only the first run is done by start-stop-daemon
-		ssd_thing=""
-
-		# wait for socket creation
-		wdebug 1
-		while ! [[ -S "${socket}" || "${STARTUPTIMEOUT}" -lt 1 || "${retstatus}" -ne 0 ]] ; do
-			STARTUPTIMEOUT=$(( STARTUPTIMEOUT - 1 ))
-			[[ ${DEBUG} -ge 1 ]] && echo -n "${STARTUPTIMEOUT},"
-			sleep ${TIMEUNIT}
-		done
-		wdebug 1 ""
-		if [[ ! -S "${socket}" ]] ; then
-			eerror "MySQL${MY_SUFFIX} NOT started (${retstatus})"
-			retstatus=1
-		else
-			globretstatus=0
-			pidfilelist="${pidfilelist}${pidfile},"
-			datadirlist="${datadirlist}${datadir},"
-			socketlist="${socketlist}${socket},"
-			echo "${srv_slot}${srv_num:+"_"}${srv_num}=${pidfile}" >> "${MYSQL_GLOB_PID_FILE}"
-		fi
-	done
-	# successfull if at least one mysqld started
-	wdebug 4 "<<< start()"
-	eend $globretstatus
-}
-
-stop() {
-	get_slot_config &> /dev/null
-	MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-${SVCNAME/mysql/mysqld}"}
-	local runwhat pidfile shutdown_elem
-	local PID cnt timeout=${STOPTIMEOUT:-"120"}
-	local retstatus=0
-	local shutdown_list="$(< "${MYSQL_GLOB_PID_FILE}" )"
-
-	ebegin "Stopping ${myservice}"
-	wdebug 5 "MYSQL_GLOB_PID_FILE: ${MYSQL_GLOB_PID_FILE}"
-	wdebug 5 "shutdown_list: ${shutdown_list}"
-	for shutdown_elem in ${shutdown_list} ; do
-		runwhat=${shutdown_elem%%=*}
-		pidfile=${shutdown_elem#*=}
-		timeout=${STOPTIMEOUT:-"120"}
-		PID=$(< "${pidfile}" )
-		wdebug 3 "runwhat            ${runwhat}"
-		wdebug 3 "pidfile            ${pidfile}"
-		wdebug 3 "timeout            ${timeout}"
-		wdebug 3 "PID                ${PID}"
-
-		einfo "Stopping mysqld (${runwhat})"
-
-		start-stop-daemon --quiet ${DEBUG/*/"--verbose"} --stop --pidfile "${pidfile}" &
-		wdebug 1 ""
-		while [[ -n "$PID" ]] \
-			&& $( ps -Ao pid | grep -q "^ *$PID$" ) \
-			&& [[ "${timeout}" -ge 1 ]]
-		do
-			timeout=$(($timeout - 1))
-			[[ ${DEBUG} -ge 1 ]] && echo -n "$(( $STOPTIMEOUT - $timeout )),"
-			sleep ${TIMEUNIT}
-		done
-		[[ "${timeout}" -lt 1 ]] && retstatus=1
-	done
-	sleep ${TIMEUNIT}
-	[[ "$retstatus" -eq 0 ]] && rm -f "$MYSQL_GLOB_PID_FILE"
-	eend ${retstatus}
-}
diff --git a/dev-db/mysql/files/mysqlmanager.conf.d b/dev-db/mysql/files/mysqlmanager.conf.d
deleted file mode 100644
index 8666f71596cc..000000000000
--- a/dev-db/mysql/files/mysqlmanager.conf.d
+++ /dev/null
@@ -1,28 +0,0 @@
-#  Here is where we define which server(s) to start.
-#  Additional parameters to be passed to mysqlmanager at startup may be added here,
-#  which will override the ones in "my.cnf".
-#
-#  To avoid starting a server just comment it's definition
-#  here or it will rant (no default start).
-#  Last but not least, spaces are NOT allowed inside the parameters!
-#
-#  Below are described some suggested parameters to use.
-#  The parameters not recognized will be passed through to the mysqlmanager directly.
-#
-#  Parameter      : description
-
-# ----------------+-----------------------------------------------------------
-# mycnf           : string [full path to my.cnf]
-#                 : specify the path to my.cnf file to be used
-#                 : may contain a [manager] section
-# ----------------+-----------------------------------------------------------
-#
-# Basic default
-#
-#mysqlmanager_slot_0=()
-#
-# Start MySQL 5.0.X overriding the my.cnf path
-#mysqlmanager_slot_500=(
-#	"mycnf=/home/test/my.cnf"
-#)
-#
diff --git a/dev-db/mysql/files/mysqlmanager.rc6 b/dev-db/mysql/files/mysqlmanager.rc6
deleted file mode 100644
index 91e8b580a596..000000000000
--- a/dev-db/mysql/files/mysqlmanager.rc6
+++ /dev/null
@@ -1,230 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysqlmanager.rc6,v 1.3 2006/08/28 12:22:21 vivo Exp $
-
-# external binaries used: which, sed, tac
-
-depend() {
-	use dns net localmount netmount nfsmount
-	#provide mysql
-}
-
-# int in_list(char * elem, char * list)
-function in_list() {
-	local elem=${1:-"none"}
-	local list=${2:-","}
-
-	[[ "${list}" == "${list/,${elem},/}" ]] \
-	&& return 1 \
-	|| return 0
-}
-
-do_escape() {
-	# Ihatethisreallyverymuch
-	#echo "$1" | sed -e "s|'| |" -e "s|=|='|" -e "s|$|'|"
-	echo "$1"
-}
-
-# int get_slot_config(srv_slot=0, srv_num)
-get_slot_config() {
-	[[ ${DEBUG} -ge 4 ]] && einfo ">>> get_slot_config(\"${1}\", \"${2}\")"
-
-	srv_slot="${1:-"0"}"
-	srv_num="${2}"
-	MY_SUFFIX="-${srv_slot}"
-	[[ "${MY_SUFFIX}" == '-0' ]] && MY_SUFFIX=''
-
-	basedir="" pidfile="" socket=""
-
-	local tmp_eval="mysqlmanager_slot_${srv_slot}${srv_num:+"_"}${srv_num}[@]"
-	local conf_d_parameters="${!tmp_eval}"
-	[[ ${conf_d_parameters[*]} == '()' ]] && conf_d_parameters=''
-
-	MY_CNF="/etc/mysql${MY_SUFFIX}/my.cnf"
-	# summa of unmanaged parameters
-	# some parameters may be present multiple times
-	unmanagedparams=""
-
-	# grab the parameters from conf.d/mysql definition
-	for my_default in ${conf_d_parameters[*]} ; do
-		case "${my_default}" in
-			mycnf=*) MY_CNF="${my_default#mycnf=}" ;;
-			basedir=*) basedir="${my_default#basedir=}" ;;
-			pid-file=*) pidfile="${my_default#pid-file=}" ;;
-			socket=*) socket="${my_default#socket=}" ;;
-			*=*)
-				# list of parameters we already have
-				# prepend "--" because my_print_defaults do it
-				unmanagedparams="${unmanagedparams} --$( do_escape "${my_default}" )"
-				;;
-			*)
-				unmanagedparams="${unmanagedparams} --${my_default}"
-				;;
-		esac
-	done
-
-	if [[ ! -r "${MY_CNF}" ]] ; then
-		ewarn "Cannot access ${MY_CNF} !"
-		MY_CNF=""
-		my_defaults=""
-	else
-		local my_print_defaults="$(which my_print_defaults${MY_SUFFIX} 2>/dev/null)"
-		if [[ ! -x "${my_print_defaults}" ]] ; then
-			eerror "my_print_defaults NOT found or not executable"
-			my_defaults=""
-		else
-			my_defaults=$( ${my_print_defaults} \
-			--loose-verbose \
-			--config-file="${MY_CNF}" \
-			manager )
-		fi
-	fi
-
-	# grab needed parameters from my.cnf, don't override the ones from
-	# conf.d/mysql
-	for my_default in ${my_defaults} ; do
-		case "${my_default}" in
-			--pid-file=*)
-				[[ -z "${pidfile}" ]] && pidfile="${my_default#--pid-file=}" ;;
-			--socket=*)
-				[[ -z "${socket}" ]] && socket="${my_default#--socket=}" ;;
-		esac
-	done
-
-	# still empty, I'm in doubt if assign a default or break, will see
-	basedir="${basedir:-"/usr"}"
-	pidfile="${pidfile:-"/var/run/mysqld/mysqlmanager${MY_SUFFIX}.pid"}"
-	socket="${socket:-"/var/run/mysqld/mysqlmanager${MY_SUFFIX}.sock"}"
-
-	if [[ ${DEBUG} -ge 3 ]] ; then
-		einfo "basedir    => ${basedir}"
-		einfo "pidfile    => ${pidfile}"
-		einfo "socket     => ${socket}"
-		einfo "Unamanged  => ${unmanagedparams}"
-	fi
-
-	# push these out to the script
-	export MY_SUFFIX MY_CNF pidfile basedir socket
-	export unmanagedparams
-	[[ ${DEBUG} -ge 4 ]] && einfo "<<< get_slot_config() ok"
-	return 0
-}
-
-start() {
-	[[ ${DEBUG} -ge 4 ]] && einfo ">>> start()"
-	MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-${SVCNAME}"}
-	# servers are defined in /etc/conf.d/mysql
-	local serverlist=${!mysqlmanager_slot_*}
-	# provide default for empty conf.d/mysql
-	if [[ -z "${serverlist}" ]] ; then
-		serverlist=0
-		export mysqlmanager_slot_0=()
-	fi
-	local retstatus timeout
-	local globretstatus=1
-	local srv_slot srv_num
-	# server MUST NOT share same location for these
-	local pidfilelist=',' socketlist=','
-
-	# additional security
-	rm -f "${MYSQL_GLOB_PID_FILE}" ; touch "${MYSQL_GLOB_PID_FILE}"
-	if [[ $? -ne 0 ]] ; then
-		eerror "cannot create MYSQL_GLOB_PID_FILE: ${MYSQL_GLOB_PID_FILE}"
-		[[ ${DEBUG} -ge 4 ]] && einfo "<<< start() KO"
-		return 1
-	fi
-
-	ebegin
-	# try to start each server
-	for srv in ${serverlist[*]} ; do
-		einfo "working on ${srv}"
-
-		srv_slot="${srv#mysqlmanager_slot_}"
-		if [[ "${srv_slot}" == "${srv_slot#*_}" ]] ; then
-			srv_num=''
-		else
-			srv_num="${srv_slot#*_}"
-		fi
-		srv_slot="${srv_slot%%_*}"
-
-		retstatus=0
-		get_slot_config "${srv_slot}" "${srv_num}" || retstatus=1
-
-		# timeout (seconds) before declaring the startup failed
-
-		# pre_run checks
-		if [[ "$retstatus" -eq 0 ]] ; then
-			if in_list "${pidfile}" "${pidfilelist}" ; then
-				retstatus=3
-				eerror "Sorry, won't start with same pid-file: ${pidfile}"
-			fi
-			if in_list "${socket}" "${socketlist}" ; then
-				retstatus=5
-				eerror "Sorry, won't start with same socket: ${socket}"
-			fi
-		fi
-
-		if [[ $retstatus -eq 0 ]] ; then
-			# additional security
-			rm -f ${pidfile} ${socket}
-			einfo "Starting mysqlmanager${MY_SUFFIX:+"_"}${srv_slot}${srv_num:+"_"}${srv_num} (${MY_CNF})"
-
-			[[ ${DEBUG} -ge 2 ]] && echo "starting mysqlmanager with: "${basedir}/sbin/mysqlmanager${MY_SUFFIX} ${unmanagedparams} --pid-file=${pidfile} --socket=${socket}
-
-			start-stop-daemon --quiet --start --background \
-				--pidfile "${pidfile}" \
-				--exec ${basedir}/sbin/mysqlmanager${MY_SUFFIX} \
-				-- \
-					${MY_CNF:+"--defaults-file="}${MY_CNF} \
-					${unmanagedparams} \
-					--pid-file=${pidfile} \
-					--socket=${socket}
-
-			retstatus=$?
-
-			if [[ "${retstatus}" -eq 0 ]] ; then
-				pidfilelist="${pidfilelist}${pidfile},"
-				socketlist="${socketlist}${socket},"
-				globretstatus=0
-				echo "${srv_slot}${srv_num:+"_"}${srv_num}=${pidfile}" >> "${MYSQL_GLOB_PID_FILE}"
-			fi
-		fi
-	done
-	# successfull if at least one mysqlmanager started
-	[[ ${DEBUG} -ge 4 ]] && einfo "<<< start()"
-	eend $globretstatus
-}
-
-stop () {
-	MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-${SVCNAME}"}
-	local runwhat pidfile shutdown_elem
-	local PID cnt timeout
-	local retstatus=0
-	local shutdown_list="$(< "${MYSQL_GLOB_PID_FILE}" )"
-
-	# shutdown in reverse order
-	ebegin
-	for shutdown_elem in $shutdown_list; do
-		runwhat=${shutdown_elem%%=*}
-		pidfile=${shutdown_elem#*=}
-		timeout=${STOPTIMEOUT:-"10"}
-
-		einfo "Stopping mysqlmanager (${runwhat})"
-
-		PID=$(cat "${pidfile}" 2>/dev/null)
-		start-stop-daemon --stop --quiet --pidfile="${pidfile}"
-		[[ ${DEBUG} -ge 1 ]] && echo ""
-		while [[ -n "$PID" && $( kill -0 $PID 2>/dev/null ) && "${timeout}" -ge 1 ]] ; do
-			timeout=$(($timeout - 1))
-			[[ ${DEBUG} -ge 1 ]] && echo -n $(( $STOPTIMEOUT - $timeout ))
-			sleep 1
-		done
-		if [[ "${timeout}" -lt 1 ]] ; then
-			retstatus=$(( $retstatus + 1 ))
-		fi
-	done
-
-	[[ "$retstatus" -eq 0 ]] && rm -f "$MYSQL_GLOB_PID_FILE"
-	eend $retstatus
-}
diff --git a/dev-db/mysql/mysql-4.0.27.ebuild b/dev-db/mysql/mysql-4.0.27.ebuild
deleted file mode 100644
index 15a146e13292..000000000000
--- a/dev-db/mysql/mysql-4.0.27.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.27.ebuild,v 1.16 2007/01/05 00:17:35 vivo Exp $
-
-MY_EXTRAS_VER="20070105"
-SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
-
-inherit mysql
-
-#REMEMBER!!!: update also eclass/mysql*.eclass prior to commit
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-
-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-4.1.22.ebuild b/dev-db/mysql/mysql-4.1.22.ebuild
deleted file mode 100644
index 30877e506a22..000000000000
--- a/dev-db/mysql/mysql-4.1.22.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.22.ebuild,v 1.4 2007/01/05 00:17:35 vivo Exp $
-
-MY_EXTRAS_VER="20070105"
-SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
-
-inherit mysql
-
-#REMEMBER!!!: update also eclass/mysql*.eclass prior to commit
-KEYWORDS="alpha amd64 arm hppa ia64 mips 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
-		local testopts="--force"
-
-		# sandbox make ndbd zombie
-		hasq "sandbox" ${FEATURES} && testopts="${testopts} --skip-ndb"
-
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		cd mysql-test
-		sed -i -e "s|3306|3307|g" mysql-test-run.pl
-
-		# from Makefile.am:
-		retstatus=1
-		./mysql-test-run.pl ${testopts} \
-		&& ./mysql-test-run.pl ${testopts} --ps-protocol \
-		&& retstatus=0
-
-		# Just to be sure ;)
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-		[[ $retstatus -eq 0 ]] || die "test failed"
-	else
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql/mysql-4.1.23_alpha20070101-r60.ebuild b/dev-db/mysql/mysql-4.1.23_alpha20070101-r60.ebuild
deleted file mode 100644
index 139220f7b852..000000000000
--- a/dev-db/mysql/mysql-4.1.23_alpha20070101-r60.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.23_alpha20070101-r60.ebuild,v 1.2 2007/01/04 20:48:42 vivo Exp $
-
-MY_EXTRAS_VER="latest"
-SERVER_URI="mirror://gentoo/MySQL-${PV%.*}/mysql-${PV//_alpha/-bk-}.tar.bz2"
-
-inherit mysql
-
-#REMEMBER!!!: update also eclass/mysql*.eclass prior to commit
-KEYWORDS="testing"
-
-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
-		local testopts="--force"
-
-		# sandbox make ndbd zombie
-		hasq "sandbox" ${FEATURES} && testopts="${testopts} --skip-ndb"
-
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		cd mysql-test
-
-		# from Makefile.am:
-		retstatus=1
-		./mysql-test-run.pl ${testopts} \
-		&& ./mysql-test-run.pl ${testopts} --ps-protocol \
-		&& retstatus=0
-
-		# Just to be sure ;)
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-		[[ $retstatus -eq 0 ]] || die "test failed"
-	else
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql/mysql-5.0.26-r1.ebuild b/dev-db/mysql/mysql-5.0.26-r1.ebuild
deleted file mode 100644
index a2c300d2ae71..000000000000
--- a/dev-db/mysql/mysql-5.0.26-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.26-r1.ebuild,v 1.16 2007/01/05 00:17:35 vivo Exp $
-
-MY_EXTRAS_VER="20070105"
-SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
-
-inherit mysql
-
-#REMEMBER!!!: update also eclass/mysql*.eclass prior to commit
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-
-src_test() {
-
-	make check || die "make check failed"
-	if ! useq "minimal" ; then
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# mysqladmin start before dir creation
-		mkdir mysql-test/var{,/log}
-
-		if [[ ${UID} -eq 0 ]] ; then
-			mysql_disable_test  "im_daemon_life_cycle" "fail as root"
-			mysql_disable_test  "im_life_cycle"        "fail as root"
-			mysql_disable_test  "im_options_set"       "fail as root"
-			mysql_disable_test  "im_options_unset"     "fail as root"
-			mysql_disable_test  "im_utils"             "fail as root"
-		fi
-
-		for t in \
-		loaddata_autocom_ndb \
-		ndb_{alter_table{,2},autodiscover{,2,3},basic,bitfield,blob} \
-		ndb_{cache{,2},cache_multi{,2},charset,condition_pushdown,config} \
-		ndb_{database,gis,index,index_ordered,index_unique,insert,limit} \
-		ndb_{loaddatalocal,lock,minmax,multi,read_multi_range,rename,replace} \
-		ndb_{restore,subquery,transaction,trigger,truncate,types,update} \
-		ps_7ndb rpl_ndb_innodb_trans strict_autoinc_5ndb
-		do
-			mysql_disable_test "${t}" "fail in sandbox"
-		done
-
-		useq "extraengine" && mysql_disable_test "federated" "fail with extraengine"
-
-		make test-force-pl
-		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.0.30.ebuild b/dev-db/mysql/mysql-5.0.30.ebuild
deleted file mode 100644
index 7b054ed1aefa..000000000000
--- a/dev-db/mysql/mysql-5.0.30.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.30.ebuild,v 1.5 2007/01/05 00:17:35 vivo Exp $
-
-MY_EXTRAS_VER="20070105"
-SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"
-
-inherit mysql
-
-#REMEMBER!!!: update also eclass/mysql*.eclass prior to commit
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-
-src_test() {
-
-	make check || die "make check failed"
-	if ! useq "minimal" ; then
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# mysqladmin start before dir creation
-		mkdir mysql-test/var{,/log}
-
-		if [[ ${UID} -eq 0 ]] ; then
-			mysql_disable_test  "im_daemon_life_cycle" "fail as root"
-			mysql_disable_test  "im_life_cycle"        "fail as root"
-			mysql_disable_test  "im_options_set"       "fail as root"
-			mysql_disable_test  "im_options_unset"     "fail as root"
-			mysql_disable_test  "im_utils"             "fail as root"
-		fi
-
-		for t in \
-		loaddata_autocom_ndb \
-		ndb_{alter_table{,2},autodiscover{,2,3},basic,bitfield,blob} \
-		ndb_{cache{,2},cache_multi{,2},charset,condition_pushdown,config} \
-		ndb_{database,gis,index,index_ordered,index_unique,insert,limit} \
-		ndb_{loaddatalocal,lock,minmax,multi,read_multi_range,rename,replace} \
-		ndb_{restore,subquery,transaction,trigger,truncate,types,update} \
-		ps_7ndb rpl_ndb_innodb_trans strict_autoinc_5ndb
-		do
-			mysql_disable_test "${t}" "fail in sandbox"
-		done
-
-		useq "extraengine" && mysql_disable_test "federated" "fail with extraengine"
-
-		make test-force-pl
-		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.0.34_alpha20070101-r60.ebuild b/dev-db/mysql/mysql-5.0.34_alpha20070101-r60.ebuild
deleted file mode 100644
index f90ddf306e67..000000000000
--- a/dev-db/mysql/mysql-5.0.34_alpha20070101-r60.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.34_alpha20070101-r60.ebuild,v 1.2 2007/01/04 20:48:42 vivo Exp $
-
-MY_EXTRAS_VER="latest"
-SERVER_URI="mirror://gentoo/MySQL-${PV%.*}/mysql-${PV//_alpha/-bk-}.tar.bz2"
-
-inherit mysql
-
-#REMEMBER!!!: update also eclass/mysql*.eclass prior to commit
-KEYWORDS="testing"
-
-src_test() {
-
-	make check || die "make check failed"
-	if ! useq "minimal" ; then
-		cd "${S}/mysql-test"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus
-		local t
-		local testopts="--force"
-
-		# sandbox make ndbd zombie
-		hasq "sandbox" ${FEATURES} && testopts="${testopts} --skip-ndb"
-
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# mysqladmin start before dir creation
-		mkdir ${S}/mysql-test/var{,/log}
-
-		if [[ ${UID} -eq 0 ]] ; then
-			mysql_disable_test  "im_cmd_line"          "fail as root"
-			mysql_disable_test  "im_daemon_life_cycle" "fail as root"
-			mysql_disable_test  "im_instance_conf"     "fail as root"
-			mysql_disable_test  "im_life_cycle"        "fail as root"
-			mysql_disable_test  "im_options"           "fail as root"
-			mysql_disable_test  "im_options_set"       "fail as root"
-			mysql_disable_test  "im_options_unset"     "fail as root"
-			mysql_disable_test  "im_utils"             "fail as root"
-			mysql_disable_test  "trigger"              "fail as root"
-		fi
-
-		for t in \
-		loaddata_autocom_ndb \
-		ndb_{alter_table{,2},autodiscover{,2,3},basic,bitfield,blob} \
-		ndb_{cache{,2},cache_multi{,2},charset,condition_pushdown,config} \
-		ndb_{database,gis,index,index_ordered,index_unique,insert,limit} \
-		ndb_{loaddatalocal,lock,minmax,multi,read_multi_range,rename,replace} \
-		ndb_{restore,subquery,transaction,trigger,truncate,types,update} \
-		ps_7ndb rpl_ndb_innodb_trans strict_autoinc_5ndb
-		do
-			mysql_disable_test "${t}" "fail in sandbox"
-		done
-
-		useq "extraengine" && mysql_disable_test "federated" "fail with extraengine"
-
-		mysql_disable_test "view" "Already fixed: fail because now we are in year 2007"
-
-		for t in \
-		myisam mysql_upgrade query_cache_notembedded rpl000015 rpl000017
-		do
-			mysql_disable_test "${t}" "FIXME: Im'not supposed to fail"
-		done
-
-		make test-force
-		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
-}