New main category XFCE for Xfce 4.10 compability.

Package-Manager: portage-2.2.0_alpha98/cvs/Linux x86_64

4 files changed, 86 insertions, 6 deletions

diff --git a/dev-util/desktop-file-utils/ChangeLog b/dev-util/desktop-file-utils/ChangeLog
index 67cb96af9d13..9966dcb0070a 100644
--- a/dev-util/desktop-file-utils/ChangeLog
+++ b/dev-util/desktop-file-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/desktop-file-utils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/desktop-file-utils/ChangeLog,v 1.115 2012/03/18 15:31:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/desktop-file-utils/ChangeLog,v 1.116 2012/04/05 07:10:13 ssuominen Exp $
+
+*desktop-file-utils-0.20-r1 (05 Apr 2012)
+
+  05 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +desktop-file-utils-0.20-r1.ebuild,
+  +files/desktop-file-utils-0.20-validate_Categories_XFCE.patch:
+  New main category XFCE for Xfce 4.10 compability.
 
   18 Mar 2012; Raúl Porcel <armin76@gentoo.org>
   desktop-file-utils-0.19.ebuild:
diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest
index 3d0fbe7ff873..c37cf54e4d96 100644
--- a/dev-util/desktop-file-utils/Manifest
+++ b/dev-util/desktop-file-utils/Manifest
@@ -3,18 +3,24 @@ Hash: SHA1
 
 AUX 50desktop-file-utils-gentoo.el 250 RMD160 34186094d43cab4f043aa9f0a9cc31611657ad19 SHA1 406f9f76728ad8c6b0263d1221edef2923aa3d13 SHA256 2aa59c328d13dd9a447f573ef68d92768f13e142cc92eda1e7d45f29684e07b7
 AUX desktop-file-utils-0.18-unity.patch 631 RMD160 228410c7774d47ebbc4aa91e9e1b5e86f0715a37 SHA1 8281f5cbe704fe6f7dc7172a6dceb5dd6ecafbba SHA256 31dededfd8eb759b964efeace7307259f2a8bee212d6c3e355507fbd9cd11c47
+AUX desktop-file-utils-0.20-validate_Categories_XFCE.patch 592 RMD160 ee2ba2d736ade45f47bf7f12c453d7db0b454d79 SHA1 b8c2e6d39d5a951d0faf5bae535f4a2ac124ec2b SHA256 526a8d0490fd2d818e3cf49358cd15deca60ed95bae6f7191f43fb7c347ac84f
 DIST desktop-file-utils-0.18.tar.bz2 256340 RMD160 5e4e5b2d7ca2e645e44fa6f1b94ffa2489d1f568 SHA1 9169aee9dfe8b2fcd2debdd1029fcc57a7500586 SHA256 d9449956c1c8caa75281a3322b2bb433db42610942f0ceeaa65ccd9636c04231
 DIST desktop-file-utils-0.19.tar.xz 99808 RMD160 1de90ba754b3d459a0143a865625aecafbdd691b SHA1 090fd123f090e173edfa4514c5c32bf77c34ec45 SHA256 1f805c44fc6943d2d9d2acfe2aa4c6edc1fa17b1807e4e950c8ce50111ddc81b
 DIST desktop-file-utils-0.20.tar.xz 124388 RMD160 5242a9629242fae9c01342d5b3f084f82ef4019f SHA1 0be40d8ad20e9dc56c2649bd64ee30b36198ccd7 SHA256 a7507379859cc483f1c64fbdb569f722c75e3af7c3f91bcdc239ff9dacd24f49
 EBUILD desktop-file-utils-0.18.ebuild 1407 RMD160 86c8c43acf81eb87c360bd616b88e9e4c570c143 SHA1 f3e648484cf09ac7fd20052a2eeb8de8fdbb3c39 SHA256 9c4238dbfe331ad96e5b58c7bc23f4a37f9e41c4bebfb61d7f4af293c83566fb
 EBUILD desktop-file-utils-0.19.ebuild 1356 RMD160 e596c903663a99959f39894da23aa6750b5c1662 SHA1 f0c40be81b38438bb8e378cb7c33a4d2fc10cd00 SHA256 c0b038dd27045cb45f72b75fc1f52523de633b247dfe6fd42fe242aa9402c5d2
+EBUILD desktop-file-utils-0.20-r1.ebuild 1438 RMD160 e13872e604106dbdf1361e09901c450a77aa7001 SHA1 ae4d21c7633c04d59e5d6be2dc47b707df3fd474 SHA256 a4b7b7029a156fa7035d22fbd1e7bb8493ca007208c020a95f223dfa7b11f5ef
 EBUILD desktop-file-utils-0.20.ebuild 1369 RMD160 6dfe3dd204f1ca5d04122aa266b5e57dfbe9f571 SHA1 28689535e30df1a2823f1cc4a9c1227693495e80 SHA256 ab4e345d8d21187e015b72a85c2d1a3da5f127264c2adf7dc798915d50321f01
-MISC ChangeLog 14887 RMD160 ad032261734f8ad8ee1faf5ba0582af62ca3a570 SHA1 73de4e544e88270079506d36fee82b0c4e7aff6b SHA256 9360b191d61b2064e2e165bd98fc2964761d2ac58f36ad78dfdf47daea48b8e3
+MISC ChangeLog 15142 RMD160 8aa782ec87e101da77096f5afff8e5300461a19c SHA1 43dbfd2e7dcf5e4635b3bef023b314902c149405 SHA256 dbaaec3ef465c2c57138f48f5bddc75203d94df9b37ff86f0989d916655b259b
 MISC metadata.xml 234 RMD160 bd496dac30573bf707591b2b2ad497860e5aa029 SHA1 4641c1e70e35e944e7019aeae967deb1d2c28186 SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk9l/+gACgkQuQc30/atMkDKpwCghI6QSlcQEtoqiQwmpXzmPBKy
-Y7gAoLbIrrxNJVdmku9vG3bDy+6qdnBc
-=MS6/
+iQEcBAEBAgAGBQJPfUUwAAoJEEdUh39IaPFNRRMH/iN0CfOD+4h4c+CrtjN5jq8G
+MRFUnrmhkhRoK5A5wzmSdi8L+Twry+cPno4dank4eis2IlluGG8mQgogln9u13YS
++TGW4NYPlZaj+e0PJuag3Xkpi4Rqp3+XGTvnsfyKjG8g+FOkabZvbPO0yinYn8vl
+o29O7wLXjx51EIKD0CnWsFOBfFVyWk0dnIT/xg8et+tEOUF6gd9TYAEz2iuPlhzP
+CN4SEt9qlTyXoFLLfiLjghIohG/+8SDXb3sz6CG311LbEgwFNchA6HWGS8PX2KaI
+2FxWhbhMWZCM7xbL25RUD8d8fG4A4pM53BhF+lNekm3SaEI8N7/oTmgIiOMCwvs=
+=5BFS
 -----END PGP SIGNATURE-----
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.20-r1.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.20-r1.ebuild
new file mode 100644
index 000000000000..7abff50a0fc0
--- /dev/null
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.20-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/desktop-file-utils/desktop-file-utils-0.20-r1.ebuild,v 1.1 2012/04/05 07:10:13 ssuominen Exp $
+
+EAPI=4
+inherit elisp-common eutils
+
+DESCRIPTION="Command line utilities to work with desktop menu entries"
+HOMEPAGE="http://freedesktop.org/wiki/Software/desktop-file-utils"
+SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="emacs"
+
+RDEPEND=">=dev-libs/glib-2.12
+	emacs? ( virtual/emacs )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+SITEFILE=50${PN}-gentoo.el
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-validate_Categories_XFCE.patch
+
+	sed -i -e '/SUBDIRS =/s:misc::' Makefile.in || die
+}
+
+src_configure() {
+	econf "$(use_with emacs lispdir "${SITELISP}"/${PN})"
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile misc/desktop-entry-mode.el
+}
+
+src_install() {
+	default
+	if use emacs; then
+		elisp-install ${PN} misc/*.el misc/*.elc || die
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/desktop-file-utils/files/desktop-file-utils-0.20-validate_Categories_XFCE.patch b/dev-util/desktop-file-utils/files/desktop-file-utils-0.20-validate_Categories_XFCE.patch
new file mode 100644
index 000000000000..9cbcd7893a80
--- /dev/null
+++ b/dev-util/desktop-file-utils/files/desktop-file-utils-0.20-validate_Categories_XFCE.patch
@@ -0,0 +1,12 @@
+http://lists.freedesktop.org/archives/xdg/2012-April/012348.html
+
+--- src/validate.c
++++ src/validate.c
+@@ -499,6 +499,7 @@
+   { "Core",                   FALSE, FALSE, FALSE, { NULL } },
+   { "KDE",                    FALSE, FALSE, FALSE, { "Qt", NULL } },
+   { "GNOME",                  FALSE, FALSE, FALSE, { "GTK", NULL } },
++  { "XFCE",                   FALSE, FALSE, FALSE, { "GTK", NULL } },
+   { "GTK",                    FALSE, FALSE, FALSE, { NULL } },
+   { "Qt",                     FALSE, FALSE, FALSE, { NULL } },
+   { "Motif",                  FALSE, FALSE, FALSE, { NULL } },