gentoo auto-resync : 17:01:2023 - 07:14:19

3 files changed, 69 insertions, 1 deletions

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 570be39c5e85..596a0b529d6a 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,4 +1,5 @@
 AUX mariadb-10.6.11-gssapi.patch 1824 BLAKE2B 5d0fefad9ff2d35d06dc4df3bcdd08a737a6f5ab7492673102c031c0e88fdd3fd7eeef977fb4128be170b9c948850e6a69a6d11f972d234cf49f2ea742838478 SHA512 0acee9c539782f11480b8e274576bb3b06cc7b2a914fee2d8f85fb692700b014da1f47e08f5f36d5ed264c9b5f820a123791de5b010fdc25f194dc215e890162
+AUX mariadb-10.6.11-include.patch 2044 BLAKE2B 050729672c228818658f45b02ef5a70a8153eb43b7729569edcd7b0c9420a5b16a57359f153862232c634a817a21d0d6a20028104ef5cfdc53f3de25e7e63425 SHA512 cb8150274538fd2e3c26f9fde8fdbf0e8c31c2c26efe9e99ca97d984ae17fe967aabf315c7aee4d2659c3c477eaac604afc948f44de7475ee248cd502dac0fa5
 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
@@ -21,5 +22,5 @@ EBUILD mariadb-10.4.27.ebuild 42081 BLAKE2B 7dca7c8be92a53cd382a9680f1264cd156b5
 EBUILD mariadb-10.5.17.ebuild 42039 BLAKE2B 4b6a08ef9a8673356833f4d9495b07f548a9f9b6e4dfc90af5fab478ef13f91f451bb444b1a132a9d3418b20ea2149621cb24e593529864c7338f1e211fe6284 SHA512 acc33064c0ce6aba4568f79d21e0124d7fcf3eb75755697f0986925fd196a770dc79b91237eaeb051027530da250fff40760477a96f2af476e1991dcb1834e82
 EBUILD mariadb-10.5.18.ebuild 42040 BLAKE2B 448c62e184d96dd5771e065e03a5b23dd8fd975661d6e96632d88740928e55b6d71d2793b2657a91411d52652287fecd165266d2ba59bb184eef3b4bd7fba5fb SHA512 5aecb9ef006b8077af9e49d67b24de48048915a738e1528036e0810e5884f2aefa94a7b005044fb275f6ee67e6e7f30bbfbac7cae943307039b195ef9647a1fd
 EBUILD mariadb-10.6.10.ebuild 42414 BLAKE2B ce19b4626b496ffb7b9390e88e653c5ec38e4e54774d6f5aa4bcd7b14da22250a7d91a84f92738e2cc283424a214862c96e3867d8b360b9e716ab78d4ebf0f0c SHA512 12a7284a5ed095c335a224acffebe5ba8f8968d6d4f5829e57582a36ecc84e28679545b740b490ff966789deb46bf1f1c43f1f241df54b2077fc30c46f72517d
-EBUILD mariadb-10.6.11.ebuild 42470 BLAKE2B 94b7544a108e1de979ca9de588df0c59b8df6349c7b00dbdbf49d6a61cd17804d70fd7c74c45ab44f3bb061d693ec76e3fa5e673f74e063e17ada77d3e109949 SHA512 0590699414bd5953bdeb3eca71ada8f93a1abcba7d7e293146a7b7fa3a73cef0101380d6017d33ceca99c2a68c229eb12f34de7a747211ea1f37fd87e8672893
+EBUILD mariadb-10.6.11.ebuild 42522 BLAKE2B a3d8d4b71286bb63465b7b965ff5f9ea7a1c0b8bdeb5cfab8dfd9ab4b5db2c0f54c3783a809a8e654707eb5b4ec2a0977ffe416f8eca3db5414e2bf3e793a992 SHA512 7dc505916fcb24801eec96fad63d8a8f8bf9eaba9c0229f8f559e1ec57cef3e5d33df2fb971983f2166c2059464b5627e5ced092ffd50a3c1e0a64ee20d44b5b
 MISC metadata.xml 2602 BLAKE2B 7d388158062c76f40bca2feba53f292bbdab51cf0c3dba59ce2b74c3dedcb07cd7d4f1b5b52f7bf42c814dfc817a0670fcd8e39dccb2395337b46be98deda258 SHA512 a53f2612f8aea11cf7037847dc6f8b2acc87f710778b1bc18d7e1821c95061c1b08deefd3019789810eea2e5445b50c604b8686f3d491397793be3cbf86a35be
diff --git a/dev-db/mariadb/files/mariadb-10.6.11-include.patch b/dev-db/mariadb/files/mariadb-10.6.11-include.patch
new file mode 100644
index 000000000000..600f440b85f0
--- /dev/null
+++ b/dev-db/mariadb/files/mariadb-10.6.11-include.patch
@@ -0,0 +1,66 @@
+https://github.com/mariadb-corporation/mariadb-columnstore-engine/pull/2698
+
+From 20b5dbb6171604b151ec2dd8c56bef26cc27d201 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 17 Jan 2023 01:18:41 +0000
+Subject: [PATCH] Add missing includes
+
+These seem to have all fallen out of a recent Boost update to 1.81 which
+dropped some internal includes. All of these uses within columnstore
+relied on these transitive includes, so explicitly include what we need
+to fix build.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+
+--- a/storage/columnstore/columnstore/tools/passwd/secrets.cpp
++++ b/storage/columnstore/columnstore/tools/passwd/secrets.cpp
+@@ -12,6 +12,8 @@
+  */
+ #include "secrets.h"
+ 
++#include <array>
++#include <cstdint>
+ #include <cctype>
+ #include <fstream>
+ #include <pwd.h>
+--- a/storage/columnstore/columnstore/storage-manager/src/S3Storage.h
++++ b/storage/columnstore/columnstore/storage-manager/src/S3Storage.h
+@@ -18,6 +18,7 @@
+ #ifndef S3STORAGE_H_
+ #define S3STORAGE_H_
+ 
++#include <deque>
+ #include <string>
+ #include <map>
+ #include "CloudStorage.h"
+--- a/storage/columnstore/columnstore/storage-manager/src/MetadataFile.cpp
++++ b/storage/columnstore/columnstore/storage-manager/src/MetadataFile.cpp
+@@ -19,6 +19,7 @@
+  * MetadataFile.cpp
+  */
+ #include "MetadataFile.h"
++#include <set>
+ #include <boost/filesystem.hpp>
+ #define BOOST_SPIRIT_THREADSAFE
+ #include <boost/property_tree/ptree.hpp>
+--- a/storage/columnstore/columnstore/dbcon/mysql/ha_mcs_impl_if.h
++++ b/storage/columnstore/columnstore/dbcon/mysql/ha_mcs_impl_if.h
+@@ -19,6 +19,7 @@
+ 
+ #ifndef HA_MCS_IMPL_IF_H__
+ #define HA_MCS_IMPL_IF_H__
++#include <bitset>
+ #include <string>
+ #include <stdint.h>
+ #ifdef _MSC_VER
+--- a/storage/columnstore/columnstore/utils/cloudio/SocketPool.h
++++ b/storage/columnstore/columnstore/utils/cloudio/SocketPool.h
+@@ -18,6 +18,8 @@
+ #ifndef _SOCKETPOOL_H_
+ #define _SOCKETPOOL_H_
+ 
++#include <deque>
++
+ #include <boost/utility.hpp>
+ #include <boost/thread/mutex.hpp>
+ #include <boost/thread/condition_variable.hpp>
diff --git a/dev-db/mariadb/mariadb-10.6.11.ebuild b/dev-db/mariadb/mariadb-10.6.11.ebuild
index 31285154561e..095305883bb9 100644
--- a/dev-db/mariadb/mariadb-10.6.11.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.11.ebuild
@@ -208,6 +208,7 @@ src_unpack() {
 src_prepare() {
 	eapply "${WORKDIR}"/mariadb-patches
 	eapply "${FILESDIR}"/${PN}-10.6.11-gssapi.patch
+	eapply "${FILESDIR}"/mariadb-10.6.11-include.patch
 
 	eapply_user