Missing Categories Utility and TextTools in xfce4-dict.desktop (as required by desktop-file-validate). Install to libdir instead of libexecdir.

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

3 files changed, 36 insertions, 19 deletions

diff --git a/xfce-extra/xfce4-dict/ChangeLog b/xfce-extra/xfce4-dict/ChangeLog
index 073b57bd4bfb..73bd4fb45b5e 100644
--- a/xfce-extra/xfce4-dict/ChangeLog
+++ b/xfce-extra/xfce4-dict/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-extra/xfce4-dict
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-dict/ChangeLog,v 1.51 2011/12/07 15:30:31 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-dict/ChangeLog,v 1.52 2012/04/21 06:01:46 ssuominen Exp $
+
+  21 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> xfce4-dict-0.6.0.ebuild:
+  Missing Categories Utility and TextTools in xfce4-dict.desktop (as required
+  by desktop-file-validate). Install to libdir instead of libexecdir.
 
   07 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> xfce4-dict-0.6.0.ebuild,
   +files/xfce4-dict-0.6.0-underlinking.patch:
diff --git a/xfce-extra/xfce4-dict/Manifest b/xfce-extra/xfce4-dict/Manifest
index 9b451c4f41e2..24ab7bb7c12f 100644
--- a/xfce-extra/xfce4-dict/Manifest
+++ b/xfce-extra/xfce4-dict/Manifest
@@ -3,17 +3,17 @@ Hash: SHA1
 
 AUX xfce4-dict-0.6.0-underlinking.patch 702 RMD160 4283b472bccda87b11c210dc4e95c7df2d6c5e31 SHA1 983e0dd3cd2e140b5998c6b9b89b6ff9010a9a5c SHA256 b3705741591209ca815387644f7d040539c45f146d8707812f5092e89bc2f9c3
 DIST xfce4-dict-0.6.0.tar.bz2 373420 RMD160 050def7ce94982683c14afb2611d1d415268f743 SHA1 af004096d6bd935d69b7ef3a989470e89c7be99b SHA256 a8188ca4c980ca2003be6bf2391589f5122830680c41d51105b10813850da0d3
-EBUILD xfce4-dict-0.6.0.ebuild 924 RMD160 c5e49fc26cdb741ba60edbf8a8d2a6e702d8ae4d SHA1 07f2266db0757b0b1669be9c827c40a9a8fd00eb SHA256 9657338071cd76f8f95839e1b9ce6ff0bda8739c7733dcb7b8f8747703cb6efe
-MISC ChangeLog 6312 RMD160 402257ea5e5762ea8d16e1b9382019fc474b12a7 SHA1 0f1f583182554ba06b50db8837a8674250d2b93b SHA256 5d7d2dffc11e2b8a0b45e72904dd567786606932d10391248443da2b014e545f
+EBUILD xfce4-dict-0.6.0.ebuild 1341 RMD160 cebfa899bad12d88eee4acea6d554b042f572457 SHA1 ddaf37454c4487f16386ec9942c7b209479675b8 SHA256 22d050326948d4bbbc27b8a673688071bceb7fd250545c47e865a7b3ee987d05
+MISC ChangeLog 6540 RMD160 666b6900beb59f2e4c6e9eb431ce9e5c7300c18a SHA1 6cd64c209cb0b61f5e2cffe7dfa7b36f163a83bb SHA256 51a63268e88ce8dbf4a8de85f30335c3246d07610ef508dce6f696d36c8cc65a
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO34aDAAoJEEdUh39IaPFNTNcH/jEPmgRSkCbGu+Kpgae9DMwu
-zjoL60J8B1pwFo4cqp7KQmBGbmAMIWuE9I/M2jxE+2Ql6jnZ7unOuRqK2ZJPVkJy
-BLyByRzP860oQd2uub6urZMsm2Iga87jZMx1hXPObdFtG/28lx7OU1QmSA2InUl/
-hGMQBayeOEfMeoY4MgqqCg4q5Ixy6wkMoxDMOSZfBp292uLiFlqCJWOfNlRzPWrM
-URqHRrftklBv44JGEco0m4Z3TnxiVaH8EuCGHQ2x62ucGXIuJzhoFoEaH/tCBz5X
-Y59pgkIMo56/hwv5AcLM1wjUU2w3Zy0rZ9vm72/5yExDIUKLCBVqWwgybWmsL6s=
-=TEDU
+iQEcBAEBAgAGBQJPkkzpAAoJEEdUh39IaPFNYBsH/3U71AI4BlXLflXJ9CEck5zR
+tat6AmkP7pQNzCRZIEJienGAGNyzBYv8FIlhQZufrYhgID6AMepBtEAx8N+IfVyl
+btcGvDQjjZ7e/FBqT1g83+tQHJAGiEEz+y1y/AgGVDS+/nevySYfiddWN7KkE5gS
+MiDtYWFL47cGlUkyKGSFFyq143EvvONd0zFzoPDMZlQVX3idcH51VPGfag6PEJ6T
+4jLAF5ZuZd+AjQuhaSMQU7n6F3THASs4FSUoNU9+BvtoTBnB0EG9xZwHS/70EP2J
+bCG2mXaw1vA4Ls9Fv2zmIoI8BImQmV3kIiDHI61LZYzH2kSgejByb1eP8uDc+SE=
+=wOOl
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-dict/xfce4-dict-0.6.0.ebuild b/xfce-extra/xfce4-dict/xfce4-dict-0.6.0.ebuild
index 5874d1c5dc0b..993c8039fb7f 100644
--- a/xfce-extra/xfce4-dict/xfce4-dict-0.6.0.ebuild
+++ b/xfce-extra/xfce4-dict/xfce4-dict-0.6.0.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-dict/xfce4-dict-0.6.0.ebuild,v 1.10 2011/12/07 15:28:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-dict/xfce4-dict-0.6.0.ebuild,v 1.11 2012/04/21 06:01:46 ssuominen Exp $
 
 EAPI=4
 EAUTORECONF=yes
-inherit xfconf
+inherit multilib xfconf
 
 DESCRIPTION="A dict.org querying application and panel plug-in for the Xfce desktop"
 HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-dict"
-SRC_URI="mirror://xfce/src/apps/${PN}/0.6/${P}.tar.bz2"
+SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND=">=dev-libs/glib-2.6:2
-	>=x11-libs/gtk+-2.6:2
-	>=xfce-base/libxfcegui4-4.8
+RDEPEND=">=dev-libs/glib-2.24
+	>=x11-libs/gtk+-2.20:2
 	>=xfce-base/libxfce4util-4.8
+	>=xfce-base/libxfcegui4-4.8
 	>=xfce-base/xfce4-panel-4.8"
 DEPEND="${RDEPEND}
 	dev-util/intltool
@@ -26,5 +26,18 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	PATCHES=( "${FILESDIR}"/${P}-underlinking.patch )
+
+	XFCONF=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		)
+
 	DOCS=( AUTHORS ChangeLog README )
 }
+
+src_prepare() {
+	# xfce4-dict.desktop: (will be fatal in the future): value "Dictionary" in key
+	# "Categories" in group "Desktop Entry" requires another category to be present
+	# among the following categories: Office;TextTools	
+	sed -i -e '/Categories/s:Office:&;Utility;TextTools:' src/xfce4-dict.desktop.in || die
+	xfconf_src_prepare
+}