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

[Thomas Deutschmann]

commit:     81f261aafc3a920b19281b06398738d21355379d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  2 16:42:59 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar  2 17:15:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81f261aa

dev-db/mariadb-connector-c: switch to cmake.eclass

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 .../mariadb-connector-c-3.1.12.ebuild              | 23 +++++--------------
 .../mariadb-connector-c-9999.ebuild                | 26 +++++++---------------
 2 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild
index 80f4c976d4b..7a4723936d3 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=7
 
-VCS_INHERIT=""
 if [[ "${PV}" == 9999 ]] ; then
-       VCS_INHERIT="git-r3"
+       inherit git-r3
        EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git";
 else
        MY_PN=${PN#mariadb-}
@@ -15,7 +14,8 @@ else
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 
~sparc ~x86"
 fi
 
-inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
+CMAKE_ECLASS=cmake
+inherit cmake-multilib toolchain-funcs
 
 MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
 
@@ -52,13 +52,10 @@ PATCHES=(
        "${FILESDIR}"/${PN}-3.1.11-fix-flow-control-statement.patch
 )
 
-src_configure() {
+multilib_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)
@@ -72,19 +69,11 @@ multilib_src_configure() {
                -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
+       cmake_src_configure
 }
 
 multilib_src_install_all() {
        if ! use static-libs ; then
-               find "${D}" -name "*.a" -delete || die
+               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 be4696f0f20..7a4723936d3 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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"
+       inherit git-r3
        EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git";
 else
        MY_PN=${PN#mariadb-}
@@ -15,7 +14,8 @@ else
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 
~sparc ~x86"
 fi
 
-inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
+CMAKE_ECLASS=cmake
+inherit cmake-multilib toolchain-funcs
 
 MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
 
@@ -49,15 +49,13 @@ RDEPEND="${DEPEND}"
 PATCHES=(
        "${FILESDIR}"/gentoo-layout-3.0.patch
        "${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
+       "${FILESDIR}"/${PN}-3.1.11-fix-flow-control-statement.patch
 )
 
-src_configure() {
+multilib_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)
@@ -71,19 +69,11 @@ multilib_src_configure() {
                -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
+       cmake_src_configure
 }
 
 multilib_src_install_all() {
        if ! use static-libs ; then
-               find "${D}" -name "*.a" -delete || die
+               find "${ED}" -name "*.a" -delete || die
        fi
 }