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

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

2 files changed, 26 insertions, 9 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/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
+}