[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     e304c85d3f4e55cb89af39249be96d8dc64cb114
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 25 10:32:26 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar  6 12:21:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e304c85d

dev-db/mysql-connector-c: Switch to cmake.eclass, skel.ebuild order

Closes: https://bugs.gentoo.org/770526
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../mysql-connector-c/mysql-connector-c-8.0.23.ebuild  | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.23.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.23.ebuild
index 17f49931dfe..6553c3776e5 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.23.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.23.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 # wrap the config script
@@ -10,12 +11,11 @@ MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
 
 DESCRIPTION="C client library for MariaDB/MySQL"
 HOMEPAGE="https://dev.mysql.com/downloads/"
-LICENSE="GPL-2"
-
 SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${PV}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
 
+LICENSE="GPL-2"
 SLOT="0/21"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
 IUSE="ldap libressl static-libs"
 
 RDEPEND="
@@ -25,7 +25,7 @@ RDEPEND="
 	ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] )
 	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
 	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-	"
+"
 DEPEND="${RDEPEND}"
 
 # Avoid file collisions, #692580
@@ -48,7 +48,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "${S}/scripts/CMakeLists.txt" || die
+	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
@@ -73,7 +73,7 @@ src_prepare() {
 		echo > libmysql/authentication_ldap/CMakeLists.txt || die
 	fi
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 multilib_src_configure() {
@@ -93,11 +93,7 @@ multilib_src_configure() {
 		-DCMAKE_POSITION_INDEPENDENT_CODE=ON
 		-DWITHOUT_SERVER=ON
 	)
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
+	cmake_src_configure
 }
 
 multilib_src_install_all() {