Gentoo Archives: gentoo-commits

From: Andrew Savchenko <bircoph@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-doc/root-docs/, app-doc/root-docs/files/
Date: Sat, 26 Sep 2015 08:45:39
Message-Id: 1443257069.1da3f352e7d9997c803e224e081ef40503057f5f.bircoph@gentoo
1 commit: 1da3f352e7d9997c803e224e081ef40503057f5f
2 Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
3 AuthorDate: Sat Sep 26 08:35:55 2015 +0000
4 Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 26 08:44:29 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1da3f352
7
8 app-doc/root-docs: remove old version and related patches
9
10 app-doc/root-docs/Manifest | 1 -
11 .../root-docs/files/root-docs-5.32-makehtml.patch | 44 ----------
12 app-doc/root-docs/root-docs-5.32.03.ebuild | 96 ----------------------
13 3 files changed, 141 deletions(-)
14
15 diff --git a/app-doc/root-docs/Manifest b/app-doc/root-docs/Manifest
16 index b945c8a..8d75ae6 100644
17 --- a/app-doc/root-docs/Manifest
18 +++ b/app-doc/root-docs/Manifest
19 @@ -4,7 +4,6 @@ DIST info.png 2060 SHA256 51de6661250f3fb71c6c8250cbc4bdc4dc4283cc90240b4dc1ee61
20 DIST roofit_quickstart_3.00.pdf 501576 SHA256 65aaf9e0c88352e265fd55b97a2503a9ee4a51d3219daff69c6f7f6427fe22cf SHA512 e8e1bd3bb3ead0ae3883512d7ff297651b99937fd5df0b61cf559ea5dd6cfbda35dfd8ebc953ed11a12f471849f6e95e05869b58a1e433ea6e5d1d1aa08bbb93 WHIRLPOOL a58b221272e3b2775639bf934f63cd06919105871ad736a84e18e6f3949a579301d1c6d69df39576dcc11867aa27274f5c78f36146a929698437b1a0c310aebe
21 DIST root-banner.png 132555 SHA256 d165e1cc175f654ff79af39193a6144678f600e14a53dd20e2b216b3e8951e94 SHA512 139347f396e88c8062d847d612949204cb80e551a826d926950ca8ab967f0d496487fed17a227fc796ae4db23fca758d91a0af7943142adbed358e98d7667b1f WHIRLPOOL dd23e26acf9303b404cda8135d6946af3b1abba3dfdff8d80e56096f810d50a01ebfb52dc1e6ee1d1b99fbb5859dc850e0e368155339b5007294d95ce8909857
22 DIST root6-banner.jpg 32319 SHA256 9d6d226bbe61db257a1796a3ad04dfe97b3bb500a29349ff76bf6a929ed1e104 SHA512 f01dd253f24d59c374042efd239ce023e5ca82d3d617ca6763daf9720b169c4fb27a0f4573ea95d807f0e12095924606372df4940f65ce7d859164314d22b9af WHIRLPOOL 69976abe240235a4f4eb25d61a0ceb183dc5ad5f9e57e9130ae10615329dd23125848f45608e1ad2d65a286d1f191f95336316f7c8f1cc052d396c31433cbe4c
23 -DIST root_v5.32.03.source.tar.gz 55529362 SHA256 575057c429625df69f0fa5c303287acefff185cda8cf8d1e9a6b2d21097d5ae6 SHA512 2e067eb9c6bbda5cf4df6973a3cf5307540247fb07c349f7ee74c0cf6a4abbb63f585a9ff67139cae985250fc5c5106b5ea03d7d9d2bcd20269e0ec8760ebd02 WHIRLPOOL 87dbf6f55f82001e07afc3b467e95f841f185f1f67d1dbd953f73e8aa9127ef8485db84100d6e9a08f0ae6aa5b45a565398eb6723145fff16c07e5158bb3e3ab
24 DIST root_v5.34.26.source.tar.gz 75171961 SHA256 c1fd2a249bb7210914b42e35dba4f1262cfa46b79ef7a41f73d7f08f8c54a643 SHA512 f5da5e20d1763608a32d78c48581e574a3f51aef47ecf6987a4064d1fb3234dfc9f626e041a17213f881f52f807ed6a6da60bf1d24951fa7dc2cadd94f8dd8b4 WHIRLPOOL 77b48b815c971642da68b71732a0ea3372648634281be634037b13cb58488f7075ec8bfc9a684e55d85cd9b038f229be29b19a15dfc829f0ce63a5f17241c23c
25 DIST root_v5.34.32.source.tar.gz 75170203 SHA256 939c7592802a54b6cbc593efb6e51699bf52e92baf6d6b20f486aaa08480fc5f SHA512 6485f2bb544947173e1feb2cfb41d6a176020027f1193d9388700a797ba4badbf497022e6129fdc4879e709460bf1efabf3e51c51840f0c781fa12e631419afc WHIRLPOOL 695147a519415b99e73fdad1cd61bb1944e292628236b5a7cbf1835174c950fa9cb068431a8164f24663323163012ea652db84d082f9f1eb1fcae79489575d9e
26 DIST root_v6.02.05.source.tar.gz 99121880 SHA256 7a5d4af171ba3b8a736c462b2041f8f35bd4c1d3b6a22c32a3ebd3ffe144ae60 SHA512 b30bc4aafe294ee069ee4c884ff70c983539a48eda586cd1938d00d4688f10e94a435640965b89c6d100fdd998453a4c1ae2109d5f1427f23865a868c561d684 WHIRLPOOL de363835fa00ffa0ff6e596b3c92b59ed59378bac3a344c066f7603d6104058203f76181d4c15478fd9066aedbe6a514257d5796feedb2d5d0d789b263e92955
27
28 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
29 deleted file mode 100644
30 index 5cad010..0000000
31 --- a/app-doc/root-docs/files/root-docs-5.32-makehtml.patch
32 +++ /dev/null
33 @@ -1,44 +0,0 @@
34 ---- root/Makefile.orig 2012-05-23 21:07:07.000000000 +0400
35 -+++ root/Makefile 2012-05-23 22:47:48.935680301 +0400
36 -@@ -1039,8 +1039,7 @@
37 - releasenotes:
38 - @$(MAKERELNOTES)
39 -
40 --html: $(ROOTEXE) changelog releasenotes
41 -- @$(MAKELOGHTML)
42 -+html: compiledata releasenotes
43 - @$(MAKEHTML)
44 -
45 - # Use DESTDIR to set a sandbox prior to calling "make install", e.g.:
46 ---- root/build/unix/makehtml.sh.orig 2012-06-18 06:44:59.000000000 +0400
47 -+++ root/build/unix/makehtml.sh 2012-06-18 19:39:41.262064654 +0400
48 -@@ -1,17 +1,17 @@
49 - #! /bin/sh
50 -
51 --ROOT=bin/root.exe
52 -+ROOT=root.exe
53 -
54 - dir=`pwd`
55 - cd tutorials
56 - # we need tutorials/hsimple.root
57 - if [ ! -f hsimple.root ]; then
58 -- $ROOT -l -b -q hsimple.C
59 -+ $ROOT -l -b -q hsimple.C && exit 1
60 - fi
61 - cd tree
62 - # we need tutorials/tree/cernstaff.root
63 - if [ ! -f cernstaff.root ]; then
64 -- $ROOT -l -b -q cernbuild.C
65 -+ $ROOT -l -b -q cernbuild.C || exit 1
66 - fi
67 - cd $dir
68 -
69 -@@ -19,7 +19,7 @@
70 - echo "Generating doc in directory htmldoc/..."
71 - echo ""
72 -
73 --$ROOT -l <<makedoc
74 -+$ROOT -l <<makedoc || exit 1
75 - THtml h;
76 - h.LoadAllLibs();
77 - h.MakeAll();
78
79 diff --git a/app-doc/root-docs/root-docs-5.32.03.ebuild b/app-doc/root-docs/root-docs-5.32.03.ebuild
80 deleted file mode 100644
81 index fa4562d..0000000
82 --- a/app-doc/root-docs/root-docs-5.32.03.ebuild
83 +++ /dev/null
84 @@ -1,96 +0,0 @@
85 -# Copyright 1999-2012 Gentoo Foundation
86 -# Distributed under the terms of the GNU General Public License v2
87 -# $Id$
88 -
89 -EAPI=4
90 -
91 -ROOT_PN="root"
92 -PATCH_PV="5.32"
93 -
94 -if [[ ${PV} == "9999" ]] ; then
95 - _SVN_DEP="dev-vcs/subversion"
96 - SRC_URI=""
97 - KEYWORDS=""
98 -else
99 - SRC_URI="ftp://root.cern.ch/${ROOT_PN}/${ROOT_PN}_v${PV}.source.tar.gz"
100 - KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
101 -fi
102 -
103 -inherit eutils multilib toolchain-funcs virtualx
104 -
105 -DESCRIPTION="API documentation for ROOT (An Object-Oriented Data Analysis Framework)"
106 -HOMEPAGE="http://root.cern.ch/"
107 -
108 -SLOT="0"
109 -LICENSE="LGPL-2.1"
110 -IUSE=""
111 -
112 -S="${WORKDIR}/${ROOT_PN}"
113 -VIRTUALX_REQUIRED="always"
114 -
115 -DEPEND="
116 - ~sci-physics/root-${PV}[X,doc,graphviz,htmldoc,opengl]
117 - virtual/pkgconfig
118 - ${_SVN_DEP}"
119 -RDEPEND=""
120 -
121 -pkg_setup() {
122 - # sandboxed user can't access video hardware, so xorg-x11 implementation
123 - # should be used
124 - GL_IMPLEM=$(eselect opengl show)
125 - eselect opengl set xorg-x11
126 -}
127 -
128 -src_unpack() {
129 - # can't use subversion eclass functions,
130 - # we need to svn export the same root tree:
131 - # 1) svn revisions for root and root-docs must be the same;
132 - # 2) no need to abuse server twice.
133 - if [[ ${PV} == "9999" ]] ; then
134 - addpredict "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/${ROOT_PN}/trunk/.svn"
135 - svn export "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/${ROOT_PN}/trunk" \
136 - "${S}" || die "svn export failed"
137 - else
138 - default
139 - fi
140 -}
141 -
142 -src_prepare() {
143 - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-makehtml.patch
144 -}
145 -
146 -src_configure() {
147 - # we need only to setup paths here, html docs doesn't depend on USE flags
148 - ./configure \
149 - --prefix="${EPREFIX}"/usr \
150 - --etcdir="${EPREFIX}"/etc/root \
151 - --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
152 - --docdir="${EPREFIX}"/usr/share/doc/${PF} \
153 - --tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
154 - --testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
155 - --with-cc=$(tc-getCC) \
156 - --with-cxx=$(tc-getCXX) \
157 - --with-f77=$(tc-getFC) \
158 - --with-ld=$(tc-getCXX) \
159 - --with-afs-shared=yes \
160 - --with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \
161 - --with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps
162 -}
163 -
164 -src_compile() {
165 - ROOTSYS="${S}" Xemake html
166 - # if root.exe crashes, return code will be 0 due to gdb attach,
167 - # so we need to check if last html file was generated;
168 - # this check is volatile and can't catch crash on the last file.
169 - [[ -f htmldoc/timespec.html ]] || die "looks like html doc generation crashed"
170 -}
171 -
172 -src_install() {
173 - dodir /usr/share/doc/${PF}
174 - # too large data to copy
175 - mv htmldoc/* "${ED}usr/share/doc/${PF}/"
176 -}
177 -
178 -pkg_postinst() {
179 - eselect opengl set ${GL_IMPLEM}
180 -}