gentoo auto-resync : 12:06:2023 - 20:20:47

5 files changed, 70 insertions, 78 deletions

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 94dae22cb893..953c193e1983 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -7,35 +7,34 @@ AUX mariadb-10.6.12-gcc-13.patch 1145 BLAKE2B 592d1699bf538c7cccac59ba694b5dce98
 AUX my.cnf-10.2 140 BLAKE2B 3a56b7e38c3dc00215cae4bdc3270e30e85299d3290c0c995a611e4b8b15e66f40d6ac40ab18369e7863742ab6eda94259be5a7f363a26020c6fce28a7582e94 SHA512 85c650670e364f5f71842d9ab07b59c5de6e26e774e7192102562e56f94ed5f8fbc487cef31c134209c22b72fde38f7f53b7279cead97a8af608436d1ecc8857
 AUX my.cnf.distro-client 643 BLAKE2B 5ffd286907ee28c92c85bbcc9a6266555733f1115f2d6b8009183dba6939b978ae8d1b8e0a53e672b8e1a1f621650399231723603fc5f96ef7218db84236e176 SHA512 801f6ab8be3110bb4dc38eaa4367715b8d342b69cadfe13dff987ef6c3aedb67d19449f8f2483e63df5d8b444ca30701b0d96f85e211de6b1e3db923b029acbc
 AUX my.cnf.distro-server 998 BLAKE2B a7f2977a96d394cb7e24d72d82a1c21095c4b55607e5ca4a2c10619278796c328931a5ec076c15b60afef370c2e5da02ca0c628f330e876b4d2c984eeb54df5f SHA512 d9ab6f7fdfe08e6c242f84410ec680ef6aa6778c4bd55fee67c644e1a7d997446d8ef2129be6fc9833d16fe40cf17e09cdf0cf015f06bb145bbf9cfecb51e882
-DIST mariadb-10.11.2-patches-01.tar.xz 5116 BLAKE2B 63fb7efe4cd66b72286a3ada0d739bbb838e6867dfcaca97df87620b6fee4523a97a3d6f5099fcdab1daf17c6e3824cd0084462331eed2f927b4d9835a518d0d SHA512 fca27b3f1d586ad880f5fb87c06bca73a44148ffc0d99ff5bc79e77125365e323e603ddc18b7dd0dbf3b7c2f77c807433610e6de990c261d671c875bff1277e4
-DIST mariadb-10.11.2.tar.gz 96372411 BLAKE2B 50ab57a1bb23817bebf992237055a2cbb8c946c325e29fef93b45dcb3be5212b8bdbf21d12eec15321712c431e0a9c3f924bd2b99d52cc829c12bbcc2513c6b7 SHA512 500e26461d36f16fb213b34db2795efb4e66668d443af97300495ea6978decaf3f49ad3f5a347822c6ff911c204a3e2263cb4351bc107aca0187b3474101c7b3
 DIST mariadb-10.11.3-patches-01.tar.xz 4984 BLAKE2B abc78c83505c745ab7320b99dcda8c667fed8332dede466142027b24957fa9ff3d03f8402679ce6cffdc89bc9f0559f8c717b7ec9df52a2c5db39195f096d731 SHA512 127386c9dc8ce242d9d309e31b9357a928ba816d24d94d60cbc8723fb3bd0fb136c7d049bfb37aac057f9ebcc73c155ac20b8bcf2542f89401140728c2dcf29a
-DIST mariadb-10.11.3.tar.gz 96761750 BLAKE2B 8cbce050faa3f1bd59115c2deadbacf3beff7fa4e0f9c3b78d338f8046e5e383919a9de90949574a5a72c1692dda9c1a47e32ab71030db5ea70dd6e951bd7822 SHA512 84de65230a99d7a0b2079cf1287723a30cb86e5c4f8e756503b260b8e495b454ed15fd5b959c9c12f6d8db2610993f3c8ff92cbdee6520bfbdcd5763dccdae07
+DIST mariadb-10.11.4.tar.gz 96770117 BLAKE2B 562f00691efb425ed58fa1ba2fb96613d5de1568db3206c4635322710741e29d677d35800bddc4f304cc410ada7dd77b1ecbbfe46ed9ee925d020d5941b9b610 SHA512 62fc05395857dd036ebeed53b1ff0ecd9abd95ce8e5316194286521caae0f9452cf96a93613adec809e39e1d8ef20c330b24fee82b3bb90ee27a84f2bbd0d8d2
 DIST mariadb-10.4.26-patches-01.tar.xz 4528 BLAKE2B 0e1683ca254fa4beb06239c377f241e6db2306b386d125491ea39dddbe82c9471f1dc7c26001f2c5ba105913f1ec707ce43482e9581b807723a8690c26fc6e6e SHA512 7b54419ea7a974bc275c72770e63d37e116a2724ed5ce404a04acb622a95ae652f9a81c2ece0dd3d1ea41401dd5428627af19f7689fd01eb68471309ef4400f7
 DIST mariadb-10.4.27.tar.gz 94348724 BLAKE2B 3e34b66f645798fbb48def30177f95afaff985c7a4f0063e58131f08f7599053a65c9cd9da9940d986ace1e5b78abd8e4885d990b9705e4c10093040df510239 SHA512 22865451b0e3caaa6c886f68292af95c02eb18c37d545998eccda952f125c0983ecb358f4deebaebb9a5ed30cfd947e8a1457760f0d985e7b738c03437ed26a2
 DIST mariadb-10.4.28.tar.gz 94731133 BLAKE2B d0419368f3eb73af3e49adf72bfb21f8f763b6a6aef3035b3eceeb0557dfff72df662f80a8147ce2c80c5a776f7aad8bb15a146739cc16b64878b5b2f153336e SHA512 2d66380dd65aa85bf8a142fee18faecef10562c5c31e17f429afad9dba5a2b373b5b400da2bd42e5d78b7f01f3393ea0a46e0ed17ec1e0820f42f7b838f56f0d
 DIST mariadb-10.4.29.tar.gz 94859830 BLAKE2B f9215c3e7cd50568d3a1699e70756ec4a7726bebc8ba3337e54f8fa7ac31468565921077b3947a05ae90972e1f7b4769d1df0d866fabd2403ea972729e5f37fa SHA512 4cd8b7dd1ec21062e348c0078fd339b73bd6a819ccf3f4706f58bcf42fb50ceb1a655acb54f6c9c2f89decc1857af2016ff1772dfefdd966aa1f60f8aa3ea229
+DIST mariadb-10.4.30.tar.gz 94859480 BLAKE2B cb0be056d8cf77568c973c0813f5d4676b22436716b825c0696dad629cd55bb81ff94322752151d22923f71fa653472ccb7c781d315ad5c60f45d4dad976b4a6 SHA512 e32dda949983e894eeb6fe885e4b3ae4db9715772e029a4b7b369fff301877038567a57e5a1d75e983b70b36c8fbca4fab221246e7b44e1cbb1bd310ac302bb2
 DIST mariadb-10.5.17-patches-01.tar.xz 5124 BLAKE2B 74976beee48142294d1dcab73e9cdad40392619115184ab5da5553d28b9a10e415711fac84c4290affe301abe0047c99c5a31ce9dfd58c923cfa15346b9c5acc SHA512 b3ffc4a227fcb4a85575fd093b399810c433686a97518cb0d2b47d61c623bbb760b40c5c9d7752fdbb24e3e41740e8a85c3096f6269c80f6ecc2ffc73d5ee94b
 DIST mariadb-10.5.18.tar.gz 111568643 BLAKE2B 39067475c00c456d0cb5e79eef063665db81ec98216b0c1969428edd7d5651d44186eb01d301aa4a7322845e401e3667f54128bd8aced2a88783c8a397ae19c1 SHA512 1fe13db1c0b66d2bc0c4d80e2c278f6e64027aaeebebfa5a179bd8ca92ae135ae53b72ed26c9b6d35b35fd2ad2a3cb390fd5ee0715b22d4bfafe773f950d804c
 DIST mariadb-10.5.19-patches-01.tar.xz 5156 BLAKE2B 9e764f11dc5ed1babb2b34122f70e90e3ca8765a6f5860fb70e71bbca69311656645b7178332df7d8c2cbd57264d3418a2707558fc2ec332b031e600b545af01 SHA512 ccbb3d64eedce9abb76a40b7658b19487a669f585c95138590e47e1e47fe84e761a20d733ce1c8a413099d23bc52f032e8ac20644d9508e31982d418058c963b
 DIST mariadb-10.5.19.tar.gz 111958233 BLAKE2B 0dd89fe0a838710d7307e3bc293f31232ad3c2c36d48c2899fb46b4fab87234f401224a07ff3da921370fdace3f3c972782c419be3479ab686fa46d31f8ca8b4 SHA512 4a72ca4dfee0d3fa5432495f62c7eb03addc067e2f023b1ebe32bd1d3a0687c2c61c3316c0c4f690db4f74559bce668c6accbe137d906a52116db2bb2f454699
-DIST mariadb-10.5.20.tar.gz 112088768 BLAKE2B 758e04acabf336bfd32e9b0909a39d34754b2541a88d21ab8bc42a874d3138f16967374bc2df24560d59004dcfd54a5a383254000c862bc765ed745651f28d11 SHA512 93d847ceb325262b711956e9d9c042ce419ef6d282cb5ed4fa53faf2ffd72eb1d2fdcebdf413dab29a6a9924b1bedd75d6cfd89da1ec10d3faae6ae524eb7046
+DIST mariadb-10.5.21.tar.gz 112102574 BLAKE2B 280c353fa6bca2076bc0e567f05191e226fb74ab1bfd1f396313c371ec4b4ee5d4f2295ef9d26ff4ce7c7e94b66f53ed58c86ce79e421d01115b45c9e7a5765c SHA512 b95d66e32153ae609450a98da2b32d7bccde80c4cb41070655084d2064d713b21ce460ce275a2b84513dec2567f44aaa2c358230bbd620ae13a0829587339e0c
 DIST mariadb-10.6.10-patches-01.tar.xz 5240 BLAKE2B 4c41bbb5a81ecca3e9ccbdfb0861189575e5b3edfb1019465c8dbceee641a8bbeb3e54f061ff3ec44fb5ff3bca960419893429897db4a919177c390b44ef7e49 SHA512 aee039f5e771c840e2a5bb6f6f5fcbec06c0bbd7fd5ce155f0e6f3694595d5d2a0e38f25972c328fc9f69dd68354434e40c5e9a7b2d509d7ea795e097a57864d
 DIST mariadb-10.6.11.tar.gz 94742041 BLAKE2B cb5ff7a9b44814cb56f715c92f9d136070872889c0fe2d27987f62f75b1c787ef4ece81ae8bad9a944cbb4c4416fc23587fdab366ad1181b319eb3a0bf40f91a SHA512 4b9e8e16651329f53eb19670dcc7f5dbb11ba84c28cca35bc7d216c5504b6db698ab65ce42c30a34ab967c1b14e6637c511ac4b49f2613b01f6dd615288cba98
 DIST mariadb-10.6.12-patches-01.tar.xz 5120 BLAKE2B 5c5b25be056edf2ea665ed2ceca3af7012c9d4b07a09c8e5c892a7495a83bb297bdae3b779048b83919791d118f6a4e938284f0db4580cc864b855eee400a88b SHA512 ef6c468bf28a00d5424aa12e9c2909eec4f77e74ce9d128404824fd6b9d48a7cac7fbcfb623d3af279a810af1d0b0b3f30a1651599ed0a04f972ff1f6d0b5c7a
 DIST mariadb-10.6.12.tar.gz 95085449 BLAKE2B e915601e53c9ebb8c0f2b0536d6adb9bc4a0268fd0e5808ff851f33e6c49571e4edb66ef6c11511a65331a292c8431cd71be75d5ffd786830b14f3b843d210f2 SHA512 f6d5178ce2a4d755367bb805f23e849824ee4c982a01a114c35a13d250a9b3b2a93ac9b745fb3685fd9e6b44deff0b5c936b43e5441d3af8a300881109db0549
 DIST mariadb-10.6.13-patches-01.tar.xz 4984 BLAKE2B 625d04310b02aad4fec4b633e9fab06636364f3c5ed3cb88e89acd4224786c3c9ed478b636ac699e77a888b73dab12cb279df41d6095e93e9c4ae3a159570286 SHA512 1e6ac167bfd77570e8ff5955aaa9a101d9387ac4857d856f1fb8c9a489c4c2a154481b9385584435e8dc95baef0dd3ef6831c7de2d6f004401cc338edcaa9d12
-DIST mariadb-10.6.13.tar.gz 95285355 BLAKE2B df8587d2634fbf52aa6db7ccda3ea9799fc42ec841d879ad3194a4bc841030cbb3dde9e2b7c0a279dc4463445d454b5ba89b28a7bdeac8f9d625f8be9c031a1b SHA512 9be4419cbc3a40281a8e6b7c08f22b042120319c3fd21cbbce42c8142d35209848516dd5171413e1c15714df4747e9003563244ca93d07ec6deed379cd13a370
-EBUILD mariadb-10.11.2.ebuild 42465 BLAKE2B cba5be2d20ca87c9040920a733130be09f6cd44a7d65cc5b898270c5b5bee16905541ec984833d2f80483f2797ff6518838d605376cde5ddc970bd60f6196a74 SHA512 07400bea7d88a11950379cac054c46ad523c83e11435d8c2a6fc598feaa2c5d45fd025cafb3a9f6ef6e28fa3dc394f5a777073fc8d6c196104c48243938cf2ff
-EBUILD mariadb-10.11.3.ebuild 42465 BLAKE2B 0a91fe40b6a3c86ae75f4542342f7ea421f5451a1a611b4958467e61e6879942583aabbd6e5c67f62656b39bac2e4675ef316cc42f0b5eb766327664873c190d SHA512 0c3f8568725b4afa0a719af711f319ccfe3555d1c7be8a3e92345cb3a029a5bc53086250fe72fff010ad55f114ea67990dd2bddb06f32033b0975eb9d89b2f0a
+DIST mariadb-10.6.14.tar.gz 95286643 BLAKE2B 4a186f3f52b63ab7321aa7556776ff8a986bd602d78dc6a143cc3bfdfd8cc09b0a22688cba02b8907f4b3f0d1e7c640f5caad768c1e89486d6af24e6cf3168a8 SHA512 11b88480ac61303172e98ed3271c8172e840cded5175caba1469d6ec063df647b536ee6e95f110abd8d95d95c9b8d7edf1cb611113be225d5e8eeb2041f86438
+EBUILD mariadb-10.11.4.ebuild 42465 BLAKE2B 0a91fe40b6a3c86ae75f4542342f7ea421f5451a1a611b4958467e61e6879942583aabbd6e5c67f62656b39bac2e4675ef316cc42f0b5eb766327664873c190d SHA512 0c3f8568725b4afa0a719af711f319ccfe3555d1c7be8a3e92345cb3a029a5bc53086250fe72fff010ad55f114ea67990dd2bddb06f32033b0975eb9d89b2f0a
 EBUILD mariadb-10.4.27-r1.ebuild 42101 BLAKE2B e81c6f5f58acc48f06bf63adc7a9a389e08ff9650ebaf36037665a5d9f2a6daeb3b3c2046571514a701ac5ea1627c0635a99bf46a6a9d08e9d0c7b95f684217a SHA512 5c209245d4bb2f6cd7bc7def08809454d5ac9d3cfa0d52365c1c96449eef42f7958f9f1cbe514227b06d2dc5b15d3457035f96a1f688d90386afd888e7be7e29
 EBUILD mariadb-10.4.28-r1.ebuild 42251 BLAKE2B 1170da78f58814201431b87aa8bf8017f2543a245e0416e02af514262063176f9bd6ac6099cae8c466b708627559c2bf44026adf9012e5ae7f9a679a6832e2bb SHA512 5a72504c992e835dfeab5a5fca6bea109577fb92eb8241803fed61006652a0c3e7f9fecbfad46039b890a1d432e30cd219edc7d662cb0154a20b4817fdee8518
 EBUILD mariadb-10.4.29.ebuild 42204 BLAKE2B a1fce5ae8cf6a67a8acd545c0dc20c6cfda568335db2356b2a94814ebda6e7dba521578988b9242da0ee89c0cf0e09383ed2fb513965555cf859bf143530db94 SHA512 9575aa979caf13894a657008a58aa88dbe5d92318524411beb5551a5b3598a7ae64cbd3e34fb6660dffa12f593e6f3ef398734e94f1aea2b8629924596657232
+EBUILD mariadb-10.4.30.ebuild 42204 BLAKE2B a1fce5ae8cf6a67a8acd545c0dc20c6cfda568335db2356b2a94814ebda6e7dba521578988b9242da0ee89c0cf0e09383ed2fb513965555cf859bf143530db94 SHA512 9575aa979caf13894a657008a58aa88dbe5d92318524411beb5551a5b3598a7ae64cbd3e34fb6660dffa12f593e6f3ef398734e94f1aea2b8629924596657232
 EBUILD mariadb-10.5.18-r1.ebuild 42060 BLAKE2B d94d8f43dbe4189eb4d05d801c9b53058b0d671ad47a5808d583ba3c3521389a2c6c946deb1a7834823135e0d62af98fb3bf2b8f2630651f51bf55ef1c3ebe1a SHA512 93cffc2fd62f343507818e237f24c6b80a08afe5126d31ac119f0b942134472825a3e75d1409e7b6cacb2e7b6c7a5680277445b0aa3bab80933b010a9b642c15
 EBUILD mariadb-10.5.19-r1.ebuild 42260 BLAKE2B 8ea6c803f5fb5d670e9c2a79bb8b0c7a6830d27974e330727b8221eadc8b901cd02c8cdcf49d0ae1750a500615ac25257ba436be1ac648e1a8d1d68ebff4c53e SHA512 dccabf1c7dcbf62585bc600820a99cd9e800a235bd47baeaaa5e3e16d7ec0fe2365f8c8c134ed57c86471f430437570eabeee7f90e2e41c2e68bf0af6e6370de
-EBUILD mariadb-10.5.20.ebuild 42163 BLAKE2B e7dc05827b4f35fd03e592c9687cfc412b89c98592395ea64c64146753ba475b8040b7599f6ecebf1dd7f11a5e1184977c8e8669485798da87be0bf0019d381a SHA512 fdfb313add7f31ce2a94d4982fbf8420bbd0b003262fe8469fc7d76f778666c78c1cc33e789b24db735de0afaa7fbe06e660b6a1986b6bd098c843909c2e57b4
+EBUILD mariadb-10.5.21.ebuild 42163 BLAKE2B e7dc05827b4f35fd03e592c9687cfc412b89c98592395ea64c64146753ba475b8040b7599f6ecebf1dd7f11a5e1184977c8e8669485798da87be0bf0019d381a SHA512 fdfb313add7f31ce2a94d4982fbf8420bbd0b003262fe8469fc7d76f778666c78c1cc33e789b24db735de0afaa7fbe06e660b6a1986b6bd098c843909c2e57b4
 EBUILD mariadb-10.6.11-r4.ebuild 42723 BLAKE2B a44662046dd3b9afafd02c1dcfeed4c3a3c2a70d68638002b6374f98289c64a8bfeeaf502011b894263ea01dbef748ed6c22f26634d56a47ebe2572e4d826070 SHA512 4e78f69cfc56a80165dd754295bb9486d85a436f79516f835338f41da4bafc1c7ec760d0dfbb077f5295f271d657382f4e98873022464870803aeddc87963286
 EBUILD mariadb-10.6.11.ebuild 42589 BLAKE2B 5e8bbab058a222bdb92ed35dfaec0e9a8a3849b585b29f0dbecd37ef1c6396ec0f7c942108940d7a75685dab4ba0bfa62197888f4e207a422c174d2f15a9f5f1 SHA512 10cffb1fc77f316629f9c2aafa1ecc2b7b07e35ba179b14bfdbc2e89bdee0e0b6ad28d5e9b9b15895b8792b70518ee648da0675cea65a363de8787a7bf757d05
 EBUILD mariadb-10.6.12-r1.ebuild 42770 BLAKE2B 05575a0a02e2d331cc31463e29ebd73463620c471451a894e427de20d6a697914893e54bc94a9a26b80bacd4a7ac18e95a09fbd83c26dec4d3f694cabcd653a0 SHA512 33a35a52d9dd1bcbc3ed14ff8690bd7fab8e19765c99095b84c2434bf38c037d9e56253a10370f01243a2abd55e405a6d271eb9a7a384f1e92afb60bf7df265f
-EBUILD mariadb-10.6.13.ebuild 42711 BLAKE2B 20d9e969865fbc13543e6b30ec130363b202fde8428900d8050e80e0b72218cd824079038963f975ca76a45122ae67c8bd6d5d97352d94ac1635c233ab5c872c SHA512 b39528257fd34de9d158569d94af7f32f0933d82d1790298ccdd06be3289cc7f36c462cf0f59cbd06eb4acdc0ad82f54ed4c53d8b93c54bf45f2c47949b8d1a5
+EBUILD mariadb-10.6.14.ebuild 42711 BLAKE2B 20d9e969865fbc13543e6b30ec130363b202fde8428900d8050e80e0b72218cd824079038963f975ca76a45122ae67c8bd6d5d97352d94ac1635c233ab5c872c SHA512 b39528257fd34de9d158569d94af7f32f0933d82d1790298ccdd06be3289cc7f36c462cf0f59cbd06eb4acdc0ad82f54ed4c53d8b93c54bf45f2c47949b8d1a5
 MISC metadata.xml 2481 BLAKE2B 09059dd62aedd2606c213bce7f1448ab4b2888a7e444555d103310af4ecbea9a78dc83dc1ac0b695e0c201d2afe2ccdecbd42fa4b17b63917d76d2e00727f0f2 SHA512 35d6cce29ef52f5843cbc0282e93fa01d36c3911d37074af448e1db2de483633e527671cf60bfdc708bd249f6b62827b159ff77d5bc00087d95d2631bed79e5d
diff --git a/dev-db/mariadb/mariadb-10.11.3.ebuild b/dev-db/mariadb/mariadb-10.11.4.ebuild
index 390767389c97..390767389c97 100644
--- a/dev-db/mariadb/mariadb-10.11.3.ebuild
+++ b/dev-db/mariadb/mariadb-10.11.4.ebuild
diff --git a/dev-db/mariadb/mariadb-10.11.2.ebuild b/dev-db/mariadb/mariadb-10.4.30.ebuild
index 66cffe403316..e6a6f3ccb39c 100644
--- a/dev-db/mariadb/mariadb-10.11.2.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.30.ebuild
@@ -9,27 +9,30 @@ JAVA_PKG_OPT_USE="jdbc"
 inherit systemd flag-o-matic prefix toolchain-funcs \
 	multiprocessing java-pkg-opt-2 cmake
 
-HOMEPAGE="https://mariadb.org/"
+# Patch version
+PATCH_SET="https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.4.26-patches-01.tar.xz"
+
 SRC_URI="mirror://mariadb/${PN}-${PV}/source/${P}.tar.gz
-	https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.11.2-patches-01.tar.xz"
+	${PATCH_SET}"
 
+HOMEPAGE="https://mariadb.org/"
 DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="$(ver_cut 1-2)/${SUBSLOT:-0}"
-IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
+IUSE="+backup bindist cracklib debug extraengine galera innodb-lz4
 	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
 	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
-	sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
-	test xml yassl"
+	sst-rsync sst-mariabackup static systemd systemtap tcmalloc
+	test tokudb xml yassl"
 
 RESTRICT="!bindist? ( bindist ) !test? ( test )"
 
 REQUIRED_USE="jdbc? ( extraengine server !static )
+	server? ( tokudb? ( jemalloc !tcmalloc ) )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
@@ -38,32 +41,27 @@ S="${WORKDIR}/mysql"
 # Be warned, *DEPEND are version-dependant
 # These are used for both runtime and compiletime
 COMMON_DEPEND="
-	dev-libs/libfmt:=
-	>=dev-libs/libpcre2-10.34:=
+	kernel_linux? (
+		sys-process/procps:0=
+		dev-libs/libaio:0=
+	)
 	>=sys-apps/texinfo-4.7-r1
-	sys-libs/ncurses:0=
+	jemalloc? ( dev-libs/jemalloc:0= )
+	tcmalloc? ( dev-util/google-perftools:0= )
+	systemtap? ( >=dev-util/systemtap-1.3:0= )
 	>=sys-libs/zlib-1.2.3:0=
-	virtual/libcrypt:=
+	kerberos? ( virtual/krb5 )
+	yassl? ( net-libs/gnutls:0= )
+	!yassl? (
+		<dev-libs/openssl-3:=
+	)
+	sys-libs/ncurses:0=
 	!bindist? (
 		sys-libs/binutils-libs:0=
 		>=sys-libs/readline-4.1:0=
 	)
-	jemalloc? ( dev-libs/jemalloc:0= )
-	kerberos? ( virtual/krb5 )
-	kernel_linux? (
-		dev-libs/libaio:0=
-		sys-libs/liburing:=
-		sys-process/procps:0=
-	)
 	server? (
-		app-arch/bzip2
-		app-arch/xz-utils
 		backup? ( app-arch/libarchive:0= )
-		columnstore? (
-			app-arch/snappy:=
-			dev-libs/boost:=
-			dev-libs/libxml2:2=
-		)
 		cracklib? ( sys-libs/cracklib:0= )
 		extraengine? (
 			odbc? ( dev-db/unixODBC:0= )
@@ -79,39 +77,38 @@ COMMON_DEPEND="
 			dev-libs/judy:0=
 		)
 		pam? ( sys-libs/pam:0= )
-		s3? ( net-misc/curl )
 		systemd? ( sys-apps/systemd:= )
+		tokudb? ( app-arch/snappy:= )
 	)
-	systemtap? ( >=dev-util/systemtap-1.3:0= )
-	tcmalloc? ( dev-util/google-perftools:0= )
-	yassl? ( net-libs/gnutls:0= )
-	!yassl? (
-		>=dev-libs/openssl-1.0.0:0=
-	)
+	>=dev-libs/libpcre-8.41-r1:3=
+	virtual/libcrypt:=
 "
 BDEPEND="app-alternatives/yacc"
-DEPEND="${COMMON_DEPEND}
+DEPEND="static? ( sys-libs/ncurses[static-libs] )
 	server? (
 		extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )
 		test? ( acct-group/mysql acct-user/mysql )
 	)
-	static? ( sys-libs/ncurses[static-libs] )
-"
-RDEPEND="${COMMON_DEPEND}
-	!dev-db/mysql !dev-db/percona-server
+	${COMMON_DEPEND}"
+RDEPEND="selinux? ( sec-policy/selinux-mysql )
+	!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+	!dev-db/mariadb:0
+	!dev-db/mariadb:5.5
+	!dev-db/mariadb:10.1
+	!dev-db/mariadb:10.2
 	!dev-db/mariadb:10.3
-	!dev-db/mariadb:10.4
 	!dev-db/mariadb:10.5
 	!dev-db/mariadb:10.6
 	!dev-db/mariadb:10.7
 	!dev-db/mariadb:10.8
 	!dev-db/mariadb:10.9
 	!dev-db/mariadb:10.10
+	!dev-db/mariadb:10.11
 	!dev-db/mariadb:11.0
-	selinux? ( sec-policy/selinux-mysql )
+	!<virtual/mysql-5.6-r11
+	!<virtual/libmysqlclient-18-r1
+	${COMMON_DEPEND}
 	server? (
-		columnstore? ( dev-db/mariadb-connector-c )
-		extraengine? ( jdbc? ( >=virtual/jre-1.8 ) )
 		galera? (
 			sys-apps/iproute2
 			=sys-cluster/galera-26*
@@ -119,6 +116,7 @@ RDEPEND="${COMMON_DEPEND}
 			sst-mariabackup? ( net-misc/socat[ssl] )
 		)
 		!prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql )
+		extraengine? ( jdbc? ( >=virtual/jre-1.8 ) )
 	)
 "
 # For other stuff to bring us in
@@ -205,8 +203,6 @@ src_unpack() {
 
 src_prepare() {
 	eapply "${WORKDIR}"/mariadb-patches
-	eapply "${FILESDIR}"/${PN}-10.6.11-gssapi.patch
-	eapply "${FILESDIR}"/${PN}-10.6.11-include.patch
 	eapply "${FILESDIR}"/${PN}-10.6.12-gcc-13.patch
 
 	eapply_user
@@ -219,11 +215,16 @@ src_prepare() {
 	}
 
 	if use jemalloc; then
-		echo "TARGET_LINK_LIBRARIES(mariadbd LINK_PUBLIC jemalloc)" >> "${S}/sql/CMakeLists.txt"
+		echo "TARGET_LINK_LIBRARIES(mysqld LINK_PUBLIC jemalloc)" >> "${S}/sql/CMakeLists.txt"
 	elif use tcmalloc; then
-		echo "TARGET_LINK_LIBRARIES(mariadbd LINK_PUBLIC tcmalloc)" >> "${S}/sql/CMakeLists.txt"
+		echo "TARGET_LINK_LIBRARIES(mysqld LINK_PUBLIC tcmalloc)" >> "${S}/sql/CMakeLists.txt"
 	fi
 
+	# Don't build bundled xz-utils for tokudb
+	echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
+	sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
+	sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
+
 	local plugin
 	local server_plugins=( handler_socket auth_socket feedback metadata_lock_info
 				locale_info qc_info server_audit sql_errlog auth_ed25519 )
@@ -371,13 +372,13 @@ src_configure() {
 			-DWITH_PCRE=system
 			-DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
 			-DPLUGIN_SPHINX=$(usex sphinx YES NO)
+			-DPLUGIN_TOKUDB=$(usex tokudb YES NO)
 			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
 			-DPLUGIN_AWS_KEY_MANAGEMENT=NO
 			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+			-DPLUGIN_CASSANDRA=NO
 			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
 			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
-			-DPLUGIN_S3=$(usex s3 YES NO)
-			-DPLUGIN_COLUMNSTORE=$(usex columnstore YES NO)
 			-DCONNECT_WITH_MYSQL=1
 			-DCONNECT_WITH_LIBXML2=$(usex xml)
 			-DCONNECT_WITH_ODBC=$(usex odbc)
@@ -399,6 +400,9 @@ src_configure() {
 			-DWITH_NUMA=$(usex numa ON OFF)
 		)
 
+		# Workaround for MDEV-14524
+		use tokudb && mycmakeargs+=( -DTOKUDB_OK=1 )
+
 		if use test ; then
 			# This is needed for the new client lib which tests a real, open server
 			mycmakeargs+=( -DSKIP_TESTS=ON )
@@ -416,8 +420,8 @@ src_configure() {
 
 		elif ! use latin1 ; then
 			mycmakeargs+=(
-				-DDEFAULT_CHARSET=utf8mb4
-				-DDEFAULT_COLLATION=utf8mb4_unicode_520_ci
+				-DDEFAULT_CHARSET=utf8
+				-DDEFAULT_COLLATION=utf8_general_ci
 			)
 		else
 			mycmakeargs+=(
@@ -471,7 +475,7 @@ src_compile() {
 }
 
 # Official test instructions:
-# USE='extraengine perl server' \
+# USE='extraengine perl server xml' \
 # FEATURES='test userpriv' \
 # ebuild mariadb-X.X.XX.ebuild \
 # digest clean package
@@ -549,10 +553,8 @@ src_test() {
 	disabled_tests+=( "compat/oracle.plugin;0;Needs example plugin which Gentoo disables" )
 	disabled_tests+=( "innodb_gis.1;25095;Known rounding error with latest AMD processors" )
 	disabled_tests+=( "innodb_gis.gis;25095;Known rounding error with latest AMD processors" )
-	disabled_tests+=( "main.gis;25095;Known rounding error with latest AMD processors" )
 	disabled_tests+=( "main.explain_non_select;0;Sporadically failing test" )
 	disabled_tests+=( "main.func_time;0;Dependent on time test was written" )
-	disabled_tests+=( "main.mysql_upgrade;27044;Sporadically failing test" )
 	disabled_tests+=( "main.plugin_auth;0;Needs client libraries built" )
 	disabled_tests+=( "main.selectivity_no_engine;26320;Sporadically failing test" )
 	disabled_tests+=( "main.stat_tables;0;Sporadically failing test" )
@@ -560,13 +562,10 @@ src_test() {
 	disabled_tests+=( "main.upgrade_MDEV-19650;25096;Known to be broken" )
 	disabled_tests+=( "mariabackup.*;0;Broken test suite" )
 	disabled_tests+=( "perfschema.nesting;23458;Known to be broken" )
-	disabled_tests+=( "perfschema.prepared_statements;0;Broken test suite" )
-	disabled_tests+=( "perfschema.privilege_table_io;27045;Sporadically failing test" )
 	disabled_tests+=( "plugins.auth_ed25519;0;Needs client libraries built" )
 	disabled_tests+=( "plugins.cracklib_password_check;0;False positive due to varying policies" )
 	disabled_tests+=( "plugins.two_password_validations;0;False positive due to varying policies" )
 	disabled_tests+=( "roles.acl_statistics;0;False positive due to a user count mismatch caused by previous test" )
-	disabled_tests+=( "spider.*;0;Fails with network sandbox" )
 	disabled_tests+=( "sys_vars.wsrep_on_without_provider;25625;Known to be broken" )
 
 	if ! use latin1 ; then
@@ -591,7 +590,7 @@ src_test() {
 
 	# run mysql-test tests
 	pushd "${TESTDIR}" &>/dev/null || die
-	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test-list="${T}/disabled.def"
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
 	retstatus_tests=$?
 
 	popd &>/dev/null || die
@@ -688,20 +687,14 @@ src_install() {
 		fi
 	fi
 
-	# Conflicting files
-	conflicting_files=()
-
-	# We prefer my_print_defaults from dev-db/mysql-connector-c
-	conflicting_files=( "${ED}/usr/share/man/man1/my_print_defaults.1" )
-
 	# Remove bundled mytop in favor of dev-db/mytop
-	conflicting_files+=( "${ED}/usr/bin/mytop" )
-	conflicting_files+=( "${ED}/usr/share/man/man1/mytop.1" )
-
-	local conflicting_file
-	for conflicting_file in "${conflicting_files[@]}" ; do
-		if [[ -e "${conflicting_file}" ]] ; then
-			rm -v "${conflicting_file}" || die
+	local mytop_file
+	for mytop_file in \
+		"${ED}/usr/bin/mytop" \
+		"${ED}/usr/share/man/man1/mytop.1" \
+	; do
+		if [[ -e "${mytop_file}" ]] ; then
+			rm -v "${mytop_file}" || die
 		fi
 	done
 
diff --git a/dev-db/mariadb/mariadb-10.5.20.ebuild b/dev-db/mariadb/mariadb-10.5.21.ebuild
index f5477e843a70..f5477e843a70 100644
--- a/dev-db/mariadb/mariadb-10.5.20.ebuild
+++ b/dev-db/mariadb/mariadb-10.5.21.ebuild
diff --git a/dev-db/mariadb/mariadb-10.6.13.ebuild b/dev-db/mariadb/mariadb-10.6.14.ebuild
index 0675af87264c..0675af87264c 100644
--- a/dev-db/mariadb/mariadb-10.6.13.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.14.ebuild