Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: app-doc/root-docs/files/, app-doc/root-docs/
Date: Sun, 29 Dec 2013 00:31:25
Message-Id: 1388274947.48e23a3ceee1b66aa123de66347e618de0585707.jlec@gentoo
1 commit: 48e23a3ceee1b66aa123de66347e618de0585707
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 28 23:55:47 2013 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 28 23:55:47 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=48e23a3c
7
8 More up to date verison in tree
9
10 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
11
12 ---
13 app-doc/root-docs/ChangeLog | 108 ---------------------
14 .../files/root-docs-5.34.01-makehtml.patch | 51 ----------
15 app-doc/root-docs/metadata.xml | 14 ---
16 app-doc/root-docs/root-docs-5.34.10.ebuild | 77 ---------------
17 app-doc/root-docs/root-docs-5.34.13.ebuild | 77 ---------------
18 app-doc/root-docs/root-docs-9999.ebuild | 97 ------------------
19 6 files changed, 424 deletions(-)
20
21 diff --git a/app-doc/root-docs/ChangeLog b/app-doc/root-docs/ChangeLog
22 deleted file mode 100644
23 index e7a3993..0000000
24 --- a/app-doc/root-docs/ChangeLog
25 +++ /dev/null
26 @@ -1,108 +0,0 @@
27 -# ChangeLog for app-doc/root-docs
28 -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: $
30 -
31 -*root-docs-5.34.13 (05 Dec 2013)
32 -
33 - 05 Dec 2013; Andrew Savchenko <bircoph@×××××.com> +root-docs-5.34.13.ebuild:
34 - Version bump.
35 -
36 - 07 Oct 2013; Andrew Savchenko <bircoph@×××××.com> root-docs-5.34.10.ebuild:
37 - Omit unneeded howto messages.
38 -
39 -*root-docs-5.34.10 (04 Oct 2013)
40 -
41 - 04 Oct 2013; Andrew Savchenko <bircoph@×××××.com> -root-docs-5.34.09.ebuild,
42 - +root-docs-5.34.10.ebuild:
43 - Version bump per bug 486620. Remove old.
44 -
45 -*root-docs-5.34.09 (29 Jun 2013)
46 -
47 - 29 Jun 2013; Andrew Savchenko <bircoph@×××××.com> -root-docs-5.34.08.ebuild,
48 - +root-docs-5.34.09.ebuild:
49 - Version bump.
50 -
51 -*root-docs-5.34.08 (08 Jun 2013)
52 -
53 - 08 Jun 2013; Andrew Savchenko <bircoph@×××××.com> -root-docs-5.34.07.ebuild,
54 - +root-docs-5.34.08.ebuild:
55 - Version bump.
56 -
57 -*root-docs-5.34.07 (28 May 2013)
58 -
59 - 28 May 2013; Andrew Savchenko <bircoph@×××××.com> -root-docs-5.34.05.ebuild,
60 - +root-docs-5.34.07.ebuild, -files/root-docs-5.32-makehtml.patch:
61 - Fix sandbox violation on DRI systems: use addpredict instead of
62 - switching to Xong GL interface. Remove old.
63 -
64 -*root-docs-5.34.05 (23 Feb 2013)
65 -
66 - 23 Feb 2013; Andrew Savchenko <bircoph@×××××.com> -root-docs-5.32.04.ebuild,
67 - -root-docs-5.34.03.ebuild, +root-docs-5.34.05.ebuild, root-docs-9999.ebuild:
68 - Version bump. Remove old. Do not compress files (mostly headers) as
69 - this renders them unusable from html pages.
70 -
71 -*root-docs-5.34.03 (25 Oct 2012)
72 -
73 - 25 Oct 2012; Andrew Savchenko <bircoph@×××××.com> -root-docs-5.34.02.ebuild,
74 - +root-docs-5.34.03.ebuild:
75 - Version bump.
76 -
77 -*root-docs-5.34.02 (19 Oct 2012)
78 -*root-docs-5.32.04 (19 Oct 2012)
79 -
80 - 19 Oct 2012; Andrew Savchenko <bircoph@×××××.com> +root-docs-5.32.04.ebuild,
81 - +files/root-docs-5.32-makehtml.patch, +root-docs-5.34.02.ebuild:
82 - Version bump for patch releases in 5.32 and 5.34 branches.
83 -
84 -*root-docs-5.34.01 (22 Jul 2012)
85 -
86 - 22 Jul 2012; Andrew Savchenko <bircoph@×××××.com> +root-docs-5.34.01.ebuild,
87 - +files/root-docs-5.34.01-makehtml.patch, root-docs-9999.ebuild,
88 - -files/root-docs-9999-makehtml.patch:
89 - Version bump.
90 -
91 - 21 Jul 2012; Andrew Savchenko <bircoph@×××××.com>
92 - -files/root-docs-5.32-makehtml.patch, -files/root-docs-5.34-makehtml.patch,
93 - root-docs-9999.ebuild, +files/root-docs-9999-makehtml.patch:
94 - Update patching for live ebuild. Remove old.
95 -
96 - 06 Jul 2012; Justin Lecher <jlec@g.o> -root-docs-5.32.03.ebuild,
97 - metadata.xml:
98 - Dropped in tree version
99 -
100 -*root-docs-5.32.03 (20 Jun 2012)
101 -
102 - 20 Jun 2012; Andrew Savchenko <bircoph@×××××.com> -root-docs-5.32.ebuild,
103 - +root-docs-5.32.03.ebuild, +files/root-docs-5.32-makehtml.patch:
104 - Backport htmldoc generation fixes for 5.32 branch.
105 -
106 -*root-docs-5.34.00 (19 Jun 2012)
107 -
108 - 19 Jun 2012; Andrew Savchenko <bircoph@×××××.com> +root-docs-5.34.00.ebuild:
109 - Version bump based on live ebuild.
110 -
111 -*root-docs-9999 (19 Jun 2012)
112 -
113 - 19 Jun 2012; Andrew Savchenko <bircoph@×××××.com>
114 - +files/root-docs-5.34-makehtml.patch, +root-docs-9999.ebuild:
115 - htmldoc generation for root must be separated, because it is
116 - supposed to be run only root was installed to the live
117 - filesystem. It can't be faked easily in the sandbox environment,
118 - because ROOTSYS is not respected when --prefix or --*dir are
119 - used for configure script.
120 -
121 -*root-docs-5.32 (03 Dec 2011)
122 -
123 - 03 Dec 2011; Andrew Savchenko <bircoph@×××××.com> -root-docs-5.30.ebuild,
124 - +root-docs-5.32.ebuild:
125 - Version bump.
126 - Remove useless html/html32/ patch chunk, thus html files will be
127 - installed directly into /usr/share/doc/${PF}/.
128 -
129 -*root-docs-5.30 (02 Aug 2011)
130 -
131 - 02 Aug 2011; Andrew Savchenko <bircoph@×××××.com> +root-docs-5.30.ebuild,
132 - +metadata.xml:
133 - Version bump.
134 -
135
136 diff --git a/app-doc/root-docs/files/root-docs-5.34.01-makehtml.patch b/app-doc/root-docs/files/root-docs-5.34.01-makehtml.patch
137 deleted file mode 100644
138 index b339226..0000000
139 --- a/app-doc/root-docs/files/root-docs-5.34.01-makehtml.patch
140 +++ /dev/null
141 @@ -1,51 +0,0 @@
142 ---- root/Makefile.orig 2012-07-13 13:42:46.000000000 +0400
143 -+++ root/Makefile 2012-07-22 00:15:03.282994389 +0400
144 -@@ -1087,16 +1087,7 @@
145 -
146 - ifeq ($(BUILDX11),yes)
147 - ifeq ($(BUILDASIMAGE),yes)
148 --html: rootexecs postbin changelog releasenotes
149 --ifneq ($(USECONFIG),FALSE)
150 -- @if [ "x`which root.exe`" != "x$(DESTDIR)$(BINDIR)/root.exe" ] \
151 -- || [ "`which root.exe`" -ot "bin/root.exe" ]; then \
152 -- echo 'ERROR: root.exe has not been installed by this build.'; \
153 -- echo ' Run "make install" before running "make html".'; \
154 -- exit 1; \
155 -- fi
156 --endif
157 -- @$(MAKELOGHTML)
158 -+html: compiledata releasenotes
159 - @$(MAKEHTML)
160 - else
161 - html:
162 ---- root/build/unix/makehtml.sh.orig 2012-06-28 11:33:36.000000000 +0400
163 -+++ root/build/unix/makehtml.sh 2012-07-22 00:18:58.705804436 +0400
164 -@@ -1,16 +1,16 @@
165 - #! /bin/sh
166 -
167 - dir=`pwd`
168 --ROOT=$dir/bin/root
169 -+ROOT=root
170 - cd tutorials
171 - # we need tutorials/hsimple.root
172 - if [ ! -f hsimple.root ]; then
173 -- $ROOT -l -b -q hsimple.C
174 -+ $ROOT -l -b -q hsimple.C && exit 1
175 - fi
176 - cd tree
177 - # we need tutorials/tree/cernstaff.root
178 - if [ ! -f cernstaff.root ]; then
179 -- $ROOT -l -b -q cernbuild.C
180 -+ $ROOT -l -b -q cernbuild.C || exit 1
181 - fi
182 - cd $dir
183 -
184 -@@ -20,7 +20,7 @@
185 -
186 - # To generate the full documentation, we do need to
187 - # use the graphics engine, so do not use '-b'.
188 --$ROOT -l <<makedoc
189 -+$ROOT -l <<makedoc || exit 1
190 - THtml h;
191 - h.LoadAllLibs();
192 - h.MakeAll();
193
194 diff --git a/app-doc/root-docs/metadata.xml b/app-doc/root-docs/metadata.xml
195 deleted file mode 100644
196 index 8d64e52..0000000
197 --- a/app-doc/root-docs/metadata.xml
198 +++ /dev/null
199 @@ -1,14 +0,0 @@
200 -<?xml version="1.0" encoding="UTF-8"?>
201 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
202 -<pkgmetadata>
203 -<maintainer>
204 - <email>bircoph@×××××.com</email>
205 - <name>Andrew Savchenko</name>
206 - <description>Maintainer. Assign bugs to him</description>
207 -</maintainer>
208 -<herd>sci-physics</herd>
209 -<longdescription lang="en">
210 - This package contains the automatically generated ROOT class
211 - documentation.
212 -</longdescription>
213 -</pkgmetadata>
214
215 diff --git a/app-doc/root-docs/root-docs-5.34.10.ebuild b/app-doc/root-docs/root-docs-5.34.10.ebuild
216 deleted file mode 100644
217 index 3a039f1..0000000
218 --- a/app-doc/root-docs/root-docs-5.34.10.ebuild
219 +++ /dev/null
220 @@ -1,77 +0,0 @@
221 -# Copyright 1999-2013 Gentoo Foundation
222 -# Distributed under the terms of the GNU General Public License v2
223 -# $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 $
224 -
225 -EAPI=5
226 -
227 -ROOT_PN="root"
228 -PATCH_PV="5.34.01"
229 -
230 -if [[ ${PV} == "9999" ]] ; then
231 - _GIT=git-2
232 - SRC_URI=""
233 - KEYWORDS=""
234 -else
235 - SRC_URI="ftp://root.cern.ch/${ROOT_PN}/${ROOT_PN}_v${PV}.source.tar.gz"
236 - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
237 -fi
238 -
239 -inherit eutils multilib toolchain-funcs virtualx ${_GIT}
240 -
241 -DESCRIPTION="API documentation for ROOT (An Object-Oriented Data Analysis Framework)"
242 -HOMEPAGE="http://root.cern.ch/"
243 -
244 -SLOT="0"
245 -LICENSE="LGPL-2.1"
246 -IUSE=""
247 -
248 -S="${WORKDIR}/${ROOT_PN}"
249 -VIRTUALX_REQUIRED="always"
250 -
251 -DEPEND="
252 - ~sci-physics/root-${PV}[X,doc,graphviz,htmldoc,opengl]
253 - virtual/pkgconfig
254 - ${_GIT_DEP}"
255 -RDEPEND=""
256 -
257 -src_prepare() {
258 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-makehtml.patch
259 -}
260 -
261 -src_configure() {
262 - # we need only to setup paths here, html docs doesn't depend on USE flags
263 - ./configure \
264 - --prefix="${EPREFIX}"/usr \
265 - --etcdir="${EPREFIX}"/etc/root \
266 - --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
267 - --docdir="${EPREFIX}"/usr/share/doc/${PF} \
268 - --tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
269 - --testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
270 - --with-cc=$(tc-getCC) \
271 - --with-cxx=$(tc-getCXX) \
272 - --with-f77=$(tc-getFC) \
273 - --with-ld=$(tc-getCXX) \
274 - --with-afs-shared=yes \
275 - --with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \
276 - --with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
277 - --nohowto
278 -}
279 -
280 -src_compile() {
281 - # video drivers may want to access hardware devices
282 - cards=$(echo -n /dev/dri/card* /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
283 - [[ -n "${cards}" ]] && addpredict "${cards}"
284 -
285 - ROOTSYS="${S}" Xemake html
286 - # if root.exe crashes, return code will be 0 due to gdb attach,
287 - # so we need to check if last html file was generated;
288 - # this check is volatile and can't catch crash on the last file.
289 - [[ -f htmldoc/timespec.html ]] || die "looks like html doc generation crashed"
290 -}
291 -
292 -src_install() {
293 - dodir /usr/share/doc/${PF}
294 - # too large data to copy
295 - mv htmldoc/* "${ED}usr/share/doc/${PF}/"
296 - docompress -x "${EPREFIX}/usr/share/doc/${PF}/"
297 -}
298
299 diff --git a/app-doc/root-docs/root-docs-5.34.13.ebuild b/app-doc/root-docs/root-docs-5.34.13.ebuild
300 deleted file mode 100644
301 index 3a039f1..0000000
302 --- a/app-doc/root-docs/root-docs-5.34.13.ebuild
303 +++ /dev/null
304 @@ -1,77 +0,0 @@
305 -# Copyright 1999-2013 Gentoo Foundation
306 -# Distributed under the terms of the GNU General Public License v2
307 -# $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 $
308 -
309 -EAPI=5
310 -
311 -ROOT_PN="root"
312 -PATCH_PV="5.34.01"
313 -
314 -if [[ ${PV} == "9999" ]] ; then
315 - _GIT=git-2
316 - SRC_URI=""
317 - KEYWORDS=""
318 -else
319 - SRC_URI="ftp://root.cern.ch/${ROOT_PN}/${ROOT_PN}_v${PV}.source.tar.gz"
320 - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
321 -fi
322 -
323 -inherit eutils multilib toolchain-funcs virtualx ${_GIT}
324 -
325 -DESCRIPTION="API documentation for ROOT (An Object-Oriented Data Analysis Framework)"
326 -HOMEPAGE="http://root.cern.ch/"
327 -
328 -SLOT="0"
329 -LICENSE="LGPL-2.1"
330 -IUSE=""
331 -
332 -S="${WORKDIR}/${ROOT_PN}"
333 -VIRTUALX_REQUIRED="always"
334 -
335 -DEPEND="
336 - ~sci-physics/root-${PV}[X,doc,graphviz,htmldoc,opengl]
337 - virtual/pkgconfig
338 - ${_GIT_DEP}"
339 -RDEPEND=""
340 -
341 -src_prepare() {
342 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-makehtml.patch
343 -}
344 -
345 -src_configure() {
346 - # we need only to setup paths here, html docs doesn't depend on USE flags
347 - ./configure \
348 - --prefix="${EPREFIX}"/usr \
349 - --etcdir="${EPREFIX}"/etc/root \
350 - --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
351 - --docdir="${EPREFIX}"/usr/share/doc/${PF} \
352 - --tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
353 - --testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
354 - --with-cc=$(tc-getCC) \
355 - --with-cxx=$(tc-getCXX) \
356 - --with-f77=$(tc-getFC) \
357 - --with-ld=$(tc-getCXX) \
358 - --with-afs-shared=yes \
359 - --with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \
360 - --with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
361 - --nohowto
362 -}
363 -
364 -src_compile() {
365 - # video drivers may want to access hardware devices
366 - cards=$(echo -n /dev/dri/card* /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
367 - [[ -n "${cards}" ]] && addpredict "${cards}"
368 -
369 - ROOTSYS="${S}" Xemake html
370 - # if root.exe crashes, return code will be 0 due to gdb attach,
371 - # so we need to check if last html file was generated;
372 - # this check is volatile and can't catch crash on the last file.
373 - [[ -f htmldoc/timespec.html ]] || die "looks like html doc generation crashed"
374 -}
375 -
376 -src_install() {
377 - dodir /usr/share/doc/${PF}
378 - # too large data to copy
379 - mv htmldoc/* "${ED}usr/share/doc/${PF}/"
380 - docompress -x "${EPREFIX}/usr/share/doc/${PF}/"
381 -}
382
383 diff --git a/app-doc/root-docs/root-docs-9999.ebuild b/app-doc/root-docs/root-docs-9999.ebuild
384 deleted file mode 100644
385 index 8b170c6..0000000
386 --- a/app-doc/root-docs/root-docs-9999.ebuild
387 +++ /dev/null
388 @@ -1,97 +0,0 @@
389 -# Copyright 1999-2013 Gentoo Foundation
390 -# Distributed under the terms of the GNU General Public License v2
391 -# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.34.00.ebuild,v 1.2 2012/06/27 17:31:12 bicatali Exp $
392 -
393 -EAPI=5
394 -
395 -ROOT_PN="root"
396 -PATCH_PV="5.34.01"
397 -
398 -if [[ ${PV} == "9999" ]] ; then
399 - _SVN_DEP="dev-vcs/subversion"
400 - SRC_URI=""
401 - KEYWORDS=""
402 -else
403 - SRC_URI="ftp://root.cern.ch/${ROOT_PN}/${ROOT_PN}_v${PV}.source.tar.gz"
404 - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
405 -fi
406 -
407 -inherit eutils multilib toolchain-funcs virtualx
408 -
409 -DESCRIPTION="API documentation for ROOT (An Object-Oriented Data Analysis Framework)"
410 -HOMEPAGE="http://root.cern.ch/"
411 -
412 -SLOT="0"
413 -LICENSE="LGPL-2.1"
414 -IUSE=""
415 -
416 -S="${WORKDIR}/${ROOT_PN}"
417 -VIRTUALX_REQUIRED="always"
418 -
419 -DEPEND="
420 - ~sci-physics/root-${PV}[X,doc,graphviz,htmldoc,opengl]
421 - virtual/pkgconfig
422 - ${_SVN_DEP}"
423 -RDEPEND=""
424 -
425 -pkg_setup() {
426 - # sandboxed user can't access video hardware, so xorg-x11 implementation
427 - # should be used
428 - GL_IMPLEM=$(eselect opengl show)
429 - eselect opengl set xorg-x11
430 -}
431 -
432 -src_unpack() {
433 - # can't use subversion eclass functions,
434 - # we need to svn export the same root tree:
435 - # 1) svn revisions for root and root-docs must be the same;
436 - # 2) no need to abuse server twice.
437 - if [[ ${PV} == "9999" ]] ; then
438 - addpredict "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/${ROOT_PN}/trunk/.svn"
439 - svn export "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/${ROOT_PN}/trunk" \
440 - "${S}" || die "svn export failed"
441 - else
442 - default
443 - fi
444 -}
445 -
446 -src_prepare() {
447 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-makehtml.patch
448 -}
449 -
450 -src_configure() {
451 - # we need only to setup paths here, html docs doesn't depend on USE flags
452 - ./configure \
453 - --prefix="${EPREFIX}"/usr \
454 - --etcdir="${EPREFIX}"/etc/root \
455 - --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
456 - --docdir="${EPREFIX}"/usr/share/doc/${PF} \
457 - --tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
458 - --testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
459 - --with-cc=$(tc-getCC) \
460 - --with-cxx=$(tc-getCXX) \
461 - --with-f77=$(tc-getFC) \
462 - --with-ld=$(tc-getCXX) \
463 - --with-afs-shared=yes \
464 - --with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \
465 - --with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps
466 -}
467 -
468 -src_compile() {
469 - ROOTSYS="${S}" Xemake html
470 - # if root.exe crashes, return code will be 0 due to gdb attach,
471 - # so we need to check if last html file was generated;
472 - # this check is volatile and can't catch crash on the last file.
473 - [[ -f htmldoc/timespec.html ]] || die "looks like html doc generation crashed"
474 -}
475 -
476 -src_install() {
477 - dodir /usr/share/doc/${PF}
478 - # too large data to copy
479 - mv htmldoc/* "${ED}usr/share/doc/${PF}/"
480 - docompress -x "${EPREFIX}/usr/share/doc/${PF}/"
481 -}
482 -
483 -pkg_postinst() {
484 - eselect opengl set ${GL_IMPLEM}
485 -}