gentoo auto-resync : 14:11:2023 - 22:34:48

11 files changed, 0 insertions, 821 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index bd1d9d7e17ec..7fdf05202f3f 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 224c4a603be8..abf2b6840337 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,13 +1,8 @@
-AUX gentoo-layout-3.0.patch 311 BLAKE2B 4c2f0ae8aa53d605bcaf134274d3b549ec970b43cc68eed1ac71cf089c9fa32a1343d7ebfdf428e7f25032f5782aecfb86fb8f78528ffc708ab15dc7285a24e7 SHA512 4d5a48b4dd66aab04ba597b30e96b4601c6745acca21be1daf051ba6ce1e8fef1a0efa46d8e81da1ecdc893a8ee471bd8c7ed0c5436ee33b8b4f7cd18fdca1a5
 AUX mariadb-connector-c-3.1.3-fix-pkconfig-file.patch 616 BLAKE2B 650c5a794da6d3d0095a823917704d52a5f16c349ce7017b93b1bebfec01287929470a89a2e4aec2f9f7cd5135368e43f2a2e89257c0d7042b878e1806ede8aa SHA512 fe621abedaf81d1fa367c52f69ccce1765757db8d9f412aa40b440d7e51d4de3785a90150e76893f7066b1ba656eb1bad020465e58adae13f08245b839bde4de
 AUX mariadb-connector-c-3.3.4-fix-building-without-gssapi.patch 715 BLAKE2B e7fc6c3432dfee51deebc80696ad7f556980e3ccb011d5795cb950bcedccaa06f8c7563ebe927b482f4a3c6b47245f3d5d277305caf9c5936b0f6dd01b0818e4 SHA512 a1b8df19b1534d4d47f8ab07f21b8ab812f3d4e75eaec331f5c7f4039b1f918928572bb3a437cc4b94a12df0fa543e856afe9a7203cc1952b99bdba82bc9c5a2
 AUX mariadb-connector-c-3.3.4-remove-zstd.patch 732 BLAKE2B 56544c653e2eded85bce16fd18775945b2f83a94a0a2cdb4964baf14fa9a448264cfea680d1293296c828c4338e15b6275414003f048ee357ab055a63f2a7f18 SHA512 fe407b8ecfac43d135a47c161f8812a0911c19d7e515ff62a454aa259925e56a470350b2bcd7e5e7aefd996ea020a204590a0ab0f496e80142195849ae4a8a3d
-DIST mariadb-connector-c-3.1.13-src.tar.gz 968401 BLAKE2B 4b7270c5e86e0a39773f38fbf1b4334ed9fdfca65432a5858b7e591fca5d6a68fd5a0eead96a6c9bfab22f49416d9c19c8a4c5c3fc328d16702c6051116e9a01 SHA512 a179a4fa689f681d64f926c1f3abfd3912896ec3e39c15be6a330647ded207aa2f110277dc43b90faffa4386365a72babc96264e29ac436e5d212d8b7cef7c32
-DIST mariadb-connector-c-3.2.5-src.tar.gz 992580 BLAKE2B c850dfbb2241e78475b5f9e9aa0fcb69bc9cc0d17a9092da36e720ec63e3fbdb0add32e6c4508a136fcb43d0825bea7346c0d6ce8a40ae10357ef3d3b6b7bea0 SHA512 5068c95ff15969c6b1d0e2e095fe0bdca3382f478012c852a9745a9bbbfc7586b1eeaa93a55fbadb236499a336133667f4638082814c97ff6b3bbc750c5e59dc
 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.1.13.ebuild 2069 BLAKE2B 40f264865d47b1e3bdbd5fb768f6544e54d6630520b2f56b52805004d8232d9de208686bf8f4f5eeebdc0e2058a86cbda0d9d2e9c6ff32bc0053a3834b353895 SHA512 430e19de5d734d776380d3ef653813c2497ad4787a2c4c0160f3c76290d42956248d3886c00a2172d129a5b699400e909d17053d2f238ae15126113476dfac3d
-EBUILD mariadb-connector-c-3.2.5.ebuild 3426 BLAKE2B 093e574b9fa695e7fad0fed0176477b46c1544ff1c7b444bf4392869a7f4aab1709ca9444970020856cb20887f64161b0c91f8ec981bd03f0175b5a954a8303a SHA512 b8d3ef35d1f03f34b811fd5546b620227a9d0b65436223936d756775091a95f7d2292af186b2ee360bafb3cd8420ff38408f038faad3032c0bff3fc2828e4edc
 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
diff --git a/dev-db/mariadb-connector-c/files/gentoo-layout-3.0.patch b/dev-db/mariadb-connector-c/files/gentoo-layout-3.0.patch
deleted file mode 100644
index b57b7abc03b4..000000000000
--- a/dev-db/mariadb-connector-c/files/gentoo-layout-3.0.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/mariadb_config/CMakeLists.txt	2016-02-12 21:21:06.981021227 -0500
-+++ b/mariadb_config/CMakeLists.txt	2016-02-12 22:06:02.397130410 -0500
-@@ -40,5 +44,5 @@
- # Installation
- #
- INSTALL(TARGETS mariadb_config
--        DESTINATION "bin"
-+        DESTINATION ${INSTALL_BINDIR}
-         COMPONENT Development)
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
deleted file mode 100644
index 92da81e96162..000000000000
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
-	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 x86"
-fi
-
-inherit cmake-multilib toolchain-funcs
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
-
-MULTILIB_WRAPPED_HEADERS+=(
-	/usr/include/mariadb/mariadb_version.h
-)
-
-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:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
-			app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
-		!gnutls? (
-			dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	"
-RDEPEND="${DEPEND}"
-PATCHES=(
-	"${FILESDIR}"/gentoo-layout-3.0.patch
-	"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
-)
-
-multilib_src_configure() {
-	# bug 508724 mariadb cannot use ld.gold
-	tc-ld-disable-gold
-
-	local mycmakeargs=(
-		-DWITH_EXTERNAL_ZLIB=ON
-		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
-		-DWITH_CURL=$(usex curl ON OFF)
-		-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_PCDIR="$(get_libdir)/pkgconfig"
-		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
-		-DINSTALL_BINDIR=bin
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
-
-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-3.2.5.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
deleted file mode 100644
index 5ed3f7fbf421..000000000000
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2023 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 toolchain-funcs
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
-
-MULTILIB_WRAPPED_HEADERS+=(
-	/usr/include/mariadb/mariadb_version.h
-)
-
-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:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
-			app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
-		!gnutls? (
-			dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	"
-BDEPEND="test? ( dev-db/mariadb[server] )"
-RDEPEND="${DEPEND}"
-PATCHES=(
-	"${FILESDIR}"/gentoo-layout-3.0.patch
-	"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
-)
-
-src_prepare() {
-	# 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
-}
-
-multilib_src_configure() {
-	# bug 508724 mariadb cannot use ld.gold
-	tc-ld-disable-gold
-
-	local mycmakeargs=(
-		-DWITH_EXTERNAL_ZLIB=ON
-		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
-		-DWITH_CURL=$(usex curl ON OFF)
-		-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 ON OFF)
-	)
-	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 && 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-odbc/Manifest b/dev-db/mariadb-connector-odbc/Manifest
index 1b3be48db646..553fb9549946 100644
--- a/dev-db/mariadb-connector-odbc/Manifest
+++ b/dev-db/mariadb-connector-odbc/Manifest
@@ -1,6 +1,4 @@
 AUX odbcinst2.ini 90 BLAKE2B 8070ddb3460799429fc9a80f5c54317381f3fc79a9b98766bb7c5db325ace3ed5f558df70386c2249f8a1f5a373cde51f0a28140421a00d3599f75994c28cbbf SHA512 00634eab33d08650cd19128bfd9d2187b4e5d38a866d08690d0b1e2224af7dcfefcb45f13a83f4a774beee322e6c5f3152c0f967399aea2893f8e857451aba8a
-DIST mariadb-connector-odbc-3.1.14-src.tar.gz 549698 BLAKE2B 612879086805c57b42036bb224b14ef1ab287d2ff288a5ec5ec6db7334fc8b82acd648476eca1dee282393486d117cadf1bbdcb0e78eae52bab26a0c05cb1fbe SHA512 bb3cb74ccd17a8df39456ccf3091579bbdfc56431954a978f488928df54e3f9ad1c5b67cb411be4b661ba0e0bdd69ccd4d00ea4bfd72c3f448b560031830512d
 DIST mariadb-connector-odbc-3.1.18-src.tar.gz 556590 BLAKE2B 9644521f91136b3bc30846d8c9df7cfa21c8fff0e9219bf0c758a0294f34783a57f1200834b84833284624160652315adb4f6eb465a90378e676e5767c7bd40a SHA512 1d240988d03dbb0ef2f4eb0667ff973a35d700f319caaea78db6d5c0ca569ed5adcee978fb10cd9f067c0c5aecbfe697e5adb3d736e564bae82cf6c11cd0dba2
-EBUILD mariadb-connector-odbc-3.1.14.ebuild 1946 BLAKE2B 76490f7869d61650589429714798de3885fd1b98d4838c9a68d00b23701cd595810efa14319d7b13616acfa4d825f4b6c3a1d4715e183711136190588afb3050 SHA512 013e4905f29f0dbf7bc511faa15cab959298bbf7836252c3eb162a247a98235b31e68dab43f1e22c6e943d36f5559711e5e2d8213d152ad22791184dba483951
 EBUILD mariadb-connector-odbc-3.1.18.ebuild 2111 BLAKE2B 1281e5c216022e85946f8b926a1dc3f1eb0d6dda23a8f55165427cd7302c2c5fe5558328a805423c537234a10e9ee2aabae3d353ba703a30dc403c7040c0b7c1 SHA512 1fc091ee19cd337632ac7e491cb0ca59c6b0e6bcc3b3779e7ec32a66bf4e06d5a11cd67f123e615788302b434bddd3d3c0fa88fc180dbd43bd83c4bdbf6a3c68
 MISC metadata.xml 495 BLAKE2B 50717eb32456dc6dec684b14b318e2f511e8f6d3b0fe810608a106dcca7bb1eb631aba5d034584474c3631d39fb647ba1dbe97fa3aa4aeb1d3f7d03b4427841a SHA512 ef88620670ae82a5b39a103f44d52cec79863f69389d38923a4a1c66a11751d14059f9bed496d3e05045208b40e1f3e83cd5020dfd33f6656bb030ce8577d6be
diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.14.ebuild b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.14.ebuild
deleted file mode 100644
index da1eeb6dfc48..000000000000
--- a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.14.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2018-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="MariaDB Connector/ODBC"
-HOMEPAGE="https://downloads.mariadb.org/connector-odbc/"
-SRC_URI="mirror://mariadb/connector-odbc-${PV}/${P}-src.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/3.1"
-KEYWORDS="amd64 x86"
-IUSE="ssl"
-
-S="${S}-src"
-
-# USE=ssl merely enables the configuration options (seemingly for interactive
-# sessions) and does not cause direct linking to any SSL libraries.  However,
-# it doesn't make sense enable these configuration options unless the
-# underlying mariadb-connector-c has ssl enabled, thus if we have USE=ssl,
-# require mariadb-connector-c to have it too.
-DEPEND="=dev-db/mariadb-connector-c-$(ver_cut 1-2)*:=[ssl?]
-	dev-db/unixODBC"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e "s,/lib/,/$(get_libdir)/,g" "${FILESDIR}/odbcinst2.ini" > odbcinst.ini || die
-}
-
-multilib_src_configure() {
-	append-cppflags $(mariadb_config --cflags || die)
-	local mycmakeargs=(
-		-DWITH_SSL=$(usex ssl OPENSSL OFF)
-		-DMARIADB_LINK_DYNAMIC=YES
-		-DUSE_SYSTEM_INSTALLED_LIB=YES
-		-DINSTALL_DOCDIR="/usr/share/doc/${PF}"
-		-DINSTALL_LICENSEDIR="/usr/share/doc/${PF}"
-		#-DCMAKE_C_FLAGS="$(mariadb_config --cflags)"
-	)
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	insinto /usr/share/${PN}
-	doins odbcinst.ini
-}
-
-pkg_postinst() {
-	elog "Please remember to use emerge --config =${P} to install the ODBC ini files."
-	elog "Alternatively run: /usr/bin/odbcinst -i -d -f /usr/share/${PN}/odbcinst.ini"
-}
-
-pkg_config() {
-	[[ -n "${ROOT}" ]] && die "Sorry, non-standard ROOT setting is not supported."
-
-	if /usr/bin/odbcinst -q -d -n maodbc &>/dev/null; then
-		einfo "maodbc (MariaDB ODBC driver) has already been installed."
-	else
-		ebegin "Installing maodbc (MariaDB ODBC driver)"
-		/usr/bin/odbcinst -i -d -f /usr/share/${PN}/odbcinst.ini
-		eend ${?} || die
-	fi
-}
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest
index b323c08d40dc..7e30aac9edb4 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -1,12 +1,7 @@
 AUX mysql-connector-c-8.0.19-do-not-install-comp_err.patch 307 BLAKE2B 864c07e9d4fb9a38ac418476f4b7738caa1f2a5dc633ad5921859793983c7b42acd87263ce2703df5a8c7d3bc3d7a60efb28a3ff17c311d89cc7b12edd22574f SHA512 cbb9be24a67a649b68230fe3482063d2d16fb629233e070289eb1ab0011bd8c43b0c056e4b6ca430a62ce0e8f47bb9490cb6746b7dc3fe06a05670b078cd084f
 AUX mysql-connector-c-8.0.22-always-build-decompress-utilities.patch 534 BLAKE2B 15bef04f750b5f373d8c5f39690e90be482bfea66430234befc777e9d84d0060d20e1290798ddacbf0e9f0f8db45ba0318d88b61aec3fd1e859285cefff446ef SHA512 7ae81f4fe020c12e45eba041dcca921fa93f42a12d8c8d840b1bec819c00de8b780a792e99cdc3cae55eef74c911de3087b6583d6213913b36428b96f0e1c3af
-AUX mysql-connector-c-8.0.27-add-OpenSSL-3.0.0-support.patch 11508 BLAKE2B 1fe2341c938ce580611bb1f2ded279d02d4f1130b719c43d0c70942e9954214cc4392b86a18dfd0f88082c6b72fdf270e076647dd1600d7ebb8eb437ca10bb64 SHA512 1b7b1bf471ad6cab6c86dbfb7f6ffe506e3d20a51efcc1df503a9d65976fedb8dbcd67993897241fc0dd9e1f7356670bf3ec80c5b7f66c9246a44b4aa3eee3cc
 AUX mysql-connector-c-8.0.27-res_n.patch 1635 BLAKE2B f75811958a6415bf45aa571a8da14c371500216a197602dec19b8b565bc219f98e8feb9bc660d81e32c4af7f39abb626af405d33a7f478617c8ee96c5b4453b8 SHA512 bb6315f0ac540d0723dffd9f8c2bdad9b9b1c0a3d706f80fd3bbdc9c7f276a8dda2754df94f6cb4ffecb0c3b0e65edc96c90b171eb0a4e5032fe6583e56ade85
 AUX mysql-connector-c-8.0.32-musl.patch 833 BLAKE2B 92fd8e0b41ec07faf37bf94795e87883bb6bf860e7e0ba27919fe2caedb06b4a015d866d48568d5342f0557b6cba42fe912e8e8ea2f2c6c8a1a21fc05531d11e SHA512 35646ccce4f6064eb8b71cb7309db34abe851e5a46acb7b428a7c667bbe6f63de82ef74e00e58192c4fb55c82fe5ad3818551ec3eb334364fa426c106e846f5d
-DIST mysql-boost-8.0.27.tar.gz 292184025 BLAKE2B 177209f3c62b0326ca9d021c751a701dec84c1b15c946ab0a68b1b4cf0620468eb3a1df77a918284007a0fde1aaa6a9767d0baed57936612813ef583df51c35e SHA512 6ef2426c0bee46bdf8e2fa5cb159d5ae19f0bed4f7c9bea9b33e0dd922b568c3c68ca063dcbcd7ea6904aaea31877c10064ea10b4bc63fb40d9f31778e3a7891
-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
-EBUILD mysql-connector-c-8.0.27-r1.ebuild 3243 BLAKE2B e0cd9a95e8b9760309df66c35e3c22f21bed920288e91ec466cba438cbdddd9721fd37068720fc1b6155f820aa0c759cff7a06cb27aa90f97e4d6eda82d2294b SHA512 29d9d9a14042f9c18ce6bdb4e30c0bf31932f734965b001cc7dadc6d55d9fb06b78be61f5c29c5dce0242102d4c1bbd375a7c030d081c9c983b68185caf8bf7b
-EBUILD mysql-connector-c-8.0.31.ebuild 3183 BLAKE2B 7c7a0735b18f7d48451b6c86aed42d85d07155d132ac38d363b2d75e9f4ff718e920f1dd3806e5240373e207e049d30a90b6a6ed805393d39e2083219b30ba12 SHA512 002090814388556e8605091b8acb08d1ccaf40ea5c624e60fb5e0bd586470bf4461e40523c72bdec5fc5b6da5eb4d856fb1b2971953592bbc13f8cd87bd71a7e
 EBUILD mysql-connector-c-8.0.32-r1.ebuild 3245 BLAKE2B e9ea5b835cbe956003a13add9ab19063482b0f96fa2a7ebfffd725976c9532cc22e888fcc4f85ea67b9bb85c29d7fc74bf4872c2ac090d2a19f1d17a94ec0d47 SHA512 cf32dea8d79256dc5d79ab51b7a035247592534ec02f3bde70ca49af178d3708516f5b8417bf4fc83ae8df33f1c0e6037cfd99a5fd10a3f4df4093b1af5c5cf8
 MISC metadata.xml 240 BLAKE2B cc93ae4da8408b221c296e092d9db6ae3879754ade669d81c1218d53a5f007c6b7717bda6f92dbb0af38ff9b5e45f44e91503b12d3603d9955ec7d5a2a67399b SHA512 0f41c32ce3d736e061302252f14913d7425bc97e19d0c2f3b80c50637ab3521aa6cfc67f82e5f70f91174cddb36bb5622837dc18fd9db3bf75eb860359aade27
diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.27-add-OpenSSL-3.0.0-support.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.27-add-OpenSSL-3.0.0-support.patch
deleted file mode 100644
index da1907db4633..000000000000
--- a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.27-add-OpenSSL-3.0.0-support.patch
+++ /dev/null
@@ -1,313 +0,0 @@
-From d5bedd07c111676695270cdf35d23f9026a78113 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Tue, 22 Jun 2021 23:56:54 +0200
-Subject: [PATCH 6/6] Add OpenSSL 3.0.0 support
-
-Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
----
- cmake/ssl.cmake                               | 59 +++++++++++++------
- mysys/my_md5.cc                               |  2 +
- .../xcom_network_provider_ssl_native_lib.cc   |  4 ++
- plugin/x/client/xconnection_impl.cc           |  4 ++
- sql-common/client.cc                          |  2 +
- sql/mysqld.cc                                 |  2 +
- sql/sys_vars.cc                               | 18 +++++-
- vio/viosslfactories.cc                        |  6 ++
- 8 files changed, 78 insertions(+), 19 deletions(-)
-
-diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake
-index 293281cf1..4732d8bf4 100644
---- a/cmake/ssl.cmake
-+++ b/cmake/ssl.cmake
-@@ -205,34 +205,59 @@ MACRO (MYSQL_CHECK_SSL)
-                  NAMES crypto libcrypto libeay32
-                  HINTS ${OPENSSL_ROOT_DIR}/lib)
- 
--    IF(OPENSSL_INCLUDE_DIR)
-+    IF(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
-       # Verify version number. Version information looks like:
-       #   #define OPENSSL_VERSION_NUMBER 0x1000103fL
-       # Encoded as MNNFFPPS: major minor fix patch status
-       FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
-         OPENSSL_VERSION_NUMBER
--        REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
--        )
--      STRING(REGEX REPLACE
--        "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
--        OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}"
--        )
--      STRING(REGEX REPLACE
--        "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1"
--        OPENSSL_MINOR_VERSION "${OPENSSL_VERSION_NUMBER}"
--        )
--      STRING(REGEX REPLACE
--        "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" "\\1"
--        OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
-+        REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
-         )
-+
-+      IF(OPENSSL_VERSION_NUMBER)
-+        STRING(REGEX REPLACE
-+          "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
-+          OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}"
-+          )
-+        STRING(REGEX REPLACE
-+          "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1"
-+          OPENSSL_MINOR_VERSION "${OPENSSL_VERSION_NUMBER}"
-+          )
-+        STRING(REGEX REPLACE
-+          "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" "\\1"
-+          OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
-+          )
-+      ELSE()
-+        FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
-+          OPENSSL_VERSION_STR
-+          REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_STR[\t ]+\"([0-9])+\\.([0-9])+\\.([0-9])+\".*"
-+          )
-+
-+        STRING(REGEX REPLACE
-+          "^.*OPENSSL_VERSION_STR[\t ]+\"([0-9]+)\\.[0-9]+\\.[0-9]+\".*$" "\\1"
-+          OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_STR}"
-+          )
-+        STRING(REGEX REPLACE
-+          "^.*OPENSSL_VERSION_STR[\t ]+\"[0-9]+\\.([0-9]+)\\.[0-9]+\".*$" "\\1"
-+          OPENSSL_MINOR_VERSION "${OPENSSL_VERSION_STR}"
-+          )
-+        STRING(REGEX REPLACE
-+          "^.*OPENSSL_VERSION_STR[\t ]+\"[0-9]+\\.[0-9]+\\.([0-9]+)\".*$" "\\1"
-+          OPENSSL_FIX_VERSION "${OPENSSL_VERSION_STR}"
-+          )
-+      ENDIF()
-     ENDIF()
--    IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0")
-+
-+    INCLUDE(CheckSymbolExists)
-+
-+    CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
-+    IF(HAVE_TLS1_3_VERSION)
-        ADD_DEFINITIONS(-DHAVE_TLSv13)
-     ENDIF()
-     IF(OPENSSL_INCLUDE_DIR AND
-        OPENSSL_LIBRARY   AND
-        CRYPTO_LIBRARY      AND
--       OPENSSL_MAJOR_VERSION STREQUAL "1"
-+       OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
-       )
-       SET(OPENSSL_FOUND TRUE)
-       FIND_PROGRAM(OPENSSL_EXECUTABLE openssl
-@@ -296,8 +321,6 @@ MACRO (MYSQL_CHECK_SSL)
-     MESSAGE(STATUS "OPENSSL_MINOR_VERSION = ${OPENSSL_MINOR_VERSION}")
-     MESSAGE(STATUS "OPENSSL_FIX_VERSION = ${OPENSSL_FIX_VERSION}")
- 
--    INCLUDE(CheckSymbolExists)
--
-     CMAKE_PUSH_CHECK_STATE()
-     SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
-     CHECK_SYMBOL_EXISTS(SHA512_DIGEST_LENGTH "openssl/sha.h"
-diff --git a/mysys/my_md5.cc b/mysys/my_md5.cc
-index 86203619f..37ed3c8b2 100644
---- a/mysys/my_md5.cc
-+++ b/mysys/my_md5.cc
-@@ -56,7 +56,9 @@ static void my_md5_hash(unsigned char *digest, unsigned const char *buf,
- int compute_md5_hash(char *digest, const char *buf, int len) {
-   int retval = 0;
-   int fips_mode = 0;
-+#if defined(OPENSSL_FIPS)
-   fips_mode = FIPS_mode();
-+#endif
-   /* If fips mode is ON/STRICT restricted method calls will result into abort,
-    * skipping call. */
-   if (fips_mode == 0) {
-diff --git a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc
-index 8d4af3c04..de67c9e7c 100644
---- a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc
-+++ b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc
-@@ -316,6 +316,7 @@ error:
-   return 1;
- }
- 
-+#if defined(OPENSSL_FIPS)
- #define OPENSSL_ERROR_LENGTH 512
- static int configure_ssl_fips_mode(const int fips_mode) {
-   int rc = -1;
-@@ -339,6 +340,7 @@ static int configure_ssl_fips_mode(const int fips_mode) {
- EXIT:
-   return rc;
- }
-+#endif
- 
- static int configure_ssl_ca(SSL_CTX *ssl_ctx, const char *ca_file,
-                             const char *ca_path) {
-@@ -478,12 +480,14 @@ int Xcom_network_provider_ssl_library::xcom_init_ssl(
-   int verify_server = SSL_VERIFY_NONE;
-   int verify_client = SSL_VERIFY_NONE;
- 
-+#if defined(OPENSSL_FIPS)
-   if (configure_ssl_fips_mode(
-           Network_provider_manager::getInstance().xcom_get_ssl_fips_mode()) !=
-       1) {
-     G_ERROR("Error setting the ssl fips mode");
-     goto error;
-   }
-+#endif
- 
-   SSL_library_init();
-   SSL_load_error_strings();
-diff --git a/plugin/x/client/xconnection_impl.cc b/plugin/x/client/xconnection_impl.cc
-index aaf37a1b3..753944889 100644
---- a/plugin/x/client/xconnection_impl.cc
-+++ b/plugin/x/client/xconnection_impl.cc
-@@ -617,6 +617,7 @@ XError Connection_impl::get_ssl_error(const int error_id) {
-   return XError(CR_SSL_CONNECTION_ERROR, buffer);
- }
- 
-+#if defined(OPENSSL_FIPS)
- /**
-   Set fips mode in openssl library,
-   When we set fips mode ON/STRICT, it will perform following operations:
-@@ -656,6 +657,7 @@ int set_fips_mode(const uint32_t fips_mode,
- EXIT:
-   return rc;
- }
-+#endif
- 
- XError Connection_impl::activate_tls() {
-   if (nullptr == m_vio) return get_socket_error(SOCKET_ECONNRESET);
-@@ -666,12 +668,14 @@ XError Connection_impl::activate_tls() {
-   if (!m_context->m_ssl_config.is_configured())
-     return XError{CR_SSL_CONNECTION_ERROR, ER_TEXT_TLS_NOT_CONFIGURATED, true};
- 
-+#if defined(OPENSSL_FIPS)
-   char err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
-   if (set_fips_mode(
-           static_cast<uint32_t>(m_context->m_ssl_config.m_ssl_fips_mode),
-           err_string) != 1) {
-     return XError{CR_SSL_CONNECTION_ERROR, err_string, true};
-   }
-+#endif
-   auto ssl_ctx_flags = process_tls_version(
-       details::null_when_empty(m_context->m_ssl_config.m_tls_version));
- 
-diff --git a/sql-common/client.cc b/sql-common/client.cc
-index 5de2a1fb9..102e663d9 100644
---- a/sql-common/client.cc
-+++ b/sql-common/client.cc
-@@ -8286,6 +8286,7 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_option option,
-         return 1;
-       break;
-     case MYSQL_OPT_SSL_FIPS_MODE: {
-+#if defined(OPENSSL_FIPS)
-       char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
-       ENSURE_EXTENSIONS_PRESENT(&mysql->options);
-       mysql->options.extension->ssl_fips_mode =
-@@ -8298,6 +8299,7 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_option option,
-             "Set Fips mode ON/STRICT failed, detail: '%s'.", ssl_err_string);
-         return 1;
-       }
-+#endif
-     } break;
-     case MYSQL_OPT_SSL_MODE:
-       ENSURE_EXTENSIONS_PRESENT(&mysql->options);
-diff --git a/sql/mysqld.cc b/sql/mysqld.cc
-index 8105d4b73..b580f1c4d 100644
---- a/sql/mysqld.cc
-+++ b/sql/mysqld.cc
-@@ -5292,12 +5292,14 @@ static void init_ssl() {
- }
- 
- static int init_ssl_communication() {
-+#if defined(OPENSSL_FIPS)
-   char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
-   int ret_fips_mode = set_fips_mode(opt_ssl_fips_mode, ssl_err_string);
-   if (ret_fips_mode != 1) {
-     LogErr(ERROR_LEVEL, ER_SSL_FIPS_MODE_ERROR, ssl_err_string);
-     return 1;
-   }
-+#endif
-   if (TLS_channel::singleton_init(&mysql_main, mysql_main_channel, opt_use_ssl,
-                                   &server_main_callback, opt_initialize))
-     return 1;
-diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
-index 4592e4bbb..320f458fd 100644
---- a/sql/sys_vars.cc
-+++ b/sql/sys_vars.cc
-@@ -4799,6 +4799,7 @@ static Sys_var_ulong Sys_max_execution_time(
-     HINT_UPDATEABLE SESSION_VAR(max_execution_time), CMD_LINE(REQUIRED_ARG),
-     VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1));
- 
-+#if defined(OPENSSL_FIPS)
- static bool update_fips_mode(sys_var *, THD *, enum_var_type) {
-   char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
-   if (set_fips_mode(opt_ssl_fips_mode, ssl_err_string) != 1) {
-@@ -4809,15 +4810,30 @@ static bool update_fips_mode(sys_var *, THD *, enum_var_type) {
-     return false;
-   }
- }
-+#endif
- 
-+#if defined(OPENSSL_FIPS)
- static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", nullptr};
-+#else
-+static const char *ssl_fips_mode_names[] = {"OFF", 0};
-+#endif
- static Sys_var_enum Sys_ssl_fips_mode(
-     "ssl_fips_mode",
-     "SSL FIPS mode (applies only for OpenSSL); "
-+#if defined(OPENSSL_FIPS)
-     "permitted values are: OFF, ON, STRICT",
-+#else
-+    "permitted values are: OFF",
-+#endif
-     GLOBAL_VAR(opt_ssl_fips_mode), CMD_LINE(REQUIRED_ARG, OPT_SSL_FIPS_MODE),
-     ssl_fips_mode_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG,
--    ON_CHECK(nullptr), ON_UPDATE(update_fips_mode), nullptr);
-+    ON_CHECK(NULL),
-+#if defined(OPENSSL_FIPS)
-+    ON_UPDATE(update_fips_mode),
-+#else
-+    ON_UPDATE(NULL),
-+#endif
-+    NULL);
- 
- static Sys_var_bool Sys_auto_generate_certs(
-     "auto_generate_certs",
-diff --git a/vio/viosslfactories.cc b/vio/viosslfactories.cc
-index 618be1511..672fc74ca 100644
---- a/vio/viosslfactories.cc
-+++ b/vio/viosslfactories.cc
-@@ -472,6 +472,7 @@ void ssl_start() {
-   }
- }
- 
-+#if defined(OPENSSL_FIPS)
- /**
-   Set fips mode in openssl library,
-   When we set fips mode ON/STRICT, it will perform following operations:
-@@ -525,6 +526,7 @@ EXIT:
-   @returns openssl current fips mode
- */
- uint get_fips_mode() { return FIPS_mode(); }
-+#endif
- 
- /**
-   Toggle FIPS mode, to see whether it is available with the current SSL library.
-@@ -532,12 +534,16 @@ uint get_fips_mode() { return FIPS_mode(); }
-   @retval non-zero: FIPS is supported.
- */
- int test_ssl_fips_mode(char *err_string) {
-+#if defined(OPENSSL_FIPS)
-   int ret = FIPS_mode_set(FIPS_mode() == 0 ? 1 : 0);
-   unsigned long err = (ret == 0) ? ERR_get_error() : 0;
- 
-   if (err != 0) {
-     ERR_error_string_n(err, err_string, OPENSSL_ERROR_LENGTH - 1);
-   }
-+#else
-+  int ret = 0;
-+#endif
-   return ret;
- }
- 
--- 
-2.34.0
-
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild
deleted file mode 100644
index 124402752491..000000000000
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.27-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib flag-o-matic
-
-# wrap the config script
-MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
-
-DESCRIPTION="C client library for MariaDB/MySQL"
-HOMEPAGE="https://dev.mysql.com/downloads/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/mysql/mysql-server.git"
-
-	inherit git-r3
-else
-	SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-	S="${WORKDIR}/mysql-${PV}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/21"
-IUSE="ldap static-libs"
-
-RDEPEND="
-	>=app-arch/lz4-0_p131:=[${MULTILIB_USEDEP}]
-	app-arch/zstd:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] )
-	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-# Avoid file collisions, #692580
-RDEPEND+=" !<dev-db/mysql-5.6.45-r1"
-RDEPEND+=" !=dev-db/mysql-5.7.23*"
-RDEPEND+=" !=dev-db/mysql-5.7.24*"
-RDEPEND+=" !=dev-db/mysql-5.7.25*"
-RDEPEND+=" !=dev-db/mysql-5.7.26-r0"
-RDEPEND+=" !=dev-db/mysql-5.7.27-r0"
-RDEPEND+=" !<dev-db/percona-server-5.7.26.29-r1"
-
-DOCS=( README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.22-always-build-decompress-utilities.patch
-	"${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch
-	"${FILESDIR}"/${PN}-8.0.27-add-OpenSSL-3.0.0-support.patch
-	"${FILESDIR}"/${PN}-8.0.27-res_n.patch
-)
-
-src_prepare() {
-	sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "scripts/CMakeLists.txt" || die
-
-	# All these are for the server only.
-	# Disable rpm call which would trigger sandbox, #692368
-	sed -i \
-		-e '/MYSQL_CHECK_LIBEVENT/d' \
-		-e '/MYSQL_CHECK_RAPIDJSON/d' \
-		-e '/MYSQL_CHECK_ICU/d' \
-		-e '/MYSQL_CHECK_EDITLINE/d' \
-		-e '/MYSQL_CHECK_CURL/d' \
-		-e '/ADD_SUBDIRECTORY(man)/d' \
-		-e '/ADD_SUBDIRECTORY(share)/d' \
-		-e '/INCLUDE(cmake\/boost/d' \
-		-e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \
-		CMakeLists.txt || die
-
-	# Skip building clients
-	echo > client/CMakeLists.txt || die
-
-	# Forcefully disable auth plugin
-	if ! use ldap ; then
-		sed -i -e '/MYSQL_CHECK_SASL/d' CMakeLists.txt || die
-		echo > libmysql/authentication_ldap/CMakeLists.txt || die
-	fi
-
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-	# Code is now requiring C++17 due to https://github.com/mysql/mysql-server/commit/236ab55bedd8c9eacd80766d85edde2a8afacd08
-	append-cxxflags -std=c++17
-
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG
-		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG
-		-DINSTALL_LAYOUT=RPM
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DWITH_DEFAULT_COMPILER_OPTIONS=OFF
-		-DENABLED_LOCAL_INFILE=ON
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock"
-		-DWITH_LZ4=system
-		-DWITH_NUMA=OFF
-		-DWITH_SSL=system
-		-DWITH_ZLIB=system
-		-DWITH_ZSTD=system
-		-DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient
-		-DSHARED_LIB_PATCH_VERSION="0"
-		-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-		-DWITHOUT_SERVER=ON
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	doman \
-		man/my_print_defaults.1 \
-		man/perror.1 \
-		man/zlib_decompress.1
-
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.31.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.31.ebuild
deleted file mode 100644
index db6fbd547f17..000000000000
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.31.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib flag-o-matic
-
-# wrap the config script
-MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
-
-DESCRIPTION="C client library for MariaDB/MySQL"
-HOMEPAGE="https://dev.mysql.com/downloads/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/mysql/mysql-server.git"
-
-	inherit git-r3
-else
-	SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-	S="${WORKDIR}/mysql-${PV}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/21"
-IUSE="ldap static-libs"
-
-RDEPEND="
-	>=app-arch/lz4-0_p131:=[${MULTILIB_USEDEP}]
-	app-arch/zstd:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] )
-	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-# Avoid file collisions, #692580
-RDEPEND+=" !<dev-db/mysql-5.6.45-r1"
-RDEPEND+=" !=dev-db/mysql-5.7.23*"
-RDEPEND+=" !=dev-db/mysql-5.7.24*"
-RDEPEND+=" !=dev-db/mysql-5.7.25*"
-RDEPEND+=" !=dev-db/mysql-5.7.26-r0"
-RDEPEND+=" !=dev-db/mysql-5.7.27-r0"
-RDEPEND+=" !<dev-db/percona-server-5.7.26.29-r1"
-
-DOCS=( README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.22-always-build-decompress-utilities.patch
-	"${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch
-	"${FILESDIR}"/${PN}-8.0.27-res_n.patch
-)
-
-src_prepare() {
-	sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "scripts/CMakeLists.txt" || die
-
-	# All these are for the server only.
-	# Disable rpm call which would trigger sandbox, #692368
-	sed -i \
-		-e '/MYSQL_CHECK_LIBEVENT/d' \
-		-e '/MYSQL_CHECK_RAPIDJSON/d' \
-		-e '/MYSQL_CHECK_ICU/d' \
-		-e '/MYSQL_CHECK_EDITLINE/d' \
-		-e '/MYSQL_CHECK_CURL/d' \
-		-e '/ADD_SUBDIRECTORY(man)/d' \
-		-e '/ADD_SUBDIRECTORY(share)/d' \
-		-e '/INCLUDE(cmake\/boost/d' \
-		-e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \
-		CMakeLists.txt || die
-
-	# Skip building clients
-	echo > client/CMakeLists.txt || die
-
-	# Forcefully disable auth plugin
-	if ! use ldap ; then
-		sed -i -e '/MYSQL_CHECK_SASL/d' CMakeLists.txt || die
-		echo > libmysql/authentication_ldap/CMakeLists.txt || die
-	fi
-
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-	# Code is now requiring C++17 due to https://github.com/mysql/mysql-server/commit/236ab55bedd8c9eacd80766d85edde2a8afacd08
-	append-cxxflags -std=c++17
-
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG
-		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG
-		-DINSTALL_LAYOUT=RPM
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DWITH_DEFAULT_COMPILER_OPTIONS=OFF
-		-DENABLED_LOCAL_INFILE=ON
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock"
-		-DWITH_LZ4=system
-		-DWITH_NUMA=OFF
-		-DWITH_SSL=system
-		-DWITH_ZLIB=system
-		-DWITH_ZSTD=system
-		-DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient
-		-DSHARED_LIB_PATCH_VERSION="0"
-		-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-		-DWITHOUT_SERVER=ON
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	doman \
-		man/my_print_defaults.1 \
-		man/perror.1 \
-		man/zlib_decompress.1
-
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}