gentoo resync : 15.01.2020

3 files changed, 2 insertions, 92 deletions

diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
index 697ed8dd08a9..b26cf0fc4cf8 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -3,10 +3,8 @@ AUX mariadb-connector-c-3.0.6-provide-pkconfig-file.patch 1838 BLAKE2B 454433d58
 AUX mariadb-connector-c-3.0.8-fix-pkconfig-file.patch 630 BLAKE2B 4d087835c14334ebfdbfcf69df16e948dfd0c46c194d56ba44516bfb647ff518d766170d95c3c86f39211555f25993d95b57c516a357bb3db52b8428273aad48 SHA512 9949b6e6ea2fe325279a6459ce6119524444dbec65cd509549bdc89d5a4c9afb6c39abe2d4e1ab64f6c7e917279f83a323f93d3fe7bd79a8d519976f8c786028
 AUX mariadb-connector-c-3.1.3-fix-pkconfig-file.patch 616 BLAKE2B 650c5a794da6d3d0095a823917704d52a5f16c349ce7017b93b1bebfec01287929470a89a2e4aec2f9f7cd5135368e43f2a2e89257c0d7042b878e1806ede8aa SHA512 fe621abedaf81d1fa367c52f69ccce1765757db8d9f412aa40b440d7e51d4de3785a90150e76893f7066b1ba656eb1bad020465e58adae13f08245b839bde4de
 DIST mariadb-connector-c-3.0.6-src.tar.gz 666819 BLAKE2B 7245c0e13e569454d1cc70e3579afcbd53c64a0a7e828012b38d73f7d737a81b4fdf0363bd1b156dae783806a51773dbceb2ea06621bd4a73773edb78a70249a SHA512 6a41efacff1840eb8ddd8b34d8894b51f260444c76a1344f9ac9b675fd8492d44716338e4c11594d80118b12d90f75430304282650bce0d5f64179df6cc14d8e
-DIST mariadb-connector-c-3.1.4-src.tar.gz 738308 BLAKE2B ba0242ba951ba53aec899517cb25877cefebb757eb1d90adcf88021d669213790c32654d1078943f1c37f0494de780e03d93b3f2c2d8a584ddffc08d9802c392 SHA512 9528760df2aa4921d6a06dfd977977060b58fe7d57c7cb1e323021245533de3da97e45f44818fe9bfdfbe60606aff69f8216e23a0b53620aa21dcdee241c30ea
-DIST mariadb-connector-c-3.1.5-src.tar.gz 739192 BLAKE2B 4430231489bcd173ce6f0dc1502a4bc376545e598336a239d81e9a19ef73b7788316cdfc2660ab7681c3201afa42ed2527b37944097e6e525e6896e4f74766e0 SHA512 06da9d400bdaf1db640cd20ef0e028986e7dbe1108c24b73c67d6df40eecc36bcfa35fc0697567a95f5016242da5829a48b47a07c08faf8eadd4ba44b50acc1d
+DIST mariadb-connector-c-3.1.6-src.tar.gz 742858 BLAKE2B 416cc33cf7a01fee9649f6c35e0a7e16b889a1fad10f2b204e259a2672535d1ad7f9ade9723989a4ce00cf8a2c4660f40357516bfdc4547118a54637911f9b60 SHA512 44309e706cb49451a0d1a91f907ab7cfa1fb1bf95d26cf3bbce1caa367c2fa8ad377a691361e297dd2fcbc444c10115f18aec66dd6d69c458f282ace3025a3e8
 EBUILD mariadb-connector-c-3.0.6-r1.ebuild 2842 BLAKE2B 207d08aff8494af4fd67c5fc9b8292348bc3c198655e3ae66c8e2f3fa7d27af3d177e177279ceb333d800fb9a8c5b8343edb9722282e892be42b73d79660e80a SHA512 83bcb560d6f10ecc2b24004b7dd71c6a5b5c9385b3787b44362d7cf0c3194bb4bcb0c25eacce5f400aa22091a3fd31acf7695d663c0446ed07e16f9e0f7480a2
-EBUILD mariadb-connector-c-3.1.4.ebuild 2344 BLAKE2B da4880e8fee8dede76cce177181f1290874f3a72078b9d7a3cd9ce3ad6d3abf7d72b418e81f57bdeb321e0e39d5a052b0195be70c92d066a53d8c4f0768842d0 SHA512 0b747b13ba14a5b1943ada402afbed3b19c490fb1b07fcd2a9c1791b1c97566186d9a46c9ac35113685b1a32b287e9373339f932c0e794ad86a19aa497de879a
-EBUILD mariadb-connector-c-3.1.5.ebuild 2344 BLAKE2B da4880e8fee8dede76cce177181f1290874f3a72078b9d7a3cd9ce3ad6d3abf7d72b418e81f57bdeb321e0e39d5a052b0195be70c92d066a53d8c4f0768842d0 SHA512 0b747b13ba14a5b1943ada402afbed3b19c490fb1b07fcd2a9c1791b1c97566186d9a46c9ac35113685b1a32b287e9373339f932c0e794ad86a19aa497de879a
+EBUILD mariadb-connector-c-3.1.6.ebuild 2344 BLAKE2B da4880e8fee8dede76cce177181f1290874f3a72078b9d7a3cd9ce3ad6d3abf7d72b418e81f57bdeb321e0e39d5a052b0195be70c92d066a53d8c4f0768842d0 SHA512 0b747b13ba14a5b1943ada402afbed3b19c490fb1b07fcd2a9c1791b1c97566186d9a46c9ac35113685b1a32b287e9373339f932c0e794ad86a19aa497de879a
 EBUILD mariadb-connector-c-9999.ebuild 2344 BLAKE2B 503e29dbd45777f693139c7febc843733c68b1c3c6151e7f69afd5b09fbe1767be464f912c2d7a8a082320a951952dca213ec1241b9fb7b2a2a3b2818bffbed9 SHA512 47a5d77dfb14bf5ffdad3bf849a3bb0df995a4c7db5b94704231ad70ff6e7529c5713e830e8c11c76d1cec0303496815d449390b84d91ca9687e312939883166
 MISC metadata.xml 324 BLAKE2B fab5394015cd337683f65a257556ed0f15e35826bb0a6ce75a7033cd5931455ff2bed527064d698e9b3165f2cfcaff8a4bdfcad0b830482ae2e4389a79d529fb SHA512 1fe9e5d5d9f8e817ce49117fbcc6a6d706a090752606647496f2b7a25de51bfb641a408ff0cdaf626d83eb5c314d2e28c3f29532307d942cb41498edf4b44aa6
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.5.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.5.ebuild
deleted file mode 100644
index a62f6afecfb9..000000000000
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.5.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VCS_INHERIT=""
-if [[ "${PV}" == 9999 ]] ; then
-	VCS_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="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
-
-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 libressl +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? (
-			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		)
-	)
-	"
-RDEPEND="${DEPEND}"
-PATCHES=(
-	"${FILESDIR}"/gentoo-layout-3.0.patch
-	"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
-)
-
-src_configure() {
-	# bug 508724 mariadb cannot use ld.gold
-	tc-ld-disable-gold
-	multilib-minimal_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 ON OFF)
-		-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-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${D}" -name "*.a" -delete || die
-	fi
-}
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.4.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
index a62f6afecfb9..a62f6afecfb9 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.4.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild