[gentoo-commits] repo/gentoo:master commit in: sci-physics/root/

["Guilherme Amadio" <amadio@gentoo.org>]

commit:     7f482115392c335e9c7a8ee523d3a15710a2f0b8
Author:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 19 12:54:11 2018 +0000
Commit:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Mon Nov 19 16:25:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f482115

sci-physics/root: update live ebuild

* Drop patches added upstream
* Sync USE flags with 6.14/06 ebuild

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>

 sci-physics/root/root-9999.ebuild | 51 +++++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 12ada06493f..3fcff6ba7bf 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,19 +26,22 @@ fi
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="https://root.cern"
 
-IUSE="+X avahi aqua +asimage cuda +davix emacs +examples fits fftw fortran
-	+gdml graphviz +gsl http jemalloc kerberos ldap libcxx memstat
-	+minuit mysql odbc +opengl oracle postgres prefix pythia6 pythia8
-	+python qt5 R +roofit root7 shadow sqlite +ssl table +tbb test
-	+threads +tiff +tmva +unuran vc xinetd +xml xrootd"
+IUSE="+X avahi aqua +asimage c++11 +c++14 c++17 cuda +davix emacs
+	+examples fits fftw fortran +gdml graphviz +gsl http jemalloc
+	kerberos ldap libcxx memstat +minuit mysql odbc +opengl oracle
+	postgres prefix pythia6 pythia8 +python qt5 R +roofit root7
+	shadow sqlite +ssl table +tbb test +threads +tiff +tmva +unuran
+	vc xinetd +xml xrootd"
 
 LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
 
 REQUIRED_USE="
+	^^ ( c++11 c++14 c++17 )
 	!X? ( !asimage !opengl !qt5 !tiff )
 	davix? ( ssl xml )
 	python? ( ${PYTHON_REQUIRED_USE} )
 	qt5? ( root7 )
+	root7? ( || ( c++14 c++17 ) )
 	tmva? ( gsl )
 "
 
@@ -116,23 +119,19 @@ RDEPEND="${CDEPEND}
 	xinetd? ( sys-apps/xinetd )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-6.12.04-no-ocaml.patch
 	"${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch
-	"${FILESDIR}"/${PN}-6.13.02-hsimple.patch
 )
 
 pkg_setup() {
 	use fortran && fortran-2_pkg_setup
 	use python && python-single-r1_pkg_setup
 
-	echo
 	elog "There are extra options on packages not yet in Gentoo:"
 	elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
 	elog "HDFS, Monalisa, MaxDB/SapDB, SRP, VecCore."
-	elog "You can use the env variable EXTRA_ECONF variable for this."
+	elog "You can use the environment variable EXTRA_ECONF for this."
 	elog "For example, for Chirp, you would set: "
 	elog "EXTRA_ECONF=\"-Dchirp=ON\""
-	echo
 }
 
 src_prepare() {
@@ -146,25 +145,29 @@ src_prepare() {
 
 # Note: ROOT uses bundled clang because it is patched and API-incompatible
 #       with vanilla clang. The patches enable the C++ interpreter to work.
-#       Since ROOT installs many small files into /etc (~100MB in total),
-#       we install it into another directory to avoid making /etc too big.
+#       Since ROOT installs many files into /etc (~100MB in total) that don't
+#       really belong there, we install it into another directory to avoid
+#       making /etc too big.
 
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_C_FLAGS="${CFLAGS}"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)"
 		-DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)/share/man"
-		-DMCAKE_INSTALL_LIBDIR=$(get_libdir)
+		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
 		-DDEFAULT_SYSROOT="${EPREFIX}"
 		-DLLVM_CONFIG="${EPREFIX%/}/usr/lib/llvm/5/bin/llvm-config"
 		-DCLING_BUILD_PLUGINS=OFF
 		-Dexplicitlink=ON
 		-Dexceptions=ON
 		-Dfail-on-missing=ON
+		-Dgnuinstall=OFF
 		-Dshared=ON
 		-Dsoversion=ON
 		-Dbuiltin_llvm=OFF
+		-Dbuiltin_clang=ON
 		-Dbuiltin_afterimage=OFF
 		-Dbuiltin_cfitsio=OFF
 		-Dbuiltin_davix=OFF
@@ -202,7 +205,9 @@ src_configure() {
 		-Dcling=ON # cling=OFF is broken
 		-Dcocoa=$(usex aqua)
 		-Dcuda=$(usex cuda)
-		-Dcxx14=$(usex root7)
+		-Dcxx11=$(usex c++11)
+		-Dcxx14=$(usex c++14)
+		-Dcxx17=$(usex c++17)
 		-Dcxxmodules=OFF # requires clang, unstable
 		-Ddavix=$(usex davix)
 		-Ddcache=OFF
@@ -218,7 +223,6 @@ src_configure() {
 		-Dglite=OFF # not implemented
 		-Dglobus=OFF
 		-Dgminimal=OFF
-		-Dgnuinstall=OFF
 		-Dgsl_shared=$(usex gsl)
 		-Dgviz=$(usex graphviz)
 		-Dhdfs=OFF
@@ -249,8 +253,8 @@ src_configure() {
 		-Droofit=$(usex roofit)
 		-Droot7=$(usex root7)
 		-Drootbench=OFF
-		-Droottest=$(usex test)
-		-Drpath=ON # needed for multi-slot to work
+		-Droottest=OFF
+		-Drpath=OFF
 		-Druby=OFF # deprecated and broken
 		-Druntime_cxxmodules=OFF # does not work yet
 		-Dr=$(usex R)
@@ -260,7 +264,6 @@ src_configure() {
 		-Dsrp=OFF # not implemented
 		-Dssl=$(usex ssl)
 		-Dtable=$(usex table)
-		-Dtbb=$(usex tbb)
 		-Dtcmalloc=OFF
 		-Dtesting=$(usex test)
 		-Dthread=$(usex threads)
@@ -279,6 +282,12 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+src_compile() {
+	# needed for hsimple.root
+	addwrite /dev/random
+	cmake-utils_src_compile
+}
+
 src_install() {
 	cmake-utils_src_install
 
@@ -310,7 +319,7 @@ src_install() {
 	fi
 
 	if ! use examples; then
-		rm -r test tutorials || die
+		rm -r tutorials || die
 	fi
 
 	if ! use tmva; then
@@ -318,5 +327,5 @@ src_install() {
 	fi
 
 	# clean up unnecessary files from installation
-	rm -r bin/clang* emacs || die
+	rm -r emacs test || die
 }