gentoo auto-resync : 04:03:2024 - 11:43:04

16 files changed, 186 insertions, 20 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 02bb21099e09..b72e6aaf7f8b 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
index abf2b6840337..a0fd2daebdc3 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -3,7 +3,9 @@ AUX mariadb-connector-c-3.3.4-fix-building-without-gssapi.patch 715 BLAKE2B e7fc
 AUX mariadb-connector-c-3.3.4-remove-zstd.patch 732 BLAKE2B 56544c653e2eded85bce16fd18775945b2f83a94a0a2cdb4964baf14fa9a448264cfea680d1293296c828c4338e15b6275414003f048ee357ab055a63f2a7f18 SHA512 fe407b8ecfac43d135a47c161f8812a0911c19d7e515ff62a454aa259925e56a470350b2bcd7e5e7aefd996ea020a204590a0ab0f496e80142195849ae4a8a3d
 DIST mariadb-connector-c-3.2.7-src.tar.gz 1212691 BLAKE2B ae2d1317fdc087c6d64b7cf11f4343bf35662d04da5c693f6f3b45ec405ff0f3d5d03157eb56a9c05cf4e16b9980baffec8800b886ae3d962d22a828a6938671 SHA512 3f0c67c5fd12e889a3704e0a638b64a784f05d12c7c424f7ce64e78a3eb17e2ad588e0e23f0ce037cd49efb695294ab69277da78f02940c2a7ea0676886b9c36
 DIST mariadb-connector-c-3.3.4-src.tar.gz 1389030 BLAKE2B 4bee45ee4f76979d36072ab2119042b4de1127a42e99510bd0c1bc5e163fdb4e9b7ca4cce9381ed89e0c733158293d0641c7b7cbd14feaf3257a442c62083e23 SHA512 3a3f20efe58f8458a426501248b154107b76bd2001a43e41923e31568c8419cd88f2379e3636a54118ee64ac160a1c6f68dd79c0ac053fa273d9b6b127410ef6
-EBUILD mariadb-connector-c-3.2.7.ebuild 3380 BLAKE2B fb2439ff30a1e1395f5503669c76c406951ffe110a1ba6d8276781fc3177ee6dca12a758ab69fc757ffe6b948e206e32d9bd4d32a36a8784456471f483a8a46c SHA512 c0aa320a25adeac2570b4abd12f064c317f0bca3fcdd26873a566087223c29e29203b8ee6f9067cc5ce1de3de961fb61663887c7731cc040375dc6489af0ac08
-EBUILD mariadb-connector-c-3.3.4.ebuild 3491 BLAKE2B d9e847f4872b296c32ae920086094d99e486bcb13dcf3c90d4890027383087129eea35841df7587d918e2aae613108c0037682d1da4cb4c24bafa096f9341291 SHA512 0d9af5c524b22d65f0bd66b9596df748996ab4ff048c99936a0546b3363d24f5b9e5d08847e25ee390ee2b5b0c1ec9976fba07b8465e3c20d8228e076adf0ee1
-EBUILD mariadb-connector-c-9999.ebuild 3385 BLAKE2B cf6987988ab04944de71fd92dbd5bc509b1f7fbef556645acabdea07a4c5d21451448461c93f321d98e8e40a0a26cb866574830c595ef0afe6e262d3b5f21202 SHA512 5643602706c1a931b47c1f60b8d9f8ad3bfbb7ed00cb4ddbe166345390f371090f4b8fa5e39fc1748e2fbcdb0ff47f02852d279b67256a7e7014aa07585a9952
+DIST mariadb-connector-c-3.3.8-src.tar.gz 1393368 BLAKE2B 09a8a310f97809f0b0396770a77d4512fe1124de263e2077e5a14a2fa1fbc59d7e35a09d97b0471b687943fc9ce06925507e4b950fdacfdc7ca04ea5ee56bf9e SHA512 d2630bda8deb28696842a6b5dd308060a8b9a83a04dfb3ed908387f53af4108510c6f536aaecc4a3c9a035c7be91b98229d6c480366a3579b6be2c5a8d85ff56
+EBUILD mariadb-connector-c-3.2.7.ebuild 3506 BLAKE2B 37a73276c6ac296a4522df9e0f2c4b2e32a17e2efcf978263862c66ac37872236734d52b9894d5f90f3dcc790fc78e4a80e72db85d424ffeaab8128872740c0c SHA512 8e5773976bc20aca17758d0066ace8b5d812d9c6c475d1f066293139b5948e70fa2c9030368f196a13abd122ebabf055348a4c244a55039b3b71a79677f2fea1
+EBUILD mariadb-connector-c-3.3.4.ebuild 3617 BLAKE2B e766159d763b75eaec2f0e2856c47795f666707fbb033b44c00c1ba0cee4d9fd8c670b74dfa75e899ccd3b29c9ce17f90f8de1d03bf27fce997b73a23d39406d SHA512 a77df5fde47685e66bbaa6010bf2f073b271bd80ee5b5771034e4f20de7390d08eeb0b090a24d294c6249288e2f4fa90bcbbf8f88dc4414133204b9ce3a8b3ff
+EBUILD mariadb-connector-c-3.3.8.ebuild 3818 BLAKE2B 20bca4e60c06a47d759710a645d3a0d913678b63b6cac9878ba1470b4dcebe4c5658d089424074826d2c7dc647841d7118159ae0046ce9f0864eaa63d2f128b5 SHA512 1f0f283b7fa76e895fc340cb617b1206aa6433f084bf6bb0a58ebd781692619efcd6fde67fd6fe8a42c6cad5629bbf5996f6eb404103fb50515e7094c07792aa
+EBUILD mariadb-connector-c-9999.ebuild 3818 BLAKE2B 20bca4e60c06a47d759710a645d3a0d913678b63b6cac9878ba1470b4dcebe4c5658d089424074826d2c7dc647841d7118159ae0046ce9f0864eaa63d2f128b5 SHA512 1f0f283b7fa76e895fc340cb617b1206aa6433f084bf6bb0a58ebd781692619efcd6fde67fd6fe8a42c6cad5629bbf5996f6eb404103fb50515e7094c07792aa
 MISC metadata.xml 348 BLAKE2B 4c817753c3ccda9cdade926d129408d83169373335553a3c990224a74444e122d1150cfb031395d923959911e8485b1dc88e00cce2aeb599d4a26b2fd5d8eef5 SHA512 009615c60fbffadc877e7d26cddd26e1f5fbfbbc844ba7cf388ea748a091f16f819ac539a8998c0588fc96c3cd882fb3cadde556510fa1732636aac64c95ddf9
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
index 0f94f5ae5fd0..455985c30d27 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ else
 	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 x86"
 fi
 
-inherit cmake-multilib toolchain-funcs
+inherit cmake-multilib flag-o-matic toolchain-funcs
 
 DESCRIPTION="C client library for MariaDB/MySQL"
 HOMEPAGE="https://mariadb.org/"
@@ -64,10 +64,17 @@ src_prepare() {
 	cmake_src_prepare
 }
 
-multilib_src_configure() {
+src_configure() {
 	# mariadb cannot use ld.gold, bug #508724
 	tc-ld-disable-gold
 
+	# bug #855233 (MDEV-11914, MDEV-25633) at least
+	filter-lto
+
+	cmake-multilib_src_configure
+}
+
+multilib_src_configure() {
 	local mycmakeargs=(
 		-DWITH_EXTERNAL_ZLIB=ON
 		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.4.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.4.ebuild
index 2778d1261848..3ebe51ce18fc 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.4.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86"
 fi
 
-inherit cmake-multilib toolchain-funcs
+inherit cmake-multilib flag-o-matic toolchain-funcs
 
 DESCRIPTION="C client library for MariaDB/MySQL"
 HOMEPAGE="https://mariadb.org/"
@@ -66,10 +66,17 @@ src_prepare() {
 	cmake_src_prepare
 }
 
-multilib_src_configure() {
+src_configure() {
 	# mariadb cannot use ld.gold, bug #508724
 	tc-ld-disable-gold
 
+	# bug #855233 (MDEV-11914, MDEV-25633) at least
+	filter-lto
+
+	cmake-multilib_src_configure
+}
+
+multilib_src_configure() {
 	local mycmakeargs=(
 		-DWITH_EXTERNAL_ZLIB=ON
 		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.ebuild
new file mode 100644
index 000000000000..c7280c550ded
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
+else
+	MY_PN=${PN#mariadb-}
+	MY_PV=${PV/_b/-b}
+	SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz"
+	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86"
+fi
+
+inherit cmake-multilib flag-o-matic toolchain-funcs
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="https://mariadb.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0/3"
+IUSE="+curl gnutls kerberos +ssl static-libs test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	virtual/libiconv:=[${MULTILIB_USEDEP}]
+	curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
+	kerberos? (
+		|| (
+			app-crypt/mit-krb5[${MULTILIB_USEDEP}]
+			app-crypt/heimdal[${MULTILIB_USEDEP}]
+		)
+	)
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-3.3.24:=[${MULTILIB_USEDEP}] )
+		!gnutls? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+	)
+"
+BDEPEND="test? ( dev-db/mariadb[server] )"
+RDEPEND="${DEPEND}"
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mariadb/mariadb_version.h )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
+	"${FILESDIR}"/${PN}-3.3.4-remove-zstd.patch
+)
+
+src_prepare() {
+	# Should be able to drop this once bug #926121 is fixed and
+	# https://github.com/mariadb-corporation/mariadb-connector-c/commit/395641549ac72bc31def6d8b64e09093336aef72
+	# is in a release.
+	sed -i -e '/SET(WARNING_AS_ERROR "-Werror")/d' CMakeLists.txt || die
+
+	# These tests the remote_io plugin which requires network access
+	sed -i 's/{"test_remote1", test_remote1, TEST_CONNECTION_NEW, 0, NULL, NULL},//g' "unittest/libmariadb/misc.c" || die
+
+	# These tests don't work with --skip-grant-tables
+	sed -i 's/{"test_conc366", test_conc366, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},//g' "unittest/libmariadb/connection.c" || die
+	sed -i 's/{"test_conc66", test_conc66, TEST_CONNECTION_DEFAULT, 0, NULL,  NULL},//g' "unittest/libmariadb/connection.c" || die
+
+	# [Warning] Aborted connection 2078 to db: 'test' user: 'root' host: '' (Got an error reading communication packets)
+	# Not sure about this one - might also require network access
+	sed -i 's/{"test_default_auth", test_default_auth, TEST_CONNECTION_NONE, 0, NULL, NULL},//g' "unittest/libmariadb/connection.c" || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# mariadb cannot use ld.gold, bug #508724
+	tc-ld-disable-gold
+
+	# bug #855233 (MDEV-11914, MDEV-25633) at least
+	filter-lto
+
+	cmake-multilib_src_configure
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DWITH_EXTERNAL_ZLIB=ON
+		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
+		-DWITH_CURL=$(usex curl)
+		-DWITH_ICONV=ON
+		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
+		-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_LIBDIR="$(get_libdir)"
+		-DINSTALL_MANDIR=share/man
+		-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
+		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
+		-DINSTALL_BINDIR=bin
+		-DWITH_UNIT_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	mkdir -vp "${T}/mysql/data" || die
+
+	mysql_install_db --no-defaults --datadir="${T}/mysql/data" || die
+	mysqld --no-defaults --datadir="${T}/mysql/data" --socket="${T}/mysql/mysql.sock" --skip-grant-tables --skip-networking &
+
+	while ! mysqladmin ping --socket="${T}/mysql/mysql.sock" --silent ; do
+		sleep 1
+	done
+
+	cd unittest/libmariadb || die
+	MYSQL_TEST_SOCKET="${T}/mysql/mysql.sock" MARIADB_CC_TEST=1 ctest --verbose || die
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
index 62a90589ade5..c7280c550ded 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86"
 fi
 
-inherit cmake-multilib toolchain-funcs
+inherit cmake-multilib flag-o-matic toolchain-funcs
 
 DESCRIPTION="C client library for MariaDB/MySQL"
 HOMEPAGE="https://mariadb.org/"
@@ -47,9 +47,15 @@ MULTILIB_WRAPPED_HEADERS+=( /usr/include/mariadb/mariadb_version.h )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
+	"${FILESDIR}"/${PN}-3.3.4-remove-zstd.patch
 )
 
 src_prepare() {
+	# Should be able to drop this once bug #926121 is fixed and
+	# https://github.com/mariadb-corporation/mariadb-connector-c/commit/395641549ac72bc31def6d8b64e09093336aef72
+	# is in a release.
+	sed -i -e '/SET(WARNING_AS_ERROR "-Werror")/d' CMakeLists.txt || die
+
 	# These tests the remote_io plugin which requires network access
 	sed -i 's/{"test_remote1", test_remote1, TEST_CONNECTION_NEW, 0, NULL, NULL},//g' "unittest/libmariadb/misc.c" || die
 
@@ -64,10 +70,17 @@ src_prepare() {
 	cmake_src_prepare
 }
 
-multilib_src_configure() {
+src_configure() {
 	# mariadb cannot use ld.gold, bug #508724
 	tc-ld-disable-gold
 
+	# bug #855233 (MDEV-11914, MDEV-25633) at least
+	filter-lto
+
+	cmake-multilib_src_configure
+}
+
+multilib_src_configure() {
 	local mycmakeargs=(
 		-DWITH_EXTERNAL_ZLIB=ON
 		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 2cc0d9007818..8ae06a9a94d2 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -13,11 +13,11 @@ DIST mariadb-10.6.14.tar.gz 95286643 BLAKE2B 4a186f3f52b63ab7321aa7556776ff8a986
 DIST mariadb-10.6.15.tar.gz 98204031 BLAKE2B 4534b82f1c1e16ce2c7c21879714e24b20fada36ef10a8a0dbe770c1d99055822fcaf146646b19b459cfd948bff0662d23f1f661a843919f90a354838bda7ee6 SHA512 61b5af8c2f8bd2f641aaa708941563d5f6ecc118acc9a154c009c3ae1d50e7360ae59241f87e5c2111775a3ffeb42a64f4853e9c7096b58d68a3695b5d0ef97c
 DIST mariadb-10.6.16-patches-01.tar.xz 4956 BLAKE2B a178930f7abe474e1419509c0bbabf783e1b931cfc3f4b4bddf426d9671d4e69e62a800d759f424f957562091c634049e594332ab15dc758e98d26c48ba69d1d SHA512 42969e6881cf2548c48fcce7f8439c9d56596ef038d55affcada45f4cd42a3666617f5786b69fe9ba42f11b06e85f43b722f2190aa7ed5badb461c48282751e5
 DIST mariadb-10.6.16.tar.gz 98224346 BLAKE2B f5b51df0b8665b817e81b5f0550019627fb41fa682c5cf5acfac30add46442ad9338da39283b09f97f2108e3677c249c2b7395c9c9f5b97e8648c879d654c7f1 SHA512 05d509d5f7a672b897f42674884df0debcae0b75c4eaa6d67645343c596c81c0c41d474a59150108428bf9f2c4468ca05650afb616aac5d1ea09fd2cea258a7f
-EBUILD mariadb-10.11.5-r1.ebuild 42343 BLAKE2B 4dd7cba431537b68c71929b533e4b100a731638eed5e5bc5092c00b369b872706c6dea43f7674d1585d65e85f1c083023ec07e63adfdd420c9cd0457f85972f2 SHA512 7a94c5447891cc0c0b1b13a14e05402a46ee222a3b61eaf33ac16cca2d02cf35781aad59c0d086f901388ccfc9205da05ac0bec7e4ef18f47b449e1a367fa74c
-EBUILD mariadb-10.11.5.ebuild 42470 BLAKE2B b1f3e6e6d1687078b2514ce375753d5652f94c2ef958daad596198ed62d0b2554b0deceb5365f2f501f629d4c1efe81e987059726cfa0897ec4643cc168fcfa1 SHA512 779c58debd94ed8d9d070b741739c7d390cdcfb83b58c9c6b0b59062e33fcfa806c32cf45b5d9bb733713e26aa060a171b56e89b372bc43194969c29ef187992
-EBUILD mariadb-10.11.6.ebuild 42350 BLAKE2B 15a06674d205c63c16bb64c60dce2f43d7505f3c5f02d380fc45fda1e628d1a96c39adf5ad3cd9f66882a5a76d5c1e10c3ac5e1b30b6e22c49cfe0f30379ea41 SHA512 2eeb532c32cbfed2177b2cc527aa1fd9c6347a480d2ed15fa026b14feb6be890a54e03936bd269a90c61e779ded517ac9798a233024bb81bf65e4a231d6879bd
-EBUILD mariadb-10.6.14.ebuild 42729 BLAKE2B f451eb581e9c062228293a3911be0286249f863fe2a12ddf9664f13f8e60b80dcb93460c7886be7d97ebbbe65002dbd7953b7d1856d90b61df798650703ef51f SHA512 fbfad175735ee67b4e0b16d615870555c67a01144dacafc2a37d4311bf38e9ef645348b97e2e5f495c0726f73944531b49497481fdf34c347cf1adc32b7ce445
-EBUILD mariadb-10.6.15-r1.ebuild 42602 BLAKE2B f7a1e0cfe3299fb8ad27d7e4ea4ee90baa3c34e88cf293c8e2c55b1e33e3920aa0300265573b99bdb91d84d34cf5ae6deae15b2cf25ed643b9ed85446c3613b7 SHA512 5a71c0ea249b33913d8f71019cdf9268db9f5b2f334ae179c494f9d9fccf10f0107f1f848cb4fa51fef22a0dbcb64bacaa7cb627727eaae41eff920ea8c39323
-EBUILD mariadb-10.6.15.ebuild 42735 BLAKE2B dede0b8afee851f5316d26860166bdaa3e5b9b89ad80dbc22342a2baf9d1cb96caa68504b848009a10487a58073c0c1624ef0dac17877fd657c5c07abe994834 SHA512 92c3c618ced55074eed795b2f0f4b83c231c6556e908daf92f94a7f22705cd108099e3acf38d1d6b3498aaf24b4dd270944d3a41e000dd1b4dfab1acf975041c
-EBUILD mariadb-10.6.16.ebuild 42609 BLAKE2B 5ed21a8ea20768822ed4193c36041c92924e1de9a7fc39e8e65661c214f97f3bad045d39ad8f72be5a641b240fe79774f9b597cc2a97694ed92dd0b82543e618 SHA512 0ad6d9d39bfa8a3dd12aa9da4ecfd3927d727f1273fcd4f67541c79a7b65d6122e4f66787e588a98c8bda5ef8f735b479e893c8c546699876068b0d27d33b4f0
+EBUILD mariadb-10.11.5-r1.ebuild 42404 BLAKE2B d1bfb48bb1bfae914ed88bc1854f2b2554b05afdc34a74133195f20c62fb2cdf57bc8766d3f476ddf6e7a3a57b1255d9cb42e232c29be3ffac8289a9ce67afcc SHA512 f2b5bde9e4c20c6cdac5112b26e7d98a5421216adc9dc20c472ffe4e3b3d5a6e81bd1b10a8290644ba7b92c0baf5f5deb99a9ff98c03c20da24ef21b60a439a9
+EBUILD mariadb-10.11.5.ebuild 42531 BLAKE2B d091673ea4c11f51a32befdf0bfceb57e2eb39e5507adc7ffe77262c317e672644738736d47f34b1ff441a1805615f7fa2226ad127572344fd0d1edccba8278e SHA512 5456414b868f312a32ff5a2e92a0bcfe7d1c0d2c905fc3d373f1254143abb709feb94f82d3a5fbd7bdbd950875904c9444b2bca77ef59df7cbb1aaf766cbaa61
+EBUILD mariadb-10.11.6.ebuild 42411 BLAKE2B 465b93f7fd7dc384a82fdfd90b0d310021b1bb0b02dd5f67ea0a3ec48e709e4a92e2640b44074d0e5c62a4cf7bacd834acf45e1034755b222f5e3ddedde4036b SHA512 6526049e50ef8c2d48943a5323989815b390409e30b83e109e8cede1d2bfd6a24f2f869a27b5fdb0ba17528f6f5db10dd9f2568972aceff44279ffc72804d5d6
+EBUILD mariadb-10.6.14.ebuild 42790 BLAKE2B 2700f3c261b601459989014c5e65374b6437ffc259bd9d4042c2bbaf6660da912a5362c0cdf8476ccb240366046e9d8e2fd3c1d2d447c988b83a23b7914e2d93 SHA512 07ff8176f82feb50a279f20bc368ee0a9f8dd5ad56c0b3e3a2edf8d8378cb11b2306019c8544df030dbb51cb973c7cde2f42920b469a8219f2095b5a2a7bb146
+EBUILD mariadb-10.6.15-r1.ebuild 42663 BLAKE2B ed78b484705dd7ac9780c217f209efa4954387824e46c863a938141aa4e8770e96d8a6be0f8856cd344a03c08628f04269bb64cd7776e5e5412abd033daf9f44 SHA512 f1e433b549bd7d2a516240ff37b3bb464368d2098ebda945fd809a3d1e736bc86dd5815deb93ed552c3717a846921c83f6d4aa0dbaccb3a0372acb7c23e4e6ae
+EBUILD mariadb-10.6.15.ebuild 42796 BLAKE2B f44efc89d35f4482d34d445709bd411eb9489cb0028c3a2ab952eb4b6f4364c3c6514b62fb0383ed936b11d71e0a7666c4a418fbd9666f51d2d9f5bca4ba7f95 SHA512 11bb7215e4dd1fa9f03e9cf32d48212d93e34ad0987bbeef19419b2ac19e3894fb18d70759891d7f78576d3c171fb5ec93e00d02e573927451b9f035f42772f3
+EBUILD mariadb-10.6.16.ebuild 42670 BLAKE2B ca0fd59bae6dd42066ce1cea902121ad19025057928ff464c6bee6ae7c93c700758122b3d36631dbab1b7186f50e800184110c2b07ad36a1c0d747ab5870a917 SHA512 6ec8dd97cd37bac2e0899716215079b5e90f343d2e146c76d43726252ba9f4c6804ddf12ad35249bc5a16288401517645a3b79467695902ca1a26b61203ce67b
 MISC metadata.xml 2415 BLAKE2B 15e491cb0881203b21f66652af9e420582e3992a610bde08dfae2d076c417b298529eafd659adaa4cdeecd70b0c10c83796f8dfd8fbdede7489c48fdd2bdb015 SHA512 ecc641157ada5ad6d84b534b6a40e27e59ef428668d61f3908817735d31d4828dd0327343bf4ad13a5f6a1bc306cc46137388489176c3116f2a0e0946471b49b
diff --git a/dev-db/mariadb/mariadb-10.11.5-r1.ebuild b/dev-db/mariadb/mariadb-10.11.5-r1.ebuild
index faf4a0173937..c746545f8e79 100644
--- a/dev-db/mariadb/mariadb-10.11.5-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.11.5-r1.ebuild
@@ -275,6 +275,8 @@ src_prepare() {
 }
 
 src_configure() {
+	# bug #855233 (MDEV-11914, MDEV-25633) at least
+	filter-lto
 	# bug 508724 mariadb cannot use ld.gold
 	tc-ld-disable-gold
 	# Bug #114895, bug #110149
diff --git a/dev-db/mariadb/mariadb-10.11.5.ebuild b/dev-db/mariadb/mariadb-10.11.5.ebuild
index 388d4ffea6c1..a4216b24f9fb 100644
--- a/dev-db/mariadb/mariadb-10.11.5.ebuild
+++ b/dev-db/mariadb/mariadb-10.11.5.ebuild
@@ -275,6 +275,8 @@ src_prepare() {
 }
 
 src_configure() {
+	# bug #855233 (MDEV-11914, MDEV-25633) at least
+	filter-lto
 	# bug 508724 mariadb cannot use ld.gold
 	tc-ld-disable-gold
 	# Bug #114895, bug #110149
diff --git a/dev-db/mariadb/mariadb-10.11.6.ebuild b/dev-db/mariadb/mariadb-10.11.6.ebuild
index 618372159ab3..17e3f6655187 100644
--- a/dev-db/mariadb/mariadb-10.11.6.ebuild
+++ b/dev-db/mariadb/mariadb-10.11.6.ebuild
@@ -275,6 +275,8 @@ src_prepare() {
 }
 
 src_configure() {
+	# bug #855233 (MDEV-11914, MDEV-25633) at least
+	filter-lto
 	# bug 508724 mariadb cannot use ld.gold
 	tc-ld-disable-gold
 	# Bug #114895, bug #110149
diff --git a/dev-db/mariadb/mariadb-10.6.14.ebuild b/dev-db/mariadb/mariadb-10.6.14.ebuild
index 6b04209e8502..a47a18609606 100644
--- a/dev-db/mariadb/mariadb-10.6.14.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.14.ebuild
@@ -286,6 +286,8 @@ src_prepare() {
 }
 
 src_configure() {
+	# bug #855233 (MDEV-11914, MDEV-25633) at least
+	filter-lto
 	# bug 508724 mariadb cannot use ld.gold
 	tc-ld-disable-gold
 	# Bug #114895, bug #110149
diff --git a/dev-db/mariadb/mariadb-10.6.15-r1.ebuild b/dev-db/mariadb/mariadb-10.6.15-r1.ebuild
index 2bce0280ca59..8ffeec4aa737 100644
--- a/dev-db/mariadb/mariadb-10.6.15-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.15-r1.ebuild
@@ -286,6 +286,8 @@ src_prepare() {
 }
 
 src_configure() {
+	# bug #855233 (MDEV-11914, MDEV-25633) at least
+	filter-lto
 	# bug 508724 mariadb cannot use ld.gold
 	tc-ld-disable-gold
 	# Bug #114895, bug #110149
diff --git a/dev-db/mariadb/mariadb-10.6.15.ebuild b/dev-db/mariadb/mariadb-10.6.15.ebuild
index e2281369b5cb..56661ef5dc05 100644
--- a/dev-db/mariadb/mariadb-10.6.15.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.15.ebuild
@@ -286,6 +286,8 @@ src_prepare() {
 }
 
 src_configure() {
+	# bug #855233 (MDEV-11914, MDEV-25633) at least
+	filter-lto
 	# bug 508724 mariadb cannot use ld.gold
 	tc-ld-disable-gold
 	# Bug #114895, bug #110149
diff --git a/dev-db/mariadb/mariadb-10.6.16.ebuild b/dev-db/mariadb/mariadb-10.6.16.ebuild
index b2abcce4246a..675c53c34db1 100644
--- a/dev-db/mariadb/mariadb-10.6.16.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.16.ebuild
@@ -286,6 +286,8 @@ src_prepare() {
 }
 
 src_configure() {
+	# bug #855233 (MDEV-11914, MDEV-25633) at least
+	filter-lto
 	# bug 508724 mariadb cannot use ld.gold
 	tc-ld-disable-gold
 	# Bug #114895, bug #110149
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 7f985c3fd9e1..5cd520028678 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -15,7 +15,7 @@ DIST mysql-boost-8.0.27.tar.gz 292184025 BLAKE2B 177209f3c62b0326ca9d021c751a701
 DIST mysql-boost-8.0.31.tar.gz 334504577 BLAKE2B 0506472c732351a1055be9bbd81212e95280ae464af95cb5b579777dd8fad4634b099fa2830c3095066daf8c586f1d8cd2316e7268fb0d2577dd706c595c9102 SHA512 87b1678de8c2fd640fd6f3ae58266ea63fe240578330e3296d0e5fc209bbe9b0c22996214b6ca4cce8c0d9cc2f9897f4e6723d835b33fc4342983c82929c3d96
 DIST mysql-boost-8.0.32.tar.gz 436207624 BLAKE2B 8a75fd6fe12d4f870622b3386118737b8f17d116df625ef6187647c870d456823543e0a1e9aa05fff53313c3872df1df23add2508ec735bb7972718fc1e90539 SHA512 937e0d0350cb583bb4de15b080f08ed92b253a6d7c09f13a028855dae154fc84f0c95fb082b818b2fa6fa792cd2d9db8d7dc7a20a2a0d3d2b6839fbd2c821b44
 DIST mysql-boost-8.0.34.tar.gz 439550780 BLAKE2B f50701b7e97e6cec21d6ce0f80f07a8df68a14c637a67841c06f578be8ed01d216dcb3b859a29f1befd4223b99e60675d6fa70f4b227bf6af81804e2c43161d4 SHA512 e5e79ac6870c214cf62c8e2830106d60e09d2e6df30654b84bb5d26864b4eabe777468a223e6ee4c1e22b7f6ec086c73e85e3f4c1fa66912b0e59b606ab46cd6
-EBUILD mysql-5.7.41.ebuild 38638 BLAKE2B 4a16cca1bcf882a14033213e3f90e97f5f0a2ea07e080904629b2f5ddfcaed3e8ed199ea478ef6d5825c3b2c366c6e9d53b2cc49ce3cfee6261463d359825941 SHA512 43a741a197b63e3d2c262cecafee90ec9877563bc795e786674f3e0ff15ddf37685ab77b12c4460a51f5aad02dbebda24f9cbec7bb3d133faf0fe83b79e49feb
+EBUILD mysql-5.7.41.ebuild 38717 BLAKE2B ae54e24801d303ea3ce3db755c2b810ed9d083cbb226cb235381bf1b22ff564ff98696ab531cfa73a3d942829d9783a009b94a1253279b569bc31bee0c6eff0c SHA512 eef7b9085772e13e0f8c1bd300c33111a4af7577ccdbed68aaaaaa33f05bbfd94e8a801bfb6ab505e4a30c10bb53dbc4ccc1879d857991da17b420ca0eef402e
 EBUILD mysql-8.0.27-r1.ebuild 40508 BLAKE2B 5f2e62ce42582929b30cf3f4536d43d1c85a9569e77a1a6f01b02f96367a0b4841ac140b2c0a8689fc1330dcae7e7acc5478b95703f55f807c8284569a34bf05 SHA512 32760dc886c67e2d9a343037fca648d73356e830cd627e848b4495e1ce8408bd2db701907f815452802ca242f14c983a582c220e4131e2b5cc591dcf99ea1dea
 EBUILD mysql-8.0.31-r2.ebuild 40554 BLAKE2B 3c1930c3dbc66783e490cbe0e9583d54ea74119f51c9ee9cdffe54d1b7039ed2195954465c1f3bba7e2dd812f3658e9ff74999ceed08113b5c7158f3967594dd SHA512 ccd8c45981644edca27e3f022dddee64defaf6fd4c0e7bfc6aa4faed956492d2ace1836bdeb95f1a47b014d1c86617121ad07939bc257a88adb3531def756e42
 EBUILD mysql-8.0.32-r2.ebuild 40298 BLAKE2B 26ece821d8aebd85b745b0ce3bd72466616f92418a92b6496b49f2206d7e23d9eb86139c6a4b9aaa2a63738748cf53a65863f2910e89f8400f2852afc4b065c6 SHA512 23bc6425039c3ea2aae640663608d36f4b8d639dcebf8e53fc4da28c50a181673361bb3fe02bf93bc8bee95e4be3c3781defe6f24441f211469da21a2f583c83
diff --git a/dev-db/mysql/mysql-5.7.41.ebuild b/dev-db/mysql/mysql-5.7.41.ebuild
index 016aa962043a..3efb6229af13 100644
--- a/dev-db/mysql/mysql-5.7.41.ebuild
+++ b/dev-db/mysql/mysql-5.7.41.ebuild
@@ -261,6 +261,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# Filter LTO for legacy branch with ODR violations (bug #855242)
+	filter-lto
+
 	# Bug #114895, bug #110149
 	filter-flags "-O" "-O[01]"