From 20b423be6551476ab55edc45799a48e1259d7d32 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 5 Oct 2009 07:48:36 +0000
Subject: Avoid sandbox violations when xdg-mime is called during src_install,
 as reported in bug #287067, comment #13. Package-Manager:
 portage-2.2_rc43_p14493/cvs/Linux i686

---
 app-text/calibre/ChangeLog                |  6 +++++-
 app-text/calibre/Manifest                 | 10 +++++-----
 app-text/calibre/calibre-0.6.16-r1.ebuild | 18 ++++++++++++++++--
 3 files changed, 26 insertions(+), 8 deletions(-)

(limited to 'app-text')

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index f80f04ef4e5d..6a83385dece3 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.51 2009/10/03 21:08:37 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.52 2009/10/05 07:48:36 zmedico Exp $
+
+  05 Oct 2009; Zac Medico <zmedico@gentoo.org> calibre-0.6.16-r1.ebuild:
+  Avoid sandbox violations when xdg-mime is called during src_install,
+  as reported in bug #287067, comment #13.
 
 *calibre-0.6.16-r1 (03 Oct 2009)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index a84a234e71e5..249537e5abd6 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -10,13 +10,13 @@ EBUILD calibre-0.4.77.ebuild 2282 RMD160 3d0daa0c5740299d302be542de93b42aba01a7b
 EBUILD calibre-0.5.14-r1.ebuild 4260 RMD160 dc4d9465d99914e4336ba4b35cd8257435769f18 SHA1 438b4b4cc28a06a7f5bdbccc70862d6810c95904 SHA256 fcc6677b0a7047ce5f377d0cef1c8927e6c70dc87205542ab942f310f6bf8b4b
 EBUILD calibre-0.6.10.ebuild 4074 RMD160 847f0f754cc948d1ee333d9a32cb308a75dd5e6a SHA1 5e3583fef0460be34784cd9e058dd8dbfaba6c85 SHA256 6ed00ab6f8bd026c88f36c25d417dbca9b8b247e560f1cc955c277861cc4a6af
 EBUILD calibre-0.6.11.ebuild 4074 RMD160 c9951c75216bddc46887edddab6c93b444c8b06c SHA1 0fa086e34ec29fe3847838ff41d1674153af96ae SHA256 f65bb03f0a5ffa3d6b896083e69f9805c3d290c0a04b8c5ff46a38b17c1ecc6b
-EBUILD calibre-0.6.16-r1.ebuild 3378 RMD160 f5eecce0cfd02a7015bca51d98007bfea2b987e2 SHA1 e0a367146d5e5ede77d56ada90ebd20f64c75cd6 SHA256 275feb1c3c3c21f77a5601d5d0e5af076a9519dc5824239ce95c4245af140558
-MISC ChangeLog 8597 RMD160 dd2df76e81a04ee3dbb0a775ba25836dddb3fa1f SHA1 3cd97420929cda224b7173469cb94349685d1a43 SHA256 c38e6f76b5f2668e0f3f0372d02c8506307dfe2e4c24816f432c2e27b02380e5
+EBUILD calibre-0.6.16-r1.ebuild 3831 RMD160 c949b13765741aca028688012bc777f63cba9aee SHA1 466b9d0c7f9a2d95b77973e3d410778dde0153f1 SHA256 513f2701ee506a0b673699217a99dd012a79d4c7bd28319ecf7c2beacd1511a5
+MISC ChangeLog 8785 RMD160 5feb7de5bdcf8b68916b55c626128edef480eac8 SHA1 1603aeed54f4da98a443b0a1b7db94132fc979bf SHA256 00eb0e8bcc12e5b5e61196bf34bbb6de88e6b32d0e05ae12255a4e6b93f25bbd
 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkrHvW0ACgkQ/ejvha5XGaOvSgCfQkuAMV9R3wnoHmNyJaYVAEX5
-GVYAoL6V6uMfIQ0bztuLuDK11bSzQA82
-=yiAW
+iEYEARECAAYFAkrJpPIACgkQ/ejvha5XGaPw2QCgurrktECSLhSDzH/nQ7yJhjz3
+4SsAn0mN/Zi8MWnqyi3erzSnbbS1NjcB
+=00bC
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.6.16-r1.ebuild b/app-text/calibre/calibre-0.6.16-r1.ebuild
index 23a56678e371..9eca2129db66 100644
--- a/app-text/calibre/calibre-0.6.16-r1.ebuild
+++ b/app-text/calibre/calibre-0.6.16-r1.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.6.16-r1.ebuild,v 1.1 2009/10/03 21:08:37 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.16-r1.ebuild,v 1.2 2009/10/05 07:48:36 zmedico Exp $
 
 EAPI=2
 NEED_PYTHON=2.6
@@ -59,9 +59,23 @@ src_prepare() {
 }
 
 src_install() {
+
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	cat - > "${T}/kbuildsycoca" <<-EOF
+	#!$BASH
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database}
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database}
+
 	# --bindir and --sharedir don't seem to work.
 	# Pass them in anyway so we'll know when they are fixed.
-	PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
 		distutils_src_install --bindir="${D}usr/bin" --sharedir="${D}usr/share"
 
 	grep -rlZ "${D}" "${D}" | xargs -0 sed -e "s:${D}:/:g" -i ||
-- 
cgit v1.2.3-65-gdbad