Fix sandbox violation due to unneeded call to update-desktop-database, bug #318797.

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

4 files changed, 75 insertions, 67 deletions

diff --git a/app-text/gtranslator/ChangeLog b/app-text/gtranslator/ChangeLog
index 664f3678d495..93cac8d224d8 100644
--- a/app-text/gtranslator/ChangeLog
+++ b/app-text/gtranslator/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/gtranslator
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/ChangeLog,v 1.38 2010/12/17 22:57:01 eva Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/ChangeLog,v 1.39 2011/01/12 10:15:14 eva Exp $
+
+  12 Jan 2011; Gilles Dartiguelongue <eva@gentoo.org>
+  -gtranslator-1.9.11.ebuild, gtranslator-1.9.13.ebuild,
+  +files/gtranslator-1.9.13-desktop-database.patch:
+  Fix sandbox violation due to unneeded call to update-desktop-database, bug
+  #318797.
 
   17 Dec 2010; Gilles Dartiguelongue <eva@gentoo.org>
   gtranslator-1.9.13.ebuild:
diff --git a/app-text/gtranslator/files/gtranslator-1.9.13-desktop-database.patch b/app-text/gtranslator/files/gtranslator-1.9.13-desktop-database.patch
new file mode 100644
index 000000000000..644a2b664e66
--- /dev/null
+++ b/app-text/gtranslator/files/gtranslator-1.9.13-desktop-database.patch
@@ -0,0 +1,53 @@
+From e4ecdf31c9f53ea95fe803b5d25a892c5e72279d Mon Sep 17 00:00:00 2001
+From: Ignacio Casal Quinteiro <icq@gnome.org>
+Date: Sat, 06 Nov 2010 11:36:18 +0000
+Subject: Remove call to update-desktop-database. Fixes bug #628726.
+
+---
+diff --git a/data/desktop/Makefile.am b/data/desktop/Makefile.am
+index 313cb9f..3812f9a 100644
+--- a/data/desktop/Makefile.am
++++ b/data/desktop/Makefile.am
+@@ -1,34 +1,14 @@
+ SUBDIRS = icons
+ 
+-##
+-## the dirs where all the DATA should go ..
+-##
+-Applicationdir = $(datadir)/applications
+-
+-##
+-## and the DATA
+-##
+-Application_predata = gtranslator.desktop.in
+-Application_DATA = $(Application_predata:.desktop.in=.desktop)
+-
++desktopdir 	 = $(datadir)/applications
++desktop_in_files = gtranslator.desktop.in
++desktop_DATA 	 = $(desktop_in_files:.desktop.in=.desktop)
+ @INTLTOOL_DESKTOP_RULE@
+ 
+-EXTRA_DIST = $(Application_DATA) \
+-	$(Applicationicon_DATA) \
+-	$(Application_predata)
+-
+-CLEANFILES = $(Application_DATA)
++EXTRA_DIST = $(desktop_in_files)
+ 
+-UPDATE_DESKTOP = \
+-	if [ -f $(Applicationdir)/defaults.list ] ; then \
+-		if which update-desktop-database>/dev/null 2>&1 ; then \
+-			update-desktop-database $(Applicationdir); \
+-		fi \
+-	fi
++CLEANFILES = $(desktop_DATA)
+ 
+-install-data-hook:
+-	$(UPDATE_DESKTOP)
++DISTCLEANFILES = $(desktop_DATA)
+ 
+-uninstall-hook:
+-	$(UPDATE_DESKTOP) 
+ -include $(top_srcdir)/git.mk
+--
+cgit v0.8.3.1
diff --git a/app-text/gtranslator/gtranslator-1.9.11.ebuild b/app-text/gtranslator/gtranslator-1.9.11.ebuild
deleted file mode 100644
index 42c4c5230c29..000000000000
--- a/app-text/gtranslator/gtranslator-1.9.11.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-1.9.11.ebuild,v 1.1 2010/05/14 20:10:23 eva Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="An enhanced gettext po file editor for GNOME"
-HOMEPAGE="http://gtranslator.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="doc http gnome spell"
-
-RDEPEND="
-	>=dev-libs/glib-2.16:2
-	>=dev-libs/gdl-2.26
-	>=dev-libs/libunique-1
-	>=dev-libs/libxml2-2.4.12
-	>=gnome-base/gconf-2.18
-	gnome-extra/libgda:4
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtksourceview-2.4:2.0
-
-	gnome? (
-		gnome-extra/gnome-utils
-		>=gnome-extra/gucharmap-2 )
-	http? ( >=net-libs/libsoup-2.4:2.4 )
-	spell? ( >=app-text/gtkspell-2.0.2 )"
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.1.4
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	dev-util/pkgconfig
-	app-text/gnome-doc-utils
-	app-text/docbook-xml-dtd:4.1.2
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog HACKING INSTALL NEWS README THANKS TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_with gnome dictionary)
-		$(use_with spell gtkspell)"
-
-	if use http; then
-		G2CONF="${G2CONF} enable_opentran=yes"
-	else
-		G2CONF="${G2CONF} enable_opentran=no"
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Clean up unused libtool generated content
-	find "${D}" -name "*.la" -delete || die "failed to remove *.la"
-}
diff --git a/app-text/gtranslator/gtranslator-1.9.13.ebuild b/app-text/gtranslator/gtranslator-1.9.13.ebuild
index d477139c7a38..400bdfb3e104 100644
--- a/app-text/gtranslator/gtranslator-1.9.13.ebuild
+++ b/app-text/gtranslator/gtranslator-1.9.13.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-1.9.13.ebuild,v 1.2 2010/12/17 22:57:01 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-1.9.13.ebuild,v 1.3 2011/01/12 10:15:14 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="An enhanced gettext po file editor for GNOME"
 HOMEPAGE="http://gtranslator.sourceforge.net/"
@@ -53,6 +53,17 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	gnome2_src_prepare
+
+	# Let package manager handle desktop database updates, bug #318797
+	# patch from upstream gtk3 branch
+	epatch "${FILESDIR}/${PN}-1.9.13-desktop-database.patch"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
 src_install() {
 	gnome2_src_install