sci-physics/root: version bump to 6.12.04

Closes: https://bugs.gentoo.org/622034
Closes: https://bugs.gentoo.org/617160
Closes: https://bugs.gentoo.org/599274
Closes: https://bugs.gentoo.org/596290

Package-Manager: Portage-2.3.18, Repoman-2.3.6

4 files changed, 403 insertions, 9 deletions

diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index a4a16721db46..16e83ab4a34b 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,2 +1,3 @@
 DIST root_v5.34.36.source.tar.gz 75427331 BLAKE2B 203af03e1459c7fe079fcb1b30da145b3262f90c074abb7ff8fb3b1b2b90ac24391ce51aa8afbd10e0db8d69549207f15176207bc30a13720e0ae94342a38dfa SHA512 2cc0c8f8b63b2a3ce01c49c41704483548a7324d92c21a63e3e36a00f4d6f5656a7844fdf48cb71a6f2a2c974112527300ffd3bb5502d8365ffaf138e6ae4c7a
 DIST root_v6.04.06.source.tar.gz 99180724 BLAKE2B 96416ff36bd8e3084ca3a89bb73bfd4750f25d1fbe132ffac0288a7bdebf0200e769efc5e7d5a0d138176db67cb7531cd28124d3b7c568028a125d8a79ec7669 SHA512 ac96ac998ed4894587b7d286d79bcbea7b33f15764cc2513ae089e86c584e2dcb064cd135d44a4bfd2bede368eb772ccbffcd6bf426857a1236f5d7e9f5ce6fd
+DIST root_v6.12.04.source.tar.gz 162106020 BLAKE2B f27382cf748d4e31d71b460ecbf9b9f12294fb212bf23dc3d34c98737d8815b2eea2318247e56953ba184bb790bbb2f4b43c675dcb7a02b77c011f19e15d0d83 SHA512 67e400e9e7e8cabfb036a1eb1c262d462f613de7d6e18f8a17109c8eb52932e9ba77e69ab7b1f62c582d06b7f4d020cc888a0dfbefb4d3716743f142c3e3c063
diff --git a/sci-physics/root/files/root-6.11.02-hsimple.patch b/sci-physics/root/files/root-6.11.02-hsimple.patch
new file mode 100644
index 000000000000..c1e88bd55b7d
--- /dev/null
+++ b/sci-physics/root/files/root-6.11.02-hsimple.patch
@@ -0,0 +1,34 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index aa05c02568..ef2b5e3f52 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -354,28 +354,6 @@ add_dependencies(onepcm ${__allTargets})
+ install(FILES ${CMAKE_BINARY_DIR}/etc/allDict.cxx.pch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
+ install(DIRECTORY ${CMAKE_BINARY_DIR}/etc/dictpch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
+ 
+-#---hsimple.root---------(use the executable for clearer dependencies and proper return code)---
+-if(NOT WIN32)
+-add_custom_target(hsimple ALL DEPENDS tutorials/hsimple.root)
+-add_dependencies(hsimple onepcm)
+-if(WIN32)
+-  add_custom_command(OUTPUT tutorials/hsimple.root
+-                     COMMAND set PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} &&
+-                             set ROOTIGNOREPREFIX=1 &&
+-                             $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
+-                     WORKING_DIRECTORY tutorials
+-                     DEPENDS $<TARGET_FILE:root.exe> Cling Hist Tree Gpad Graf HistPainter move_artifacts)
+-else()
+-  add_custom_command(OUTPUT tutorials/hsimple.root
+-                     COMMAND ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}}
+-                             ROOTIGNOREPREFIX=1
+-                             $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
+-                     WORKING_DIRECTORY tutorials
+-                     DEPENDS $<TARGET_FILE:root.exe> Cling Hist Tree Gpad Graf HistPainter move_artifacts)
+-endif()
+-install(FILES ${CMAKE_BINARY_DIR}/tutorials/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
+-endif()
+-
+ #---version--------------------------------------------------------------------------------------
+ if(NOT WIN32)
+ add_custom_target(version COMMAND ${CMAKE_SOURCE_DIR}/build/unix/makeversion.sh ${CMAKE_BINARY_DIR}
+
diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index b621201035fd..1999cbbbd3b1 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -10,28 +10,42 @@
     <name>Gentoo Physics Project</name>
   </maintainer>
   <longdescription lang="en">
-  ROOT Object Oriented Technologies is an object oriented data
-  analysis framework written in C++ by the CERN. Widely used in
-  high energy physics, but also in other data analysis applications. It
-  contains the CINT C/C++ interpreter and many classes such as
-  statistics, serialization, optimization, linear algebra, graphics,
-  GUI toolkit, and a complete visualization framework.
-</longdescription>
+  ROOT is a modular scientific software framework. It provides all the
+  functionality needed to deal with big data processing, statistical analysis,
+  visualisation and storage. It is mainly written in C++ but integrated with
+  other languages such as Python and R. ROOT is widely used in high energy
+  physics, but also in other data analysis applications. It contains the
+  CINT (ROOT 5.x) or cling (ROOT 6.x) C/C++ interpreter and many other
+  classes for statistics, serialization, optimization, linear algebra,
+  graphics, GUI toolkit, and a complete visualization framework.
+  </longdescription>
   <use>
     <flag name="c++11"> Build ROOT using the C++11 standard</flag>
     <flag name="c++14"> Build ROOT using the C++14 standard</flag>
-    <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
+    <flag name="asimage">Enable support for <pkg>media-libs/libafterimage</pkg></flag>
+    <flag name="davix">Enable support for DAVIX Data Management Client (https://cern.ch/davix)</flag>
+    <flag name="fits">Enable support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
+    <flag name="fortran">Compile included Fortran programs</flag>
     <flag name="gdml">Enable GDML writer and reader</flag>
     <flag name="geocad">Enable ROOT-CAD interface using <pkg>sci-libs/opencascade</pkg></flag>
     <flag name="http">Enable http server support including but not limited to fastcgi support</flag>
+    <flag name="jemalloc">Enable support for <pkg>dev-libs/jemalloc</pkg></flag>
+    <flag name="libcxx">Build ROOT against <pkg>sys-libs/libcxx</pkg></flag>
     <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
     <flag name="memstat">Build memory statistics library, helps to detect memory leaks</flag>
+    <flag name="minuit">Build ROOT's internal versions of minuit (fortran) and minuit2 (C++)</flag>
     <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
     <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
+    <flag name="R">Enable support for <pkg>dev-lang/R</pkg></flag>
     <flag name="reflex">Build the reflection database for the C++ interpreter</flag>
+    <flag name="roofit">Build RooFit function fitting package</flag>
+    <flag name="root7">Build experimental features to be released with ROOT 7</flag>
     <flag name="shadow">Enable shadow authentication in rootd and proofd</flag>
     <flag name="table">Build libTable contrib library</flag>
+    <flag name="tbb">Enable implicit multi-threading (IMT) with <pkg>dev-cpp/tbb</pkg></flag>
+    <flag name="tmva">Built TMVA (ROOT's multi-variate analysis toolkit for machine learning)</flag>
+    <flag name="unuran">Enable support for <pkg>sci-mathematics/unuran</pkg></flag>
+    <flag name="vc">Enable support for <pkg>dev-libs/vc</pkg> with VecCore</flag>
     <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
-    <flag name="R">Enable support for <pkg>dev-lang/R</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/sci-physics/root/root-6.12.04.ebuild b/sci-physics/root/root-6.12.04.ebuild
new file mode 100644
index 000000000000..4fb0c10e18f8
--- /dev/null
+++ b/sci-physics/root/root-6.12.04.ebuild
@@ -0,0 +1,345 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_BUILD_TYPE=Release
+FORTRAN_NEEDED="fortran"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit cmake-utils elisp-common eutils fortran-2 python-single-r1 \
+	toolchain-funcs user versionator xdg-utils
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="https://root.cern"
+SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz"
+
+IUSE="+X avahi aqua +asimage davix emacs +examples fits fftw fortran +gdml
+	graphviz +gsl http jemalloc kerberos ldap libcxx +math memstat +minuit
+	mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt4
+	R +roofit root7 shadow sqlite ssl table +tbb test +threads +tiff +tmva
+	+unuran vc xinetd +xml xrootd"
+
+MY_PV="$(get_version_component_range 1-2 ${PV})"
+MY_P="${PN}/$(get_version_component_range 1-2 ${PV})"
+MY_PREFIX=opt/${MY_P}
+
+SLOT="${MY_PV}/$(get_version_component_range 3 ${PV})"
+LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="
+	!X? ( !asimage !opengl !qt4 !tiff )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	pythia6? ( !pythia8 )
+	pythia8? ( !pythia6 )
+	tmva? ( math gsl )
+	davix? ( ssl )
+"
+
+CDEPEND="
+	app-arch/lz4
+	app-arch/xz-utils
+	fortran? ( dev-lang/cfortran )
+	dev-libs/libpcre:3=
+	media-fonts/dejavu
+	media-libs/freetype:2=
+	media-libs/libpng:0=
+	sys-libs/ncurses:=
+	sys-libs/zlib:0=
+	X? (
+		x11-libs/libX11:0=
+		x11-libs/libXext:0=
+		x11-libs/libXft:0=
+		x11-libs/libXpm:0=
+		opengl? (
+			media-libs/ftgl:0=
+			media-libs/glew:0=
+			virtual/opengl
+			virtual/glu
+			x11-libs/gl2ps:0=
+		)
+		qt4? (
+			dev-qt/qtcore:4=
+			dev-qt/qtgui:4=
+			opengl? ( dev-qt/qtopengl:4= )
+		)
+	)
+	asimage? ( || (
+		media-libs/libafterimage[gif,jpeg,png,tiff?]
+		>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?]
+	) )
+	avahi? ( net-dns/avahi[mdnsresponder-compat] )
+	fftw? ( sci-libs/fftw:3.0= )
+	fits? ( sci-libs/cfitsio:0= )
+	graphviz? ( media-gfx/graphviz:0= )
+	gsl? ( sci-libs/gsl )
+	http? ( dev-libs/fcgi:0= )
+	jemalloc? ( dev-libs/jemalloc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:0= )
+	libcxx? ( sys-libs/libcxx )
+	unuran? ( sci-mathematics/unuran:0= )
+	minuit? ( !sci-libs/minuit )
+	mysql? ( virtual/mysql )
+	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql:= )
+	pythia6? ( sci-physics/pythia:6= )
+	pythia8? ( sci-physics/pythia:8= )
+	python? ( ${PYTHON_DEPS} )
+	R? ( dev-lang/R )
+	shadow? ( virtual/shadow )
+	sqlite? ( dev-db/sqlite:3= )
+	ssl? ( dev-libs/openssl:0= )
+	tbb? ( dev-cpp/tbb )
+	vc? ( dev-libs/vc )
+	xml? ( dev-libs/libxml2:2= )
+	xrootd? ( net-libs/xrootd:0= )
+"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}
+	xinetd? ( sys-apps/xinetd )"
+
+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 "For example, for Chirp, you would set: "
+	elog "EXTRA_ECONF=\"-Dchirp=ON\""
+	echo
+
+	enewgroup rootd
+	enewuser rootd -1 -1 /var/spool/rootd rootd
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	epatch \
+        "${FILESDIR}"/${PN}-5.28.00b-glibc212.patch \
+        "${FILESDIR}"/${PN}-5.32.00-afs.patch \
+        "${FILESDIR}"/${PN}-5.32.00-cfitsio.patch \
+        "${FILESDIR}"/${PN}-5.32.00-chklib64.patch \
+        "${FILESDIR}"/${PN}-6.00.01-dotfont.patch \
+		"${FILESDIR}"/${PN}-6.11.02-hsimple.patch
+
+	# make sure we use system libs and headers
+	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
+	rm -r graf2d/asimage/src/libAfterImage || die
+	rm -r graf3d/ftgl/{inc,src} || die
+	rm -r graf2d/freetype/src || die
+	rm -r graf3d/gl/src/gl2ps* || die
+	rm -r graf3d/glew/{inc,src} || die
+	rm -r core/pcre/src || die
+	rm -r math/unuran/src/unuran-*.tar.gz || die
+	rm -r core/lzma/src/*.tar.gz || die
+	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm || die
+
+	# CSS should use local images
+	sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
+}
+
+# Note: ROOT uses bundled LLVM, because it is patched and API-incompatible with system LLVM.
+# Note: ROOT will install many compiler headers and other files into suboptimal places, so
+#       we install it into /opt due to QA concerns over the files installed into <prefix>/etc
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS}"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/${MY_PREFIX}"
+		-Dexplicitlink=ON
+		-Dexceptions=ON
+		-Dfail-on-missing=ON
+		-Dshared=ON
+		-Dsoversion=ON
+		-Dbuiltin_llvm=ON
+		-Dbuiltin_afterimage=OFF
+		-Dbuiltin_cfitsio=OFF
+		-Dbuiltin_davix=$(usex davix) # not in Gentoo yet
+		-Dbuiltin_fftw3=OFF
+		-Dbuiltin_freetype=OFF
+		-Dbuiltin_ftgl=OFF
+		-Dbuiltin_glew=OFF
+		-Dbuiltin_gsl=OFF
+		-Dbuiltin_lzma=OFF
+		-Dbuiltin_pcre=OFF
+		-Dbuiltin_tbb=OFF
+		-Dbuiltin_unuran=OFF
+		-Dbuiltin_vc=OFF
+		-Dbuiltin_xrootd=OFF
+		-Dbuiltin_zlib=OFF
+		-Dx11=$(usex X)
+		-Dxft=$(usex X)
+		# -Dafs=$(usex afs) # option not implemented
+		-Dasimage=$(usex asimage)
+		-Dastiff=$(usex tiff)
+		-Dbonjour=$(usex avahi)
+		-Dlibcxx=$(usex libcxx) # default OFF
+		-Dccache=OFF # use ccache via portage
+		-Dcastor=OFF # default ON
+		-Dchirp=OFF # default ON
+		# -Dcling=$(usex cling) # default ON
+		-Dcocoa=$(usex aqua) # default *
+		-Dcxx14=$(usex root7) # default OFF
+		-Ddavix=$(usex davix) # default *
+		-Ddcache=OFF # $(usex dcache) # default ON
+		-Dfftw3=$(usex fftw) # default ON
+		-Dfitsio=$(usex fits) # default ON
+		-Dfortran=$(usex fortran) # default *
+		-Dgdml=$(usex gdml) # default *
+		-Dgeocad=OFF # default OFF
+		-Dgenvector=$(usex math) # default ON
+		-Dgfal=OFF # $(usex gfal) # default ON
+		-Dglite=OFF #$(usex glite) # default ON (unimplemented option)
+		-Dglobus=OFF #$(usex globus) # default OFF
+		-Dgminimal=OFF # default OFF
+		-Dgnuinstall=OFF # default OFF
+		-Dgsl_shared=$(usex gsl) # default OFF
+		-Dgviz=$(usex graphviz) # default ON
+		-Dhdfs=OFF # $(usex hdfs) # default ON
+		-Dhttp=$(usex http) # default *
+		-Dimt=$(usex tbb) # default OFF
+		-Djemalloc=$(usex jemalloc) # default OFF
+		-Dkrb5=$(usex kerberos) # default ON
+		-Dldap=$(usex ldap) # default ON
+		-Dmathmore=$(usex math) # default ON
+		-Dmemstat=$(usex memstat) # default *
+		#-Dminimal=$(usex minimal) # default OFF
+		-Dminuit=$(usex minuit)
+		-Dminuit2=$(usex minuit) # default * (broken)
+		-Dmonalisa=OFF # default ON
+		-Dmysql=$(usex mysql) # default ON
+		-Dodbc=$(usex odbc) # default ON
+		-Dopengl=$(usex opengl) # default ON
+		-Doracle=$(usex oracle) # default ON
+		-Dpgsql=$(usex postgres) # default ON
+		-Dpythia6=$(usex pythia6) # default ON
+		-Dpythia8=$(usex pythia8) # default ON
+		-Dpython=$(usex python) # default ON
+		-Dqt=$(usex qt4) # default Qt
+		-Dqtgsi=$(usex qt4) # default *
+		-Droofit=$(usex roofit) # default *
+		-Droot7=$(usex root7) # default OFF
+		-Droottest=OFF # default OFF
+		-Druby=OFF # default OFF
+		-Dr=$(usex R) # default OFF
+		-Drfio=OFF # default ON
+		-Drpath=$(usex prefix) # default OFF
+		-Dsapdb=OFF # default ON
+		-Dshadowpw=$(usex shadow) # default ON
+		-Dsqlite=$(usex sqlite) # default ON
+		-Dsrp=OFF # default ON (unimplemented option)
+		-Dssl=$(usex ssl) # default ON
+		-Dtbb=$(usex tbb) # default OFF
+		-Dtable=$(usex table) # default *
+		-Dtcmalloc=OFF # $(usex tcmalloc) # default OFF
+		-Dtesting=$(usex test) # default OFF
+		-Dthread=$(usex threads) # default ON
+		-Dtmva=$(usex tmva) # default ON
+		-Dunuran=$(usex unuran) # default *
+		-Dvc=$(usex vc) # default *
+		-Dvdt=OFF # $(usex math) # default ON
+		-Dxml=$(usex xml) # default ON
+		-Dxrootd=$(usex xrootd) # default ON
+		${EXTRA_ECONF}
+	)
+
+	if use oracle ; then
+			mycmakeargs+=(
+				-DORACLE_PATH_INCLUDES="${ORACLE_HOME}/include"
+				-DORACLE_PATH_LIB="${ORACLE_HOME}/$(get_libdir)"
+			)
+	fi
+
+	cmake-utils_src_configure
+}
+
+daemon_install() {
+	local daemons="rootd proofd"
+	dodir /var/spool/rootd
+	fowners rootd:rootd /var/spool/rootd
+	dodir /var/spool/rootd/{pub,tmp}
+	fperms 1777 /var/spool/rootd/{pub,tmp}
+
+	local i
+	for i in ${daemons}; do
+		newinitd "${FILESDIR}"/${i}.initd ${i}
+		newconfd "${FILESDIR}"/${i}.confd ${i}
+	done
+	if use xinetd; then
+		insinto /etc/xinetd
+		doins "${BUILD_DIR}"/etc/daemons/{rootd,proofd}.xinetd
+	fi
+}
+
+desktop_install() {
+	pushd "${S}" > /dev/null
+	echo "Icon=root-system-bin" >> etc/root.desktop
+	domenu etc/root.desktop
+	doicon build/package/debian/root-system-bin.png
+
+	insinto /usr/share/icons/hicolor/48x48/mimetypes
+	doins build/package/debian/application-x-root.png
+
+	insinto /usr/share/icons/hicolor/48x48/apps
+	doicon build/package/debian/root-system-bin.xpm
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# root fails without this symlink, because it looks only into lib
+	[[ -d lib ]] || dosym $(get_libdir) /${MY_PREFIX}/lib
+
+	use emacs && elisp-install ${PN} "${BUILD_DIR}"/root-help.el
+
+	echo "PATH=${EPREFIX}/${MY_PREFIX}/bin" > 99root || die
+	echo "LDPATH=${EPREFIX}/${MY_PREFIX}/$(get_libdir)" >> 99root || die
+
+	if use pythia8; then
+		echo "PYTHIA8=${EPREFIX}/usr" >> 99root || die
+	fi
+
+	if use python; then
+		echo "PYTHONPATH=${EPREFIX}/${MY_PREFIX}/lib" >> 99root
+		python_optimize "${ED}/${MY_PREFIX}/lib"
+	fi
+
+	doenvd 99root
+
+	daemon_install
+	desktop_install
+
+	pushd "${ED}" > /dev/null
+	rm -r ${MY_PREFIX}/{config,emacs,etc/vmc,fonts} || die
+
+	if ! use examples; then
+		rm -r ${MY_PREFIX}/{test,tutorials} || die
+	fi
+
+	if use tmva; then
+		rm -r ${MY_PREFIX}/tmva || die
+	fi
+
+	# do not copress files used by ROOT's CLI (.credit, .demo, .license)
+	docompress -x "${MY_PREFIX}/README/CREDITS"
+	use examples && docompress -x "${MY_PREFIX}/tutorials"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}