root-docs: fix sandbox access violation

See bug 471236. Addpredict is now used to catch possible HW device
access.

4 files changed, 17 insertions, 75 deletions

diff --git a/app-doc/root-docs/ChangeLog b/app-doc/root-docs/ChangeLog
index 3ddaf4a61..4d94231e7 100644
--- a/app-doc/root-docs/ChangeLog
+++ b/app-doc/root-docs/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*root-docs-5.34.07 (28 May 2013)
+
+  28 May 2013; Andrew Savchenko <bircoph@gmail.com> -root-docs-5.34.05.ebuild,
+  +root-docs-5.34.07.ebuild, -files/root-docs-5.32-makehtml.patch:
+  Fix sandbox violation on DRI systems: use addpredict instead of
+  switching to Xong GL interface. Remove old.
+
 *root-docs-5.34.05 (23 Feb 2013)
 
   23 Feb 2013; Andrew Savchenko <bircoph@gmail.com> -root-docs-5.32.04.ebuild,
diff --git a/app-doc/root-docs/Manifest b/app-doc/root-docs/Manifest
index f8e3e5537..4a3a50d60 100644
--- a/app-doc/root-docs/Manifest
+++ b/app-doc/root-docs/Manifest
@@ -1 +1 @@
-DIST root_v5.34.05.source.tar.gz 64021235 SHA256 448e180a5ed6f53b5ee49ead014a98e742e97198a4ca760f086467db5d230c9d SHA512 37d26849114c7764b8cb877e29f5e3b24603680b317ceab52d784ca2c17d66f38e99dfa1b369e587517ea5ffd4a11cefe51eb84db47d767ad16aee12b7ce79bf WHIRLPOOL 195f32c1251088ff55a5c7834bc3db3d07a4fbcfff018f329e6c39c6618aa98b7f3c2f6a0f7aba883367a016ca260c0c061c7641caa75c8c6e077cad0bb43516
+DIST root_v5.34.07.source.tar.gz 66629870 SHA256 88aa3fdd6c9b1cce33062b53c405a3ac0fb776d37d2a544aef5c71917f2adb4d SHA512 e062fdf3bbd1d81d777faccaf1ed6f603e2f9d4ee4926bdf671caf38f42b52b1a23d8ea87772d809978462f12474a1c5ad52005603b22162b9d566951fe7123e WHIRLPOOL 4519e26fb444d674e888d7aa08eae0ad98300d65fbf9a40f19d9da37be7cf19d15db98807941c426fb8407e30f99ecde98f09bd2f0cbf355b717f12f0369e35e
diff --git a/app-doc/root-docs/files/root-docs-5.32-makehtml.patch b/app-doc/root-docs/files/root-docs-5.32-makehtml.patch
deleted file mode 100644
index 5cad0102a..000000000
--- a/app-doc/root-docs/files/root-docs-5.32-makehtml.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- root/Makefile.orig	2012-05-23 21:07:07.000000000 +0400
-+++ root/Makefile	2012-05-23 22:47:48.935680301 +0400
-@@ -1039,8 +1039,7 @@
- releasenotes:
- 	@$(MAKERELNOTES)
- 
--html: $(ROOTEXE) changelog releasenotes
--	@$(MAKELOGHTML)
-+html: compiledata releasenotes
- 	@$(MAKEHTML)
- 
- # Use DESTDIR to set a sandbox prior to calling "make install", e.g.:
---- root/build/unix/makehtml.sh.orig	2012-06-18 06:44:59.000000000 +0400
-+++ root/build/unix/makehtml.sh	2012-06-18 19:39:41.262064654 +0400
-@@ -1,17 +1,17 @@
- #! /bin/sh
- 
--ROOT=bin/root.exe
-+ROOT=root.exe
- 
- dir=`pwd`
- cd tutorials
- # we need tutorials/hsimple.root
- if [ ! -f hsimple.root ]; then
--   $ROOT -l -b -q hsimple.C
-+   $ROOT -l -b -q hsimple.C && exit 1
- fi
- cd tree
- # we need tutorials/tree/cernstaff.root
- if [ ! -f cernstaff.root ]; then
--   $ROOT -l -b -q cernbuild.C
-+   $ROOT -l -b -q cernbuild.C || exit 1
- fi
- cd $dir
- 
-@@ -19,7 +19,7 @@
- echo "Generating doc in directory htmldoc/..."
- echo ""
- 
--$ROOT -l <<makedoc
-+$ROOT -l <<makedoc || exit 1
-     THtml h;
-     h.LoadAllLibs();
-     h.MakeAll();
diff --git a/app-doc/root-docs/root-docs-5.34.05.ebuild b/app-doc/root-docs/root-docs-5.34.07.ebuild
index 3bab6fafe..acf75e759 100644
--- a/app-doc/root-docs/root-docs-5.34.05.ebuild
+++ b/app-doc/root-docs/root-docs-5.34.07.ebuild
@@ -1,14 +1,14 @@
 # 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.03.ebuild,v 1.1 2012/10/26 15:39:53 bicatali Exp $
+# $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 $
 
-EAPI=4
+EAPI=5
 
 ROOT_PN="root"
 PATCH_PV="5.34.01"
 
 if [[ ${PV} == "9999" ]] ; then
-	_SVN_DEP="dev-vcs/subversion"
+	_GIT=git-2
 	SRC_URI=""
 	KEYWORDS=""
 else
@@ -16,7 +16,7 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit eutils multilib toolchain-funcs virtualx
+inherit eutils multilib toolchain-funcs virtualx ${_GIT}
 
 DESCRIPTION="API documentation for ROOT (An Object-Oriented Data Analysis Framework)"
 HOMEPAGE="http://root.cern.ch/"
@@ -31,30 +31,9 @@ VIRTUALX_REQUIRED="always"
 DEPEND="
 	~sci-physics/root-${PV}[X,doc,graphviz,htmldoc,opengl]
 	virtual/pkgconfig
-	${_SVN_DEP}"
+	${_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_unpack() {
-	# can't use subversion eclass functions,
-	# we need to svn export the same root tree:
-	# 1) svn revisions for root and root-docs must be the same;
-	# 2) no need to abuse server twice.
-	if [[ ${PV} == "9999" ]] ; then
-		addpredict "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/${ROOT_PN}/trunk/.svn"
-		svn export "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/${ROOT_PN}/trunk" \
-			"${S}" || die "svn export failed"
-	else
-		default
-	fi
-}
-
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-makehtml.patch
 }
@@ -78,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;
@@ -91,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}
-}