gentoo Easter resync : 12.04.2020

8 files changed, 342 insertions, 14 deletions

diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index e34d44b094c1..453fd24b345a 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -9,9 +9,11 @@ DIST root_v6.12.06.source.tar.gz 162284452 BLAKE2B 944b5e899677bab40842d7ec969ff
 DIST root_v6.14.08.source.tar.gz 162474562 BLAKE2B f8bfdabb4d91bbdfbab0b17626fff1f8aa265292996d857025cbd1543306f3ec540a1afb080788bfc7149ea835932b59d7c54dcd802354e31294ba2e5e9d2366 SHA512 827e39efbf3c69429a0a256127ca9f87550d9084c34c715bddccbf87a8c111c367b9a0ac6882aac747c9b48f4a3effb3747b4df567429910c93ee64dfe35df5b
 DIST root_v6.16.00.source.tar.gz 164836293 BLAKE2B 9d8f02631bdc1fa1775cbdaf50dd1feacd9b3c86b81d679ba6f0ca3c5787cd1d22ef7c33358b608361a01ad4f0aff3e8c749649d24773a35c52ce87f808d08f5 SHA512 17e5b9815973773e30ff83c2f4028e9e93691c1ecb824c162c8b3e02d1f6666fb8e0b72a5d0652a90032af146d92d271cbffcd634fb6fe6a63bdf46d672789bf
 DIST root_v6.18.04.source.tar.gz 165938450 BLAKE2B d6545dfa95817940f2bb6b5b49252eca1958df518a4bc05c4857df60a015a39d0df09ea077465533e6ebc815d04e1742da19d18b7af02b5446f9e73dc92e3c16 SHA512 cfcbdd2db4edf55845a7cd1e6ec0cdf714a7ceacb039fa6fb627d7300d6f849b3b462bab724e33b1d6b08eb22ba42c43b7d64c0c6c47dc8a3bb652f86979f2c6
-EBUILD root-6.12.06-r11.ebuild 7937 BLAKE2B c714478a834736759af8b45ecaecf25935a8f0c39611b8f444c3620a9ab5d6616496b465b2a4f090b969a224f6bee19f3771164fb8942772ffbb29feb6a97a78 SHA512 d54b1783df85f19843831e254ffaef65f774fe5694864f8afb7446950ead97626037b250b03bb1ae128a3032bc1d13f79e2f3562fea3c1a05185ac40686763bf
-EBUILD root-6.14.08-r4.ebuild 8179 BLAKE2B aa0d28a4289a32c44032abc5a8a8916458c3291b547fe117efa7505af69fef580f1c1125b1c7a5a80d7622fcb6d5398787bb0e8d2350a110968581cc428547ab SHA512 215d5ca967f6a97f99a333eebc3f3ad909ecfdfeadf930b9ed4491eb626c7cb93ba7990cab74152a58c173e9c8f8e4e302c535788609e97dd6b38d7fe9698392
-EBUILD root-6.16.00-r4.ebuild 8155 BLAKE2B cf9596fd9e1b00be23ca6381494940536f08b3e685c87f3e0df8c2ddd01b716caecd8a53920037a70d2beea3e366619428d074ea6b5c81da6bd2dd1fb8a9911f SHA512 20a0a8c0a7e9029a9f6bf3a77ccfe3044c609a9370fad28225c8d2bc512b3e055d4f2a693730525d0bf35dfd4932cf38f5552a8d4661207f9c380597c65344fc
-EBUILD root-6.18.04-r1.ebuild 7573 BLAKE2B dcdc80a9aa32512cdea024b353bb883ec725a66a061f773eec51c3cf9c573e081d973f8f1d075d14cd7b6589be7c81968534f736cc510c7bb4ad89e49ab6335d SHA512 cb79923444573ea40bc56c14973d627eb14bab6b0ca1f07d123436bc96e2a10186441dc9491c9fb1571bb62d12ee85ece7ce728c01e77048a149154b962397c3
-EBUILD root-9999.ebuild 7549 BLAKE2B 7924fb2eabefc21bbc59d102f058cd71dfd279cca3b7fa06480b35a99d6149debb436230960251f070e19e6e5938b84411f54c9a1f789884deee378f912d97e3 SHA512 21e39143f3ff1898c64c75a8e3aa625132e490398e8b706b853b94370c3abb32013f62a6cddf9864f3d2234243a78628db99beba27b7d9b11b9c5fa0050491ac
-MISC metadata.xml 3218 BLAKE2B f23175b1a5998bbecdcdb6e5f42d08bd8e16aaeee79f43d30e0906977f389e18a19ddceeba24009360c2f717c29162c8e30b807bda993492f27429802dc62883 SHA512 d3bdc5bce1d1ac904e5a7a9f21bca65deb480ecbd1362a3251c93e09ab07fdcdd6dfd8900e62df3853b7e200880850d9010122500a081fdedb6b43adae25a6bd
+DIST root_v6.20.04.source.tar.gz 168056076 BLAKE2B 814bf74f5a18adf2605954068962d3283504538118d221f55e030b224e09c9542a544c166a317ad981a84d4a1edc48bbfc76a57acd43aefb779d8e27270c4aeb SHA512 3cc214a4b160795c8aa53b6fdb01370c3aea628696d1668cbf47e6beac56f171674619a853a1219336d9b67ad06db1d9ecd13345bf1731f809da9e60b3d39a2c
+EBUILD root-6.12.06-r12.ebuild 7938 BLAKE2B 6d4c212935a3e876cfdd0bf450492bbddca396c335dfee0b83cc107d7d5fa2edddb40578c56317e794935a642a8eeb3f0cf8e4bf40cd582c7583ce121573eac8 SHA512 f8e4ac626f7036c6c105e9a8f766c42953e16061e86500ef3887d4358436adc66c4d7963b9b770d3a2441aec9cf919b70573029300a244336596689b2edf6fc0
+EBUILD root-6.14.08-r5.ebuild 8211 BLAKE2B abd4273edb6018bb2f8bd9b2c5ced07a8d2456f5c3d8d0454001effa131cfe69b64f49aa34066158cca51d7ee39a1f863529c2987c804959a00cc521aee8b5fb SHA512 31b3a3fc8eb88a8748b9bc94ca722dfb6ffe2d992c950bcf9ca7c5e50a3f657ecdea2b29c0a853d9a72e42645605b3909136a52f813f73d52de590747b937296
+EBUILD root-6.16.00-r5.ebuild 8187 BLAKE2B c43fd82834bbcdbbc1fcb1222d0224c21634fff50a442aa6a000661869dc59bea3d44966e027b346823fc3eeab179fa3d7cd9ab4242242623175a8067ce3fb0c SHA512 b9572e4ffcfe9419a6ea9d01fbedc4baf176d52a41d1346480c033ee6ccca89f8897145e369cb6aa4f7a8aa3dc7d57e2e6a70cfa8e50d43a9673be8e90138cac
+EBUILD root-6.18.04-r2.ebuild 7605 BLAKE2B 29c1e60bad000788106a9144f06160c2809d102fbda9c7caeced46d889ae1b59d763b8be856c62ca6e21f603a4731a6fff8c8847cf15cddaedb822482ae940c6 SHA512 bdc1470a84f031788c463f93115e2f602480cf6422057747b5df298fd59439c42e5c868ed2c5ae421a73d2132b477a5084e4d9e3b693afa72768e607280c94fb
+EBUILD root-6.20.04.ebuild 7617 BLAKE2B 9b3bf2fbc81c49b45a5274d2066c06b33c1f67a57a4afd3c0b5749fc549e8849aab2caa0a2183b26c32e068ea38483081ee827ece28b0f786e529f8adcacb160 SHA512 1010c53f2bfa1f6a9d6cbf62ade88d5ff1112d91dc9934d7c07f828e01edd4f6384699461ccd2c2a2e9223ad84163a36103a7f7981aca4b257cfa05f4d688bd3
+EBUILD root-9999.ebuild 8021 BLAKE2B 39b70c2fcffd785a4a6e9d95717fbbe46af6dc729f1b2ce34f56b2295144ba3f7e1ebadd9d009ec89e4411123977550b048e95395ee933ce1edfee43f029f166 SHA512 ed05ee62a2f1c92dc5816381a7eb59c777f2973e757ed3c5acc640496e8eb4e6b45ab0034d39564be923ee38caa06883c63abaf5484089935a67fbd3a4f395b5
+MISC metadata.xml 3288 BLAKE2B e61573d67396a1c102c3f92036dbd0d1f601d383ec7e806ece97eb1ab026ee05e99f36acf98261455c8213868526bb3119c502bc837654787c663bfc9b205c84 SHA512 2f26ec7cde49879c23c56b8a860471e7c3da6b4cb0ee8c36f00d352547115fecc81cd2f1344a021e5d4895996e8744b7f6fcee3d478b901e149513fba50086c6
diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 8eb44b130ef3..e20aca48cc14 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -25,6 +25,7 @@
     <flag name="c++14">Build using the C++14 standard</flag>
     <flag name="c++17">Build using the C++17 standard</flag>
     <flag name="cuda">Enable support for nVidia CUDA</flag>
+    <flag name="cudnn">Enable support for nVidia cuDNN library</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>
diff --git a/sci-physics/root/root-6.12.06-r11.ebuild b/sci-physics/root/root-6.12.06-r12.ebuild
index d49c467555c2..8aec2963b96b 100644
--- a/sci-physics/root/root-6.12.06-r11.ebuild
+++ b/sci-physics/root/root-6.12.06-r12.ebuild
@@ -86,7 +86,7 @@ CDEPEND="
 	pythia8? ( sci-physics/pythia:8= )
 	python? ( ${PYTHON_DEPS} )
 	R? ( dev-lang/R )
-	shadow? ( virtual/shadow )
+	shadow? ( sys-apps/shadow )
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? ( dev-libs/openssl:0= )
 	tbb? ( dev-cpp/tbb )
diff --git a/sci-physics/root/root-6.14.08-r4.ebuild b/sci-physics/root/root-6.14.08-r5.ebuild
index 86b2044fd24f..70ca03aa303c 100644
--- a/sci-physics/root/root-6.14.08-r4.ebuild
+++ b/sci-physics/root/root-6.14.08-r5.ebuild
@@ -91,7 +91,7 @@ CDEPEND="
 	pythia8? ( sci-physics/pythia:8 )
 	python? ( ${PYTHON_DEPS} )
 	R? ( dev-lang/R )
-	shadow? ( virtual/shadow )
+	shadow? ( sys-apps/shadow )
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? ( dev-libs/openssl:0= )
 	tbb? ( >=dev-cpp/tbb-2018 )
@@ -128,6 +128,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	use cuda && cuda_src_prepare
+
 	cmake-utils_src_prepare
 
 	sed -i "/CLING_BUILD_PLUGINS/d" interpreter/CMakeLists.txt || die
diff --git a/sci-physics/root/root-6.16.00-r4.ebuild b/sci-physics/root/root-6.16.00-r5.ebuild
index aa5745011f80..856ea9fb1061 100644
--- a/sci-physics/root/root-6.16.00-r4.ebuild
+++ b/sci-physics/root/root-6.16.00-r5.ebuild
@@ -91,7 +91,7 @@ CDEPEND="
 	pythia8? ( sci-physics/pythia:8 )
 	python? ( ${PYTHON_DEPS} )
 	R? ( dev-lang/R )
-	shadow? ( virtual/shadow )
+	shadow? ( sys-apps/shadow )
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? ( dev-libs/openssl:0= )
 	tbb? ( >=dev-cpp/tbb-2018 )
@@ -127,6 +127,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	use cuda && cuda_src_prepare
+
 	cmake-utils_src_prepare
 
 	sed -i "/CLING_BUILD_PLUGINS/d" interpreter/CMakeLists.txt || die
diff --git a/sci-physics/root/root-6.18.04-r1.ebuild b/sci-physics/root/root-6.18.04-r2.ebuild
index 89beda36d2b8..56da96833767 100644
--- a/sci-physics/root/root-6.18.04-r1.ebuild
+++ b/sci-physics/root/root-6.18.04-r2.ebuild
@@ -87,7 +87,7 @@ CDEPEND="
 	pythia8? ( sci-physics/pythia:8 )
 	python? ( ${PYTHON_DEPS} )
 	R? ( dev-lang/R )
-	shadow? ( virtual/shadow )
+	shadow? ( sys-apps/shadow )
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? ( dev-libs/openssl:0= )
 	tbb? ( >=dev-cpp/tbb-2018 )
@@ -121,6 +121,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	use cuda && cuda_src_prepare
+
 	cmake-utils_src_prepare
 
 	sed -i "/CLING_BUILD_PLUGINS/d" interpreter/CMakeLists.txt || die
diff --git a/sci-physics/root/root-6.20.04.ebuild b/sci-physics/root/root-6.20.04.ebuild
new file mode 100644
index 000000000000..07d451fd7159
--- /dev/null
+++ b/sci-physics/root/root-6.20.04.ebuild
@@ -0,0 +1,304 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ninja does not work due to fortran
+CMAKE_MAKEFILE_GENERATOR=emake
+FORTRAN_NEEDED="fortran"
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+
+inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
+	prefix python-single-r1 toolchain-funcs
+
+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 aqua +asimage +c++11 c++14 c++17 cuda cudnn +davix debug emacs
+	+examples fits fftw fortran +gdml graphviz +gsl http libcxx +minuit
+	mpi mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python
+	qt5 R +roofit root7 shadow sqlite +ssl +tbb test +tmva +unuran vc
+	vmc +xml xrootd"
+RESTRICT="!test? ( test )"
+
+SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
+LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="
+	^^ ( c++11 c++14 c++17 )
+	cuda? ( tmva !c++17 )
+	cudnn? ( cuda )
+	!X? ( !asimage !opengl !qt5 )
+	davix? ( ssl xml )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	qt5? ( root7 )
+	root7? ( || ( c++14 c++17 ) )
+	tmva? ( gsl )
+"
+
+CDEPEND="
+	app-arch/lz4
+	app-arch/zstd
+	app-arch/xz-utils
+	fortran? ( dev-lang/cfortran )
+	dev-libs/libpcre:3
+	dev-libs/xxhash
+	media-fonts/dejavu
+	media-libs/freetype:2
+	media-libs/libpng:0=
+	sys-libs/ncurses:=
+	sys-libs/zlib
+	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=
+		)
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtwebengine:5[widgets]
+		)
+	)
+	asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
+	cudnn? ( dev-libs/cudnn )
+	davix? ( net-libs/davix )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	fftw? ( sci-libs/fftw:3.0= )
+	fits? ( sci-libs/cfitsio:0= )
+	graphviz? ( media-gfx/graphviz )
+	gsl? ( sci-libs/gsl:= )
+	http? ( dev-libs/fcgi:0= )
+	libcxx? ( sys-libs/libcxx )
+	unuran? ( sci-mathematics/unuran:0= )
+	minuit? ( !sci-libs/minuit )
+	mpi? ( virtual/mpi )
+	mysql? ( dev-db/mysql-connector-c )
+	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? ( sys-apps/shadow )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl:0= )
+	tbb? ( >=dev-cpp/tbb-2018 )
+	tmva? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	vc? ( dev-libs/vc:= )
+	xml? ( dev-libs/libxml2:2= )
+	xrootd? ( net-libs/xrootd:0= )
+"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch
+)
+
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+
+	elog "There are extra options on packages not available in Gentoo."
+	elog "You can use the environment variable EXTRA_ECONF to enable"
+	elog "these packages. For example, for Vdt you would set:"
+	elog "EXTRA_ECONF=\"-Dbuiltin_vdt=ON -Dvdt=ON\""
+}
+
+src_prepare() {
+	use cuda && cuda_src_prepare
+
+	cmake-utils_src_prepare
+
+	sed -i "/CLING_BUILD_PLUGINS/d" interpreter/CMakeLists.txt || die
+
+	# CSS should use local images
+	sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
+}
+
+# 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 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_COMPILER=$(tc-getCC)
+		-DCMAKE_CXX_COMPILER=$(tc-getCXX)
+		-DCMAKE_CUDA_HOST_COMPILER=$(tc-getCXX)
+		-DCMAKE_C_FLAGS="${CFLAGS}"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+		-DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
+		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
+		-DCMAKE_INSTALL_LIBDIR="lib"
+		-DDEFAULT_SYSROOT="${EPREFIX}"
+		-DCLING_BUILD_PLUGINS=OFF
+		-Dexplicitlink=ON
+		-Dexceptions=ON
+		-Dfail-on-missing=ON
+		-Dgnuinstall=OFF
+		-Dshared=ON
+		-Dsoversion=ON
+		-Dbuiltin_llvm=ON
+		-Dbuiltin_clang=ON
+		-Dbuiltin_afterimage=OFF
+		-Dbuiltin_cfitsio=OFF
+		-Dbuiltin_davix=OFF
+		-Dbuiltin_fftw3=OFF
+		-Dbuiltin_freetype=OFF
+		-Dbuiltin_ftgl=OFF
+		-Dbuiltin_gl2ps=OFF
+		-Dbuiltin_glew=OFF
+		-Dbuiltin_gsl=OFF
+		-Dbuiltin_lz4=OFF
+		-Dbuiltin_lzma=OFF
+		-Dbuiltin_openssl=OFF
+		-Dbuiltin_pcre=OFF
+		-Dbuiltin_tbb=OFF
+		-Dbuiltin_unuran=OFF
+		-Dbuiltin_vc=OFF
+		-Dbuiltin_vdt=OFF
+		-Dbuiltin_veccore=OFF
+		-Dbuiltin_xrootd=OFF
+		-Dbuiltin_xxhash=OFF
+		-Dbuiltin_zlib=OFF
+		-Dbuiltin_zstd=OFF
+		-Dx11=$(usex X)
+		-Dalien=OFF
+		-Darrow=OFF
+		-Dasimage=$(usex asimage)
+		-Dlibcxx=$(usex libcxx)
+		-Dccache=OFF # use ccache via portage
+		-Dcefweb=OFF
+		-Dclad=OFF
+		-Dcocoa=$(usex aqua)
+		-Dcuda=$(usex cuda)
+		-Dcudnn=$(usex cudnn)
+		-Dcxxmodules=OFF # requires clang, unstable
+		-Ddavix=$(usex davix)
+		-Ddataframe=ON
+		-Ddcache=OFF
+		-Dfcgi=$(usex http)
+		-Dfftw3=$(usex fftw)
+		-Dfitsio=$(usex fits)
+		-Dfortran=$(usex fortran)
+		-Dftgl=$(usex opengl)
+		-Dgdml=$(usex gdml)
+		-Dgfal=OFF
+		-Dgl2ps=$(usex opengl)
+		-Dgminimal=OFF
+		-Dgsl_shared=$(usex gsl)
+		-Dgviz=$(usex graphviz)
+		-Dhttp=$(usex http)
+		-Dimt=$(usex tbb)
+		-Dmathmore=$(usex gsl)
+		-Dmemstat=OFF # deprecated
+		-Dminimal=OFF
+		-Dminuit2=$(usex minuit)
+		-Dminuit=$(usex minuit)
+		-Dmlp=$(usex tmva)
+		-Dmonalisa=OFF
+		-Dmpi=$(usex mpi)
+		-Dmysql=$(usex mysql)
+		-Dodbc=$(usex odbc)
+		-Dopengl=$(usex opengl)
+		-Doracle=$(usex oracle)
+		-Dpgsql=$(usex postgres)
+		-Dpythia6=$(usex pythia6)
+		-Dpythia8=$(usex pythia8)
+		-Dpyroot=$(usex python) # python was renamed to pyroot
+		-Dpyroot_experimental=OFF # use standard PyROOT for now
+		-Dqt5web=$(usex qt5)
+		-Droofit=$(usex roofit)
+		-Droot7=$(usex root7)
+		-Drootbench=OFF
+		-Droottest=OFF
+		-Drpath=OFF
+		-Druntime_cxxmodules=OFF # does not work yet
+		-Dr=$(usex R)
+		-Dshadowpw=$(usex shadow)
+		-Dsqlite=$(usex sqlite)
+		-Dssl=$(usex ssl)
+		-Dtcmalloc=OFF
+		-Dtesting=$(usex test)
+		-Dtmva=$(usex tmva)
+		-Dtmva-cpu=$(usex tmva)
+		-Dtmva-gpu=$(usex cuda)
+		-Dunuran=$(usex unuran)
+		-Dvc=$(usex vc)
+		-Dvmc=$(usex vmc)
+		-Dvdt=OFF
+		-Dveccore=OFF
+		-Dxml=$(usex xml)
+		-Dxrootd=$(usex xrootd)
+		${EXTRA_ECONF}
+	)
+
+	CMAKE_BUILD_TYPE=$(usex debug Debug Release) \
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# needed for hsimple.root
+	addwrite /dev/random
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	ROOTSYS=${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)
+	ROOTENV="$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)"
+
+	cat > ${ROOTENV} <<- EOF || die
+	MANPATH="${ROOTSYS}/share/man"
+	PATH="${ROOTSYS}/bin"
+	ROOTPATH="${ROOTSYS}/bin"
+	LDPATH="${ROOTSYS}/lib"
+	EOF
+
+	if use python; then
+		echo "PYTHONPATH=\"${ROOTSYS}/lib\"" >> ${ROOTENV} || die
+	fi
+
+	doenvd ${ROOTENV}
+
+	if use emacs; then
+		elisp-install ${PN}-$(ver_cut 1-2) "${BUILD_DIR}"/root-help.el
+	fi
+
+	pushd "${D}/${ROOTSYS}" > /dev/null
+
+	rm -r emacs bin/*.{csh,sh,fish} || die
+
+	if ! use examples; then
+		rm -r tutorials || die
+	fi
+
+	# create versioned symlinks for binaries
+	cd bin;
+	for exe in *; do
+		dosym "${exe}" "/usr/lib/${PN}/$(ver_cut 1-2)/bin/${exe}-$(ver_cut 1-2)"
+	done
+}
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 53b2390393ae..60e7f05e2b16 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -14,9 +14,9 @@ inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="https://root.cern"
 
-IUSE="+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs
+IUSE="+X aqua +asimage +c++11 c++14 c++17 cuda cudnn +davix debug emacs
 	+examples fits fftw fortran +gdml graphviz +gsl http libcxx +minuit
-	mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python
+	mpi mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python
 	qt5 R +roofit root7 shadow sqlite +ssl +tbb test +tmva +unuran vc
 	vmc +xml xrootd"
 RESTRICT="!test? ( test )"
@@ -41,6 +41,7 @@ LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
 REQUIRED_USE="
 	^^ ( c++11 c++14 c++17 )
 	cuda? ( tmva !c++17 )
+	cudnn? ( cuda )
 	!X? ( !asimage !opengl !qt5 )
 	davix? ( ssl xml )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -81,6 +82,7 @@ CDEPEND="
 	)
 	asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] )
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
+	cudnn? ( dev-libs/cudnn )
 	davix? ( net-libs/davix )
 	emacs? ( >=app-editors/emacs-23.1:* )
 	fftw? ( sci-libs/fftw:3.0= )
@@ -91,6 +93,7 @@ CDEPEND="
 	libcxx? ( sys-libs/libcxx )
 	unuran? ( sci-mathematics/unuran:0= )
 	minuit? ( !sci-libs/minuit )
+	mpi? ( virtual/mpi )
 	mysql? ( dev-db/mysql-connector-c )
 	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
 	oracle? ( dev-db/oracle-instantclient-basic )
@@ -99,7 +102,7 @@ CDEPEND="
 	pythia8? ( sci-physics/pythia:8 )
 	python? ( ${PYTHON_DEPS} )
 	R? ( dev-lang/R )
-	shadow? ( virtual/shadow )
+	shadow? ( sys-apps/shadow )
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? ( dev-libs/openssl:0= )
 	tbb? ( >=dev-cpp/tbb-2018 )
@@ -133,6 +136,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	use cuda && cuda_src_prepare
+
 	cmake-utils_src_prepare
 
 	sed -i "/CLING_BUILD_PLUGINS/d" interpreter/CMakeLists.txt || die
@@ -149,6 +154,9 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_C_COMPILER=$(tc-getCC)
+		-DCMAKE_CXX_COMPILER=$(tc-getCXX)
+		-DCMAKE_CUDA_HOST_COMPILER=$(tc-getCXX)
 		-DCMAKE_C_FLAGS="${CFLAGS}"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
 		-DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
@@ -187,6 +195,7 @@ src_configure() {
 		-Dbuiltin_xrootd=OFF
 		-Dbuiltin_xxhash=OFF
 		-Dbuiltin_zlib=OFF
+		-Dbuiltin_zstd=OFF
 		-Dx11=$(usex X)
 		-Dalien=OFF
 		-Darrow=OFF
@@ -197,9 +206,12 @@ src_configure() {
 		-Dclad=OFF
 		-Dcocoa=$(usex aqua)
 		-Dcuda=$(usex cuda)
+		-Dcudnn=$(usex cudnn)
 		-Dcxxmodules=OFF # requires clang, unstable
 		-Ddavix=$(usex davix)
+		-Ddataframe=ON
 		-Ddcache=OFF
+		-Dfcgi=$(usex http)
 		-Dfftw3=$(usex fftw)
 		-Dfitsio=$(usex fits)
 		-Dfortran=$(usex fortran)
@@ -219,6 +231,7 @@ src_configure() {
 		-Dminuit=$(usex minuit)
 		-Dmlp=$(usex tmva)
 		-Dmonalisa=OFF
+		-Dmpi=$(usex mpi)
 		-Dmysql=$(usex mysql)
 		-Dodbc=$(usex odbc)
 		-Dopengl=$(usex opengl)
@@ -226,7 +239,9 @@ src_configure() {
 		-Dpgsql=$(usex postgres)
 		-Dpythia6=$(usex pythia6)
 		-Dpythia8=$(usex pythia8)
-		-Dpython=$(usex python)
+		-Dpyroot=$(usex python) # python was renamed to pyroot
+		-Dpython=$(usex python) # kept for backward compatibility
+		-Dpyroot_experimental=OFF # use standard PyROOT for now
 		-Dqt5web=$(usex qt5)
 		-Droofit=$(usex roofit)
 		-Droot7=$(usex root7)