1 |
commit: 023bddbe83308ebcb8f0ba55cf9e18715bf466da |
2 |
Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue May 28 21:24:58 2013 +0000 |
4 |
Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com> |
5 |
CommitDate: Tue May 28 21:24:58 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=023bddbe |
7 |
|
8 |
root-docs: fix sandbox access violation |
9 |
|
10 |
See bug 471236. Addpredict is now used to catch possible HW device |
11 |
access. |
12 |
|
13 |
--- |
14 |
app-doc/root-docs/ChangeLog | 7 ++++ |
15 |
.../root-docs/files/root-docs-5.32-makehtml.patch | 44 ---------------------- |
16 |
...ocs-5.34.05.ebuild => root-docs-5.34.07.ebuild} | 39 +++++-------------- |
17 |
3 files changed, 16 insertions(+), 74 deletions(-) |
18 |
|
19 |
diff --git a/app-doc/root-docs/ChangeLog b/app-doc/root-docs/ChangeLog |
20 |
index 3ddaf4a..4d94231 100644 |
21 |
--- a/app-doc/root-docs/ChangeLog |
22 |
+++ b/app-doc/root-docs/ChangeLog |
23 |
@@ -2,6 +2,13 @@ |
24 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
25 |
# $Header: $ |
26 |
|
27 |
+*root-docs-5.34.07 (28 May 2013) |
28 |
+ |
29 |
+ 28 May 2013; Andrew Savchenko <bircoph@×××××.com> -root-docs-5.34.05.ebuild, |
30 |
+ +root-docs-5.34.07.ebuild, -files/root-docs-5.32-makehtml.patch: |
31 |
+ Fix sandbox violation on DRI systems: use addpredict instead of |
32 |
+ switching to Xong GL interface. Remove old. |
33 |
+ |
34 |
*root-docs-5.34.05 (23 Feb 2013) |
35 |
|
36 |
23 Feb 2013; Andrew Savchenko <bircoph@×××××.com> -root-docs-5.32.04.ebuild, |
37 |
|
38 |
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 |
39 |
deleted file mode 100644 |
40 |
index 5cad010..0000000 |
41 |
--- a/app-doc/root-docs/files/root-docs-5.32-makehtml.patch |
42 |
+++ /dev/null |
43 |
@@ -1,44 +0,0 @@ |
44 |
---- root/Makefile.orig 2012-05-23 21:07:07.000000000 +0400 |
45 |
-+++ root/Makefile 2012-05-23 22:47:48.935680301 +0400 |
46 |
-@@ -1039,8 +1039,7 @@ |
47 |
- releasenotes: |
48 |
- @$(MAKERELNOTES) |
49 |
- |
50 |
--html: $(ROOTEXE) changelog releasenotes |
51 |
-- @$(MAKELOGHTML) |
52 |
-+html: compiledata releasenotes |
53 |
- @$(MAKEHTML) |
54 |
- |
55 |
- # Use DESTDIR to set a sandbox prior to calling "make install", e.g.: |
56 |
---- root/build/unix/makehtml.sh.orig 2012-06-18 06:44:59.000000000 +0400 |
57 |
-+++ root/build/unix/makehtml.sh 2012-06-18 19:39:41.262064654 +0400 |
58 |
-@@ -1,17 +1,17 @@ |
59 |
- #! /bin/sh |
60 |
- |
61 |
--ROOT=bin/root.exe |
62 |
-+ROOT=root.exe |
63 |
- |
64 |
- dir=`pwd` |
65 |
- cd tutorials |
66 |
- # we need tutorials/hsimple.root |
67 |
- if [ ! -f hsimple.root ]; then |
68 |
-- $ROOT -l -b -q hsimple.C |
69 |
-+ $ROOT -l -b -q hsimple.C && exit 1 |
70 |
- fi |
71 |
- cd tree |
72 |
- # we need tutorials/tree/cernstaff.root |
73 |
- if [ ! -f cernstaff.root ]; then |
74 |
-- $ROOT -l -b -q cernbuild.C |
75 |
-+ $ROOT -l -b -q cernbuild.C || exit 1 |
76 |
- fi |
77 |
- cd $dir |
78 |
- |
79 |
-@@ -19,7 +19,7 @@ |
80 |
- echo "Generating doc in directory htmldoc/..." |
81 |
- echo "" |
82 |
- |
83 |
--$ROOT -l <<makedoc |
84 |
-+$ROOT -l <<makedoc || exit 1 |
85 |
- THtml h; |
86 |
- h.LoadAllLibs(); |
87 |
- h.MakeAll(); |
88 |
|
89 |
diff --git a/app-doc/root-docs/root-docs-5.34.05.ebuild b/app-doc/root-docs/root-docs-5.34.07.ebuild |
90 |
similarity index 69% |
91 |
rename from app-doc/root-docs/root-docs-5.34.05.ebuild |
92 |
rename to app-doc/root-docs/root-docs-5.34.07.ebuild |
93 |
index 3bab6fa..acf75e7 100644 |
94 |
--- a/app-doc/root-docs/root-docs-5.34.05.ebuild |
95 |
+++ b/app-doc/root-docs/root-docs-5.34.07.ebuild |
96 |
@@ -1,14 +1,14 @@ |
97 |
# Copyright 1999-2013 Gentoo Foundation |
98 |
# Distributed under the terms of the GNU General Public License v2 |
99 |
-# $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 $ |
100 |
+# $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 $ |
101 |
|
102 |
-EAPI=4 |
103 |
+EAPI=5 |
104 |
|
105 |
ROOT_PN="root" |
106 |
PATCH_PV="5.34.01" |
107 |
|
108 |
if [[ ${PV} == "9999" ]] ; then |
109 |
- _SVN_DEP="dev-vcs/subversion" |
110 |
+ _GIT=git-2 |
111 |
SRC_URI="" |
112 |
KEYWORDS="" |
113 |
else |
114 |
@@ -16,7 +16,7 @@ else |
115 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
116 |
fi |
117 |
|
118 |
-inherit eutils multilib toolchain-funcs virtualx |
119 |
+inherit eutils multilib toolchain-funcs virtualx ${_GIT} |
120 |
|
121 |
DESCRIPTION="API documentation for ROOT (An Object-Oriented Data Analysis Framework)" |
122 |
HOMEPAGE="http://root.cern.ch/" |
123 |
@@ -31,30 +31,9 @@ VIRTUALX_REQUIRED="always" |
124 |
DEPEND=" |
125 |
~sci-physics/root-${PV}[X,doc,graphviz,htmldoc,opengl] |
126 |
virtual/pkgconfig |
127 |
- ${_SVN_DEP}" |
128 |
+ ${_GIT_DEP}" |
129 |
RDEPEND="" |
130 |
|
131 |
-pkg_setup() { |
132 |
- # sandboxed user can't access video hardware, so xorg-x11 implementation |
133 |
- # should be used |
134 |
- GL_IMPLEM=$(eselect opengl show) |
135 |
- eselect opengl set xorg-x11 |
136 |
-} |
137 |
- |
138 |
-src_unpack() { |
139 |
- # can't use subversion eclass functions, |
140 |
- # we need to svn export the same root tree: |
141 |
- # 1) svn revisions for root and root-docs must be the same; |
142 |
- # 2) no need to abuse server twice. |
143 |
- if [[ ${PV} == "9999" ]] ; then |
144 |
- addpredict "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/${ROOT_PN}/trunk/.svn" |
145 |
- svn export "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/${ROOT_PN}/trunk" \ |
146 |
- "${S}" || die "svn export failed" |
147 |
- else |
148 |
- default |
149 |
- fi |
150 |
-} |
151 |
- |
152 |
src_prepare() { |
153 |
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-makehtml.patch |
154 |
} |
155 |
@@ -78,6 +57,10 @@ src_configure() { |
156 |
} |
157 |
|
158 |
src_compile() { |
159 |
+ # video drivers may want to access hardware devices |
160 |
+ cards=$(echo -n /dev/dri/card* /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g') |
161 |
+ [[ -n "${cards}" ]] && addpredict "${cards}" |
162 |
+ |
163 |
ROOTSYS="${S}" Xemake html |
164 |
# if root.exe crashes, return code will be 0 due to gdb attach, |
165 |
# so we need to check if last html file was generated; |
166 |
@@ -91,7 +74,3 @@ src_install() { |
167 |
mv htmldoc/* "${ED}usr/share/doc/${PF}/" |
168 |
docompress -x "${EPREFIX}/usr/share/doc/${PF}/" |
169 |
} |
170 |
- |
171 |
-pkg_postinst() { |
172 |
- eselect opengl set ${GL_IMPLEM} |
173 |
-} |