Gentoo Archives: gentoo-commits

From: Guilherme Amadio <amadio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/
Date: Fri, 24 Aug 2018 12:57:43
Message-Id: 1535115449.cccdcc6be767853b136dc5e2cbda15e170d030e6.amadio@gentoo
1 commit: cccdcc6be767853b136dc5e2cbda15e170d030e6
2 Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 24 12:29:11 2018 +0000
4 Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 24 12:57:29 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cccdcc6b
7
8 sci-physics/root: enable support for nVidia CUDA
9
10 Package-Manager: Portage-2.3.48, Repoman-2.3.10
11
12 sci-physics/root/metadata.xml | 1 +
13 sci-physics/root/root-6.14.02.ebuild | 10 ++++++----
14 sci-physics/root/root-9999.ebuild | 10 ++++++----
15 3 files changed, 13 insertions(+), 8 deletions(-)
16
17 diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
18 index 46ddf2da381..baf90a1a37b 100644
19 --- a/sci-physics/root/metadata.xml
20 +++ b/sci-physics/root/metadata.xml
21 @@ -21,6 +21,7 @@
22 </longdescription>
23 <use>
24 <flag name="asimage">Enable support for <pkg>media-libs/libafterimage</pkg></flag>
25 + <flag name="cuda">Enable support for nVidia CUDA</flag>
26 <flag name="davix">Enable support for DAVIX Data Management Client (https://cern.ch/davix)</flag>
27 <flag name="fits">Enable support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
28 <flag name="fortran">Compile included Fortran programs</flag>
29
30 diff --git a/sci-physics/root/root-6.14.02.ebuild b/sci-physics/root/root-6.14.02.ebuild
31 index da5c9512498..24d19074d97 100644
32 --- a/sci-physics/root/root-6.14.02.ebuild
33 +++ b/sci-physics/root/root-6.14.02.ebuild
34 @@ -9,14 +9,14 @@ CMAKE_MAKEFILE_GENERATOR=emake
35 FORTRAN_NEEDED="fortran"
36 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
37
38 -inherit cmake-utils eapi7-ver elisp-common eutils fortran-2 \
39 +inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
40 prefix python-single-r1 toolchain-funcs
41
42 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
43 HOMEPAGE="https://root.cern"
44 SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz"
45
46 -IUSE="+X avahi aqua +asimage +davix emacs +examples fits fftw fortran
47 +IUSE="+X avahi aqua +asimage cuda +davix emacs +examples fits fftw fortran
48 +gdml graphviz +gsl http jemalloc kerberos ldap libcxx memstat
49 +minuit mysql odbc +opengl oracle postgres prefix pythia6 pythia8
50 +python qt5 R +roofit root7 shadow sqlite +ssl table +tbb test
51 @@ -68,6 +68,7 @@ CDEPEND="
52 >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?]
53 ) )
54 avahi? ( net-dns/avahi[mdnsresponder-compat] )
55 + cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
56 davix? ( net-libs/davix )
57 emacs? ( virtual/emacs )
58 fftw? ( sci-libs/fftw:3.0= )
59 @@ -189,6 +190,7 @@ src_configure() {
60 -Dchirp=OFF
61 -Dcling=ON # cling=OFF is broken
62 -Dcocoa=$(usex aqua)
63 + -Dcuda=$(usex cuda)
64 -Dcxx14=$(usex root7)
65 -Dcxxmodules=OFF # requires clang, unstable
66 -Ddavix=$(usex davix)
67 @@ -250,9 +252,9 @@ src_configure() {
68 -Dtcmalloc=OFF
69 -Dtesting=$(usex test)
70 -Dthread=$(usex threads)
71 - -Dtmva-cpu=$(usex tmva)
72 - -Dtmva-gpu=OFF
73 -Dtmva=$(usex tmva)
74 + -Dtmva-cpu=$(usex tmva)
75 + -Dtmva-gpu=$(usex cuda)
76 -Dunuran=$(usex unuran)
77 -Dvc=$(usex vc)
78 -Dvdt=OFF
79
80 diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
81 index efb10900765..b9e470282f8 100644
82 --- a/sci-physics/root/root-9999.ebuild
83 +++ b/sci-physics/root/root-9999.ebuild
84 @@ -9,7 +9,7 @@ CMAKE_MAKEFILE_GENERATOR=emake
85 FORTRAN_NEEDED="fortran"
86 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
87
88 -inherit cmake-utils eapi7-ver elisp-common eutils fortran-2 \
89 +inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
90 prefix python-single-r1 toolchain-funcs
91
92 if [[ ${PV} == "9999" ]] ; then
93 @@ -26,7 +26,7 @@ fi
94 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
95 HOMEPAGE="https://root.cern"
96
97 -IUSE="+X avahi aqua +asimage +davix emacs +examples fits fftw fortran
98 +IUSE="+X avahi aqua +asimage cuda +davix emacs +examples fits fftw fortran
99 +gdml graphviz +gsl http jemalloc kerberos ldap libcxx memstat
100 +minuit mysql odbc +opengl oracle postgres prefix pythia6 pythia8
101 +python qt5 R +roofit root7 shadow sqlite +ssl table +tbb test
102 @@ -77,6 +77,7 @@ CDEPEND="
103 >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?]
104 ) )
105 avahi? ( net-dns/avahi[mdnsresponder-compat] )
106 + cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
107 davix? ( net-libs/davix )
108 emacs? ( virtual/emacs )
109 fftw? ( sci-libs/fftw:3.0= )
110 @@ -198,6 +199,7 @@ src_configure() {
111 -Dchirp=OFF
112 -Dcling=ON # cling=OFF is broken
113 -Dcocoa=$(usex aqua)
114 + -Dcuda=$(usex cuda)
115 -Dcxx14=$(usex root7)
116 -Dcxxmodules=OFF # requires clang, unstable
117 -Ddavix=$(usex davix)
118 @@ -260,9 +262,9 @@ src_configure() {
119 -Dtcmalloc=OFF
120 -Dtesting=$(usex test)
121 -Dthread=$(usex threads)
122 - -Dtmva-cpu=$(usex tmva)
123 - -Dtmva-gpu=OFF
124 -Dtmva=$(usex tmva)
125 + -Dtmva-cpu=$(usex tmva)
126 + -Dtmva-gpu=$(usex cuda)
127 -Dunuran=$(usex unuran)
128 -Dvc=$(usex vc)
129 -Dvdt=OFF