Cleanup finally, will live on in the overlay.

Package-Manager: portage-2.2.10/cvs/Linux x86_64

10 files changed, 9 insertions, 654 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index f4f189c46781..069d62d27104 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/mysql
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.677 2014/08/03 21:01:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.678 2014/08/04 04:01:01 robbat2 Exp $
+
+  04 Aug 2014; Robin H. Johnson <robbat2@gentoo.org> -files/my.cnf,
+  -files/my.cnf-4.0, -files/my.cnf-4.1, -files/mysql.init,
+  -mysql-4.0.27-r1.ebuild, -mysql-4.1.22-r1.ebuild, -mysql-5.0.96.ebuild,
+  metadata.xml:
+  Cleanup finally, will live on in the overlay.
 
   03 Aug 2014; Robin H. Johnson <robbat2@gentoo.org> mysql-5.6.20.ebuild:
   Missed merging a test.
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 1643ee2160cf..5fea48b013cc 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,32 +1,19 @@
-AUX my.cnf 1249 SHA256 29c07ce113496ec62bf9427609f2291861e3e165200d6e98a69bd312c6c101ec SHA512 f3864d5ff209dce0a0ab0ae5d0c20d4564ff491d21681c052a7a9d75f986b22d9c637f7d606ab1d7f923539a9137abaf547ceab4c2334140b76f952ef45d26dc WHIRLPOOL ec41a690119cff9b0f2b6adab148dee82a77e9a56fbabe7619d3aa1a9996261c9ad8a4c33d40294a12d701ef7db9fe40e81ad167566070a61d759ac134f087f7
-AUX my.cnf-4.0 4324 SHA256 2c9715f29b423207a92e6bc81f1179b152c2d8ff72f69e4af3cda37c114452df SHA512 51c3956b44e54dfc3aa2f1ac0d8aac3fefca1f2a8caa9298c218eff4fd64e33f4a49ea313aafc22d13582af7420edbc35034cec1ee2340f7689cfe49b180a3d5 WHIRLPOOL 839926eb7816ef93ee1bc480b0a2fc354f91db8d3053a8679bc5663fce785a0efa974cb1421c8b6c122d5d5f86f95305eafdeadc80e2c101cced6a6017f08ec7
-AUX my.cnf-4.1 4235 SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7 SHA512 8bb6a8cc05b9aea433f0a0f1184a03b5b99b6a4dd5e162abd173810db8a530de33db80a7ae0018e29879253c752a4b3a4522335a170cb2339a1ead76fd15318b WHIRLPOOL fa5e0f91100e8dd6ed42e095079635dd95ed171d96275340145136c86157805fd1d101b74b49873b6cc05f182ca209d6e981e0d16d4871adf5d24a279469b59b
 AUX my.cnf-5.1 4827 SHA256 8b11f33d086566d0ca21d46bb21b1020be6e24511038f3f12e146089a1d406c7 SHA512 5facc6fe5b6a4bf9e4ac9430d1c2a8195e7a859fb66d84cf4adebf2a9f4e3f422c5fc143beb5d8f327d9191200e654b636a564b6e082cc9cbac39cfb6516a086 WHIRLPOOL 185cb121d3ca0c5c249cfa58377e029a7dd4934de2bd240943cddb9d3c10116a3c3d90959bf8872d5f69627f8b2adf7fd001aa40947713a42bd13df7f733f068
 AUX my.cnf-5.5 4905 SHA256 952c0c7429f3c85355ef94cfbd02a905bdace248e1131ed3d94d8c7aad76d39d SHA512 9ae23c0bebceea7e2874fb080d0da57707f362a5f6bd685ff6e8fa70f1f775e52b43dd058cae5c55eee04806e01794bc474684e4a1c68f9609a68e4417678b68 WHIRLPOOL 1c1eef2aa5b7445e0920d4f4579d225b8c6aab5851b0ed8553442ccb4682229bf615b8c974c69433b76879356effcc88439a36d016a9e826df20cc7b2111ce0c
 AUX mysql-5.5.32-Werror.patch 620 SHA256 bb2cf6f5b1546a310a64d94e80e0583354c7223fd223169280f00268dde1410b SHA512 a1fdc9619e6d6d6cb708946ef7951854f6d8e481d4eb9d47495c1a9114cd835bc34f50815fcf93ede8c055b2cd5c28454c610f94263c8745f9e26f69de85c925 WHIRLPOOL aa27642e499d4dcc611c5b9caf591c3fa5b3b9e0558660b4a3adea7e18e0fb6c7bfab8684be18bd17d42b4ec01a1aa747a61f26730370c813f500d870c8d3640
-AUX mysql.init 886 SHA256 2d7faf6d88fd13e5c10368a20074fdb59554635f8b1fd17e088d82208e611c12 SHA512 4400e6e993fc9bb69efdb06e8dd2eaacd16a361d290031c38347a3dc1f912867bc3f0f62fe2d61e09671801a2355bf896bf22360e209e8044877ca976f4e0611 WHIRLPOOL 43a656123c687571158edc94363e9dfd742e4ef29f92551e7bba56ff9782795b75ae62fab1f659fc3d21bc6debab689c39269c0a5bfd28b6652162d38ae9dd5a
-DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f SHA512 188283133e99e1c0b52ac8650aff325d7c9762fbad526c2c67b26dd614f2a86afb247a3f55ff071be1d44cd13060b9d7cca08ba1d758a04d2369381fa104454e WHIRLPOOL d3964468635eae0caf7fc8fb7b3576da12d49264bd9b797bb2191da8c6b91ca46321fb090e994df2b93b43f50686dcc4f735bdff03b49a3176fa746d5c4a60ab
-DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
-DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.70.tar.gz 23984241 SHA256 9e03a343cf1b72b07f9c9bf7be24ffc808aa5c1a9daa590aaf2bc6a7a31f60ed SHA512 5d667af9e819bca85ff4d471cbb2792f47129146822a14cc93abb3f80a6fc6453ef06fc3dece091979003906d76002c1e680b3516747d29f5282827ec87a00e3 WHIRLPOOL 58dedd3b72621b339525338db717c399f04293bee5525856f2a275473f9730b3eafffcc3c29425047e4378ca519cb4da217a269269b0b43ad38178ce1e46f21d
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
 DIST mysql-5.5.39.tar.gz 21713567 SHA256 1893a00b034da6ff4159b81348388dc65eca6c3ae12962bd446e9b3d105b4862 SHA512 1da29663720d94cc5cf5d76f7bc1534c638ed66f78533f9eac167575acd772498d409b931a9dffd7f863a0c2e4659fc4d4687ae363ca427ad49b8558c8747aa8 WHIRLPOOL be884564757bfe579cdd39161732d42abe041102162d2edd6c441214df2f3928a3e58d8e9acd7d06b96cb59be0fa28e05d8ae7cab0a6de4779ae9c79912f4d59
 DIST mysql-5.6.20.tar.gz 32979820 SHA256 4fc33b1a3ddb75fbc1cc30d0aba1af3d94c4fbe608048d46e34f39a8281a064d SHA512 c4bcc2a209616a38c04a4679cc7a76b354f0d7d3dda860b82b9cdb4746f897aa5c8204a440e1c65f55d81b2ac526b205dd0ba28786ba21778cc068efd71403ac WHIRLPOOL 09cd264b098401cdde9e57fd1dcf90387cb6e5f24b874c220914c6afcc4f03bccec9cb4e83a9694e740ac0ea4e5cf37297fab60fdf4d6342df71b7e4f75590f8
-DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
-DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551
-DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
 DIST mysql-extras-20130626-0127Z.tar.bz2 1476503 SHA256 a3c791b7b95fe170c4071feed11699146fc8f9de6a9f2ffa67214c2e50644b4f SHA512 4ee19cb5960ba24f2db16e7c5b647d1b7bb9fadbc73bbd8125bbac7e926c569a9a585a4d1d92b851ea6653d9c15eeb00f1592880f104520dc040e5af19943ac7 WHIRLPOOL 739f5762fa24b0feb40848ddb83f2ed95fb650933920b3d9e55c5e90f907d4ac74dfb00e4b9189cda8f9af4317478f3132daf789d7c91196827f645dd3e37d61
 DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512 7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e WHIRLPOOL 371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
 DIST mysql-extras-20140801-1950Z.tar.bz2 1494288 SHA256 a656486a7383d656ed33e279f41bb4384feba082cad3af48376ce9e1f395fe0b SHA512 b2c29c3d7c1ddacfa170125c9df0aaf65eac9f6112244b1deea97a46a3a2f2bd3eb069808e7b2ee3261d609b32046363830ba4ebcc7e74f449189a91145a6f9c WHIRLPOOL 41befc03a7382516849ecaecc1d02be7d00c47be489b97ce68c320c3aa8979c8f941525efe230d97ad2d1a85936a1e4d6c93d96a3f45930991a938e5f0fdab87
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
-EBUILD mysql-4.0.27-r1.ebuild 1105 SHA256 eed1ba3bb284d74483c521b410cb2f165db846eb6f6f0f7bb5218dd8e7cad2ce SHA512 2175d66db93d8745d410ca5ec0fbc803dce648f80e8f57d5d1b9ba78ee1fbe5dc5fb4f150e49ffe50f1215f7d0e6c4e3dac515097dac0e659413e3cc39276d89 WHIRLPOOL b932b28dd6dbe96016f86b4e3f6fbbc5197e97fc5a8bb934bbaed2c7a6f418b7970f76b1682b6c1d97e6133a2d179d2062b2f5b911d4caade763ae188f11556e
-EBUILD mysql-4.1.22-r1.ebuild 1343 SHA256 237e821bc7b47d259635f42255e80bc1e6f411341ada6b9014b6443d8ef52f08 SHA512 f66d21e221e9dcc2f7558f360b6d44bbe72c547dec3c1b164e7313e779268c5f11eb51807d6707298dc2547df4dc455174ceb21fe4f6bf6e6f02b377c62940cb WHIRLPOOL 6fdaa7a771dbcf52b2e39470c580f6c887e30a9df01e4f550cdd665b1762095dd37d52ece783c6b25511a57cdb555926399a25cc333a0a53e5ad1f0b162d4afb
-EBUILD mysql-5.0.96.ebuild 7175 SHA256 307fd3e2426b42d05b6793c9f0b90be12387fd5434abcc9b8caca84adcf275a0 SHA512 e7d71bb91dd953ec013d5b10379f97fe649c0a4c678ddead7120660349b8dfb8b7f2ebedb45ca17ec6b522ca5c8ece34cd8e0ec6a66fdb8faf076e5074e1e3cd WHIRLPOOL c9a06e4d0d52af5cbdc2cc56e1003564de4281ada0b951f7c9d2f93b64cecba1a6c48405308ef4b0a646099f0bc3ad3e10ba86a38e7d84519ef223a8927352c1
 EBUILD mysql-5.1.70.ebuild 8874 SHA256 abd74f2cf58e5c8d4544c2dee89c8b30174b038aba91f3b45138cc299d8013b7 SHA512 303ee2ff791852dcab8d72a73e06b7f5e1fe0bd48b6e71730013c601eba412cebacb09cc76d06075f4e63b0eae80947a2bf9eb42da24d412b5c66d69d9aeb4c4 WHIRLPOOL 20d542a938589b3fefc738e64f5d9f9596faa1f1dad0175b144adc096d7354390eb6c4aed873dec9687e08483cba47fac56c786829c2ffbbb22e04ecea2b867a
 EBUILD mysql-5.1.73-r1.ebuild 8892 SHA256 a3f57db069a9d7eab793820178c0367ddeb912b604560db3a55553c9787cf230 SHA512 ebf6f4f196362b7623c6ee9b336e23ca94a67a32da4f389e4f49c9f44c1dc2b1c6e482de90e3afe1cfbf1edbcfbba02331ea4506cc5bc66fc2fed2624b9defd8 WHIRLPOOL c917e39875832571fdcdd5c37c58548c4bc25434b313b0dcbe569d0551b265ec3d2cf1811fbcbbac62213faa1de4855284769a2add53dc889e6998e76464e736
 EBUILD mysql-5.5.39.ebuild 4625 SHA256 8b9f8261588ebb7ae0ca1178619866ec0d2a2e605d24189635486902ef69ddb5 SHA512 ac88bf2c3838bdaaf600110af3d2a863417074ed7833853a960ee30925245b3914e89f1857bb9cd00c998224085a1e4b426229a12a13bbe32be9f6aaaea1e075 WHIRLPOOL 098c624f7d816eb3a1463c5728510d045f9ac8b164990a31e46c2c16bd4b66afeaec6b0a3125f3cf25cd37af1b8ba16abd7c3f3b218aa96a07f957526ec20d2a
 EBUILD mysql-5.6.20.ebuild 4870 SHA256 3f648054cc738d223de0049f263040d9dd8fa0c57dba91059897cf8320686543 SHA512 841dde413652326c55c32581b4b94703f598e259e148b50767f2bff3c317650d757e4377c9e051e1ed324df01b6360916df9a84e1d39dd57a2d4e060baed55e1 WHIRLPOOL 88274cfd5530cc204304715e71b58503895655b6b201028d517cb89341a78fb3624c1b30cbf5db73ca18126ce1089db654c1950214416e4a397d34d3fabd41e6
-MISC ChangeLog 18244 SHA256 0f9ea98d58a4ae6fc86ceeb78a8e9159dd51d0257e751b32bd8f2cb8d6d2a2b6 SHA512 2d3acce610cb234d894b6674a541d69854a1b91502f957189c88fb14c02adb6929adf813d74697afdac990b5a136a29bb24465f8986f3f62b7b53995c624cef4 WHIRLPOOL 4089a06b5034e26e17eda1f682be7aca33a601fbd700e6ba4640fc107ed640e9ae1d8b390caf1b9411a46ef24ae4c8743bef997d7f267d42f012163c2e09c977
+MISC ChangeLog 18510 SHA256 46aa80fb702e94ee912c70444f5e7e7089f2aa00f3a882b87ad3d9a849f2d007 SHA512 d2a85b8b4363c8fa46032ad8ffda128fff5a196ef30a24a3f264996307b386753464eb7fa3ab0b31c5966e90913d89eb94e1c6c4d5be7b8c058f8d49bfe03f66 WHIRLPOOL b0f2ca1a7c999c083e6cc29173b45ef296909853cf60431634fdc55dea79a82a88b8b23580b5b906fe47f9c86eee074c64f2cf994c06ca14aa7324e2ea6d321a
 MISC ChangeLog-2010 108404 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd SHA512 5f54b7c2e25d27680a9313da2450851118e34a57202d9f36f59da52834ca3b587701d93868d71bf684ddc253d49f87837c8d7e2d442f2955dfde8a701150fbe5 WHIRLPOOL 55f758942e3012aa0ae7d529c2f8b6e0d8f4d7cbde09039f16cd05f0a58fc4e3e09ccd50e366effdcaab4641300eb0f494ddbe3a35a645ced8a9d747d80e9821
-MISC metadata.xml 1512 SHA256 2aa7aa3c625242463dcc8fbd52f0c33558507f375dd64c80412372e5d8456b70 SHA512 b9a09711b821ce7a962dcb23a4e249bfa83fd5605a45bc9416e4721a643e8fc740df4e22a7aba8d7245612361f6f3d779647f32c9469662fc2a2598030a2499e WHIRLPOOL 9d553da0a5501afbb99566ba46664f50e871e90a6ae839626f2aea9b7f28e9eadd1b8360483bed9a397082f59518009d1f70fef128399370c4bb1d6e85c2b5dd
+MISC metadata.xml 1440 SHA256 57b1430c744bb21c4f99b885b92c1ca27efec6757e06f51bc043e25737a226b5 SHA512 0a8f4cc67b3dee66b95c16edcb0c1dd70b95b199f7cd46ba4b509a9f52dbb7d45ed2da4280ed8ba93d96521f66fc80d486de91f0a23ff3e0baee48795e5151fa WHIRLPOOL d747dccd7d8ae91fd60c5c074a3d1f0ab64a96f8ec09658a36e42546d17cbd9644de45527ed1bc6babeb7329c666ecc01cea7283dc4640268ed5cd2ca045172b
diff --git a/dev-db/mysql/files/my.cnf b/dev-db/mysql/files/my.cnf
deleted file mode 100644
index 4e7d0f6d2b98..000000000000
--- a/dev-db/mysql/files/my.cnf
+++ /dev/null
@@ -1,48 +0,0 @@
-# /etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf,v 1.5 2008/11/14 01:49:37 robbat2 Exp $
-#
-# This file can be simultaneously placed in three places:
-# 1. /etc/mysql/my.cnf to set global options.
-# 2. /var/lib/mysql/my.cnf to set server-specific options.
-# 3. ~/.my.cnf to set user-specific options.
-#
-# One can use all long options that the program supports.
-# Run the program with --help to get a list of them.
-#
-# The following values assume you have at least 32M RAM!
-
-[client]
-#password	= my_password
-port		= 3306
-socket		= /var/run/mysqld/mysqld.sock
-
-[safe_mysqld]
-err-log		= /var/log/mysql/mysql.err
-
-[mysqld]
-#skip-networking
-skip-innodb
-innodb_file_per_table
-user		= mysql
-pid-file	= /var/run/mysqld/mysqld.pid
-socket		= /var/run/mysqld/mysqld.sock
-port		= 3306
-log		= /var/log/mysql/mysql.log
-basedir		= /usr
-datadir		= /var/lib/mysql
-tmpdir		= /tmp
-language	= /usr/share/mysql/english
-skip-locking
-set-variable	= key_buffer=16M
-set-variable	= max_allowed_packet=1M
-set-variable	= thread_stack=128K
-
-[mysqldump]
-quick
-set-variable	= max_allowed_packet=1M
-
-[mysql]
-#no-auto-rehash	# faster start of mysql but no tab completition
-
-[isamchk]
-set-variable	= key_buffer=16M
diff --git a/dev-db/mysql/files/my.cnf-4.0 b/dev-db/mysql/files/my.cnf-4.0
deleted file mode 100644
index abc86905298e..000000000000
--- a/dev-db/mysql/files/my.cnf-4.0
+++ /dev/null
@@ -1,113 +0,0 @@
-# /etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.0,v 1.3 2012/02/02 03:12:02 robbat2 Exp $
-#
-# This file can be simultaneously placed in three places:
-# 1. /etc/mysql/my.cnf to set global options.
-# 2. /var/lib/mysql/my.cnf to set server-specific options.
-# 3. ~/.my.cnf to set user-specific options.
-#
-# One can use all long options that the program supports.
-# Run the program with --help to get a list of them.
-#
-# The following values assume you have at least 64M RAM!
-
-[client]
-#password	= my_password
-port		= 3306
-socket		= /var/run/mysqld/mysqld.sock
-
-[safe_mysqld]
-err-log		= /var/log/mysql/mysql.err
-
-[mysqld]
-user		= mysql
-pid-file	= /var/run/mysqld/mysqld.pid
-socket		= /var/run/mysqld/mysqld.sock
-log-error	= /var/log/mysql/mysqld.err
-# If set, mysql logs all queries (general query log). This will be deprecated in
-# MySQL 5.0. This logs all queries, even error queries and is slow.
-# log          = /var/log/mysql/mysql.log
-#
-# If you really need logging, you'd rather use binary logging. Especially when doing
-# replication. Read file:/usr/share/doc/mysql-*/manual.html.gz#Replication for info.
-# You can use PURGE MASTER LOGS TO '$hostname-bin.010' to get rid of old logs
-# from $hostname-bin.01 up to $hostname-bin.09 while the slave server is
-# running.
-# Before doing that, check which logfile slave curently uses by running
-# mysql> SHOW SLAVE STATUS
-# To list logfiles on master do:
-# mysql> SHOW MASTER LOGS
-# Then use PURGE for those not needed anymore only! Never remove the files
-# manually!
-#
-# Also consult RESET MASTER and RESET SLAVE commands before doing any changes
-# mysql> RESET MASTER - Deletes all binary logs listed in the index
-#                       file, resetting the binlog index file to be empty.
-# mysql> RESET SLAVE - Makes the slave forget its replication position in
-#                      the master logs.
-# mysql> SET SQL_LOG_BIN=0  - this turns off logging (execute on MASTER only)
-# mysql> SET SQL_LOG_BIN=1  - this turns on logging (execute on MASTER only)
-#
-# log-bin
-# set-variable  = binlog-do-db=non_existant
-# set-variable  = binlog-ignore-db=database_name
-#
-# server-id has to unique for each master or slave in your network,
-# lets use the last number from IP address
-# server-id	= 207
-basedir		= /usr
-datadir		= /var/lib/mysql
-tmpdir		= /tmp
-language	= /usr/share/mysql/english
-skip-locking
-set-variable	= key_buffer=16M
-set-variable	= max_allowed_packet=1M
-set-variable	= thread_stack=128K
-# be secure by default!
-bind-address    = 127.0.0.1
-port			= 3306
-# this can make it even more secure:
-#skip-networking
-#
-# the following is the InnoDB configuration
-# if you wish to disable innodb instead
-# uncomment just the next line
-#skip-innodb
-#
-# the rest of the innodb config follows:
-# don't eat too much memory, we're trying to be safe on 64Mb boxes
-# you might want to bump this up a bit on boxes with more RAM
-set-variable = innodb_buffer_pool_size=32M
-# this is the default, increase it if you have lots of tables
-set-variable = innodb_additional_mem_pool_size=1M
-#
-# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-(
-# and upstream wants things to be under /var/lib/mysql/, so that's the route
-# we have to take for the moment
-innodb_data_home_dir = /var/lib/mysql/
-innodb_log_arch_dir = /var/lib/mysql/
-innodb_log_group_home_dir = /var/lib/mysql/
-# you may wish to change this size to be more suitable for your system
-# the max is there to avoid run-away growth on your machine
-innodb_data_file_path = ibdata1:10M:autoextend:max:128M
-# we keep this at around 25% of of innodb_buffer_pool_size
-# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
-set-variable = innodb_log_file_size=8M
-# this is the default, increase it if you have very large transactions going on
-set-variable = innodb_log_buffer_size=1M
-# this is the default and won't hurt you
-# you shouldn't need to tweak it
-set-variable = innodb_log_files_in_group=2
-# see the innodb config docs, the other options are not always safe
-innodb_flush_log_at_trx_commit = 1
-loose-innodb_file_per_table=1
-
-[mysqldump]
-quick
-set-variable	= max_allowed_packet=16M
-
-[mysql]
-#no-auto-rehash	# faster start of mysql but no tab completion
-
-[isamchk]
-set-variable	= key_buffer=16M
diff --git a/dev-db/mysql/files/my.cnf-4.1 b/dev-db/mysql/files/my.cnf-4.1
deleted file mode 100644
index 458a58a73969..000000000000
--- a/dev-db/mysql/files/my.cnf-4.1
+++ /dev/null
@@ -1,147 +0,0 @@
-# /etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.1,v 1.4 2008/11/14 02:16:25 robbat2 Exp $
-
-# The following options will be passed to all MySQL clients
-[client]
-#password					= your_password
-port						= 3306
-socket						= /var/run/mysqld/mysqld.sock
-
-[mysql]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqladmin]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlcheck]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqldump]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlimport]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlshow]
-character-sets-dir=/usr/share/mysql/charsets
-default-character-set=utf8
-
-[myisamchk]
-character-sets-dir=/usr/share/mysql/charsets
-
-[myisampack]
-character-sets-dir=/usr/share/mysql/charsets
-
-# use [safe_mysqld] with mysql-3
-[mysqld_safe]
-err-log						= /var/log/mysql/mysql.err
-
-# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
-[mysqld]
-character-set-server		= utf8
-default-character-set		= utf8
-user 						= mysql
-port 						= 3306
-socket 						= /var/run/mysqld/mysqld.sock
-pid-file 					= /var/run/mysqld/mysqld.pid
-log-error 					= /var/log/mysql/mysqld.err
-basedir 					= /usr
-datadir 					= @DATADIR@
-skip-locking
-key_buffer 					= 16M
-max_allowed_packet 			= 1M
-table_cache 				= 64
-sort_buffer_size 			= 512K
-net_buffer_length 			= 8K
-read_buffer_size 			= 256K
-read_rnd_buffer_size 		= 512K
-myisam_sort_buffer_size 	= 8M
-language 					= /usr/share/mysql/english
-
-# security:
-# using "localhost" in connects uses sockets by default
-# skip-networking
-bind-address				= 127.0.0.1
-
-log-bin
-server-id 					= 1
-
-# point the following paths to different dedicated disks
-tmpdir 						= /tmp/
-#log-update 				= /path-to-dedicated-directory/hostname
-
-# you need the debug USE flag enabled to use the following directives,
-# if needed, uncomment them, start the server and issue 
-# #tail -f /tmp/mysqld.sql /tmp/mysqld.trace
-# this will show you *exactly* what's happening in your server ;)
-
-#log						= /tmp/mysqld.sql
-#gdb
-#debug						= d:t:i:o,/tmp/mysqld.trace
-#one-thread
-
-# uncomment the following directives if you are using BDB tables
-#bdb_cache_size				= 4M
-#bdb_max_lock				= 10000
-
-# the following is the InnoDB configuration
-# if you wish to disable innodb instead
-# uncomment just the next line
-#skip-innodb
-#
-# the rest of the innodb config follows:
-# don't eat too much memory, we're trying to be safe on 64Mb boxes
-# you might want to bump this up a bit on boxes with more RAM
-innodb_buffer_pool_size = 16M
-# this is the default, increase it if you have lots of tables
-innodb_additional_mem_pool_size = 2M
-#
-# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-(
-# and upstream wants things to be under /var/lib/mysql/, so that's the route
-# we have to take for the moment
-#innodb_data_home_dir		= /var/lib/mysql/
-#innodb_log_arch_dir		= /var/lib/mysql/
-#innodb_log_group_home_dir	= /var/lib/mysql/
-# you may wish to change this size to be more suitable for your system
-# the max is there to avoid run-away growth on your machine
-innodb_data_file_path = ibdata1:10M:autoextend:max:128M
-# we keep this at around 25% of of innodb_buffer_pool_size
-# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
-innodb_log_file_size = 5M
-# this is the default, increase it if you have very large transactions going on
-innodb_log_buffer_size = 8M
-# this is the default and won't hurt you
-# you shouldn't need to tweak it
-set-variable = innodb_log_files_in_group=2
-# see the innodb config docs, the other options are not always safe
-innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
-innodb_file_per_table
-
-[mysqldump]
-quick
-max_allowed_packet 			= 16M
-
-[mysql]
-# uncomment the next directive if you are not familiar with SQL
-#safe-updates
-
-[isamchk]
-key_buffer 					= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[myisamchk]
-key_buffer 					= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[mysqlhotcopy]
-interactive-timeout
diff --git a/dev-db/mysql/files/mysql.init b/dev-db/mysql/files/mysql.init
deleted file mode 100644
index 16ea7bc0bf3e..000000000000
--- a/dev-db/mysql/files/mysql.init
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql.init,v 1.7 2004/07/14 21:41:15 agriffis Exp $
-
-depend() {
-	need net
-	use dns
-}
-
-checkconfig() {
-	if [ ! -f /etc/mysql/my.cnf ] ; then
-		eerror "No /etc/mysql/my.cnf file exists!"
-	fi
-
-    dir=`my_print_defaults mysqld | grep -- --datadir | sed -e "s|^.*=\(.*\)|\1|"`
-
-	if [ ! -d $dir/mysql ] ; then
-		eerror "You dont appear to have the mysql database installed yet."
-		eerror "Please run /usr/bin/mysql_install_db to have this done..."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting mysqld"
-	/usr/bin/safe_mysqld >/dev/null 2>&1 &
-	eend $?
-}
-
-stop () {
-	ebegin "Stopping mysqld"
-	start-stop-daemon --stop --quiet \
-		--pidfile=/var/run/mysqld/mysqld.pid --retry 20
-	eend $?
-}
diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
index 9ecd92876ef0..f34987e7a56e 100644
--- a/dev-db/mysql/metadata.xml
+++ b/dev-db/mysql/metadata.xml
@@ -19,7 +19,6 @@ dev-db/mariadb
   <flag name='minimal'>Install client programs only, no server</flag>
   <flag name='pbxt'>Add experimental support for PBXT storage engine</flag>
   <flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
-  <flag name='raid'>Deprecated option, removed in the 5.0 series</flag>
   <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
   <flag name='test'>Install upstream testsuites for end use.</flag>
   <flag name='xtradb'>Add experimental support for Percona's InnoDB replacement: XtraDB</flag>
diff --git a/dev-db/mysql/mysql-4.0.27-r1.ebuild b/dev-db/mysql/mysql-4.0.27-r1.ebuild
deleted file mode 100644
index 4e000a03859e..000000000000
--- a/dev-db/mysql/mysql-4.0.27-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2008 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-r1.ebuild,v 1.6 2008/12/14 20:17:13 klausman Exp $
-
-MY_EXTRAS_VER="20070105"
-SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
-
-inherit mysql
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	make check || die "make check failed"
-	if ! use "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-r1.ebuild b/dev-db/mysql/mysql-4.1.22-r1.ebuild
deleted file mode 100644
index 4371565b6d92..000000000000
--- a/dev-db/mysql/mysql-4.1.22-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 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-r1.ebuild,v 1.8 2011/07/08 10:05:34 ssuominen Exp $
-
-MY_EXTRAS_VER="20090228-2228Z"
-SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
-
-inherit mysql
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	make check || die "make check failed"
-	if ! use "minimal" ; then
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus
-		local testopts="--force"
-
-		# sandbox makes ndbd zombie
-		has "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-5.0.96.ebuild b/dev-db/mysql/mysql-5.0.96.ebuild
deleted file mode 100644
index f22bc535435c..000000000000
--- a/dev-db/mysql/mysql-5.0.96.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.96.ebuild,v 1.4 2013/01/20 01:49:23 robbat2 Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20120401-2131Z"
-
-inherit toolchain-funcs mysql
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND=""
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	emake check || die "make check failed"
-	if ! use "minimal" ; then
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect ; do \
-					mysql_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.0 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		case ${PV} in
-			5.0.*)
-			for t in main.mysql_client_test main.mysql_comments main.mysql_upgrade; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		case $PV in
-			5.0.91)
-			for t in archive archive_gis archive-big \
-				federated_archive mysqldump-max \
-				; do
-					mysql_disable_test $t "Broken in $PV"
-				done
-			;;
-			5.0.96)
-				for t in \
-					client_xml compress connect ctype_recoding drop \
-					federated grant information_schema \
-					information_schema_db innodb lowercase_table \
-					lowercase_utf8 mysql-bug41486 mysql-bug45236 mysql \
-					mysqlcheck mysqldump-max mysqldump mysqldump_restore \
-					mysqlshow ps ps_1general rename rpl000009 rpl_ddl \
-					rpl_delete_all rpl_drop_db rpl_dual_pos_advance \
-					rpl_error_ignored_table rpl_filter_tables_not_exist \
-					rpl_replicate_do rpl_trigger_not_windows select \
-					show_check sp system_mysql_db system_mysql_db_fix30020 \
-					system_mysql_db_fix40123 view \
-				; do
-					mysql_disable_test $t "Broken in $PV"
-				done
-			;;
-		esac
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-		failures=""
-		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-	else
-		einfo "Skipping server tests due to minimal build."
-	fi
-}