commit: 6230441073031d9f6301deb2e3017e598b22b200 Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> AuthorDate: Sat Sep 3 11:19:24 2022 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Mon Sep 12 19:14:32 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62304410
kodi-addon.eclass: drop support for EAPI<7 - No consumers for EAPI<7 remain in ::gentoo tree - For those EAPIs, it tries to inherit cmake-utils eclass, which doesn't exist, so it would just fail! - Simplify the eclass logic - Fix UnquotedVariable for EPREFIX Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> eclass/kodi-addon.eclass | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/eclass/kodi-addon.eclass b/eclass/kodi-addon.eclass index 8cbbad9224fc..6e7fa26f3c8a 100644 --- a/eclass/kodi-addon.eclass +++ b/eclass/kodi-addon.eclass @@ -1,25 +1,22 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: kodi-addon.eclass # @MAINTAINER: # candr...@gentoo.org -# @SUPPORTED_EAPIS: 4 5 6 7 -# @PROVIDES: cmake cmake-utils +# @SUPPORTED_EAPIS: 7 +# @PROVIDES: cmake # @BLURB: Helper for correct building and (importantly) installing Kodi addon packages. # @DESCRIPTION: # Provides a src_configure function for correct CMake configuration -case "${EAPI:-0}" in - 4|5|6) - inherit cmake-utils multilib - ;; - 7) - inherit cmake - ;; - *) die "EAPI=${EAPI} is not supported" ;; +case ${EAPI} in + 7) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac +inherit cmake + EXPORT_FUNCTIONS src_configure # @FUNCTION: kodi-addon_src_configure @@ -28,11 +25,8 @@ EXPORT_FUNCTIONS src_configure kodi-addon_src_configure() { mycmakeargs+=( - -DCMAKE_INSTALL_LIBDIR=${EPREFIX%/}/usr/$(get_libdir)/kodi + -DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)/kodi" ) - case ${EAPI} in - 4|5|6) cmake-utils_src_configure ;; - 7) cmake_src_configure ;; - esac + cmake_src_configure }