Move stable keywords on p.masked 5.0 series to 5.0.96 and clean up old versions. 5.0.96 to remain only for migration from 4.x releases.

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

5 files changed, 11 insertions, 405 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 56a6681e7390..e83182d70ddc 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/mysql
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.630 2013/01/20 01:46:12 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.631 2013/01/20 01:49:23 robbat2 Exp $
+
+  20 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> -mysql-5.0.91.ebuild,
+  -mysql-5.0.92.ebuild, mysql-5.0.96.ebuild:
+  Move stable keywords on p.masked 5.0 series to 5.0.96 and clean up old
+  versions. 5.0.96 to remain only for migration from 4.x releases.
 
   20 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> -mysql-5.1.51.ebuild,
   -mysql-5.1.52-r1.ebuild, -mysql-5.1.52.ebuild, -mysql-5.1.53.ebuild,
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 78d4d72cfd29..d77478b3acd4 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -5,8 +5,6 @@ AUX my.cnf-5.1 4207 SHA256 3d1d19a8371e65e18d4e3b29010109e6730e0dac4a2eee6720fe2
 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.91.tar.gz 22340514 SHA256 4669abf059bcf97c2fc1f3ce678e83f738ffe2299bd893e1a3d31afbc682c754 SHA512 e9b8dd911941ca0b6781ebd8cc5eb2bfbf4424f51c54f191b7ea6ccb6373cbcf1b76e7aff6538ca2e537059c545d628875ba4ba75d51249abf430c6e42b3ac29 WHIRLPOOL 59789b73b2a0ac2dbf18f3d3aafa9559a432a38ef4f930f5b1d9a5c575e3c23d10b8bc82bb7ecc5143303d593c7ed35e6c89d7e0f8d232f1e67cfe5350c3cf0d
-DIST mysql-5.0.92.tar.gz 22440590 SHA256 223530c4cd6d45e2906e6c7d33615c5824816dfdb772d104f4165a483ea78a55 SHA512 8fdc609761be56f64c71d5334611c1744f5496cef3adb68bbc52f5249d34174373e7b3fb15e6592d138cfd77d1b46d23bc9991ff49fd0d2636abe71304493fe2 WHIRLPOOL 58fb2dc8fabd376000418f5a7fd0aecda6b824704ebff2f3f2ca0776458f1e0e28e2fcfe7194253dd7437f6c14c8cc6625d19b59714ba421379f3b8f0f08a579
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.66.tar.gz 24771341 SHA256 eb85e3fa152949670f5b6f4379bd1d700a5f4726660ce18ff0ca628190cba907 SHA512 01b7ff0a08362249e04a9a66cf0f255cb517f22d336201ba4ae8759cfc8047cb3dcaff75821796c01f87b35a7e8f5533957152cc7ae905cdf65f40239634e4f0 WHIRLPOOL 384cb0ef805ac70646f834ed7140ec1dd9ee4810692ba8e671eb7f5006ce2f97a401097224ce78316c371860639322164505e9099c1233d1816fa7bbc4fd354b
 DIST mysql-5.5.19.tar.gz 24296942 SHA256 7f3643b378101de19205d133e6fb5ce03d8394e183f4e9ac2b0de59ba57fc34f SHA512 02f741df70c0b8058babb2cb6b9469856641413eb334e76ffeec91f21ab71440f1ee644cc58471e86f03ca850cf789869d48b68788ea346b0b3dfc5b509a5bd1 WHIRLPOOL 8b119fd8be0d2191d0b4df49de8abde5b0382b5eb0fab4bafea83dcd54fabf9751f4ab3d008f860828bd6e9667696e831a0c7f88dcc648f372efec39cae1552d
@@ -16,7 +14,6 @@ DIST mysql-5.5.22.tar.gz 24475686 SHA256 f3333ffbe13e586471225fcb521f6ce511fa437
 DIST mysql-5.5.28.tar.gz 24739429 SHA256 f9b2491f1ddd99842a8e75c21958368bebe59c47e84bec778baa915e255cc78f SHA512 61b20e7ae11ef0fc53d199a6a177a34a95e0a7cf17cd574e7ed75d2e51e62da8178184333adb0805b6bbe7649355ae2062ac36c70faa23acfbc419aaa47a7365 WHIRLPOOL 909018977ddbd124b2152372d858a65d85ee0cbebef2f94ea14b04188ebaf90529a576f24f47cc6bc232e9d6ddd5251ed18242eb08ee0d3da081c81a04da9d3b
 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-20100809-0452Z.tar.bz2 1228458 SHA256 2ba39a87dd5ea2c819193d1b25c6e2abbd4506d63c1e8b845846b7b33d64e52b SHA512 1d7b5c443a21c6383dfedb07b3d8ac3d55d2b380c9caa3738110697bb9da9f920e99585ee40c4c94ca77807c01e4a3350b6aa1148a834357c24e1ff38b4f2ce6 WHIRLPOOL e6e33baeef0d7ea72ff13af3e93966cd7786e05d7e151b77e3129ac85d7ca64d0637b77cd20520f02c25de863f03dbebefd5d0771cf519933df2574739c10d18
 DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605 SHA512 87d7b80d2df8f5e52bff2abd070eb8ed73d6bf19a32fcf82167a74d0f4600e62bc17cb09076b82bc643ed37279a7e4c402f1da8db25a06955c037b7173810a7f WHIRLPOOL a959ec13bd06c96988691b2458cf8ceb510f99aba20dd1f6e9c90f9c5f7bf9fe0c811badfd056ffe66c1c14cb2c9d3c29cd47481ac445a2df2fc22aa0b8a1324
 DIST mysql-extras-20111118-2347Z.tar.bz2 1780751 SHA256 db380436ad13231245c02c2e36d4a1d5b3d27fa39c19e844507736a8ba69b6f5 SHA512 bf0e4a88d6b981aff0ae25a1294a808b12414aed591634dc6aaf7f5b1b2e31a401c622b7f60408dd85c3f71d79eedb7c9118a25eafb2cd739278266edadd75c1 WHIRLPOOL 8a5790ce2a94378e594afb662c0e465db045e720e026ba98aafa8289c861af71e25ed4a10fce6061ec4ba683952a92f3bbc484937bb4e5de0617026f95bdc28b
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
@@ -26,9 +23,7 @@ DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7
 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.91.ebuild 6576 SHA256 99a6bda230ae2508a350fa5f135d432c91dc4684240dc189c2600aa21ca865b9 SHA512 f233d9094d6aea9c36bd8da4cd9d0c508c8a9de05021cb30fbbca11547b9a2a719c4aa29a63038e4ec1d98e694c6123ab99f4d9520269c84e2a338be759729a4 WHIRLPOOL 496b70d91499fa608ee25f730ce3ee8bbbeb56f5be3110379062f01848336e2abe44dd8dc4b6de2b907cc1819e1e473250e56614442e1f59fd53903cc2af4449
-EBUILD mysql-5.0.92.ebuild 6500 SHA256 51fa8885473b1118f14390aba400863ad9a8b3db85cba48eb3eabec97780d726 SHA512 09abfef4a1578621c566261b63ba8377627588febbc15bdeafbfb51e88b0eee621e85e98a1b16c63653a89009120a2e9744d86134cb515cf2b6316f22d9d0434 WHIRLPOOL f4dd19482ab75cdfc5f8cdbd9bc485e099250bde7eb5e604c41bd39dce9d164cc8442271ea95d5dce1a7c935680dadc4c8c6ee327939cd8bddc0a47def6843c1
-EBUILD mysql-5.0.96.ebuild 7182 SHA256 71b61df001c705acdaad542e4fb7af4ccfcbb43a91d256e3acc12ab0b716e41d SHA512 d9b868affa7e90e29faa31ee7623ef23492cee3b70a5ddceb7d112ed6eb78d4146cd6a66cb83fd7413b6bbc3fd00956eca21b49110908345b8ae8c78082ada78 WHIRLPOOL f7892ae3a357e259a56f31b1b75681780666fed1513a874a7787c1bca397276090f86ad5f729efc58256b0bc0583c566ac593aad230916d31a65a9f014c3b17e
+EBUILD mysql-5.0.96.ebuild 7175 SHA256 307fd3e2426b42d05b6793c9f0b90be12387fd5434abcc9b8caca84adcf275a0 SHA512 e7d71bb91dd953ec013d5b10379f97fe649c0a4c678ddead7120660349b8dfb8b7f2ebedb45ca17ec6b522ca5c8ece34cd8e0ec6a66fdb8faf076e5074e1e3cd WHIRLPOOL c9a06e4d0d52af5cbdc2cc56e1003564de4281ada0b951f7c9d2f93b64cecba1a6c48405308ef4b0a646099f0bc3ad3e10ba86a38e7d84519ef223a8927352c1
 EBUILD mysql-5.1.66.ebuild 8878 SHA256 f74d361247ce17dd50a91082a5b4f6153bcf6e5e65c327289d5a075de68a88e3 SHA512 4b0999c925e4a4820a5c82e418eade3f74f41be04f4ea02e277a92554252e57ae88f26b4ed81d6641f37a7ee19a13dc9df42b303c5d492579677c817e8095b68 WHIRLPOOL e7adfec4605381ef389e0dd141ccff301204769061feddcc4dfb5509f8b780db61259adda254646e39687f2f7a33c5275ef9da0779731ab1bf73df3fb02e537b
 EBUILD mysql-5.5.19.ebuild 4228 SHA256 c600763aa7f16ea2a3feceebf3f75d2f7ebc7ee06c4bdc4e1855c3b7e7f47629 SHA512 db2c2ddfdf1b24f9ef1fa0d2e27c19132d8e190c739ca6e90920723e87b48862548416971638499804bae67df7220e99082f3b07e641e896adfdbd93b771031f WHIRLPOOL 327cf69b8d0097ea83be352d631ebdc13e20e276de1dbb9d118a54cbf348b567ebe5ef68d83bdeb6ecd00b60db006a6d32e782e2a229da2e54eed6eb6781ae97
 EBUILD mysql-5.5.20.ebuild 4228 SHA256 3cc105df9e14f05c019aae76cf30749a2eb3d36924156fc4c6f405690a77efd0 SHA512 e8183e8864e771f98fa31791776a7ca6369d3d78f0c5465345bb1df023bbe7207922f2a9c0b81c6a02016130832560c51facc7b4e818e6f442e2dc535d816f0d WHIRLPOOL 38c4d6cad5b31b82938b2893a94e08e9e5f4cd578740e3e260b90ea722fe80b370dc75fc6dd025550f66eedea222c22e8705dc83895db2d80cdad502686381e9
@@ -36,6 +31,6 @@ EBUILD mysql-5.5.21.ebuild 4228 SHA256 0f5718f07c1c262aa5c4c8887067a0aade0d1404a
 EBUILD mysql-5.5.22-r1.ebuild 4231 SHA256 551a745a5077cd72dd96e27ddf2c1b11f2719b79378f20e5e3203959fe342003 SHA512 37bfc6a5906ec3485f2f0b67abfd58305dd5a2693d14ebbdb5c136e07ced3d013e51684f9ff125242ac11209e9cfa011debab7c32d37d83640b28042906b77fc WHIRLPOOL 0cb385db04700a96193e218d7abb5ff37c5e7425089a6b22c661431f55ae87001d6161f9d8e4c37d575fd440213d52db6b7d2993352d03e6ca2b206a912f95b2
 EBUILD mysql-5.5.22.ebuild 4228 SHA256 54aeeec255369dbd3475e3daab99e73f1489df9097378848eef08711c8a9a66c SHA512 5b711f39a0fb755a787d9b9008e0b3e093cdaf88e70e92e84ccfc8774dcdb469fe958c53afd3fc1d1fbafb59028cb02f47d6bae4dcb0ab9dade37e349868892f WHIRLPOOL 89fad07ddb5f7883276c03bd7491c8fa235ecfc0c5f8c685c45e998bcf7fdc34d4a7e605b20bd4147e6a87f40a50e490bfc3645d9b329a73dc5bd30bd5686047
 EBUILD mysql-5.5.28.ebuild 4239 SHA256 6ed16f01bd369026ad624b95ab06c5bf9700b1674b1c92be7f25cb1fc05def28 SHA512 eb2bbe80519e7adf651e7c6108e95269b74b0b0595966c93b3f0d2711a33875a6ee048526d3e76177945cc962db645046e29d235b61ada46a689d292d7e8fafb WHIRLPOOL ac6b0e57ef1fb45350325e586a3a252e65eb3bbb2b661fc29fa47bdc0f94b8ec11ebb39debaefba37c35ed4986c5a09e5370bbe1a3b989e0e5d8f9e1f358dfb6
-MISC ChangeLog 11456 SHA256 bdd79fcc2dca574fe2d1e786f40af821b89ba39e993dfbe0be7258507d8b167c SHA512 bb0a4d94a431c481b8ba30ccffa404195d440ef42ae060846b42be15e646d0526ca209ad00bb28268d9de62589d412130bcfd206f9830fef88b7ebc3c04ee535 WHIRLPOOL 436e6624b74f5f28469f2b24bf0814776f3ea984c30ddbbef7860a9f54c420b6ecae63d0c98ab74bca72ea8fd6abac39a13a96154bb86adc169c904dce3ee4d6
+MISC ChangeLog 11717 SHA256 137f94934e0c41676aa1a3aae720f080be863a7a2081cfe7ab7cfe8027bcb52a SHA512 0f28ecebffb235d6e55f40dceeaf4811c041317a656ae62a4edfe77ccf06ca02279d68ff05d6c7282d793b99ec25ec6a695e4b3e3458a7fb78a49b516b72164c WHIRLPOOL f21c9a71bdba0d2e6aef86de82e5baeae59ba1ea40647815f050fe02f8a07635efcbe2b563e0e75b76299073451cb3dfe12d810f38a94b6e3137b425f28128ea
 MISC ChangeLog-2010 108404 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd SHA512 5f54b7c2e25d27680a9313da2450851118e34a57202d9f36f59da52834ca3b587701d93868d71bf684ddc253d49f87837c8d7e2d442f2955dfde8a701150fbe5 WHIRLPOOL 55f758942e3012aa0ae7d529c2f8b6e0d8f4d7cbde09039f16cd05f0a58fc4e3e09ccd50e366effdcaab4641300eb0f494ddbe3a35a645ced8a9d747d80e9821
 MISC metadata.xml 1512 SHA256 2aa7aa3c625242463dcc8fbd52f0c33558507f375dd64c80412372e5d8456b70 SHA512 b9a09711b821ce7a962dcb23a4e249bfa83fd5605a45bc9416e4721a643e8fc740df4e22a7aba8d7245612361f6f3d779647f32c9469662fc2a2598030a2499e WHIRLPOOL 9d553da0a5501afbb99566ba46664f50e871e90a6ae839626f2aea9b7f28e9eadd1b8360483bed9a397082f59518009d1f70fef128399370c4bb1d6e85c2b5dd
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 b7ae1cb01dc9..000000000000
--- a/dev-db/mysql/mysql-5.0.91.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# 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.0.91.ebuild,v 1.9 2012/04/13 18:00:05 ulm Exp $
-
-EAPI=2
-MY_EXTRAS_VER="20100809-0452Z"
-# 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.0.92.ebuild b/dev-db/mysql/mysql-5.0.92.ebuild
deleted file mode 100644
index 334e0d557072..000000000000
--- a/dev-db/mysql/mysql-5.0.92.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# 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.0.92.ebuild,v 1.3 2012/04/13 18:00:05 ulm Exp $
-
-EAPI="4"
-MY_EXTRAS_VER="20110713-0702Z"
-
-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.0.96.ebuild b/dev-db/mysql/mysql-5.0.96.ebuild
index 5780a7b1e2f8..f22bc535435c 100644
--- a/dev-db/mysql/mysql-5.0.96.ebuild
+++ b/dev-db/mysql/mysql-5.0.96.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.3 2012/04/13 18:00:05 ulm Exp $
+# $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"
@@ -10,7 +10,7 @@ inherit toolchain-funcs mysql
 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"
+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=''