From 023bddbe83308ebcb8f0ba55cf9e18715bf466da Mon Sep 17 00:00:00 2001
From: Andrew Savchenko <bircoph@gmail.com>
Date: Wed, 29 May 2013 01:24:58 +0400
Subject: root-docs: fix sandbox access violation

See bug 471236. Addpredict is now used to catch possible HW device
access.
---
 app-doc/root-docs/ChangeLog                        |  7 ++
 app-doc/root-docs/Manifest                         |  2 +-
 .../root-docs/files/root-docs-5.32-makehtml.patch  | 44 ----------
 app-doc/root-docs/root-docs-5.34.05.ebuild         | 97 ----------------------
 app-doc/root-docs/root-docs-5.34.07.ebuild         | 76 +++++++++++++++++
 5 files changed, 84 insertions(+), 142 deletions(-)
 delete mode 100644 app-doc/root-docs/files/root-docs-5.32-makehtml.patch
 delete mode 100644 app-doc/root-docs/root-docs-5.34.05.ebuild
 create mode 100644 app-doc/root-docs/root-docs-5.34.07.ebuild

(limited to 'app-doc/root-docs')

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.05.ebuild
deleted file mode 100644
index 3bab6fafe..000000000
--- a/app-doc/root-docs/root-docs-5.34.05.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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 $
-
-EAPI=4
-
-ROOT_PN="root"
-PATCH_PV="5.34.01"
-
-if [[ ${PV} == "9999" ]] ; then
-	_SVN_DEP="dev-vcs/subversion"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="ftp://root.cern.ch/${ROOT_PN}/${ROOT_PN}_v${PV}.source.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-inherit eutils multilib toolchain-funcs virtualx
-
-DESCRIPTION="API documentation for ROOT (An Object-Oriented Data Analysis Framework)"
-HOMEPAGE="http://root.cern.ch/"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE=""
-
-S="${WORKDIR}/${ROOT_PN}"
-VIRTUALX_REQUIRED="always"
-
-DEPEND="
-	~sci-physics/root-${PV}[X,doc,graphviz,htmldoc,opengl]
-	virtual/pkgconfig
-	${_SVN_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
-}
-
-src_configure() {
-	# we need only to setup paths here, html docs doesn't depend on USE flags
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--etcdir="${EPREFIX}"/etc/root \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
-		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
-		--with-cc=$(tc-getCC) \
-		--with-cxx=$(tc-getCXX) \
-		--with-f77=$(tc-getFC) \
-		--with-ld=$(tc-getCXX) \
-		--with-afs-shared=yes \
-		--with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \
-		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps
-}
-
-src_compile() {
-	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;
-	# this check is volatile and can't catch crash on the last file.
-	[[ -f htmldoc/timespec.html ]] || die "looks like html doc generation crashed"
-}
-
-src_install() {
-	dodir /usr/share/doc/${PF}
-	# too large data to copy
-	mv htmldoc/* "${ED}usr/share/doc/${PF}/"
-	docompress -x "${EPREFIX}/usr/share/doc/${PF}/"
-}
-
-pkg_postinst() {
-	eselect opengl set ${GL_IMPLEM}
-}
diff --git a/app-doc/root-docs/root-docs-5.34.07.ebuild b/app-doc/root-docs/root-docs-5.34.07.ebuild
new file mode 100644
index 000000000..acf75e759
--- /dev/null
+++ b/app-doc/root-docs/root-docs-5.34.07.ebuild
@@ -0,0 +1,76 @@
+# 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 $
+
+EAPI=5
+
+ROOT_PN="root"
+PATCH_PV="5.34.01"
+
+if [[ ${PV} == "9999" ]] ; then
+	_GIT=git-2
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="ftp://root.cern.ch/${ROOT_PN}/${ROOT_PN}_v${PV}.source.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+inherit eutils multilib toolchain-funcs virtualx ${_GIT}
+
+DESCRIPTION="API documentation for ROOT (An Object-Oriented Data Analysis Framework)"
+HOMEPAGE="http://root.cern.ch/"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE=""
+
+S="${WORKDIR}/${ROOT_PN}"
+VIRTUALX_REQUIRED="always"
+
+DEPEND="
+	~sci-physics/root-${PV}[X,doc,graphviz,htmldoc,opengl]
+	virtual/pkgconfig
+	${_GIT_DEP}"
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-makehtml.patch
+}
+
+src_configure() {
+	# we need only to setup paths here, html docs doesn't depend on USE flags
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--etcdir="${EPREFIX}"/etc/root \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
+		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
+		--with-cc=$(tc-getCC) \
+		--with-cxx=$(tc-getCXX) \
+		--with-f77=$(tc-getFC) \
+		--with-ld=$(tc-getCXX) \
+		--with-afs-shared=yes \
+		--with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \
+		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps
+}
+
+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;
+	# this check is volatile and can't catch crash on the last file.
+	[[ -f htmldoc/timespec.html ]] || die "looks like html doc generation crashed"
+}
+
+src_install() {
+	dodir /usr/share/doc/${PF}
+	# too large data to copy
+	mv htmldoc/* "${ED}usr/share/doc/${PF}/"
+	docompress -x "${EPREFIX}/usr/share/doc/${PF}/"
+}
-- 
cgit v1.2.3-65-gdbad