From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sat, 4 Jan 2020 17:06:09 +0000 (+0100)
Subject: kodi-addons.eclass: Switch EAPI-7 to cmake.eclass
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=958c50e9e40c11e3a56f520e3cf032b538906515;p=gentoo.git

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@gentoo.org>
---

diff --git a/eclass/kodi-addon.eclass b/eclass/kodi-addon.eclass
index e924dbdd6972..914ee3e9f750 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
 }