commit: 25a0079ec2825c73656b3f20a4a33421bd2f90f6 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Jan 27 23:09:51 2026 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Feb 1 20:30:49 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25a0079e
desktop.eclass: Support EAPI 9 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> eclass/desktop.eclass | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/eclass/desktop.eclass b/eclass/desktop.eclass index b38aa4e1d0d8..b10e2647e879 100644 --- a/eclass/desktop.eclass +++ b/eclass/desktop.eclass @@ -4,14 +4,14 @@ # @ECLASS: desktop.eclass # @MAINTAINER: # [email protected] -# @SUPPORTED_EAPIS: 7 8 +# @SUPPORTED_EAPIS: 7 8 9 # @BLURB: support for desktop files, menus, and icons if [[ -z ${_DESKTOP_ECLASS} ]]; then _DESKTOP_ECLASS=1 case ${EAPI} in - 7|8) ;; + 7|8|9) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -63,20 +63,14 @@ _DESKTOP_IDS=() # @CODE make_desktop_entry() { local eapi9 - if [[ -n ${1} ]]; then + if [[ ${1} == --eapi9 ]]; then case ${EAPI} in 7|8) - if [[ ${1} == --eapi9 ]]; then - eapi9=1 - shift - fi + eapi9=1 + shift ;; *) - if [[ ${1} == --eapi9 ]]; then - ewarn "make_desktop_entry: --eapi9 arg is obsolete in EAPI-${EAPI} and may be cleaned up now." - shift - fi - eapi9=1 + die "make_desktop_entry: --eapi9 arg is obsolete in EAPI-${EAPI}!" ;; esac fi
