kodi-addon.eclass: EAPI=7 support, fix warning

Fix CMAKE_INSTALL_LIBDIR warning, see:
https://github.com/xbmc/xbmc/blob/18.3-Leia/cmake/scripts/common/AddonHelpers.cmake#L308

Signed-off-by: Craig Andrews <candrews@gentoo.org>

diff --git a/eclass/kodi-addon.eclass b/eclass/kodi-addon.eclass
index 8f34ccd92a564ced824a7c4d74f954a0299a7a1a..e924dbdd69729c255af0755c999b05c72257f3e7 100644 (file)
--- a/eclass/kodi-addon.eclass
+++ b/eclass/kodi-addon.eclass
@@ -4,27 +4,31 @@
 # @ECLASS: kodi-addon.eclass
 # @MAINTAINER:
 # candrews@gentoo.org
-# @SUPPORTED_EAPIS: 4 5 6
+# @SUPPORTED_EAPIS: 4 5 6 7
 # @BLURB: Helper for correct building and (importantly) installing Kodi addon packages.
 # @DESCRIPTION:
 # Provides a src_configure function for correct CMake configuration
 
-inherit multilib cmake-utils
+inherit cmake-utils
 
 case "${EAPI:-0}" in
        4|5|6)
-               EXPORT_FUNCTIONS src_configure
+               inherit multilib
+               ;;
+       7)
                ;;
        *) die "EAPI=${EAPI} is not supported" ;;
 esac
 
+EXPORT_FUNCTIONS src_configure
+
 # @FUNCTION: kodi-addon_src_configure
 # @DESCRIPTION:
 # Configure handling for Kodi addons
 kodi-addon_src_configure() {
 
        mycmakeargs+=(
-               -DCMAKE_INSTALL_LIBDIR=$(get_libdir)/kodi
+               -DCMAKE_INSTALL_LIBDIR=${EPREFIX%/}/usr/$(get_libdir)/kodi
        )
 
        cmake-utils_src_configure