Reapply patch, this time with workaround for an apparent bug in bash 3.2 and 4.0
authorJonathan Callen <jcallen@gentoo.org>
Fri, 26 Feb 2010 05:33:57 +0000 (05:33 +0000)
committerJonathan Callen <jcallen@gentoo.org>
Fri, 26 Feb 2010 05:33:57 +0000 (05:33 +0000)
eclass/eutils.eclass

index 8fc52129f8da03a94be1b0ef49737c9aec6da03b..a9515725748d2a2cd5be793ea80250a9a2207c3c 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.335 2010/02/26 05:17:24 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.336 2010/02/26 05:33:57 abcd Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -961,6 +961,7 @@ make_desktop_entry() {
                                        news)   type=News;;
                                        nntp)   type=News;;
                                        p2p)    type=FileTransfer;;
+                                       voip)   type=Telephony;;
                                        *)              type=;;
                                esac
                                type="Network;${type}"
@@ -979,7 +980,7 @@ make_desktop_entry() {
                                        visual*) type=DataVisualization;;
                                        *)               type=;;
                                esac
-                               type="Science;${type}"
+                               type="Education;Science;${type}"
                                ;;
 
                        sys)
@@ -991,7 +992,7 @@ make_desktop_entry() {
                                        client) type=WebBrowser;;
                                        *)              type=;;
                                esac
-                               type="Network"
+                               type="Network;${type}"
                                ;;
 
                        *)
@@ -1007,6 +1008,17 @@ make_desktop_entry() {
        local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
        #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
 
+       # Don't append another ";" when a valid category value is provided.
+       type=${type%;}${type:+;}
+
+       eshopts_push -s extglob
+       if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then
+               ewarn "As described in the Icon Theme Specification, icon file extensions are not"
+               ewarn "allowed in .desktop files if the value is not an absolute path."
+               icon=${icon%.@(xpm|png|svg)}
+       fi
+       eshopts_pop
+
        cat <<-EOF > "${desktop}"
        [Desktop Entry]
        Name=${name}
@@ -1015,7 +1027,7 @@ make_desktop_entry() {
        Exec=${exec}
        TryExec=${exec%% *}
        Icon=${icon}
-       Categories=${type};
+       Categories=${type}
        EOF
 
        [[ ${path} ]] && echo "Path=${path}" >> "${desktop}"