gentoo resync : 02.09.2020

8 files changed, 76 insertions, 135 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 5033a8006da8..dcf8f2bf0c73 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/qmeq/Manifest b/sci-physics/qmeq/Manifest
index 040c513d09cb..0da17ab9847d 100644
--- a/sci-physics/qmeq/Manifest
+++ b/sci-physics/qmeq/Manifest
@@ -1,4 +1,4 @@
 DIST qmeq-1.0.tar.gz 590715 BLAKE2B 7f091be0651236f2dcb45825df541813e27b43b2b8ec9184a342c962363921e29462726ba23530d0b956bba45793ed2036cec6287696e5fa58f91204d9267933 SHA512 3589fe927740cac5130a5b936e7fb8f73ce20f280878a326cdf91fe6340e8853f5e055c7e07170433c0977130cbb31644b0d9f84d23cd467aaa82557c8541e6f
 DIST qmeq-examples-1.0.tgz 289316 BLAKE2B add7520b579023c8da91aff294dd5a8fd29ba3520c3b496f2a98c8159dab4ad6bcdd1d12070357d868a10bbf224511ab27da069b94951d2c8632064344d2e143 SHA512 4a7b78a200ab4fa407401ea89740cdbcfb82376d97e8146e20a1cdab154269a6b9ce8217fb7ce78af73677b544ab535c5eadd386655dbff9c4ebde6c8eda9e38
-EBUILD qmeq-1.0.ebuild 942 BLAKE2B 63215a4a4eefd87ec3424e1a4f4fe7777779ce932873cbd82ef4fe58b0c52df16eee45ea43f40d0b6532919913c10d37388c939e814c3bb143e27d877d9d6fa5 SHA512 35722b33bd3777b1c9e04f1d88fa3560866e37bace9febd4c4eade89cf0d29da60b23739f5d194c21e6a76fa77cd2d864a1264652dfdbc82adea6c211dc2b31a
+EBUILD qmeq-1.0.ebuild 938 BLAKE2B bbeeb67d14fdd94fe94a00d88b2a3ab8d7468517ba90d78e03a0e400529d3c8bf9cd15b75528035384858a02ad90159552a214729981fdc8541699da3f59f5bb SHA512 e7a7e778ef9a7d075788b8dfb703b0b973c96b87d71b1e8b5201603f0354302fbf6848cb995559639a3fca557fb7a64246e38022540a94cc1c1f142c478ba34d
 MISC metadata.xml 342 BLAKE2B 8bfc619eb36e81fb749932d8478b86b7ebce4e36378b3caf00b7d76b3a0d876debf3b42b1182fc68f5e1122974430a48b6977e69d9699f4eb04efe34b8be1ed1 SHA512 678efb4d82074368f3d07aa488049a79ccaa214c729b8de358e5f4eaeb3f49728a1019bf0ed5fb5bb6859f667b6d5ae2632a60d9af8b6cbd82c63c68b7624660
diff --git a/sci-physics/qmeq/qmeq-1.0.ebuild b/sci-physics/qmeq/qmeq-1.0.ebuild
index f2a11f357f90..9038c029f11b 100644
--- a/sci-physics/qmeq/qmeq-1.0.ebuild
+++ b/sci-physics/qmeq/qmeq-1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
 
 inherit distutils-r1
 
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index caa26f5f363f..cb80d1371739 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,15 +1,14 @@
 AUX root-6.12.06_cling-runtime-sysroot.patch 989 BLAKE2B 8202cc8f2bf72cc25642d0a03ba26c3969069b291a6a22188879dbedbf0c3c496149f79f671d0eb51d81d0ee36565660d136b4741f5d018c2b05325ff08381f0 SHA512 c96dee9843da1051c54bd6870ef0a04714944ffe1f86800c9a51b8eb8ef84107d3315d3a708dcc0b651248af4bec362c7f31695514505045aeda9c793d40dc58
-AUX root-6.16.00-disable-header-search.patch 1670 BLAKE2B cc9fda55bc867585432d9acb7dcde6cefa022226c84034bd5c4ba6e286d083ac330ac16ae0f119b5aaf3763cc93ada8c6592096333f55b6ff374ccdd09592e33 SHA512 99e8998c18e70ea9e352abf9839252319e3d8a53bac3a0f777d81e48b88bfd235a6e8386eceb1b50e1202b53088a82cbe6e1576e9137e0e5db59da7cb1761bae
 AUX root-6.22.00-rlogger.patch 1284 BLAKE2B 4eb69454d83abbf4d29f6c117b1df60aac171c6f8d5a1e085bef67d3f17234bb662f8ede7435564516a3789634721d56e190fe00b37a9e226a7c979634451ef9 SHA512 271aa94d272fd7c668c90af624adb086b28283d6b27d2ae2be84e2ed523dfa2085b83b2941ce6b4975fcc47b7cc566374b91b6f70a3045130857df96c147f911
-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
-DIST root_v6.20.04.source.tar.gz 168056076 BLAKE2B 814bf74f5a18adf2605954068962d3283504538118d221f55e030b224e09c9542a544c166a317ad981a84d4a1edc48bbfc76a57acd43aefb779d8e27270c4aeb SHA512 3cc214a4b160795c8aa53b6fdb01370c3aea628696d1668cbf47e6beac56f171674619a853a1219336d9b67ad06db1d9ecd13345bf1731f809da9e60b3d39a2c
 DIST root_v6.20.06.source.tar.gz 168216335 BLAKE2B a0a51f11e6dcc3a6ba657a8b946507bb857088bce3102f5330a0df455fec468ee4228f5394795f3e3b1ee3434b7ddda85f08039bf603a531154c28b335ff803c SHA512 232fd5253e83eb02ad33d03941c7c83d39d5f6b0162bd42594e44a0c1c08deade42ae5793e571db767ce4fa0a582aa332b9d1869e621b825d1eb1162819c98c6
+DIST root_v6.20.08.source.tar.gz 168218062 BLAKE2B 79b1eb89f1003c140a60d47e9d447576ad215e66321a265ed047b069d05f008cf8f0d23df99ed35a8ee5a802e5de5a42122e8f1c075b01ef74eb11926a1b31d7 SHA512 205d5ae94a6c1b6e1a479a8631d5a9bab4a9f76c396cf3ed2c23a26c767a5a892a087b872a69853ada0f84e60a6015f732342c5f48acc696cb626528748f81fe
 DIST root_v6.22.00.source.tar.gz 173014392 BLAKE2B a59071ee5b13466505323fca30fe656668a243006239e7f9ebc71bb21a7fe244cafe6d33ff4579b67920c9102eb36344f20415079bb627834fb8a57d9117476d SHA512 9e3c54bbc146b0abb0a2d960af380255ec59d0b3a11a4a97a2a25cb7ac567b07280c4eb48dddf99c1fa2e692881f6396a842ce125d3a253037e52f719739f01e
-EBUILD root-6.16.00-r5.ebuild 8188 BLAKE2B ac2fb81f115d0a2a0bfd893ec3b113483550363167d42544b4784b448852831801537749abf24d0524bd8f150876e791231e09032de0ec8b3aef0b92b85b0372 SHA512 a0bbbfa5a6b9984ef0e599eb07a91e5b0bdb95fc46d4d1d7b09584b524aa34cdaf0d136cfbd5e665fda647370b59e6ef4ea254a46bfedffaa5b072b17ac228f6
+DIST root_v6.22.02.source.tar.gz 173033408 BLAKE2B c7e3719b612093386fddecbfd098c428345d3562537c2dc546e12b9da62fa6f2cc776a5314ae1257eeaaa498af29236520931ea3f6dd5ad3e03095bc117da125 SHA512 0a0ffbcee2ef971bebf32bc38a247ea981f56721314bc2eab69cfe66ae86eafb00568c475b41b2ae7db7ad25f0c8b0953e10f1841316a49cf62fbad664ccee17
 EBUILD root-6.18.04-r2.ebuild 7606 BLAKE2B 6a1f7b36bc8479538b1487b2125f7130632b64d319ac43728fb8be3a6ce63b6979f1ca32955b85d455e3df87685b9aa06480c55d095e0632c9c642f00e4246f9 SHA512 439bcb7daadbd796ca62d022c3c79832e149e0665da1e56e1e81d3ad3ae352dfa67f3685f965da97cd023252a3d9796c3749be218f969ca521704208a7f522dc
-EBUILD root-6.20.04.ebuild 7622 BLAKE2B befddc9eb89171f28f410067ffe4ef5fad17f0252da5b6c8391171719b71dde5f9eeae1b136b0883e4f4c9cf00852cd2e0d8c0714401cc53904e442473c09139 SHA512 365ab02df174eb50562e5d24f3ac1550b98bc27c4e70bf9f5bb93e07cef09a81fdd1a9ebdf2ca86ad79c2183a5f0fac5a4d253151c2dd98b2f782895f85ff8d3
 EBUILD root-6.20.06.ebuild 7574 BLAKE2B 7e323a8ddedf4e10642f37aff96324483655ca8c4122883a6517114c6c845756d468e71a03a8da7d449e0deaa14dde4e885c8951c725c66920592eba18064bf7 SHA512 acb8ced616738df91f1dcf36d82c33e4a6054e13930a7e8ae107b29d123a2b918d76f30f11bd9489763b5311be74dbff7989fa389f1fae65880fde3131eba919
+EBUILD root-6.20.08.ebuild 7574 BLAKE2B 7e323a8ddedf4e10642f37aff96324483655ca8c4122883a6517114c6c845756d468e71a03a8da7d449e0deaa14dde4e885c8951c725c66920592eba18064bf7 SHA512 acb8ced616738df91f1dcf36d82c33e4a6054e13930a7e8ae107b29d123a2b918d76f30f11bd9489763b5311be74dbff7989fa389f1fae65880fde3131eba919
 EBUILD root-6.22.00.ebuild 7581 BLAKE2B 26be211c71848caafcafb3bdfd7c069b0417f9b89875b2de61304109426c5e6aeb41e80411bd5c35d162c9b1a815e3acae39942f3224b85b21788738a9a98237 SHA512 aa6486212e3a1dfdb8f080401fd5d276c0b3b6eb3bc914daca9834103696d306454f902c145f41c32d28f9da64e4f85bcb59110610e9b15f81aeb5854f587cde
+EBUILD root-6.22.02.ebuild 7538 BLAKE2B a60dc578fc47ab132bb7c7135473d03a40c240cea979a75ce58042dda06bf214560537e5c909d7cf4beb90dbe5b8ed997cfd335c2f524d9a24814cbd6b4286da SHA512 ae638d81e3c0c4b30a015538e6b594492a43f90888de7770c7cfabe37730b4fe02eb3c5e3dd24e6f29324e1fe6451754c14d7418520922375a38e69075c1058f
 EBUILD root-9999.ebuild 8019 BLAKE2B 5e872be0fd66e98c0bda4cdbe7892b42d24dc8676aa0e3748d162f1b194aad2ed792bb98cff3110942bafe680ea81cf8eb8f4cba064d20c6bdf52dc849900782 SHA512 cbf623074ef0024cbf8b781b000bb9e8a136e272d72e476bb5e755552f40e10acfa83ff7960cd9421cf9b88ca7493aa5310fbd4c726ea93d349880b783954d58
-MISC metadata.xml 3288 BLAKE2B e61573d67396a1c102c3f92036dbd0d1f601d383ec7e806ece97eb1ab026ee05e99f36acf98261455c8213868526bb3119c502bc837654787c663bfc9b205c84 SHA512 2f26ec7cde49879c23c56b8a860471e7c3da6b4cb0ee8c36f00d352547115fecc81cd2f1344a021e5d4895996e8744b7f6fcee3d478b901e149513fba50086c6
+MISC metadata.xml 3227 BLAKE2B d4c07ae082584a652a0f56735fa4d6556f0c917c949ade4663b3347e4ca371b2508e370f2040d70482ca5c1c128fc903412b9acba05014a7aca784fb65d0fbb3 SHA512 c7589407ef19ddf5c48b2d91a83c913862d1384fc2b125286d71097e698462849c720f10f57a5c5be7e026537e961dc3dab61c256438313e3d6cf73ea0108b79
diff --git a/sci-physics/root/files/root-6.16.00-disable-header-search.patch b/sci-physics/root/files/root-6.16.00-disable-header-search.patch
deleted file mode 100644
index 06748eb64312..000000000000
--- a/sci-physics/root/files/root-6.16.00-disable-header-search.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Benda Xu <heroxbd@gentoo.org>
-Date: 2019-03-23
-Subject: Remove header expansion logic from module cmake helper.
-
-Description: ROOT module cmake helper by default expands header inclusion to
-absolute path.  In Gentoo, that will capture PORTAGE_TMPDIR resulting in various
-runtime bugs. By removing this convolved logic, headers are untouched and become
-more predictible for rootcling at runtime.
-
-Typical bug it solves:
-
-  Error in cling::AutoloadingVisitor::InsertIntoAutoloadingState:
-    Missing FileEntry for /var/tmp/portage/sci-physics/JSAP-479/work/JSAP-479/DataType/JPSimOutput.hh
-    requested to autoload type JPSimTruthTree_t
-  Error in cling::AutoloadingVisitor::InsertIntoAutoloadingState:
-    Missing FileEntry for /var/tmp/portage/sci-physics/JSAP-479/work/JSAP-479/DataType/JPSimOutput.hh
-    requested to autoload type JPSimTriggerInfoTree_t
-
-Forwarded: No need. Gentoo specific.
-
---- a/cmake/modules/RootNewMacros.cmake	2019-01-23 16:23:37.000000000 +0800
-+++ b/cmake/modules/RootNewMacros.cmake	2019-02-25 00:18:04.000000000 +0800
-@@ -250,14 +250,7 @@ function(ROOT_GENERATE_DICTIONARY dictio
-       list(APPEND headerfiles ${fp})
-       list(APPEND _list_of_header_dependencies ${fp})
-     else()
--      find_file(headerFile ${fp} HINTS ${localinclude} ${incdirs} NO_DEFAULT_PATH)
--      find_file(headerFile ${fp} NO_SYSTEM_ENVIRONMENT_PATH)
--      if(headerFile)
--        list(APPEND headerfiles ${headerFile})
--        list(APPEND _list_of_header_dependencies ${headerFile})
--      else()
--        list(APPEND headerfiles ${fp})
--      endif()
-+      list(APPEND headerfiles ${fp})
-       unset(headerFile CACHE)
-     endif()
-   endforeach()
diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index e20aca48cc14..85a5b09bdff4 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -41,7 +41,6 @@
     <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>
diff --git a/sci-physics/root/root-6.20.04.ebuild b/sci-physics/root/root-6.20.08.ebuild
index 4806caa94c9c..4403d94be474 100644
--- a/sci-physics/root/root-6.20.04.ebuild
+++ b/sci-physics/root/root-6.20.08.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
 PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
-inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
-	prefix python-single-r1 toolchain-funcs
+inherit cmake cuda elisp-common fortran-2 prefix python-single-r1 toolchain-funcs
 
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="https://root.cern"
@@ -28,7 +27,7 @@ KEYWORDS="~amd64 ~x86"
 
 REQUIRED_USE="
 	^^ ( c++11 c++14 c++17 )
-	cuda? ( tmva !c++17 )
+	cuda? ( tmva )
 	cudnn? ( cuda )
 	!X? ( !asimage !opengl !qt5 )
 	davix? ( ssl xml )
@@ -126,12 +125,14 @@ pkg_setup() {
 src_prepare() {
 	use cuda && cuda_src_prepare
 
-	cmake-utils_src_prepare
+	cmake_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"
+
+	eapply_user
 }
 
 # Note: ROOT uses bundled clang because it is patched and API-incompatible
@@ -154,7 +155,6 @@ src_configure() {
 		-DCMAKE_INSTALL_LIBDIR="lib"
 		-DDEFAULT_SYSROOT="${EPREFIX}"
 		-DCLING_BUILD_PLUGINS=OFF
-		-Dexplicitlink=ON
 		-Dexceptions=ON
 		-Dfail-on-missing=ON
 		-Dgnuinstall=OFF
@@ -184,11 +184,9 @@ src_configure() {
 		-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
@@ -196,22 +194,21 @@ src_configure() {
 		-Dcuda=$(usex cuda)
 		-Dcudnn=$(usex cudnn)
 		-Dcxxmodules=OFF # requires clang, unstable
-		-Ddavix=$(usex davix)
 		-Ddataframe=ON
+		-Ddavix=$(usex davix)
 		-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)
+		-Dlibcxx=$(usex libcxx)
 		-Dmathmore=$(usex gsl)
 		-Dmemstat=OFF # deprecated
 		-Dminimal=OFF
@@ -225,19 +222,20 @@ src_configure() {
 		-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
+		-Dpythia6=$(usex pythia6)
+		-Dpythia8=$(usex pythia8)
 		-Dqt5web=$(usex qt5)
+		-Dr=$(usex R)
 		-Droofit=$(usex roofit)
 		-Droot7=$(usex root7)
 		-Drootbench=OFF
 		-Droottest=OFF
 		-Drpath=OFF
-		-Druntime_cxxmodules=OFF # does not work yet
-		-Dr=$(usex R)
+		-Druntime_cxxmodules=OFF
 		-Dshadowpw=$(usex shadow)
+		-Dspectrum=ON
 		-Dsqlite=$(usex sqlite)
 		-Dssl=$(usex ssl)
 		-Dtcmalloc=OFF
@@ -245,28 +243,32 @@ src_configure() {
 		-Dtmva=$(usex tmva)
 		-Dtmva-cpu=$(usex tmva)
 		-Dtmva-gpu=$(usex cuda)
+		-Dtmva-pymva=$(usex tmva)
+		-Dtmva-rmva=$(usex R)
 		-Dunuran=$(usex unuran)
 		-Dvc=$(usex vc)
-		-Dvmc=$(usex vmc)
 		-Dvdt=OFF
 		-Dveccore=OFF
+		-Dvecgeom=OFF
+		-Dvmc=$(usex vmc)
+		-Dx11=$(usex X)
 		-Dxml=$(usex xml)
 		-Dxrootd=$(usex xrootd)
 		${EXTRA_ECONF}
 	)
 
 	CMAKE_BUILD_TYPE=$(usex debug Debug Release) \
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
 	# needed for hsimple.root
 	addwrite /dev/random
-	cmake-utils_src_compile
+	cmake_src_compile
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	ROOTSYS=${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)
 	ROOTENV="$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)"
diff --git a/sci-physics/root/root-6.16.00-r5.ebuild b/sci-physics/root/root-6.22.02.ebuild
index 654e8431079f..24742a32e5e6 100644
--- a/sci-physics/root/root-6.16.00-r5.ebuild
+++ b/sci-physics/root/root-6.22.02.ebuild
@@ -1,36 +1,35 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
-inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
-	prefix python-single-r1 toolchain-funcs
+inherit cmake cuda elisp-common 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 debug emacs
-	+examples fits fftw fortran +gdml graphviz +gsl http jemalloc
-	kerberos ldap libcxx memstat +minuit mysql nosplash 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"
+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"
+KEYWORDS="~amd64 ~x86"
 
 REQUIRED_USE="
 	^^ ( c++11 c++14 c++17 )
-	cuda? ( tmva !c++17 )
-	!X? ( !asimage !opengl !qt5 !tiff )
+	cuda? ( tmva )
+	cudnn? ( cuda )
+	!X? ( !asimage !opengl !qt5 )
 	davix? ( ssl xml )
 	python? ( ${PYTHON_REQUIRED_USE} )
 	qt5? ( root7 )
@@ -40,6 +39,7 @@ REQUIRED_USE="
 
 CDEPEND="
 	app-arch/lz4
+	app-arch/zstd
 	app-arch/xz-utils
 	fortran? ( dev-lang/cfortran )
 	dev-libs/libpcre:3
@@ -67,9 +67,9 @@ CDEPEND="
 			dev-qt/qtwebengine:5[widgets]
 		)
 	)
-	asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+	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= )
@@ -77,12 +77,10 @@ CDEPEND="
 	graphviz? ( media-gfx/graphviz )
 	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 )
+	mpi? ( virtual/mpi )
 	mysql? ( dev-db/mysql-connector-c )
 	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
 	oracle? ( dev-db/oracle-instantclient-basic )
@@ -108,12 +106,10 @@ CDEPEND="
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 
-RDEPEND="${CDEPEND}
-	xinetd? ( sys-apps/xinetd )"
+RDEPEND="${CDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch
-	"${FILESDIR}"/${PN}-6.16.00-disable-header-search.patch
 )
 
 pkg_setup() {
@@ -129,18 +125,14 @@ pkg_setup() {
 src_prepare() {
 	use cuda && cuda_src_prepare
 
-	cmake-utils_src_prepare
+	cmake_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"
 
-	if use nosplash; then
-		sed -i -e '/bool gNoLogo/s@false@true@' rootx/src/rootx.cxx
-	fi
-
-	hprefixify core/clingutils/CMakeLists.txt
+	eapply_user
 }
 
 # Note: ROOT uses bundled clang because it is patched and API-incompatible
@@ -151,15 +143,18 @@ 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-)
 		-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
@@ -188,111 +183,95 @@ src_configure() {
 		-Dbuiltin_xrootd=OFF
 		-Dbuiltin_xxhash=OFF
 		-Dbuiltin_zlib=OFF
-		-Dx11=$(usex X)
-		-Dxft=$(usex X)
-		-Dafdsmgrd=OFF
-		-Dafs=OFF # not implemented
+		-Dbuiltin_zstd=OFF
 		-Dalien=OFF
+		-Darrow=OFF
 		-Dasimage=$(usex asimage)
-		-Dastiff=$(usex tiff)
-		-Dbonjour=$(usex zeroconf)
-		-Dlibcxx=$(usex libcxx)
 		-Dccache=OFF # use ccache via portage
-		-Dcastor=OFF
-		-Dchirp=OFF
+		-Dcefweb=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)
+		-Dcudnn=$(usex cudnn)
 		-Dcxxmodules=OFF # requires clang, unstable
+		-Ddataframe=ON
 		-Ddavix=$(usex davix)
 		-Ddcache=OFF
+		-Dfcgi=$(usex http)
 		-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)
+		-Dlibcxx=$(usex libcxx)
 		-Dmathmore=$(usex gsl)
-		-Dmemstat=$(usex memstat)
+		-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)
-		-Dpch=ON # pch=OFF is broken
 		-Dpgsql=$(usex postgres)
+		-Dpyroot=$(usex python) # python was renamed to pyroot
+		-Dpyroot_legacy=OFF
 		-Dpythia6=$(usex pythia6)
 		-Dpythia8=$(usex pythia8)
-		-Dpython=$(usex python)
 		-Dqt5web=$(usex qt5)
-		-Dqtgsi=OFF
-		-Dqt=OFF
-		-Drfio=OFF
+		-Dr=$(usex R)
 		-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
+		-Druntime_cxxmodules=OFF
 		-Dshadowpw=$(usex shadow)
+		-Dspectrum=ON
 		-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)
+		-Dtmva-pymva=$(usex tmva)
+		-Dtmva-rmva=$(usex R)
 		-Dunuran=$(usex unuran)
 		-Dvc=$(usex vc)
 		-Dvdt=OFF
 		-Dveccore=OFF
+		-Dvecgeom=OFF
+		-Dvmc=$(usex vmc)
+		-Dx11=$(usex X)
 		-Dxml=$(usex xml)
 		-Dxrootd=$(usex xrootd)
 		${EXTRA_ECONF}
 	)
 
 	CMAKE_BUILD_TYPE=$(usex debug Debug Release) \
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
 	# needed for hsimple.root
 	addwrite /dev/random
-	cmake-utils_src_compile
+	cmake_src_compile
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	ROOTSYS=${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)
-	ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)
+	ROOTENV="$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)"
 
 	cat > ${ROOTENV} <<- EOF || die
 	MANPATH="${ROOTSYS}/share/man"
@@ -313,7 +292,7 @@ src_install() {
 
 	pushd "${D}/${ROOTSYS}" > /dev/null
 
-	rm -r test emacs bin/*.{csh,sh,fish} || die
+	rm -r emacs bin/*.{csh,sh,fish} || die
 
 	if ! use examples; then
 		rm -r tutorials || die