gentoo resync : 24.12.2018

12 files changed, 432 insertions, 163 deletions

diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 191772a26568..65b0d61e596e 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,17 +1,15 @@
-AUX proofd.confd 415 BLAKE2B ca38b3d9cf27cd3c4a57f595741abf40691a300585d35a6c1bfbad936476ec4cc633edbb4b1c3e6ea37b4bc2f8744c977d02142078faed83e89ae645e6ee9624 SHA512 5aa6e6313cf159d2b407286a15f7f959d966a7e9b74bd2a74f13bd3fe01c04d99b46b5fb55f4a7434ebe911cd8b6469657d96591d624a7bfc7d39d49ab62b900
-AUX proofd.initd 606 BLAKE2B 60c7ec90b68b8b1add38c81f7730859a8bc9528ac60ed41713309c3a4931af193cc9f90ab1265f8f174e5a73fbcbfc3855cc3fdb253ce2d09a75f4032efbb8c8 SHA512 de72ea4ea106ab6ec4cc892c2eaf1b17f85db3de9dbfe85d34678678268c943868e4698a1a046e51b5694f03109cb06484b90aea83cf2728229a065f35c3d165
 AUX root-6.11.02-hsimple.patch 1838 BLAKE2B e5d4a2a04580c1ebe4e1da4cf615939347bcf24003c240870252938421f189e5da3ffc4a913c2241fe93f78077373ac0614bd85d32c33ba0da2203fa906f520a SHA512 3ded889d7a79070d78824bbea059f6451c96d95ac7c45063b2328856111e3dd28677dfd9a0696d0d5cbbe200690ed3f940341966847745c4bcf2f7e235135e5b
 AUX root-6.12.04-no-ocaml.patch 1631 BLAKE2B 808da46144572073e6fac54859a60a9f056e164a4f31718f2962197f162ced11a6f1e9839af50d1d9c720dc0e2811f9eabef4901dfbe0c14d055315abf9dcdad SHA512 37d78c57b05a20088794cf887d60514c932b6b11b2a918b4b2621700be281df80adf3f17d76da17a146e4e941bf472a0a1ddcbbf14406e5d49bd3b8e4dbf3c50
 AUX root-6.12.04-no-opengl.patch 763 BLAKE2B 7f93aac3941dd5906768cd07c87a421137de2d21531d24b6e9e9d6c1182bbc2c8aea20a2c8a79415633cc41018ac8e979689277e4b96923df3e0518d5abae95e SHA512 cd4dbeb8e0a253ce664b489238a84535ab4c0e96d52b995965354ba4cd0f19b2a2783dad72ab3a3d0935744acf64f1f82c804f3bebe2203cd891dda8c6b40b8f
 AUX root-6.12.04-z3.patch 1155 BLAKE2B 31d099bb260a030d88fcfbe0c9c5a7953738619b216da4140e087b29fead0bfd05bd22aa75da99521689decfb54caa23e0b50a9be9c34fe2fd75596b99b13092 SHA512 ca82ed6f3a0eb9e0ae13a0c354eab0a7c9c18e93ef444418f5786decdd8600184a6c2d5deb6d54d1a852076988645a0fbd215459cd15f5569f54606d74ee3e18
 AUX root-6.12.06_cling-runtime-sysroot.patch 989 BLAKE2B 8202cc8f2bf72cc25642d0a03ba26c3969069b291a6a22188879dbedbf0c3c496149f79f671d0eb51d81d0ee36565660d136b4741f5d018c2b05325ff08381f0 SHA512 c96dee9843da1051c54bd6870ef0a04714944ffe1f86800c9a51b8eb8ef84107d3315d3a708dcc0b651248af4bec362c7f31695514505045aeda9c793d40dc58
 AUX root-6.13.02-hsimple.patch 1694 BLAKE2B 877304f0c51c34645d1c6fb1814e9914539351775c3de6dc621080e469047cd634a95095c083a633ee2c793f79bcb90e0966e607a9f620cb34d807dea9be4c14 SHA512 6533ed9f7402da534d76a39e9536c97245430148ffea0634937e16e483919532f8810049a1358d3268ba9f7a7ee71ddc7d96772b390db582a6342508dd4e3e1d
-AUX root-6.14.00-http.patch 1130 BLAKE2B b2967a7e2a56d3989ebbcc84d82aa0395708ff8988bb866fb1e2e277383f82ef037fc7df1c84bda1cb2c25eb02f8f15fb0e130d378202718b20d3bb1e634b512 SHA512 e7e78f3fb54f5bd7dedc8371d3120ba178cad16880a77239ae1504f0e502f1464f36fa4c2668a99891d8ff63b14cb18318e361b61a9948ce3d0950a123f0976b
-AUX rootd.confd 199 BLAKE2B d7638f5ee8ccb4fcb428d07c59d776a9ab8773fa8a8911281e8f76b32fab5902e3f6f6086ad210af39480df514c947719cc5e76d29c7dbf2a8715ae58ef49880 SHA512 2ce6753d37a7f22cc3656f110f802b8e07c1469bfe4524606c1472369352f8c584c01c716760252fab40369470b72d8c77cdbb2d52126c39371faaf597bf58d8
-AUX rootd.initd 622 BLAKE2B 7edeaf3cf550303642a89eb69edb65e6625215ac2daae5766904bcc14f1b30f6277c6eac6b895f46fbda01656df80cb71fdad6294a19bf581badceaa29278fdf SHA512 fde858a37b52540285d228e52845c963b18065a250aef0753f469753d541f577ac401f01438297c030e47176350bb23c3c0280c9b4ccbc1feda3313ab7c9be2e
+AUX root-6.14.06-oracle.patch 666 BLAKE2B 8ca54fa3d6d836805a88f3ff713e34c1d5db8ffabe4eab7d213d4e0d6a3750cbe0bc8fd14e40ff98f3a4a225b641ebfc6abcf0d34034f90718b0567935bb0209 SHA512 095678f4b3e277cf9b3cd64e0811e20d9c486f2ed524792e55b087441e652ea7b9ee9c2358319ae2be6e4b35828873669d5b9c89f61d68aaa76db62abc4c5a46
 DIST root_v6.12.06.source.tar.gz 162284452 BLAKE2B 944b5e899677bab40842d7ec969ff08cfa470e63be9a02b948a49ae088e8da72ce433a5071d9196bfd98f71e6861b1bda285354012620eee6c61cffcee71a0c8 SHA512 3d44749ccfc3d40a2f516ae53ef40fb244ed785eee0dbc18ff822bbb811a15b943039d30282ef5358a283d485e62531880c877ec77a86089503b06d6f37e42e1
-DIST root_v6.14.04.source.tar.gz 162451369 BLAKE2B c7af9cf18736c900f71c35b7f9df91784058406c738ac49cf93aa6d1caee13b79e1f68be53ea600fc7311a5af76207f9de71f8438bf6eb43681c93f1815b39a7 SHA512 eb8f3fe89f70b222962ecec7bb7a1ff107dd600bc7ad63cbefc5d4e00561cc80b6430da90d1e59f70dbff69158929eec54614bb5df9894d342482b41c051353f
-EBUILD root-6.12.06-r7.ebuild 7895 BLAKE2B 1edf90da948b0c3165624648f2679b602569d52484e6c49100d7e8834ff91ce84ae342da932c76c19b1dedd1dffeb175770e2a8c3f2a24dfb0e14938cefbdaff SHA512 786cdcb479098dc18e07e03201d6c27da80aef873997f828eda430499d462b2532cc1219432095eb34fb721e10a903a760be336111537379488c57ebf3ae2558
-EBUILD root-6.14.04-r3.ebuild 7918 BLAKE2B 40bc6ad41f77f2d844f4f75b09b05f44a311fe268545b4cccafae84169735926238321874d5fcc2e3a7ec18578cd194208f5153559ef3f2ae1188c90a1a9637e SHA512 aac213999b59f79112150ecb4785135dfe59948cf37cde2afddf3f3751574cb7457a9d124bd555cf5c119a426ceabc8f926452c5927294824616e6672220d71f
-EBUILD root-9999.ebuild 8142 BLAKE2B 785d7040bfdb6664c613390e7b16e5d05259b9e46ab35a956a53b6534cdd92338513055b807dd12398e3f3910d946fa81c0dcde57aeb253b438c1b0ab6f361ea SHA512 52ee93459aca1826856d22c89982ef2281d855d89be88340d1d24d0aac47c43aefd23da024e0333b0a3d0a8e825fbb09302e17a69ea6b817cc03f2d52af718ef
-MISC metadata.xml 2896 BLAKE2B e84b7e82aba212c161c6d6d00b78d365c689a131d6786b641529e32ecb69d55cdad6f0a44d6a4cac6d33643f0f721fe68891a5ce7c1f976268dbaf880a25b0ae SHA512 cd477aee55ae4147ec9e153e3c478e2d42538e364e2946837458b9d287252fb7d98e1dd79d06245e9c20c94b50d98e1729e663e2307ca2ae5b4200537f618da0
+DIST root_v6.14.06.source.tar.gz 162462837 BLAKE2B a6904b67d1f5964768fa884bd2b5c648390d0b3626b5be8f39ff0e311bf14690d2aff7eb9d6047fa8d5a9de894935067ea8c033592b9795fc34b61aa5f65fcdb SHA512 83698e1213ae9bd4a87ef3160b459c962199585bed7378efc0cfefdc352e6651a17286a11cd925dbcb5d04e1b832d47a3a69849d048731ea9d0d84f9b0f996a4
+DIST root_v6.14.08.source.tar.gz 162474562 BLAKE2B f8bfdabb4d91bbdfbab0b17626fff1f8aa265292996d857025cbd1543306f3ec540a1afb080788bfc7149ea835932b59d7c54dcd802354e31294ba2e5e9d2366 SHA512 827e39efbf3c69429a0a256127ca9f87550d9084c34c715bddccbf87a8c111c367b9a0ac6882aac747c9b48f4a3effb3747b4df567429910c93ee64dfe35df5b
+EBUILD root-6.12.06-r8.ebuild 7954 BLAKE2B 8ea25f2461acb83bbdb11f0fd4292507bbe578503d859104132e840bca92a774eb085484c7ed0ed03c4e055f020f974cd714c7f62cc8e996d87dc1eff524823f SHA512 7b6e8e5307b076ef6df5b7de38875f96a510ef19813ed3f5e927c3948c3f3f1c1b2eb24dfbedc638be5c13abcca0aed0d1d10594f556de00251ec8f0bf5bfa97
+EBUILD root-6.14.06-r2.ebuild 8190 BLAKE2B 022d1204ba0b575b982254fd37bd3ba9728671c0cff5865f25f2a29a3eaaadb161f9131c83422fa3708e2bcc1b633f85b96826226439ee96ef482443fd1c627c SHA512 88fe584445e5225f5dc876004a63903b9697d31b91fd3cff983d7847fffa28a79fc38a03ac8a6df8dd4d05584651f6538269edc35931f2319053eb881fbb17fd
+EBUILD root-6.14.08-r1.ebuild 8197 BLAKE2B d077c55548aba53572bc5ef867567d35b9df9b6d341cfe66990934f4c22e659efb22857143ab3fb3079c145bdd4549d03a61c8ce9d2142bbb4d0affa1ac79b9c SHA512 5aeb9ed20fcc226f8ed967bc1b9dd9131856bac4a36e265a17fd6c9f7e6d78a9e946f5b705ecf72d870bd6459afc1a2e5b4a1f41dd17132eee7f70d7f75a2ed9
+EBUILD root-9999.ebuild 8301 BLAKE2B 702553c1ea5e98d4a6bcdaa58029159a94506d68def2412f43f92ff4eba6be7f185a86068a112c3cb3f9a12bf2d0e826b4079001a15fad6993819bd2f509d8c7 SHA512 840777ec2c211c034b0c609df6eb689aa735962faa71d1fce9e31390f47b0262f5bb8672bd4bcafd0c5586f40cfe52954ea793130d435672cead3c8232626460
+MISC metadata.xml 3079 BLAKE2B a67a71c5dcde9c3d05420b7edefeee32a8e623e10d03f75169a02044377106641ed6dc96c65aa71f42c94c4b29777c0267e9163870cbb392e1dc7715b8ccc542 SHA512 24bb9b7d0d0263f363639f4861a071bfb7f1bdd5e15ec4b166c44114b25343edb008f7ac896dd899cbcdd068abd762aa84924a6e50384ee214de28beb08cfd2a
diff --git a/sci-physics/root/files/proofd.confd b/sci-physics/root/files/proofd.confd
deleted file mode 100644
index 81720a7eb335..000000000000
--- a/sci-physics/root/files/proofd.confd
+++ /dev/null
@@ -1,12 +0,0 @@
-# conf.d file for proof daemon
-#
-# Please refer to the proofd(1) man(1) page for more information on 
-# command line parameters. 
-#
-PROOFD_OPTS=
-
-# Specify your base of your PROOF directory here.  If left blank, it
-# will use the system default (e.g., /usr/share/root/proof). 
-# Note, however, that ROOT recommends that this directory is shared (via
-# NFS or similar) among all the nodes of the cluster.
-PROOF_DIR=
diff --git a/sci-physics/root/files/proofd.initd b/sci-physics/root/files/proofd.initd
deleted file mode 100644
index ee865133cb25..000000000000
--- a/sci-physics/root/files/proofd.initd
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-    need root-file-server
-    use logger
-}
-
-start() {
-    ebegin "Starting parallel ROOT facility server"
-    start-stop-daemon --start --quiet \
-	--pidfile /var/run/proofd.pid \
-	--exec /usr/bin/proofd -- ${PROOFD_OPTS} ${PROOF_DIR}
-    pidof /usr/bin/proofd > /var/run/proofd.pid
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping parallel ROOT facility server"
-    start-stop-daemon --stop --quiet \
-	--pidfile /var/run/proofd.pid \
-	--exec /usr/bin/proofd
-    eend $?
-}
diff --git a/sci-physics/root/files/root-6.14.00-http.patch b/sci-physics/root/files/root-6.14.00-http.patch
deleted file mode 100644
index 04ec4bea567b..000000000000
--- a/sci-physics/root/files/root-6.14.00-http.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bed1568548d7a47785d8fe24ec7a9ce5799040ff Mon Sep 17 00:00:00 2001
-From: Guilherme Amadio <amadio@cern.ch>
-Date: Wed, 27 Jun 2018 15:08:07 +0200
-Subject: [PATCH] Do not exclude etc/http directory from installation
-
-This was an unintended side-effect of a previous commit:
-9b4d0d8dccbd48d21b0f7c79b6eaf94428f691b1.
----
- CMakeLists.txt | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4c760d0fdb..a3a0f59925 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -426,8 +426,7 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_INSTALL_PREFIX)
-                          PATTERN "rootd.xinetd" EXCLUDE
-                          PATTERN "proofd.xinetd" EXCLUDE
-                          PATTERN "root.mimes" EXCLUDE
--                         PATTERN "cmake" EXCLUDE
--                         PATTERN "http" EXCLUDE )
-+                         PATTERN "cmake" EXCLUDE )
-   install(DIRECTORY fonts/  DESTINATION ${CMAKE_INSTALL_FONTDIR})
-   install(DIRECTORY icons/  DESTINATION ${CMAKE_INSTALL_ICONDIR})
-   install(DIRECTORY macros/ DESTINATION ${CMAKE_INSTALL_MACRODIR})
--- 
-2.18.0
-
diff --git a/sci-physics/root/files/root-6.14.06-oracle.patch b/sci-physics/root/files/root-6.14.06-oracle.patch
new file mode 100644
index 000000000000..232d3b08cfa3
--- /dev/null
+++ b/sci-physics/root/files/root-6.14.06-oracle.patch
@@ -0,0 +1,24 @@
+From: Guilherme Amadio <amadio@cern.ch>
+Date: Wed, 14 Nov 2018 11:36:49 +0100
+Subject: Fix FindOracle.cmake to find version 18.x
+
+---
+ cmake/modules/FindOracle.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/FindOracle.cmake b/cmake/modules/FindOracle.cmake
+index b7c8cfbb99..6672cb1bbd 100644
+--- a/cmake/modules/FindOracle.cmake
++++ b/cmake/modules/FindOracle.cmake
+@@ -55,7 +55,7 @@ FIND_LIBRARY(
+ )
+ FIND_LIBRARY(
+     ORACLE_LIBRARY_LNNZ
+-    NAMES libnnz10 nnz10 libnnz11 nnz11 libnnz12 nnz12 ociw32
++    NAMES libnnz10 nnz10 libnnz11 nnz11 libnnz12 nnz12 nnz18 ociw32
+     PATHS ${ORACLE_LIB_LOCATION}
+ )
+ 
+-- 
+2.19.1
+
diff --git a/sci-physics/root/files/rootd.confd b/sci-physics/root/files/rootd.confd
deleted file mode 100644
index 7516b8c9b6dd..000000000000
--- a/sci-physics/root/files/rootd.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-# conf.d file for root daemon
-
-# User to run as (default is `rootd')
-ROOTD_USER="rootd"
-
-# Please refer to the rootd(1) man(1) page for more information on 
-# command line parameters. 
-ROOTD_OPTS=""
diff --git a/sci-physics/root/files/rootd.initd b/sci-physics/root/files/rootd.initd
deleted file mode 100644
index f808259c3670..000000000000
--- a/sci-physics/root/files/rootd.initd
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-    need net
-    use logger
-    provide root-file-server
-}
-
-start() {
-    ebegin "Starting ROOT file server"
-    pid=$(start-stop-daemon --start --quiet --user ${ROOTD_USER} \
-	--pidfile /var/run/rootd.pid \
-	--exec /usr/bin/rootd -- ${ROOTD_OPTS})
-    retval=$?
-    echo ${ROOTD_PID} > /var/run/rootd.pid
-    eend ${retval}
-}
-
-stop() {
-    ebegin "Stopping ROOT file server"
-    start-stop-daemon --stop --quiet \
-	--pidfile /var/run/rootd.pid \
-	--exec /usr/bin/rootd
-    eend $?
-}
diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 6d5558e76bbf..3c004c040558 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -21,6 +21,9 @@
   </longdescription>
   <use>
     <flag name="asimage">Enable support for <pkg>media-libs/libafterimage</pkg></flag>
+    <flag name="c++11">Build using the C++11 standard</flag>
+    <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="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>
diff --git a/sci-physics/root/root-6.12.06-r7.ebuild b/sci-physics/root/root-6.12.06-r8.ebuild
index 87b5d83bd4ff..8431934ba7af 100644
--- a/sci-physics/root/root-6.12.06-r7.ebuild
+++ b/sci-physics/root/root-6.12.06-r8.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
@@ -16,11 +16,11 @@ 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
+IUSE="+X aqua +asimage +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"
+	+threads +tiff +tmva +unuran vc xinetd +xml xrootd zeroconf"
 
 SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
 LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
@@ -67,7 +67,7 @@ CDEPEND="
 		media-libs/libafterimage[gif,jpeg,png,tiff?]
 		>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?]
 	) )
-	avahi? ( net-dns/avahi[mdnsresponder-compat] )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 	davix? ( net-libs/davix )
 	emacs? ( virtual/emacs )
 	fftw? ( sci-libs/fftw:3.0= )
@@ -81,7 +81,7 @@ CDEPEND="
 	libcxx? ( sys-libs/libcxx )
 	unuran? ( sci-mathematics/unuran:0= )
 	minuit? ( !sci-libs/minuit )
-	mysql? ( virtual/mysql )
+	mysql? ( dev-db/mysql-connector-c )
 	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	postgres? ( dev-db/postgresql:= )
@@ -111,6 +111,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.12.04-no-opengl.patch
 	"${FILESDIR}"/${PN}-6.12.04-z3.patch
 	"${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch
+	"${FILESDIR}"/${PN}-6.14.06-oracle.patch
 )
 
 pkg_setup() {
@@ -183,7 +184,7 @@ src_configure() {
 		-Dalien=OFF
 		-Dasimage=$(usex asimage)
 		-Dastiff=$(usex tiff)
-		-Dbonjour=$(usex avahi)
+		-Dbonjour=$(usex zeroconf)
 		-Dlibcxx=$(usex libcxx)
 		-Dccache=OFF # use ccache via portage
 		-Dcastor=OFF
diff --git a/sci-physics/root/root-6.14.04-r3.ebuild b/sci-physics/root/root-6.14.06-r2.ebuild
index 0a144e280c73..e8e14bd43c0d 100644
--- a/sci-physics/root/root-6.14.04-r3.ebuild
+++ b/sci-physics/root/root-6.14.06-r2.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
@@ -16,21 +16,24 @@ 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 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 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
+	zeroconf"
 
 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 )
 	!X? ( !asimage !opengl !qt5 !tiff )
 	davix? ( ssl xml )
 	python? ( ${PYTHON_REQUIRED_USE} )
 	qt5? ( root7 )
+	root7? ( || ( c++14 c++17 ) )
 	tmva? ( gsl )
 "
 
@@ -67,7 +70,7 @@ CDEPEND="
 		media-libs/libafterimage[gif,jpeg,png,tiff?]
 		>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?]
 	) )
-	avahi? ( net-dns/avahi[mdnsresponder-compat] )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
 	davix? ( net-libs/davix )
 	emacs? ( virtual/emacs )
@@ -82,7 +85,7 @@ CDEPEND="
 	libcxx? ( sys-libs/libcxx )
 	unuran? ( sci-mathematics/unuran:0= )
 	minuit? ( !sci-libs/minuit )
-	mysql? ( virtual/mysql )
+	mysql? ( dev-db/mysql-connector-c )
 	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	postgres? ( dev-db/postgresql:= )
@@ -109,21 +112,19 @@ RDEPEND="${CDEPEND}
 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
+	"${FILESDIR}"/${PN}-6.14.06-oracle.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() {
@@ -137,16 +138,18 @@ 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}"
 		-DCLING_BUILD_PLUGINS=OFF
 		-Dexplicitlink=ON
@@ -185,15 +188,18 @@ src_configure() {
 		-Dalien=OFF
 		-Dasimage=$(usex asimage)
 		-Dastiff=$(usex tiff)
-		-Dbonjour=$(usex avahi)
+		-Dbonjour=$(usex zeroconf)
 		-Dlibcxx=$(usex libcxx)
 		-Dccache=OFF # use ccache via portage
 		-Dcastor=OFF
 		-Dchirp=OFF
+		-Dclad=OFF
 		-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
@@ -239,7 +245,7 @@ src_configure() {
 		-Droofit=$(usex roofit)
 		-Droot7=$(usex root7)
 		-Drootbench=OFF
-		-Droottest=$(usex test)
+		-Droottest=OFF
 		-Drpath=OFF
 		-Druby=OFF # deprecated and broken
 		-Druntime_cxxmodules=OFF # does not work yet
@@ -250,7 +256,6 @@ src_configure() {
 		-Dsrp=OFF # not implemented
 		-Dssl=$(usex ssl)
 		-Dtable=$(usex table)
-		-Dtbb=$(usex tbb)
 		-Dtcmalloc=OFF
 		-Dtesting=$(usex test)
 		-Dthread=$(usex threads)
@@ -269,6 +274,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
 
@@ -300,7 +311,7 @@ src_install() {
 	fi
 
 	if ! use examples; then
-		rm -r test tutorials || die
+		rm -r tutorials || die
 	fi
 
 	if ! use tmva; then
@@ -308,5 +319,5 @@ src_install() {
 	fi
 
 	# clean up unnecessary files from installation
-	rm -r emacs || die
+	rm -r emacs test || die
 }
diff --git a/sci-physics/root/root-6.14.08-r1.ebuild b/sci-physics/root/root-6.14.08-r1.ebuild
new file mode 100644
index 000000000000..d107740182ae
--- /dev/null
+++ b/sci-physics/root/root-6.14.08-r1.ebuild
@@ -0,0 +1,323 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_BUILD_TYPE=Release
+# ninja does not work due to fortran
+CMAKE_MAKEFILE_GENERATOR=emake
+FORTRAN_NEEDED="fortran"
+PYTHON_COMPAT=( python2_7 python3_{4,5,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 +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
+	zeroconf"
+
+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 )
+	!X? ( !asimage !opengl !qt5 !tiff )
+	davix? ( ssl xml )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	qt5? ( root7 )
+	root7? ( || ( c++14 c++17 ) )
+	tmva? ( gsl )
+"
+
+CDEPEND="
+	app-arch/lz4
+	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=
+		)
+	)
+	asimage? ( || (
+		media-libs/libafterimage[gif,jpeg,png,tiff?]
+		>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?]
+	) )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
+	davix? ( net-libs/davix )
+	emacs? ( virtual/emacs )
+	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? ( 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? ( virtual/shadow )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl:0= )
+	tbb? ( >=dev-cpp/tbb-2018 )
+	tmva? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	vc? ( dev-libs/vc )
+	xml? ( dev-libs/libxml2:2= )
+	xrootd? ( net-libs/xrootd:0= )
+"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+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.14.06-oracle.patch
+)
+
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+
+	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 environment variable EXTRA_ECONF for this."
+	elog "For example, for Chirp, you would set: "
+	elog "EXTRA_ECONF=\"-Dchirp=ON\""
+}
+
+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_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"
+		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
+		-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
+		-Dx11=$(usex X)
+		-Dxft=$(usex X)
+		-Dafdsmgrd=OFF
+		-Dafs=OFF # not implemented
+		-Dalien=OFF
+		-Dasimage=$(usex asimage)
+		-Dastiff=$(usex tiff)
+		-Dbonjour=$(usex zeroconf)
+		-Dlibcxx=$(usex libcxx)
+		-Dccache=OFF # use ccache via portage
+		-Dcastor=OFF
+		-Dchirp=OFF
+		-Dclad=OFF
+		-Dcling=ON # cling=OFF is broken
+		-Dcocoa=$(usex aqua)
+		-Dcuda=$(usex cuda)
+		-Dcxx11=$(usex c++11)
+		-Dcxx14=$(usex c++14)
+		-Dcxx17=$(usex c++17)
+		-Dcxxmodules=OFF # requires clang, unstable
+		-Ddavix=$(usex davix)
+		-Ddcache=OFF
+		-Dfftw3=$(usex fftw)
+		-Dfitsio=$(usex fits)
+		-Dfortran=$(usex fortran)
+		-Dftgl=$(usex opengl)
+		-Dgdml=$(usex gdml)
+		-Dgenvector=ON # genvector=OFF ignored
+		-Dgeocad=OFF
+		-Dgfal=OFF
+		-Dgl2ps=$(usex opengl)
+		-Dglite=OFF # not implemented
+		-Dglobus=OFF
+		-Dgminimal=OFF
+		-Dgsl_shared=$(usex gsl)
+		-Dgviz=$(usex graphviz)
+		-Dhdfs=OFF
+		-Dhttp=$(usex http)
+		-Dimt=$(usex tbb)
+		-Djemalloc=$(usex jemalloc)
+		-Dkrb5=$(usex kerberos)
+		-Dldap=$(usex ldap)
+		-Dmathmore=$(usex gsl)
+		-Dmemstat=$(usex memstat)
+		-Dminimal=OFF
+		-Dminuit2=$(usex minuit)
+		-Dminuit=$(usex minuit)
+		-Dmonalisa=OFF
+		-Dmysql=$(usex mysql)
+		-Dodbc=$(usex odbc)
+		-Dopengl=$(usex opengl)
+		-Doracle=$(usex oracle)
+		-Dpch=ON # pch=OFF is broken
+		-Dpgsql=$(usex postgres)
+		-Dpythia6=$(usex pythia6)
+		-Dpythia8=$(usex pythia8)
+		-Dpython=$(usex python)
+		-Dqt5web=$(usex qt5)
+		-Dqtgsi=OFF
+		-Dqt=OFF
+		-Drfio=OFF
+		-Droofit=$(usex roofit)
+		-Droot7=$(usex root7)
+		-Drootbench=OFF
+		-Droottest=OFF
+		-Drpath=OFF
+		-Druby=OFF # deprecated and broken
+		-Druntime_cxxmodules=OFF # does not work yet
+		-Dr=$(usex R)
+		-Dsapdb=OFF # not implemented
+		-Dshadowpw=$(usex shadow)
+		-Dsqlite=$(usex sqlite)
+		-Dsrp=OFF # not implemented
+		-Dssl=$(usex ssl)
+		-Dtable=$(usex table)
+		-Dtcmalloc=OFF
+		-Dtesting=$(usex test)
+		-Dthread=$(usex threads)
+		-Dtmva=$(usex tmva)
+		-Dtmva-cpu=$(usex tmva)
+		-Dtmva-gpu=$(usex cuda)
+		-Dunuran=$(usex unuran)
+		-Dvc=$(usex vc)
+		-Dvdt=OFF
+		-Dveccore=OFF
+		-Dxml=$(usex xml)
+		-Dxrootd=$(usex xrootd)
+		${EXTRA_ECONF}
+	)
+
+	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/$(get_libdir)/${PN}/$(ver_cut 1-2)
+	ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)
+
+	# ROOT fails without this symlink because it only looks in lib
+	if [[ ! -d ${D}/${ROOTSYS}/lib ]]; then
+		dosym $(get_libdir) /usr/$(get_libdir)/${PN}/$(ver_cut 1-2)/lib
+	fi
+
+	cat > ${ROOTENV} <<- EOF || die
+	MANPATH="${ROOTSYS}/share/man"
+	PATH="${ROOTSYS}/bin"
+	ROOTPATH="${ROOTSYS}/bin"
+	LDPATH="${ROOTSYS}/$(get_libdir)"
+	EOF
+
+	if use python; then
+		echo "PYTHONPATH=${ROOTSYS}/$(get_libdir)" >> ${ROOTENV} || die
+	fi
+
+	doenvd ${ROOTENV}
+
+	pushd "${D}/${ROOTSYS}" > /dev/null
+
+	if use emacs; then
+		elisp-install ${PN}-$(ver_cut 1-2) "${BUILD_DIR}"/root-help.el
+	fi
+
+	if ! use examples; then
+		rm -r tutorials || die
+	fi
+
+	if ! use tmva; then
+		rm -r tmva || die
+	fi
+
+	# clean up unnecessary files from installation
+	rm -r emacs test || die
+}
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 12ada06493f2..42eab5c6a5b8 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 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
+	zeroconf"
 
 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 )
 "
 
@@ -76,7 +79,7 @@ CDEPEND="
 		media-libs/libafterimage[gif,jpeg,png,tiff?]
 		>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?]
 	) )
-	avahi? ( net-dns/avahi[mdnsresponder-compat] )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
 	davix? ( net-libs/davix )
 	emacs? ( virtual/emacs )
@@ -91,7 +94,7 @@ CDEPEND="
 	libcxx? ( sys-libs/libcxx )
 	unuran? ( sci-mathematics/unuran:0= )
 	minuit? ( !sci-libs/minuit )
-	mysql? ( virtual/mysql )
+	mysql? ( dev-db/mysql-connector-c )
 	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	postgres? ( dev-db/postgresql:= )
@@ -102,7 +105,7 @@ CDEPEND="
 	shadow? ( virtual/shadow )
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? ( dev-libs/openssl:0= )
-	tbb? ( dev-cpp/tbb )
+	tbb? ( >=dev-cpp/tbb-2018 )
 	tmva? ( dev-python/numpy[${PYTHON_USEDEP}] )
 	vc? ( dev-libs/vc )
 	xml? ( dev-libs/libxml2:2= )
@@ -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
@@ -193,7 +196,7 @@ src_configure() {
 		-Dalien=OFF
 		-Dasimage=$(usex asimage)
 		-Dastiff=$(usex tiff)
-		-Dbonjour=$(usex avahi)
+		-Dbonjour=$(usex zeroconf)
 		-Dlibcxx=$(usex libcxx)
 		-Dccache=OFF # use ccache via portage
 		-Dcastor=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,11 +282,17 @@ 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
 
 	ROOTSYS=${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)
-	ROOTENV=9999${PN}-$(ver_cut 1-2)
+	ROOTENV=9900${PN}-$(ver_cut 1-2)
 
 	# ROOT fails without this symlink because it only looks in lib
 	if [[ ! -d ${D}/${ROOTSYS}/lib ]]; then
@@ -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
 }