1 |
commit: 74f34fcebed6f459f69038842ef6246c277b1dc9 |
2 |
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 19 07:13:17 2018 +0000 |
4 |
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 19 16:25:15 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74f34fce |
7 |
|
8 |
sci-physics/root: version bump to 6.14/06 |
9 |
|
10 |
Package-Manager: Portage-2.3.51, Repoman-2.3.12 |
11 |
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org> |
12 |
|
13 |
sci-physics/root/Manifest | 2 +- |
14 |
sci-physics/root/files/root-6.14.06-oracle.patch | 24 +++++++++++ |
15 |
sci-physics/root/metadata.xml | 3 ++ |
16 |
...{root-6.14.04-r3.ebuild => root-6.14.06.ebuild} | 47 +++++++++++++--------- |
17 |
4 files changed, 57 insertions(+), 19 deletions(-) |
18 |
|
19 |
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest |
20 |
index 91e7e9b5c73..dc5a9f7f346 100644 |
21 |
--- a/sci-physics/root/Manifest |
22 |
+++ b/sci-physics/root/Manifest |
23 |
@@ -1,2 +1,2 @@ |
24 |
DIST root_v6.12.06.source.tar.gz 162284452 BLAKE2B 944b5e899677bab40842d7ec969ff08cfa470e63be9a02b948a49ae088e8da72ce433a5071d9196bfd98f71e6861b1bda285354012620eee6c61cffcee71a0c8 SHA512 3d44749ccfc3d40a2f516ae53ef40fb244ed785eee0dbc18ff822bbb811a15b943039d30282ef5358a283d485e62531880c877ec77a86089503b06d6f37e42e1 |
25 |
-DIST root_v6.14.04.source.tar.gz 162451369 BLAKE2B c7af9cf18736c900f71c35b7f9df91784058406c738ac49cf93aa6d1caee13b79e1f68be53ea600fc7311a5af76207f9de71f8438bf6eb43681c93f1815b39a7 SHA512 eb8f3fe89f70b222962ecec7bb7a1ff107dd600bc7ad63cbefc5d4e00561cc80b6430da90d1e59f70dbff69158929eec54614bb5df9894d342482b41c051353f |
26 |
+DIST root_v6.14.06.source.tar.gz 162462837 BLAKE2B a6904b67d1f5964768fa884bd2b5c648390d0b3626b5be8f39ff0e311bf14690d2aff7eb9d6047fa8d5a9de894935067ea8c033592b9795fc34b61aa5f65fcdb SHA512 83698e1213ae9bd4a87ef3160b459c962199585bed7378efc0cfefdc352e6651a17286a11cd925dbcb5d04e1b832d47a3a69849d048731ea9d0d84f9b0f996a4 |
27 |
|
28 |
diff --git a/sci-physics/root/files/root-6.14.06-oracle.patch b/sci-physics/root/files/root-6.14.06-oracle.patch |
29 |
new file mode 100644 |
30 |
index 00000000000..232d3b08cfa |
31 |
--- /dev/null |
32 |
+++ b/sci-physics/root/files/root-6.14.06-oracle.patch |
33 |
@@ -0,0 +1,24 @@ |
34 |
+From: Guilherme Amadio <amadio@××××.ch> |
35 |
+Date: Wed, 14 Nov 2018 11:36:49 +0100 |
36 |
+Subject: Fix FindOracle.cmake to find version 18.x |
37 |
+ |
38 |
+--- |
39 |
+ cmake/modules/FindOracle.cmake | 2 +- |
40 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
41 |
+ |
42 |
+diff --git a/cmake/modules/FindOracle.cmake b/cmake/modules/FindOracle.cmake |
43 |
+index b7c8cfbb99..6672cb1bbd 100644 |
44 |
+--- a/cmake/modules/FindOracle.cmake |
45 |
++++ b/cmake/modules/FindOracle.cmake |
46 |
+@@ -55,7 +55,7 @@ FIND_LIBRARY( |
47 |
+ ) |
48 |
+ FIND_LIBRARY( |
49 |
+ ORACLE_LIBRARY_LNNZ |
50 |
+- NAMES libnnz10 nnz10 libnnz11 nnz11 libnnz12 nnz12 ociw32 |
51 |
++ NAMES libnnz10 nnz10 libnnz11 nnz11 libnnz12 nnz12 nnz18 ociw32 |
52 |
+ PATHS ${ORACLE_LIB_LOCATION} |
53 |
+ ) |
54 |
+ |
55 |
+-- |
56 |
+2.19.1 |
57 |
+ |
58 |
|
59 |
diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml |
60 |
index 6d5558e76bb..3c004c04055 100644 |
61 |
--- a/sci-physics/root/metadata.xml |
62 |
+++ b/sci-physics/root/metadata.xml |
63 |
@@ -21,6 +21,9 @@ |
64 |
</longdescription> |
65 |
<use> |
66 |
<flag name="asimage">Enable support for <pkg>media-libs/libafterimage</pkg></flag> |
67 |
+ <flag name="c++11">Build using the C++11 standard</flag> |
68 |
+ <flag name="c++14">Build using the C++14 standard</flag> |
69 |
+ <flag name="c++17">Build using the C++17 standard</flag> |
70 |
<flag name="cuda">Enable support for nVidia CUDA</flag> |
71 |
<flag name="davix">Enable support for DAVIX Data Management Client (https://cern.ch/davix)</flag> |
72 |
<flag name="fits">Enable support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag> |
73 |
|
74 |
diff --git a/sci-physics/root/root-6.14.04-r3.ebuild b/sci-physics/root/root-6.14.06.ebuild |
75 |
similarity index 87% |
76 |
rename from sci-physics/root/root-6.14.04-r3.ebuild |
77 |
rename to sci-physics/root/root-6.14.06.ebuild |
78 |
index 0a144e280c7..57b14c7e31d 100644 |
79 |
--- a/sci-physics/root/root-6.14.04-r3.ebuild |
80 |
+++ b/sci-physics/root/root-6.14.06.ebuild |
81 |
@@ -1,4 +1,4 @@ |
82 |
-# Copyright 1999-2018 Gentoo Foundation |
83 |
+# Copyright 1999-2018 Gentoo Authors |
84 |
# Distributed under the terms of the GNU General Public License v2 |
85 |
|
86 |
EAPI=6 |
87 |
@@ -16,21 +16,24 @@ DESCRIPTION="C++ data analysis framework and interpreter from CERN" |
88 |
HOMEPAGE="https://root.cern" |
89 |
SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz" |
90 |
|
91 |
-IUSE="+X avahi aqua +asimage cuda +davix emacs +examples fits fftw fortran |
92 |
- +gdml graphviz +gsl http jemalloc kerberos ldap libcxx memstat |
93 |
- +minuit mysql odbc +opengl oracle postgres prefix pythia6 pythia8 |
94 |
- +python qt5 R +roofit root7 shadow sqlite +ssl table +tbb test |
95 |
- +threads +tiff +tmva +unuran vc xinetd +xml xrootd" |
96 |
+IUSE="+X avahi aqua +asimage c++11 +c++14 c++17 cuda +davix emacs |
97 |
+ +examples fits fftw fortran +gdml graphviz +gsl http jemalloc |
98 |
+ kerberos ldap libcxx memstat +minuit mysql odbc +opengl oracle |
99 |
+ postgres prefix pythia6 pythia8 +python qt5 R +roofit root7 |
100 |
+ shadow sqlite +ssl table +tbb test +threads +tiff +tmva +unuran |
101 |
+ vc xinetd +xml xrootd" |
102 |
|
103 |
SLOT="$(ver_cut 1-2)/$(ver_cut 3)" |
104 |
LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" |
105 |
KEYWORDS="~amd64 ~x86" |
106 |
|
107 |
REQUIRED_USE=" |
108 |
+ ^^ ( c++11 c++14 c++17 ) |
109 |
!X? ( !asimage !opengl !qt5 !tiff ) |
110 |
davix? ( ssl xml ) |
111 |
python? ( ${PYTHON_REQUIRED_USE} ) |
112 |
qt5? ( root7 ) |
113 |
+ root7? ( || ( c++14 c++17 ) ) |
114 |
tmva? ( gsl ) |
115 |
" |
116 |
|
117 |
@@ -109,21 +112,19 @@ RDEPEND="${CDEPEND} |
118 |
PATCHES=( |
119 |
"${FILESDIR}"/${PN}-6.12.04-no-ocaml.patch |
120 |
"${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch |
121 |
- "${FILESDIR}"/${PN}-6.13.02-hsimple.patch |
122 |
+ "${FILESDIR}"/${PN}-6.14.06-oracle.patch |
123 |
) |
124 |
|
125 |
pkg_setup() { |
126 |
use fortran && fortran-2_pkg_setup |
127 |
use python && python-single-r1_pkg_setup |
128 |
|
129 |
- echo |
130 |
elog "There are extra options on packages not yet in Gentoo:" |
131 |
elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite," |
132 |
elog "HDFS, Monalisa, MaxDB/SapDB, SRP, VecCore." |
133 |
- elog "You can use the env variable EXTRA_ECONF variable for this." |
134 |
+ elog "You can use the environment variable EXTRA_ECONF for this." |
135 |
elog "For example, for Chirp, you would set: " |
136 |
elog "EXTRA_ECONF=\"-Dchirp=ON\"" |
137 |
- echo |
138 |
} |
139 |
|
140 |
src_prepare() { |
141 |
@@ -137,16 +138,18 @@ src_prepare() { |
142 |
|
143 |
# Note: ROOT uses bundled clang because it is patched and API-incompatible |
144 |
# with vanilla clang. The patches enable the C++ interpreter to work. |
145 |
-# Since ROOT installs many small files into /etc (~100MB in total), |
146 |
-# we install it into another directory to avoid making /etc too big. |
147 |
+# Since ROOT installs many files into /etc (~100MB in total) that don't |
148 |
+# really belong there, we install it into another directory to avoid |
149 |
+# making /etc too big. |
150 |
|
151 |
src_configure() { |
152 |
local mycmakeargs=( |
153 |
-DCMAKE_C_FLAGS="${CFLAGS}" |
154 |
-DCMAKE_CXX_FLAGS="${CXXFLAGS}" |
155 |
+ -DPYTHON_EXECUTABLE="${PYTHON}" |
156 |
-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)" |
157 |
-DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)/share/man" |
158 |
- -DMCAKE_INSTALL_LIBDIR=$(get_libdir) |
159 |
+ -DCMAKE_INSTALL_LIBDIR=$(get_libdir) |
160 |
-DDEFAULT_SYSROOT="${EPREFIX}" |
161 |
-DCLING_BUILD_PLUGINS=OFF |
162 |
-Dexplicitlink=ON |
163 |
@@ -190,10 +193,13 @@ src_configure() { |
164 |
-Dccache=OFF # use ccache via portage |
165 |
-Dcastor=OFF |
166 |
-Dchirp=OFF |
167 |
+ -Dclad=OFF |
168 |
-Dcling=ON # cling=OFF is broken |
169 |
-Dcocoa=$(usex aqua) |
170 |
-Dcuda=$(usex cuda) |
171 |
- -Dcxx14=$(usex root7) |
172 |
+ -Dcxx11=$(usex c++11) |
173 |
+ -Dcxx14=$(usex c++14) |
174 |
+ -Dcxx17=$(usex c++17) |
175 |
-Dcxxmodules=OFF # requires clang, unstable |
176 |
-Ddavix=$(usex davix) |
177 |
-Ddcache=OFF |
178 |
@@ -239,7 +245,7 @@ src_configure() { |
179 |
-Droofit=$(usex roofit) |
180 |
-Droot7=$(usex root7) |
181 |
-Drootbench=OFF |
182 |
- -Droottest=$(usex test) |
183 |
+ -Droottest=OFF |
184 |
-Drpath=OFF |
185 |
-Druby=OFF # deprecated and broken |
186 |
-Druntime_cxxmodules=OFF # does not work yet |
187 |
@@ -250,7 +256,6 @@ src_configure() { |
188 |
-Dsrp=OFF # not implemented |
189 |
-Dssl=$(usex ssl) |
190 |
-Dtable=$(usex table) |
191 |
- -Dtbb=$(usex tbb) |
192 |
-Dtcmalloc=OFF |
193 |
-Dtesting=$(usex test) |
194 |
-Dthread=$(usex threads) |
195 |
@@ -269,6 +274,12 @@ src_configure() { |
196 |
cmake-utils_src_configure |
197 |
} |
198 |
|
199 |
+src_compile() { |
200 |
+ # needed for hsimple.root |
201 |
+ addwrite /dev/random |
202 |
+ cmake-utils_src_compile |
203 |
+} |
204 |
+ |
205 |
src_install() { |
206 |
cmake-utils_src_install |
207 |
|
208 |
@@ -300,7 +311,7 @@ src_install() { |
209 |
fi |
210 |
|
211 |
if ! use examples; then |
212 |
- rm -r test tutorials || die |
213 |
+ rm -r tutorials || die |
214 |
fi |
215 |
|
216 |
if ! use tmva; then |
217 |
@@ -308,5 +319,5 @@ src_install() { |
218 |
fi |
219 |
|
220 |
# clean up unnecessary files from installation |
221 |
- rm -r emacs || die |
222 |
+ rm -r emacs test || die |
223 |
} |