1 |
commit: 24c15d7d99615871d6fb2d36b17509f1d4af49cc |
2 |
Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Jul 1 06:58:08 2012 +0000 |
4 |
Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com> |
5 |
CommitDate: Sun Jul 1 06:58:08 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=24c15d7d |
7 |
|
8 |
sci-physics/root: backport fixes from the portage |
9 |
|
10 |
and remove old data |
11 |
|
12 |
--- |
13 |
sci-physics/root/ChangeLog | 6 +++++ |
14 |
sci-physics/root/files/olbd.confd | 9 ------- |
15 |
sci-physics/root/files/olbd.initd | 26 ---------------------- |
16 |
sci-physics/root/files/xrootd.confd | 8 ------- |
17 |
sci-physics/root/files/xrootd.initd | 26 ---------------------- |
18 |
sci-physics/root/metadata.xml | 39 ++++++++++++++++----------------- |
19 |
sci-physics/root/root-5.34.00.ebuild | 16 ++++++++----- |
20 |
sci-physics/root/root-9999.ebuild | 14 +++++++---- |
21 |
8 files changed, 44 insertions(+), 100 deletions(-) |
22 |
|
23 |
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog |
24 |
index 53f4413..1c0138f 100644 |
25 |
--- a/sci-physics/root/ChangeLog |
26 |
+++ b/sci-physics/root/ChangeLog |
27 |
@@ -2,6 +2,12 @@ |
28 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
29 |
# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $ |
30 |
|
31 |
+ 01 Jul 2012; Andrew Savchenko <bircoph@×××××.com> root-5.34.00.ebuild, |
32 |
+ root-9999.ebuild, -files/olbd.confd, -files/olbd.initd, -files/xrootd.confd, |
33 |
+ -files/xrootd.initd, metadata.xml: |
34 |
+ Backport fixes from the portage. |
35 |
+ Remove unused files and USE flag description. |
36 |
+ |
37 |
*root-5.32.03-r3 (20 Jun 2012) |
38 |
|
39 |
20 Jun 2012; Andrew Savchenko <bircoph@×××××.com> -root-5.32.03-r2.ebuild, |
40 |
|
41 |
diff --git a/sci-physics/root/files/olbd.confd b/sci-physics/root/files/olbd.confd |
42 |
deleted file mode 100644 |
43 |
index 848f4d7..0000000 |
44 |
--- a/sci-physics/root/files/olbd.confd |
45 |
+++ /dev/null |
46 |
@@ -1,9 +0,0 @@ |
47 |
-# conf.d file for olbd daemon |
48 |
- |
49 |
-# User to run as (default is `xrootd') |
50 |
-OLBD_USER="root" |
51 |
- |
52 |
-# |
53 |
-# Please refer to the olbd(1) man(1) page for more |
54 |
-# information on command line parameters. |
55 |
-OLBD_OPTS="" |
56 |
|
57 |
diff --git a/sci-physics/root/files/olbd.initd b/sci-physics/root/files/olbd.initd |
58 |
deleted file mode 100644 |
59 |
index 1793300..0000000 |
60 |
--- a/sci-physics/root/files/olbd.initd |
61 |
+++ /dev/null |
62 |
@@ -1,26 +0,0 @@ |
63 |
-#!/sbin/runscript |
64 |
-# Copyright 1999-2012 Gentoo Foundation |
65 |
-# Distributed under the terms of the GNU General Public License v2 |
66 |
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/olbd.initd,v 1.1 2008/12/18 18:10:18 bicatali Exp $ |
67 |
- |
68 |
-depend() { |
69 |
- need net |
70 |
- use dns logger |
71 |
- provide root-file-server |
72 |
-} |
73 |
- |
74 |
-start() { |
75 |
- ebegin "Starting ROOT open load balancer server" |
76 |
- start-stop-daemon --start --quiet --user=${OLBD_USER} \ |
77 |
- --make-pidfile --pidfile=/var/run/olbd.pid \ |
78 |
- --exec /usr/bin/olbd --background -- ${OLBD_OPTS} |
79 |
- eend $? |
80 |
-} |
81 |
- |
82 |
-stop() { |
83 |
- ebegin "Stopping ROOT open load balancer server" |
84 |
- start-stop-daemon --stop --quiet \ |
85 |
- --pidfile=/var/run/olbd.pid \ |
86 |
- --exec /usr/bin/olbd |
87 |
- eend $? |
88 |
-} |
89 |
|
90 |
diff --git a/sci-physics/root/files/xrootd.confd b/sci-physics/root/files/xrootd.confd |
91 |
deleted file mode 100644 |
92 |
index e725cd1..0000000 |
93 |
--- a/sci-physics/root/files/xrootd.confd |
94 |
+++ /dev/null |
95 |
@@ -1,8 +0,0 @@ |
96 |
-# conf.d file for xroot daemon |
97 |
- |
98 |
-# User to run as (default is `root') |
99 |
-XROOTD_USER="root" |
100 |
- |
101 |
-# Please refer to the xrootd(1) man(1) page for more |
102 |
-# information on command line parameters. |
103 |
-XROOTD_OPTS="" |
104 |
|
105 |
diff --git a/sci-physics/root/files/xrootd.initd b/sci-physics/root/files/xrootd.initd |
106 |
deleted file mode 100644 |
107 |
index 28dd8a5..0000000 |
108 |
--- a/sci-physics/root/files/xrootd.initd |
109 |
+++ /dev/null |
110 |
@@ -1,26 +0,0 @@ |
111 |
-#!/sbin/runscript |
112 |
-# Copyright 1999-2012 Gentoo Foundation |
113 |
-# Distributed under the terms of the GNU General Public License v2 |
114 |
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/xrootd.initd,v 1.2 2009/01/20 18:04:09 bicatali Exp $ |
115 |
- |
116 |
-depend() { |
117 |
- need net |
118 |
- use logger dns |
119 |
- provide root-file-server |
120 |
-} |
121 |
- |
122 |
-start() { |
123 |
- ebegin "Starting extended ROOTD file server" |
124 |
- start-stop-daemon --start --quiet --user ${XROOTD_USER} \ |
125 |
- --make-pidfile --pidfile /var/run/xrootd.pid \ |
126 |
- --exec /usr/bin/xrootd --background -- ${XROOTD_OPTS} |
127 |
- eend $? |
128 |
-} |
129 |
- |
130 |
-stop() { |
131 |
- ebegin "Stopping extended ROOTD file server" |
132 |
- start-stop-daemon --stop --quiet \ |
133 |
- --pidfile /var/run/xrootd.pid \ |
134 |
- --exec /usr/bin/xrootd |
135 |
- eend $? |
136 |
-} |
137 |
|
138 |
diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml |
139 |
index cb56d9f..e7da68b 100644 |
140 |
--- a/sci-physics/root/metadata.xml |
141 |
+++ b/sci-physics/root/metadata.xml |
142 |
@@ -1,13 +1,13 @@ |
143 |
<?xml version="1.0" encoding="UTF-8"?> |
144 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
145 |
<pkgmetadata> |
146 |
-<maintainer> |
147 |
- <email>bircoph@×××××.com</email> |
148 |
- <name>Andrew Savchenko</name> |
149 |
- <description>Maintainer. Assign bugs to him</description> |
150 |
-</maintainer> |
151 |
-<herd>sci-physics</herd> |
152 |
-<longdescription lang="en"> |
153 |
+ <maintainer> |
154 |
+ <email>bircoph@×××××.com</email> |
155 |
+ <name>Andrew Savchenko</name> |
156 |
+ <description>Maintainer. Assign bugs to him</description> |
157 |
+ </maintainer> |
158 |
+ <herd>sci-physics</herd> |
159 |
+ <longdescription lang="en"> |
160 |
ROOT Object Oriented Technologies is an object oriented data |
161 |
analysis framework written in C++ by the CERN. Widely used in |
162 |
high energy physics, but also in other data analysis applications. It |
163 |
@@ -15,17 +15,16 @@ |
164 |
statistics, serialization, optimization, linear algebra, graphics, |
165 |
GUI toolkit, and a complete visualization framework. |
166 |
</longdescription> |
167 |
-<use> |
168 |
- <flag name="c++0x"> Build ROOT using the C++11 standard. Not supported, requires <pkg>sys-devel/gcc</pkg>>=4.7.0</flag> |
169 |
- <flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag> |
170 |
- <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag> |
171 |
- <flag name="geant4">Support for <pkg>sci-physics/geant</pkg> version 4</flag> |
172 |
- <flag name="htmldoc">Generate html documentation</flag> |
173 |
- <flag name="llvm">Build the new cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag> |
174 |
- <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag> |
175 |
- <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag> |
176 |
- <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag> |
177 |
- <flag name="reflex">Build the reflection database for the C++ interpreter</flag> |
178 |
- <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag> |
179 |
-</use> |
180 |
+ <use> |
181 |
+ <flag name="c++0x"> Build ROOT using the C++11 standard. Not supported, requires <pkg>sys-devel/gcc</pkg>>=4.7.0</flag> |
182 |
+ <flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag> |
183 |
+ <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag> |
184 |
+ <flag name="htmldoc">Generate html documentation</flag> |
185 |
+ <flag name="llvm">Build the new cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag> |
186 |
+ <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag> |
187 |
+ <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag> |
188 |
+ <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag> |
189 |
+ <flag name="reflex">Build the reflection database for the C++ interpreter</flag> |
190 |
+ <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag> |
191 |
+ </use> |
192 |
</pkgmetadata> |
193 |
|
194 |
diff --git a/sci-physics/root/root-5.34.00.ebuild b/sci-physics/root/root-5.34.00.ebuild |
195 |
index 2a75fd8..54afec9 100644 |
196 |
--- a/sci-physics/root/root-5.34.00.ebuild |
197 |
+++ b/sci-physics/root/root-5.34.00.ebuild |
198 |
@@ -1,6 +1,6 @@ |
199 |
# Copyright 1999-2012 Gentoo Foundation |
200 |
# Distributed under the terms of the GNU General Public License v2 |
201 |
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.02-r1.ebuild,v 1.3 2012/05/04 07:55:34 jdhore Exp $ |
202 |
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.00.ebuild,v 1.2 2012/06/28 17:02:39 jlec Exp $ |
203 |
|
204 |
EAPI=4 |
205 |
|
206 |
@@ -16,7 +16,7 @@ else |
207 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
208 |
fi |
209 |
|
210 |
-inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user ${_SVN} |
211 |
+inherit elisp-common eutils fdo-mime fortran-2 multilib python ${_SVN} toolchain-funcs user versionator |
212 |
|
213 |
ROOFIT_DOC_PV=2.91-33 |
214 |
TMVA_DOC_PV=4.03 |
215 |
@@ -37,7 +37,7 @@ SRC_URI="${SRC_URI} |
216 |
|
217 |
SLOT="0" |
218 |
LICENSE="LGPL-2.1" |
219 |
-IUSE="+X afs avahi c++0x clarens doc emacs examples fits fftw graphviz htmldoc |
220 |
+IUSE="+X afs avahi -c++0x clarens doc emacs examples fits fftw graphviz htmldoc |
221 |
kerberos ldap +math mpi mysql odbc +opengl openmp oracle postgres prefix |
222 |
pythia6 pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd" |
223 |
|
224 |
@@ -75,7 +75,6 @@ CDEPEND=" |
225 |
) |
226 |
afs? ( net-fs/openafs ) |
227 |
avahi? ( net-dns/avahi ) |
228 |
- c++0x? ( >=sys-devel/gcc-4.7.0 ) |
229 |
clarens? ( dev-libs/xmlrpc-c[curl] ) |
230 |
emacs? ( virtual/emacs ) |
231 |
fits? ( sci-libs/cfitsio ) |
232 |
@@ -131,8 +130,8 @@ pkg_setup() { |
233 |
|
234 |
if use math; then |
235 |
if use openmp; then |
236 |
- if [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then |
237 |
- ewarn "You are using a gcc without OpenMP capabilities" |
238 |
+ if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then |
239 |
+ ewarn "You are using a g++ without OpenMP capabilities" |
240 |
die "Need an OpenMP capable compiler" |
241 |
else |
242 |
export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1 |
243 |
@@ -141,6 +140,11 @@ pkg_setup() { |
244 |
export USE_MPI=1 USE_PARALLEL_MINUIT2=1 |
245 |
fi |
246 |
fi |
247 |
+ if use c++0x && [[ $(tc-getCXX) == *g++* ]] && \ |
248 |
+ ! version_is_at_least "4.7" "$(gcc-version)"; then |
249 |
+ eerror "You are using a g++ without C++0x capabilities" |
250 |
+ die "Need an C++0x capable compiler" |
251 |
+ fi |
252 |
} |
253 |
|
254 |
src_prepare() { |
255 |
|
256 |
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild |
257 |
index e9b5476..689046e 100644 |
258 |
--- a/sci-physics/root/root-9999.ebuild |
259 |
+++ b/sci-physics/root/root-9999.ebuild |
260 |
@@ -16,7 +16,7 @@ else |
261 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
262 |
fi |
263 |
|
264 |
-inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user ${_SVN} |
265 |
+inherit elisp-common eutils fdo-mime fortran-2 multilib python ${_SVN} toolchain-funcs user versionator |
266 |
|
267 |
ROOFIT_DOC_PV=2.91-33 |
268 |
TMVA_DOC_PV=4.03 |
269 |
@@ -37,7 +37,7 @@ SRC_URI="${SRC_URI} |
270 |
|
271 |
SLOT="0" |
272 |
LICENSE="LGPL-2.1" |
273 |
-IUSE="+X afs avahi c++0x clarens doc emacs examples fits fftw graphviz htmldoc |
274 |
+IUSE="+X afs avahi -c++0x clarens doc emacs examples fits fftw graphviz htmldoc |
275 |
kerberos ldap llvm +math mpi mysql odbc +opengl openmp oracle postgres prefix |
276 |
pythia6 pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd" |
277 |
|
278 |
@@ -75,7 +75,6 @@ CDEPEND=" |
279 |
) |
280 |
afs? ( net-fs/openafs ) |
281 |
avahi? ( net-dns/avahi ) |
282 |
- c++0x? ( >=sys-devel/gcc-4.7.0 ) |
283 |
clarens? ( dev-libs/xmlrpc-c[curl] ) |
284 |
emacs? ( virtual/emacs ) |
285 |
fits? ( sci-libs/cfitsio ) |
286 |
@@ -132,8 +131,8 @@ pkg_setup() { |
287 |
|
288 |
if use math; then |
289 |
if use openmp; then |
290 |
- if [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then |
291 |
- ewarn "You are using a gcc without OpenMP capabilities" |
292 |
+ if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then |
293 |
+ ewarn "You are using a g++ without OpenMP capabilities" |
294 |
die "Need an OpenMP capable compiler" |
295 |
else |
296 |
export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1 |
297 |
@@ -142,6 +141,11 @@ pkg_setup() { |
298 |
export USE_MPI=1 USE_PARALLEL_MINUIT2=1 |
299 |
fi |
300 |
fi |
301 |
+ if use c++0x && [[ $(tc-getCXX) == *g++* ]] && \ |
302 |
+ ! version_is_at_least "4.7" "$(gcc-version)"; then |
303 |
+ eerror "You are using a g++ without C++0x capabilities" |
304 |
+ die "Need an C++0x capable compiler" |
305 |
+ fi |
306 |
} |
307 |
|
308 |
src_prepare() { |