Signed-off-by: Andreas Sturmlechner <[email protected]>
---
 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
-- 
2.52.0

Attachment: signature.asc
Description: This is a digitally signed message part.

Reply via email to