gentoo resync : 28.04.2021

20 files changed, 691 insertions, 215 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 2a1326f85d33..5b58cbae2ae6 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index c6a1a138b9d4..3f0af87faee9 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -1,4 +1,4 @@
 DIST espresso-4.1.3.tar.gz 16947336 BLAKE2B 14d3513eda87f62a8473a0cac0c273b3590bf78ed48b96e76d10c106713f7bbd7d37de951bd3d9210062b34c02bd83a68f3aaf1ca8215ed1dcde590e4e99b113 SHA512 1fe82683eddb7bfd9bae6e446b0f42a50087d755995963905cd419473ad17b204f20049d0cf4af9264898dd6fee36f02744b38fa45cd0e33086374cf2aebd934
-EBUILD espresso-4.1.3.ebuild 2712 BLAKE2B 254bd16353e3918209c484b03eee9b3c61df568e70b77955d16cec04b3af17dec49c2968570eb82c0d0401fb6640f5a50f3317bfb31b15435db3985e7ce5d41a SHA512 d30b9892b4852f0727f860ca4c7ad3469d701ed01aff024749153a218124d7c80738e3c571932a944603cd1c2edc7f39ebc928c129aaa2e28b3c9da18893c50a
-EBUILD espresso-9999.ebuild 2712 BLAKE2B 254bd16353e3918209c484b03eee9b3c61df568e70b77955d16cec04b3af17dec49c2968570eb82c0d0401fb6640f5a50f3317bfb31b15435db3985e7ce5d41a SHA512 d30b9892b4852f0727f860ca4c7ad3469d701ed01aff024749153a218124d7c80738e3c571932a944603cd1c2edc7f39ebc928c129aaa2e28b3c9da18893c50a
+EBUILD espresso-4.1.3.ebuild 2717 BLAKE2B d462c6221b13b7feabf9e5a19dbcc3e3bf9218dbd10da194ca116590cb8b43fd47870ac75e9c2a6910cea0976b5ccecfa70d518327ce40569bc8891e1d0303ab SHA512 28ff98bb8ecf7e8b9121b737e777dfca2a665e4c30b83f8e44e7748eca99653276c2a17c982aa66d75be5b2cba4c9b22157aff019dd8dab8cac40e19ce3af759
+EBUILD espresso-9999.ebuild 2717 BLAKE2B d462c6221b13b7feabf9e5a19dbcc3e3bf9218dbd10da194ca116590cb8b43fd47870ac75e9c2a6910cea0976b5ccecfa70d518327ce40569bc8891e1d0303ab SHA512 28ff98bb8ecf7e8b9121b737e777dfca2a665e4c30b83f8e44e7748eca99653276c2a17c982aa66d75be5b2cba4c9b22157aff019dd8dab8cac40e19ce3af759
 MISC metadata.xml 476 BLAKE2B 6c074886e03a8645cb40176234cfff18ec75c0c3faa9c72f2cce228cdcbb113eb870eb0aebde8c0c378aee65e54606addb114361255df082a00e4289cd9f0db1 SHA512 d50a5262cccf20c2949d76fbd7a17166985b018d7686deade58a2d748a91754f5691df28800f7d19f3c3f2a78755d3e90cf93f6273be849deea47ee9d7de0258
diff --git a/sci-physics/espresso/espresso-4.1.3.ebuild b/sci-physics/espresso/espresso-4.1.3.ebuild
index 1ef336f2ab40..a60bb434ef8b 100644
--- a/sci-physics/espresso/espresso-4.1.3.ebuild
+++ b/sci-physics/espresso/espresso-4.1.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake python-single-r1 savedconfig
+inherit cmake cuda python-single-r1 savedconfig
 
 DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
 HOMEPAGE="http://espressomd.org"
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index 1ef336f2ab40..a60bb434ef8b 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake python-single-r1 savedconfig
+inherit cmake cuda python-single-r1 savedconfig
 
 DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
 HOMEPAGE="http://espressomd.org"
diff --git a/sci-physics/herwig++/Manifest b/sci-physics/herwig++/Manifest
deleted file mode 100644
index 1fa1a1060124..000000000000
--- a/sci-physics/herwig++/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX herwig++-2.6.3-looptools.patch 3187 BLAKE2B 1f310339b5bd84a67aa7111ed5d548e225cfcc5620175dd3c39fd0b1a51f783fa58cc5f1d3ca7e3d7b274d4360827b95d1042d7046030300b58ca9879dffcf08 SHA512 22a39b340a12fc7060bbd26700be836b1a9833a9b43f93ddfef6659ee0517fc6804e455dd39cd26b8d3ff41c125acca34ea0e72bfa45958885c347e38078aaab
-AUX herwig++-2.7.1-fix-boost-1.67.patch 986 BLAKE2B b66583720154dd1c3a00357c3aea4a26fb6ce33b02fd4670851487fa31786c59d7a5a638d965e917e0a8b8d2b5f6c0fa947c99e054706a28f21a9f57825771df SHA512 d297990d7fc2cd8335bc3c89fba71976cd186ece40d5e5d0aa5776ca9d7c688146cb7421d6012fe0f97a1160a78eef7c4b3d49e4fe82e4d91d9c130eab04bddb
-DIST Herwig++-2.7.1.tar.bz2 3388956 BLAKE2B 20aa085d9b3e7bf3246a6431240141f027ac666d85679cb093b4d76c89d04cac3913cb8cdb6eac050bcd0da6f7ba78c97dea46ca7fd6ad578c5d8a42ed6c633e SHA512 643f389f13f22b30d0adb4ca601a11c2686f6db4746af51136601954af2ec20eb0af7b45981e764d8b71cb7206bfe310beea1fee069972868955b1f024b8d5e3
-EBUILD herwig++-2.7.1-r1.ebuild 1659 BLAKE2B 1186bb8e9654998c9b1f8b69705600de741e324e949e4fd398d469e8733d5345a0c2746778ca5bfc5a46028c296a09344968ae588981179bfadc039da3d4f978 SHA512 b62f1eb0a56df7ba06d84b837c8b289741dff00fa87f90048446dd791ed53dc31174ccf4da8b993239876ff79f9febf8bcb732df77e82c7385b3e32fb23d6f50
-MISC metadata.xml 844 BLAKE2B 62358b0fc54682b9758f5b26bce163a97be4e27aaa9fef6f92c899f6a3e82a74d4a110c0427a36677f732dcc1ed132de8741fe485379a8fbf743e087ea596a7d SHA512 72d27384af741c0508a9fa5df44c76c0bc34f0affbcbdd76e5b46b84ecb08db80bf6c8735d45df180728a13d68cef8cc97aa22e6b12b9bb946cec5036c30afc4
diff --git a/sci-physics/herwig++/files/herwig++-2.6.3-looptools.patch b/sci-physics/herwig++/files/herwig++-2.6.3-looptools.patch
deleted file mode 100644
index 0c802977db6a..000000000000
--- a/sci-physics/herwig++/files/herwig++-2.6.3-looptools.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- Looptools/Makefile.am
-+++ Looptools/Makefile.am
-@@ -1,58 +1,12 @@
--noinst_LTLIBRARIES = libHwLooptoolsXFC.la libHwLooptoolsCFC.la 
--noinst_LTLIBRARIES += libHwLooptools.la
--
--EXTRA_DIST = include/lt.h include/ftypes.h include/ff.h include/ffwarn.h \
--  include/fferr.h include/defs.h include/looptools.h include/ffperm5.h \
--  include/clooptools.h include/cexternals.h include/externals.h \
--  util/solve-LU.F util/solve-LU.h util/solve-Eigen.F
--
--theXFCSOURCES = \
--A/A0.F            A/A00.F           A/ffxa0.F         A/ffca0.F         B/Bget.F \
--B/Bcoeff.F        B/BcoeffC.F       B/Bcoeffa.F       B/Bcoeffb.F       B/ffxb0.F \
--B/ffcb0.F         B/ffxb1.F         B/ffcb1.F         B/ffxb2p.F        B/ffcb2p.F \
--B/ffxdb0.F        B/ffcdb0.F        B/ffxdb1.F        B/ffdel2.F        B/ffcel2.F \
--C/C0.F            C/C0C.F           C/Cget.F          C/ffxc0.F         C/ffcc0.F \
--C/ffxc0i.F        C/ffxc0p.F        C/ffxc0p0.F       C/ffcc0p.F        C/ffdxc0.F \
--C/ffdel3.F        C/ffcel3.F        D/D0.F            D/D0C.F           D/Dget.F \
--D/ffxd0.F         D/ffxd0h.F        D/ffxd0i.F        D/ffxd0p.F        D/ffxd0m0.F \
--D/ffxd0tra.F      D/ffxdbd.F        D/ffdcc0.F        D/ffdel4.F        D/ffd0c.F \
--D/ffTn.F          D/ffT13.F         D/ffS2.F          D/ffS3n.F         D/ffRn.F \
--E/E0.F            E/Eget.F          E/Ecoeffa.F       E/Ecoeffb.F       E/ffxe0.F \
--E/ffdel5.F    util/ini.F    util/auxCD.F   util/solve.F  util/Dump.F \
--util/Li2.F    util/ffinit.F util/ffxli2.F  util/ffcli2.F util/ffxxyz.F \
--util/ffcxyz.F util/ffcrr.F  util/ffcxr.F   util/fftran.F util/ffabcd.F \
--util/ff2dl2.F util/ffcxs3.F util/ffcxs4.F  util/ffdcxs.F util/ffbndc.F
--
--## the following need -DCOMPLEXPARA
--theCFCSOURCES = \
--A/A0.F       A/A00.F      B/Bget.F     B/Bcoeffa.F  C/Cget.F     D/Dget.F     E/E0.F \
--E/Eget.F     E/Ecoeffa.F  E/Ecoeffb.F  util/solve.F    util/Dump.F     util/Li2.F
-+noinst_LTLIBRARIES = libHwLooptools.la
- 
- commonCPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include
- 
--libHwLooptoolsXFC_la_SOURCES = $(theXFCSOURCES)
--libHwLooptoolsXFC_la_CPPFLAGS = $(commonCPPFLAGS)
--libHwLooptoolsXFC_la_FCFLAGS = $(AM_FCFLAGS) -ffixed-line-length-none
--libHwLooptoolsXFC_la_FFLAGS = $(AM_FFLAGS) -ffixed-line-length-none
--
--libHwLooptoolsCFC_la_SOURCES = $(theCFCSOURCES)
--libHwLooptoolsCFC_la_CPPFLAGS = $(commonCPPFLAGS) -DCOMPLEXPARA
--libHwLooptoolsCFC_la_FCFLAGS = $(AM_FCFLAGS) -ffixed-line-length-none
--libHwLooptoolsCFC_la_FFLAGS = $(AM_FFLAGS) -ffixed-line-length-none
--
--## installed already from "include/Makefile.am"
--## noinst_HEADERS = include/clooptools.h
--
--##if NEED_APPLE_FIXES
--##libHwLooptoolsXFC_la_LDFLAGS = -Wl,-single_module
--##libHwLooptoolsCFC_la_LDFLAGS = -Wl,-single_module
--##endif
--
--libHwLooptools_la_SOURCES = util/cache.c clooptools.cc
-+libHwLooptools_la_SOURCES = clooptools.cc
- libHwLooptools_la_CXXFLAGS = $(AM_CXXFLAGS) -Wno-strict-aliasing
- libHwLooptools_la_CPPFLAGS = $(commonCPPFLAGS) 
- libHwLooptools_la_CFLAGS = $(AM_CFLAGS) -std=c99 
--libHwLooptools_la_LIBADD = libHwLooptoolsXFC.la libHwLooptoolsCFC.la
-+libHwLooptools_la_LIBADD = -looptools
- 
- 
- ## libHwLooptoolsHelper2_la_SOURCES = clooptools.cc
diff --git a/sci-physics/herwig++/files/herwig++-2.7.1-fix-boost-1.67.patch b/sci-physics/herwig++/files/herwig++-2.7.1-fix-boost-1.67.patch
deleted file mode 100644
index bd4579b575a0..000000000000
--- a/sci-physics/herwig++/files/herwig++-2.7.1-fix-boost-1.67.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://bugs.gentoo.org/672250
-
---- a/DipoleShower/Base/DipoleChain.cc
-+++ b/DipoleShower/Base/DipoleChain.cc
-@@ -15,6 +15,7 @@
- #include "Herwig++/DipoleShower/Utility/DipolePartonSplitter.h"
- 
- #include <boost/utility.hpp>
-+#include <boost/next_prior.hpp>
- 
- using namespace Herwig;
- 
---- a/DipoleShower/Base/DipoleEventRecord.cc
-+++ b/DipoleShower/Base/DipoleEventRecord.cc
-@@ -19,6 +19,7 @@
- #include "ThePEG/PDF/PartonExtractor.h"
- 
- #include <boost/utility.hpp>
-+#include <boost/next_prior.hpp>
- 
- #include <algorithm>
- 
---- a/Exsample2/BinnedStatistics.h
-+++ b/Exsample2/BinnedStatistics.h
-@@ -16,6 +16,7 @@
- #include "ThePEG/Repository/UseRandom.h"
- 
- #include <boost/utility.hpp>
-+#include <boost/next_prior.hpp>
- 
- namespace Herwig {
- 
---- a/Exsample2/exsample/config.h
-+++ b/Exsample2/exsample/config.h
-@@ -25,6 +25,7 @@
- #include <limits>
- 
- #include <boost/utility.hpp>
-+#include <boost/next_prior.hpp>
- #include <boost/scoped_array.hpp>
- #include <boost/scoped_ptr.hpp>
- 
diff --git a/sci-physics/herwig++/herwig++-2.7.1-r1.ebuild b/sci-physics/herwig++/herwig++-2.7.1-r1.ebuild
deleted file mode 100644
index 33fcc97e82f2..000000000000
--- a/sci-physics/herwig++/herwig++-2.7.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils eutils flag-o-matic multilib
-
-MYP=Herwig++-${PV}
-
-DESCRIPTION="High-Energy Physics event generator"
-HOMEPAGE="http://herwig.hepforge.org/"
-SRC_URI="http://www.hepforge.org/archive/herwig/${MYP}.tar.bz2"
-
-SLOT="0/15"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="c++11 fastjet static-libs"
-
-# >sci-physics/looptools-2.8 leads to misoperation
-# and failing tests (it lacks some symbols)
-RDEPEND="
-	dev-libs/boost:0=
-	sci-libs/gsl:0=
-	<=sci-physics/looptools-2.8:0=
-	~sci-physics/thepeg-1.9.2:0=
-	fastjet? ( sci-physics/fastjet:0= )"
-DEPEND="${RDEPEND}
-	>=sys-devel/boost-m4-0.4_p20160328"
-
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.6.3-looptools.patch \
-		"${FILESDIR}"/${PN}-2.7.1-fix-boost-1.67.patch
-	# fixes bug 570458, which is due to an outdated bundled boost.m4
-	rm m4/boost.m4 || die
-	find -name 'Makefile.am' -exec \
-		sed -i -e '1ipkgdatadir=$(datadir)/herwig++' {} \; || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	use prefix && \
-		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/ThePEG
-	local myeconfargs=(
-		--with-boost="${EPREFIX}"/usr
-		--with-thepeg="${EPREFIX}"/usr
-		$(use_enable c++11 stdcxx11)
-		$(use_with fastjet fastjet "${EPREFIX}"/usr)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	sed -i -e "s|${ED}||g" "${ED}"/usr/share/herwig++/defaults/PDF.in || die
-	sed -i -e "s|${ED}||g" "${ED}"/usr/share/herwig++/HerwigDefaults.rpo || die
-}
diff --git a/sci-physics/herwig++/metadata.xml b/sci-physics/herwig++/metadata.xml
deleted file mode 100644
index 23f7c30990f2..000000000000
--- a/sci-physics/herwig++/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-physics@gentoo.org</email>
-    <name>Gentoo Physics Project</name>
-  </maintainer>
-  <longdescription>
-  Herwig++ is a completely new event generator, written in C++.
-  It is built on the experience gained with the well-known
-  event generator HERWIG. The aim is to provide a multi purpose
-  event generator with similar or improved capabilities (like angular
-  ordered parton evolution and the cluster hadronization model).
-</longdescription>
-  <use>
-    <flag name="c++11">Build Herwig++ using the C++11 standard.
-  Experimental feature, not for production use.</flag>
-    <flag name="fastjet">Adds support for <pkg>sci-physics/fastjet</pkg></flag>
-  </use>
-</pkgmetadata>
diff --git a/sci-physics/herwig/Manifest b/sci-physics/herwig/Manifest
index f64fe0a19032..ddfd45645ab5 100644
--- a/sci-physics/herwig/Manifest
+++ b/sci-physics/herwig/Manifest
@@ -2,5 +2,5 @@ DIST HERWIG65.INC 32 BLAKE2B 89056a5d5bca2bfe1493ba32c73501c2a0b46c0b27e3ff0ebdf
 DIST herwig6521.f 2513511 BLAKE2B 5172e07e8dfd5c731d0a8dffe061980a2629ffac5581d2df3cc619e9de166d4ecc1e66da0a07ee8527c62d45665f3740c22a92b89b88638dddee7fbd41a9a94f SHA512 c13bc74132ddb86ca0fea61bc2da21dc6908b96d14a33c378c0f37be0dce201012fdd11681e11fcfb715b345ccd72fb4d166017eaf4e0cd19762acbe6687809a
 DIST herwig6521.inc 15224 BLAKE2B 176f3b329f0eabdf5befdbc0cd372e57a3027e6d7faf447356e72b0a5c396e21f44dd594e18f37e4139e2ecc507749175441644513de4b10e055a95731ab3046 SHA512 8254dc7a99445a7f4a61760fd8bd4ede5f8b7613e25a9c51155ae614c9cb888c7a66043b3b2ec96b8f515351dab0f697dc14738bcde58fdb345f3aebdac6f1fa
 DIST hw65_manual.pdf 934022 BLAKE2B ab6d000f236246779450a239e7b7d18ed3487189b33ec27407edcf40ae7f19134a2bdc7689c55eb44ab5637efa8aa32d678eb71b782e386e6ea340f936c6cb79 SHA512 68c4407e27abe2d34e239455bd94324d919b712cc8b031faa4635caf4e3eb6ff30d35b4e7f8dc9146c8f54886ff77cc690b296b15805dcd9302ef93e707915ff
-EBUILD herwig-6.5.21-r1.ebuild 1643 BLAKE2B d31a098483c0cab4a0adc2ebf93ef3d198e3ea00568c3abe1ec351e2e72bb1b26da5f53d11c80b6bccceba46a42218bb44902ea349f30c22cd0f68fa6072cad5 SHA512 e3b8c5741afe2c8f86c2f2c3a18b3209cc1d4ef4fb112e86089a97fdb3026dbac418a3c347fe3e993fa009825d5f36525821c377f0282f56a210a05f8749a8ae
+EBUILD herwig-6.5.21-r1.ebuild 1636 BLAKE2B fbc2f8ba6f6fd7d9eb7b4bf41183bc8aa92113e055e55706ce3e62f445281925ef34931bcf2bb26e16310b29213188564bb49dd06d3d5dfc64ff2399c397cff9 SHA512 69130656f5619573862d7e23c219c05f1fc0a7ab438d986c1b0df1d1e15b3b280513738ff7a2dd01eddaeab17a7615c84e072db35aff9e1821221d366c2644fc
 MISC metadata.xml 267 BLAKE2B c385b495a9f001f00de5e6984ba8d77c2fa758403b12c844027a990345b7335fa5262471006a8892a9b987c2985bc5d61f94450d9a3eb64c8c9b94edc698bf03 SHA512 7a56e62a05945c4fd6f6ccd048a990cfd7f50dfda6d2b2b91fa1063009a9a596b630ba70d00eb21b6c622d9543ed59037ce5e354220fe698cdf67dbff02ec0c5
diff --git a/sci-physics/herwig/herwig-6.5.21-r1.ebuild b/sci-physics/herwig/herwig-6.5.21-r1.ebuild
index db6f80481b4e..78056ab8b5ea 100644
--- a/sci-physics/herwig/herwig-6.5.21-r1.ebuild
+++ b/sci-physics/herwig/herwig-6.5.21-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools eutils fortran-2 ltprune versionator
+inherit autotools fortran-2 ltprune versionator
 
 PV1=$(get_version_component_range 1 ${PV})
 PV2=$(get_version_component_range 2 ${PV})
diff --git a/sci-physics/lammps/Manifest b/sci-physics/lammps/Manifest
index 3626d767ab7c..de56efcfba5c 100644
--- a/sci-physics/lammps/Manifest
+++ b/sci-physics/lammps/Manifest
@@ -1,4 +1,4 @@
 DIST lammps-stable_3Mar2020.tar.gz 126001870 BLAKE2B 35ed6ff208fd6dcc8eae50b8e0562a6a0771aa6419c0225353f648d95512ca64b22250ad4a3f9b836b9a25a6838e24e070a1d190fdc02b896dc1ed9838648f01 SHA512 6608cd9f6ea18d8acb55d611a560cb4b329043b41aca23fafd91fac0dfbde5a5286e1a6563bd16b2414bb3bf95929e3a2f270a0b023ce5ede515eb3353d56f04
 DIST lammps-testing-stable_3Mar2020.tar.gz 55729550 BLAKE2B d0de8efa83342b4a350f17a43d3fe96011534b3f410beb295e396a45200ea56298c14664b290b2e30ab4f2fd70b92c01c73927b2878e8171a166dedee8ecf379 SHA512 e3dc592ce57ae625eb66ddd9ca80d7bbaca57c47a07166a7196dcc3074b574a497e706da8baf93b5deacdf588702ceb141014533ac2aaccdd011836fb34943b9
-EBUILD lammps-20200303.ebuild 3043 BLAKE2B adc573dde316ae1b4e0f8730a998cb4fd4100ef7543f337d255034a2e2018428209d063977f4f1726a35b68ac46232a54b55e79ebada774d6dac106017e419b9 SHA512 65e11efe60e38b668a69a84922cb7130c7ce889b42e4a22c2c0ed1275d8b1a5df72e53da34102ff5e90f5507c36f4326c2dc0b8cd657703aa866990eb3799464
+EBUILD lammps-20200303-r1.ebuild 3058 BLAKE2B ef2ba82d63cf376d4e43ca43eeb8fee3772f7b927e36e9d1b7a762c4786805fc9742b701bd9b2a563fc32cd73a8688d8c12e0220b261cccaf7d763bc7a07cfff SHA512 7c137e91c53be71ef015b7c44fe780dd9bcc077bc9dfbd28f015c4d886cef599396a4dbd179759549b24c66d18a00468776179dc0254a665aff79fce18a04929
 MISC metadata.xml 1400 BLAKE2B 799d1c7a8a17a78af7de38cba5058ebe2b79eb577f8bcfa918459bccedecf151adc9442fe2031f16c6215b9126045a7472cb91fdf0d9a68c6f22271a5a2a5226 SHA512 8f864d325dfcbba719be7f7860485810a63a685739d0f2a0ec45989362b3eec28351d4ad34f579572f638291f2bad96ac04ca6eacd4c886ffbb77fb6d06dbe12
diff --git a/sci-physics/lammps/lammps-20200303.ebuild b/sci-physics/lammps/lammps-20200303-r1.ebuild
index aa161200f770..750459af9395 100644
--- a/sci-physics/lammps/lammps-20200303.ebuild
+++ b/sci-physics/lammps/lammps-20200303-r1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
+CMAKE_MAKEFILE_GENERATOR=emake
 
-inherit cmake-utils fortran-2 python-r1
+inherit cmake fortran-2 python-r1
 
 convert_month() {
 	local months=( "" Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec )
@@ -114,11 +115,11 @@ src_configure() {
 		-DPKG_USER-SPH=ON
 		-DPKG_USER-TALLY=ON
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# Install python script.
 	use python && python_foreach_impl python_domodule "${S}"/../python/lammps.py
diff --git a/sci-physics/lhapdf/Manifest b/sci-physics/lhapdf/Manifest
index 51c3ae2391c6..d33f01089def 100644
--- a/sci-physics/lhapdf/Manifest
+++ b/sci-physics/lhapdf/Manifest
@@ -1,5 +1,5 @@
 DIST LHAPDF-6.2.3.tar.gz 750659 BLAKE2B a16f67c69f41e96cdb5434cc53658c6b085b94c9ad06443fdfb49aa1de50eeb2a59aa41442a032c29b361bad4f749cef42499f3d16f2774efb0b399f889576e4 SHA512 167064a141f46e5c834d950690a989330b940acec62377b8b4c40e14665503cf7b4ddb79e05c71ebe1f801231192d951e294bec3944ec37b2bca484b2e5ce894
 DIST LHAPDF-6.3.0.tar.gz 770744 BLAKE2B 02b9fe3507b87c6f0c635ceb203304eb9b3ee8ac4d17c8b83578f8c05b78b17035b63b6d3d9a0b9fe3505a3daf8e9376fe25040b8826ea4976d2a717b1447eb9 SHA512 4a5aca6e2f06b59a44acc23ef76f1fae747f38e425803e7625cc68130da0c76d1e0d534b7b1867f09c86ee838d4f769d5097257170740db704c966d91c41f94b
 EBUILD lhapdf-6.2.3.ebuild 1631 BLAKE2B b986649bf0ddcb1935c27e41acc9c75f72495a712a91f4777c2d93da8c2389a7d6f969bc98dcdd07415e61133927733f749972b835ae3fb63a81360af23e36e5 SHA512 7b80b0a71f21bb3dc4cb9b5a36de573e5ed58dac0b55ee82d272912c78ea2dbc467cf625c4b805de268b1d9571368f505d91332c4bee2f159a7a8e63bd3c82f3
-EBUILD lhapdf-6.3.0.ebuild 1631 BLAKE2B 3b0f5fdc06e578219750f5d87ad06fa16c43f00397e78b7a0dcc8360a742389f4f40b3df6f70285bb30b9aeadc85c5e4724c6adbca4ef6d5b2e7b358a4858560 SHA512 0643569f589b753aa2e4cd12edf58b57b751c57020486413593ccb5612305d7ffab0d7274a4a152133200684db265cbb23913367a2e34bad1ac1b1b3f17ac841
+EBUILD lhapdf-6.3.0.ebuild 1629 BLAKE2B 1f94a3659432b0d28fb9898eaf2ceecfc4d53e60b44adb9711c9cde9301574d8e144f515a5f123036c7dc6e57a3ed6f64543bcd65cf27280d387695f5127f3c0 SHA512 66d8c4d81f4d7931211cfeaf6e08bdf046acb30f7f2592984e148f19ce13d473720f79afb1290e63152a2cffa0244c92398990315d8cc727f0fe6bc2d81ca9a7
 MISC metadata.xml 996 BLAKE2B 97df1e778a0e4fdd20faeffcc992c5c76d203c35f9916a15c823bd10d8914cea7b2b6c7b58cca1e6af50ff4a134db8c5cf40db345520cd6f4d16a58d02fda822 SHA512 0c5f089f8428dfbf3e6151f2d9052409dbf7dc64af40fe28664df3e6ba014c8ec4c3e6ae2958c0f0b13ee7edc59f038dab14272622119cc5cb5d6f7fc43637cc
diff --git a/sci-physics/lhapdf/lhapdf-6.3.0.ebuild b/sci-physics/lhapdf/lhapdf-6.3.0.ebuild
index 6c93048a666b..9fc01878697b 100644
--- a/sci-physics/lhapdf/lhapdf-6.3.0.ebuild
+++ b/sci-physics/lhapdf/lhapdf-6.3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.hepforge.org/archive/lhapdf/${MY_PF}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index e070e1b41101..27af362494c4 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,7 +1,10 @@
 AUX root-6.12.06_cling-runtime-sysroot.patch 989 BLAKE2B 8202cc8f2bf72cc25642d0a03ba26c3969069b291a6a22188879dbedbf0c3c496149f79f671d0eb51d81d0ee36565660d136b4741f5d018c2b05325ff08381f0 SHA512 c96dee9843da1051c54bd6870ef0a04714944ffe1f86800c9a51b8eb8ef84107d3315d3a708dcc0b651248af4bec362c7f31695514505045aeda9c793d40dc58
 DIST root_v6.22.06.source.tar.gz 173073959 BLAKE2B 3db5e5ff73509a87d00aaba5a394c96aaddebac210ce692d10b9174f0bdff5dc5862c25c9ff66e481b9fda96684cfca45ab49824166404f59ad76edb3fbdddde SHA512 39b330f0cd594f06e30e33dd4b0fc86cfd076b006e5287ff61e577deaf76e63f2e5780b72f53c0770b7d2e28e6f61133ff54b5d905ec2ad845c8f00b10be6fb7
 DIST root_v6.22.08.source.tar.gz 173079716 BLAKE2B 0b3c15dfedd0215334dcd59db133aa9097709996e0e9cc20a1ae96f954ee607cad314291148f78a31f24ba78dee84204e617e17a6ed8a390503b068e8120e9f3 SHA512 2355e20b8c4d7ad747c31956a3ad0f6e7b70039f3e6613182bd7c53d0e8776267ee85fc1d8aad9ed0d942e28f4124ad79a7dc1082bb1ea7974be2cb6a8a85b39
+DIST root_v6.24.00.source.tar.gz 185185756 BLAKE2B cf46534c0e9476a428291c65ec1456af10e47d830dd006aacf43307db11ad5732c357aabd09f4297276190d21fc18fdd6966f5f5e6cd437cc46878fa72fde260 SHA512 bba72cbe310c3ce9a64adc990aaeba6df970f17dc7132d2c3fdc83cc72d24973a3e15c02067a95870794e576e4065478d7a3ed52bfb8f0598294356a7fceff03
 EBUILD root-6.22.06.ebuild 7525 BLAKE2B ee3341e24f9970c9fbe2358b2859148ccac84cb67fa96b56e21741f10d43bb26cff200437509ef9d7a084594d0b22b0d0866441a31352f10600d77772cfb5e87 SHA512 4d5f483eb06144a1a52b905e8012abc2563db862c7b6fa78d6ea8c329749e179985d676226214a165f94a72e2533ac6bc776bd980157c7430a80ab4f0df7fb0a
 EBUILD root-6.22.08.ebuild 7525 BLAKE2B 409206a9110827040b326947010340f2668ad137e67787eee269f875103166a7c96811dfede68d6bae03496071262919d2d2403ae3bde0a1f9c718595f5acaa6 SHA512 bc2ae7becf056c26cacda629bb6b05d970a0eb6c106f1caafda1e2a8be1ddc72f80509b56ec1cc5825f111ec3b93a22227aae396701b2b52c0a02669bfb8d84d
-EBUILD root-9999.ebuild 7994 BLAKE2B c5cc6646627394518614ecc5b6c399fec63c89e69dc8e9cf8335b06be47bbb034806509580e9e57081e05da02523fe04932ff29d39754c709e954ef748fc589b SHA512 6b7cbbbe2395c8ff32ff0003d4b7d26d9e30bec26a1d5affe6ecb17e14c77ec427d923c469d733d2f41d302d6387ab3e8c777cc1b141e8efb3608857d0b2c66f
-MISC metadata.xml 3060 BLAKE2B a08c5d2c54daba2c05984d23d1a912929ab94e40e0b72b17a804b442f7c5b2a2a1039485d529d14953c25261c7a8179d67c6790dab733cc7cee6c1ce0fb0d509 SHA512 6ca7f1940a92053a2c12412882a6b4e478758af94fae422e1ace6cc55cc25dea8117cb042f034a98db6993afba3726d4f4d9d983513ada940c14bc9d988abc26
+EBUILD root-6.24.00.ebuild 7764 BLAKE2B a19ed4e4982066eda95ca2b6b13b82f35ed4df3687d860aa56f6d0a9806e29d8e102c741f088f0515543f07a6f8bc0cb223bc0547d82b9e127e7df4dc3876e6e SHA512 e2dd91f6ad29439083ab004de532b9c58a0abbc4bacbf4905ac69cc5adffdc307ae49bfc68946b1ea40d2259bf95e4b1a3fb6ae720fac56d755524671506a427
+EBUILD root-6.24.9999.ebuild 8235 BLAKE2B d5ffdc4a4989ddccdb76aca2968e3e3af3373fd31723aae6122cb5b69f5e6a4206417e5c75f99b95bddaaccd9ab0ea0c42b5b6b9595f2c6645e7f320bcb39cca SHA512 ba4ad6c225689a2f76bc168d391833a222c4415107a45fa113acce6e5d39cb2de1c83cf1e435093a0c1497ed366e8ba13ab02802a3747b428465d76caf470860
+EBUILD root-9999.ebuild 8235 BLAKE2B d5ffdc4a4989ddccdb76aca2968e3e3af3373fd31723aae6122cb5b69f5e6a4206417e5c75f99b95bddaaccd9ab0ea0c42b5b6b9595f2c6645e7f320bcb39cca SHA512 ba4ad6c225689a2f76bc168d391833a222c4415107a45fa113acce6e5d39cb2de1c83cf1e435093a0c1497ed366e8ba13ab02802a3747b428465d76caf470860
+MISC metadata.xml 3149 BLAKE2B 88e20041b72bc4507f253ea0b9096567f6a7c5c7f7bf6851adfb69c24aedb73fb68b2541538cd01fd51d944425c22f4b7154379ac70d851659efeaa1e3a07337 SHA512 65a82570e75f9b4b3e6f8d1e1cfd1aad5f3e2199843853392b51ea1e1f4dcc7ef6500196aa0f759726cb0d0e17be19055d8c9c87e745fa11d337acc2eaf5ce74
diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 453df091a133..15ba329fe27c 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -42,6 +42,7 @@
     <flag name="tbb">Enable implicit multi-threading (IMT) with <pkg>dev-cpp/tbb</pkg></flag>
     <flag name="tmva">Built TMVA (ROOT's multi-variate analysis toolkit for machine learning)</flag>
     <flag name="unuran">Enable support for <pkg>sci-mathematics/unuran</pkg></flag>
+    <flag name="uring">Enable support for <pkg>sys-libs/liburing</pkg> in RNTuple</flag>
     <flag name="vc">Enable support for <pkg>dev-libs/vc</pkg> with VecCore</flag>
     <flag name="vmc">Built the Virtual Monte Carlo library</flag>
     <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
diff --git a/sci-physics/root/root-6.24.00.ebuild b/sci-physics/root/root-6.24.00.ebuild
new file mode 100644
index 000000000000..9357a155802c
--- /dev/null
+++ b/sci-physics/root/root-6.24.00.ebuild
@@ -0,0 +1,317 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ninja does not work due to fortran
+CMAKE_MAKEFILE_GENERATOR=emake
+FORTRAN_NEEDED="fortran"
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+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 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 uring
+	vc vmc +xml xrootd"
+RESTRICT="!test? ( test )"
+
+SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
+LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="
+	^^ ( c++11 c++14 c++17 )
+	cuda? ( tmva )
+	cudnn? ( cuda )
+	!X? ( !asimage !opengl !qt5 )
+	davix? ( ssl xml )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	qt5? ( root7 )
+	root7? ( || ( c++14 c++17 ) )
+	tmva? ( gsl )
+	uring? ( root7 )
+"
+
+CDEPEND="
+	app-arch/lz4
+	app-arch/zstd
+	app-arch/xz-utils
+	fortran? ( dev-lang/cfortran )
+	dev-cpp/nlohmann_json
+	dev-libs/libpcre:3
+	dev-libs/xxhash
+	media-fonts/dejavu
+	media-libs/freetype:2
+	media-libs/libpng:0=
+	sys-libs/ncurses:=
+	sys-libs/zlib
+	X? (
+		x11-libs/libX11:0
+		x11-libs/libXext:0
+		x11-libs/libXft:0
+		x11-libs/libXpm:0
+		opengl? (
+			media-libs/ftgl:0=
+			media-libs/glew:0=
+			virtual/opengl
+			virtual/glu
+			x11-libs/gl2ps:0=
+		)
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtwebengine:5[widgets]
+		)
+	)
+	asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
+	cudnn? ( dev-libs/cudnn )
+	davix? ( net-libs/davix )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	fftw? ( sci-libs/fftw:3.0= )
+	fits? ( sci-libs/cfitsio:0= )
+	graphviz? ( media-gfx/graphviz )
+	gsl? ( sci-libs/gsl:= )
+	http? ( dev-libs/fcgi:0= )
+	libcxx? ( sys-libs/libcxx )
+	unuran? ( sci-mathematics/unuran:0= )
+	minuit? ( !sci-libs/minuit )
+	mpi? ( virtual/mpi )
+	mysql? ( dev-db/mysql-connector-c )
+	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql:= )
+	pythia6? ( sci-physics/pythia:6 )
+	pythia8? ( sci-physics/pythia:8 )
+	python? ( ${PYTHON_DEPS} )
+	R? ( dev-lang/R )
+	shadow? ( sys-apps/shadow )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl:0= )
+	tbb? ( dev-cpp/tbb )
+	tmva? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	uring? ( sys-libs/liburing )
+	vc? ( dev-libs/vc:= )
+	xml? ( dev-libs/libxml2:2= )
+	xrootd? ( net-libs/xrootd:0= )
+"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch
+)
+
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+
+	elog "There are extra options on packages not available in Gentoo."
+	elog "You can use the environment variable EXTRA_ECONF to enable"
+	elog "these packages. For example, for Vdt you would set:"
+	elog "EXTRA_ECONF=\"-Dbuiltin_vdt=ON -Dvdt=ON\""
+}
+
+src_prepare() {
+	use cuda && cuda_src_prepare
+
+	cmake_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
+#       with vanilla clang. The patches enable the C++ interpreter to work.
+#       Since ROOT installs many files into /etc (>100MB in total) that don't
+#       really belong there, we install it into another directory to avoid
+#       making /etc too big.
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_COMPILER=$(tc-getCC)
+		-DCMAKE_CXX_COMPILER=$(tc-getCXX)
+		-DCMAKE_CUDA_HOST_COMPILER=$(tc-getCXX)
+		-DCMAKE_C_FLAGS="${CFLAGS}"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+		-DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
+		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
+		-DCMAKE_INSTALL_LIBDIR="lib"
+		-DDEFAULT_SYSROOT="${EPREFIX}"
+		-DCLING_BUILD_PLUGINS=OFF
+		-Dasserts=OFF
+		-Ddev=OFF
+		-Dexceptions=ON
+		-Dfail-on-missing=ON
+		-Dgnuinstall=OFF
+		-Dshared=ON
+		-Dsoversion=ON
+		-Dbuiltin_llvm=ON
+		-Dbuiltin_clang=ON
+		-Dbuiltin_cling=ON
+		-Dbuiltin_openui5=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_nlohmannjson=OFF
+		-Dbuiltin_openssl=OFF
+		-Dbuiltin_pcre=OFF
+		-Dbuiltin_tbb=OFF
+		-Dbuiltin_unuran=OFF
+		-Dbuiltin_vc=OFF
+		-Dbuiltin_vdt=OFF
+		-Dbuiltin_veccore=OFF
+		-Dbuiltin_xrootd=OFF
+		-Dbuiltin_xxhash=OFF
+		-Dbuiltin_zlib=OFF
+		-Dbuiltin_zstd=OFF
+		-Dalien=OFF
+		-Darrow=OFF
+		-Dasimage=$(usex asimage)
+		-Dccache=OFF # use ccache via portage
+		-Dcefweb=OFF
+		-Dclad=OFF
+		-Dcocoa=$(usex aqua)
+		-Dcuda=$(usex cuda)
+		-Dcudnn=$(usex cudnn)
+		-Dcxxmodules=OFF # requires clang, unstable
+		-Ddataframe=ON
+		-Ddavix=$(usex davix)
+		-Ddcache=OFF
+		-Ddistcc=OFF
+		-Dfcgi=$(usex http)
+		-Dfftw3=$(usex fftw)
+		-Dfitsio=$(usex fits)
+		-Dfortran=$(usex fortran)
+		-Dgdml=$(usex gdml)
+		-Dgfal=OFF
+		-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
+		-Dminuit2=$(usex minuit)
+		-Dminuit=$(usex minuit)
+		-Dmlp=$(usex tmva)
+		-Dmonalisa=OFF
+		-Dmpi=$(usex mpi)
+		-Dmysql=$(usex mysql)
+		-Dodbc=$(usex odbc)
+		-Dopengl=$(usex opengl)
+		-Doracle=$(usex oracle)
+		-Dpgsql=$(usex postgres)
+		-Dpyroot=$(usex python) # python was renamed to pyroot
+		-Dpyroot_legacy=OFF
+		-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
+		-Dshadowpw=$(usex shadow)
+		-Dspectrum=ON
+		-Dsqlite=$(usex sqlite)
+		-Dssl=$(usex ssl)
+		-Dtcmalloc=OFF
+		-Dtest_distrdf_pyspark=OFF
+		-Dtesting=$(usex test)
+		-Dtmva=$(usex tmva)
+		-Dtmva-cpu=$(usex tmva)
+		-Dtmva-gpu=$(usex cuda)
+		-Dtmva-pymva=$(usex tmva)
+		-Dtmva-rmva=$(usex R)
+		-Dunuran=$(usex unuran)
+		-During=$(usex uring)
+		-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_src_configure
+}
+
+src_compile() {
+	# needed for hsimple.root
+	addwrite /dev/random
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+
+	ROOTSYS=${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)
+	ROOTENV="$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)"
+
+	cat > ${ROOTENV} <<- EOF || die
+	MANPATH="${ROOTSYS}/share/man"
+	PATH="${ROOTSYS}/bin"
+	ROOTPATH="${ROOTSYS}/bin"
+	LDPATH="${ROOTSYS}/lib"
+	EOF
+
+	if use python; then
+		echo "PYTHONPATH=\"${ROOTSYS}/lib\"" >> ${ROOTENV} || die
+	fi
+
+	doenvd ${ROOTENV}
+
+	if use emacs; then
+		elisp-install ${PN}-$(ver_cut 1-2) "${BUILD_DIR}"/root-help.el
+	fi
+
+	pushd "${D}/${ROOTSYS}" > /dev/null
+
+	rm -r emacs bin/*.{csh,sh,fish} || die
+
+	if ! use examples; then
+		rm -r tutorials || die
+	fi
+
+	# create versioned symlinks for binaries
+	cd bin;
+	for exe in *; do
+		dosym "${exe}" "/usr/lib/${PN}/$(ver_cut 1-2)/bin/${exe}-$(ver_cut 1-2)"
+	done
+}
diff --git a/sci-physics/root/root-6.24.9999.ebuild b/sci-physics/root/root-6.24.9999.ebuild
new file mode 100644
index 000000000000..dabb6bbd617f
--- /dev/null
+++ b/sci-physics/root/root-6.24.9999.ebuild
@@ -0,0 +1,336 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ninja does not work due to fortran
+CMAKE_MAKEFILE_GENERATOR=emake
+FORTRAN_NEEDED="fortran"
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+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"
+
+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 uring
+	vc vmc +xml xrootd"
+RESTRICT="!test? ( test )"
+
+if [[ ${PV} =~ "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/root-project/root.git"
+	if [[ ${PV} == "9999" ]]; then
+		SLOT="0"
+	else
+		SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
+		EGIT_BRANCH="v$(ver_cut 1)-$(ver_cut 2)-00-patches"
+	fi
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz"
+fi
+
+LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
+
+REQUIRED_USE="
+	^^ ( 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 )
+	uring? ( root7 )
+"
+
+CDEPEND="
+	app-arch/lz4
+	app-arch/zstd
+	app-arch/xz-utils
+	fortran? ( dev-lang/cfortran )
+	dev-cpp/nlohmann_json
+	dev-libs/libpcre:3
+	dev-libs/xxhash
+	media-fonts/dejavu
+	media-libs/freetype:2
+	media-libs/libpng:0=
+	sys-libs/ncurses:=
+	sys-libs/zlib
+	X? (
+		x11-libs/libX11:0
+		x11-libs/libXext:0
+		x11-libs/libXft:0
+		x11-libs/libXpm:0
+		opengl? (
+			media-libs/ftgl:0=
+			media-libs/glew:0=
+			virtual/opengl
+			virtual/glu
+			x11-libs/gl2ps:0=
+		)
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtwebengine:5[widgets]
+		)
+	)
+	asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
+	cudnn? ( dev-libs/cudnn )
+	davix? ( net-libs/davix )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	fftw? ( sci-libs/fftw:3.0= )
+	fits? ( sci-libs/cfitsio:0= )
+	graphviz? ( media-gfx/graphviz )
+	gsl? ( sci-libs/gsl:= )
+	http? ( dev-libs/fcgi:0= )
+	libcxx? ( sys-libs/libcxx )
+	unuran? ( sci-mathematics/unuran:0= )
+	minuit? ( !sci-libs/minuit )
+	mpi? ( virtual/mpi )
+	mysql? ( dev-db/mysql-connector-c )
+	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql:= )
+	pythia6? ( sci-physics/pythia:6 )
+	pythia8? ( sci-physics/pythia:8 )
+	python? ( ${PYTHON_DEPS} )
+	R? ( dev-lang/R )
+	shadow? ( sys-apps/shadow )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl:0= )
+	tbb? ( dev-cpp/tbb )
+	tmva? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	uring? ( sys-libs/liburing )
+	vc? ( dev-libs/vc:= )
+	xml? ( dev-libs/libxml2:2= )
+	xrootd? ( net-libs/xrootd:0= )
+"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch
+)
+
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+
+	elog "There are extra options on packages not available in Gentoo."
+	elog "You can use the environment variable EXTRA_ECONF to enable"
+	elog "these packages. For example, for Vdt you would set:"
+	elog "EXTRA_ECONF=\"-Dbuiltin_vdt=ON -Dvdt=ON\""
+}
+
+src_prepare() {
+	use cuda && cuda_src_prepare
+
+	cmake_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
+#       with vanilla clang. The patches enable the C++ interpreter to work.
+#       Since ROOT installs many files into /etc (>100MB in total) that don't
+#       really belong there, we install it into another directory to avoid
+#       making /etc too big.
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_COMPILER=$(tc-getCC)
+		-DCMAKE_CXX_COMPILER=$(tc-getCXX)
+		-DCMAKE_CUDA_HOST_COMPILER=$(tc-getCXX)
+		-DCMAKE_C_FLAGS="${CFLAGS}"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+		-DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
+		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
+		-DCMAKE_INSTALL_LIBDIR="lib"
+		-DDEFAULT_SYSROOT="${EPREFIX}"
+		-DCLING_BUILD_PLUGINS=OFF
+		-Dasserts=OFF
+		-Ddev=OFF
+		-Dexceptions=ON
+		-Dfail-on-missing=ON
+		-Dgnuinstall=OFF
+		-Dshared=ON
+		-Dsoversion=ON
+		-Dbuiltin_llvm=ON
+		-Dbuiltin_clang=ON
+		-Dbuiltin_cling=ON
+		-Dbuiltin_openui5=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_nlohmannjson=OFF
+		-Dbuiltin_openssl=OFF
+		-Dbuiltin_pcre=OFF
+		-Dbuiltin_tbb=OFF
+		-Dbuiltin_unuran=OFF
+		-Dbuiltin_vc=OFF
+		-Dbuiltin_vdt=OFF
+		-Dbuiltin_veccore=OFF
+		-Dbuiltin_xrootd=OFF
+		-Dbuiltin_xxhash=OFF
+		-Dbuiltin_zlib=OFF
+		-Dbuiltin_zstd=OFF
+		-Dalien=OFF
+		-Darrow=OFF
+		-Dasimage=$(usex asimage)
+		-Dccache=OFF # use ccache via portage
+		-Dcefweb=OFF
+		-Dclad=OFF
+		-Dcocoa=$(usex aqua)
+		-Dcuda=$(usex cuda)
+		-Dcudnn=$(usex cudnn)
+		-Dcxxmodules=OFF # requires clang, unstable
+		-Ddataframe=ON
+		-Ddavix=$(usex davix)
+		-Ddcache=OFF
+		-Ddistcc=OFF
+		-Dfcgi=$(usex http)
+		-Dfftw3=$(usex fftw)
+		-Dfitsio=$(usex fits)
+		-Dfortran=$(usex fortran)
+		-Dgdml=$(usex gdml)
+		-Dgfal=OFF
+		-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
+		-Dminuit2=$(usex minuit)
+		-Dminuit=$(usex minuit)
+		-Dmlp=$(usex tmva)
+		-Dmonalisa=OFF
+		-Dmpi=$(usex mpi)
+		-Dmysql=$(usex mysql)
+		-Dodbc=$(usex odbc)
+		-Dopengl=$(usex opengl)
+		-Doracle=$(usex oracle)
+		-Dpgsql=$(usex postgres)
+		-Dpythia6=$(usex pythia6)
+		-Dpyroot=$(usex python) # python was renamed to pyroot
+		#-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
+		-Dshadowpw=$(usex shadow)
+		-Dspectrum=ON
+		-Dsqlite=$(usex sqlite)
+		-Dssl=$(usex ssl)
+		-Dtcmalloc=OFF
+		-Dtest_distrdf_pyspark=OFF
+		-Dtesting=$(usex test)
+		-Dtmva=$(usex tmva)
+		-Dtmva-cpu=$(usex tmva)
+		-Dtmva-gpu=$(usex cuda)
+		-Dtmva-pymva=$(usex tmva)
+		-Dtmva-rmva=$(usex R)
+		-Dunuran=$(usex unuran)
+		-During=$(usex uring)
+		-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_src_configure
+}
+
+src_compile() {
+	# needed for hsimple.root
+	addwrite /dev/random
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+
+	ROOTSYS=${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)
+
+	if [[ ${PV} == "9999" ]]; then
+		ROOTENV="9900${PN}-git"
+	else
+		ROOTENV="$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)-git"
+	fi
+
+	cat > ${ROOTENV} <<- EOF || die
+	MANPATH="${ROOTSYS}/share/man"
+	PATH="${ROOTSYS}/bin"
+	ROOTPATH="${ROOTSYS}/bin"
+	LDPATH="${ROOTSYS}/lib"
+	EOF
+
+	if use python; then
+		echo "PYTHONPATH=\"${ROOTSYS}/lib\"" >> ${ROOTENV} || die
+	fi
+
+	doenvd ${ROOTENV}
+
+	if use emacs; then
+		elisp-install ${PN}-$(ver_cut 1-2) "${BUILD_DIR}"/root-help.el
+	fi
+
+	pushd "${D}/${ROOTSYS}" > /dev/null
+
+	rm -r emacs bin/*.{csh,sh,fish} || die
+
+	if ! use examples; then
+		rm -r tutorials || die
+	fi
+
+	# create versioned symlinks for binaries
+	if [[ ! ${PV} == "9999" ]]; then
+		cd bin;
+		for exe in *; do
+			dosym "${exe}" "/usr/lib/${PN}/$(ver_cut 1-2)/bin/${exe}-$(ver_cut 1-2)"
+		done
+	fi
+}
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index ea14149330d7..dabb6bbd617f 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit cmake cuda elisp-common fortran-2 prefix python-single-r1 toolchain-funcs
 
@@ -16,8 +16,8 @@ HOMEPAGE="https://root.cern"
 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"
+	qt5 R +roofit root7 shadow sqlite +ssl +tbb test +tmva +unuran uring
+	vc vmc +xml xrootd"
 RESTRICT="!test? ( test )"
 
 if [[ ${PV} =~ "9999" ]] ; then
@@ -46,6 +46,7 @@ REQUIRED_USE="
 	qt5? ( root7 )
 	root7? ( || ( c++14 c++17 ) )
 	tmva? ( gsl )
+	uring? ( root7 )
 "
 
 CDEPEND="
@@ -53,6 +54,7 @@ CDEPEND="
 	app-arch/zstd
 	app-arch/xz-utils
 	fortran? ( dev-lang/cfortran )
+	dev-cpp/nlohmann_json
 	dev-libs/libpcre:3
 	dev-libs/xxhash
 	media-fonts/dejavu
@@ -103,12 +105,13 @@ CDEPEND="
 	shadow? ( sys-apps/shadow )
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? ( dev-libs/openssl:0= )
-	tbb? ( >=dev-cpp/tbb-2018 )
+	tbb? ( dev-cpp/tbb )
 	tmva? (
 		$(python_gen_cond_dep '
 			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
 		')
 	)
+	uring? ( sys-libs/liburing )
 	vc? ( dev-libs/vc:= )
 	xml? ( dev-libs/libxml2:2= )
 	xrootd? ( net-libs/xrootd:0= )
@@ -166,6 +169,8 @@ src_configure() {
 		-DCMAKE_INSTALL_LIBDIR="lib"
 		-DDEFAULT_SYSROOT="${EPREFIX}"
 		-DCLING_BUILD_PLUGINS=OFF
+		-Dasserts=OFF
+		-Ddev=OFF
 		-Dexceptions=ON
 		-Dfail-on-missing=ON
 		-Dgnuinstall=OFF
@@ -173,6 +178,8 @@ src_configure() {
 		-Dsoversion=ON
 		-Dbuiltin_llvm=ON
 		-Dbuiltin_clang=ON
+		-Dbuiltin_cling=ON
+		-Dbuiltin_openui5=ON
 		-Dbuiltin_afterimage=OFF
 		-Dbuiltin_cfitsio=OFF
 		-Dbuiltin_davix=OFF
@@ -184,6 +191,7 @@ src_configure() {
 		-Dbuiltin_gsl=OFF
 		-Dbuiltin_lz4=OFF
 		-Dbuiltin_lzma=OFF
+		-Dbuiltin_nlohmannjson=OFF
 		-Dbuiltin_openssl=OFF
 		-Dbuiltin_pcre=OFF
 		-Dbuiltin_tbb=OFF
@@ -208,6 +216,7 @@ src_configure() {
 		-Ddataframe=ON
 		-Ddavix=$(usex davix)
 		-Ddcache=OFF
+		-Ddistcc=OFF
 		-Dfcgi=$(usex http)
 		-Dfftw3=$(usex fftw)
 		-Dfitsio=$(usex fits)
@@ -251,6 +260,7 @@ src_configure() {
 		-Dsqlite=$(usex sqlite)
 		-Dssl=$(usex ssl)
 		-Dtcmalloc=OFF
+		-Dtest_distrdf_pyspark=OFF
 		-Dtesting=$(usex test)
 		-Dtmva=$(usex tmva)
 		-Dtmva-cpu=$(usex tmva)
@@ -258,6 +268,7 @@ src_configure() {
 		-Dtmva-pymva=$(usex tmva)
 		-Dtmva-rmva=$(usex R)
 		-Dunuran=$(usex unuran)
+		-During=$(usex uring)
 		-Dvc=$(usex vc)
 		-Dvdt=OFF
 		-Dveccore=OFF