From 0d73e3c23002ac214b23131084de34b05977b6fc Mon Sep 17 00:00:00 2001
From: Brian Evans <grknight@gentoo.org>
Date: Tue, 16 Oct 2018 21:35:51 -0400
Subject: dev-db/mariadb-connector-c: Drop cmake-multilib and old builds

Signed-off-by: Brian Evans <grknight@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6
---
 dev-db/mariadb-connector-c/Manifest                |  30 +++---
 .../mariadb-connector-c-2.0.0-r1.ebuild            |  81 ----------------
 .../mariadb-connector-c-2.1.0.ebuild               |  80 ----------------
 .../mariadb-connector-c-2.2.2.ebuild               |   4 +-
 .../mariadb-connector-c-3.0.1_beta.ebuild          | 104 --------------------
 .../mariadb-connector-c-3.0.3.ebuild               | 105 ---------------------
 .../mariadb-connector-c-9999.ebuild                |  24 ++---
 7 files changed, 25 insertions(+), 403 deletions(-)
 delete mode 100644 dev-db/mariadb-connector-c/mariadb-connector-c-2.0.0-r1.ebuild
 delete mode 100644 dev-db/mariadb-connector-c/mariadb-connector-c-2.1.0.ebuild
 delete mode 100644 dev-db/mariadb-connector-c/mariadb-connector-c-3.0.1_beta.ebuild
 delete mode 100644 dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3.ebuild

diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
index a4c0a98..96c1c73 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,27 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST mariadb-connector-c-2.1.0-src.tar.gz 1912888 SHA256 568050b89463af7610d458669fd9eee06dcc9405689aca8a526ac8c013b59167 SHA512 1bf06ed2fe2a39c15bbd48029b2e6aaf0a9b4704f18e0caa9f356f6b41c8e57e5170e83e875929eb77ec631250f983d1cf8d60d78156b1e6795518a1a346bbe7 WHIRLPOOL 205319d1e4b47f41f2e5f409f66ba9101d7a041ac7550f3886471db02ae329d671a12ebd2177bbec83d2f99baa603589ca8d45fe09ed7f4f20c26a9150ed0624
 DIST mariadb-connector-c-2.2.2-src.tar.gz 519724 SHA256 93f56ad9f08bbaf0da8ef03bc96f7093c426ae40dede60575d485e1b99e6406b SHA512 8e7b35345de3ae3902b74613646c17641e441548ec87eb97c635c98dcddb0862411a625d9e82ba62324babe21d0d099a241b074826f0b396b425a80e714dd355 WHIRLPOOL e09d535186726cad6c880327e2045176a8bc773675381262bcff071ecccbdaa6b2fc802250cedf9d3a5f8848fa178fba9a8e236e3d3d988800826176376b91b1
-DIST mariadb-connector-c-3.0.1_beta-src.tar.gz 650137 SHA256 37b7922254e637285e69deceaa81667be103b1ac904b5a946a74d6d3ec97eeac SHA512 99e65987317b4169558191e45449332465188721429842f5196afb22f5e7ec31ac833c75ca8820c9bd63f7745df58fd17e809a83bca58d1a74f329dc10aee551 WHIRLPOOL 770e7e4368fbc17e871a704112c94522b27f564dd66d4520d0afdb46ef0e32e054d533d93a2ff60b9d7f42e15a2c33d2d8723dcb07f4d8f5b459820c797b012b
-DIST mariadb-connector-c-3.0.3-src.tar.gz 666928 SHA256 210f0ee3414b235d3db8e98e9e5a0a98381ecf771e67ca4a688036368984eeea SHA512 6da66a32165cb74b106bf94e13a35d4bb38f05e5d2b3ff3740862dfc0892a7705977c1394b4f84b8e1f1e50a59a3fadbc62e7733b1feb532c6368a9fc262db04 WHIRLPOOL 808428dbf05546a2066ce8198e9713bc5e86caf068ed3ab308ee8e912d39248e1c0d7ddc912d8d12ec77411a744c8db5b3dc2351329b06e28ef5be22b5bc8790
-DIST mariadb_client-2.0.0-src.tar.gz 1923436 SHA256 fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60 SHA512 7be7454dedc218bb5cdeae5d54c461129cc4611d0e380c4d2bf60bc276e85ea0ae52b0dcf8a41edef0e0e678e1392c2ddcebb9c4a75ad4625808fd0cc7522c75 WHIRLPOOL be699bbda7d86a8708347fcfdc0ebdc17f1fe6ee6e4d1b839e849673450849ab4838eee8d6995a45009a899dbe88d63f7e09dc94933b598b16709db92958aa55
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlpt6ulfFIAAAAAALgAo
+iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlvGkfJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
 QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
-o7YVpxAAsM1Pzw+qxoXilOvt3NTCtH74pVTG37cls30jxH0t4/sHeegKubqIDgRA
-e/Rsb+Ap6urwpwFg3owHEksgdaHcoStVnEjWhvjJzlS3wbbV7NDpql8J4hZTTD+Z
-ftb6GZurv+C6PplZCfVag8Z/zeOT698VZL7aLIMDE6KMBGj+KSES/q1fmQtGGQI8
-Jp4r7ZJGazZmQnjDoFiBizTNRwXRc3mJ8izN1qUWeeahuRegrYF5EK6u/JtzhOnW
-ukXfAdRBDZuTqeX9LZwtLpFZLsH1SfTH6BStBgnYOu865a2MlF1PKtCe/OOeR/WX
-/PGzv5+dws6bF08hXG4aOZQSfuznzcpUIYcQQAco6xOGKYQJ0DztV1/0nrza9zKq
-GkfiJGJLfQAhBbMttv3sod777NlFcs+7P+BFGxgY5xMLiGQDXVjhmPtVxHRK0cO0
-cvalKmvIzBpxx1pBv5e9HumNv3uDcBQ8jnuEdeHKfH5jLJuRynS4UPD7D5iCuKPg
-Hq5+gEEDz/0XG9DjFagIwK6OyurAmV79Ia37UF8dQi0ikMhpIq/dN5IfOxpj59lD
-yFRKp5BBHBBram+pnzTPTcZHnernuyBNKxYGNOovQ3zILA41I/Hbhhfq5sbyNnHG
-bdhbnTKujLYiD/MZtzZ5xQCTt9bDx1P7dlv5y2kTTMeyxuRj2Gc=
-=x+dp
+o7aOZg/+N0nU88jEV2GjbwsxV98LaGTSYNlNzGT84WL9G2dHjxXodI6eli7tfjXf
+BufXEXqrS6VahipTya6JCG4P/z+06AvpA7ZHCUZkJ/m88gnDQ5vdMnjFYVfm7iVO
+ODA4mzPcdJ1ah6OeRYsk1kqFqFLhr40weDSMwTjbLAm1771RVzJSkz0L7acRF+WE
+F960IK1WaWY9K0D/nRb0VgCckfcLOHQBUsNmQru/QopI196thCP9wnaQQWFyqjIL
+pbduyvBc3rPmTeBo+Gm3R2F2rqy2tyxccmYpoYERbYNomuUnSo9Lgo9qe+yRhKXf
+hleNchUqUFNYnwvCAx42SU2CNxzBufTVJyTvCvFq1PcUwlVGq+3VIaElwcspzo5f
+8eiORT66BM5lV79eG1Tqj4P+ctwIKp3Mq89pfwT9IjgZljDukz56fgZQvDFZQkqs
+dZhQoyV7rLx+VKwj/s4k58B8o7kS7IDrCqMhTcwsZJ/gn2xRqeIMUxWxJgnndAZE
+5lPHf+/johpj8Zffhd4ehFSe9A4oyAP3BUdndScSixqY58F+f4S5MN32ZHELLng3
+3NO/a4kUcMZ0nF8B4LXygQciKBqMJVp3N+xUL3sKH33ZfJl+PHv5JEvKkaa4JZLT
+zbIg5aV+znJR7sdyQWcBE31NYnyJphcz6riROk9KK78d2Zvp3s8=
+=BD3O
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-2.0.0-r1.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-2.0.0-r1.ebuild
deleted file mode 100644
index 5743d88..0000000
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-VCS_INHERIT=""
-if [[ "${PV}" == 9999 ]] ; then
-	VCS_INHERIT="git-r3"
-	EGIT_REPO_URI="https://github.com/MariaDB/connector-c.git"
-	KEYWORDS=""
-else
-	MY_PN="mariadb_client"
-	SRC_URI="
-	http://ftp.osuosl.org/pub/mariadb/client-native-${PV}/src/${MY_PN}-${PV}-src.tar.gz
-	http://mirrors.fe.up.pt/pub/mariadb/client-native${PV}/src/${MY_PN}-${PV}-src.tar.gz
-	http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/client-native-${PV}/src/${MY_PN}-${PV}-src.tar.gz
-	"
-	S="${WORKDIR}/${MY_PN}-${PV}-src"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit cmake-multilib eutils ${VCS_INHERIT}
-
-MULTILIB_WRAPPED_HEADERS+=(
-	/usr/include/mariadb/my_config.h
-)
-
-DESCRIPTION="C client library for MariaDB/MySQL"
-HOMEPAGE="http://mariadb.org/"
-LICENSE="LGPL-2.1"
-
-SLOT="0/2"
-IUSE="doc +mysqlcompat +ssl static-libs"
-
-CDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	virtual/libiconv:=[${MULTILIB_USEDEP}]
-	ssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
-	"
-# Block server packages due to /usr/bin/mariadb_config symlink there
-# TODO: make server package block only when mysqlcompat is enabled
-RDEPEND="${CDEPEND}
-	!dev-db/mysql
-	!dev-db/mysql-cluster
-	!dev-db/mysql-connector-c
-	!dev-db/mariadb
-	!dev-db/mariadb-galera
-	!dev-db/percona-server
-	"
-DEPEND="${CDEPEND}
-	doc? ( app-text/xmlto )"
-
-src_prepare() {
-	epatch 	"${FILESDIR}/fix-libdir.patch" \
-		"${FILESDIR}/fix-mariadb_config.patch"
-}
-
-src_configure() {
-	mycmakeargs+=(
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DWITH_EXTERNAL_ZLIB=ON
-		$(cmake-utils_use_with ssl OPENSSL)
-		$(cmake-utils_use_with mysqlcompat MYSQLCOMPAT)
-		$(cmake-utils_use_build doc DOCS)
-	)
-	cmake-multilib_src_configure
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	if ! use static-libs ; then
-		rm "${ED}/usr/$(get_libdir)/libmariadbclient.a" || die
-		use mysqlcompat && rm "${ED}/usr/$(get_libdir)/libmysqlclient.a" || die
-	fi
-}
-
-multilib_src_install_all() {
-	if use mysqlcompat ; then
-		dosym mariadb_config /usr/bin/mysql_config
-		dosym mariadb /usr/include/mysql
-	fi
-}
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-2.1.0.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-2.1.0.ebuild
deleted file mode 100644
index 2e8d6b3..0000000
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-2.1.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-VCS_INHERIT=""
-if [[ "${PV}" == 9999 ]] ; then
-	VCS_INHERIT="git-r3"
-	EGIT_REPO_URI="https://github.com/MariaDB/connector-c.git"
-	KEYWORDS=""
-else
-	MY_PN=${PN#mariadb-}
-	SRC_URI="
-	http://ftp.osuosl.org/pub/mariadb/${MY_PN}-${PV}/source-tgz/${P}-src.tar.gz
-	http://mirrors.fe.up.pt/pub/mariadb/${MY_PN}-${PV}/source-tgz/${P}-src.tar.gz
-	http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/${MY_PN}-${PV}/source-tgz/${P}-src.tar.gz
-	"
-	S="${WORKDIR}/${P}-src"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit cmake-multilib eutils ${VCS_INHERIT}
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
-
-MULTILIB_WRAPPED_HEADERS+=(
-	/usr/include/mariadb/my_config.h
-)
-
-DESCRIPTION="C client library for MariaDB/MySQL"
-HOMEPAGE="http://mariadb.org/"
-LICENSE="LGPL-2.1"
-
-SLOT="0/2"
-IUSE="mysqlcompat +ssl static-libs"
-
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	virtual/libiconv:=[${MULTILIB_USEDEP}]
-	ssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-	"
-# Block server packages due to /usr/bin/mariadb_config symlink there
-# TODO: make server package block only when mysqlcompat is enabled
-RDEPEND="${DEPEND}
-	!dev-db/mysql
-	!dev-db/mysql-cluster
-	!dev-db/mariadb
-	!dev-db/mariadb-galera
-	!dev-db/percona-server
-	mysqlcompat? ( !dev-db/mysql-connector-c )
-	"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/fix-mariadb_config-2.1.0.patch" \
-		"${FILESDIR}/gentoo-layout.patch"
-	epatch_user
-}
-
-multilib_src_configure() {
-	mycmakeargs+=(
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DWITH_EXTERNAL_ZLIB=ON
-		$(cmake-utils_use_with ssl OPENSSL)
-		$(cmake-utils_use_with mysqlcompat MYSQLCOMPAT)
-		-DLIB_INSTALL_DIR=$(get_libdir)
-		-DPLUGIN_INSTALL_DIR=$(get_libdir)/mariadb/plugin
-		-DINSTALL_LAYOUT=GENTOO
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${D}" -name "*.a" -delete || die
-	fi
-	if use mysqlcompat ; then
-		dosym mariadb_config /usr/bin/mysql_config
-		dosym mariadb /usr/include/mysql
-	fi
-}
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-2.2.2.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-2.2.2.ebuild
index d484eca..882ee60 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-2.2.2.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -65,7 +65,7 @@ multilib_src_install_all() {
 		find "${D}" -name "*.a" -delete || die
 	fi
 	if use mysqlcompat ; then
-		dosym /usr/sbin/mariadb_config /usr/bin/mysql_config
+		dosym ../sbin/mariadb_config /usr/bin/mysql_config
 		dosym mariadb /usr/include/mysql
 	fi
 }
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.1_beta.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.1_beta.ebuild
deleted file mode 100644
index 89d8b33..0000000
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.1_beta.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VCS_INHERIT=""
-if [[ "${PV}" == 9999 ]] ; then
-	VCS_INHERIT="git-r3"
-	EGIT_REPO_URI="https://github.com/MariaDB/connector-c.git"
-	KEYWORDS=""
-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 ~x86"
-fi
-
-inherit cmake-utils multilib-minimal ${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="http://mariadb.org/"
-LICENSE="LGPL-2.1"
-
-SLOT="0/2"
-IUSE="+curl gnutls kerberos libressl mysqlcompat +ssl static-libs"
-
-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}
-	mysqlcompat? (
-	!dev-db/mysql
-	!dev-db/mysql-cluster
-	!dev-db/mariadb
-	!dev-db/mariadb-galera
-	!dev-db/percona-server
-	!dev-db/mysql-connector-c )
-	"
-PATCHES=(
-	"${FILESDIR}/gentoo-layout-3.0.patch" )
-
-src_prepare() {
-	local gpluginconf="${T}/gentoo-plugins.cmake"
-	touch "${gpluginconf}" || die
-	# Plugins cannot be disabled by a build switch, redefine them in our own file to be included
-	if ! use kerberos ; then
-		echo 'REGISTER_PLUGIN("AUTH_GSSAPI" "" "auth_gssapi_plugin" "OFF" "auth_gssapi_client" 1)' \
-			>> "${gpluginconf}" || die
-	fi
-	if ! use curl ; then
-		echo 'REGISTER_PLUGIN("REMOTEIO" "" "remote_io_plugin" "OFF" "remote_io" 1)' \
-			>> "${gpluginconf}" || die
-	fi
-	default
-}
-
-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)
-		-DAUTH_GSSAPI_PLUGIN_TYPE:STRING=$(usex kerberos ON OFF)
-		-DINSTALL_LIBDIR="$(get_libdir)"
-		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
-		-DINSTALL_BINDIR=bin
-		-DPLUGIN_CONF_FILE:STRING="${T}/gentoo-plugins.cmake"
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	if use mysqlcompat ; then
-		dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so.19
-		dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so
-	fi
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${D}" -name "*.a" -delete || die
-	fi
-	if use mysqlcompat ; then
-		dosym mariadb_config /usr/bin/mysql_config
-		dosym mariadb /usr/include/mysql
-	fi
-}
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3.ebuild
deleted file mode 100644
index 552150c..0000000
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VCS_INHERIT=""
-if [[ "${PV}" == 9999 ]] ; then
-	VCS_INHERIT="git-r3"
-	EGIT_REPO_URI="https://github.com/MariaDB/connector-c.git"
-	KEYWORDS=""
-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 ~x86"
-fi
-
-inherit cmake-utils multilib-minimal ${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="http://mariadb.org/"
-LICENSE="LGPL-2.1"
-
-SLOT="0/2"
-IUSE="+curl gnutls kerberos libressl mysqlcompat +ssl static-libs"
-
-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}
-	mysqlcompat? (
-	!dev-db/mysql[client-libs(+)]
-	!dev-db/mysql-cluster[client-libs(+)]
-	!dev-db/mariadb[client-libs(+)]
-	!dev-db/mariadb-galera[client-libs(+)]
-	!dev-db/percona-server[client-libs(+)]
-	!dev-db/mysql-connector-c )
-	!>=dev-db/mariadb-10.2.0[client-libs(+)]
-	"
-PATCHES=(
-	"${FILESDIR}/gentoo-layout-3.0.patch" )
-
-src_prepare() {
-	local gpluginconf="${T}/gentoo-plugins.cmake"
-	touch "${gpluginconf}" || die
-	# Plugins cannot be disabled by a build switch, redefine them in our own file to be included
-	if ! use kerberos ; then
-		echo 'REGISTER_PLUGIN("AUTH_GSSAPI" "" "auth_gssapi_plugin" "OFF" "auth_gssapi_client" 1)' \
-			>> "${gpluginconf}" || die
-	fi
-	if ! use curl ; then
-		echo 'REGISTER_PLUGIN("REMOTEIO" "" "remote_io_plugin" "OFF" "remote_io" 1)' \
-			>> "${gpluginconf}" || die
-	fi
-	cmake-utils_src_prepare
-}
-
-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)
-		-DAUTH_GSSAPI_PLUGIN_TYPE:STRING=$(usex kerberos ON OFF)
-		-DINSTALL_LIBDIR="$(get_libdir)"
-		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
-		-DINSTALL_BINDIR=bin
-		-DPLUGIN_CONF_FILE:STRING="${T}/gentoo-plugins.cmake"
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	if use mysqlcompat ; then
-		dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so.19
-		dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so
-	fi
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${D}" -name "*.a" -delete || die
-	fi
-	if use mysqlcompat ; then
-		dosym mariadb_config /usr/bin/mysql_config
-		dosym mariadb /usr/include/mysql
-	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 8b4cb07..c45c245 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 VCS_INHERIT=""
 if [[ "${PV}" == 9999 ]] ; then
@@ -19,7 +19,7 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-inherit cmake-multilib eutils ${VCS_INHERIT}
+inherit cmake-utils multilib-minimal ${VCS_INHERIT}
 
 MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
 
@@ -27,6 +27,9 @@ MULTILIB_WRAPPED_HEADERS+=(
 	/usr/include/mariadb/my_config.h
 )
 
+PATCHES=( "${FILESDIR}/fix-mariadb_config-2.1.0.patch"
+		"${FILESDIR}/gentoo-layout.patch" )
+
 DESCRIPTION="C client library for MariaDB/MySQL"
 HOMEPAGE="http://mariadb.org/"
 LICENSE="LGPL-2.1"
@@ -49,19 +52,12 @@ RDEPEND="${DEPEND}
 	mysqlcompat? ( !dev-db/mysql-connector-c )
 	"
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}/fix-mariadb_config-2.1.0.patch" \
-		"${FILESDIR}/gentoo-layout.patch"
-	epatch_user
-}
-
 multilib_src_configure() {
-	mycmakeargs+=(
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	local mycmakeargs=(
+		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
 		-DWITH_EXTERNAL_ZLIB=ON
-		$(cmake-utils_use_with ssl OPENSSL)
-		$(cmake-utils_use_with mysqlcompat MYSQLCOMPAT)
+		-DOPENSSL=$(usex ssl ON OFF)
+		-DMYSQLCOMPAT=$(usex mysqlcompat ON OFF)
 		-DLIB_INSTALL_DIR=$(get_libdir)
 		-DPLUGIN_INSTALL_DIR=$(get_libdir)/mariadb/plugin
 		-DINSTALL_LAYOUT=GENTOO
-- 
cgit v1.2.3-65-gdbad