[dev-db/mysql] Bumped EAPI to 4 on ebuilds inheriting the mysql-v2 eclass as I'm going to push the overlay eclasses with prefix support.

Dropped old versions.

Package-Manager: portage-2.2.0_alpha83/cvs/Linux x86_64

11 files changed, 43 insertions, 585 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index f617a9b448c4..f8f03c9c2ee3 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/mysql
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.591 2012/01/06 19:27:22 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.592 2012/01/06 21:28:19 jmbsvicetto Exp $
+
+  06 Jan 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  -mysql-5.0.54.ebuild, -mysql-5.0.91.ebuild, mysql-5.1.56-r1.ebuild,
+  mysql-5.1.57.ebuild, mysql-5.1.58-r1.ebuild, mysql-5.1.59.ebuild,
+  -mysql-5.5.14.ebuild, -mysql-5.5.16.ebuild, mysql-5.5.19.ebuild:
+  [dev-db/mysql] Bumped EAPI to 4 on ebuilds inheriting the mysql-v2 eclass as
+  I'm going to push the overlay eclasses with prefix support.
+  Dropped old versions.
 
   06 Jan 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   mysql-3.23.58-r1.ebuild:
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 2531328d4d8d..6fdedb9bca3d 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -9,8 +9,6 @@ AUX mysql.init 886 RMD160 26b8aa45af3f930db01f0db731865b9293626fb1 SHA1 d7d99a3f
 DIST mysql-3.23.58.tar.gz 12039843 RMD160 b7d436ac7aaa9238e724bf3c62c5f837bef676b6 SHA1 f3383e41e8926c040a295173881414a1e96e0266 SHA256 8dcc6a613820701221b787419c32c1c717562194cfd296187da0e87454252acc
 DIST mysql-4.0.27.tar.gz 11152643 RMD160 00cf895eab192e3e0ab526587ccab3e81c6c9070 SHA1 9cce3b92c47d17bf58ec6cdefebfdf953b5ce2c4 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f
 DIST mysql-4.1.22.tar.gz 17761101 RMD160 bfcf5058e4247cf4d7d1550ea54c64ebc8bc615e SHA1 857e942cc3207caf56e2aa48961fc1ed66d932e6 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9
-DIST mysql-5.0.54.tar.gz 27397332 RMD160 50898b7339cad1339cfdcf01e75c8e851d837d80 SHA1 8b540ccce64a1c4cf470d4f78c8d811ebad8da1d SHA256 d3431038e594c6e6b480d2d7a24bca7166bb5e593c9d807140257ed06b105a66
-DIST mysql-5.0.91.tar.gz 22340514 RMD160 3aaa638172f6916d3698c5421b24a01647f7e9db SHA1 14a79138a1296ce6ebb681fceba622d870feba3e SHA256 4669abf059bcf97c2fc1f3ce678e83f738ffe2299bd893e1a3d31afbc682c754
 DIST mysql-5.0.92.tar.gz 22440590 RMD160 24a373a1b124acf39d0c0726e5cb6f47dc1bef08 SHA1 10fffc7672a469af4a7fd980922b04d7ba0143ba SHA256 223530c4cd6d45e2906e6c7d33615c5824816dfdb772d104f4165a483ea78a55
 DIST mysql-5.1.51.tar.gz 23830456 RMD160 033fc88fba226caf2ec6a34ac3875deab3006f42 SHA1 45aa05a6a70d67b379272ec19ad3023230c94079 SHA256 39d962222f068c426d4616950f0e8451d947a132f0c42af17a2fc8b3b5a42882
 DIST mysql-5.1.52.tar.gz 23841760 RMD160 5809c7a5932a014fe412ddc5b9f15632c7367c27 SHA1 5ed4a3c12662b0329df870f4dcebea6903e94265 SHA256 b1c458b68aaf7b7745453c27b615ffc59cd213453ee78bc6b477b0f40df83917
@@ -19,14 +17,10 @@ DIST mysql-5.1.56.tar.gz 24795624 RMD160 c2ff6eb06d0797d4b56630b783d4ad2d1add142
 DIST mysql-5.1.57.tar.gz 23660514 RMD160 9ca7f79d14525fef2c1badf8410fecd238ee283e SHA1 fcfe037ee6cfd53fe336ef12854e79481bdc6681 SHA256 7944fa56476f44173af4c91ad685a9da5e9d5fa9dea69dafb4b9919df3f3667d
 DIST mysql-5.1.58.tar.gz 24333490 RMD160 199729c701c764cd22584c2b952230c07d0f31a6 SHA1 cfd70bee07ad99576eecde01785b7b2a74ec87ab SHA256 3c69562399655fc62d1424437e6ef59ef7c1ed225f940f81558f549b803f3fd7
 DIST mysql-5.1.59.tar.gz 24325443 RMD160 bbc54a2fc0eb3657f297ac097e9374c98e90442e SHA1 1d425a421edc94fba616f1986a16bdc9d0b5c193 SHA256 f87b99b73c0d936ed892326ebd4c90b1d5c7d5d2ac8832fc62f538db99fb04f7
-DIST mysql-5.5.14.tar.gz 23772997 RMD160 1c84fc3967691e9eedd1b90df780a9d738a709c4 SHA1 3b17e20be4e8bcc0f94392fb444f4a09f80de2e4 SHA256 c7acab9ccb1e2598d079fe8b832281343c00b5b8032fcece37ef551b61980738
-DIST mysql-5.5.16.tar.gz 23816508 RMD160 c1581d56b3bf254077c709375e7ae48a21748be1 SHA1 1a3372f9179bfc21cba0005c339a72f8e1458483 SHA256 38a88d5f3a4e0ab1c6722662a2c858c63fd98f0925691400282cb23f1ea29b70
 DIST mysql-5.5.19.tar.gz 24296942 RMD160 cae5bbea6d527ffb899eeeced8fc411375c285ae SHA1 f6a3b5fb5a10f8110fd85463e1a25fb314e60c24 SHA256 7f3643b378101de19205d133e6fb5ce03d8394e183f4e9ac2b0de59ba57fc34f
 DIST mysql-extras-20061210.tar.bz2 51115 RMD160 52355e608d5048c91b7960aa5be0c030ecb0e5d8 SHA1 c9d035ac73d29fe2d1274760ca70b8c6b882fec6 SHA256 46505a8b54ae7cafdc610465edfdfde1cd74f101071f71cf1f5c1c02e92790eb
 DIST mysql-extras-20070105.tar.bz2 50005 RMD160 abf1f8ebab8ecdfdb5ebe9ca55076f39ab492acb SHA1 7f4dbc3d6c20fe953bf6e936a58343a229398ca0 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172
-DIST mysql-extras-20080124.tar.bz2 106526 RMD160 8f9f556308c96c4cd5cffd0506c99ea59e7c25c2 SHA1 574f5dbf4a8bb53d352cb2fbe391ad5c484eb932 SHA256 c4b33dd391834252d20d4b083ac4bd6999253a8f20d894dd93b0795c6b318829
 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 RMD160 d71ed448d9fbe61ecc9e4113bd0a7721e8321acb SHA1 9fd9370193e7038067e11cc8a26bfe4013eb6bac SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb
-DIST mysql-extras-20100809-0452Z.tar.bz2 1228458 RMD160 baedaa994165ec17cfc31357d91212c8350be310 SHA1 e464adc36d96b76a5c6ac74856060d05ff0bba3d SHA256 2ba39a87dd5ea2c819193d1b25c6e2abbd4506d63c1e8b845846b7b33d64e52b
 DIST mysql-extras-20101006-0004Z.tar.bz2 1251792 RMD160 ee333704688e4e9f07f5e7fb68961d3ffaff0755 SHA1 c1633295abb7f3d2ff463938f85e1bc8ed708b4f SHA256 a42c4988a25113bef5cc727fb24c994502f4d02469246ff839f8ea2a08c07bb7
 DIST mysql-extras-20101104-1842Z.tar.bz2 1255196 RMD160 712cc8d8c4f84dc5419e0c69cee1ebd5e14c11d9 SHA1 9080b25248bc7a17b51b049c35d87a220db4dca2 SHA256 64a1f9c29b955eec52f3b45b2cd50bbcc286982290c36c5eb87fe9b160be6cc2
 DIST mysql-extras-20101128-2122Z.tar.bz2 1237793 RMD160 43b536c060d3a1bafa993ec4c55c1b13a78926cc SHA1 409b47603948bceea3531414af42b74915e698b8 SHA256 a804e4418fff742a72fc4cc8c83f1107a86f95b2fafde96002436905a9b5f729
@@ -38,38 +32,34 @@ DIST percona-xtradb-1.0.6-10.tar.gz 1676716 RMD160 772947fe67725c55751f3ec349711
 EBUILD mysql-3.23.58-r1.ebuild 7477 RMD160 7a869c479e27c2cd2c32c83aeeb7147f40dc4e71 SHA1 12f75a6722eb4499674499526466e9d0cc3e07ce SHA256 752feee693c9b398c82ab8d0a62a840cdd10aafe469c8648e53b772d725945b9
 EBUILD mysql-4.0.27-r1.ebuild 1105 RMD160 55f3ea683ea8c57bc2197a64b81b50a0933a57b2 SHA1 0adb182c9cb4640e6f3a1e6b6f501190a3c46067 SHA256 eed1ba3bb284d74483c521b410cb2f165db846eb6f6f0f7bb5218dd8e7cad2ce
 EBUILD mysql-4.1.22-r1.ebuild 1343 RMD160 db6bd89ee2c7baeaac1e41b2f05f592b626c373c SHA1 49bd4a7125578b9fefa9c5cb1a88b6e4df6b99a5 SHA256 237e821bc7b47d259635f42255e80bc1e6f411341ada6b9014b6443d8ef52f08
-EBUILD mysql-5.0.54.ebuild 3264 RMD160 c028a3ed0d6e9c2c282e25b7045e7dd5cd3492a1 SHA1 ff54ac6a367b6481c2aaeff81f26d107edc457fa SHA256 d491a85c5d57fc57f3601be8ce4f268dfd19098ff208d2db03acc436d18a04a0
-EBUILD mysql-5.0.91.ebuild 6583 RMD160 2f73169480c9e735ebefd11468e69856ef489a95 SHA1 e1d00b2dbd14fc7cd384c75fa2869c8699c62363 SHA256 c22bed980a05cb4687634d8fb107dffe0f73e49a3b21e76fb3cf3c2f0f4f7769
 EBUILD mysql-5.0.92.ebuild 6591 RMD160 cd6d8110d49fce89edaa19e3d241c6ce40350178 SHA1 f3af3164e3735a0892ff1dd28f0198749dafa27b SHA256 d23bfd838ee9a57240b42db20cf6f3fe1afb36b3aac9714a5d02fe1000e23459
 EBUILD mysql-5.1.51.ebuild 8597 RMD160 2f296a6723fb071c07fe53fc443a737fc1f65179 SHA1 72224bc36f7aac2169d5dba5bd1b0353d0651534 SHA256 8506c0c1d7303e06914f65a48d3e7c92cbdc2b1b412e18225f92daf1e72f9583
 EBUILD mysql-5.1.52-r1.ebuild 8637 RMD160 0c1e370d95cac3fcb78d348ea360e84ff0690f56 SHA1 361f05208aec3a939c575afd0043ead82c17b38c SHA256 cbc1ed8e1f2754eb9864383d37c41158e9e12fede7cd642fc46d5babf76ba7ff
 EBUILD mysql-5.1.52.ebuild 8611 RMD160 3583ee9347e2cd9b872c544bd984f5224206fdd5 SHA1 fabff78bf53ed9c308f3caeb4e5600ba1f92e732 SHA256 7c22bdd4829f318d5e6a6b6a220ddeb2ee8f6fee0cf91932b65394b1f7cbfd3d
 EBUILD mysql-5.1.53.ebuild 8645 RMD160 5106b1271e7564d7cd234aaa09b958d206e4e50f SHA1 317ff6474db53a84022138869e775ed74c5bd14e SHA256 1b85afede53e6853b7b2bad6b2c2c1bf69e736bb38d6b3ca10fbdf53d0fb3be3
-EBUILD mysql-5.1.56-r1.ebuild 8668 RMD160 634a23c158b9a4a0edab5cb3de1f0b0bf86cb7d8 SHA1 5ab3e7c33af2c0e06ea437e749ef8c30fd1fada6 SHA256 05f5f6103f1a99c1dfa0e5ca6e9cfb7c647897595925175dc047886b834a68ba
+EBUILD mysql-5.1.56-r1.ebuild 8672 RMD160 faf80a203fe7452f644f6fdefb91beba63e26d01 SHA1 ec74460fbbf741aab678e26c40d3833fa50c02ff SHA256 d8e6a65007b4c9432d227dc9440db526932294df953f760cc719922596299706
 EBUILD mysql-5.1.56.ebuild 8659 RMD160 afec6db5737ec2049241488e593cd681d42ca493 SHA1 b85f9e79befbf722e5d017b15c342ecc746744fa SHA256 badf220bea95fe69591b5fff807eeb9cdb49f4d0009567a609aa900cbbf49b6a
-EBUILD mysql-5.1.57.ebuild 8715 RMD160 f086ab37e0230cc1187d06073a261664b4b5e38e SHA1 558b14a34400841bec569aeab1492331f2994382 SHA256 4307074e0ae888e350f0496dd874a6e7c370caf8308ab596b6bbb772cd4533d0
-EBUILD mysql-5.1.58-r1.ebuild 8725 RMD160 a2a8099856f4a039bcda808057f331fbbbdd8f48 SHA1 6f87b3f02ed1bacbbbd8ad5e670d9f3ae0975fa8 SHA256 cac74d6f6f448afa1ef6e2bb4bf93b42584c9a6feb63c48adff90950feb96379
-EBUILD mysql-5.1.59.ebuild 8731 RMD160 eb3a43286f073f80bb9a1db63baaf6a2a349e0a9 SHA1 0dc3ce64221aac70a10f8d80b16c63d44cf7491b SHA256 362ecff5c4a0bb5aef13b5e6197f65930decd355ba95d47489526867fd72f8f4
-EBUILD mysql-5.5.14.ebuild 3916 RMD160 c477eb7200fa7444aaaaa48699477a858d3de95f SHA1 32aeee60204ab8ed9b436144d88fc5f4da847ea2 SHA256 5382baf2d872a1251cf052744c473708026145ea43c4e5f5de8273cb726ae491
-EBUILD mysql-5.5.16.ebuild 3916 RMD160 4f83222913fc36d043e83dc757021efff23c54f8 SHA1 1eb821a41f4ba72d4ecdb79faae61a67462a8218 SHA256 cf7560b2ac3fbb2e59a581b01bd222931c0884774538ac1b092c56306d3bb313
-EBUILD mysql-5.5.19.ebuild 4230 RMD160 2e4c2f9fa9a05e9f324c3f75a6af1a89baf55a22 SHA1 32ce85bffa82518031631b3b38f8963a1589319a SHA256 6232bf4af334e19abf1e404f3c9b7dee815d0fe32efbdab12717af47e9ea834d
-MISC ChangeLog 5184 RMD160 8ee464d86fed73342cae12186dcc2cd3d259e3c6 SHA1 d4019403733e4489ab30b8ba759cd7dd3a4f7ad2 SHA256 d415e5a079695ce02ad028d9b260b47f41d858a96bafd1d95cdf79b7aee72ef5
+EBUILD mysql-5.1.57.ebuild 8719 RMD160 2b3573c5c3480a74a69e6be8c3c6c0b2e79aec98 SHA1 1e426a3648b7e2371399bbf4505d84fa22db59a0 SHA256 0b0dec0329899e46be03c6535fcc365d8105d697cd4ce33ba6168e44427022ce
+EBUILD mysql-5.1.58-r1.ebuild 8725 RMD160 b24dfc0ef0585fff9c90be233e38d0a18a8729e1 SHA1 44e88a0c9b7b8274e01db08fbd59264441af879a SHA256 5bcf90202f0feeea590291aacd639a5e15a2f1f4e8b4ad02c67b72e70b00aea6
+EBUILD mysql-5.1.59.ebuild 8735 RMD160 6c6414519d83c587e0cd9d784f2421d8aefde9be SHA1 44c8a608cb92777dc990742a562d8433ab1d3798 SHA256 3d883c45c0b74802b85952ecafff61aeabf7213ce3a9ed2e3f68075270848eb1
+EBUILD mysql-5.5.19.ebuild 4234 RMD160 ab95178bb615cfdf73d6085b424c2127e45640e0 SHA1 d5ec9a7dde6788c6cb1a189f45d02e532ce5861c SHA256 b178e2dbcb0afb843b53cf2c0148dfc52a1909141435d43fd32d4e4dfee94e3a
+MISC ChangeLog 5622 RMD160 da328a6b72e913cd3caaf4c13c5cef128bfd80ff SHA1 9e348c7437253bdefb91a08a4c0a440d6e380d5a SHA256 f66cd7cea31a6cba30e7e5ef6c8f72fdd6eab6813db4d5ce770b898de9a4f317
 MISC ChangeLog-2010 108404 RMD160 11fd27413d19e453f2cfe1877c93f53d06c81f82 SHA1 4722e0f32417772921ab328942a7dcbd743b3c56 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd
 MISC metadata.xml 1497 RMD160 82a73ef66a72224add24244ddf39df290a1f67dc SHA1 3a1fd203707ee79ea61202e559b8e912653ffbff SHA256 dde83b854d83894cffd06d26a28ed66e7a0788ba70a745ece4ff719445cc9bf1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPB0qvAAoJEC8ZTXQF1qEPv0wQALmcAGiJa+9UIqd9Lx5o+tJf
-um+i4ihKqANzdWYOiOtRWdAbSH/2OgWvUorH76CvgLrEPT3JYZ8mYZrjQZWSoe3e
-0TE8dCOvQwZTlUrdf0u8BYQWOWofhxbrHEJZkzER0R8KqVHuFq1Ht0ViEYMlGakS
-Ds9IenxG8z1AqFX3KmQecs52wivXfo2HTfjMIOtqTP/8eYVd8ltbrMiNm9bpO7qK
-RbCdrwXfCLMUUIEnmn4+B5MfAYoC/BjwAXv2UsFAIefgso8qdjKT8EyYhRQ+4PEY
-KYzO91HYCzdP2agbx1P491RoJtQWhIp3CqSQrLCSiTbO+zcSyqbKTzvpZUPu1wOQ
-9Auomvl/srCVr/3XMyQEBqUNozwqHKBil1f8dqWf73GGv+J6Cul7qGmTh2vB1/MJ
-r1R8bO1wa+Mp+UpNosiLpSFIGxOWlsMEAdlfT+0v4ydLaVartTs81OycZxneYorN
-eJyWiLj+Nd64EzgErU1yHc1lpj8zMviDl30lW2GqWppC2LmC/zdAAAn1ZqI1xVUj
-RoK4QVCAmLuwB4xJjml0bp1Td2SOBX7sUyQGrpi1uAwCpJJYY2DSxej5QBmCY0lu
-wA9MmpOchELENfJN5jS6RoItCtTn+60npZTsZk4+kjV7FZPfCHemb4hhNJkSBtWV
-gqH+MWO15BGe+DWGUy6A
-=9uuW
+iQIcBAEBAgAGBQJPB2cJAAoJEC8ZTXQF1qEPSgUP/iZ/Zyq4VF1sWJf6UIWcKN/m
+oHyD7XETAHUxKdPAyiQMI5T/lmHG9khcfXkp5GPcrja5wl8Fd6jLP07zqLd9l6v9
+3oYIiy0uPtb+wvyevweqRJs2zsD9TpW14ncJfFddX4JlwQc7Furw7QhfFe/RS1dd
+bDReC/OFJ5UyUnwNkKe8AaBNtMgMWL0e9V57VEcw3oODyg17QgrgC5C4DDYyAr0O
+V46WnLzAWlOKv/BX/GWTvQVSQ4LlIaxT8J6I0kD2oWjcqOc8Bn6/GHHPWQrFx58i
+tiFXxJaHvyoxkTpfpbAFUg0Tv6VdlAXWCECVcdFe5x6odEBTT/FwQbfWsV0yAgFV
+a7N20ypSol2h/NFESv2YjqPH8fWhcAF/x2UKvkwthE035s11HPpPxI4uCV+z1sYE
+EAaCskbVsx8s66jcM36ePnxEY1bvcbSSV/ARsMOMtuZ/TqnmM4wfkgDcRw/2dO5H
+yQAX3I2RivhAxqGDgAhytLcVOaLxB6VuP7Hsvnu2DldjsGKkqfUMVGUuUq4Zyr9S
+jzXig41BwzKkfAzGvcHQeIC5LQd6PVBKnjrGrvv/Kz2Cct9UK+rMhRhXz9IbEBgQ
+i0B2qceVTZEHQeKB4mH1YM7ppS+pEE5uKNQ8c624EaN1fw6BLb5XLZtR488ZilEV
+/qPzZNlOb1aJoVRb4StQ
+=gUDL
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql/mysql-5.0.54.ebuild b/dev-db/mysql/mysql-5.0.54.ebuild
deleted file mode 100644
index 7879f7d6c1b5..000000000000
--- a/dev-db/mysql/mysql-5.0.54.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.54.ebuild,v 1.15 2010/02/01 00:55:52 mr_bones_ Exp $
-
-MY_EXTRAS_VER="20080124"
-SERVER_URI="http://mirror.provenscaling.com/mysql/enterprise/source/5.0/${P}.tar.gz"
-
-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 ~sparc-fbsd x86 ~x86-fbsd"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-src_test() {
-	make 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"
-		fi
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus1
-		local retstatus2
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# mysqladmin start before dir creation
-		mkdir -p "${S}"/mysql-test/var{,/log}
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		case ${PV} in
-			5.0.42)
-			mysql_disable_test "archive_gis" "Broken in 5.0.42" ;;
-
-			5.0.44|5.0.45|5.0.46|5.0.48|5.0.50|5.0.52|5.0.54)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.44-54 on big-endian boxes only" ;;
-		esac
-
-		[ "${PV}" == "5.0.54" ] && \
-			mysql_disable_test \
-				"read_only" \
-				"Broken in 5.0.54, output in wrong order"
-
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# 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_ssl ssl ssl_8k_key \
-					ssl_compress ssl_connect ; do \
-					mysql_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# We run the test protocols seperately
-		make -j1 test-ns force=--force
-		retstatus1=$?
-		[[ $retstatus1 -eq 0 ]] || eerror "test-ns failed"
-
-		make -j1 test-ps force=--force
-		retstatus2=$?
-		[[ $retstatus2 -eq 0 ]] || eerror "test-ps failed"
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-		[[ $retstatus1 -eq 0 ]] || die "test-ns failed"
-		[[ $retstatus2 -eq 0 ]] || die "test-ps failed"
-	else
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql/mysql-5.0.91.ebuild b/dev-db/mysql/mysql-5.0.91.ebuild
deleted file mode 100644
index 28a37a958f38..000000000000
--- a/dev-db/mysql/mysql-5.0.91.ebuild
+++ /dev/null
@@ -1,198 +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-5.0.91.ebuild,v 1.6 2011/01/10 12:20:13 xarthisius Exp $
-
-MY_EXTRAS_VER="20100809-0452Z"
-EAPI=2
-# 5.0.91 tarball has wrong version number in the directory.
-#MY_SOURCEDIR='mysql-5.0.90'
-
-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 5.0.91"
-				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
-}
diff --git a/dev-db/mysql/mysql-5.1.56-r1.ebuild b/dev-db/mysql/mysql-5.1.56-r1.ebuild
index 8025cfd63820..d4ca5dcfec6a 100644
--- a/dev-db/mysql/mysql-5.1.56-r1.ebuild
+++ b/dev-db/mysql/mysql-5.1.56-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.56-r1.ebuild,v 1.1 2011/07/13 07:37:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.56-r1.ebuild,v 1.2 2012/01/06 21:28:19 jmbsvicetto Exp $
 
-EAPI="2"
+EAPI="4"
 
 MY_EXTRAS_VER="20110713-0702Z"
 # PBXT
diff --git a/dev-db/mysql/mysql-5.1.57.ebuild b/dev-db/mysql/mysql-5.1.57.ebuild
index fcba23dfc09c..c75e1969c5ff 100644
--- a/dev-db/mysql/mysql-5.1.57.ebuild
+++ b/dev-db/mysql/mysql-5.1.57.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.57.ebuild,v 1.1 2011/07/13 07:37:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.57.ebuild,v 1.2 2012/01/06 21:28:19 jmbsvicetto Exp $
 
-EAPI="2"
+EAPI="4"
 
 MY_EXTRAS_VER="20110713-0702Z"
 # PBXT
diff --git a/dev-db/mysql/mysql-5.1.58-r1.ebuild b/dev-db/mysql/mysql-5.1.58-r1.ebuild
index b0825f518093..9210de587ce8 100644
--- a/dev-db/mysql/mysql-5.1.58-r1.ebuild
+++ b/dev-db/mysql/mysql-5.1.58-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.58-r1.ebuild,v 1.1 2011/07/21 05:59:30 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.58-r1.ebuild,v 1.2 2012/01/06 21:28:19 jmbsvicetto Exp $
 
-EAPI="2"
+EAPI="4"
 
 MY_EXTRAS_VER="20110721-0450Z"
 # PBXT
diff --git a/dev-db/mysql/mysql-5.1.59.ebuild b/dev-db/mysql/mysql-5.1.59.ebuild
index 5cf43cad1b54..b459637b0605 100644
--- a/dev-db/mysql/mysql-5.1.59.ebuild
+++ b/dev-db/mysql/mysql-5.1.59.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.59.ebuild,v 1.2 2011/11/08 20:25:09 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.59.ebuild,v 1.3 2012/01/06 21:28:19 jmbsvicetto Exp $
 
-EAPI="2"
+EAPI="4"
 
 MY_EXTRAS_VER="20110721-0450Z"
 # PBXT
diff --git a/dev-db/mysql/mysql-5.5.14.ebuild b/dev-db/mysql/mysql-5.5.14.ebuild
deleted file mode 100644
index 83eb93b49abe..000000000000
--- a/dev-db/mysql/mysql-5.5.14.ebuild
+++ /dev/null
@@ -1,120 +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-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
-
-EAPI="2"
-
-MY_EXTRAS_VER="20110713-0702Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# Define the mysql-extras source
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-
-# 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="${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() {
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# 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"
-
-	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"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		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
-}
diff --git a/dev-db/mysql/mysql-5.5.16.ebuild b/dev-db/mysql/mysql-5.5.16.ebuild
deleted file mode 100644
index 0a8450e4ca13..000000000000
--- a/dev-db/mysql/mysql-5.5.16.ebuild
+++ /dev/null
@@ -1,120 +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-5.5.16.ebuild,v 1.1 2011/09/30 02:46:36 jmbsvicetto Exp $
-
-EAPI="2"
-
-MY_EXTRAS_VER="20110713-0702Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# Define the mysql-extras source
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-
-# 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="${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() {
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# 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"
-
-	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"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		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
-}
diff --git a/dev-db/mysql/mysql-5.5.19.ebuild b/dev-db/mysql/mysql-5.5.19.ebuild
index 7d2e7d5f015d..fa982cea70f2 100644
--- a/dev-db/mysql/mysql-5.5.19.ebuild
+++ b/dev-db/mysql/mysql-5.5.19.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.19.ebuild,v 1.1 2011/12/18 23:43:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.19.ebuild,v 1.2 2012/01/06 21:28:19 jmbsvicetto Exp $
 
-EAPI="2"
+EAPI="4"
 
 MY_EXTRAS_VER="20110713-0702Z"
 MY_PV="${PV//_alpha_pre/-m}"