gentoo resync : 21.06.2020

13 files changed, 204 insertions, 367 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 085416a0154f..2845f5c808b7 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 50ef82b78979..0eabe84496f5 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,19 +1,15 @@
-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.14.06-oracle.patch 666 BLAKE2B 8ca54fa3d6d836805a88f3ff713e34c1d5db8ffabe4eab7d213d4e0d6a3750cbe0bc8fd14e40ff98f3a4a225b641ebfc6abcf0d34034f90718b0567935bb0209 SHA512 095678f4b3e277cf9b3cd64e0811e20d9c486f2ed524792e55b087441e652ea7b9ee9c2358319ae2be6e4b35828873669d5b9c89f61d68aaa76db62abc4c5a46
 AUX root-6.16.00-disable-header-search.patch 1670 BLAKE2B cc9fda55bc867585432d9acb7dcde6cefa022226c84034bd5c4ba6e286d083ac330ac16ae0f119b5aaf3763cc93ada8c6592096333f55b6ff374ccdd09592e33 SHA512 99e8998c18e70ea9e352abf9839252319e3d8a53bac3a0f777d81e48b88bfd235a6e8386eceb1b50e1202b53088a82cbe6e1576e9137e0e5db59da7cb1761bae
-DIST root_v6.12.06.source.tar.gz 162284452 BLAKE2B 944b5e899677bab40842d7ec969ff08cfa470e63be9a02b948a49ae088e8da72ce433a5071d9196bfd98f71e6861b1bda285354012620eee6c61cffcee71a0c8 SHA512 3d44749ccfc3d40a2f516ae53ef40fb244ed785eee0dbc18ff822bbb811a15b943039d30282ef5358a283d485e62531880c877ec77a86089503b06d6f37e42e1
-DIST root_v6.14.08.source.tar.gz 162474562 BLAKE2B f8bfdabb4d91bbdfbab0b17626fff1f8aa265292996d857025cbd1543306f3ec540a1afb080788bfc7149ea835932b59d7c54dcd802354e31294ba2e5e9d2366 SHA512 827e39efbf3c69429a0a256127ca9f87550d9084c34c715bddccbf87a8c111c367b9a0ac6882aac747c9b48f4a3effb3747b4df567429910c93ee64dfe35df5b
+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
-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
+DIST root_v6.20.06.source.tar.gz 168216335 BLAKE2B a0a51f11e6dcc3a6ba657a8b946507bb857088bce3102f5330a0df455fec468ee4228f5394795f3e3b1ee3434b7ddda85f08039bf603a531154c28b335ff803c SHA512 232fd5253e83eb02ad33d03941c7c83d39d5f6b0162bd42594e44a0c1c08deade42ae5793e571db767ce4fa0a582aa332b9d1869e621b825d1eb1162819c98c6
+DIST root_v6.22.00.source.tar.gz 173014392 BLAKE2B a59071ee5b13466505323fca30fe656668a243006239e7f9ebc71bb21a7fe244cafe6d33ff4579b67920c9102eb36344f20415079bb627834fb8a57d9117476d SHA512 9e3c54bbc146b0abb0a2d960af380255ec59d0b3a11a4a97a2a25cb7ac567b07280c4eb48dddf99c1fa2e692881f6396a842ce125d3a253037e52f719739f01e
+EBUILD root-6.16.00-r5.ebuild 8185 BLAKE2B 37cfecd2895248be70e4f47bbb3ae87538e639232f17f2429b79c984860688d1e3681aaf8b5f157048d6bad266123d0acc6282f3ae28f7f3e91913b2eef972d0 SHA512 377f136cd55ccf1e21885fbd67c33bdf0afa4d100773c3a950662d8b14b7a6cf749057a2cd1017ab645d84cc26a358acd4f03210d30c8bdc09158c43c484fd79
+EBUILD root-6.18.04-r2.ebuild 7603 BLAKE2B 90431ca482d520ade23455a016227d876d48ae5a824eae8488883b1e652ba136f7728f0c2e93aba88d273dc9345d7836a928c21a2cf870083f4a76569a515550 SHA512 f0bdcd0e11a1c0826369e311064d72714b1ec973c98a937482a96b67b9787d5ec3b0f84e127eebc2fedd6da464f35be82581cdb5304baac931c6c9ac927c8f23
 EBUILD root-6.20.04.ebuild 7619 BLAKE2B 3956618c3f3bb23d3ff6599fc21d8b1ee7cec19a8b93cc5875bbb4ea10fa37e5d61840f1b156d9cb443c84560708211c1dfbabcb74561e1a6fbb4d05c4545143 SHA512 f0be0e1f492576954cf357033f843ebe1540f7c1002e97ec5666103cab36a95b2b6648179d3959c07598c43d4b70d65798abb84972f5a086895109bd6a3ee8f1
-EBUILD root-9999.ebuild 8023 BLAKE2B e2bf4b134981bbd4077589c3c904c4e76c2ee9d8f5ccafb736e620c3443689c5bcba034ccc1141039826e54f44e4d1ed3cdec2bd5cd471578e2cff52d0509d0b SHA512 b1513126faf8ae34efbd483b7704dd912f6420e68e3bd946d642070501949a72ac59a9981499308ea61986208e0b683357eb5f053726152b6c17d38ef34ebc26
+EBUILD root-6.20.06.ebuild 7571 BLAKE2B a377f07847be57961baca90114f0e96d63442dd3e7b25561158e7fb5ac59c6d7a6bf7517b65f0178a160fe3dc724731ee937773f77106729277337de0a377a8c SHA512 aba076e740c93609670ef8274309e4b1c03dc9f157c3c613f799f79c903f75a8dcb6216c58d51d1e8ab22c83e3b093a590e477148c7619c381a7eb01999793fe
+EBUILD root-6.22.00.ebuild 7578 BLAKE2B 69f9b0c875d120b6c6425c591f4867158e2975d040ec9fd5a13192e4ec58d009e4f455bf2994902ca9fad549f50ddea14368d2c085e8ef66e50c6e81bbe29797 SHA512 54d0f1b072f5ac487a9aaf1eb4558a6765c119125a197e4f5f6d77a1cecb975fa251b6e9781c0f110f711cd6dc784756c4b1ecc50efd3f6bf00dc6a0274f49fe
+EBUILD root-9999.ebuild 8019 BLAKE2B 5e872be0fd66e98c0bda4cdbe7892b42d24dc8676aa0e3748d162f1b194aad2ed792bb98cff3110942bafe680ea81cf8eb8f4cba064d20c6bdf52dc849900782 SHA512 cbf623074ef0024cbf8b781b000bb9e8a136e272d72e476bb5e755552f40e10acfa83ff7960cd9421cf9b88ca7493aa5310fbd4c726ea93d349880b783954d58
 MISC metadata.xml 3288 BLAKE2B e61573d67396a1c102c3f92036dbd0d1f601d383ec7e806ece97eb1ab026ee05e99f36acf98261455c8213868526bb3119c502bc837654787c663bfc9b205c84 SHA512 2f26ec7cde49879c23c56b8a860471e7c3da6b4cb0ee8c36f00d352547115fecc81cd2f1344a021e5d4895996e8744b7f6fcee3d478b901e149513fba50086c6
diff --git a/sci-physics/root/files/root-6.11.02-hsimple.patch b/sci-physics/root/files/root-6.11.02-hsimple.patch
deleted file mode 100644
index c1e88bd55b7d..000000000000
--- a/sci-physics/root/files/root-6.11.02-hsimple.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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/files/root-6.12.04-no-ocaml.patch b/sci-physics/root/files/root-6.12.04-no-ocaml.patch
deleted file mode 100644
index 1d91739f01a0..000000000000
--- a/sci-physics/root/files/root-6.12.04-no-ocaml.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 7405b8848e7c0d5ddcaa1f27b905b6931dc262e2 Mon Sep 17 00:00:00 2001
-From: Guilherme Amadio <amadio@cern.ch>
-Date: Mon, 18 Dec 2017 13:08:14 +0100
-Subject: [PATCH] Disable OCaml bindings in LLVM
-
----
- interpreter/llvm/src/cmake/config-ix.cmake | 28 ----------------------------
- 1 file changed, 28 deletions(-)
-
-diff --git a/interpreter/llvm/src/cmake/config-ix.cmake b/interpreter/llvm/src/cmake/config-ix.cmake
-index 6fb589cfd3..d1c9a70d10 100644
---- a/interpreter/llvm/src/cmake/config-ix.cmake
-+++ b/interpreter/llvm/src/cmake/config-ix.cmake
-@@ -575,32 +575,4 @@ if(CMAKE_HOST_APPLE AND APPLE)
-   endif()
- endif()
- 
--# Keep the version requirements in sync with bindings/ocaml/README.txt.
--include(FindOCaml)
--include(AddOCaml)
--if(WIN32)
--  message(STATUS "OCaml bindings disabled.")
--else()
--  find_package(OCaml)
--  if( NOT OCAML_FOUND )
--    message(STATUS "OCaml bindings disabled.")
--  else()
--    if( OCAML_VERSION VERSION_LESS "4.00.0" )
--      message(STATUS "OCaml bindings disabled, need OCaml >=4.00.0.")
--    else()
--      find_ocamlfind_package(ctypes VERSION 0.4 OPTIONAL)
--      if( HAVE_OCAML_CTYPES )
--        message(STATUS "OCaml bindings enabled.")
--        find_ocamlfind_package(oUnit VERSION 2 OPTIONAL)
--        set(LLVM_BINDINGS "${LLVM_BINDINGS} ocaml")
--
--        set(LLVM_OCAML_INSTALL_PATH "${OCAML_STDLIB_PATH}" CACHE STRING
--            "Install directory for LLVM OCaml packages")
--      else()
--        message(STATUS "OCaml bindings disabled, need ctypes >=0.4.")
--      endif()
--    endif()
--  endif()
--endif()
--
- string(REPLACE " " ";" LLVM_BINDINGS_LIST "${LLVM_BINDINGS}")
--- 
-2.15.1
-
diff --git a/sci-physics/root/files/root-6.12.04-no-opengl.patch b/sci-physics/root/files/root-6.12.04-no-opengl.patch
deleted file mode 100644
index 319020222e53..000000000000
--- a/sci-physics/root/files/root-6.12.04-no-opengl.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
-index a68c462eb3..1e82e57241 100644
---- a/cmake/modules/SearchInstalledSoftware.cmake
-+++ b/cmake/modules/SearchInstalledSoftware.cmake
-@@ -499,7 +499,7 @@ if(opengl)
- endif()
- 
- #---Check for gl2ps ------------------------------------------------------------------
--if(NOT builtin_gl2ps)
-+if(gl2ps AND NOT builtin_gl2ps)
-   message(STATUS "Looking for gl2ps")
-   find_Package(gl2ps)
-   if(NOT GL2PS_FOUND)
-@@ -999,7 +999,7 @@ if(globus)
- endif()
- 
- #---Check for ftgl if needed----------------------------------------------------------
--if(NOT builtin_ftgl)
-+if(ftgl AND NOT builtin_ftgl)
-   find_package(FTGL)
-   if(NOT FTGL_FOUND)
-     if(fail-on-missing)
-
diff --git a/sci-physics/root/files/root-6.12.04-z3.patch b/sci-physics/root/files/root-6.12.04-z3.patch
deleted file mode 100644
index 04f6edf2c6d5..000000000000
--- a/sci-physics/root/files/root-6.12.04-z3.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 4445e05660493841b5fb683c7e8a8dc6c08564ac Mon Sep 17 00:00:00 2001
-From: Guilherme Amadio <amadio@cern.ch>
-Date: Mon, 18 Dec 2017 11:49:55 +0100
-Subject: [PATCH] Only look for Z3 if necessary
-
----
- interpreter/llvm/src/tools/clang/CMakeLists.txt | 9 ++-------
- 1 file changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/interpreter/llvm/src/tools/clang/CMakeLists.txt b/interpreter/llvm/src/tools/clang/CMakeLists.txt
-index 2667b1d689..a1559d9b15 100644
---- a/interpreter/llvm/src/tools/clang/CMakeLists.txt
-+++ b/interpreter/llvm/src/tools/clang/CMakeLists.txt
-@@ -186,8 +186,6 @@ if (LIBXML2_FOUND)
-   set(CLANG_HAVE_LIBXML 1)
- endif()
- 
--find_package(Z3 4.5)
--
- include(CheckIncludeFile)
- check_include_file(sys/resource.h CLANG_HAVE_RLIMITS)
- 
-@@ -381,11 +379,8 @@ if(NOT CLANG_ENABLE_STATIC_ANALYZER AND (CLANG_ENABLE_ARCMT OR CLANG_ANALYZER_BU
- endif()
- 
- if(CLANG_ANALYZER_BUILD_Z3)
--  if(Z3_FOUND)
--    set(CLANG_ANALYZER_WITH_Z3 1)
--  else()
--    message(FATAL_ERROR "Cannot find Z3 header file or shared library")
--  endif()
-+  find_package(Z3 4.5 REQUIRED)
-+  set(CLANG_ANALYZER_WITH_Z3 1)
- endif()
- 
- if(CLANG_ENABLE_ARCMT)
--- 
-2.15.1
-
diff --git a/sci-physics/root/files/root-6.14.06-oracle.patch b/sci-physics/root/files/root-6.14.06-oracle.patch
deleted file mode 100644
index 232d3b08cfa3..000000000000
--- a/sci-physics/root/files/root-6.14.06-oracle.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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/root-6.22.00-rlogger.patch b/sci-physics/root/files/root-6.22.00-rlogger.patch
new file mode 100644
index 000000000000..8ff25c86b521
--- /dev/null
+++ b/sci-physics/root/files/root-6.22.00-rlogger.patch
@@ -0,0 +1,36 @@
+From bea87d2cde7c490c8417a97f043eaa6905c27f08 Mon Sep 17 00:00:00 2001
+From: Axel Naumann <Axel.Naumann@cern.ch>
+Date: Wed, 3 Jun 2020 16:38:49 +0200
+Subject: [PATCH] [cmake] Fix ROOT/RLogger.hxx not found:
+
+When building without root7 but with C++14, RLogger is used.
+Make it available to the include directories.
+
+(cherry picked from commit fbe075ceedcd7d7f9993864c82ac5bd2960f3494)
+---
+ core/base/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/core/base/CMakeLists.txt b/core/base/CMakeLists.txt
+index 66ec9a2224..95eea9b44a 100644
+--- a/core/base/CMakeLists.txt
++++ b/core/base/CMakeLists.txt
+@@ -198,6 +198,7 @@ set(BASE_SOURCES
+ if(CMAKE_CXX_STANDARD GREATER 11)
+   list(APPEND BASE_HEADERS ROOT/RLogger.hxx)
+   list(APPEND BASE_SOURCES v7/src/RLogger.cxx)
++  set(BASE_V7_INC ${CMAKE_SOURCE_DIR}/core/base/v7/inc)
+   # TLogger.hxx may be used without root7 flag, but is placed in v7/inc/,
+   # so we need to tell ROOT_INSTALL_HEADERS() where to find it
+   set(BASE_HEADER_DIRS inc/ v7/inc/)
+@@ -220,6 +221,7 @@ set(Core_dict_headers ${BASE_HEADERS} PARENT_SCOPE)
+ ROOT_OBJECT_LIBRARY(Base ${BASE_SOURCES})
+ 
+ target_include_directories(Base PRIVATE
++   ${BASE_V7_INC}
+    ${PCRE_INCLUDE_DIR}
+    res
+    ${CMAKE_SOURCE_DIR}/core/foundation/res
+-- 
+2.27.0
+
diff --git a/sci-physics/root/root-6.16.00-r5.ebuild b/sci-physics/root/root-6.16.00-r5.ebuild
index 856ea9fb1061..5b4861dbe3ca 100644
--- a/sci-physics/root/root-6.16.00-r5.ebuild
+++ b/sci-physics/root/root-6.16.00-r5.ebuild
@@ -25,7 +25,7 @@ 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 )
diff --git a/sci-physics/root/root-6.18.04-r2.ebuild b/sci-physics/root/root-6.18.04-r2.ebuild
index 56da96833767..043dfdd8ac3c 100644
--- a/sci-physics/root/root-6.18.04-r2.ebuild
+++ b/sci-physics/root/root-6.18.04-r2.ebuild
@@ -24,7 +24,7 @@ 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 )
diff --git a/sci-physics/root/root-6.14.08-r5.ebuild b/sci-physics/root/root-6.20.06.ebuild
index 70ca03aa303c..d719ead370c7 100644
--- a/sci-physics/root/root-6.14.08-r5.ebuild
+++ b/sci-physics/root/root-6.20.06.ebuild
@@ -1,26 +1,24 @@
 # 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)"
@@ -29,8 +27,9 @@ 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,13 +106,10 @@ CDEPEND="
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 
-RDEPEND="${CDEPEND}
-	xinetd? ( sys-apps/xinetd )"
+RDEPEND="${CDEPEND}"
 
 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() {
@@ -130,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
@@ -152,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
@@ -189,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_experimental=OFF # use standard PyROOT for now
 		-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"
@@ -314,7 +292,7 @@ src_install() {
 
 	pushd "${D}/${ROOTSYS}" > /dev/null
 
-	rm -r test emacs bin/*.{csh,sh} || die
+	rm -r emacs bin/*.{csh,sh,fish} || die
 
 	if ! use examples; then
 		rm -r tutorials || die
diff --git a/sci-physics/root/root-6.12.06-r12.ebuild b/sci-physics/root/root-6.22.00.ebuild
index 8aec2963b96b..f81b66760847 100644
--- a/sci-physics/root/root-6.12.06-r12.ebuild
+++ b/sci-physics/root/root-6.22.00.ebuild
@@ -1,25 +1,24 @@
 # 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 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
-inherit cmake-utils 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 +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)"
@@ -27,29 +26,34 @@ LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
 KEYWORDS="~amd64 ~x86"
 
 REQUIRED_USE="
-	!X? ( !asimage !opengl !qt5 !tiff )
+	^^ ( c++11 c++14 c++17 )
+	cuda? ( tmva )
+	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/libpcre:3
 	dev-libs/xxhash
 	media-fonts/dejavu
-	media-libs/freetype:2=
+	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=
+		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=
@@ -63,39 +67,38 @@ 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= )
 	fits? ( sci-libs/cfitsio:0= )
-	graphviz? ( media-gfx/graphviz:0= )
-	gsl? ( sci-libs/gsl )
+	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 )
 	postgres? ( dev-db/postgresql:= )
-	pythia6? ( sci-physics/pythia:6= )
-	pythia8? ( sci-physics/pythia:8= )
+	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 )
+	tbb? ( >=dev-cpp/tbb-2018 )
 	tmva? (
 		$(python_gen_cond_dep '
 			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
 		')
 	)
-	vc? ( dev-libs/vc )
+	vc? ( dev-libs/vc:= )
 	xml? ( dev-libs/libxml2:2= )
 	xrootd? ( net-libs/xrootd:0= )
 "
@@ -103,66 +106,63 @@ CDEPEND="
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 
-RDEPEND="${CDEPEND}
-	xinetd? ( sys-apps/xinetd )"
+RDEPEND="${CDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-6.11.02-hsimple.patch
-	"${FILESDIR}"/${PN}-6.12.04-no-ocaml.patch
-	"${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
+	"${FILESDIR}"/${PN}-6.22.00-rlogger.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 "For example, for Chirp, you would set: "
-	elog "EXTRA_ECONF=\"-Dchirp=ON\""
-	echo
+	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() {
-	cmake-utils_src_prepare
+	use cuda && cuda_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
 #       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_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}"
-		-Dexplicitlink=ON
+		-DCLING_BUILD_PLUGINS=OFF
 		-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
@@ -184,101 +184,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
-		-Dcling=ON # cling=OFF is broken
+		-Dcefweb=OFF
+		-Dclad=OFF
 		-Dcocoa=$(usex aqua)
-		-Dcxx14=$(usex root7)
+		-Dcuda=$(usex cuda)
+		-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
-		-Dgnuinstall=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=$(usex test)
-		-Drpath=ON # needed for multi-slot to work
-		-Druby=OFF # deprecated and broken
-		-Druntime_cxxmodules=OFF # does not work yet
-		-Dr=$(usex R)
-		-Dsapdb=OFF # not implemented
+		-Droottest=OFF
+		-Drpath=OFF
+		-Druntime_cxxmodules=OFF
 		-Dshadowpw=$(usex shadow)
+		-Dspectrum=ON
 		-Dsqlite=$(usex sqlite)
-		-Dsrp=OFF # not implemented
 		-Dssl=$(usex ssl)
-		-Dtable=$(usex table)
-		-Dtbb=$(usex tbb)
 		-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_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"
@@ -288,7 +282,7 @@ src_install() {
 	EOF
 
 	if use python; then
-		echo "PYTHONPATH=${ROOTSYS}/lib" >> ${ROOTENV} || die
+		echo "PYTHONPATH=\"${ROOTSYS}/lib\"" >> ${ROOTENV} || die
 	fi
 
 	doenvd ${ROOTENV}
@@ -299,7 +293,7 @@ src_install() {
 
 	pushd "${D}/${ROOTSYS}" > /dev/null
 
-	rm -r test emacs bin/*.{csh,sh} || die
+	rm -r emacs bin/*.{csh,sh,fish} || die
 
 	if ! use examples; then
 		rm -r tutorials || die
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index c8b16d196ea1..54b3cc2715b1 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.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"
@@ -24,7 +23,7 @@ RESTRICT="!test? ( test )"
 if [[ ${PV} =~ "9999" ]] ; then
 	inherit git-r3
 	KEYWORDS=""
-	EGIT_REPO_URI="http://root.cern/git/root.git"
+	EGIT_REPO_URI="https://github.com/root-project/root.git"
 	if [[ ${PV} == "9999" ]]; then
 		SLOT="0"
 	else
@@ -40,7 +39,7 @@ LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
 
 REQUIRED_USE="
 	^^ ( c++11 c++14 c++17 )
-	cuda? ( tmva !c++17 )
+	cuda? ( tmva )
 	cudnn? ( cuda )
 	!X? ( !asimage !opengl !qt5 )
 	davix? ( ssl xml )
@@ -138,12 +137,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
@@ -166,7 +167,6 @@ src_configure() {
 		-DCMAKE_INSTALL_LIBDIR="lib"
 		-DDEFAULT_SYSROOT="${EPREFIX}"
 		-DCLING_BUILD_PLUGINS=OFF
-		-Dexplicitlink=ON
 		-Dexceptions=ON
 		-Dfail-on-missing=ON
 		-Dgnuinstall=OFF
@@ -196,11 +196,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
@@ -208,22 +206,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
@@ -238,19 +235,20 @@ src_configure() {
 		-Doracle=$(usex oracle)
 		-Dpgsql=$(usex postgres)
 		-Dpythia6=$(usex pythia6)
-		-Dpythia8=$(usex pythia8)
 		-Dpyroot=$(usex python) # python was renamed to pyroot
-		-Dpython=$(usex python) # kept for backward compatibility
-		-Dpyroot_experimental=OFF # use standard PyROOT for now
+		#-Dpyroot_legacy=OFF # set to ON to use legacy PyROOT (6.22 and later)
+		#-Dpyroot_experimental=OFF # set to ON to use new PyROOT (6.20 and earlier)
+		-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
@@ -258,28 +256,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)