8 files changed, 37 insertions, 231 deletions
diff --git a/dev-db/cpp-driver/Manifest b/dev-db/cpp-driver/Manifest
index d3d9e1a78407..749a0a79caff 100644
--- a/dev-db/cpp-driver/Manifest
+++ b/dev-db/cpp-driver/Manifest
@@ -1,4 +1,4 @@
-DIST cpp-driver-2.4.3.tar.gz 593974 SHA256 d3364d1b8bc71ec4409ff7432f10d1edbdb1329ab8315418858561065b024bdf SHA512 a23fdd77a19dd99bd077af2d51163471c30dcb88c59a1c8c5221c4369e46637ecbb5ffa4d76ed5f60d1a0d0feabf05a731cd0b377ae5bbc901ba5beeb6055953 WHIRLPOOL ce5a54fd54be2e9e940b98785ebe8e3517dec5810c8318bb5dbb62639ed210c2aff1b04d25ea99164a3b77abd66a5679f4aa0ee042c902a6fd357a07702039fd
-EBUILD cpp-driver-2.4.3.ebuild 625 SHA256 7c1d5e61e33083fad2dc05d2153ba83be01e628b9039858d640cbb50549e9791 SHA512 84251aff02b34f4b0631cf896c87c33b5e2dba2421aeaa8aa061a79e3b6a57c7cb4379f2098b911beb7c81dc288daffeeee89a1b472322022730b7ac64fa10a5 WHIRLPOOL aeeab84f664898c9375f340cdd9498317d338d016c32586fc032d23e423076a52807ccb4f4a3c7fed39eb016dba87afc4ea419777ca10bda90418e491bbdac0a
+DIST cpp-driver-2.7.1.tar.gz 623912 SHA256 eb22b7b148507253d2ca24f419e6768d5f9525dbc6f60afcd40906df3ae7cf8d SHA512 240cfc63eafd5c825289703569e7ec405f3a8671f21372c11738fc9a45712fd430b5ef0b78d03156223dcf68862ab2e8a78d2f9b3274839e271455920492110d WHIRLPOOL 5745cb3e39a9b375945ddd41d23bb25488105238315993646eaa11897d5730d0db80dd5f0e159752163ec7a8e06995f9e4fcd71f765a03a1f43a09957e0bac1c
+EBUILD cpp-driver-2.7.1.ebuild 625 SHA256 981753389f90780b87be7d08f752384e56ff2b49e1b10c0df687c371a56a08a3 SHA512 e282796c2334a35784ae1d5311944b37123051f9c0ec2d523199ad076455f1c3654a33de7c541689f40f2678adddc6bcdbbcbf20ad558e529c7ac71cba5c28b1 WHIRLPOOL dba845006d431716478cd5fad9abaf2f3258a44b2e13e42add61aa7285d6cd41476395105b6aa3b555613328f6e0cda3e42f18d490a4b373e0dbe04ea16b5615
 MISC ChangeLog 437 SHA256 f3bee71ef91c84ca9f18da94da28b11bc90a3eaddebce4c84a1d1341f56c7531 SHA512 f72463d8d4fee4aea606104b8d70b85bde985ef88b556e1e185cc67a95781e48211335c5a52cff972053fa377903e5e385d6f617ae0d5bdd4eb640f5de99fb18 WHIRLPOOL 3f159f244d2ad8649c665876fb868efaf45b17bd36e8b01d4dfa9284fb989a472b79783d48caf59192245c7dad5e9c699170d82d92c4c82504625e2e747c2771
 MISC metadata.xml 553 SHA256 b24ad0d80ce9bb2a470324829edf6edce68b588ccca4dcfa3c72a04752815d67 SHA512 7e02ca90a667319bd669dc10dbba7abc1018a1c4941fc213af728bd6b7afe48e5fca888f3f6d19798937f6fa5d8188cd784cd37f0ff690bc2295abab8ae408f8 WHIRLPOOL 0fbb770c6af77b58beda20e24dc793460501491b5cb99e0fb4c0b2408e4855f1b4c3384aaf78deb17aa94da091d9b9e449579ec17ed5781f0579218a05a00959
diff --git a/dev-db/cpp-driver/cpp-driver-2.4.3.ebuild b/dev-db/cpp-driver/cpp-driver-2.7.1.ebuild
index 942cb0b2ed00..a68364459ede 100644
--- a/dev-db/cpp-driver/cpp-driver-2.4.3.ebuild
+++ b/dev-db/cpp-driver/cpp-driver-2.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 35affa71282e..0b88f7cf56f4 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -4,28 +4,25 @@ AUX my.cnf-5.5 4805 SHA256 cfd7deae0f7be56f3efec8581428892ea614626b19818e938f2de
 AUX my.cnf-5.6 4579 SHA256 118bb51fe3e4af1b45d2403d803bd6afea15f1091586bd7cf9c31fdd5f514c95 SHA512 4a55807a119e847f6aa42c94a3c1761eb819d837a9d71a28afb71e5704195f920a0488d54cbeacbe978590c5f2b1dc9b743127cb9d2aa9e3813db226b5bdc356 WHIRLPOOL ffa3ed22ff8c270fdf5358e255d48cf41e2d4641057155c868dee7370980555ba69ad3d9cf7919025f6a59ae09bb6047fa5e5f388bb9fb39520f55868424238c
 AUX my.cnf.distro-client 637 SHA256 fe72e71376fda41384c1ec95139640ca0fb55f6256b127cfa9a84a277b8cc262 SHA512 85c0b0eb4281b398ca7c010042d69b4306ccebae9838bf7a1ee53c0d6bb12b20f95bcbd3bb359b107b018d456d7bcae8d168757ff34028ce69357ce3f3fbd54e WHIRLPOOL fc4a732069effff2c3079b31ff81c679eda7a5d0f9de0da9fa19fe41b305bd8eaa79228145e7cdf98b06a094f9bee10a2257b0732161eb809cfcedf9178eafda
 AUX my.cnf.distro-server 998 SHA256 30a033609ee26535115f39b1bce07fe7aef6bc31068eaf4d9d977b170d813aec SHA512 d9ab6f7fdfe08e6c242f84410ec680ef6aa6778c4bd55fee67c644e1a7d997446d8ef2129be6fc9833d16fe40cf17e09cdf0cf015f06bb145bbf9cfecb51e882 WHIRLPOOL 2bcede79a4d7c8501061554613951bddf1296a086c6a51c3b0446cc0647160d3c0ea35d35dcf95adb98e555b0ff1d43fc342cd48eb4b8605e426643256eb547e
-DIST mariadb-10.0.29.tar.gz 63385696 SHA256 f5f8da646f7df4b1fb21adb8d2b15e6dfbe1964ceb8cea53207d580a464350f4 SHA512 187c3563e8cb74221505e3e77dbe716a8f3fe53130b304c073105c59f0aededf7285b3fa0d0a60cc2d084323f7d2892dce14d60755c594b20c06864255c2dc9c WHIRLPOOL ef9b20fccf280da2bc65c64081f8b1fb7c1984fd8815da3ee40957fa6f977a415b983ba35cf57ddb0380e273e18039deba93007c2ce7496ec4f3ae2d5554397b
 DIST mariadb-10.0.30.tar.gz 63433598 SHA256 9a2cb7f06ecce1bb64dddc70c484e36507b50b756c110c1d37fa145a13a796bb SHA512 b9f4bdf2b19edc661c80b0c19b09979ad765e6a7f76e038436660d29bc05c2c9882c39f557aa407828ba2917632a9a0f6a96090279912e78f04b54ca2d9f14e7 WHIRLPOOL d109efc6599f457b0a270c62f32115bc0753a5357e88f40023944668c2cfece70f01050fe4773f2bb97ae58c76da15b22031a281aeebaf0512a64bc9ff3f4c37
 DIST mariadb-10.0.32.tar.gz 63567828 SHA256 f7a8d9ba88b01d426f5d69e5044e505e444a5ce73e22c9c50913dade43725936 SHA512 e1ecfc2b819b5ffa72fc0d4131fc9d7b6811919e10f15608830611028746580731c653a6b3eb43c92640cd29716b6278f48d27af5322dd2084f2d5f356e6f628 WHIRLPOOL e39e115d1382dbce432c2e27f85b03c8079dec03fd84fc3a0e1f906cb8ef2f82e2eab719fe2544de2ba8a83c66858d276ca2224e66317ecd7ade2d7a78d00368
 DIST mariadb-10.1.24.tar.gz 61780687 SHA256 b3df99ae5b1ec8cf6cede4cbc4ae3f54ce66464549cba6d56d9ff4d24e4d551e SHA512 0b8d81b53f6866a81f33559ce57ebf956fec3ba25da0bd58c8bee3b2ecc00a6c370340000209d18463f84501d3ba35994b51ef99224616c37cd38d2fc87b73e9 WHIRLPOOL 91261a05e3d8b0cad925c382e0cf9a40fcfd3d35ae320c4a9860db110cb5655d1e1f992f9dea8987e50a07dd4a66aa42c9a3470a7acb3d0d706bcef7bc890122
 DIST mariadb-10.1.26.tar.gz 61887132 SHA256 ba88b1cb9967dea2909938a34ba89373b162b0d83e5c98a0f1c94540156bf73d SHA512 a7505c579728b58eb6a92bdee1f5dfea5c10c8389cb7a31eb99fe2c6bc416593925cf9708d3dec91ede12eb4e232098a0833af2185bdd60bc593c89d255f3c0b WHIRLPOOL 8fe0c23f70b441a1f8d32d1fedcd033443641288ef1a20c49fbedfe6f5da95cb82125faa68f676fd68c441d4bf096101f364e1b3976f54229f5d9d0d10edbe21
 DIST mariadb-10.1.28.tar.gz 67559689 SHA256 292dc8fff420c4bdaf3a2c3381ec3c99292965db2b09de0d7fec414c00032bbd SHA512 ca10d28f6b966719c7488c2b4ba928b65cbe9dc32ccf2a28d29c4d0c2d46ea1c59c3e339230017b317132dcd216925a71769dfba80a7d6321079c74ac41926d8 WHIRLPOOL d8ff24346a9e8ada4a9ec0ea8fd7657ff4972d43347afb7a9d7725293437ba70e0035c365738084b1e4828344861f000bd963260176524da2188c2c3a1389f67
 DIST mariadb-10.2.9.tar.gz 70858881 SHA256 12e0a01c52591ee77cf0f940fe65df024457fa16c70f08c6116048d576096124 SHA512 11ba0913144d7298ffa4c0a0128a3d1525a39b8205ffc580311751cf25a4e86159e46a32d3c8330c4ea028cdd50643eb5381651df654751ca3e4fb3d4698a373 WHIRLPOOL dba0a8dfd5079b314ffc399e116abf8582bdaf51657dfe6e72247ab92da874aca97af4ca27dbcfdca5634c926598a853b7a8ecd8a61fee453c2764085a05b949
-DIST mariadb-5.5.57.tar.gz 45783940 SHA256 5dbde98d7e4a5a1721b6cbed7898b2549a88866247951cf586057975c6cea641 SHA512 5d6350abd6f0ba98326633a36bb7ec67525e34e08cbe43f79c9b30bf0b872b0a8f9f0bfd5f3a4c2800a52d25b9c6f3a3a4a62e0f41574153bbf4b881f5347c71 WHIRLPOOL c2af12fb71b3fcc9989cd2208a44dc81401fe1387ae2d03981fd5d00277d480a35f23bdb8f1564f91b4c345bdb18a610b46ee91f47772ba5de1baf8f808eaec3
-DIST mysql-extras-20160629-1442Z.tar.bz2 299152 SHA256 c90979db927772468f8b398c640469ff4740f950068e740c04ff60500e714766 SHA512 1de46daf6b4534dadf9d3eff8d5d557778e63b5e04aedb57fe56d3016ba93a9d55d80faee38f77852d23da5169879e4f25b3386abe44ee8d961db7ffc4145715 WHIRLPOOL d8c94e4e43e772307d8d137a28e18991fa24a27b1587ec19ae5bd12c733cc0931e459092de2c43216776e3284c7c416d52030fe20c98a6439388507c5fe5111f
+DIST mariadb-5.5.58.tar.gz 45784323 SHA256 26fdf8784a51e5d6f7624c0f4528433a6188065dd1bf92ef69e27db6b0a41002 SHA512 c5c8b52c613a1a3f30de2cd1d8e390f8110b0891af78ee2a24ef2c4b7b8c5f2e140970ca89865e8277e7486dbfd0ad01c1fdbf8791c67a9793392247d68fec63 WHIRLPOOL b507f3aaaced5da716de1a131dc4e69ace6f2ccd2ac58614d3d722b46b0b271ab0a452aef03b78d499b961f39a057ece5169f5af6fcce2e840aecd77ebf9295e
 DIST mysql-extras-20160721-1526Z.tar.bz2 301788 SHA256 45198f8adb4a61fdd89a5d3c7966ce2fe9241381510e1f7b93e793502a32dfcb SHA512 c7450039780e4e2684c932ba7c291c1de25dd1a64e4c6e88aa13b790768b4100955f36ae4a3bf983569ea23b43be02da6dad3d5985c1163ec9e8aa91f0efd85d WHIRLPOOL becdf0d4d7b8b5a269246d2fcf1bc09c4313046468b264f07394ae9f1de2f736ad3fff8cad35e544df7a3623688050e6fb9635dfea3876ea082d19cf9fe88927
 DIST mysql-extras-20170310-1426Z.tar.bz2 307052 SHA256 23f5becec389fc49e7cf0d52c6c914cbc8d7e3fc5851ee38881ee6884ffc5732 SHA512 2dbb3e46f14fbd0be9ee0e3a8ff2e4d5325f9a9be332014ea556283c0bc5f53349952d267d6713fac5b54e3167a66ddd36f18b18b79ca6b68ede399399488157 WHIRLPOOL 9f459d9e58938597e7919b29fc819d87920a51461d274bf87520fe322a67ad8638ef19212855ba8e37507d3b160d29ecad0099f4632f078cc503e1be0f809fb4
 DIST mysql-extras-20170316-1355Z.tar.bz2 308933 SHA256 ebcb4f03413ccf42877558ad365db01bbb5ef2e12620a9be479ffc2514d9830e SHA512 5bf7938bfa5989da85216fbca4575397fc05c83e1afac76bd6c0b338a876caf37194f53a2a933d6f69eb31727ca005be617e53a8fdd0a95d8f1f68684c4ba68c WHIRLPOOL 701871ff554970adef8e5eb1e2e966a09c4b59ac7931df125f78a4fcfa415e87767184a9d3418013d27410ad0482673942f1df48d5e5de68917f49e1efa96689
 DIST mysql-extras-20170830-1210Z.tar.bz2 312079 SHA256 eda0090fb448e22a004e334956278a887843a3b2bf3ed523b80dd4691d4729d4 SHA512 55553de3bb93b09c29ff411c135ff2762edad3498d9e8fb844df349ce8ab864969668f2bbc3ba99e2217cc20f1c9155443794c301ca064d09a1b45ddead567c8 WHIRLPOOL 961073913064ad3f4decf4221bd9f87fd8bd6349c3e13c1c799e5622b9f2353a2981d2577c5a00c026ac006c03a1c609f4527c2d9027610214d2e79bc5be0669
 DIST mysql-extras-20170926-1321Z.tar.bz2 312466 SHA256 e2ecfa43d70d9796cfd60dc2448b8e76e4e35ccbbe12b6a4becc8f854e172c12 SHA512 556e782ccc40d8cffb2fde8c46038c90023440c07785ec667f898afdb8c802faeb4dbfe8b3918a1e563b46d1dc8c0de1172f7843ce08ee1ded435b344f8f0cf5 WHIRLPOOL cae69f01090231bd25a48002e8682b70894d0b4e3ae43083fb062db159a44d4b085edb46f92ed0452d98fccbec7fc0fd1f97eff9fd16b810fc22e845e8923b50
-EBUILD mariadb-10.0.29.ebuild 6795 SHA256 157bb51bebe6fe9cf33ad75cbbef343f038f101e2c8d4b5bc354358ea342f1ea SHA512 d146a24f4b1902c02b312b2fd64c7ffb198051c8bfe2e48f7f7076db1d63c72904beb51a767eb8a06da5b5c4f354ce091ac876ed0b30dbb5e997257cdce1293d WHIRLPOOL de82641687ed6350f39acec5e2f9810209f66280567fcdb8a0ee9c4911d708a8949475bdedcef30030ba3359bd9780748b9abd43623d5413039a5b8eb5326f62
 EBUILD mariadb-10.0.30.ebuild 6886 SHA256 e9ed5cf89f7d44ad61b6c9c35d958fbfe6b56b30cd7cf22c405e1f31d2bcba09 SHA512 4c8ed348db2b71ebc351a78c141b56fe1736e35e7db6819612c43f347251b4fc68db9a2b982a1a70219310e23b0ffdc3bdf1253cebd6955ba0700c76b39a2ca3 WHIRLPOOL 4ceb753a8122b9c2e42cc1ad7e85f5c71d3e06dce0eb22dab57982e8f102101f42cef4a85367c66f2eb2e2b0ee1924226284fa72e9f229fb523321a1a672d062
 EBUILD mariadb-10.0.32.ebuild 6767 SHA256 9ea0af871fe806b30a877415da0b0881cd24f3eb3611d4e2dec18e78e15c443d SHA512 8ecca9144723916e28351cb349ea465227946d08ce905a19c7fe5503018c3e8441549a92ef6bffcd8d2ee9eedff3541354ab920d89c4f4f0bbd5ea1c19f96e5e WHIRLPOOL 8736b28d7092ff0f07b722f057a7f9ee65960b2d2a6b633fc17b0f14925a5ee68de857393ba433f1f0c126307d3e496bc6b306659769e9e576b14c66d0ef67e2
 EBUILD mariadb-10.1.24.ebuild 7187 SHA256 fb9a9a37ea87839b5df675be187df0756853d995e56af9f46e4d938f1f3bb778 SHA512 f88e2f171b9785ab6c834511ca71d9939eb36020a32cfdba5fb91f81253df8a35b891db321c0f796dfec03c7fa39226d1696607518efbaa446531590de97a75a WHIRLPOOL 95a507b48de0251948e1511c285d50b7fdbc490395ce3618a2e4517fd3223d62e17787837570f5f4ba5b78d3b7f773889826ef0966ae7b92ed7da9d6639a0f21
 EBUILD mariadb-10.1.26.ebuild 7255 SHA256 3dfe3f3c0effdb9a13b4e89398169a58773c056da51a12ac9c79e28ed0cc2b02 SHA512 171bd1cf59c77e98505f9f2217a5522611977fcd1c13d67dbe551892da3569b45298a032e33d5aed8cc2caa95f326c6f011291f678436a7fb3069133792693c7 WHIRLPOOL 3bc062878d0be9c3211299ab3e2c2d90d970f2cb2cf311dfe3fa799545bc09fd32f6da3532883dc5a6a4adfb42e23459b302d43bb01ebb1d776f5811f5102156
 EBUILD mariadb-10.1.28.ebuild 7320 SHA256 b45d0316aed437a96b46648109783fd9a8d3252d92acadf89e8a763843327e49 SHA512 4868269e57a2951e6f51dafb51fea044902e390aedaf2d1229b85c61fda12f39cf0b01935dcd4ae111b5323b647c9f639cc4fbfe03d20f50b56085babcb275e9 WHIRLPOOL cbaf38b55fcc2d3f2b0ba00fbde07b513077952b33d3679f99a1b48eb5e15638f274753bc1b536570350890d0faa5ccaa3e45934984699d95c3c9fb8fb56f45f
 EBUILD mariadb-10.2.9.ebuild 33584 SHA256 2493e44d407da15ee064afb0dae082980514d5b8754a4f0cf9cf544a8f435724 SHA512 308a9089edb55264e290aed7fade8ba2e4c9bdb6c83204dbbbfdf3f0b205a64a82874079134d48de958b0755f92d3fc9a1a2e73fefd105c58862c4ca1a327e9b WHIRLPOOL 03a803a33eb343bfef919e4cc5b8aacba74b32ecad01d12dbecbddd71ce26a4a0862d1f539e735bdd91064f3476aca4128bd47852aeee7332b92587766fc72c3
-EBUILD mariadb-5.5.57.ebuild 4241 SHA256 ebb8013626eb0a5a222b3bac6ef12606545e67338903c5872249589ae8d79aa8 SHA512 3de822605e73ca9094f6635ee232b133371823e3f3330d6ecad973c0e9176d2280a5fd5ae6032a4f6e3f914c8a937f912e2aeb91a5802342ced02aee6db11944 WHIRLPOOL 3d68d32e9d157c909659ddb17550c517e5407366c2e867a7d7ecc14594d329e551d42221e2a918155e0a1d6cbe7819a121f8ac3a417110156010ed1716ef230f
+EBUILD mariadb-5.5.58.ebuild 4241 SHA256 ebb8013626eb0a5a222b3bac6ef12606545e67338903c5872249589ae8d79aa8 SHA512 3de822605e73ca9094f6635ee232b133371823e3f3330d6ecad973c0e9176d2280a5fd5ae6032a4f6e3f914c8a937f912e2aeb91a5802342ced02aee6db11944 WHIRLPOOL 3d68d32e9d157c909659ddb17550c517e5407366c2e867a7d7ecc14594d329e551d42221e2a918155e0a1d6cbe7819a121f8ac3a417110156010ed1716ef230f
 MISC ChangeLog 24701 SHA256 3ff49394f0611c2c667536a084ba1816152d1770039e716db13ff905ed3382da SHA512 c7dce735d23de6f8c71f27d0047e5079bf6587ba386935800613cb36c0e3653f59e5021d73a4efaf56c74ba4a4f6ce4bbe21e10b214ed4618e0b2528bf13f65d WHIRLPOOL de0cbab6250b12fb8f55acc5978e3d135723ff727805e2c898a921ad7adae798702a16df7077159c195ea9854cada6840f1ef03d7f4934a183d5b0f081dd57b9
 MISC ChangeLog-2015 18661 SHA256 49a3541aba6998e4e877f4a11c5f3b9e3c6019c87d2f7ad8b8e55a25eab88eda SHA512 24861a1e538520bb16a70d09a34633dd51b15a4c2fee86928be65ec589ef54014aea54072124b245a4572b69208483c30cd2e26260fa09e30433e3ab617d25fc WHIRLPOOL 6b99d1767c2bf508d584fc9ab323e722079280aaad98ef7d56414f6b183a87b54b1907cc6f2bb2487d87e9cb672f9879cf65a49bf872f59fb09d794bb83253a7
 MISC metadata.xml 3051 SHA256 01a96c7d17bd176e1acdc11d7b2522d858cc27d0bbedd92b46b08623a05dbd30 SHA512 e6fd6d89b587b8b1fc29fc6c6c6ef8dbe0ec209a52887468bd047e5813dd5479f6e1217e4d29db0a278caac544c645157721fefe8b3c59e59431eb8a85019a68 WHIRLPOOL 95422cf084e505625e47d5a098e7acefbd2b1a9292e1f7d30758adb95b3ebed269853f93b5e3adbdf87327fc19a358e0738347c9956f2460e0d82c409798dceb
diff --git a/dev-db/mariadb/mariadb-10.0.29.ebuild b/dev-db/mariadb/mariadb-10.0.29.ebuild
deleted file mode 100644
index 091fe95c3d59..000000000000
--- a/dev-db/mariadb/mariadb-10.0.29.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20160629-1442Z"
-SUBSLOT="18"
-MYSQL_PV_MAJOR="5.6"
-
-JAVA_PKG_OPT_USE="jdbc"
-
-inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1
-
-HOMEPAGE="http://mariadb.org/"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-
-IUSE="bindist jdbc odbc oqgraph pam sphinx tokudb xml"
-RESTRICT="!bindist? ( bindist )"
-
-REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
-PATCHES=(
-	"${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch"
-	"${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-10.0.26.patch"
-	"${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch"
-	"${MY_PATCH_DIR}/20018_all_mariadb-10.0.20-without-clientlibs-tools.patch"
-)
-COMMON_DEPEND="
-	!bindist? ( >=sys-libs/readline-4.1:0=	)
-	server? (
-		extraengine? (
-			odbc? ( dev-db/unixODBC:0= )
-			xml? ( dev-libs/libxml2:2= )
-		)
-		oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
-		pam? ( virtual/pam:0= )
-		tokudb? ( app-arch/snappy )
-	)
-	>=dev-libs/libpcre-8.35:3=
-"
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-	server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
-	${COMMON_DEPEND}"
-RDEPEND="${RDEPEND} ${COMMON_DEPEND}
-	perl? ( !dev-db/mytop
-		virtual/perl-Getopt-Long
-		dev-perl/TermReadKey
-		virtual/perl-Term-ANSIColor
-		virtual/perl-Time-HiRes )
-	server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
-"
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
-	/usr/include/mysql/private/probes_mysql_nodtrace.h
-	/usr/include/mysql/private/probes_mysql_dtrace.h )
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	mysql-multilib-r1_pkg_setup
-}
-
-pkg_preinst() {
-	java-pkg-opt-2_pkg_preinst
-	mysql-multilib-r1_pkg_preinst
-}
-
-src_prepare() {
-	java-pkg-opt-2_src_prepare
-	mysql-multilib-r1_src_prepare
-}
-
-src_configure(){
-	# bug 508724 mariadb cannot use ld.gold
-	tc-ld-disable-gold
-	local MYSQL_CMAKE_NATIVE_DEFINES=(
-			-DWITH_JEMALLOC=$(usex jemalloc system)
-			-DWITH_PCRE=system
-	)
-	if use server ; then
-		# Federated{,X} must be treated special otherwise they will not be built as plugins
-		if ! use extraengine ; then
-			MYSQL_CMAKE_NATIVE_DEFINES+=(
-				-DWITHOUT_FEDERATED=1
-				-DWITHOUT_FEDERATEDX=1 )
-		fi
-
-		# Connect with Zip is currently broken and does not compile
-		# Reported upstream https://jira.mariadb.org/browse/MDEV-11809
-
-		MYSQL_CMAKE_NATIVE_DEFINES+=(
-			$(mysql-cmake_use_plugin oqgraph OQGRAPH)
-			$(mysql-cmake_use_plugin sphinx SPHINX)
-			$(mysql-cmake_use_plugin tokudb TOKUDB)
-			$(mysql-cmake_use_plugin pam AUTH_PAM)
-			-DWITHOUT_CASSANDRA=0
-			$(mysql-cmake_use_plugin extraengine SEQUENCE)
-			$(mysql-cmake_use_plugin extraengine SPIDER)
-			$(mysql-cmake_use_plugin extraengine CONNECT)
-			-DCONNECT_WITH_MYSQL=1
-			-DCONNECT_WITH_LIBXML2=$(usex xml)
-			-DCONNECT_WITH_ODBC=$(usex odbc)
-			-DCONNECT_WITH_JDBC=$(usex jdbc)
-			-DWITHOUT_MROONGA=1
-			-DCONNECT_WITH_ZIP=OFF
-		)
-	fi
-	mysql-multilib-r1_src_configure
-}
-
-# Official test instructions:
-# USE='embedded extraengine perl server openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-multilib_src_test() {
-
-	if ! multilib_is_native_abi ; then
-		einfo "Server tests not available on non-native abi".
-		return 0;
-	fi
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	if use server ; then
-
-		# 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 [[ $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))"
-		# Enable parallel testing, auto will try to detect number of cores
-		# You may set this by hand.
-		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-		# create directories because mysqladmin might run out of order
-		mkdir -p "${T}"/var-tests{,/log}
-
-		# These are failing in MariaDB 10.0 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql main.bootstrap
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test, main.mysql_client_test_nonblock
-		# main.mysql_client_test_comp:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-		# fails due to bad cleanup of previous tests when run in parallel
-		# The tool is deprecated anyway
-		# Bug 532288
-
-#main.bootstrap \
-#		for t in main.mysql_client_test main.mysql_client_test_nonblock \
-#			main.mysql_client_test_comp \
-#			binlog.binlog_statement_insert_delayed main.information_schema \
-#			main.mysqld--help \
-#			archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
-#			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
-#				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
-#		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}" || die
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
-
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd || die
-
-		# 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/mariadb/mariadb-5.5.57.ebuild b/dev-db/mariadb/mariadb-5.5.58.ebuild
index 0619086e848c..0619086e848c 100644
--- a/dev-db/mariadb/mariadb-5.5.57.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.58.ebuild
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 324417891e22..66549983be95 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,18 +1,17 @@
 AUX my.cnf-5.1 4658 SHA256 def067f194436548d9d41e2480d309a3727ba8bbfa7328798319fbf37ad5468c SHA512 6499e2cc1382e64be1f59d1e7855737067bfcf360f0acaede5dd357d97678eb55964de66ac0bece2bd0bfd2283997c7f335359242cfe396e21f0391de68c62ee WHIRLPOOL b90ed6abf8c0f71e6bd762f3b66b8ecdef95811eaa8c3374cd5819148e98dc1d5410ca36fce89c976e4997830cd1937f08162f8d2462173468368dd1767e9c08
 AUX my.cnf-5.5 4733 SHA256 197e84650b514dd4792df0bea3c27f9f23dee25b6363751562695f006a38e626 SHA512 6a5d183f1aeb30d9096838ac010c8f2dc004448924b3606bd03c1a5e0336a20fe5fcef1d2cd772977a167268fcff51a4b663f1f73a37d3066983621a8ca6c004 WHIRLPOOL 224e82ee0cd38c7d363dd6542d380e94638e2736767e4562c30efeb5afaf7bff086e964f330a5d26b1c2e061ac164410b96e76b44bc1de13b5f8539c9caeaba4
 AUX my.cnf-5.6 4504 SHA256 d6bfb754105464643f8f2efa14337c2f78a6a6e7e812e998b2ebcdd4b7c6f450 SHA512 866aa700460c2962bad6294b271efad09ef285dd428ab01551078be9972d2f961fbdf56aef7927439784711022e92a96f2eba30cd297f056f6562e8817c89aae WHIRLPOOL c91bb1ea6ef0b974377a60ef7ceb434ffcbf46d3fb57412deaa92930ab83e57bee3771b44a7b374f1df02211562ed5296182a218763145a7c41d96aa9b709afd
-DIST mysql-5.5.57.tar.gz 21044615 SHA256 c1c2bd321e524f92e43fe73d0d6745badd538c984c7561b273ae10e9aef57384 SHA512 493e6345a2d8ec407fcfc6ed5b67599c77b6351b7cfb1d676b39f68ac9446959cf0822c0d0bcd2206cea07b8c06c85734aa8501c938d6393ffab220f3f5ee6e8 WHIRLPOOL c321bfc26c7b5a1bdaddf2be9de84c174869743034f4d5b483767c0308875bc583f6705982ccb4935794b8ce94a1234b2b8561c933cced5aba11f48e93fbfe15
-DIST mysql-5.6.35.tar.gz 32167628 SHA256 dddcba169b98844d7c65346cbd791c853edf942d78440381685087b84aa35020 SHA512 106c4b05c52cd2bb5378376e4a453aeb55eda0adce527862c435068597c3e60f44e3c64476011befefd688e6fdf30f2245e28320d57d9fccbb2415d87498e7f2 WHIRLPOOL e8972bba163453e54dc3859a7cfd07b4dc38125e0b5f7b41940afa6f1466820079f18e88769ea198b12645383d105340ab5ea998b32a95d083d08689658510bc
+DIST mysql-5.5.58.tar.gz 21045852 SHA256 9b6912faf261555c8975db24a987f63f36aaa28052a301e85538346ace0009b9 SHA512 a57613034bb7456827d2dfa3e6d1fd006c3bd3f61e6ad4e882bb36a11beca4cf3d76b6b6d2bf0ccdb115d6896a08a7a20d0781a31e22abca2562b7b9a81614b0 WHIRLPOOL 3eb0ebafda2a43982f86c279fdeb32e03593ec8f77e1d9db6b773b14b5a7f18d282bfe5871ae9f8eafc915d909c04f05486d25247bb8de16b41850964057bafa
 DIST mysql-5.6.36.tar.gz 32192348 SHA256 0af81a5538fc7fe2b747295dfa96589ace8831d2a7d4a26660fca456babeb147 SHA512 b3e3bcb1d1e913994f274f4c6dc72c77f1f52b132389e784c675d1720b5913788ce035f045b99ef3754d1b257db55e8300b5c7622ec79c33afafec5968801c18 WHIRLPOOL 628e33a58532dcdca20e489c3120824604b8d51e10d609f1f9c2adb11552124a8f87f206df99766162d288d5877dac22d2cacffdba1458c73fb52b529245a1e6
 DIST mysql-5.6.37.tar.gz 32200158 SHA256 59c4ed39047279ddccd1bed9e247830d2bfad27d56dc2eb48d0b5695c94a1fbd SHA512 6935cf11490fb32832468e2a69a9d81a567b1b4ab0afaa0614896e3ddbb95a74b26406284f307637e4b2b9620ef4d96a167128ce7fcb1d338b0ebbc2cef2e597 WHIRLPOOL d5e7f6445bacfa7cb118a805f0efff5f4c22d96e77c174efa7ae2d286f3889ab7975ece8a0abe6232d278994d5991430d0d0ff89769883f278d2fa233341db25
-DIST mysql-extras-20160212-0233Z.tar.bz2 297332 SHA256 01a52587ef1335b2795197d2e547c0b3a1e4b705db09f96cdfb45d2152b6536b SHA512 956dbdcb987556c0625944848f97a36d096cd1f1712a2e051dd027f2856d3c6e94a18d23faca71882260c4b12ee329e3a5f569443b877a3c3e5e88146bfac916 WHIRLPOOL e3837d329ddd137be60fe9d0b37f35ed2e0e7fe1383f38ee45617be288ae318a444e6befdfbaf64b07d4a88ec47fec5cd88d733ecd5bb32ce40f3ba8d09573cd
+DIST mysql-5.6.38.tar.gz 32197625 SHA256 18f249752f6c64af6e39c5b99c89ee1c86d6eb7fac853707603453cf584c54f3 SHA512 8144aec822f053fbdfa11ae542e96d3e7da93552b60ed131f041ec4832f48c95025b322340a2e90a82c18b6ee6bfd708f209735f82e37532198245aad697b93d WHIRLPOOL b27cbf4f36bb805389dc7f335dff31d03666842bbff0f98852a4e0ead1766123f0f52d28fa0f42da6399575716b15e55714d34b7797599f11e5cd77810be8e2c
 DIST mysql-extras-20170302-1359Z.tar.bz2 306816 SHA256 0375bffa8a7b26caab3a13be299b30231f20ad3e8dc82fba9384e5463763a105 SHA512 2c096c68e0d545c98fb5520f92b9e85f6bbc910853793f60f0e67979ee927410bbecadece3400364fdc2b5682f9105664f6a2de8fa0ee1818fb266e063e82869 WHIRLPOOL 6629f0069b77c9add86f4a40168a1dad7bcc0ae18a513f05e44619366a5fdfb82238df2e925de88c358fca2dd50f162ffefd8efea335cb544ccdcf74e73ed25f
 DIST mysql-extras-20170719-1335Z.tar.bz2 311350 SHA256 725dc29fa4a553cfc0bd07dcc1259e5a38a6d945f757e9f49f554a9a7773abe7 SHA512 3450725b4cdcf1e330aee775c1c169510bd7f06f19b874a3e94203227d393b136165eca1e77270bfc37c534f4120aeeeb3df8fbd71704312836b79a99d81a122 WHIRLPOOL f1606df56f82847a8b4b332c1b61cb695aba2a51aef895fa9596495d89208535f829b8fa69a6e97a26d0b9171d817115b83ce447c8232197353dda258a6d38d0
-DIST mysql-extras-20170719-1630Z.tar.bz2 311320 SHA256 d21f42035850a3208a89d4271d2c544b8ccbb3b8855390b882248561451ae4cc SHA512 a2369d512b8e490b5859403c4c15cf9d8ff589000e56785f0fb02ad99535af189fe93ba9590035bf0b8cc1d0c7f3656c56d86d94d62ef97fa63cdaeade609f38 WHIRLPOOL aec2eb79350008464499f74cff002589628fc8e4e81970cbcf1d7d3ca0a7714d9ebc6408c7f25e037f452fb0b3397e7885dac83277884692eb3a88a26d6625c4
-EBUILD mysql-5.5.57.ebuild 4402 SHA256 3d8d94b5182b29cddb804f3b20ec99307186801341d501f27a0aeae207987b86 SHA512 35a7ea9160109174197c258d504c929e04b094d8e5cd5bfeb47d1155480b8f665f9edfecc1e3a53024536f8be80604da2b06f24d26246410870144b453a672d8 WHIRLPOOL e26942baeab07d395e9cf031acd354471e7704262de623e8fb22e1e9990f8eb7d0641e4c0163ede64061ce118fba4735e5ca9e4e98a1daf6874c12a84037ceb7
-EBUILD mysql-5.6.35.ebuild 5423 SHA256 b531c77f6d65f2ac0f557cf799f191df2ca1a75cc7af703ba9eae37e0c55489c SHA512 2a59c6801263a127b0a6a00bcace61677a98edfee5c79b2ee83bd30d3cb9d55d89a4409d37a4af4af48310966ae0b04fd1461ce370e1278bcb8f24eba58cccab WHIRLPOOL d0281c0403b9f8fb9e7b90aac330f348a8b4f0337cbd51b6e289f3dac52822487ffa5b31c82e6d8417a846a89cf27a59b1b592165b047f1ce0db09e4540634aa
+DIST mysql-extras-20171018-1948Z.tar.bz2 313540 SHA256 6b910637f7ac2d5132154357db46f47b585f6555846d5f1922e85954e93a527a SHA512 35ba9f3c8462ae188e47f5973e891cbd72e5d742e92fabc09678f93c83bb26337ae11d6fa8400b2a8c5125ba2a771f780e008b7448e3006446b13d3e51adcaba WHIRLPOOL 480c0aa3353076864795f0646a1c833cfeaddeff21e26404e98480f73ff6f4866a9ece39e7dd88e0d1a4ee9c820eb1fd31a46c09bfdb18537f839b0460fc3443
+EBUILD mysql-5.5.58.ebuild 4402 SHA256 f90aaf2c42115fd18c583cc2069f7d3e8a9525dfd9633456f4d24e024620cd3f SHA512 1e1a3e4a0285cd2b51763e91dfdc95daff97d2a2739d0b5938b1f2cd7f95dad33f01b66b0919943550a4f07922b33b69462528fc5c40f501e919444d22ef9916 WHIRLPOOL c7d790a65fb55a1676bf079ed8c18c710e41958a72cb9678c88a756a3d96d6894ac3adca9933b3ad3728bbae5ebebf3979b28146b0b5ee6bd1276fc675f85611
 EBUILD mysql-5.6.36.ebuild 5950 SHA256 aa2069134693657f666cbf7a100701e334a74f2acdeab5b609038d2ed79b6c57 SHA512 864b0a2be4a822855369c19a7c2879b9909caeb607181dc8e6b88617abd32c6ac93f006135a2ffc14a72f170d02a5ea9c80274e3c1cb0c00c253ca365583ae55 WHIRLPOOL b335dd3da99eb6d28a12d85ae1393aab72a9c9af67b3c8087d187fbb0b7f89cf3b69598e76c3f07e74636a0205808ce584d570bb6b9e2ed5b3dbca856876e730
 EBUILD mysql-5.6.37.ebuild 6169 SHA256 4ca65730c9608696fe46ef85933ce11076410aebacb5d0868665149c0664170f SHA512 97c04c4efc40db771592b0c5835b48520b3b5c6e99084f33c43cfae2f74883b99ecab35d8bd646bfe5e18717dd398ce946695d82bb8f7431b914e7060c8603d5 WHIRLPOOL edb2d8e3f65fb1be6a2480442aa72b027cb6fdafc1a541cad3a9d654aa75b18f2939512a747d1926593a9b62b0456191bd4a54dc1346b455575dde31ab32aed3
+EBUILD mysql-5.6.38.ebuild 6238 SHA256 6d9a62e5ec21b8921c1abea734b93e0ffc2572979516a988520a8abc0861a34d SHA512 33d8e28a27d890f0664449761d9ac2855a83cae0451915acb84312f5eebde1a68ee3421b4c9e503936218ad27b25faa9e5145173266532e8d7ca90f7e2fb05d9 WHIRLPOOL b33106c5da2a37d7a293842559086ce1dbf5ae22cada4f56eae34886029686f1c9775bae8469e9b4c3985c3d4906d1ea220d3e0a4ee187fa3ded73e18b5daf16
 MISC ChangeLog 18776 SHA256 3ff64ef7497a470510146081692817768857fd4f297b98a184202f5fd06f0a47 SHA512 bfcb679245574135e7e0b7f0592771954bba01b6977ca4ffc8a37de181fb7fb60e6bd8b7c23cee0d41c4397341d282f28d43fed11eb176f12178123e0f8032e4 WHIRLPOOL c4601fb0d1ac3238f2d69a439463d66a67d843c197a55f4d9b436493e979393047b9549053fa00b46a3ed3719d72565ebad38c35ace3abab145e751212c047a8
 MISC ChangeLog-2010 108404 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd SHA512 5f54b7c2e25d27680a9313da2450851118e34a57202d9f36f59da52834ca3b587701d93868d71bf684ddc253d49f87837c8d7e2d442f2955dfde8a701150fbe5 WHIRLPOOL 55f758942e3012aa0ae7d529c2f8b6e0d8f4d7cbde09039f16cd05f0a58fc4e3e09ccd50e366effdcaab4641300eb0f494ddbe3a35a645ced8a9d747d80e9821
 MISC ChangeLog-2015 27542 SHA256 997fb94e9984a271cfd68316c0012c16f78234b1aad328c2c5e97e2940f7dcfa SHA512 f07244cfb59f613fcaed97ad0ed135857ba995b616962b145548ecf84176666986fc9fb5e55ec543110755e73d316ee5a733cfc1ce14eb1ca2a1449adfa50859 WHIRLPOOL aed27d4cb6a7cf33d354fb559268baac8c7977dd9cdc821b12af8008c94dc22d0dedace9e33caae6bd676405a3a02628e1a8ae8d3baac46af33b95251a94c70f
diff --git a/dev-db/mysql/mysql-5.5.57.ebuild b/dev-db/mysql/mysql-5.5.58.ebuild
index b34282c99920..fdf3c8d8ebc5 100644
--- a/dev-db/mysql/mysql-5.5.57.ebuild
+++ b/dev-db/mysql/mysql-5.5.58.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-MY_EXTRAS_VER="20170719-1630Z"
+MY_EXTRAS_VER="20171018-1948Z"
 MY_PV="${PV//_alpha_pre/-m}"
 MY_PV="${MY_PV//_/-}"
 
diff --git a/dev-db/mysql/mysql-5.6.35.ebuild b/dev-db/mysql/mysql-5.6.38.ebuild
index c173b55fdf5e..35dc3122c0a9 100644
--- a/dev-db/mysql/mysql-5.6.35.ebuild
+++ b/dev-db/mysql/mysql-5.6.38.ebuild
@@ -3,25 +3,37 @@
 
 EAPI="6"
 
-MY_EXTRAS_VER="20160212-0233Z"
+MY_EXTRAS_VER="20171018-1948Z"
 MY_PV="${PV//_alpha_pre/-m}"
 MY_PV="${MY_PV//_/-}"
 HAS_TOOLS_PATCH="1"
 SUBSLOT="18"
+#fails to build with ninja
+CMAKE_MAKEFILE_GENERATOR=emake
 
 inherit mysql-multilib-r1
 # 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 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
 RDEPEND="${RDEPEND}"
 
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+
+PATCHES=(
+	"${MY_PATCH_DIR}"/01050_all_mysql_config_cleanup-5.6.patch
+	"${MY_PATCH_DIR}"/02040_all_embedded-library-shared-5.5.10.patch
+	"${MY_PATCH_DIR}"/20006_all_cmake_elib-mysql-5.6.35.patch
+	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.6.22.patch
+	"${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink-5.6.37.patch
+	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.6.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.6.25-without-clientlibs-tools.patch
+	"${MY_PATCH_DIR}"/20027_all_mysql-5.5-perl5.26-includes.patch
+)
+
 # 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
@@ -106,6 +118,10 @@ multilib_src_test() {
 		# fails due to bad cleanup of previous tests when run in parallel
 		# The tool is deprecated anyway
 		# Bug 532288
+		#
+		# main.events_2
+		# Fails on date in past without preserve causing the drop to fail
+
 		for t in \
 			binlog.binlog_mysqlbinlog_filter \
 			binlog.binlog_statement_insert_delayed \
@@ -119,6 +135,7 @@ multilib_src_test() {
 			perfschema.binlog_edge_stmt \
 			rpl.rpl_plugin_load \
 			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+			main.events_2 \
 		; do
 				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
 		done
@@ -130,6 +147,10 @@ multilib_src_test() {
 			done
 		fi
 
+		for t in main.mysql main.mysql_upgrade ; do
+			mysql-multilib-r1_disable_test  "$t" "Test $t broken upstream - error return value not updated"
+		done
+
 		# Run mysql tests
 		pushd "${TESTDIR}"