gentoo resync : 26.11.2017

9 files changed, 22 insertions, 318 deletions

diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest
index 9c7071f67341..ee1614f80609 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -1,14 +1,5 @@
-AUX conn-c-includes.patch 386 SHA256 ff1107769ef8eca55f27948b14fb7d70ca24d3b072c8a558331f27d7256f5164 SHA512 7601beb869ca55387790244fa5c0748eff1e5c6e3533aa4039cdbe3361d785f00a93b0ec43a6d96972c9c8c5bebb09a94fa6508eb5ce05f383522c4ab29ea11f WHIRLPOOL 1e6a2155cef46753366df3b13dd5fde709473e408906c5c485b03f8603e2a35a697d9cbb0a9d5b29c887b55c265853a4e3129c1152386bfe23894264865914bf
-AUX mysql_com.patch 1787 SHA256 faa8711e119def5a6c8106b6efa3d1a479ff68583809a9dc0e9f900ebf0e2d8b SHA512 340365b05d72045af0ef12fd5c260a796be547d9abb97a6ef3d6aaf30aecf29368c1dfa28f1284da544a81656f0436f11ada2f8c5cb481540d1f1c90dd354b49 WHIRLPOOL 9db197670b891d2661c2777671da30d72e8de477e16d4ab09fb501a9afc7d12326958ccab34ac6463597bc112e64bf7bc0ebbf813d491af4c3eedbaf8243cce3
-AUX openssl-cmake-detection.patch 564 SHA256 4e44d7a94ca89cced30b41207b00c47cba819c2b9021e035fd498aa3ea5694c1 SHA512 29214f3e8351c857b73ad39267179f04e50beb28ef00cf59375145e1fdbd4ce73ac7b2dc54975aa8f9406a1fa996bdff4852692629166bd1bef1d8ac9b24d435 WHIRLPOOL 796e862f7913e896b8f8cb9be49136f417a9cb051e184dc23ae988c970fb07f8b3b2b06c00975c0ffe3197edeca5f4b7d87143d69f8e34e484c2f2c0d821b555
-DIST mysql-connector-c-6.1.5-src.tar.gz 3455028 SHA256 278f2b40f3980079bc7ad247cb2bf08967ce56ef79da468ae26ff2e2a560be66 SHA512 be47ed70865744ff9ecb9376972208504327514f03635e54c05e81d324bcf9ba777300a12738d8ca32b95c9c31d734dc9f6ebb7bb24fd11821560a6b0f09bb56 WHIRLPOOL bfdd17908cae63ef5b5006bdf28432bb12738044fe99960fdddab6da527ab41211a48396270a778ce500c5758c2f5d50c1fd850a92c684996612ab7c38637c61
-DIST mysql-connector-c-6.1.6-src.tar.gz 3475044 SHA256 2222433012c415871958b61bc4f3683e1ebe77e3389f698b267058c12533ea78 SHA512 2a3db4aec5b8e5357fa407d6e2b52534f7aa9c0b78c4ebe9a61e2e25dc5f7dc1f1962f6e6fd847107ce53ca369e0babe7118b947a87189495212596348cfd760 WHIRLPOOL 6a0a55a47a88606c12511f9fd155bafcf5d73b1ffa2c4877b838bca018f4a8a8f4427ac6af6e4c567eced7e1108dba4a613255f813ab481e8ea948b3a6cdff33
-DIST mysql-connector-c-6.1.9-src.tar.gz 3494748 SHA256 4e808704443365ad5b649673d03eca8fbebc0a4da9f1f96616c6bd1b1901ab2b SHA512 3127d08428e820044e25ab5ebb741a128325be6ca0fca0300cab33891693e11e57d4ded5a25918a67d23cceb8a2c6ee99879ffb50c31bc4c2e225a9dba9674dc WHIRLPOOL 7f0cb1fa7bb0f77447f4884b567e7881d8d9c1dda2e27250838fe8a51ac4ddcb8f7aa683fe11a3f7f9545f90918b15fe9e033da138c86e5bd4f360164ebaeb2e
-EBUILD mysql-connector-c-6.1.5.ebuild 1427 SHA256 95774f8e83c1f905668231c28d3f17124a520f945b2ab15f87d955c892ab9585 SHA512 1ee302c40a4bc611a3e7f5ec2efe597a0d427728d96f332ab7971f6d14afa9dafb8e58bf9cef1e259b49f2dbad9c068f6001618dbc49652a6482725c647f8675 WHIRLPOOL ad6c321225cfbabb8353007b0cdcd594d5c1746b59d84e83c999ff3a9fc31377b11901d6b039ce035c0279d913c1b119db0410bfcbe199347c2cfbe41a083d00
-EBUILD mysql-connector-c-6.1.6-r1.ebuild 1583 SHA256 b805fed195f90c1c472305d7606506324d4ac3d2664cfdaa5109576654d64155 SHA512 57460f5c37626fee2bdcff273ea491a1c44e2e2f690df61a10c5219be16ef7378abd876c1bf8c80400f14bf435642294e87f0921d579330a961cc5ac36c4bd88 WHIRLPOOL c4851aaac50aa73751bc9586a1ebc37ff2a5afc4d9b9913edac25ca8373349257113c6d822709b87f0ffda91215b84a131b28f5da0baeb13b2e75a729fc2475a
-EBUILD mysql-connector-c-6.1.6-r2.ebuild 2072 SHA256 dabc381c2cfeb84f67596d44491a60d8696b0f49b97e94ff790fb49ab67d8a94 SHA512 ef97936b80f928978afab284d60a3773fef8f467f115d93c28c6e9021ae8a1c87fe671f2db3761e6f1f6f3d0c1d74e68ca0067400c0717c99dd9bfc3748a1d72 WHIRLPOOL dab74fb6896ec7abd876a756c4aa5b84c895d795439823d630edf3b93293c40db52ec3ba044d4aee252b039ef2e3e60f9b96225ea89c4488d743f8d145d0a20d
-EBUILD mysql-connector-c-6.1.9-r1.ebuild 2175 SHA256 4ab36e26fae8c12580faa97ec493f37dfb22b95caba1b4dc7bf56df5e9639fde SHA512 feedc21396fe090439d990deb40678baca4f08a3741187ab8b9a15cfa1d2ae6516c811bf33c62f50ee5f9305e0cc0df3d858283e55c663d273cafb7bdc92ad4d WHIRLPOOL d854df916db53df0b4b8c5b33ac66b9e21db1716bcec9528583ba69e9b92e27671589e61d7297d397ee23f015517707e4cc3c7f1212d9c76cb6a0d8ae378642c
-EBUILD mysql-connector-c-6.1.9.ebuild 1974 SHA256 1ae8455216fde95576bf042bed21062a9d648a027bc6884ac9585bb37da76fb8 SHA512 f13c7e3bb1f8443f3ef07e40d33b3efcb040a25246bdce34331d3fe3c5a0e797f062857e6617a75847b3cf64c85b9554c7238dce205ff0612295c2ff0c4628f4 WHIRLPOOL f8a5857ce1f38fa1a1d7ad0047be903cfa1af67571598a8bbc032c21588124afa6d521d166bafa0abe768e02a0694be945b5294ebab96fa03720211ee0286bc4
-MISC ChangeLog 4210 SHA256 49bc4ddbe5d7b9861a0a47da0dff8439545aa1254e658f874eaabd682ea0a014 SHA512 2f40b4f4b12d226a535600df73b4579ef7d454c1f107d1e44b06f82437fe06b597a96e833b6811139bb717694066ac656f3533bddb7bb60044b0d9375dac816e WHIRLPOOL 8050a7b12e04c132413742de717d714b2cc145ada7a0c22379809b6b53c505da1e0d5cf8208b9074c8505bdfedea0754aa3401a857d04ae1342d8c50c3e4957b
-MISC ChangeLog-2015 601 SHA256 828e88df369701275ead137ce3a91c3d58da90f775583f5a06d3786f110d27cf SHA512 1e57ce1e1625114b48c7f4a410fea944098abe1dfca815a14e78df338dd2ccaa4ffa8e0db1225e194ecc7866262a2b9b618a79f5aa0e229fcb57d5aae4908ffa WHIRLPOOL b18260020190129b7ed3a43b70694697773b0d3e42bd0d8093accd4af678e60b856bc0eeb4da4633bd5a0709090a774397ead334c78a145d99ce1324e945403e
-MISC metadata.xml 239 SHA256 a35e1476a1677a91f06dd6e4f955fcebc58c3a07f934b5e62fbf801573a5c82b SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b WHIRLPOOL 3ed1945907fa58cbc9997c311d1d0431d481586576ce45b4bc5caf7704ddefe2117305879a97e8021694b86af0d570a34517212b6cc9528224b85e568eee3d75
+AUX 20028_all_mysql-5.6-gcc7.patch 603 BLAKE2B f03dc2e39dca4496cc084b427daa60014464876df456bf290a5de3431b481691a35ac9ac00d71cc86931efe3bca70dae012bedefc6d29ad7fec2feeb07cce014 SHA512 f9dab813418f38f3a877b8672cdec153d6f0f289144c35277e8275cc7a58195f974b7bf76b74f8dd2403643b1199f5e6d6bcde661ce5f79f614ff10347b52278
+AUX mysql_com.patch 1787 BLAKE2B 4fbd40325f400586926072927b3f07231d577f18c1e30951c34c36ded9b9e42b7c3dc47ca51df974265c28b40116e30274d8a73d6a843e5d9d0074430bc17b08 SHA512 340365b05d72045af0ef12fd5c260a796be547d9abb97a6ef3d6aaf30aecf29368c1dfa28f1284da544a81656f0436f11ada2f8c5cb481540d1f1c90dd354b49
+DIST mysql-connector-c-6.1.11-src.tar.gz 3489345 BLAKE2B 813512520ef660521221565a4466e81d902629d0ee731f746b68eed2b9129ea8361fcabe184537ec8ba91aed5a4b02dfb3450b36524c2e98f81fba148eee0cf1 SHA512 271395c888a93b833e0bbe1840b9987ecdb37d0f1cf89904207cc9aa99ed32e538aee8c9529ff39b6533947159776a8f5aa079da86ed51b1d26b086f4ffdd7c6
+EBUILD mysql-connector-c-6.1.11.ebuild 2206 BLAKE2B 1ac284b75e86cc7999d53e7680d641eee2be08b64c47477130450e321e1c2f8619798d3725cd27bb942fbf131ae24cf621c18f9b4c90278a57c2328e66c00d74 SHA512 924073576b7aeedf92f24b019b2f38a82a94feb4c39c884fcfbdc5297961da594d42741b6668200afc2af671909cef1031d0863bc99c967883ff52f860f28646
+MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/mysql-connector-c/files/20028_all_mysql-5.6-gcc7.patch b/dev-db/mysql-connector-c/files/20028_all_mysql-5.6-gcc7.patch
new file mode 100644
index 000000000000..cf8caedb7f1b
--- /dev/null
+++ b/dev-db/mysql-connector-c/files/20028_all_mysql-5.6-gcc7.patch
@@ -0,0 +1,13 @@
+diff --git a/sql-common/client_authentication.cc b/sql-common/client_authentication.cc
+index eaeb2d4..035ecd2 100644
+--- a/sql-common/client_authentication.cc
++++ b/sql-common/client_authentication.cc
+@@ -84,7 +84,7 @@ RSA *rsa_init(MYSQL *mysql)
+ 
+   if (mysql->options.extension != NULL &&
+       mysql->options.extension->server_public_key_path != NULL &&
+-      mysql->options.extension->server_public_key_path != '\0')
++      mysql->options.extension->server_public_key_path[0] != '\0')
+   {
+     pub_key_file= fopen(mysql->options.extension->server_public_key_path,
+                         "r");
diff --git a/dev-db/mysql-connector-c/files/conn-c-includes.patch b/dev-db/mysql-connector-c/files/conn-c-includes.patch
deleted file mode 100644
index fcde71f3f4ee..000000000000
--- a/dev-db/mysql-connector-c/files/conn-c-includes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -aurN a/include/CMakeLists.txt b/include/CMakeLists.txt
---- a/include/CMakeLists.txt	2015-07-14 13:06:04.424091000 -0400
-+++ b/include/CMakeLists.txt	2015-07-14 13:24:43.434091000 -0400
-@@ -55,6 +55,11 @@
-   byte_order_generic_x86.h
-   little_endian.h
-   big_endian.h
-+  my_thread_local.h
-+  thr_cond.h
-+  thr_lock.h
-+  thr_mutex.h
-+  thr_rwlock.h
-   ${HEADERS_GEN_CONFIGURE}
- )
- 
diff --git a/dev-db/mysql-connector-c/files/openssl-cmake-detection.patch b/dev-db/mysql-connector-c/files/openssl-cmake-detection.patch
deleted file mode 100644
index 3a5f53e7ba35..000000000000
--- a/dev-db/mysql-connector-c/files/openssl-cmake-detection.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aurN a/cmake/ssl.cmake b/cmake/ssl.cmake
---- a/cmake/ssl.cmake	2014-11-21 00:39:51.000000000 -0500
-+++ b/cmake/ssl.cmake	2015-01-27 08:45:36.771744344 -0500
-@@ -166,7 +166,7 @@
-     # 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].*"
-+      REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
-     )
-     STRING(REGEX REPLACE
-       "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.9-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.11.ebuild
index 7a1da326d8a4..c4494ba6484a 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.9-r1.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.11.ebuild
@@ -38,9 +38,11 @@ RDEPEND="${CDEPEND}
 	"
 DEPEND="${CDEPEND}"
 
-DOCS=( README Docs/ChangeLog )
+DOCS=( README )
 PATCHES=(
-	"${FILESDIR}/mysql_com.patch" )
+	"${FILESDIR}/mysql_com.patch"
+	"${FILESDIR}/20028_all_mysql-5.6-gcc7.patch"
+)
 
 src_prepare() {
 	sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "${S}/scripts/CMakeLists.txt" || die
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild
deleted file mode 100644
index 1813980a0934..000000000000
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-multilib eutils
-
-MULTILIB_WRAPPED_HEADERS+=(
-	/usr/include/mysql/my_config.h
-)
-
-DESCRIPTION="C client library for MariaDB/MySQL"
-HOMEPAGE="https://dev.mysql.com/downloads/connector/c/"
-LICENSE="GPL-2"
-
-SRC_URI="https://dev.mysql.com/get/Downloads/Connector-C/${P}-src.tar.gz"
-S="${WORKDIR}/${P}-src"
-KEYWORDS="~amd64 ~x86"
-
-SLOT="0/18"
-IUSE="+ssl static-libs"
-
-CDEPEND="
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	ssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
-	"
-RDEPEND="${CDEPEND}
-	!dev-db/mysql[client-libs(+)]
-	!dev-db/mysql-cluster[client-libs(+)]
-	!dev-db/mariadb[client-libs(+)]
-	!dev-db/mariadb-connector-c[mysqlcompat]
-	!dev-db/mariadb-galera[client-libs(+)]
-	!dev-db/percona-server[client-libs(+)]
-	"
-DEPEND="${CDEPEND}"
-
-DOCS=( README Docs/ChangeLog )
-PATCHES=( "${FILESDIR}/openssl-cmake-detection.patch" )
-
-multilib_src_configure() {
-	mycmakeargs+=(
-		-DINSTALL_LAYOUT=RPM
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DWITH_DEFAULT_COMPILER_OPTIONS=OFF
-		-DWITH_DEFAULT_FEATURE_SET=OFF
-		-DENABLED_LOCAL_INFILE=ON
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DWITH_ZLIB=system
-		-DENABLE_DTRACE=OFF
-		-DWITH_SSL=$(usex ssl system bundled)
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r1.ebuild
deleted file mode 100644
index b7b764fde620..000000000000
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-multilib eutils
-
-MULTILIB_WRAPPED_HEADERS+=(
-	/usr/include/mysql/my_config.h
-)
-
-# wrap the config script
-MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
-
-DESCRIPTION="C client library for MariaDB/MySQL"
-HOMEPAGE="https://dev.mysql.com/downloads/connector/c/"
-LICENSE="GPL-2"
-
-SRC_URI="https://dev.mysql.com/get/Downloads/Connector-C/${P}-src.tar.gz"
-S="${WORKDIR}/${P}-src"
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~x86"
-
-SLOT="0/18"
-IUSE="+ssl static-libs"
-
-CDEPEND="
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	ssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
-	"
-RDEPEND="${CDEPEND}
-	!dev-db/mysql[client-libs(+)]
-	!dev-db/mysql-cluster[client-libs(+)]
-	!dev-db/mariadb[client-libs(+)]
-	!dev-db/mariadb-connector-c[mysqlcompat]
-	!dev-db/mariadb-galera[client-libs(+)]
-	!dev-db/percona-server[client-libs(+)]
-	"
-DEPEND="${CDEPEND}"
-
-DOCS=( README Docs/ChangeLog )
-
-PATCHES=(
-	"${FILESDIR}/openssl-cmake-detection.patch"
-	"${FILESDIR}/conn-c-includes.patch"
-	"${FILESDIR}/mysql_com.patch"
-)
-
-multilib_src_configure() {
-	mycmakeargs+=(
-		-DINSTALL_LAYOUT=RPM
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DWITH_DEFAULT_COMPILER_OPTIONS=OFF
-		-DWITH_DEFAULT_FEATURE_SET=OFF
-		-DENABLED_LOCAL_INFILE=ON
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DWITH_ZLIB=system
-		-DENABLE_DTRACE=OFF
-		-DWITH_SSL=$(usex ssl system bundled)
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r2.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r2.ebuild
deleted file mode 100644
index fccb70097d1e..000000000000
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-multilib eutils multilib
-
-MULTILIB_WRAPPED_HEADERS+=(
-	/usr/include/mysql/my_config.h
-)
-
-# wrap the config script
-MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
-
-DESCRIPTION="C client library for MariaDB/MySQL"
-HOMEPAGE="https://dev.mysql.com/downloads/connector/c/"
-LICENSE="GPL-2"
-
-SRC_URI="https://dev.mysql.com/get/Downloads/Connector-C/${P}-src.tar.gz"
-S="${WORKDIR}/${P}-src"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc64 ~x86"
-
-SUBSLOT="18"
-SLOT="0/${SUBSLOT}"
-IUSE="+ssl static-libs"
-
-CDEPEND="
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	ssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-	"
-RDEPEND="${CDEPEND}
-	!dev-db/mysql[client-libs(+)]
-	!dev-db/mysql-cluster[client-libs(+)]
-	!dev-db/mariadb[client-libs(+)]
-	!dev-db/mariadb-connector-c[mysqlcompat]
-	!dev-db/mariadb-galera[client-libs(+)]
-	!dev-db/percona-server[client-libs(+)]
-	"
-DEPEND="${CDEPEND}"
-
-DOCS=( README Docs/ChangeLog )
-PATCHES=(
-	"${FILESDIR}/openssl-cmake-detection.patch"
-	"${FILESDIR}/conn-c-includes.patch"
-	"${FILESDIR}/mysql_com.patch"
-)
-
-multilib_src_configure() {
-	mycmakeargs+=(
-		-DINSTALL_LAYOUT=RPM
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DWITH_DEFAULT_COMPILER_OPTIONS=OFF
-		-DWITH_DEFAULT_FEATURE_SET=OFF
-		-DENABLED_LOCAL_INFILE=ON
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DWITH_ZLIB=system
-		-DENABLE_DTRACE=OFF
-		-DWITH_SSL=$(usex ssl system bundled)
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
-
-pkg_preinst() {
-	if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
-		elog "Due to ABI changes when switching between different client libraries,"
-		elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
-		elog "Please run: revdep-rebuild --library libmysqlclient.so.${SUBSLOT}"
-		ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
-	fi
-}
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.9.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.9.ebuild
deleted file mode 100644
index 2868be92897b..000000000000
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.9.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-MULTILIB_WRAPPED_HEADERS+=(
-	/usr/include/mysql/my_config.h
-)
-
-# wrap the config script
-MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
-
-DESCRIPTION="C client library for MariaDB/MySQL"
-HOMEPAGE="https://dev.mysql.com/downloads/connector/c/"
-LICENSE="GPL-2"
-
-SRC_URI="https://dev.mysql.com/get/Downloads/Connector-C/${P}-src.tar.gz"
-S="${WORKDIR}/${P}-src"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc64 ~x86"
-
-SUBSLOT="18"
-SLOT="0/${SUBSLOT}"
-IUSE="+ssl static-libs"
-
-CDEPEND="
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	ssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-	"
-RDEPEND="${CDEPEND}
-	!dev-db/mysql[client-libs(+)]
-	!dev-db/mysql-cluster[client-libs(+)]
-	!dev-db/mariadb[client-libs(+)]
-	!dev-db/mariadb-connector-c[mysqlcompat]
-	!dev-db/mariadb-galera[client-libs(+)]
-	!dev-db/percona-server[client-libs(+)]
-	"
-DEPEND="${CDEPEND}"
-
-DOCS=( README Docs/ChangeLog )
-PATCHES=(
-	"${FILESDIR}/mysql_com.patch" )
-
-multilib_src_configure() {
-	mycmakeargs+=(
-		-DINSTALL_LAYOUT=RPM
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DWITH_DEFAULT_COMPILER_OPTIONS=OFF
-		-DWITH_DEFAULT_FEATURE_SET=OFF
-		-DENABLED_LOCAL_INFILE=ON
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DWITH_ZLIB=system
-		-DENABLE_DTRACE=OFF
-		-DWITH_SSL=$(usex ssl system bundled)
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
-
-pkg_preinst() {
-	if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
-		elog "Due to ABI changes when switching between different client libraries,"
-		elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
-		elog "Please run: revdep-rebuild --library libmysqlclient.so.${SUBSLOT}"
-		ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
-	fi
-}