Workaround sandbox violations due to gst-inspect, bug #358755 & co.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

5 files changed, 36 insertions, 20 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 7dc3f2d12a9c..cfb35c6854ad 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/totem
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.354 2013/01/12 11:11:27 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.355 2013/01/12 11:38:07 eva Exp $
+
+  12 Jan 2013; Gilles Dartiguelongue <eva@gentoo.org> totem-2.32.0-r2.ebuild,
+  totem-3.4.3.ebuild, totem-3.6.3-r1.ebuild:
+  Workaround sandbox violations due to gst-inspect, bug #358755 & co.
 
   12 Jan 2013; Gilles Dartiguelongue <eva@gentoo.org> totem-2.32.0-r2.ebuild,
   totem-3.4.3.ebuild:
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index b2e60cbf1e2e..4cda5ac357f2 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -7,15 +7,15 @@ DIST totem-2.32.0-patches.tar.bz2 13355 SHA256 fdf1d04e5c2325ba5b982a4fb59b9c70b
 DIST totem-2.32.0.tar.bz2 3278758 SHA256 982d6aaeca3e4844694fc0a2540d792bea753e24b55cf33203188b32b5914f47 SHA512 67d5d3e06a57fc355867f288f620be384c7ec3078ecfa0a223ae09d7d8b34d5b9b16de1d97e1d1bfe2b3b12cc87eed8bd8305b9f5a1bba1c4fe37cf7355e0f0f WHIRLPOOL 301f7727e1255b1fcf4b8546cc8973d5bae45bca5b84e4a516d1a1d006eb695632a33bcb04c00d360c0d00d8ba21057fab4a05b1870023febf076e35887ef40d
 DIST totem-3.4.3.tar.xz 3163404 SHA256 fce76e3c924d0ffd3d4eef2e69af4c44b3537b26c2df86745e900b4c829b38db SHA512 6a2947e0d472da9587b275bb4bf546b4566cda50c3475369b941d2f81f9909c754ac9b50b64715a6acfa38231e2a4fb3047b0b64f45da371572c1d554df9ab11 WHIRLPOOL 2c5bb18871e57a09bf4bb7ad03392d34b93e482d1aba553bc816d55c686eb9f28cf29260d5490f74063640e320e7c8ab7a1b9820b66878aa555421fc48df5f1a
 DIST totem-3.6.3.tar.xz 3120056 SHA256 ad9f2ff207c8a965975670e262394953b37b2dc25cff7ee59f138f961f88ce60 SHA512 adb8c568aafd09fb87ef93b48a9c9bc490471690c0c52d66cde5ba00e527d342be99d54b40e4f0293604bee5ef2f3200a200047a7c92ac1920723e6fb18e5b6d WHIRLPOOL 53e1ce226f124295c8eca321c9a513d01bb07454232aa2d2dd6623d6501e9270193e5a8668e81f0fd51e3746720a79bc88903b79741a7dda4c452e8e281f9568
-EBUILD totem-2.32.0-r2.ebuild 5813 SHA256 a4b8e2ce40d54f7bc8576e136835a829a82122512f6a9e0473fd17b902e729a6 SHA512 ab6a8e499aa3a1b06a8a77e254c94eeedee11c704aaaeade82d4cd12101f4d2edd2df4af4047a93943e75dd0b165451ad9c6f67e28d677a15436df7adbf2c253 WHIRLPOOL 0c7da40dc6d365464362c4328290685546c39c3b8813f53a3b58de688c8696dfc0b5bd16a4430a8baa12a6a415eeda734496d332dd0e3e4e505bafa7c9f1fe21
-EBUILD totem-3.4.3.ebuild 5493 SHA256 ee39816c8ce66bd5754a1bb8ec08a430d3ea30018557ff537c446267a1503a4f SHA512 12b14e1b0125d3e18c519a1e6ed85aa2c890190b66176670efda700b9f546a57b97f0765a9fc6d91fa28e16d62f8a66cceafc79e9af0b1d0e755971bea0086bc WHIRLPOOL 8e165c56f602bf3377eb27414bcf899b4cf2d35aacc3f9e63d2d780c6b8b71ee538bfc8d921bf75ef046cad8173db72ac9b9a0a2916da6336b17eb045fc921ff
-EBUILD totem-3.6.3-r1.ebuild 4193 SHA256 1b580eeffc47027984b3b96faa0a71193021e8267caba58d7dd61c00fbf2a733 SHA512 2ca844ab75fa07d7fb8637ca117561fae83b82cc4219dc78308329be4ff1d55852bc2fecd0472a5462650c3e03c034713f1c7626c946c858ca375e3bb1839ca5 WHIRLPOOL cf5cbbd2b0c062df4f9599eab0669b02ffd99d16f444125aaf57c472887c6467cc2d222788d2309332976a0bc4626e7283c992ffecfa9b27e4b23b8528ac60dd
-MISC ChangeLog 52896 SHA256 56d37aa601f80235e01b920e615477d75e72ae3eab5fe718132326344f4fed52 SHA512 d6aeef9000bdc867a317f8402a07d98f1bd84968d8834e0023a8b40db10edeb91e89ea2109eec6f4bc15af6d0450acb2c3315cb4949e0e94380b3bfba158fba6 WHIRLPOOL ec46c09028a63785d11e2bbee37a2f01eff0ec73a0ababb9611d30b3938acbf62be6f47cade5af21e42477021e7b0b399539d504ec1553fd895311693eaf6f82
+EBUILD totem-2.32.0-r2.ebuild 6083 SHA256 602096eca2fbb7fa7d09215044ac96361f5b378b8646e8daba33ea0190bab160 SHA512 93fb7e90e73d796fc50a4de32248b417485b4d3f7fbad6cb337b5e9cbff01552c31df59ed6fe8af1b57bccd226217de32d55447c3db950606ba5d4891b86823f WHIRLPOOL 6cbf5edefe1a4dec0709d3ef169269a881dfef31a9774594467816730fa796bd5472c3b11b98c004e51347810d6e65ca2904799dde94bb311327cf778f7cb0af
+EBUILD totem-3.4.3.ebuild 5603 SHA256 47cd1e89730da4b0cd06c3e673ba4531fd73ed073438c01841501131e9d70c01 SHA512 3f9ac29c39be8ab17a57d2e166a21789f7177d9382b2eb57865f0f9e5d66bec8ec114e58c48f9fc16ff18cd5711ca54a205ba326bf423ad2ce3084d0225aa74f WHIRLPOOL e6fa03f5079de29c2bfc7b4a798976e737eddc091f736635f3cb435da235999b4b9a3b9b04800dc78561a0fbcdd4b56322c6e7917ad996dabaf2449f77670fba
+EBUILD totem-3.6.3-r1.ebuild 4386 SHA256 c804de2b159d93725194cf53d46841e78339ce4b0af6ebc06d287b57f90b74ea SHA512 9791657f9d40e9d78ddaae520fbfc88dd3e30fcb7f5d739343d9f47300e0ec9c8414d64a1fb89b73e790b3757c7b67984691186aeeece74589c4cab5e1c154a2 WHIRLPOOL 8ca0a17d4607476cf38b3408e67b50279fe60ba681fc8a71d7d548da74d172fcbb625f9c1df9467904b85f7c8ee3be7c8fc2f2ef174c004420de43021ab51eb3
+MISC ChangeLog 53090 SHA256 ef76cc1e34c81fefe4c17843979c81f0221c78c45b1986bd8494e9dcc6c68099 SHA512 0e7c73b5be48a697137e682f3b9f1a63085f60446cf03002fb43f582dec0fc334d86abd9be9b61b1b94c4bd8683abc3788bafece327b7af48cf69236df78b424 WHIRLPOOL 975415fba80db25997d178cef375b6b1442247977e0e44fc100e0b8373c49921caf1de216b67f6955ba9804a97db605dd9b586d94b50148f728fb3fa783d06d7
 MISC metadata.xml 1614 SHA256 dec13a6edcbc4b0fc4324d74937f6423883019cdb32397eb2bc8102b93d9957d SHA512 74f4affccb613b5cdaa015f10d018ffac89104e6bec13fc26acee08cde973b2e93f9b1106f92aaa52134d1340852c9e29b850a9751d9f52ab5f43639f7d9f464 WHIRLPOOL 8051fe6e2d0f4d1426c6ff9270756e4996723274a107a2882b01e3a08bda826172fa8cb12e2e675934352d10cf8b51da5498842e6e7ecb02c6f4c658cc0727e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDxROEACgkQ1fmVwcYIWAbJsQCeMF8VODqi9747fYj2g2ZkfkLu
-tgwAn1EKucMIwGt6FHrXkRng7HeCN32a
-=Ouxp
+iEYEAREIAAYFAlDxSyEACgkQ1fmVwcYIWAafZQCfQQjGMCQY3JRzL6FcaQXtqHvE
+LMMAoKEYHI1HxjJrFX7DqRdsWmvD70bj
+=/RJC
 -----END PGP SIGNATURE-----
diff --git a/media-video/totem/totem-2.32.0-r2.ebuild b/media-video/totem/totem-2.32.0-r2.ebuild
index 92a0dc4dcea8..45430574dc1d 100644
--- a/media-video/totem/totem-2.32.0-r2.ebuild
+++ b/media-video/totem/totem-2.32.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.32.0-r2.ebuild,v 1.14 2013/01/12 11:11:27 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.32.0-r2.ebuild,v 1.15 2013/01/12 11:38:08 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -157,6 +157,12 @@ src_prepare() {
 
 	# disable pyc compiling
 	python_clean_py-compile_files
+
+	# FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
+	# gst-inspect causes sandbox violations when a plugin needs write access to
+	# /dev/dri/card* in its init phase.
+	sed -e "s|\(gst010_inspect=\).*|\1$(type -P true)|" \
+		-i configure || die
 }
 
 src_configure() {
diff --git a/media-video/totem/totem-3.4.3.ebuild b/media-video/totem/totem-3.4.3.ebuild
index ffd9be7fbd47..8d5e706282cf 100644
--- a/media-video/totem/totem-3.4.3.ebuild
+++ b/media-video/totem/totem-3.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.4.3.ebuild,v 1.6 2013/01/12 11:11:27 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.4.3.ebuild,v 1.7 2013/01/12 11:38:07 eva Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -164,13 +164,12 @@ src_prepare() {
 	# Only needed when regenerating C sources from Vala files
 	#use vala && vala_src_prepare
 	gnome2_src_prepare
-}
 
-src_configure() {
-	# Work around sandbox violations when FEATURES=-userpriv caused by
-	# gst-inspect-0.10 (bug #358755)
-	unset DISPLAY
-	gnome2_src_configure
+	# FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
+	# gst-inspect causes sandbox violations when a plugin needs write access to
+	# /dev/dri/card* in its init phase.
+	sed -e "s|\(gst010_inspect=\).*|\1$(type -P true)|" \
+		-i configure || die
 }
 
 pkg_postinst() {
diff --git a/media-video/totem/totem-3.6.3-r1.ebuild b/media-video/totem/totem-3.6.3-r1.ebuild
index 664713be047e..a5420983c277 100644
--- a/media-video/totem/totem-3.6.3-r1.ebuild
+++ b/media-video/totem/totem-3.6.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.6.3-r1.ebuild,v 1.7 2013/01/06 09:58:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.6.3-r1.ebuild,v 1.8 2013/01/12 11:38:07 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -88,6 +88,16 @@ DEPEND="${RDEPEND}
 "
 # docbook-xml-dtd is needed for user doc
 
+src_prepare() {
+	gnome2_src_prepare
+
+	# FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
+	# gst-inspect causes sandbox violations when a plugin needs write access to
+	# /dev/dri/card* in its init phase.
+	sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \
+		-i configure || die
+}
+
 src_configure() {
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 	use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin"
@@ -125,9 +135,6 @@ src_configure() {
 
 	G2CONF="${G2CONF} --with-plugins=${plugins}"
 
-	# Work around sandbox violations when FEATURES=-userpriv caused by
-	# gst-inspect-1.0(bug #358755)
-	unset DISPLAY
 	gnome2_src_configure
 }