1 |
jlec 12/04/03 18:03:41 |
2 |
|
3 |
Modified: metadata.xml ChangeLog root-5.32.02-r1.ebuild |
4 |
root-5.28.00h-r1.ebuild |
5 |
Log: |
6 |
sci-physics/root: Imported latest fixes from sci overlay, including LD and CXXFLAGS respect and clean EAPI=4 usage |
7 |
|
8 |
(Portage version: 2.2.0_alpha99/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.14 sci-physics/root/metadata.xml |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/metadata.xml?rev=1.14&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/metadata.xml?rev=1.14&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/metadata.xml?r1=1.13&r2=1.14 |
16 |
|
17 |
Index: metadata.xml |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sci-physics/root/metadata.xml,v |
20 |
retrieving revision 1.13 |
21 |
retrieving revision 1.14 |
22 |
diff -u -r1.13 -r1.14 |
23 |
--- metadata.xml 21 Jan 2012 19:19:46 -0000 1.13 |
24 |
+++ metadata.xml 3 Apr 2012 18:03:41 -0000 1.14 |
25 |
@@ -1,13 +1,13 @@ |
26 |
<?xml version="1.0" encoding="UTF-8"?> |
27 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
28 |
<pkgmetadata> |
29 |
-<maintainer> |
30 |
- <email>bircoph@×××××.com</email> |
31 |
- <name>Andrew Savchenko</name> |
32 |
- <description>Maintainer. Assign bugs to him</description> |
33 |
-</maintainer> |
34 |
-<herd>sci-physics</herd> |
35 |
-<longdescription lang="en"> |
36 |
+ <maintainer> |
37 |
+ <email>bircoph@×××××.com</email> |
38 |
+ <name>Andrew Savchenko</name> |
39 |
+ <description>Maintainer. Assign bugs to him</description> |
40 |
+ </maintainer> |
41 |
+ <herd>sci-physics</herd> |
42 |
+ <longdescription lang="en"> |
43 |
ROOT Object Oriented Technologies is an object oriented data |
44 |
analysis framework written in C++ by the CERN. Widely used in |
45 |
high energy physics, but also in other data analysis applications. It |
46 |
@@ -15,15 +15,15 @@ |
47 |
statistics, serialization, optimization, linear algebra, graphics, |
48 |
GUI toolkit, and a complete visualization framework. |
49 |
</longdescription> |
50 |
-<use> |
51 |
- <flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag> |
52 |
- <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag> |
53 |
- <flag name="geant4">Support for <pkg>sci-physics/geant</pkg> version 4</flag> |
54 |
- <flag name="llvm">Build the new cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag> |
55 |
- <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag> |
56 |
- <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag> |
57 |
- <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag> |
58 |
- <flag name="reflex">Build the reflection database for the C++ interpreter</flag> |
59 |
- <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag> |
60 |
-</use> |
61 |
+ <use> |
62 |
+ <flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag> |
63 |
+ <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag> |
64 |
+ <flag name="geant4">Support for <pkg>sci-physics/geant</pkg> version 4</flag> |
65 |
+ <flag name="llvm">Build the new cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag> |
66 |
+ <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag> |
67 |
+ <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag> |
68 |
+ <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag> |
69 |
+ <flag name="reflex">Build the reflection database for the C++ interpreter</flag> |
70 |
+ <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag> |
71 |
+ </use> |
72 |
</pkgmetadata> |
73 |
|
74 |
|
75 |
|
76 |
1.98 sci-physics/root/ChangeLog |
77 |
|
78 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/ChangeLog?rev=1.98&view=markup |
79 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/ChangeLog?rev=1.98&content-type=text/plain |
80 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/ChangeLog?r1=1.97&r2=1.98 |
81 |
|
82 |
Index: ChangeLog |
83 |
=================================================================== |
84 |
RCS file: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v |
85 |
retrieving revision 1.97 |
86 |
retrieving revision 1.98 |
87 |
diff -u -r1.97 -r1.98 |
88 |
--- ChangeLog 3 Apr 2012 16:02:52 -0000 1.97 |
89 |
+++ ChangeLog 3 Apr 2012 18:03:41 -0000 1.98 |
90 |
@@ -1,6 +1,11 @@ |
91 |
# ChangeLog for sci-physics/root |
92 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
93 |
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.97 2012/04/03 16:02:52 bicatali Exp $ |
94 |
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.98 2012/04/03 18:03:41 jlec Exp $ |
95 |
+ |
96 |
+ 03 Apr 2012; Justin Lecher <jlec@g.o> root-5.28.00h-r1.ebuild, |
97 |
+ root-5.32.02-r1.ebuild, metadata.xml: |
98 |
+ Imported latest fixes from sci overlay, including LD and CXXFLAGS respect and |
99 |
+ clean EAPI=4 usage |
100 |
|
101 |
03 Apr 2012; Sébastien Fabbro <bicatali@g.o> -root-5.28.00h.ebuild, |
102 |
+root-5.28.00h-r1.ebuild, -root-5.32.01-r2.ebuild, +root-5.32.02-r1.ebuild: |
103 |
|
104 |
|
105 |
|
106 |
1.2 sci-physics/root/root-5.32.02-r1.ebuild |
107 |
|
108 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.32.02-r1.ebuild?rev=1.2&view=markup |
109 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.32.02-r1.ebuild?rev=1.2&content-type=text/plain |
110 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.32.02-r1.ebuild?r1=1.1&r2=1.2 |
111 |
|
112 |
Index: root-5.32.02-r1.ebuild |
113 |
=================================================================== |
114 |
RCS file: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.02-r1.ebuild,v |
115 |
retrieving revision 1.1 |
116 |
retrieving revision 1.2 |
117 |
diff -u -r1.1 -r1.2 |
118 |
--- root-5.32.02-r1.ebuild 3 Apr 2012 16:02:52 -0000 1.1 |
119 |
+++ root-5.32.02-r1.ebuild 3 Apr 2012 18:03:41 -0000 1.2 |
120 |
@@ -1,6 +1,6 @@ |
121 |
# Copyright 1999-2012 Gentoo Foundation |
122 |
# Distributed under the terms of the GNU General Public License v2 |
123 |
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.02-r1.ebuild,v 1.1 2012/04/03 16:02:52 bicatali Exp $ |
124 |
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.02-r1.ebuild,v 1.2 2012/04/03 18:03:41 jlec Exp $ |
125 |
|
126 |
EAPI=4 |
127 |
PYTHON_DEPEND="python? 2" |
128 |
@@ -14,11 +14,12 @@ |
129 |
|
130 |
DESCRIPTION="C++ data analysis framework and interpreter from CERN" |
131 |
HOMEPAGE="http://root.cern.ch/" |
132 |
-SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz |
133 |
+SRC_URI=" |
134 |
+ ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz |
135 |
doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf |
136 |
- math? ( |
137 |
- ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf |
138 |
- http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )" |
139 |
+ math? ( |
140 |
+ ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf |
141 |
+ http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )" |
142 |
|
143 |
SLOT="0" |
144 |
LICENSE="LGPL-2.1" |
145 |
@@ -45,7 +46,7 @@ |
146 |
x11-libs/libXext |
147 |
x11-libs/libXpm |
148 |
|| ( |
149 |
- >=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] |
150 |
+ >=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] |
151 |
>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff] |
152 |
) |
153 |
opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps ) |
154 |
@@ -109,7 +110,7 @@ |
155 |
enewuser rootd -1 -1 /var/spool/rootd rootd |
156 |
|
157 |
if use math; then |
158 |
- if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then |
159 |
+ if use openmp && ! tc-has-openmp; then |
160 |
ewarn "You are using gcc and OpenMP is available with gcc >= 4.2" |
161 |
ewarn "If you want to build this package with OpenMP, abort now," |
162 |
ewarn "and set CC to an OpenMP capable compiler" |
163 |
@@ -134,17 +135,17 @@ |
164 |
"${FILESDIR}"/${PN}-${PATCH_PV2}-explicit-functions.patch |
165 |
|
166 |
# make sure we use system libs and headers |
167 |
- rm montecarlo/eg/inc/cfortran.h README/cfortran.doc |
168 |
- rm -rf graf2d/asimage/src/libAfterImage |
169 |
- rm -rf graf3d/ftgl/{inc,src} |
170 |
- rm -rf graf2d/freetype/src |
171 |
- rm -rf graf3d/glew/{inc,src} |
172 |
- rm -rf core/pcre/src |
173 |
- rm -rf math/unuran/src/unuran-*.tar.gz |
174 |
- LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" | xargs rm |
175 |
- rm -rf core/lzma/src/*.tar.gz |
176 |
- rm graf3d/gl/{inc,src}/gl2ps.* |
177 |
- sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk |
178 |
+ rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die |
179 |
+ rm -rf graf2d/asimage/src/libAfterImage || die |
180 |
+ rm -rf graf3d/ftgl/{inc,src} || die |
181 |
+ rm -rf graf2d/freetype/src || die |
182 |
+ rm -rf graf3d/glew/{inc,src} || die |
183 |
+ rm -rf core/pcre/src || die |
184 |
+ rm -rf math/unuran/src/unuran-*.tar.gz || die |
185 |
+ LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die |
186 |
+ rm -rf core/lzma/src/*.tar.gz || die |
187 |
+ rm graf3d/gl/{inc,src}/gl2ps.* || die |
188 |
+ sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die |
189 |
|
190 |
# In Gentoo, libPythia6 is called libpythia6 |
191 |
# libungif is called libgif, |
192 |
@@ -178,6 +179,7 @@ |
193 |
--with-cc=$(tc-getCC) \ |
194 |
--with-cxx=$(tc-getCXX) \ |
195 |
--with-f77=$(tc-getFC) \ |
196 |
+ --with-ld=$(tc-getCXX) \ |
197 |
--with-afs-shared=yes \ |
198 |
--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \ |
199 |
--disable-builtin-afterimage \ |
200 |
@@ -238,7 +240,7 @@ |
201 |
} |
202 |
|
203 |
src_compile() { |
204 |
- emake OPT="${CFLAGS}" F77OPT="${FFLAGS}" || die "emake failed" |
205 |
+ emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}" |
206 |
if use emacs; then |
207 |
elisp-compile build/misc/*.el || die "elisp-compile failed" |
208 |
fi |
209 |
@@ -259,7 +261,7 @@ |
210 |
insinto /usr/share/doc/${PF}/examples/tutorials/tmva |
211 |
doins -r tmva/test |
212 |
else |
213 |
- rm -rf "${ED}"/usr/share/doc/${PF}/examples |
214 |
+ rm -rf "${ED}"/usr/share/doc/${PF}/examples || die |
215 |
fi |
216 |
} |
217 |
|
218 |
@@ -296,13 +298,13 @@ |
219 |
} |
220 |
|
221 |
src_install() { |
222 |
- emake DESTDIR="${D}" install || die "emake install failed" |
223 |
+ emake DESTDIR="${D}" install |
224 |
|
225 |
echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root |
226 |
use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root |
227 |
use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root |
228 |
use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root |
229 |
- doenvd 99root || die "doenvd failed" |
230 |
+ doenvd 99root |
231 |
|
232 |
# The build system installs Emacs support unconditionally and in the wrong |
233 |
# directory. Remove it and call elisp-install in case of USE=emacs. |
234 |
@@ -316,18 +318,18 @@ |
235 |
desktop_install |
236 |
|
237 |
# Cleanup of files either already distributed or unused on Gentoo |
238 |
- rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} |
239 |
- rm "${ED}"usr/share/root/fonts/LICENSE |
240 |
+ rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die |
241 |
+ rm "${ED}"usr/share/root/fonts/LICENSE || die |
242 |
pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null |
243 |
rm -f posix/mktypes dll_stl/setup \ |
244 |
- G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o |
245 |
- rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib |
246 |
- rm -f "${ED}"/etc/root/proof/*.sample |
247 |
- rm -rf "${ED}"/etc/root/daemons |
248 |
+ G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die |
249 |
+ rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die |
250 |
+ rm -f "${ED}"/etc/root/proof/*.sample || die |
251 |
+ rm -rf "${ED}"/etc/root/daemons || die |
252 |
popd > /dev/null |
253 |
# these should be in PATH |
254 |
mv "${ED}"etc/root/proof/utils/pq2/pq2* \ |
255 |
- "${ED}"usr/bin |
256 |
+ "${ED}"usr/bin/ || die |
257 |
} |
258 |
|
259 |
pkg_postinst() { |
260 |
|
261 |
|
262 |
|
263 |
1.2 sci-physics/root/root-5.28.00h-r1.ebuild |
264 |
|
265 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.28.00h-r1.ebuild?rev=1.2&view=markup |
266 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.28.00h-r1.ebuild?rev=1.2&content-type=text/plain |
267 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.28.00h-r1.ebuild?r1=1.1&r2=1.2 |
268 |
|
269 |
Index: root-5.28.00h-r1.ebuild |
270 |
=================================================================== |
271 |
RCS file: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.28.00h-r1.ebuild,v |
272 |
retrieving revision 1.1 |
273 |
retrieving revision 1.2 |
274 |
diff -u -r1.1 -r1.2 |
275 |
--- root-5.28.00h-r1.ebuild 3 Apr 2012 16:02:52 -0000 1.1 |
276 |
+++ root-5.28.00h-r1.ebuild 3 Apr 2012 18:03:41 -0000 1.2 |
277 |
@@ -1,6 +1,6 @@ |
278 |
# Copyright 1999-2012 Gentoo Foundation |
279 |
# Distributed under the terms of the GNU General Public License v2 |
280 |
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.28.00h-r1.ebuild,v 1.1 2012/04/03 16:02:52 bicatali Exp $ |
281 |
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.28.00h-r1.ebuild,v 1.2 2012/04/03 18:03:41 jlec Exp $ |
282 |
|
283 |
EAPI=3 |
284 |
|
285 |
@@ -45,7 +45,7 @@ |
286 |
x11-libs/libXft |
287 |
x11-libs/libXpm |
288 |
|| ( |
289 |
- >=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] |
290 |
+ >=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] |
291 |
>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff] |
292 |
) |
293 |
afs? ( net-fs/openafs ) |