From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Nkspr-0004oF-M2 for garchives@archives.gentoo.org; Fri, 26 Feb 2010 05:33:59 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F938E0986; Fri, 26 Feb 2010 05:33:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 011C4E0986 for ; Fri, 26 Feb 2010 05:33:59 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id A99A21B408E for ; Fri, 26 Feb 2010 05:33:58 +0000 (UTC) Received: from abcd by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1Nkspp-0003qk-QC for gentoo-commits@lists.gentoo.org; Fri, 26 Feb 2010 05:33:57 +0000 From: "Jonathan Callen (abcd)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, abcd@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: eutils.eclass X-VCS-Directories: eclass X-VCS-Committer: abcd X-VCS-Committer-Name: Jonathan Callen Content-Type: text/plain; charset=utf8 Message-Id: Sender: Jonathan Callen Date: Fri, 26 Feb 2010 05:33:57 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 51407f86-2f24-407b-b52e-ce35892737cd X-Archives-Hash: 702752a39478be6b11f797c12fcd1252 abcd 10/02/26 05:33:57 Modified: eutils.eclass Log: Reapply patch, this time with workaround for an apparent bug in bash 3.= 2 and 4.0 Revision Changes Path 1.336 eclass/eutils.eclass file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/eutils.ecla= ss?rev=3D1.336&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/eutils.ecla= ss?rev=3D1.336&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/eutils.ecla= ss?r1=3D1.335&r2=3D1.336 Index: eutils.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v retrieving revision 1.335 retrieving revision 1.336 diff -u -r1.335 -r1.336 --- eutils.eclass 26 Feb 2010 05:17:24 -0000 1.335 +++ eutils.eclass 26 Feb 2010 05:33:57 -0000 1.336 @@ -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 $ =20 # @ECLASS: eutils.eclass # @MAINTAINER: @@ -961,6 +961,7 @@ news) type=3DNews;; nntp) type=3DNews;; p2p) type=3DFileTransfer;; + voip) type=3DTelephony;; *) type=3D;; esac type=3D"Network;${type}" @@ -979,7 +980,7 @@ visual*) type=3DDataVisualization;; *) type=3D;; esac - type=3D"Science;${type}" + type=3D"Education;Science;${type}" ;; =20 sys) @@ -991,7 +992,7 @@ client) type=3DWebBrowser;; *) type=3D;; esac - type=3D"Network" + type=3D"Network;${type}" ;; =20 *) @@ -1007,6 +1008,17 @@ local desktop=3D"${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${des= ktop_name}.desktop" #local desktop=3D${T}/${exec%% *:-${desktop_name}}.desktop =20 + # Don't append another ";" when a valid category value is provided. + type=3D${type%;}${type:+;} + + eshopts_push -s extglob + if [[ -n ${icon} && ${icon} !=3D /* ]] && [[ ${icon} =3D=3D *.xpm || ${= icon} =3D=3D *.png || ${icon} =3D=3D *.svg ]]; then + ewarn "As described in the Icon Theme Specification, icon file extensi= ons are not" + ewarn "allowed in .desktop files if the value is not an absolute path.= " + icon=3D${icon%.@(xpm|png|svg)} + fi + eshopts_pop + cat <<-EOF > "${desktop}" [Desktop Entry] Name=3D${name} @@ -1015,7 +1027,7 @@ Exec=3D${exec} TryExec=3D${exec%% *} Icon=3D${icon} - Categories=3D${type}; + Categories=3D${type} EOF =20 [[ ${path} ]] && echo "Path=3D${path}" >> "${desktop}"