gentoo resync : 20.10.2021

3 files changed, 83 insertions, 3 deletions

diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
index f654b2758e77..398eb333a6e1 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -4,8 +4,10 @@ AUX mariadb-connector-c-3.1.3-fix-pkconfig-file.patch 616 BLAKE2B 650c5a794da6d3
 DIST mariadb-connector-c-3.1.12-src.tar.gz 966702 BLAKE2B 8187199f43ccb6f92ea9df61a1f62e48dbef4744cda9a5e865f71038e47a65dea3ed094dd76d81d0d8d357a8d611a9770590a3504c297ea30f59f285ab511d17 SHA512 a46e8ec976c28e227a72f09c15c92126d178b422a92a4c90fd52c8053604c3309aeb3bd098dc63fbd0d87059d5360c8b63d76e61a1152e7a3e7145e13681453d
 DIST mariadb-connector-c-3.1.13-src.tar.gz 968401 BLAKE2B 4b7270c5e86e0a39773f38fbf1b4334ed9fdfca65432a5858b7e591fca5d6a68fd5a0eead96a6c9bfab22f49416d9c19c8a4c5c3fc328d16702c6051116e9a01 SHA512 a179a4fa689f681d64f926c1f3abfd3912896ec3e39c15be6a330647ded207aa2f110277dc43b90faffa4386365a72babc96264e29ac436e5d212d8b7cef7c32
 DIST mariadb-connector-c-3.2.3-src.tar.gz 992155 BLAKE2B 39f0c5f15c2b016e7708ca32f9f4c08ae87f52c38a1a6433ade66b03b9e2144744c559838c3c0bb98465b7e5c1d2f3d5678ee6b1197790c18740f990dbc82284 SHA512 0d45278ba55b3cda809d9d6c3d9726ec8b2f629c7da1205fcb936594ca6ea439039c02f484f7e31fca3e55288339c9bf64c06518988a8fed016c6ce544fac631
+DIST mariadb-connector-c-3.2.4-src.tar.gz 991053 BLAKE2B 7378ddb47e7cbb8b6bec4d7daa1572e05ca494cd1585fff8c3dc9fca088d11ca523a2571fdda570e7a68633a6cf753fca12ba6b505dbdfa7ee9c9cc07223d0b7 SHA512 3debf8b31f280d70ba4f163351658dc1d15f2d250e0d7098200516f96a782cb66ef38855b2436d3d23a3385f79309d5c41b05b8d7d673001de4b4a62555511ca
 EBUILD mariadb-connector-c-3.1.12.ebuild 2148 BLAKE2B a6328dd0a6416691513398220dda45e3fa4a3f857c5f908f11b06095252e02e15102708181af2aef2e809045ec4fa7617e379517499b27ee3dfb98aaf0cfd98b SHA512 9762c0c60084675e61e5843c7b113ba3809d8f60c082ebc3e0c4a167683cc71cb321de8633fcbe52faf0e4ef9c05e50efb7c8ee3ca6b9b0544e06fa5c89ca890
 EBUILD mariadb-connector-c-3.1.13.ebuild 2095 BLAKE2B e4cfcce60afebb3c706c585396950e4e90dd4eba29e22a541ad4947639ee2e5d957bf0347be30fdd5525af93e53824ba6a99a4057d2676b70b143bf0faeb1e86 SHA512 7b2f9d3098d43fdff9ec0e44beab28dc5a1e0bf66460d402cb8e66c528f4dbe04a15e0aba2b5dcfe96924d818d1c0be5db81abb13ee2dbb4e1d98da51fa086bd
 EBUILD mariadb-connector-c-3.2.3.ebuild 2129 BLAKE2B d166508f5a826a721b3822eab5a6f5a8c9161f084e0f2f7e57bea70897344b4f82fc2d26860e459002786e6b83ef0f214a42526ff9965594ea23847aa1c76ffe SHA512 e10c8135d1cfccc68d57990220d64ceba5b5aa33f9a6d9a507ac3ca5d4730b11802f31ccef9ced4673bd85e2640af21dc325262aa3e5e8c40ff0d258a14d94e2
-EBUILD mariadb-connector-c-9999.ebuild 2129 BLAKE2B d166508f5a826a721b3822eab5a6f5a8c9161f084e0f2f7e57bea70897344b4f82fc2d26860e459002786e6b83ef0f214a42526ff9965594ea23847aa1c76ffe SHA512 e10c8135d1cfccc68d57990220d64ceba5b5aa33f9a6d9a507ac3ca5d4730b11802f31ccef9ced4673bd85e2640af21dc325262aa3e5e8c40ff0d258a14d94e2
+EBUILD mariadb-connector-c-3.2.4.ebuild 2102 BLAKE2B 0f8057839f5b2f595c5d5eadbc9788e9f8d0d3ef76d52fbcf5d027a96e872f9a890b743fee7856833f41e45b0fa58ce7af7a2718461d1ea24dbc50b7a76c1a70 SHA512 0b516ff055adad048d9746498835c537a8c5dbb2f7d1ca8f9b7d6c3833f010ed163f7e26330c1208355e26d3ed9ddcf0a8514933262d8b9d7cc085ac211b8392
+EBUILD mariadb-connector-c-9999.ebuild 2102 BLAKE2B 0f8057839f5b2f595c5d5eadbc9788e9f8d0d3ef76d52fbcf5d027a96e872f9a890b743fee7856833f41e45b0fa58ce7af7a2718461d1ea24dbc50b7a76c1a70 SHA512 0b516ff055adad048d9746498835c537a8c5dbb2f7d1ca8f9b7d6c3833f010ed163f7e26330c1208355e26d3ed9ddcf0a8514933262d8b9d7cc085ac211b8392
 MISC metadata.xml 244 BLAKE2B 4123aca5430915cc6801ba9b4e57e1ff48f31a4bacaa785c4dfbbf2d1aadf14f274684cad9b24a09e875a7f621b33bd9bd3333f7ababbd44aa173d4ace98b46e SHA512 380cbd85bebb869f4a2ec1e3518dc6ac5abed1fa5364172e7436098dbd910e738c4d59ee18aa7cf387b354020ed5782732e43702dc83c1857d46b720d623143d
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.4.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.4.ebuild
new file mode 100644
index 000000000000..fb175f8f7402
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+CMAKE_ECLASS=cmake
+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_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_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 055778b5039c..fb175f8f7402 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
@@ -9,7 +9,7 @@ if [[ "${PV}" == 9999 ]] ; then
 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"
+	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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi