commit: 5b1df6b067e0b1bfee6ba657c8df4d24a5b08d35 Author: Thomas Bracht Laumann Jespersen <t <AT> laumann <DOT> xyz> AuthorDate: Thu Mar 17 08:42:55 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Mar 21 23:34:59 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b1df6b0
gkrellm-plugin.eclass: Support EAPI 8 The most notable changes are: * BDEPEND on "virtual/pkgconfig" instead of DEPEND * Add @DEFAULT_UNSET to the variables PLUGIN_SERVER_SO and PLUGIN_DOCS Looking over the eclass, it doesn't appear to use any functionality that was modified or banned in EAPI 7 or 8. Signed-off-by: Thomas Bracht Laumann Jespersen <t <AT> laumann.xyz> Closes: https://github.com/gentoo/gentoo/pull/24626 Signed-off-by: Sam James <sam <AT> gentoo.org> eclass/gkrellm-plugin.eclass | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/eclass/gkrellm-plugin.eclass b/eclass/gkrellm-plugin.eclass index fb3800f56b7d..c247e6362eb8 100644 --- a/eclass/gkrellm-plugin.eclass +++ b/eclass/gkrellm-plugin.eclass @@ -7,7 +7,8 @@ # @AUTHOR: # Original author: Jim Ramsay <[email protected]> # EAPI 6 author: David Seifert <[email protected]> -# @SUPPORTED_EAPIS: 6 +# EAPI 8 author: Thomas Bracht Laumann Jespersen <[email protected]> +# @SUPPORTED_EAPIS: 6 8 # @PROVIDES: multilib # @BLURB: Provides src_install used by (almost) all gkrellm plugins # @DESCRIPTION: @@ -15,6 +16,8 @@ # - Provides a common src_install method to avoid code duplication # # Changelog: +# 17 March 2022: Thomas Bracht Laumann Jespersen <[email protected]> +# - Port to EAPI 8 # 03 January 2018: David Seifert <[email protected]> # - Port to EAPI 6, remove built_with_use, simplify a lot # 12 March 2007: Jim Ramsay <[email protected]> @@ -29,35 +32,35 @@ # the plugin dir. Defaults to "${PN}$(get_modname)". Has to be a bash array. # @ECLASS-VARIABLE: PLUGIN_SERVER_SO +# @DEFAULT_UNSET # @DESCRIPTION: # The name of the plugin's server plugin $(get_modname) portion. # Unset by default. Has to be a bash array. # @ECLASS-VARIABLE: PLUGIN_DOCS +# @DEFAULT_UNSET # @DESCRIPTION: # An optional list of docs to be installed, in addition to the default # DOCS variable which is respected too. Has to be a bash array. -case ${EAPI:-0} in - [0-5]) - die "${ECLASS} is banned in EAPI ${EAPI:-0}" - ;; - 6) - ;; - *) - die "Unknown EAPI ${EAPI:-0}" - ;; +case ${EAPI} in + 6|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac inherit multilib -EXPORT_FUNCTIONS src_install - if [[ ! ${_GKRELLM_PLUGIN_R1} ]]; then +_GKRELLM_PLUGIN_R1=1 -DEPEND="virtual/pkgconfig" +if [[ ${EAPI} == 6 ]]; then + DEPEND="virtual/pkgconfig" +else + BDEPEND="virtual/pkgconfig" +fi # @FUNCTION: gkrellm-plugin_src_install +# @USAGE: # @DESCRIPTION: # Install the plugins and call einstalldocs gkrellm-plugin_src_install() { @@ -71,7 +74,6 @@ gkrellm-plugin_src_install() { die "PLUGIN_SO has to be a bash array!" fi - if [[ -n ${PLUGIN_SERVER_SO} ]]; then exeinto /usr/$(get_libdir)/gkrellm2/plugins-gkrellmd @@ -97,5 +99,6 @@ gkrellm-plugin_src_install() { fi } -_GKRELLM_PLUGIN_R1=1 fi + +EXPORT_FUNCTIONS src_install
