fixed sandbox violation on DRI systems

(Portage version: 2.2.01.21938-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

2 files changed, 11 insertions, 13 deletions

diff --git a/app-doc/root-docs/ChangeLog b/app-doc/root-docs/ChangeLog
index 52d3d4ba7809..9e86894f5237 100644
--- a/app-doc/root-docs/ChangeLog
+++ b/app-doc/root-docs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-doc/root-docs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/ChangeLog,v 1.31 2013/05/23 23:50:00 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/ChangeLog,v 1.32 2013/06/04 15:41:13 bicatali Exp $
+
+
+  28 May 2013; Andrew Savchenko <bircoph@gmail.com> +root-docs-5.34.07.ebuild:
+  Fix sandbox violation on DRI systems: use addpredict instead of
+  switching to Xong GL interface.
 
 *root-docs-5.34.07 (23 May 2013)
 
diff --git a/app-doc/root-docs/root-docs-5.34.07.ebuild b/app-doc/root-docs/root-docs-5.34.07.ebuild
index 4eda16d0e44e..85bd4618c331 100644
--- a/app-doc/root-docs/root-docs-5.34.07.ebuild
+++ b/app-doc/root-docs/root-docs-5.34.07.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/app-doc/root-docs/root-docs-5.34.07.ebuild,v 1.1 2013/05/23 23:50:00 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.34.07.ebuild,v 1.2 2013/06/04 15:41:13 bicatali Exp $
 
 EAPI=5
 
@@ -34,13 +34,6 @@ DEPEND="
 	${_GIT_DEP}"
 RDEPEND=""
 
-pkg_setup() {
-	# sandboxed user can't access video hardware, so xorg-x11 implementation
-	# should be used
-	GL_IMPLEM=$(eselect opengl show)
-	eselect opengl set xorg-x11
-}
-
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-makehtml.patch
 }
@@ -64,6 +57,10 @@ src_configure() {
 }
 
 src_compile() {
+	# video drivers may want to access hardware devices
+	cards=$(echo -n /dev/dri/card* /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
+	[[ -n "${cards}" ]] && addpredict "${cards}"
+
 	ROOTSYS="${S}" Xemake html
 	# if root.exe crashes, return code will be 0 due to gdb attach,
 	# so we need to check if last html file was generated;
@@ -77,7 +74,3 @@ src_install() {
 	mv htmldoc/* "${ED}usr/share/doc/${PF}/"
 	docompress -x "${EPREFIX}/usr/share/doc/${PF}/"
 }
-
-pkg_postinst() {
-	eselect opengl set ${GL_IMPLEM}
-}