[gentoo-commits] repo/gentoo:master commit in: eclass/

[Andreas Sturmlechner]

commit:     958c50e9e40c11e3a56f520e3cf032b538906515
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  4 17:06:09 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan  4 17:07:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=958c50e9

kodi-addons.eclass: Switch EAPI-7 to cmake.eclass

All EAPI-7 consumers in Gentoo ebuild repository have been ported.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kodi-addon.eclass | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/eclass/kodi-addon.eclass b/eclass/kodi-addon.eclass
index e924dbdd697..914ee3e9f75 100644
--- a/eclass/kodi-addon.eclass
+++ b/eclass/kodi-addon.eclass
@@ -9,13 +9,12 @@
 # @DESCRIPTION:
 # Provides a src_configure function for correct CMake configuration
 
-inherit cmake-utils
-
 case "${EAPI:-0}" in
        4|5|6)
-               inherit multilib
+               inherit cmake-utils multilib
                ;;
        7)
+               inherit cmake
                ;;
        *) die "EAPI=${EAPI} is not supported" ;;
 esac
@@ -31,5 +30,8 @@ kodi-addon_src_configure() {
                -DCMAKE_INSTALL_LIBDIR=${EPREFIX%/}/usr/$(get_libdir)/kodi
        )
 
-       cmake-utils_src_configure
+       case ${EAPI} in
+               4|5|6) cmake-utils_src_configure ;;
+               7) cmake_src_configure ;;
+       esac
 }