Insert Unity to list of registered desktops.

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

4 files changed, 48 insertions, 18 deletions

diff --git a/dev-util/desktop-file-utils/ChangeLog b/dev-util/desktop-file-utils/ChangeLog
index 864fb48440ac..59bba5759793 100644
--- a/dev-util/desktop-file-utils/ChangeLog
+++ b/dev-util/desktop-file-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/desktop-file-utils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/desktop-file-utils/ChangeLog,v 1.108 2011/04/30 17:42:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/desktop-file-utils/ChangeLog,v 1.109 2011/12/02 22:05:32 ssuominen Exp $
+
+  02 Dec 2011; Samuli Suominen <ssuominen@gentoo.org>
+  desktop-file-utils-0.18.ebuild, +files/desktop-file-utils-0.18-unity.patch:
+  Insert Unity to list of registered desktops.
 
   30 Apr 2011; Raúl Porcel <armin76@gentoo.org>
   desktop-file-utils-0.18.ebuild:
diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest
index 9d6d7799207c..5aa37132e5fd 100644
--- a/dev-util/desktop-file-utils/Manifest
+++ b/dev-util/desktop-file-utils/Manifest
@@ -1,15 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+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
 DIST desktop-file-utils-0.18.tar.bz2 256340 RMD160 5e4e5b2d7ca2e645e44fa6f1b94ffa2489d1f568 SHA1 9169aee9dfe8b2fcd2debdd1029fcc57a7500586 SHA256 d9449956c1c8caa75281a3322b2bb433db42610942f0ceeaa65ccd9636c04231
-EBUILD desktop-file-utils-0.18.ebuild 1395 RMD160 8c539e4b54fd7640a2f0a7f648d1991c646f66d7 SHA1 a12a7c73429316edb93ceac271967cc0fb0b6098 SHA256 ac7a247bb41f2f8ad52f2bb782ccd346a9b7367faa38be422464b5b23d659d6d
-MISC ChangeLog 13935 RMD160 e1ef4cf8e0aa57e80fcd23f1b71ef3e51c1037ec SHA1 e011f4f04ef1f871068f319e894c6899ac00df84 SHA256 c51178894c42f73c87d9732a269575e0ab6b4a0005150886a5bf272bab5c3dfd
+EBUILD desktop-file-utils-0.18.ebuild 1407 RMD160 86c8c43acf81eb87c360bd616b88e9e4c570c143 SHA1 f3e648484cf09ac7fd20052a2eeb8de8fdbb3c39 SHA256 9c4238dbfe331ad96e5b58c7bc23f4a37f9e41c4bebfb61d7f4af293c83566fb
+MISC ChangeLog 14117 RMD160 717a40f13b38860cb37990373bbf1b7949a228ed SHA1 ae345e805458682f4d674ef6675fc4e7568bd07a SHA256 ff09f68f469819675d6b2d06ddbb271259f32ccdaa5156a66b58bed46b7eeb8e
 MISC metadata.xml 234 RMD160 bd496dac30573bf707591b2b2ad497860e5aa029 SHA1 4641c1e70e35e944e7019aeae967deb1d2c28186 SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk3XejUACgkQXkR9YqOcLPFQ2QD/Sx2eMlnArPfNeDDFPS2zlPPn
-M3w5yaYwwt9uDIy1spYA/3v5XB9r9DiMAJ3FBoGcty2Y/NvsL+naWS0piCdppJtA
-=A11Y
+iQEcBAEBAgAGBQJO2Uu2AAoJEEdUh39IaPFNRJgIAI6fjtrI8sPjvp3+HV70nEDA
+pYMgkFPWK7ysnF04tArwWF5OCuxlJlLY7/kqmsVRkjvIoyJN5TMt4U7OulKhX6tl
+lkV934ZoawhUTPR8hIndubvsoPeTqK6uN3DWvgc3XpnL2Z6HQmzPLB+9MrLjatGn
+CT3MLc0d6sFLeoSdFP2M42bj/5ON0/Pa/QfgM97BA2bWUDtXZ9NMzHtoSCDlJMS0
+3hXLit6i9L0VmI2r0KidwaNLjmpEaZZOthYY3E/f3a7hDMufxj8HKSfjfusw1w2e
+zrjCdWOLrVyZEgDC5IQLipnwP3pwkdNl7qNp4qeA7/nuquHXZx7mKP+td3JzKjI=
+=Yzzh
 -----END PGP SIGNATURE-----
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.18.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.18.ebuild
index 4842ce51a212..450851c21d0d 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.18.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.18.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 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.18.ebuild,v 1.6 2011/04/30 17:42:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/desktop-file-utils/desktop-file-utils-0.18.ebuild,v 1.7 2011/12/02 22:05:32 ssuominen Exp $
 
-EAPI=2
-inherit elisp-common
+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"
@@ -21,29 +21,28 @@ DEPEND="${RDEPEND}
 
 SITEFILE=50${PN}-gentoo.el
 
+DOCS=( AUTHORS ChangeLog HACKING NEWS README )
+
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-unity.patch
 	sed -i -e '/SUBDIRS =/s:misc::' Makefile.in || die
 }
 
 src_configure() {
-	econf \
-		"$(use_with emacs lispdir "${SITELISP}"/${PN})"
+	econf "$(use_with emacs lispdir "${SITELISP}"/${PN})"
 }
 
 src_compile() {
-	emake || die
+	default
 	use emacs && elisp-compile misc/desktop-entry-mode.el
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-
+	default
 	if use emacs; then
 		elisp-install ${PN} misc/*.el misc/*.elc || die
 		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
 	fi
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README
 }
 
 pkg_postinst() {
diff --git a/dev-util/desktop-file-utils/files/desktop-file-utils-0.18-unity.patch b/dev-util/desktop-file-utils/files/desktop-file-utils-0.18-unity.patch
new file mode 100644
index 000000000000..be1b35e23b19
--- /dev/null
+++ b/dev-util/desktop-file-utils/files/desktop-file-utils-0.18-unity.patch
@@ -0,0 +1,22 @@
+From 47322e554cc5388a3e6325f36b7d07a13f124594 Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz@gnome.org>
+Date: Thu, 31 Mar 2011 16:28:44 +0000
+Subject: Add Unity to list of registered environments
+
+See http://lists.freedesktop.org/archives/xdg/2011-March/011856.html
+---
+diff --git a/src/validate.c b/src/validate.c
+index 04bc8d0..9c399a3 100644
+--- a/src/validate.c
++++ b/src/validate.c
+@@ -338,7 +338,7 @@ static struct {
+ };
+ 
+ static const char *show_in_registered[] = {
+-  "GNOME", "KDE", "LXDE", "ROX", "XFCE", "Old"
++  "GNOME", "KDE", "LXDE", "ROX", "Unity", "XFCE", "Old"
+ };
+ 
+ static struct {
+--
+cgit v0.9.0.2-2-gbebe