01 May 2009; Zac Medico <zmedico@gentoo.org> calibre-0.5.9-r2.ebuild:

Tweak xdg-desktop-menu usage to avoid sandbox violation in
/usr/share/gnome/apps.
Package-Manager: portage-2.1.6.11_p13577/cvs/Linux i686

3 files changed, 23 insertions, 11 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index d81b6baba23e..6aa09fcb3451 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.16 2009/04/29 07:22:48 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.17 2009/05/01 06:15:26 zmedico Exp $
+
+  01 May 2009; Zac Medico <zmedico@gentoo.org> calibre-0.5.9-r2.ebuild:
+  Tweak xdg-desktop-menu usage to avoid sandbox violation in
+  /usr/share/gnome/apps.
 
 *calibre-0.5.9-r2 (29 Apr 2009)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 472df3e8ec27..e50164105efc 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -6,13 +6,13 @@ DIST calibre-0.4.77.tar.bz2 4054837 RMD160 24c64276b2413ac8e0974f8f0caa535e8635d
 DIST calibre-0.5.9.tar.gz 7676798 RMD160 4e495eab54cf9cce00f4bc0d2df59aa5f71ef147 SHA1 26455393574d9bd40414b1bb325d287b431deb79 SHA256 0be3ae0b77fdefb5eef8b2403794feaa3c734499aeee0e158786e399f0f0c46d
 EBUILD calibre-0.4.76.ebuild 2282 RMD160 da17bf58be32efeb80d3a2fd192417f2ef8faed6 SHA1 7aeff0d37d6817d1bd59ceb348b2ada0bf271da8 SHA256 15fd43d85381597f75eaf38c3feaae3b62ff47b883889739ccf95ea5321c6d26
 EBUILD calibre-0.4.77.ebuild 2282 RMD160 3d0daa0c5740299d302be542de93b42aba01a7b5 SHA1 609941ba89bf2274b2ad776c316140563d0c7366 SHA256 76479992561158d6d7eaa7ebe117b430b8836bbe774f84ab58a7ce037b4604e3
-EBUILD calibre-0.5.9-r2.ebuild 3483 RMD160 7bebb4a651ba493a5a7796e05133ae6fbc47ca43 SHA1 fd58ba232cf0e9a1656dee5c47877796fd0331bf SHA256 8242cd18aa36ea3fbdcd04a48a33bc614a4e38c0b2f352ad7ab2f5832532d262
-MISC ChangeLog 3010 RMD160 710f94c11fb5be65c97d1734fcee8eb6e45b41fe SHA1 4204283b9f988b1b425aff5d43e29f693a1736d5 SHA256 20a942a7b68599732dacd265a1f59a20385395ccbfe8bf868d4e88c5a58c6c8c
+EBUILD calibre-0.5.9-r2.ebuild 3915 RMD160 9e3a4677446854c7b21b1555b1f0d91513f7edd3 SHA1 26b6a80036127328a6269ef89745ce81a899848c SHA256 f48be512218b2fc97265947bd7bcafd9af16878cadabf72df1530f83cab5a2d1
+MISC ChangeLog 3169 RMD160 3cf36dca222f23a3daaa2cf81a7d35e477c77bcb SHA1 cc59186503209b68d2aa35a9c1e67d5db0bc66f2 SHA256 12ae1146e8f898cacd8b1d970ee7d121c29786e011d4e08f6f3a1fcd8609c4a5
 MISC metadata.xml 233 RMD160 da5a1d3b7836dcebb5fec29696b5bfb583fe346c SHA1 1c7142c677598358888a6cfc6f6f65df2e8b6901 SHA256 4d1294dc1b2a6f96aa637a0b8d340bc67191103af0f15197d07fc62446b4a709
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkn4AIEACgkQ/ejvha5XGaNWnQCfWIrzZKxboIELikTXk5pRLd2e
-0cYAnRhwMsm+pnRoWq2UoAH2NEcVL825
-=qI4h
+iEYEARECAAYFAkn6k98ACgkQ/ejvha5XGaNnDQCg5LuV6AAQ5s6hFxKhc9nOsFOs
+e/4AoMZ8kgtVI9MWTOVfQMggUi0gKXuh
+=kANk
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.5.9-r2.ebuild b/app-text/calibre/calibre-0.5.9-r2.ebuild
index f41aa076a12e..e3171feb1e60 100644
--- a/app-text/calibre/calibre-0.5.9-r2.ebuild
+++ b/app-text/calibre/calibre-0.5.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.5.9-r2.ebuild,v 1.1 2009/04/29 07:22:48 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.5.9-r2.ebuild,v 1.2 2009/05/01 06:15:26 zmedico Exp $
 
 EAPI=2
 NEED_PYTHON=2.6
@@ -58,6 +58,12 @@ src_prepare() {
 	# For help2man to succeed, we need to tell it the path to the tools.
 	sed -i -e "s:\('help2man',\) \(prog\):\1 \'PYTHONPATH=\"${D}$(python_get_sitedir)\" \' + \'${D}usr/bin/\' + \2:" \
 		src/calibre/linux.py || die "sed'ing in the IMAGE path failed"
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-desktop-menu (bug #258938). This also prevents
+	# "${D}"/usr/share/applications/{mimeinfo.cache,defaults.list}
+	# from being installed (we don't want them anyway).
+	sed -i -e "s:xdg-desktop-menu install:xdg-desktop-menu install --mode user:" \
+		src/calibre/linux.py || die "sed'ing in the IMAGE path failed"
 	distutils_src_prepare
 }
 
@@ -89,14 +95,17 @@ EOF
 
 	chmod +x "${T}/kde-config"
 
-	# Sandbox violation when linux.py calls xdg-desktop-menu (bug #258938).
-	addpredict /usr/share/gnome/apps
 	PATH="${T}:${PATH}" KDEDIRS="${D}/usr" XDG_DATA_DIRS="${D}/usr/share" DESTDIR="${D}" PYTHONPATH="${S}/build/lib" \
 		python "${S}"/src/${PN}/linux.py \
 		--use-destdir --do-not-reload-udev-hal \
 		--group-file="${ROOT}"/etc/group --dont-check-root \
 		|| die "post-installation failed."
 
+	# The menu entries end up here due to '--mode user' being added to
+	# xdg-desktop-menu options in src_prepare.
+	domenu "$HOME"/.local/share/applications/*.desktop || \
+		die "failed to install .desktop menu files"
+
 	# Move the bash-completion file and properly install it.
 	mv "${D}"/etc/bash_completion.d/calibre "${S}/" \
 		|| die "cannot move the bash-completion file"
@@ -104,8 +113,7 @@ EOF
 	find "${D}"/etc -type d -empty -delete
 
 	# Removing junk.
-	rm -r "${D}"/usr/share/applications/{mimeinfo.cache,defaults.list} \
-		"${D}"/usr/share/mime/{subclasses,XMLnamespaces,globs{,2},mime.cache,magic,aliases,{generic-,}icons} \
+	rm -r "${D}"/usr/share/mime/{subclasses,XMLnamespaces,globs{,2},mime.cache,magic,aliases,{generic-,}icons} \
 		"${D}"/usr/share/{applnk,desktop-directories} \
 		"${D}$(python_get_sitedir)"/pyPdf
 }