gentoo Easter resync : 12.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
commit: 623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree: 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /sci-physics
parent: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
37 files changed, 1205 insertions, 320 deletions
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 026c6e21f712..295c73df5f11 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/clhep/Manifest b/sci-physics/clhep/Manifest
index bfdbb44c1e7b..715f36c39904 100644
--- a/sci-physics/clhep/Manifest
+++ b/sci-physics/clhep/Manifest
@@ -1,7 +1,9 @@
 DIST clhep-2.2.0.5.tgz 1847046 BLAKE2B 8dddc6b9acbf41abdd849ef1aa1087d93f48fc83937ee67e687e28c421d290683e5381c2b9f8034e2651e3ccec2fd2e0ba8bee73dc55618e22c0e4df7ce3a378 SHA512 07d9359604196344fe3b13cc103727693fd70818c22849e54507530221812843a943cb8ed66eea421e498edcc9c0f584826823ea7939cbf53b90b17d412aed1a
 DIST clhep-2.4.0.4.tgz 1536520 BLAKE2B 7ab58aeab685950393c8059f77e95cbbf7bf61f04e8113c6fd7b09200cce497716d5a0e023143dde395db895f48848a78e579e38968d9f27a50769034003e11e SHA512 349c1225713a3bc91fe94e27f938e919b434e6466df94dcde915c7e8ed313b9b2e7186e67a9b580ede21aec0050507a070c279920590148ebbec0ac5733fb008
 DIST clhep-2.4.1.2.tgz 1537636 BLAKE2B ad6cc94e1147747d2875c3f630155527fc428cf2b6dc3236824c0f70712eea9416006b127ff0dbb5c4f0c853618cc2c3f6f8e57e5a833d7d6e1e4328d161212b SHA512 e79139682f9955ff4cb79846cca5823c70b6710e7b8e227218346c05205a346d9dfee9f03736f8d1833379ba880239babdb3398cde776318550451d284269974
-EBUILD clhep-2.2.0.5.ebuild 1356 BLAKE2B cd2005aaafdeabafcf050acf1abe4dda1688cdeffc9214cceffcb6d6ee5e08a41bf8ad8dae5cbf3cc3b29a212da3b8ad927c100c3bc6ba28c6c39489e97de84f SHA512 9c032c41d9d51c62d5aad84d8ff96e99b868f95bb362d0e2504bb2a84f751cd2e99c14f6db1229c9c947412fa256524d0a4cdfd0529aeedb051ab10df729569c
-EBUILD clhep-2.4.0.4.ebuild 1136 BLAKE2B cc4ef773bdda3fc23de379471e4c0a846e56b7ca27b3ac3ebd087c20961217c22fe7bd3a87938b305c7fe6b9da3880cb1d18538461ea771ab927a8a133149dd8 SHA512 0b7660f3e45479bf7bd5fc570da83b063773e7bc35bdda8e4dad119b5c81fb9a5de1e5180c9ad4fbc18f6d8285f5106508d485041b31c9ef6dea3bf1a7c3ff0b
-EBUILD clhep-2.4.1.2.ebuild 1123 BLAKE2B 84aa826cac794998afc5411f3afda330409ebeda2aed83caf0bc24769fbe66ccc3baba657898b93de5b529c9bcac5499efcb8e97d7b550db0765218d6963c540 SHA512 b235ebbdf83c4b7365f347bd891b533ccd3992a46f5fee94af8594ab82b8b05f12e827baf16eb38bc0a434ec378b847dbce66175dbc6a505040bc0c307696a45
+DIST clhep-2.4.1.3.tgz 1537908 BLAKE2B 92fd1fcc415b01d8efa44be67c3bf9e58af2b4d18b6e7ee2161fbc20312428a6f17eacc09150ccff7fefb1686161518042f5c2f7558ff00b4d5696d002432ece SHA512 f7a52b353dc2c6d30cb7d307af71a028838ec674af2a50fe0199335d0b0f7fb4b84489ccfd12f21ecb7b1327acbc87065e7e87363308fd0caad5748a657aac13
+EBUILD clhep-2.2.0.5.ebuild 1347 BLAKE2B 90a2000635f4be1d1aaceecc9abe05e5e3c0da3b1ec41e09e08685f7eaf01a1738b38bde6eeab5c6aa15f67e31fca89deddd68e2d7be888d93d97bca4665a05f SHA512 8e8818288544e5f36487ef4903f8dbd5c95e32d9b7266250e7f7ba05b4e7a2c3d29898b654d0ee9a6801b79d8dd8899deffa1042ee543df3923e569fe98d6c3b
+EBUILD clhep-2.4.0.4.ebuild 1286 BLAKE2B eefcd15e6d91547411fce7a35f45902bb82237141487f30763f1e58e8572ca0e71e12991a5cba98a550e5769ecc47d43c377e3b307725b7d88100b100a3c720c SHA512 526c396df82466dd0f18043e38f00cc79e85a9bbc5fe66181fb2c0f2922a0f1340eb9d1513720a815caf85786edc4e317656aa39d05ce760d1339b20e2817fb0
+EBUILD clhep-2.4.1.2.ebuild 1271 BLAKE2B 94ccb40d51b6b377180cda403282dfbfa81cbc2b16b51d97240fe93bf43f902f987e3a454a24d37fa5bb3854824dee4ff4c61af80004edbb513b91f86b298d02 SHA512 a6e7c5a80a1b9a3f21a6de83e435788289a1cf16155b4402315b206a7db9bf9abde4464dd483f935b8e2a97ed77328406488e53bdf20928b54ecb207d0a33667
+EBUILD clhep-2.4.1.3.ebuild 1076 BLAKE2B 09d86813d3c4e586a1ae8b37ff8b88f28e9db11bbe8d5a875c8724635518c1a653e579b44c63bd75ae94449f519494db203906207377567e5977a84502bfb393 SHA512 f5e7865a8ee8d01cc71162a644efc85785fbb795ede0c5d16a6b34d8cfa238dfadcdb5fbe6e017e1ea1332ea8e02772f60b541be1108309e99323e037c639d06
 MISC metadata.xml 496 BLAKE2B 60254470fbb21294249dd75b34aebb0d29d090aba3a41f75e02950ccd77fe1ca0043eec460844f2de4b2a9b4bd4e34f2faa6c00b81daf8e615b78d92f503ade3 SHA512 768aeefc23a2ea89eb63b0eb6fd084c253243b6d67b822702dffc8f49a7170d30e55ebc08875ff238e618639882f93fe6e1390e3d8456f3850d75d5a98bf3b96
diff --git a/sci-physics/clhep/clhep-2.2.0.5.ebuild b/sci-physics/clhep/clhep-2.2.0.5.ebuild
index b403ed9ff5ad..2c12b7fa1861 100644
--- a/sci-physics/clhep/clhep-2.2.0.5.ebuild
+++ b/sci-physics/clhep/clhep-2.2.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="http://proj-clhep.web.cern.ch/proj-clhep/"
 SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/${P}.tgz"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2/${PV}"
-KEYWORDS="amd64 hppa ppc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
diff --git a/sci-physics/clhep/clhep-2.4.0.4.ebuild b/sci-physics/clhep/clhep-2.4.0.4.ebuild
index e70ed5a04200..b72155c7a620 100644
--- a/sci-physics/clhep/clhep-2.4.0.4.ebuild
+++ b/sci-physics/clhep/clhep-2.4.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,12 +10,21 @@ HOMEPAGE="http://proj-clhep.web.cern.ch/proj-clhep/"
 SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/${P}.tgz"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2/${PV}"
-KEYWORDS="amd64 hppa ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 IUSE="doc test threads"
 RESTRICT="!test? ( test )"
 
-BDEPEND="doc? ( app-doc/doxygen[latex] )"
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
 
 S="${WORKDIR}/${PV}/CLHEP"
 
diff --git a/sci-physics/clhep/clhep-2.4.1.2.ebuild b/sci-physics/clhep/clhep-2.4.1.2.ebuild
index 2b6ac11002d0..d1e22595d8af 100644
--- a/sci-physics/clhep/clhep-2.4.1.2.ebuild
+++ b/sci-physics/clhep/clhep-2.4.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,12 +10,21 @@ HOMEPAGE="http://proj-clhep.web.cern.ch/proj-clhep/"
 SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/dist1/${P}.tgz"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2/${PV}"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 IUSE="doc test threads"
 RESTRICT="!test? ( test )"
 
-BDEPEND="doc? ( app-doc/doxygen[latex] )"
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
 
 S="${WORKDIR}/${PV}/CLHEP"
 
diff --git a/sci-physics/clhep/clhep-2.4.1.3.ebuild b/sci-physics/clhep/clhep-2.4.1.3.ebuild
new file mode 100644
index 000000000000..baf35e7057fd
--- /dev/null
+++ b/sci-physics/clhep/clhep-2.4.1.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="High Energy Physics C++ library"
+HOMEPAGE="http://proj-clhep.web.cern.ch/proj-clhep/"
+SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/dist1/${P}.tgz"
+LICENSE="GPL-3 LGPL-3"
+SLOT="2/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+IUSE="doc test threads"
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? ( app-doc/doxygen[latex] )"
+
+S="${WORKDIR}/${PV}/CLHEP"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# respect flags
+	sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die
+	# dont build test if not asked
+	if ! use test; then
+		cmake_comment_add_subdirectory test
+	fi
+	# gentoo doc directory
+	if use doc; then
+		grep -rl 'share/doc/CLHEP' |
+		xargs sed -i \
+			-e "s:share/doc/CLHEP:share/doc/${PF}:" \
+			{.,*}/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCLHEP_BUILD_DOCS=$(usex doc)
+		-DCLHEP_SINGLE_THREAD=$(usex threads no yes)
+	)
+	DESTDIR="${ED}" cmake-utils_src_configure
+}
diff --git a/sci-physics/geant-data/Manifest b/sci-physics/geant-data/Manifest
index b80efe4326e3..f34770bde0e1 100644
--- a/sci-physics/geant-data/Manifest
+++ b/sci-physics/geant-data/Manifest
@@ -1,24 +1,24 @@
-DIST G4ABLA.3.0.tar.gz 54909 BLAKE2B d2e893c7b85836bd1bc9c2ab0923696d66a71d75360b00f65320d4634164c5525cf3d939746dcc4ab7720387a6f4cf6350ec577605a94727ae53550b519e33d7 SHA512 905a56c142793de005dc5771509cdd8c4f98e596b95223a1a058cbf614cf48805478839eeec3a29594daf3d89c6b4d72cb33b016a596cdadc4247e452afbd526
 DIST G4ABLA.3.1.tar.gz 107286 BLAKE2B ff60665b01dcdb85a76028af472e6f71068b8132187701c46e5c4e8509125d34853d3c574561be22f34cc5f35503ec0808f2964888cd19259392de8054f19647 SHA512 4178870783ca015dade0b07006afc27fed095ff195251c672a0812f9c8e13908b5dfa9a127e8f3ec473f242bf7faf6d49a3371a75e669a06245722924b7c4278
-DIST G4EMLOW.6.50.tar.gz 28334495 BLAKE2B 057cbf55da026e080df26e95328b9aa416acedac11cfc4666c96954538488309e589376648638746bbea2ffca04461a0ae8f4adc98db04213742637a6daf1fd2 SHA512 587b6103b44ade27d5715eb804bfc172989cef63ca9a01e7454ff07140db85bb10083c036441905b6bbd5f04d373f51a73dc4bf7f7712c0314da1155406d8588
 DIST G4EMLOW.7.7.tar.gz 107307909 BLAKE2B dc97ecadc6f17e789e781e90531e09131641e9d2e4cfa06adcf9913ec9720f92d23b18871d06bd090cf036e35af7b0d1a80fb41e816ebb41cc23d8c18d0ba647 SHA512 de8b942cfe009ebd614a1c0824ab889183b319bd3fb835d1f0fd98076e50f1372bb318ede30a7a936d9c64ba039231be5fcb74b4ca6c813691e9d5ceb862fdb0
-DIST G4ENSDFSTATE.2.1.tar.gz 290690 BLAKE2B e43fb12b502a06565b4fcf182ce2ffc0807d08f5f46a98944cfe86ba3d3c03e8aa4858b057c3e9f8ede7f4cb7d9ff5faa430dc11b0d3ebac633b61d0a17449cc SHA512 8e56a00bd5e3956de10931f8b702c614e84471e0f2fa65fe81d44a6a28719ed65d9b61e5ebd6216f35a044ad6c6f430c761a52703f72eab0c1fe99e794a8e284
+DIST G4EMLOW.7.9.1.tar.gz 119756769 BLAKE2B 67be0b7ac34beb995ad4132883927fb99a78f93e7c99390c93fe897b4208a94a3ea5faaab1d04def5c248151c82d46431b411cb22303ffe941c6fe8a57d30423 SHA512 7f52ad5a3935323b60e5ea5196a64a2209337ca3d208109bceb648b95a5a3b0aa33f9a46f878884cb398e49302733c6f5b6316254261d350d038af8ec412952f
+DIST G4EMLOW.7.9.tar.gz 118027817 BLAKE2B 3456d07a0d87accbdf90049626e653488bb592f113e898e364638924259ce889940a20b7c84e40f16e654ca3fbb9e892050ce7e66a62a9e267706c5750bcd313 SHA512 6c5ae214915b273d20bec1483267279d53a015a13ed30ba1de325d489b5b34e65b227f8fd6caeb5fef28c2a582b7285002338e866f32c7f151fb1508ee55c54d
 DIST G4ENSDFSTATE.2.2.tar.gz 290632 BLAKE2B aff44d0b6512e4a227fa61a33045023652699843f80d1e90e236d491afd90be828a7bb393a4bb5b224b296d6e3f899a11027340b9e1ebffe705d08708af283fa SHA512 4feaa4229ac520d0e81ab0e31691ee899fa1f10b1a57f66b986fbe19729f7548000b8bac3519d09e91a1f7e116aa7a5bfeae5a3f5b6c3364168b51f4b5bb88c3
 DIST G4INCL.1.0.tar.gz 95840 BLAKE2B 2c264b7563620cdbdb8a5e529f21766a5b5ea3e2e51047362518714d01854de8d9ca2ca2a0183ab672cc2f8a4d951327b0e1a7298799695fd48233fa5e529686 SHA512 9d769566d1728674bd6d1e59fc05882943cd240d2f0a9e47dff37fa64fe27720b20b66f6dea6d300c3c9082a22f7f71bb416df8c7d2b5bae87251c4a0113f49b
 DIST G4NDL.4.5.tar.gz 421710294 BLAKE2B dab13b4c4ad9406e91172e1f8ec343a9be7c6c64f82e6a3b42a6fb19dec3d52b07a7a4848136af29e0cc82daff0ff02aa9e252d57e667c1a1e1a050039fff2fd SHA512 166d0189693f14c08fa9c48e4212c1cb275a848fdf0be3dfc4240bd01d1d4816f3ec3c85149995192e7055b58fd56c7e078e9d6819e01fdeafc13457bfa90470
-DIST G4NEUTRONXS.1.4.tar.gz 2249001 BLAKE2B 9c830fdbf38931b03e45c98ea80f44a4f1ff324ba7448165112c66d849a18149f1f9173b87e8cdd7d773cc471d1fd5d2b0153ac63e19fec648c4f28a5bb01ad5 SHA512 f0de306e35d0cacc77fcea4d233077247afa172413a69ef1255e47fd250e36460c38c47265dbc81499dd47c0aca7266c5299cb5c0cabef04684b796ba890f944
+DIST G4NDL.4.6.tar.gz 599862135 BLAKE2B 78e30dd0f02f3b7d7fce12a3a4dcb83e1405ba45f19ed2a743ee7e72be426e09a31cedb521a62a116a8a580a39c83987d4e39ab621b73e0d7a41e7dab8f36d41 SHA512 29b7d933d3e691b03cf45db0c4a9335c03f34ce57149a37b66a0f85e41d500d985f86bc8becc206d85202f129f60ea9fb1ef16bc4a9eef48cde593ffd5a85f24
 DIST G4PARTICLEXS.1.1.tar.gz 3388648 BLAKE2B ed179d003a84007dc26319f2b3e7349586f8e1ef58de8acb8e8560867195ada039cb62b763afc58e5e234425db39297a9f586a0249c59bca5199e78d5f219861 SHA512 feaf86d0382c199f7a443bffd4d083e635ab3e9c535b535b426c447a8e25f2ddbaac39965038eb1b9cac12132a9c19c7b86c5670863dc4e93d3aa1f4ecebf369
+DIST G4PARTICLEXS.2.0.tar.gz 4597118 BLAKE2B bc93da5bd9d8384c84056092ff404b93d5f28c88777365e514b6e8f17504a836036e98a469fe5e56123ea34f2846351b9441a01e9711ceef4f392438011bf4c3 SHA512 c3bff7f60f9ed7b0ebfecfc71a2415980b94b924827c5bbc964257d522318743765ebe826e9ab4d41cc856c65ceb7be6e2033a5d47bac036b50a21b51f7e8416
+DIST G4PARTICLEXS.2.1.tar.gz 4600435 BLAKE2B 7132411824d9d3f47b5a4b1fced0a4099baed6a91596661d74ba540b91b5d12e475eb5bb364b8be7457592136fe2c629c98a9f8015a7b6fbd380c8c720078cd5 SHA512 b96c62a4cfd654381cf57eddcff10902ce42327a500eee007dc01ce4fbda6da44905d00ed9731740f6ff2ad2177194d7098b675bb7b72deba16394add81028c1
 DIST G4PII.1.3.tar.gz 4293607 BLAKE2B 1ddf90c0e49ea51129b08bf6eb3cdf62f88abe19325e8aec76f156da32602c0498ddee36d1598035fa21df95f9d86b99137f9a6f49d7c9ef2b8eb6081db233b1 SHA512 dc458f5845948f54315477886d28fd51ea2d45f3675f45d42e8352cc5961705d920d200097dc9b55ad826ff426a655258b970ddd5a96867f706eb14e9ebbfd1a
-DIST G4PhotonEvaporation.4.3.tar.gz 19394277 BLAKE2B 57c851a0d5b0563120dfd0d57d0171c995202d0380f2549420b761b748ef7baf2ce9bb8d990ee592f938e09955a1702e9621865a8b225bb759839f0ccf75857f SHA512 7c9333d0c2644316acbbea61b60d5b7f981ec7cad06e630332572c598133bab4b4568fbe8c10b84a54a0fee5d95dc8f05232626d70244c2d36fcb5c4d077ad9c
 DIST G4PhotonEvaporation.5.3.tar.gz 9877289 BLAKE2B a7c76c2b85f1006f2336b37d743f76fb8eaa1730d3d1f34b15ee34a7af09b4811c0a57cd661ad4a627f0424edb94b6126cdc7ef63dc4beb2ad3ea0f24b096de6 SHA512 19038cc64eaa07a996f5ae2a73b82cb3b02996880ae3b72a0d24c2b9058a53683b99b4ed1f265fd1d4d37fe9e72329d0fbe08e40f7b9d007b69aa68a3b6eb719
-DIST G4RadioactiveDecay.5.1.tar.gz 1057159 BLAKE2B eb7beac3686f897507a688c1ff7eb588bf7ba639d2dd8b8a4d1c6c64aeadae14d60b6da4d6414fc1a6ebf166156f9e2feb502c50a5468593b5ac9aab434b4662 SHA512 d9b7a18fb2259374982037db619d18d474bc6a64ebd21546f6b30146b77a2f5c4e5460b02258f9eaa13a5bfde772ce674f5269f84210bbc58face08cea51a797
+DIST G4PhotonEvaporation.5.5.tar.gz 10087354 BLAKE2B c336b015c0fe8471e899b95d66c3feb3a1b9aeac01010bd840a9d9bf88b7e91924c9f2d17e5626451be8841f5b95ddf10540e05305269a97608b339d6cd5cf78 SHA512 50c27edbcc271e5af353addc08132470df9b5efdeeece8c980d8d449adea6996109b880cd9cac0abab6e0a65e8c3f5c32ac7dc998a7760196bc862ccfc87f0bd
 DIST G4RadioactiveDecay.5.3.tar.gz 1022013 BLAKE2B a9470e3cf1eb50c0e79d5c136e88b94c83123a1ed7f88da7eada669a7c3497ab54a647f6a4b84a11904ffcfb4194503bd6fa660127351c958f3b18dcd2919a29 SHA512 a11169de1044eae15e4f5ca43ec25e917aa31b901ab1bdc3055cb999281124f4b98a8c20e53043c012f1e7572172467209ec306c21770f66e7039f7199cffc5a
+DIST G4RadioactiveDecay.5.4.tar.gz 1059968 BLAKE2B 5093ca0c7e529c1f1ddb732f6d2ddb24b7533d266a325601271a73fff23fe05b57a591a5ca229e1c479c5d85dfe3a40aa00869231976e9ecf2976679030a8027 SHA512 2462c8f1503a4dde96c62d9644155a5c7de4430251c06f76b8e3dd35df98d96e34687c77cc11a9be198b918ad64585a10a81a0fef4ff26d63f0737b5b1254f17
 DIST G4RealSurface.2.1.1.tar.gz 133386050 BLAKE2B 68fb3ebadabe0c04a34279c9ff3a15545cfcf05ea18324d0fa776f4616feaeea2cd26af61d0078204c95c819d247963b416326433fda1e96a2918f23d4b2ff02 SHA512 f7755b41e30f8728710cf878d8783df9ac07d5394d0cf3358d9f4f6f4f73b9563c22657bdd9cf4ee7bebb9823fa530d86a64d2e0acbca77a80a411786c6b7202
-DIST G4SAIDDATA.1.1.tar.gz 25800 BLAKE2B d742a1de20c9ea7736a518a3ea130df2e62e06a3ab3330961aa1b9156fbaaf07ce85736bf9d135f6bf087488cc3e23564bd360439add0dc1a105805b4460390d SHA512 191627972dbf859e40e07ec4a63c5e7300571da6792c2588a6ad997e246c3fc41e890679aced918ba2496586da643c23884c4d9754329387e3579e52c87b6202
 DIST G4SAIDDATA.2.0.tar.gz 38502 BLAKE2B 349608f8f8f57b091579b4892f1547c25f0c730fe8b22de3a7355f45ea08232c3ab12af64583cf4d48528b54489d0c71c724066715592766a2a51a1a6d4eb745 SHA512 cb192c10cc9805ab8d57d5f6dca595f85ac628ccac5b975b5d8ff965ed3841b9b01071ffa76469c9a03f9ca564267f5c4a300f13d8df5056b43cd71c669bd35c
 DIST G4TENDL.1.3.2.tar.gz 585100935 BLAKE2B f58bc9e4f6741d7df84559bb41542ecd4de3891b3f79d8194d3f8174de6aed6e87f8d2d648315dac988b6daf6106780b6f88398da2040e67608da8614fb2cf42 SHA512 635707dc421354d8cd596398d69745b6038a80c44b7284951a3e0966829c08ac731bd42f7321adfab75d06d868f99e466c6f1425685770568f44ec6c1035903f
-DIST G4TENDL.1.3.tar.gz 587566993 BLAKE2B a747dc692488b54c0fd26acfc29854d8d3703018dcb37443a08f285ba555aaf3e647f6b76bae87dcdc202b92c05ddfceda2ae6b38e2df669c2e36c919dce8b61 SHA512 09ca25c3e8d188fc14f1619ba000a87d6d5b3d5d25057cbb07d6c9b464fb425eeb99d0f521e594c30eaaa625f5100772461ac53bb280bf9813c821370c847b22
-DIST RealSurface.1.0.tar.gz 1257863 BLAKE2B 51186baa6b7deb009adad446a8c6b16e858708a696a79aebb722121ab73c3d11e2448c7f6bfe8d9be6fe2b26c2efe5cadfae4d99f7472baa39e9e0b4293ed6ee SHA512 6457e1931fe1989f822493dbcb3193d97fdb37ecdc8341e953af1fb66816aa589e9d5abaa8a937e4599924c005fc32c763dd0db9af567c4c94aa07fae292be76
-EBUILD geant-data-4.10.03.ebuild 1132 BLAKE2B 55f08417386fe30881282ef05ec003f2f1b1c92bca9e90153c61934c1f15ebb61fb4af37272672ce4a2f061ea35ec6949b3176e3a4943423de592439ae8a57b9 SHA512 f0e41679c23ea666ce731b45033f15fed3b1ee9ca1ccf7f36b9be25df4554b1ee0378d91742a2a7ffdce92cc95f71a2f584b4901a9dfca0b9495968fdaf2d2c1
 EBUILD geant-data-4.10.05.ebuild 1147 BLAKE2B c0e238f637366de8523e5b2b525d7bdacf8a0227bae36525b24b01bd92afe6158ea55be4be24b2cc518427befac15b24c379ebc4e90982bc7313de8b0cae55e4 SHA512 3ca51ece5a9b7389c362001e5036ad598e63bc80267b5e41298ee1ee0a202dd67361f2eabf097bac1da365b0ea3218008456866ed6d89166c1d1ba67e7ee573c
-MISC metadata.xml 424 BLAKE2B c42f6756c505e24b3d461bd7940de8850953036629409502ba8935655109ce8af432cfcc0da459906e64c99c8c7a55f01f8351b62022cf73e8c90a66f06cafc0 SHA512 146cb215b33b638a62f30e3340190c0e02604fc1dd94973790e71209fd1011f433e21cadce1555d2e13eff5d743aa6cce12d16f5cf36676e80744e082b5b2e8b
+EBUILD geant-data-4.10.6.ebuild 1524 BLAKE2B a88678a620a6c8d6b240338ebd0a94332e247b177f8d72b3db3a6839952326af0de95a633d18bcc103ea18b408408308aa32f1d41bd3a1701dbbbdb1e0a06dad SHA512 a9c9927af7ef055f10aff045b2a94469aed5800df07e1570907b0ffe06d639a5b1094c78631644f6f688947a3c38903216aebcf41318dac6b0c0c2aa59585ccc
+EBUILD geant-data-4.10.6_beta1.ebuild 1524 BLAKE2B 6cc32de3973b5e236de7ac583cab9323d3a859899836e72e6325146e487898d471244989eac45c5ae3e3e65db8bff8c07a9be8821d641e366e44cbd6e709cad2 SHA512 e55636c263287cb0d83009509c7dbcc609da4ee6bb778fcc8e833f10aff3b89beef6e2bef0d111eb5d855ca058b8e2d60a2090b456fcde7635ec1158380b9959
+EBUILD geant-data-4.10.6_p1.ebuild 1526 BLAKE2B 0b62d69ec77ec76fd839685bbb54a425ca2f650f5e1abdb371c5d145ca4d3f515464bf9b44a6201090f1736788f3f1a1293afb5fa4c14faa45261ca4b57bfa66 SHA512 4089f135981ccbb35365dcef7dc06050977a8e57c8d7193adf3df63eb418fc2fe6023fa8288192ccbc3366c13401b039c9a0eeaaccc38cdb0a9f778afdf41945
+MISC metadata.xml 534 BLAKE2B 84abce35bec7069db8e962a0f053de5f317d01df153a07bf93cf519b390336514da9e9c5bee2ae17637f5d93c5e7d04f748d0d04c0b0f3d566907cba7cc0426f SHA512 734a46e3c0bcb4ce52498a85d45a7fd3d8ee3507296aa36ec578e8f346a29aa93f56e4b0a3f68311531b383a6aa499a890e0483328013d9a7d208686d2cd47ff
diff --git a/sci-physics/geant-data/geant-data-4.10.03.ebuild b/sci-physics/geant-data/geant-data-4.10.03.ebuild
deleted file mode 100644
index 821922f9dfa4..000000000000
--- a/sci-physics/geant-data/geant-data-4.10.03.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Data files for Geant4 physical processes"
-HOMEPAGE="http://geant4.cern.ch/"
-
-GEANT4_DATA="
-	G4NDL.4.5
-	G4EMLOW.6.50
-	G4PhotonEvaporation.4.3
-	G4RadioactiveDecay.5.1
-	G4SAIDDATA.1.1
-	G4NEUTRONXS.1.4
-	G4ABLA.3.0
-	G4PII.1.3
-	RealSurface.1.0
-	G4ENSDFSTATE.2.1
-	G4TENDL.1.3"
-
-SRC_COM="http://geant4.cern.ch/support/source"
-for d in ${GEANT4_DATA}; do
-	SRC_URI="${SRC_URI} ${SRC_COM}/${d}.tar.gz"
-done
-unset d
-
-LICENSE="geant4"
-SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=sci-physics/geant-${PV}:4"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	# unpack in destination only to avoid copy
-	return
-}
-
-src_install() {
-	sed -n "s,export \(G4.\+DATA=\"\).*\(/share/Geant.\+/data/.\+\) > /dev/null ; pwd\`,\1${EPREFIX}/usr\2,p" \
-		"${EPREFIX}/usr/bin/geant4.sh" > 99geant-data || die
-	doenvd 99geant-data
-	local g4dir=/usr/$(sed -n 's|.*/\(share/Geant4.*/data\).*|\1|p' "${EPREFIX}/usr/bin/geant4.sh" | tail -n 1)
-	dodir ${g4dir}
-	cd "${ED%/}/${g4dir}" || die
-	unpack ${A}
-}
diff --git a/sci-physics/geant-data/geant-data-4.10.6.ebuild b/sci-physics/geant-data/geant-data-4.10.6.ebuild
new file mode 100644
index 000000000000..7c0919671e17
--- /dev/null
+++ b/sci-physics/geant-data/geant-data-4.10.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Data files for Geant4 physical processes"
+HOMEPAGE="https://geant4.web.cern.ch"
+SRC_DATA="https://geant4-data.web.cern.ch/geant4-data/datasets"
+
+declare -A DATASETS
+
+DATASETS=(
+	[G4NDL]="G4NDL 4.6 G4NEUTRONHPDATA"
+	[G4EMLOW]="G4EMLOW 7.9 G4LEDATA"
+	[PhotonEvaporation]="G4PhotonEvaporation 5.5 G4LEVELGAMMADATA"
+	[RadioactiveDecay]="G4RadioactiveDecay 5.4 G4RADIOACTIVEDATA"
+	[G4PARTICLEXS]="G4PARTICLEXS 2.1 G4PARTICLEXSDATA"
+	[G4PII]="G4PII 1.3 G4PIIDATA"
+	[RealSurface]="G4RealSurface 2.1.1 G4REALSURFACEDATA"
+	[G4SAIDDATA]="G4SAIDDATA 2.0 G4SAIDXSDATA"
+	[G4ABLA]="G4ABLA 3.1 G4ABLADATA"
+	[G4INCL]="G4INCL 1.0 G4INCLDATA"
+	[G4ENSDFSTATE]="G4ENSDFSTATE 2.2 G4ENSDFSTATEDATA"
+	[G4TENDL]="G4TENDL 1.3.2 G4PROTONHPDATA"
+)
+
+for DATASET in ${!DATASETS[@]}; do
+	read FILENAME VERSION ENVVAR <<< "${DATASETS[$DATASET]}"
+	SRC_URI+="${SRC_DATA}/${FILENAME}.${VERSION}.tar.gz "
+done
+unset DATASET FILENAME VERSION ENVVAR
+
+LICENSE="geant4"
+SLOT="4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_unpack() {
+	# unpack in destination only to avoid copy
+	return
+}
+
+src_install() {
+	for DATASET in ${!DATASETS[@]}; do
+		read FILENAME VERSION ENVVAR <<< "${DATASETS[$DATASET]}"
+		echo $ENVVAR=\"${EPREFIX}/usr/share/geant4/data/${DATASET}${VERSION}\";
+	done >| 99geant-data
+	doenvd 99geant-data
+	dodir /usr/share/geant4/data
+	cd "${ED%/}/usr/share/geant4/data" || die
+	unpack ${A}
+}
diff --git a/sci-physics/geant-data/geant-data-4.10.6_beta1.ebuild b/sci-physics/geant-data/geant-data-4.10.6_beta1.ebuild
new file mode 100644
index 000000000000..bfb0044595e7
--- /dev/null
+++ b/sci-physics/geant-data/geant-data-4.10.6_beta1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Data files for Geant4 physical processes"
+HOMEPAGE="https://geant4.web.cern.ch"
+SRC_DATA="https://geant4-data.web.cern.ch/geant4-data/datasets"
+
+declare -A DATASETS
+
+DATASETS=(
+	[G4NDL]="G4NDL 4.5 G4NEUTRONHPDATA"
+	[G4EMLOW]="G4EMLOW 7.7 G4LEDATA"
+	[PhotonEvaporation]="G4PhotonEvaporation 5.3 G4LEVELGAMMADATA"
+	[RadioactiveDecay]="G4RadioactiveDecay 5.3 G4RADIOACTIVEDATA"
+	[G4PARTICLEXS]="G4PARTICLEXS 2.0 G4PARTICLEXSDATA"
+	[G4PII]="G4PII 1.3 G4PIIDATA"
+	[RealSurface]="G4RealSurface 2.1.1 G4REALSURFACEDATA"
+	[G4SAIDDATA]="G4SAIDDATA 2.0 G4SAIDXSDATA"
+	[G4ABLA]="G4ABLA 3.1 G4ABLADATA"
+	[G4INCL]="G4INCL 1.0 G4INCLDATA"
+	[G4ENSDFSTATE]="G4ENSDFSTATE 2.2 G4ENSDFSTATEDATA"
+	[G4TENDL]="G4TENDL 1.3.2 G4PROTONHPDATA"
+)
+
+for DATASET in ${!DATASETS[@]}; do
+	read FILENAME VERSION ENVVAR <<< "${DATASETS[$DATASET]}"
+	SRC_URI+="${SRC_DATA}/${FILENAME}.${VERSION}.tar.gz "
+done
+unset DATASET FILENAME VERSION ENVVAR
+
+LICENSE="geant4"
+SLOT="4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_unpack() {
+	# unpack in destination only to avoid copy
+	return
+}
+
+src_install() {
+	for DATASET in ${!DATASETS[@]}; do
+		read FILENAME VERSION ENVVAR <<< "${DATASETS[$DATASET]}"
+		echo $ENVVAR=\"${EPREFIX}/usr/share/geant4/data/${DATASET}${VERSION}\";
+	done >| 99geant-data
+	doenvd 99geant-data
+	dodir /usr/share/geant4/data
+	cd "${ED%/}/usr/share/geant4/data" || die
+	unpack ${A}
+}
diff --git a/sci-physics/geant-data/geant-data-4.10.6_p1.ebuild b/sci-physics/geant-data/geant-data-4.10.6_p1.ebuild
new file mode 100644
index 000000000000..8dae65a66711
--- /dev/null
+++ b/sci-physics/geant-data/geant-data-4.10.6_p1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Data files for Geant4 physical processes"
+HOMEPAGE="https://geant4.web.cern.ch"
+SRC_DATA="https://geant4-data.web.cern.ch/geant4-data/datasets"
+
+declare -A DATASETS
+
+DATASETS=(
+	[G4NDL]="G4NDL 4.6 G4NEUTRONHPDATA"
+	[G4EMLOW]="G4EMLOW 7.9.1 G4LEDATA"
+	[PhotonEvaporation]="G4PhotonEvaporation 5.5 G4LEVELGAMMADATA"
+	[RadioactiveDecay]="G4RadioactiveDecay 5.4 G4RADIOACTIVEDATA"
+	[G4PARTICLEXS]="G4PARTICLEXS 2.1 G4PARTICLEXSDATA"
+	[G4PII]="G4PII 1.3 G4PIIDATA"
+	[RealSurface]="G4RealSurface 2.1.1 G4REALSURFACEDATA"
+	[G4SAIDDATA]="G4SAIDDATA 2.0 G4SAIDXSDATA"
+	[G4ABLA]="G4ABLA 3.1 G4ABLADATA"
+	[G4INCL]="G4INCL 1.0 G4INCLDATA"
+	[G4ENSDFSTATE]="G4ENSDFSTATE 2.2 G4ENSDFSTATEDATA"
+	[G4TENDL]="G4TENDL 1.3.2 G4PROTONHPDATA"
+)
+
+for DATASET in ${!DATASETS[@]}; do
+	read FILENAME VERSION ENVVAR <<< "${DATASETS[$DATASET]}"
+	SRC_URI+="${SRC_DATA}/${FILENAME}.${VERSION}.tar.gz "
+done
+unset DATASET FILENAME VERSION ENVVAR
+
+LICENSE="geant4"
+SLOT="4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_unpack() {
+	# unpack in destination only to avoid copy
+	return
+}
+
+src_install() {
+	for DATASET in ${!DATASETS[@]}; do
+		read FILENAME VERSION ENVVAR <<< "${DATASETS[$DATASET]}"
+		echo $ENVVAR=\"${EPREFIX}/usr/share/geant4/data/${DATASET}${VERSION}\";
+	done >| 99geant-data
+	doenvd 99geant-data
+	dodir /usr/share/geant4/data
+	cd "${ED%/}/usr/share/geant4/data" || die
+	unpack ${A}
+}
diff --git a/sci-physics/geant-data/metadata.xml b/sci-physics/geant-data/metadata.xml
index 21956ffc593c..511a1b08ef9e 100644
--- a/sci-physics/geant-data/metadata.xml
+++ b/sci-physics/geant-data/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>amadio@gentoo.org</email>
+		<name>Guilherme Amadio</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>sci-physics@gentoo.org</email>
 		<name>Gentoo Physics Project</name>
diff --git a/sci-physics/geant-vmc/Manifest b/sci-physics/geant-vmc/Manifest
index 2b73ab3fcf24..3bf35d888da4 100644
--- a/sci-physics/geant-vmc/Manifest
+++ b/sci-physics/geant-vmc/Manifest
@@ -1,8 +1,5 @@
 AUX geant-vmc-4.4.0-fix-cflags.patch 661 BLAKE2B 121054bdcf8dfae328334221cc85c7d117a8dd9b0b096499ea07938bb05f303759c6478c2187f36e7b4ba22f4e1f0935d980802ce5195c1d2d9b5202d240b683 SHA512 7c6b7c253088a780101c51ac9a055fe79f65d78996206fce77d9e70a558e2b5b222eee4ccba689e68effc429cb8b2d41c6021fe4bead7d44f52daa1820a308a2
-DIST geant4_vmc.3.6.tar.gz 1017407 BLAKE2B f386ea49843abedbed16ba1d12a10ae4165123fb0f7842482c416becf4141bc15360be1038626ce40f96a9dbb15d27116cd2fbd46d74b856d5a9391d073784a5 SHA512 eaf8626a3702149a1c5be4adff7843ef828da8024aafb8de489dd6b55b4ee05850581318d01032a4008767ad4e2fc0fde23e1aa5c751693e902d51ce9ad3d1df
 DIST geant4_vmc.4.0.tar.gz 7118838 BLAKE2B 5edbd13adeeb560188deb54c1f5d52fda371dd5f3dc04d676bcaf7edad0bbf8eb573d6345e5c3626b5b64c229d49b7f02aafec77a2587e525cf3f407444391b5 SHA512 faf5fed17b317399b97f77ff1c2a1bf1cead8f0b02a3a89244f01f8ae04ce621763e52b40000e481b3826796bb4d94216368d2e3c98a62f02048c5979f4ee648
-EBUILD geant-vmc-4.3.6-r1.ebuild 2051 BLAKE2B 85a7f104bc6b532ea7d7b970e7c035aa1b8c80cbe037177b77260cabb4ed384f5d9d523f673f116fec1dd9e3042995843cc06a07fb22ca19f0accff84a23016d SHA512 b7c4313c6086640d029fb94afbd4a94de4e581798100ede02fae3f90e5f3fc9146f4769e2a331da0e84f0d1afb0f0e820974f5268769e72db252e6ea7628e697
-EBUILD geant-vmc-4.3.6.ebuild 2114 BLAKE2B 5de01adb2ca2011254dcdc0ce7037503ec84b8b36d423993f37785d3a34fb8bcc8bec12ab6924f676564cac208d040d26f56c5bac076f159b89e87dc4164c28c SHA512 457b3d38eb961826d35b5a5849bdf2cbaddcc3708ab5f90420e6e1108912230d335eba32db851bddd9d5b0feb97e9d04ee97d80a301726f4a8d9d37b5dfac3df
 EBUILD geant-vmc-4.4.0.ebuild 2442 BLAKE2B 60d7a84b777d2f87fde249a31b05a9a0e6fd90f1f9e5c7b74d0770e9dd6f2f40663316b39e68f56e9ccf9b4edf9d9a1aec2ae83f13435529992eb7fb88ca59ec SHA512 c533ceccfdeed7ecaa4596056a11f6fcec9828a7f3f82556dd24686d59313318b4982ac87f57ef20d44393cd9c7308904dd2f3dc4a0d155f7e304f280fe97d1c
 EBUILD geant-vmc-9999.ebuild 2087 BLAKE2B 2c922fce9990e941b90bbc13d90e6938cfcbe9eb4b75bb67847e6b194530ec2c7441733d7d5a2cc128d90c30a57210c500cc17be30206e2a6a57e336e22cae4e SHA512 8db090fb5919def57b56f34bd0dba1d8dd461b16a664e2586e6b0f82d95030384450e395d606281c1f26363d89198d5127862af0f838fd42b53cc3c2943af08f
 MISC metadata.xml 859 BLAKE2B 4bec2c6236dfc1bdb9ba9f1caff6c9b545861c6e51c58d90bfa652d2d5aaa323437473173912f1840ba3c690f92798929980e5bcb3cacb5fe4cdd8a0edb014d9 SHA512 15a0f421563051a8553e2bdf9a8f82dc5077e336513cc18ef7e9bea49e084ea4dc1aa32800fbc928743d8c09036d136518a5a6a74c2f57c61215da2f44dc9727
diff --git a/sci-physics/geant-vmc/geant-vmc-4.3.6-r1.ebuild b/sci-physics/geant-vmc/geant-vmc-4.3.6-r1.ebuild
deleted file mode 100644
index 585f02e1660a..000000000000
--- a/sci-physics/geant-vmc/geant-vmc-4.3.6-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vmc-project/geant4_vmc.git"
-else
-	DOWN_PV=$(ver_cut 2-)
-	SRC_URI="http://root.cern.ch/download/vmc/geant4_vmc.${DOWN_PV}.tar.gz"
-	SOURCE_PV=$(ver_rs 1- - ${DOWN_PV})
-	S="${WORKDIR}/geant4_vmc-${SOURCE_PV}"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Virtual Monte Carlo Geant4 implementation"
-HOMEPAGE="http://root.cern.ch/root/vmc/VirtualMC.html"
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="doc examples geant3 +g4root +mtroot vgm test"
-
-# sci-physics/root[c++11] required to match sci-physics/geant flags.
-RDEPEND="
-	>=sci-physics/geant-4.10.03:=[opengl,geant3?]
-	<sci-physics/geant-4.10.05:=
-	sci-physics/root:=[c++11,vmc]
-	vgm? ( >=sci-physics/vgm-4.4:= )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-RESTRICT="
-	!geant3? ( test )
-	!g4root? ( test )
-	!mtroot? ( test )
-	!test? ( test )
-	!vgm? ( test )"
-
-DOCS=(
-	history
-	README.md
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DGeant4VMC_USE_VGM="$(usex vgm)"
-		-DGeant4VMC_USE_GEANT4_G3TOG4="$(usex geant3)"
-		-DGeant4VMC_USE_G4Root="$(usex g4root)"
-		-DGeant4VMC_BUILD_MTRoot="$(usex mtroot)"
-		-DGeant4VMC_BUILD_EXAMPLES="$(usex test)"
-		-DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc ; then
-		local dirs=(
-			source
-			$(usev g4root)
-			$(usev mtroot)
-			$(usev examples)
-		)
-		local d
-		for d in "${dirs[@]}"; do
-			pushd "${d}" > /dev/null || die
-			doxygen || die
-			popd > /dev/null || die
-		done
-	fi
-}
-
-src_test() {
-	# Required by sci-physics/root for pointer validity checking,
-	# see e.g. https://sft.its.cern.ch/jira/browse/ROOT-8146 .
-	addwrite /dev/random
-	cd examples || die
-	./test_suite.sh --g3=off --builddir="${BUILD_DIR}" || die
-	./test_suite_exe.sh --g3=off --builddir="${BUILD_DIR}" || die
-}
-
-src_install() {
-	cmake_src_install
-	use doc && local HTML_DOCS=(doc/.)
-	einstalldocs
-}
diff --git a/sci-physics/geant-vmc/geant-vmc-4.3.6.ebuild b/sci-physics/geant-vmc/geant-vmc-4.3.6.ebuild
deleted file mode 100644
index c24d2ccce833..000000000000
--- a/sci-physics/geant-vmc/geant-vmc-4.3.6.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eapi7-ver
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vmc-project/geant4_vmc.git"
-else
-	DOWN_PV=$(ver_cut 2-)
-	SRC_URI="http://root.cern.ch/download/vmc/geant4_vmc.${DOWN_PV}.tar.gz"
-	SOURCE_PV=$(ver_rs 1- - ${DOWN_PV})
-	S="${WORKDIR}/geant4_vmc-${SOURCE_PV}"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Virtual Monte Carlo Geant4 implementation"
-HOMEPAGE="http://root.cern.ch/root/vmc/VirtualMC.html"
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="doc examples geant3 +g4root +mtroot vgm test"
-
-# sci-physics/root[root7] flag activates std=c++14, which we could only support if also Geant is built with it.
-# Disable for now.
-RDEPEND="
-	>=sci-physics/geant-4.10.03:=[opengl,geant3?]
-	sci-physics/root:=[-root7]
-	vgm? ( >=sci-physics/vgm-4.4:= )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-RESTRICT="
-	!geant3? ( test )
-	!g4root? ( test )
-	!mtroot? ( test )
-	!test? ( test )
-	!vgm? ( test )"
-
-DOCS=(
-	history
-	README.md
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DGeant4VMC_USE_VGM="$(usex vgm)"
-		-DGeant4VMC_USE_GEANT4_G3TOG4="$(usex geant3)"
-		-DGeant4VMC_USE_G4Root="$(usex g4root)"
-		-DGeant4VMC_BUILD_MTRoot="$(usex mtroot)"
-		-DGeant4VMC_BUILD_EXAMPLES="$(usex test)"
-		-DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc ; then
-		local dirs=(
-			source
-			$(usev g4root)
-			$(usev mtroot)
-			$(usev examples)
-		)
-		local d
-		for d in "${dirs[@]}"; do
-			pushd "${d}" > /dev/null || die
-			doxygen || die
-			popd > /dev/null || die
-		done
-	fi
-}
-
-src_test() {
-	# Required by sci-physics/root for pointer validity checking,
-	# see e.g. https://sft.its.cern.ch/jira/browse/ROOT-8146 .
-	addwrite /dev/random
-	cd examples || die
-	./test_suite.sh --g3=off --builddir="${BUILD_DIR}" || die
-	./test_suite_exe.sh --g3=off --builddir="${BUILD_DIR}" || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && local HTML_DOCS=(doc/.)
-	einstalldocs
-}
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index b44fac65a4a5..06653701ea25 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -1,5 +1,10 @@
-DIST geant4.10.03.tar.gz 33143770 BLAKE2B f84c4dc680c45bc5728485e3e38852de90ae0f89dfe4cf65677aa86f6d90b4cbe5d2ffec812b08d05c88f8abb73f006f3a5319bcfd48c20872299ccfd91c7e39 SHA512 61d67e57f1576ab10562f2309995897008b4be1aa60f7e471b4f5efc2d852788d5faf60e64ea7024a4af4035d98c04c0be23df8593a4ed3a510af6b476013c56
+AUX geant-4.10.6-datadir.patch 6571 BLAKE2B 2047655af7cdbf4c63a077c22ccda9eb8f0042291d5afcaf0b67614c7797afed36645ffc6ecddd6797b614c7f412412c4ebcd33c064ef648175b40a3c7e46537 SHA512 48569a7ea8f285e4e261f8b24f2910b7022899f5276f61fa86b27e993e36cebbb8f96f14ba94c0d7174355ec15aa6e415d8ba28d54b2b0efa9366c85644f10d8
 DIST geant4.10.05.p01.tar.gz 34413415 BLAKE2B d98a9308e37f166dccf8f9640a54ee74ab2b1d07275609666aec6d929b0193269a18075762cebaa154abcad5c8359a128b6629ff973cb6cdc8f54535151997a3 SHA512 ace2097251ee4cdda3511c3dd8191c97e1001f73d421797e3cd517ed41fa5adc73efcddfb2c8b6fb75231e5af8ddb4bd63a402ccb99b40ce2c140588d328b582
-EBUILD geant-4.10.03-r1.ebuild 2722 BLAKE2B 5cf9435abe415df1f08f399b288584c996bcae35a09fd6faee0bb8bd1ca4257eb3cfdf4a69ac3edd7a55c43a5cd7b997ec32646f12ae01224b9fc0b59c5ec621 SHA512 58cab146b13bcebec8654e22b363a17cdb3859c4a0eb740f88587db0642abf6531cdfe2803b9acd5cee912fe681a1202cd9d790c4a078bd225c77860277ff7e4
+DIST geant4.10.06.b01.tar.gz 34511064 BLAKE2B d20bd338ea0ac47b11464b581aa0dec3725da56902dbaab233fcaad28ba6b3ce302a8d7e2c27f4532bed2db991467b4bde837675f3837f066c9e7e3d78c7acd6 SHA512 3916a0ad13891fc5a189c0be6c2e57abe29281696c9d16c0c54fd11940146586feb550a61403ab6451e6575d2ad1f4349590d9c564d7b5d7fc5ab9e9b2356ccb
+DIST geant4.10.06.p01.tar.gz 34869969 BLAKE2B 0a27f34df213a0dcc2d87c6001c100269be7496519c614fa5b51cd6502d98232d09de0f3c44216c34b6788ec8a1f626d22a53cb7329027006c614a10777b6896 SHA512 d9bca66b086a309a577dcf018c0ca52f5d786b1ebe5ce9d30c29c579c342399816c34efbcb34af60871145b6713cb8151f5517c5a0aa9d24d00e4257a5c1c6c0
+DIST geant4.10.06.tar.gz 34834510 BLAKE2B 48f50c734186e444f5ef2fd02b013565db7f404b7fbaeb3127d7dd67ede76196fd5fa4512a5482cceb7696305eb72dbe819fe43fa26ac63ded49259d804f5ccf SHA512 e03d69cb66947ddc71d20b9065fd5db384dfc8b2b8e905ddab9ebb992c642dc33f369d7eba5f2338487da5d9d28f20f3078917f222d187c65e5af1a0112ee044
 EBUILD geant-4.10.05_p01.ebuild 2642 BLAKE2B 324ac7143b851d13a13de09a6cc578454439b2783686cf9458ab9ca478950f04789e0e5cff59f2ce6627be117102d9e88e8b5eb20c0cf746748bea1bc432feb5 SHA512 63ba64e7e920163df7fe9343e75b6c3a6cd70337f965e26931e3f521f5ace78deb79f4fdac3dfb1e8e1dd214587e9457de62b4aa4eacea522ad95a6580a2b90f
-MISC metadata.xml 1306 BLAKE2B 22a8b02b71c8e182649a701f1e28192c3bb7f7f3722bfee91490aaea9f96111be2aafe162ac1ba07fddd7b088db15c7b87a2f8c3f9a9fd2fac0e8317b605b91e SHA512 8c84f9185232134dd9da7937244bc07b5ac1fd6f7f3732491e759b000be357b51b9434c861d81ec8c5956431ae44947e475af0b86fd8368e0ad9c68b10979ae1
+EBUILD geant-4.10.6-r1.ebuild 3070 BLAKE2B e99c08bacededd8892a727c6213672fd80be189ed41b8b95df6d42a10fdeed2304e98296b97792e84f89806512d64ab1c2efd000f3088ff88d8896f42590bd63 SHA512 9559d5b33eb857712a2a15b84e557d911349f93d7931502ab993f9906389127ee368211180e8aea9deb386365025e10f086cfa7e0a6b79ac89aebf17509f5c2e
+EBUILD geant-4.10.6_beta1-r1.ebuild 3070 BLAKE2B e99c08bacededd8892a727c6213672fd80be189ed41b8b95df6d42a10fdeed2304e98296b97792e84f89806512d64ab1c2efd000f3088ff88d8896f42590bd63 SHA512 9559d5b33eb857712a2a15b84e557d911349f93d7931502ab993f9906389127ee368211180e8aea9deb386365025e10f086cfa7e0a6b79ac89aebf17509f5c2e
+EBUILD geant-4.10.6_p1-r1.ebuild 3070 BLAKE2B e99c08bacededd8892a727c6213672fd80be189ed41b8b95df6d42a10fdeed2304e98296b97792e84f89806512d64ab1c2efd000f3088ff88d8896f42590bd63 SHA512 9559d5b33eb857712a2a15b84e557d911349f93d7931502ab993f9906389127ee368211180e8aea9deb386365025e10f086cfa7e0a6b79ac89aebf17509f5c2e
+MISC metadata.xml 1683 BLAKE2B a0eb481dd6e784064dce6265b9361b51c24fa845f7af7ec238a1ffef215ef16dba7c02b795d8ea50dddb255c513c1a3941761bb99f813664d3ef012377aca174 SHA512 7631f3f6fbc0a5a730fb260476c9d514b05c71c4967c5f0059523cbae99415e5e48a416a8a4b481de5c2c484484489b4260f8ceacdeca4b0ee0e670dc7293985
diff --git a/sci-physics/geant/files/geant-4.10.6-datadir.patch b/sci-physics/geant/files/geant-4.10.6-datadir.patch
new file mode 100644
index 000000000000..c26bf8914b46
--- /dev/null
+++ b/sci-physics/geant/files/geant-4.10.6-datadir.patch
@@ -0,0 +1,159 @@
+From 44966c44635debaddd859c788b008cd4e6c7fab6 Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <amadio@cern.ch>
+Date: Fri, 13 Mar 2020 15:36:27 +0100
+Subject: [PATCH] Allow customization of CMAKE_INSTALL_DATADIR
+
+---
+ cmake/Modules/G4CMakeMain.cmake               |  2 +-
+ cmake/Modules/G4ConfigureGNUMakeHelpers.cmake | 20 +++++++++----------
+ cmake/Modules/Geant4InstallData.cmake         |  4 ++--
+ source/analysis/CMakeLists.txt                |  2 +-
+ source/analysis/g4tools/CMakeLists.txt        |  2 +-
+ 5 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/cmake/Modules/G4CMakeMain.cmake b/cmake/Modules/G4CMakeMain.cmake
+index a6b984fcad..5ab63202ca 100644
+--- a/cmake/Modules/G4CMakeMain.cmake
++++ b/cmake/Modules/G4CMakeMain.cmake
+@@ -121,7 +121,7 @@ mark_as_advanced(GEANT4_INSTALL_EXAMPLES)
+ 
+ if(GEANT4_INSTALL_EXAMPLES)
+   install(DIRECTORY examples
+-    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Geant4-${Geant4_VERSION}
++    DESTINATION ${CMAKE_INSTALL_DATADIR}
+     COMPONENT Examples
+     PATTERN "CVS" EXCLUDE
+     PATTERN ".svn" EXCLUDE
+diff --git a/cmake/Modules/G4ConfigureGNUMakeHelpers.cmake b/cmake/Modules/G4ConfigureGNUMakeHelpers.cmake
+index c2aeefee59..1052f43a45 100644
+--- a/cmake/Modules/G4ConfigureGNUMakeHelpers.cmake
++++ b/cmake/Modules/G4ConfigureGNUMakeHelpers.cmake
+@@ -729,7 +729,7 @@ _g4tc_configure_build_tree_scripts(geant4make)
+ # +- CMAKE_INSTALL_PREFIX
+ #    +- LIBDIR/Geant4-VERSION (G4LIB)
+ #    +- INCLUDEDIR/Geant4     (G4INCLUDE)
+-#    +- DATAROOTDIR/Geant4-VERSION/
++#    +- DATADIR/
+ #       +- geant4make              (THIS IS G4INSTALL!)
+ #          +- geant4make.(c)sh
+ #          +- config/
+@@ -742,7 +742,7 @@ set(G4INSTALL "\"\$geant4make_root\"")
+ # - Include dir
+ file(RELATIVE_PATH
+   G4MAKE_TO_INCLUDEDIR
+-  ${CMAKE_INSTALL_FULL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make
++  ${CMAKE_INSTALL_FULL_DATADIR}/geant4make
+   ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${PROJECT_NAME}
+   )
+ set(G4INCLUDE "\"`cd \$geant4make_root/${G4MAKE_TO_INCLUDEDIR} > /dev/null \; pwd`\"")
+@@ -750,7 +750,7 @@ set(G4INCLUDE "\"`cd \$geant4make_root/${G4MAKE_TO_INCLUDEDIR} > /dev/null \; pw
+ # - Bin dir
+ file(RELATIVE_PATH
+   G4MAKE_TO_BINDIR
+-  ${CMAKE_INSTALL_FULL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make
++  ${CMAKE_INSTALL_FULL_DATADIR}/geant4make
+   ${CMAKE_INSTALL_FULL_BINDIR}
+   )
+ set(G4BIN_DIR "\"`cd \$geant4make_root/${G4MAKE_TO_BINDIR} > /dev/null \; pwd`\"")
+@@ -758,7 +758,7 @@ set(G4BIN_DIR "\"`cd \$geant4make_root/${G4MAKE_TO_BINDIR} > /dev/null \; pwd`\"
+ # - Lib dir
+ file(RELATIVE_PATH
+   G4MAKE_TO_LIBDIR
+-  ${CMAKE_INSTALL_FULL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make
++  ${CMAKE_INSTALL_FULL_DATADIR}/geant4make
+   ${CMAKE_INSTALL_FULL_LIBDIR}
+   )
+ set(G4LIB "\"`cd \$geant4make_root/${G4MAKE_TO_LIBDIR}/Geant4-${Geant4_VERSION} > /dev/null \; pwd`\"")
+@@ -775,7 +775,7 @@ foreach(_ds ${GEANT4_EXPORTED_DATASETS})
+ 
+   file(RELATIVE_PATH
+     G4MAKE_TO_DATADIR
+-    ${CMAKE_INSTALL_FULL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make
++    ${CMAKE_INSTALL_FULL_DATADIR}/geant4make
+     ${${_ds}_PATH}
+     )
+   set(${_ds}_PATH "\"`cd \$geant4make_root/${G4MAKE_TO_DATADIR} > /dev/null \; pwd`\"")
+@@ -788,7 +788,7 @@ set(TOOLS_FONT_PATH "\"`cd \$geant4make_root/../fonts > /dev/null ; pwd`\"")
+ _g4tc_configure_install_tree_scripts(
+     ${CMAKE_BINARY_DIR}/InstallTreeFiles
+     geant4make
+-    ${CMAKE_INSTALL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make
++    ${CMAKE_INSTALL_DATADIR}/geant4make
+     )
+ 
+ 
+@@ -797,7 +797,7 @@ _g4tc_configure_install_tree_scripts(
+ #   softlink to the G4SYSTEM directory.
+ #
+ install(DIRECTORY config
+-    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/geant4make
++    DESTINATION ${CMAKE_INSTALL_DATADIR}/geant4make
+     COMPONENT Development
+     FILES_MATCHING PATTERN "*.gmk"
+     PATTERN "CVS" EXCLUDE
+@@ -845,11 +845,11 @@ endforeach()
+ 
+ # - Fonts
+ file(RELATIVE_PATH
+-  G4ENV_BINDIR_TO_DATAROOTDIR
++  G4ENV_BINDIR_TO_DATADIR
+   "${CMAKE_INSTALL_FULL_BINDIR}"
+-  "${CMAKE_INSTALL_FULL_DATAROOTDIR}/Geant4-${Geant4_VERSION}"
++  "${CMAKE_INSTALL_FULL_DATADIR}"
+   )
+-set(TOOLS_FONT_PATH "\"`cd \$geant4_envbindir/${G4ENV_BINDIR_TO_DATAROOTDIR}/fonts > /dev/null ; pwd`\"")
++set(TOOLS_FONT_PATH "\"`cd \$geant4_envbindir/${G4ENV_BINDIR_TO_DATADIR}/fonts > /dev/null ; pwd`\"")
+ 
+ 
+ # - Configure for each shell
+diff --git a/cmake/Modules/Geant4InstallData.cmake b/cmake/Modules/Geant4InstallData.cmake
+index 496b0fc4df..55536e51d4 100644
+--- a/cmake/Modules/Geant4InstallData.cmake
++++ b/cmake/Modules/Geant4InstallData.cmake
+@@ -105,7 +105,7 @@ set(GEANT4_DATASETS_URL "https://cern.ch/geant4-data/datasets")
+ set(GEANT4_BUILD_FULL_DATADIR ${PROJECT_BINARY_DIR}/data)
+ 
+ # Where to install data in the install tree (a Default)
+-set(GEANT4_INSTALL_DATADIR_DEFAULT "${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}-${${PROJECT_NAME}_VERSION}/data")
++set(GEANT4_INSTALL_DATADIR_DEFAULT "${CMAKE_INSTALL_DATADIR}/data")
+ 
+ # File containing dataset list
+ set(GEANT4_DATASETS_DEFINITIONS "Geant4DatasetDefinitions")
+@@ -596,7 +596,7 @@ endfunction()
+ # Choose Physics Data Install Dir
+ # This follows the pattern for interface and setting as in GNUInstallDirs
+ if(NOT GEANT4_INSTALL_DATADIR)
+-  set(GEANT4_INSTALL_DATADIR "" CACHE PATH "read-only architecture independent Geant4 physics data (DATAROOTDIR/${GEANT4_INSTALL_DATADIR_DEFAULT}")
++  set(GEANT4_INSTALL_DATADIR "" CACHE PATH "read-only architecture independent Geant4 physics data (DATADIR/data")
+   set(GEANT4_INSTALL_DATADIR "${GEANT4_INSTALL_DATADIR_DEFAULT}")
+ endif()
+ 
+diff --git a/source/analysis/CMakeLists.txt b/source/analysis/CMakeLists.txt
+index 44fa4a97be..4c40c704be 100644
+--- a/source/analysis/CMakeLists.txt
++++ b/source/analysis/CMakeLists.txt
+@@ -67,7 +67,7 @@ endif()
+ #
+ if (GEANT4_USE_FREETYPE)
+   install(DIRECTORY fonts/
+-    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Geant4-${Geant4_VERSION}/fonts
++    DESTINATION ${CMAKE_INSTALL_DATADIR}/fonts
+     PATTERN ".svn" EXCLUDE
+   )
+ endif()
+diff --git a/source/analysis/g4tools/CMakeLists.txt b/source/analysis/g4tools/CMakeLists.txt
+index 54c72f1297..df87582bc1 100644
+--- a/source/analysis/g4tools/CMakeLists.txt
++++ b/source/analysis/g4tools/CMakeLists.txt
+@@ -43,7 +43,7 @@ install(DIRECTORY include/
+ # We also need to install the tools license
+ #
+ install(FILES tools.license
+-  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Geant4-${Geant4_VERSION}
++  DESTINATION ${CMAKE_INSTALL_DATADIR}
+   )
+ 
+ #------------------------------------------------------------------------------
+-- 
+2.25.1
+
diff --git a/sci-physics/geant/geant-4.10.03-r1.ebuild b/sci-physics/geant/geant-4.10.6-r1.ebuild
index fa2c8ca50778..96a48a6d3ea1 100644
--- a/sci-physics/geant/geant-4.10.03-r1.ebuild
+++ b/sci-physics/geant/geant-4.10.6-r1.ebuild
@@ -1,28 +1,47 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils versionator
+inherit cmake-utils
 
-MY_P=${PN}${PV}
-SPV="$(get_version_component_range 1 ${PV}).$(get_version_component_range 2 ${PV}).$(printf %1d $(get_version_component_range 3 ${PV}))"
+MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3))
+
+case ${PV} in
+*_beta*)
+	MY_P+=.b$(printf %02d $(ver_cut 5))
+	DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt"
+	;;
+*_p*)
+	MY_P+=.p$(printf %02d $(ver_cut 5))
+	DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt"
+	HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
+	;;
+*)
+	HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
+	;;
+esac
 
 DESCRIPTION="Toolkit for simulation of passage of particles through matter"
-HOMEPAGE="http://geant4.cern.ch/"
-SRC_URI="http://geant4.cern.ch/support/source/${MY_P}.tar.gz"
+HOMEPAGE="https://geant4.cern.ch/"
+SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
 
 LICENSE="geant4"
 SLOT="4"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+data dawn doc examples gdml geant3 inventor motif opengl
-	qt5 raytracerx static-libs threads vrml zlib"
+IUSE="+c++11 c++14 c++17 +data dawn doc examples freetype gdml geant3 hdf5
+	inventor motif opengl qt5 raytracerx static-libs threads vrml"
+
+REQUIRED_USE="^^ ( c++11 c++14 c++17 )"
 
 RDEPEND="
 	dev-libs/expat
-	>=sci-physics/clhep-2.3.3.0:2=
+	>=sci-physics/clhep-2.4.1.3:2=[threads?]
+	data? ( ~sci-physics/geant-data-${PV} )
 	dawn? ( media-gfx/dawn )
+	doc? ( ~app-doc/geant-docs-$(ver_cut 1-3) )
 	gdml? ( dev-libs/xerces-c )
+	hdf5? ( sci-libs/hdf5[threads?] )
 	inventor? ( media-libs/SoXt )
 	motif? ( x11-libs/motif:0 )
 	opengl? ( virtual/opengl )
@@ -36,42 +55,38 @@ RDEPEND="
 	raytracerx? (
 		x11-libs/libX11
 		x11-libs/libXmu
-	)
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND} prefix? ( app-shells/tcsh )"
-PDEPEND="
-	data? ( ~sci-physics/geant-data-${PV} )
-	doc? ( ~app-doc/geant-docs-${PV} )"
+	)"
 
-HTML_DOCS=( ReleaseNotes/ReleaseNotes${SPV}.html )
+PATCHES=( "${FILESDIR}"/geant-4.10.6-datadir.patch )
 
 S="${WORKDIR}/${MY_P}"
 
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if ! use examples; then
-		sed -i '/install(DIRECTORY examples/,/)/d' CMakeLists.txt || die
-	fi
-}
-
 src_configure() {
 	local mycmakeargs=(
-		-DGEANT4_USE_SYSTEM_CLHEP=ON
-		-DGEANT4_INSTALL_DATA=OFF
+		-DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
+		-DGEANT4_BUILD_CXXSTD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
 		-DGEANT4_BUILD_MULTITHREADED=$(usex threads)
 		-DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec)
-		-DGEANT4_USE_NETWORKDAWN=$(usex dawn)
-		-DGEANT4_USE_GDML=$(usex gdml)
+		-DGEANT4_INSTALL_DATA=OFF
+		-DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
+		-DGEANT4_INSTALL_EXAMPLES=$(usex examples)
+		-DGEANT4_USE_FREETYPE=$(usex freetype)
 		-DGEANT4_USE_G3TOG4=$(usex geant3)
-		-DGEANT4_USE_XM=$(usex motif)
-		-DGEANT4_USE_OPENGL_X11=$(usex opengl)
+		-DGEANT4_USE_GDML=$(usex gdml)
+		-DGEANT4_USE_HDF5=$(usex hdf5)
 		-DGEANT4_USE_INVENTOR=$(usex inventor)
+		-DGEANT4_USE_NETWORKDAWN=$(usex dawn)
+		-DGEANT4_USE_NETWORKVRML=$(usex vrml)
+		-DGEANT4_USE_OPENGL_X11=$(usex opengl)
 		-DGEANT4_USE_QT=$(usex qt5)
 		-DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
-		-DGEANT4_USE_NETWORKVRML=$(usex vrml)
-		-DGEANT4_USE_SYSTEM_ZLIB=$(usex zlib)
+		-DGEANT4_USE_SYSTEM_CLHEP=ON
+		-DGEANT4_USE_SYSTEM_EXPAT=ON
+		-DGEANT4_USE_SYSTEM_ZLIB=ON
+		-DGEANT4_USE_WT=OFF
+		-DGEANT4_USE_XM=$(usex motif)
 		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		${EXTRA_ECONF}
 	)
 	if use inventor; then
 		mycmakeargs+=(
@@ -87,11 +102,7 @@ src_install() {
 	# binmake.gmk is only useful for legacy build systems
 	sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
 	cmake-utils_src_install
-	[[ -f ReleaseNotes/Patch${SPV}-1.txt ]] && DOCS+=( ReleaseNotes/Patch${SPV}-*.txt )
-	einstalldocs
-}
+	rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts"
 
-pkg_postinst() {
-	elog "The following scripts are provided for backward compatibility:"
-	elog "$(ls -1 ${EROOT%/}/usr/share/${PN^}${SPV}.*/geant4make/*sh)"
+	einstalldocs
 }
diff --git a/sci-physics/geant/geant-4.10.6_beta1-r1.ebuild b/sci-physics/geant/geant-4.10.6_beta1-r1.ebuild
new file mode 100644
index 000000000000..96a48a6d3ea1
--- /dev/null
+++ b/sci-physics/geant/geant-4.10.6_beta1-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3))
+
+case ${PV} in
+*_beta*)
+	MY_P+=.b$(printf %02d $(ver_cut 5))
+	DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt"
+	;;
+*_p*)
+	MY_P+=.p$(printf %02d $(ver_cut 5))
+	DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt"
+	HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
+	;;
+*)
+	HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
+	;;
+esac
+
+DESCRIPTION="Toolkit for simulation of passage of particles through matter"
+HOMEPAGE="https://geant4.cern.ch/"
+SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
+
+LICENSE="geant4"
+SLOT="4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+c++11 c++14 c++17 +data dawn doc examples freetype gdml geant3 hdf5
+	inventor motif opengl qt5 raytracerx static-libs threads vrml"
+
+REQUIRED_USE="^^ ( c++11 c++14 c++17 )"
+
+RDEPEND="
+	dev-libs/expat
+	>=sci-physics/clhep-2.4.1.3:2=[threads?]
+	data? ( ~sci-physics/geant-data-${PV} )
+	dawn? ( media-gfx/dawn )
+	doc? ( ~app-doc/geant-docs-$(ver_cut 1-3) )
+	gdml? ( dev-libs/xerces-c )
+	hdf5? ( sci-libs/hdf5[threads?] )
+	inventor? ( media-libs/SoXt )
+	motif? ( x11-libs/motif:0 )
+	opengl? ( virtual/opengl )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raytracerx? (
+		x11-libs/libX11
+		x11-libs/libXmu
+	)"
+
+PATCHES=( "${FILESDIR}"/geant-4.10.6-datadir.patch )
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
+		-DGEANT4_BUILD_CXXSTD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
+		-DGEANT4_BUILD_MULTITHREADED=$(usex threads)
+		-DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec)
+		-DGEANT4_INSTALL_DATA=OFF
+		-DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
+		-DGEANT4_INSTALL_EXAMPLES=$(usex examples)
+		-DGEANT4_USE_FREETYPE=$(usex freetype)
+		-DGEANT4_USE_G3TOG4=$(usex geant3)
+		-DGEANT4_USE_GDML=$(usex gdml)
+		-DGEANT4_USE_HDF5=$(usex hdf5)
+		-DGEANT4_USE_INVENTOR=$(usex inventor)
+		-DGEANT4_USE_NETWORKDAWN=$(usex dawn)
+		-DGEANT4_USE_NETWORKVRML=$(usex vrml)
+		-DGEANT4_USE_OPENGL_X11=$(usex opengl)
+		-DGEANT4_USE_QT=$(usex qt5)
+		-DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
+		-DGEANT4_USE_SYSTEM_CLHEP=ON
+		-DGEANT4_USE_SYSTEM_EXPAT=ON
+		-DGEANT4_USE_SYSTEM_ZLIB=ON
+		-DGEANT4_USE_WT=OFF
+		-DGEANT4_USE_XM=$(usex motif)
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		${EXTRA_ECONF}
+	)
+	if use inventor; then
+		mycmakeargs+=(
+			-DINVENTOR_INCLUDE_DIR="$(coin-config --includedir)"
+			-DINVENTOR_SOXT_INCLUDE_DIR="$(coin-config --includedir)"
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	# adjust clhep linking flags for system clhep
+	# binmake.gmk is only useful for legacy build systems
+	sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
+	cmake-utils_src_install
+	rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts"
+
+	einstalldocs
+}
diff --git a/sci-physics/geant/geant-4.10.6_p1-r1.ebuild b/sci-physics/geant/geant-4.10.6_p1-r1.ebuild
new file mode 100644
index 000000000000..96a48a6d3ea1
--- /dev/null
+++ b/sci-physics/geant/geant-4.10.6_p1-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3))
+
+case ${PV} in
+*_beta*)
+	MY_P+=.b$(printf %02d $(ver_cut 5))
+	DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt"
+	;;
+*_p*)
+	MY_P+=.p$(printf %02d $(ver_cut 5))
+	DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt"
+	HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
+	;;
+*)
+	HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html"
+	;;
+esac
+
+DESCRIPTION="Toolkit for simulation of passage of particles through matter"
+HOMEPAGE="https://geant4.cern.ch/"
+SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
+
+LICENSE="geant4"
+SLOT="4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+c++11 c++14 c++17 +data dawn doc examples freetype gdml geant3 hdf5
+	inventor motif opengl qt5 raytracerx static-libs threads vrml"
+
+REQUIRED_USE="^^ ( c++11 c++14 c++17 )"
+
+RDEPEND="
+	dev-libs/expat
+	>=sci-physics/clhep-2.4.1.3:2=[threads?]
+	data? ( ~sci-physics/geant-data-${PV} )
+	dawn? ( media-gfx/dawn )
+	doc? ( ~app-doc/geant-docs-$(ver_cut 1-3) )
+	gdml? ( dev-libs/xerces-c )
+	hdf5? ( sci-libs/hdf5[threads?] )
+	inventor? ( media-libs/SoXt )
+	motif? ( x11-libs/motif:0 )
+	opengl? ( virtual/opengl )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raytracerx? (
+		x11-libs/libX11
+		x11-libs/libXmu
+	)"
+
+PATCHES=( "${FILESDIR}"/geant-4.10.6-datadir.patch )
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
+		-DGEANT4_BUILD_CXXSTD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
+		-DGEANT4_BUILD_MULTITHREADED=$(usex threads)
+		-DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec)
+		-DGEANT4_INSTALL_DATA=OFF
+		-DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data"
+		-DGEANT4_INSTALL_EXAMPLES=$(usex examples)
+		-DGEANT4_USE_FREETYPE=$(usex freetype)
+		-DGEANT4_USE_G3TOG4=$(usex geant3)
+		-DGEANT4_USE_GDML=$(usex gdml)
+		-DGEANT4_USE_HDF5=$(usex hdf5)
+		-DGEANT4_USE_INVENTOR=$(usex inventor)
+		-DGEANT4_USE_NETWORKDAWN=$(usex dawn)
+		-DGEANT4_USE_NETWORKVRML=$(usex vrml)
+		-DGEANT4_USE_OPENGL_X11=$(usex opengl)
+		-DGEANT4_USE_QT=$(usex qt5)
+		-DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
+		-DGEANT4_USE_SYSTEM_CLHEP=ON
+		-DGEANT4_USE_SYSTEM_EXPAT=ON
+		-DGEANT4_USE_SYSTEM_ZLIB=ON
+		-DGEANT4_USE_WT=OFF
+		-DGEANT4_USE_XM=$(usex motif)
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		${EXTRA_ECONF}
+	)
+	if use inventor; then
+		mycmakeargs+=(
+			-DINVENTOR_INCLUDE_DIR="$(coin-config --includedir)"
+			-DINVENTOR_SOXT_INCLUDE_DIR="$(coin-config --includedir)"
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	# adjust clhep linking flags for system clhep
+	# binmake.gmk is only useful for legacy build systems
+	sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die
+	cmake-utils_src_install
+	rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts"
+
+	einstalldocs
+}
diff --git a/sci-physics/geant/metadata.xml b/sci-physics/geant/metadata.xml
index 603011551974..e89993be5a39 100644
--- a/sci-physics/geant/metadata.xml
+++ b/sci-physics/geant/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>amadio@gentoo.org</email>
+    <name>Guilherme Amadio</name>
+  </maintainer>
   <maintainer type="project">
     <email>sci-physics@gentoo.org</email>
     <name>Gentoo Physics Project</name>
@@ -15,9 +19,12 @@
   features and detectors.
 </longdescription>
   <use>
+    <flag name="c++11">Build using the C++11 standard</flag>
+    <flag name="c++14">Build using the C++14 standard</flag>
+    <flag name="c++17">Build using the C++17 standard</flag>
     <flag name="data">Add a lot of standard physics data files for geant4</flag>
-    <flag name="dawn">Add support for <pkg>media-gfx/dawn</pkg> (3D postscript
-  rendering)</flag>
+    <flag name="dawn">Add support for <pkg>media-gfx/dawn</pkg> (3D postscript rendering)</flag>
+    <flag name="freetype">Add support for <pkg>media-libs/freetype</pkg></flag>
     <flag name="gdml">Enable geometry markup language for xml</flag>
     <flag name="geant3">Add compatibility for geant321 to geant4</flag>
     <flag name="inventor">Add support for Open Inventor SGI toolkit via Coin3D</flag>
diff --git a/sci-physics/lammps/Manifest b/sci-physics/lammps/Manifest
index 4b37a5e28822..7a596e7c0853 100644
--- a/sci-physics/lammps/Manifest
+++ b/sci-physics/lammps/Manifest
@@ -13,9 +13,11 @@ DIST lammps-patch_22Feb2018.tar.gz 91869050 BLAKE2B 09d364b489d4402145b879ca40b2
 DIST lammps-patch_5Jun2019.tar.gz 106437193 BLAKE2B ce2a89f58fcdc29fbfc6d5e8769e36402569e93182a19835a0482b228ae9f568c1b56d2fc5eb3dac8e94a1289b430279d88c15284e07b5f62049aaf86cca29d3 SHA512 d72a5de3068a902cd8a825c97cd071331d5e3c16429531809178c43930b363f6549bd6802b552c2667e8882f7f21c90bd815072deb5ac19c8687060c796e58b4
 DIST lammps-patch_7Aug2019.tar.gz 105303933 BLAKE2B 8609251a919a88da64f2c0578414567141f128bbce3a447be09a99fb1f96620c15db29b4a312afc536f60237f3010a0753dfefa09d0bdfb3222b8f1491995c70 SHA512 61fff23c90a0f9029363cb90ff972e7e97b0f3be6a8153263b6be4f11960603af7f6c8b26a76b8bdcf25009c68a7a7fab3405a3f47b923695798a60723694001
 DIST lammps-patch_8Mar2018.tar.gz 91878683 BLAKE2B a4cf307769b1ac27c9cbe781a70f307d5275d2ccd4f6f77a2a21f00413ffa0af499577207afd23afd95ef6126071e8b779f6c52d50ff7117afb63161613c9f5b SHA512 57885d12e9e0ea9a6735cc2f7a2a8a9314dacbe9eaf5a46cb6d20fd7e2d0e8b0ebb3e24731eb750861973efe4d3cf0cf5a739cc9d51407f26bf3d556243c186f
+DIST lammps-stable_3Mar2020.tar.gz 126001870 BLAKE2B 35ed6ff208fd6dcc8eae50b8e0562a6a0771aa6419c0225353f648d95512ca64b22250ad4a3f9b836b9a25a6838e24e070a1d190fdc02b896dc1ed9838648f01 SHA512 6608cd9f6ea18d8acb55d611a560cb4b329043b41aca23fafd91fac0dfbde5a5286e1a6563bd16b2414bb3bf95929e3a2f270a0b023ce5ede515eb3353d56f04
 DIST lammps-testing-7869c75cac38cb8a3d2ef7747ea12ec5812f5151.tar.gz 54374284 BLAKE2B a223ef3926540660ce28fd2673667840002f6bfbbd5565deb9fb01b994085eb4d6cd24807fab49117a1b328f151d1511b7aa4d2fcdd443d20927112b83d029f0 SHA512 c996f7109d6467ae8e6a8c187485afb7c55b6dcf2b2e7003a8edd271e7f7dfe275079fbb0d680455628c8fd2eb87640284e8a92ffe095fcb398133be587af57a
 DIST lammps-testing-827be7af84ca100d394ea1cf6d3bc49f6a8eef92.tar.gz 55706643 BLAKE2B 7f2753759e1048ee9af58f1b210fe42972cc40b6df3ab5495f66bcfd10f4818f6e2c4e27f759d6ca302024531849286c4709a869984bea3d385cb44412d4d668 SHA512 bfffb0501b7b254dfc2cfcd12945b14766c1addf680d1140a78116b97a2a70795244f3a5a439aaf69ae014e35c454a48e028ca8aa65179e5da5039d6f1676e02
 DIST lammps-testing-d0394a77fa2b4b2d545a73ea092cf6de7616aac8.tar.gz 55715042 BLAKE2B 326f0357b555c030f667c502fd2c2330aa588c4a1224434ef30637ad8c6be49a5b8ee58cbc525b874f665903cf21494b52403c3a53ec0898a8cf81906c614833 SHA512 4a980578ce584b5b9334b4177f4f9188f00ac50ca916ce63a4d2ef034a4fa218366a8f32cc7dc29dc99e6b01e40cf8c8bbf15566840fe07fc5c6c2e8c55ece93
+DIST lammps-testing-stable_3Mar2020.tar.gz 55729550 BLAKE2B d0de8efa83342b4a350f17a43d3fe96011534b3f410beb295e396a45200ea56298c14664b290b2e30ab4f2fd70b92c01c73927b2878e8171a166dedee8ecf379 SHA512 e3dc592ce57ae625eb66ddd9ca80d7bbaca57c47a07166a7196dcc3074b574a497e706da8baf93b5deacdf588702ceb141014533ac2aaccdd011836fb34943b9
 EBUILD lammps-20180117.ebuild 3057 BLAKE2B 7be21a634644d3202dfe7bb90dfb3a8d1e5f77e7d40aed32eaf519b4fc2bd31538e86b18d2986123c3fa3446a505594963fa61ee28ff7a6737c366f2eeace2f5 SHA512 b91322804f33e06ae7762ca2a52eb901c599b8ae24eec2d2fbbb0b5cb510757d3a77a7adc4d63ad5dd070f5a0d4530de772bda438142b88adc00595b264c24d9
 EBUILD lammps-20180222.ebuild 3057 BLAKE2B 7be21a634644d3202dfe7bb90dfb3a8d1e5f77e7d40aed32eaf519b4fc2bd31538e86b18d2986123c3fa3446a505594963fa61ee28ff7a6737c366f2eeace2f5 SHA512 b91322804f33e06ae7762ca2a52eb901c599b8ae24eec2d2fbbb0b5cb510757d3a77a7adc4d63ad5dd070f5a0d4530de772bda438142b88adc00595b264c24d9
 EBUILD lammps-20180308.ebuild 3057 BLAKE2B 7be21a634644d3202dfe7bb90dfb3a8d1e5f77e7d40aed32eaf519b4fc2bd31538e86b18d2986123c3fa3446a505594963fa61ee28ff7a6737c366f2eeace2f5 SHA512 b91322804f33e06ae7762ca2a52eb901c599b8ae24eec2d2fbbb0b5cb510757d3a77a7adc4d63ad5dd070f5a0d4530de772bda438142b88adc00595b264c24d9
@@ -25,4 +27,5 @@ EBUILD lammps-20181212.ebuild 2983 BLAKE2B 9a1c3616dc7b93c41a934e45f9cbdf642aa96
 EBUILD lammps-20190605.ebuild 2983 BLAKE2B b1b61fea5f10e4161cd141c15ad5d39852469160c2647b88918fb7fc93d93ee085b1ae7df0de95be45e63d6689056a4065f4b1c272fc8dd6a758f2c624441291 SHA512 01510f78fec52d3799fc70397956da697ffe71bd67e49daa4cccfb68f62a371ccedf61257d58c026df0780dec3cf7cf5f180fcb6ebf956ee9234949341cd921e
 EBUILD lammps-20190807-r1.ebuild 2981 BLAKE2B 596bbab3fd8f1fc2e9704ff4f8a1820f60315f14f5d6ef3789f73cdc65ffeb2940d65f31dea29b729cbf88a2287791ba05a3b89e6a66bc694f6f47b8958be9d6 SHA512 a0f4c13dc9522fd12b683aedf8b8b4ce4f3cf7a94db166f7958beaede73d43ba021abb0b2cb2155faf101832f101adec741cf6ee9edb84e3a52205bf1de6fee9
 EBUILD lammps-20190807.ebuild 2983 BLAKE2B dec7fed84824ca9ee695e25d54abeb6b767cfbf7e8889f0ea5f035817bd6b94cee61b1cf8c75d4ad39497f2b8fc81f2c538ee329ac4aafba6c829291ecd4c245 SHA512 57814b446487f1a9c35ff28549ad70af2c6628e2324048b84544ed10b578294bc870e22e481aeab91c4545d5d74ea45f0768d98f98c623175236b104f3bc41fd
-MISC metadata.xml 1338 BLAKE2B 553629a0b3221db88a37cd6b0bfa806da9265caf2df038736211351a87ac34af5a98f0e7f3e34246d814a378cd64b1ed82d69f4c26e18c3a7700441f8be6fa2d SHA512 b3556e8444b4cb42d1fa80cc8735e11e07cd2928af67104d4518b874e167d5755840c3585e3ffefa88057f84d711cafe0a60405323b4ad6a9546c19d4a5d94bd
+EBUILD lammps-20200303.ebuild 3048 BLAKE2B 03b75bd91e21bb2d765836176d8ac88b5ca80c9cc1b1091e6e81416826c43e055aab6116eab35f6954e6bfbba09da1cf5d78e9c54de1c40f26b0b58bef11f6eb SHA512 d4b71ccb1f776643edfae5dff74d36017a2da284982d3a0a4a0f2d7949324e37ab43a60cb57fd217605a517455f021987e27bd7551d15599694b6e3699628f2a
+MISC metadata.xml 1400 BLAKE2B 799d1c7a8a17a78af7de38cba5058ebe2b79eb577f8bcfa918459bccedecf151adc9442fe2031f16c6215b9126045a7472cb91fdf0d9a68c6f22271a5a2a5226 SHA512 8f864d325dfcbba719be7f7860485810a63a685739d0f2a0ec45989362b3eec28351d4ad34f579572f638291f2bad96ac04ca6eacd4c886ffbb77fb6d06dbe12
diff --git a/sci-physics/lammps/lammps-20200303.ebuild b/sci-physics/lammps/lammps-20200303.ebuild
new file mode 100644
index 000000000000..b159bd9a9469
--- /dev/null
+++ b/sci-physics/lammps/lammps-20200303.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit cmake-utils fortran-2 python-r1
+
+convert_month() {
+	local months=( "" Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec )
+	echo ${months[${1#0}]}
+}
+
+MY_PV="stable_$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:0:4}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
+HOMEPAGE="https://lammps.sandia.gov/"
+SRC_URI="https://github.com/lammps/lammps/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz
+	test? ( https://github.com/lammps/lammps-testing/archive/${MY_PV}.tar.gz -> ${PN}-testing-${MY_PV}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cuda examples gzip kokkos lammps-memalign mpi netcdf python test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	app-arch/gzip
+	media-libs/libpng:0
+	sys-libs/zlib
+	mpi? (
+		virtual/mpi
+		sci-libs/hdf5[mpi]
+	)
+	python? ( ${PYTHON_DEPS} )
+	sci-libs/voro++
+	virtual/blas
+	virtual/lapack
+	sci-libs/fftw:3.0
+	netcdf? ( sci-libs/netcdf )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
+	kokkos? ( >=dev-cpp/kokkos-3.0.00 )
+	dev-cpp/eigen:3
+	"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}/cmake"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_MPI=$(usex mpi)
+		-DBUILD_LIB=ON
+		-DPKG_GPU=$(usex cuda)
+		-DGPU_API=CUDA
+		-DENABLE_TESTING=$(usex test)
+		-DLAMMPS_TESTING_SOURCE_DIR=$(echo "${WORKDIR}"/lammps-testing-*)
+		-DPKG_ASPHERE=ON
+		-DPKG_BODY=ON
+		-DPKG_CLASS2=ON
+		-DPKG_COLLOID=ON
+		-DPKG_COMPRESS=ON
+		-DPKG_CORESHELL=ON
+		-DPKG_DIPOLE=ON
+		-DPKG_GRANULAR=ON
+		-DPKG_KSPACE=ON
+		-DFFT=FFTW3
+		-DPKG_KOKKOS=$(usex kokkos)
+		$(use kokkos && echo -DEXTERNAL_KOKKOS=ON)
+		-DPKG_MANYBODY=ON
+		-DPKG_MC=ON
+		-DPKG_MEAM=ON
+		-DPKG_MISC=ON
+		-DPKG_MOLECULE=ON
+		-DPKG_PERI=ON
+		-DPKG_QEQ=ON
+		-DPKG_REAX=ON
+		-DPKG_REPLICA=ON
+		-DPKG_RIGID=ON
+		-DPKG_SHOCK=ON
+		-DPKG_SNAP=ON
+		-DPKG_SRD=ON
+		-DPKG_PYTHON=ON
+		-DPKG_MPIIO=$(usex mpi)
+		-DPKG_VORONOI=ON
+		-DPKG_USER-ATC=ON
+		-DPKG_USER-AWPMD=ON
+		-DPKG_USER-CGDNA=ON
+		-DPKG_USER-CGSDK=ON
+		-DPKG_USER-COLVARS=ON
+		-DPKG_USER-DIFFRACTION=ON
+		-DPKG_USER-DPD=ON
+		-DPKG_USER-DRUDE=ON
+		-DPKG_USER-EFF=ON
+		-DPKG_USER-FEP=ON
+		-DPKG_USER-H5MD=$(usex mpi)
+		-DPKG_USER-LB=$(usex mpi)
+		-DPKG_USER-MANIFOLD=ON
+		-DPKG_USER-MEAMC=ON
+		-DPKG_USER-MGPT=ON
+		-DPKG_USER-MISC=ON
+		-DPKG_USER-MOLFILE=ON
+		-DPKG_USER-NETCDF=$(usex netcdf)
+		-DPKG_USER-PHONON=ON
+		-DPKG_USER-QTB=ON
+		-DPKG_USER-REAXC=ON
+		-DPKG_USER-SMD=ON
+		-DPKG_USER-SMTBQ=ON
+		-DPKG_USER-SPH=ON
+		-DPKG_USER-TALLY=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Install python script.
+	use python && python_foreach_impl python_domodule "${S}"/../python/lammps.py
+
+	if use examples; then
+		for d in examples bench; do
+			local LAMMPS_EXAMPLES="/usr/share/${PN}/${d}"
+			insinto "${LAMMPS_EXAMPLES}"
+			doins -r "${S}"/../${d}/*
+		done
+	fi
+}
diff --git a/sci-physics/lammps/metadata.xml b/sci-physics/lammps/metadata.xml
index be0e36d7abee..274aacacf7b6 100644
--- a/sci-physics/lammps/metadata.xml
+++ b/sci-physics/lammps/metadata.xml
@@ -20,6 +20,7 @@
 			call instead of malloc() when large chunks or memory are allocated
 			by LAMMPS. Aliengnment is on 16 byte boundaries.</flag>
 		<flag name="cuda">Enable cuda non-bonded kernels</flag>
+		<flag name="kokkos">Enable kokkos non-bonded kernels</flag>
 	</use>
 	<maintainer type="person">
 		<email>nicolasbock@gentoo.org</email>
diff --git a/sci-physics/lhapdf/Manifest b/sci-physics/lhapdf/Manifest
index 5ba6329fcff0..7d9e363909d7 100644
--- a/sci-physics/lhapdf/Manifest
+++ b/sci-physics/lhapdf/Manifest
@@ -5,6 +5,6 @@ DIST cteq5l.LHgrid 134797 BLAKE2B 1e222631ff00979abf64e95ffa3133d29eacd819325fcd
 DIST cteq61.LHgrid 8946864 BLAKE2B aa7d7d817082a70fb53cf9c9d367af3bca9b5f4d845ee6c8f8b77265541980cab6f6ffc74a2233ef2899c161f9171cb3e7ba9570a57c5ed048311622217f8e89 SHA512 ab35c058f1ece8b428d8664ba2e14068541279328b5eb9e13b020642cc804c21f7412414dd74bb3621a5136bfa7d9a60832604c944d1e3519c5a94d3dce2a063
 DIST cteq61.LHpdf 11860 BLAKE2B cde2c5f6493977f56207d86f0a439a192e32f4debe50b6399b10cf59982bf944950c53c05e97a56daa8eb8e2ebf91a38fe405b1d423be7839c41dab61150b2e2 SHA512 2769bcaed94aa4b47144cd2c3ce76e0b6ab4fa8af278db5cb3b612f2286200352e829eec3971c8da0b78144483f00bbbf1ae2aae8d1e75045d239fab40289bc0
 DIST lhapdf-5.9.1.tar.gz 1236188 BLAKE2B a70b0421f1eefb79e239beed362858f0a47f27eebb0bf30c8f71f0fd49e405370774a932388c56b9193d51be14d7ad8e00efb7ea947e92009f23868b28ced67f SHA512 8e0eafa202d7c486264c06ddac31a2d1fc17c71223cf5b75cd9dae7e434792e8b8f4002bc8a0d00491c0c3fc58513095cbf693dc883c3bf968473a4e6232586a
-EBUILD lhapdf-5.9.1.ebuild 2412 BLAKE2B bdc15e85d250533dbea638a0faaa035f5a6058475e0e82d7e3683e035eaef28e48d2507bdc91601253c8627cb768e3d46b518c01f12ed04c58746807676bf2e2 SHA512 3dbbc9cf14d2764b4e3abee374cc91efb0a3846c14d5a20eb9c6183c7bb66f2cf91a67df1c3395631b2ec3fdcb52b5ed0ea3265b767ef24a0b0194efcc0a0637
-EBUILD lhapdf-6.2.3.ebuild 1448 BLAKE2B 49761e53779caddff9298c9e2d91affb4b6f58acf7e064e95677419c1e17dc4258b6ff683a9be06131096496e493044e96565d20e1b03f69e7b4fd3dfc6325a1 SHA512 4d412b59d8285b4ba65fc7e7d54c42cb59c88537d10cd62d3ff71b4ff88e7d0334ecf9d050e9a02857c6e6c41a26dc592d9caf5dca479ca57fab2f4d0b2539f3
+EBUILD lhapdf-5.9.1.ebuild 2568 BLAKE2B b524737e97a5e885f367d6c401a5e959e0b866f6c115156d568d96250c2d620bb26df6a75140405882feeeaac5eefa87de4dd529e1fb74516e7e10bcdae640ec SHA512 f5dece0e617f2750e3c7e0db47fdfad9e2b5a1a490c285094835de1af7b9f62f5cada0a5ef4d46a9ced8de7342d137551de706b3b6ea1d88278dd29671157f69
+EBUILD lhapdf-6.2.3.ebuild 1605 BLAKE2B b6ef8f78ae33a595cf508030c2804aa7932ab57cef2c9cd791805df295a35c09b5ab348ca27214fdc9a39fa1dad9fbd824b7449cf1c666c6e761e9ed9b36df8c SHA512 60ad1fb4db61bfae6eacaadcc148bb405dfb65dc619b5224cc3132f4b552c151fb72f1e3c4b3906e1acd1bc27e79d762119db7cf91f62c4c90a936aa91798337
 MISC metadata.xml 1090 BLAKE2B e7faa55de10391c76cc33d1f66f9a715d163d396c5e74b4d2d55268424abb74dc70687287c900841e4a298ca5bc936b01cec7c570d2b14b86d251c4b3d485d26 SHA512 fe04ac08f3f0b7ed98369d16b2cdf053d980211f3d4bb9a17d3e3feb3cc3dc6e2999fd16cc533ba7250e47b258aa10bed90d7f62007faac064112c5f9b79fe4e
diff --git a/sci-physics/lhapdf/lhapdf-5.9.1.ebuild b/sci-physics/lhapdf/lhapdf-5.9.1.ebuild
index dbb46b9c38bb..dee35d6e6f2f 100644
--- a/sci-physics/lhapdf/lhapdf-5.9.1.ebuild
+++ b/sci-physics/lhapdf/lhapdf-5.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,7 +26,14 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="octave? ( sci-mathematics/octave )"
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[latex] )
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
 	python? ( dev-lang/swig )"
 
 S="${WORKDIR}/${MY_PF}"
diff --git a/sci-physics/lhapdf/lhapdf-6.2.3.ebuild b/sci-physics/lhapdf/lhapdf-6.2.3.ebuild
index 0d3596130542..fd7abda37ad3 100644
--- a/sci-physics/lhapdf/lhapdf-6.2.3.ebuild
+++ b/sci-physics/lhapdf/lhapdf-6.2.3.ebuild
@@ -26,7 +26,15 @@ RDEPEND="
 	dev-libs/boost:0=
 	python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[latex] )"
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
 
 S="${WORKDIR}/${MY_PF}"
 
diff --git a/sci-physics/rivet/Manifest b/sci-physics/rivet/Manifest
index 41fb872759c2..d8af0654ef90 100644
--- a/sci-physics/rivet/Manifest
+++ b/sci-physics/rivet/Manifest
@@ -1,4 +1,4 @@
 DIST Rivet-2.6.0.tar.bz2 3527799 BLAKE2B a0ffe7a73ed1120cd3944d3c845ed9387528e7645554c589fda0bfcac694e36f24ee78914e916c51f3a978659933b4e8934e0373f26e4a3ba7597714fc9a939f SHA512 49c381d88075715e23942bb02066b189305077581cd64b708ccaf79436202fe1c9d7989fc1f35dfeffdc643adb39283710fdf33fc87407cfb7ddd3e9d2297feb
 DIST refs.bib 16907 BLAKE2B 70c11f86c8ebf6386615b3e900280d1a2677dc82d99f944ac670f52320e05355352dd4017a48ae2af52dfd6f46a92a0d2d65bde4c271589ba4e66b3e7b68982c SHA512 64755e6aeaa1f0b3fb76a33ffdf226bcd42ee597a78a8d458b728f0e6f576d4dafbb276a0498c3b573d23054ccbf54ada6f6c12faf52dbfbeef2372094d01181
-EBUILD rivet-2.6.0-r2.ebuild 1915 BLAKE2B 421b0a50ab8eb5afa679c16681e47a016777b59e87427c8ea9c5f59621a1cf4ebebb8f778e10192b8fd84b49753a036bba2beb3260977813d275d080612df31b SHA512 84da572b0d375392571ade8b1548f64e0865ad444879548d36080093113107a59111d8389a26c80a804ca4301ec883f78e2b1166aa38c6ae4a83b7483b93aaa7
+EBUILD rivet-2.6.0-r2.ebuild 2072 BLAKE2B 000281770d68dd8b8fcf79d183010ac7b792a161035edc65dbea1a6bdd8eb5a01129cc798fa1a1fcb4d65806eaf8ec6c9c92ac9c798594697a2b1a36b1815b8e SHA512 4037d80a27a2eb8111dc08463d9200306a886be79ee3e45af21f43f14fec482e5cd7c33f31d59cfd6801bb454dc607f0551c781adc4b450899576be7b46c9a1d
 MISC metadata.xml 836 BLAKE2B ab971f916f23c3c3d70e54440e8f2303918084d25ba5a5ca7ed50142606f88e25019dac7781f20df717e4a552fc3ca642439bf0c37476aa378969f82abbab1c3 SHA512 21245268e114d41e0fe10cf6d265b3db7a0e220e1f6d545df4782839f6f5f284c9ddd6f89d20c74497e394e23bf93c96013dcde5c3685e4f1c112c73156f8db0
diff --git a/sci-physics/rivet/rivet-2.6.0-r2.ebuild b/sci-physics/rivet/rivet-2.6.0-r2.ebuild
index 551de2ab59ee..3bd00b427282 100644
--- a/sci-physics/rivet/rivet-2.6.0-r2.ebuild
+++ b/sci-physics/rivet/rivet-2.6.0-r2.ebuild
@@ -27,7 +27,14 @@ RDEPEND="
 	sci-physics/yoda:=[python]
 	python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[latex,dot] )
+	doc? (
+		app-doc/doxygen[dot]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
 	python? (
 		$(python_gen_cond_dep '
 			dev-python/cython[${PYTHON_MULTI_USEDEP}]
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index e34d44b094c1..453fd24b345a 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -9,9 +9,11 @@ DIST root_v6.12.06.source.tar.gz 162284452 BLAKE2B 944b5e899677bab40842d7ec969ff
 DIST root_v6.14.08.source.tar.gz 162474562 BLAKE2B f8bfdabb4d91bbdfbab0b17626fff1f8aa265292996d857025cbd1543306f3ec540a1afb080788bfc7149ea835932b59d7c54dcd802354e31294ba2e5e9d2366 SHA512 827e39efbf3c69429a0a256127ca9f87550d9084c34c715bddccbf87a8c111c367b9a0ac6882aac747c9b48f4a3effb3747b4df567429910c93ee64dfe35df5b
 DIST root_v6.16.00.source.tar.gz 164836293 BLAKE2B 9d8f02631bdc1fa1775cbdaf50dd1feacd9b3c86b81d679ba6f0ca3c5787cd1d22ef7c33358b608361a01ad4f0aff3e8c749649d24773a35c52ce87f808d08f5 SHA512 17e5b9815973773e30ff83c2f4028e9e93691c1ecb824c162c8b3e02d1f6666fb8e0b72a5d0652a90032af146d92d271cbffcd634fb6fe6a63bdf46d672789bf
 DIST root_v6.18.04.source.tar.gz 165938450 BLAKE2B d6545dfa95817940f2bb6b5b49252eca1958df518a4bc05c4857df60a015a39d0df09ea077465533e6ebc815d04e1742da19d18b7af02b5446f9e73dc92e3c16 SHA512 cfcbdd2db4edf55845a7cd1e6ec0cdf714a7ceacb039fa6fb627d7300d6f849b3b462bab724e33b1d6b08eb22ba42c43b7d64c0c6c47dc8a3bb652f86979f2c6
-EBUILD root-6.12.06-r11.ebuild 7937 BLAKE2B c714478a834736759af8b45ecaecf25935a8f0c39611b8f444c3620a9ab5d6616496b465b2a4f090b969a224f6bee19f3771164fb8942772ffbb29feb6a97a78 SHA512 d54b1783df85f19843831e254ffaef65f774fe5694864f8afb7446950ead97626037b250b03bb1ae128a3032bc1d13f79e2f3562fea3c1a05185ac40686763bf
-EBUILD root-6.14.08-r4.ebuild 8179 BLAKE2B aa0d28a4289a32c44032abc5a8a8916458c3291b547fe117efa7505af69fef580f1c1125b1c7a5a80d7622fcb6d5398787bb0e8d2350a110968581cc428547ab SHA512 215d5ca967f6a97f99a333eebc3f3ad909ecfdfeadf930b9ed4491eb626c7cb93ba7990cab74152a58c173e9c8f8e4e302c535788609e97dd6b38d7fe9698392
-EBUILD root-6.16.00-r4.ebuild 8155 BLAKE2B cf9596fd9e1b00be23ca6381494940536f08b3e685c87f3e0df8c2ddd01b716caecd8a53920037a70d2beea3e366619428d074ea6b5c81da6bd2dd1fb8a9911f SHA512 20a0a8c0a7e9029a9f6bf3a77ccfe3044c609a9370fad28225c8d2bc512b3e055d4f2a693730525d0bf35dfd4932cf38f5552a8d4661207f9c380597c65344fc
-EBUILD root-6.18.04-r1.ebuild 7573 BLAKE2B dcdc80a9aa32512cdea024b353bb883ec725a66a061f773eec51c3cf9c573e081d973f8f1d075d14cd7b6589be7c81968534f736cc510c7bb4ad89e49ab6335d SHA512 cb79923444573ea40bc56c14973d627eb14bab6b0ca1f07d123436bc96e2a10186441dc9491c9fb1571bb62d12ee85ece7ce728c01e77048a149154b962397c3
-EBUILD root-9999.ebuild 7549 BLAKE2B 7924fb2eabefc21bbc59d102f058cd71dfd279cca3b7fa06480b35a99d6149debb436230960251f070e19e6e5938b84411f54c9a1f789884deee378f912d97e3 SHA512 21e39143f3ff1898c64c75a8e3aa625132e490398e8b706b853b94370c3abb32013f62a6cddf9864f3d2234243a78628db99beba27b7d9b11b9c5fa0050491ac
-MISC metadata.xml 3218 BLAKE2B f23175b1a5998bbecdcdb6e5f42d08bd8e16aaeee79f43d30e0906977f389e18a19ddceeba24009360c2f717c29162c8e30b807bda993492f27429802dc62883 SHA512 d3bdc5bce1d1ac904e5a7a9f21bca65deb480ecbd1362a3251c93e09ab07fdcdd6dfd8900e62df3853b7e200880850d9010122500a081fdedb6b43adae25a6bd
+DIST root_v6.20.04.source.tar.gz 168056076 BLAKE2B 814bf74f5a18adf2605954068962d3283504538118d221f55e030b224e09c9542a544c166a317ad981a84d4a1edc48bbfc76a57acd43aefb779d8e27270c4aeb SHA512 3cc214a4b160795c8aa53b6fdb01370c3aea628696d1668cbf47e6beac56f171674619a853a1219336d9b67ad06db1d9ecd13345bf1731f809da9e60b3d39a2c
+EBUILD root-6.12.06-r12.ebuild 7938 BLAKE2B 6d4c212935a3e876cfdd0bf450492bbddca396c335dfee0b83cc107d7d5fa2edddb40578c56317e794935a642a8eeb3f0cf8e4bf40cd582c7583ce121573eac8 SHA512 f8e4ac626f7036c6c105e9a8f766c42953e16061e86500ef3887d4358436adc66c4d7963b9b770d3a2441aec9cf919b70573029300a244336596689b2edf6fc0
+EBUILD root-6.14.08-r5.ebuild 8211 BLAKE2B abd4273edb6018bb2f8bd9b2c5ced07a8d2456f5c3d8d0454001effa131cfe69b64f49aa34066158cca51d7ee39a1f863529c2987c804959a00cc521aee8b5fb SHA512 31b3a3fc8eb88a8748b9bc94ca722dfb6ffe2d992c950bcf9ca7c5e50a3f657ecdea2b29c0a853d9a72e42645605b3909136a52f813f73d52de590747b937296
+EBUILD root-6.16.00-r5.ebuild 8187 BLAKE2B c43fd82834bbcdbbc1fcb1222d0224c21634fff50a442aa6a000661869dc59bea3d44966e027b346823fc3eeab179fa3d7cd9ab4242242623175a8067ce3fb0c SHA512 b9572e4ffcfe9419a6ea9d01fbedc4baf176d52a41d1346480c033ee6ccca89f8897145e369cb6aa4f7a8aa3dc7d57e2e6a70cfa8e50d43a9673be8e90138cac
+EBUILD root-6.18.04-r2.ebuild 7605 BLAKE2B 29c1e60bad000788106a9144f06160c2809d102fbda9c7caeced46d889ae1b59d763b8be856c62ca6e21f603a4731a6fff8c8847cf15cddaedb822482ae940c6 SHA512 bdc1470a84f031788c463f93115e2f602480cf6422057747b5df298fd59439c42e5c868ed2c5ae421a73d2132b477a5084e4d9e3b693afa72768e607280c94fb
+EBUILD root-6.20.04.ebuild 7617 BLAKE2B 9b3bf2fbc81c49b45a5274d2066c06b33c1f67a57a4afd3c0b5749fc549e8849aab2caa0a2183b26c32e068ea38483081ee827ece28b0f786e529f8adcacb160 SHA512 1010c53f2bfa1f6a9d6cbf62ade88d5ff1112d91dc9934d7c07f828e01edd4f6384699461ccd2c2a2e9223ad84163a36103a7f7981aca4b257cfa05f4d688bd3
+EBUILD root-9999.ebuild 8021 BLAKE2B 39b70c2fcffd785a4a6e9d95717fbbe46af6dc729f1b2ce34f56b2295144ba3f7e1ebadd9d009ec89e4411123977550b048e95395ee933ce1edfee43f029f166 SHA512 ed05ee62a2f1c92dc5816381a7eb59c777f2973e757ed3c5acc640496e8eb4e6b45ab0034d39564be923ee38caa06883c63abaf5484089935a67fbd3a4f395b5
+MISC metadata.xml 3288 BLAKE2B e61573d67396a1c102c3f92036dbd0d1f601d383ec7e806ece97eb1ab026ee05e99f36acf98261455c8213868526bb3119c502bc837654787c663bfc9b205c84 SHA512 2f26ec7cde49879c23c56b8a860471e7c3da6b4cb0ee8c36f00d352547115fecc81cd2f1344a021e5d4895996e8744b7f6fcee3d478b901e149513fba50086c6
diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 8eb44b130ef3..e20aca48cc14 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -25,6 +25,7 @@
     <flag name="c++14">Build using the C++14 standard</flag>
     <flag name="c++17">Build using the C++17 standard</flag>
     <flag name="cuda">Enable support for nVidia CUDA</flag>
+    <flag name="cudnn">Enable support for nVidia cuDNN library</flag>
     <flag name="davix">Enable support for DAVIX Data Management Client (https://cern.ch/davix)</flag>
     <flag name="fits">Enable support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
     <flag name="fortran">Compile included Fortran programs</flag>
diff --git a/sci-physics/root/root-6.12.06-r11.ebuild b/sci-physics/root/root-6.12.06-r12.ebuild
index d49c467555c2..8aec2963b96b 100644
--- a/sci-physics/root/root-6.12.06-r11.ebuild
+++ b/sci-physics/root/root-6.12.06-r12.ebuild
@@ -86,7 +86,7 @@ CDEPEND="
 	pythia8? ( sci-physics/pythia:8= )
 	python? ( ${PYTHON_DEPS} )
 	R? ( dev-lang/R )
-	shadow? ( virtual/shadow )
+	shadow? ( sys-apps/shadow )
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? ( dev-libs/openssl:0= )
 	tbb? ( dev-cpp/tbb )
diff --git a/sci-physics/root/root-6.14.08-r4.ebuild b/sci-physics/root/root-6.14.08-r5.ebuild
index 86b2044fd24f..70ca03aa303c 100644
--- a/sci-physics/root/root-6.14.08-r4.ebuild
+++ b/sci-physics/root/root-6.14.08-r5.ebuild
@@ -91,7 +91,7 @@ CDEPEND="
 	pythia8? ( sci-physics/pythia:8 )
 	python? ( ${PYTHON_DEPS} )
 	R? ( dev-lang/R )
-	shadow? ( virtual/shadow )
+	shadow? ( sys-apps/shadow )
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? ( dev-libs/openssl:0= )
 	tbb? ( >=dev-cpp/tbb-2018 )
@@ -128,6 +128,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	use cuda && cuda_src_prepare
+
 	cmake-utils_src_prepare
 
 	sed -i "/CLING_BUILD_PLUGINS/d" interpreter/CMakeLists.txt || die
diff --git a/sci-physics/root/root-6.16.00-r4.ebuild b/sci-physics/root/root-6.16.00-r5.ebuild
index aa5745011f80..856ea9fb1061 100644
--- a/sci-physics/root/root-6.16.00-r4.ebuild
+++ b/sci-physics/root/root-6.16.00-r5.ebuild
@@ -91,7 +91,7 @@ CDEPEND="
 	pythia8? ( sci-physics/pythia:8 )
 	python? ( ${PYTHON_DEPS} )
 	R? ( dev-lang/R )
-	shadow? ( virtual/shadow )
+	shadow? ( sys-apps/shadow )
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? ( dev-libs/openssl:0= )
 	tbb? ( >=dev-cpp/tbb-2018 )
@@ -127,6 +127,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	use cuda && cuda_src_prepare
+
 	cmake-utils_src_prepare
 
 	sed -i "/CLING_BUILD_PLUGINS/d" interpreter/CMakeLists.txt || die
diff --git a/sci-physics/root/root-6.18.04-r1.ebuild b/sci-physics/root/root-6.18.04-r2.ebuild
index 89beda36d2b8..56da96833767 100644
--- a/sci-physics/root/root-6.18.04-r1.ebuild
+++ b/sci-physics/root/root-6.18.04-r2.ebuild
@@ -87,7 +87,7 @@ CDEPEND="
 	pythia8? ( sci-physics/pythia:8 )
 	python? ( ${PYTHON_DEPS} )
 	R? ( dev-lang/R )
-	shadow? ( virtual/shadow )
+	shadow? ( sys-apps/shadow )
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? ( dev-libs/openssl:0= )
 	tbb? ( >=dev-cpp/tbb-2018 )
@@ -121,6 +121,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	use cuda && cuda_src_prepare
+
 	cmake-utils_src_prepare
 
 	sed -i "/CLING_BUILD_PLUGINS/d" interpreter/CMakeLists.txt || die
diff --git a/sci-physics/root/root-6.20.04.ebuild b/sci-physics/root/root-6.20.04.ebuild
new file mode 100644
index 000000000000..07d451fd7159
--- /dev/null
+++ b/sci-physics/root/root-6.20.04.ebuild
@@ -0,0 +1,304 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ninja does not work due to fortran
+CMAKE_MAKEFILE_GENERATOR=emake
+FORTRAN_NEEDED="fortran"
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+
+inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
+	prefix python-single-r1 toolchain-funcs
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="https://root.cern"
+SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz"
+
+IUSE="+X aqua +asimage +c++11 c++14 c++17 cuda cudnn +davix debug emacs
+	+examples fits fftw fortran +gdml graphviz +gsl http libcxx +minuit
+	mpi mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python
+	qt5 R +roofit root7 shadow sqlite +ssl +tbb test +tmva +unuran vc
+	vmc +xml xrootd"
+RESTRICT="!test? ( test )"
+
+SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
+LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="
+	^^ ( c++11 c++14 c++17 )
+	cuda? ( tmva !c++17 )
+	cudnn? ( cuda )
+	!X? ( !asimage !opengl !qt5 )
+	davix? ( ssl xml )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	qt5? ( root7 )
+	root7? ( || ( c++14 c++17 ) )
+	tmva? ( gsl )
+"
+
+CDEPEND="
+	app-arch/lz4
+	app-arch/zstd
+	app-arch/xz-utils
+	fortran? ( dev-lang/cfortran )
+	dev-libs/libpcre:3
+	dev-libs/xxhash
+	media-fonts/dejavu
+	media-libs/freetype:2
+	media-libs/libpng:0=
+	sys-libs/ncurses:=
+	sys-libs/zlib
+	X? (
+		x11-libs/libX11:0
+		x11-libs/libXext:0
+		x11-libs/libXft:0
+		x11-libs/libXpm:0
+		opengl? (
+			media-libs/ftgl:0=
+			media-libs/glew:0=
+			virtual/opengl
+			virtual/glu
+			x11-libs/gl2ps:0=
+		)
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtwebengine:5[widgets]
+		)
+	)
+	asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
+	cudnn? ( dev-libs/cudnn )
+	davix? ( net-libs/davix )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	fftw? ( sci-libs/fftw:3.0= )
+	fits? ( sci-libs/cfitsio:0= )
+	graphviz? ( media-gfx/graphviz )
+	gsl? ( sci-libs/gsl:= )
+	http? ( dev-libs/fcgi:0= )
+	libcxx? ( sys-libs/libcxx )
+	unuran? ( sci-mathematics/unuran:0= )
+	minuit? ( !sci-libs/minuit )
+	mpi? ( virtual/mpi )
+	mysql? ( dev-db/mysql-connector-c )
+	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql:= )
+	pythia6? ( sci-physics/pythia:6 )
+	pythia8? ( sci-physics/pythia:8 )
+	python? ( ${PYTHON_DEPS} )
+	R? ( dev-lang/R )
+	shadow? ( sys-apps/shadow )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl:0= )
+	tbb? ( >=dev-cpp/tbb-2018 )
+	tmva? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	vc? ( dev-libs/vc:= )
+	xml? ( dev-libs/libxml2:2= )
+	xrootd? ( net-libs/xrootd:0= )
+"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch
+)
+
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+
+	elog "There are extra options on packages not available in Gentoo."
+	elog "You can use the environment variable EXTRA_ECONF to enable"
+	elog "these packages. For example, for Vdt you would set:"
+	elog "EXTRA_ECONF=\"-Dbuiltin_vdt=ON -Dvdt=ON\""
+}
+
+src_prepare() {
+	use cuda && cuda_src_prepare
+
+	cmake-utils_src_prepare
+
+	sed -i "/CLING_BUILD_PLUGINS/d" interpreter/CMakeLists.txt || die
+
+	# CSS should use local images
+	sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
+}
+
+# Note: ROOT uses bundled clang because it is patched and API-incompatible
+#       with vanilla clang. The patches enable the C++ interpreter to work.
+#       Since ROOT installs many files into /etc (>100MB in total) that don't
+#       really belong there, we install it into another directory to avoid
+#       making /etc too big.
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_COMPILER=$(tc-getCC)
+		-DCMAKE_CXX_COMPILER=$(tc-getCXX)
+		-DCMAKE_CUDA_HOST_COMPILER=$(tc-getCXX)
+		-DCMAKE_C_FLAGS="${CFLAGS}"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+		-DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
+		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
+		-DCMAKE_INSTALL_LIBDIR="lib"
+		-DDEFAULT_SYSROOT="${EPREFIX}"
+		-DCLING_BUILD_PLUGINS=OFF
+		-Dexplicitlink=ON
+		-Dexceptions=ON
+		-Dfail-on-missing=ON
+		-Dgnuinstall=OFF
+		-Dshared=ON
+		-Dsoversion=ON
+		-Dbuiltin_llvm=ON
+		-Dbuiltin_clang=ON
+		-Dbuiltin_afterimage=OFF
+		-Dbuiltin_cfitsio=OFF
+		-Dbuiltin_davix=OFF
+		-Dbuiltin_fftw3=OFF
+		-Dbuiltin_freetype=OFF
+		-Dbuiltin_ftgl=OFF
+		-Dbuiltin_gl2ps=OFF
+		-Dbuiltin_glew=OFF
+		-Dbuiltin_gsl=OFF
+		-Dbuiltin_lz4=OFF
+		-Dbuiltin_lzma=OFF
+		-Dbuiltin_openssl=OFF
+		-Dbuiltin_pcre=OFF
+		-Dbuiltin_tbb=OFF
+		-Dbuiltin_unuran=OFF
+		-Dbuiltin_vc=OFF
+		-Dbuiltin_vdt=OFF
+		-Dbuiltin_veccore=OFF
+		-Dbuiltin_xrootd=OFF
+		-Dbuiltin_xxhash=OFF
+		-Dbuiltin_zlib=OFF
+		-Dbuiltin_zstd=OFF
+		-Dx11=$(usex X)
+		-Dalien=OFF
+		-Darrow=OFF
+		-Dasimage=$(usex asimage)
+		-Dlibcxx=$(usex libcxx)
+		-Dccache=OFF # use ccache via portage
+		-Dcefweb=OFF
+		-Dclad=OFF
+		-Dcocoa=$(usex aqua)
+		-Dcuda=$(usex cuda)
+		-Dcudnn=$(usex cudnn)
+		-Dcxxmodules=OFF # requires clang, unstable
+		-Ddavix=$(usex davix)
+		-Ddataframe=ON
+		-Ddcache=OFF
+		-Dfcgi=$(usex http)
+		-Dfftw3=$(usex fftw)
+		-Dfitsio=$(usex fits)
+		-Dfortran=$(usex fortran)
+		-Dftgl=$(usex opengl)
+		-Dgdml=$(usex gdml)
+		-Dgfal=OFF
+		-Dgl2ps=$(usex opengl)
+		-Dgminimal=OFF
+		-Dgsl_shared=$(usex gsl)
+		-Dgviz=$(usex graphviz)
+		-Dhttp=$(usex http)
+		-Dimt=$(usex tbb)
+		-Dmathmore=$(usex gsl)
+		-Dmemstat=OFF # deprecated
+		-Dminimal=OFF
+		-Dminuit2=$(usex minuit)
+		-Dminuit=$(usex minuit)
+		-Dmlp=$(usex tmva)
+		-Dmonalisa=OFF
+		-Dmpi=$(usex mpi)
+		-Dmysql=$(usex mysql)
+		-Dodbc=$(usex odbc)
+		-Dopengl=$(usex opengl)
+		-Doracle=$(usex oracle)
+		-Dpgsql=$(usex postgres)
+		-Dpythia6=$(usex pythia6)
+		-Dpythia8=$(usex pythia8)
+		-Dpyroot=$(usex python) # python was renamed to pyroot
+		-Dpyroot_experimental=OFF # use standard PyROOT for now
+		-Dqt5web=$(usex qt5)
+		-Droofit=$(usex roofit)
+		-Droot7=$(usex root7)
+		-Drootbench=OFF
+		-Droottest=OFF
+		-Drpath=OFF
+		-Druntime_cxxmodules=OFF # does not work yet
+		-Dr=$(usex R)
+		-Dshadowpw=$(usex shadow)
+		-Dsqlite=$(usex sqlite)
+		-Dssl=$(usex ssl)
+		-Dtcmalloc=OFF
+		-Dtesting=$(usex test)
+		-Dtmva=$(usex tmva)
+		-Dtmva-cpu=$(usex tmva)
+		-Dtmva-gpu=$(usex cuda)
+		-Dunuran=$(usex unuran)
+		-Dvc=$(usex vc)
+		-Dvmc=$(usex vmc)
+		-Dvdt=OFF
+		-Dveccore=OFF
+		-Dxml=$(usex xml)
+		-Dxrootd=$(usex xrootd)
+		${EXTRA_ECONF}
+	)
+
+	CMAKE_BUILD_TYPE=$(usex debug Debug Release) \
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# needed for hsimple.root
+	addwrite /dev/random
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	ROOTSYS=${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)
+	ROOTENV="$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)"
+
+	cat > ${ROOTENV} <<- EOF || die
+	MANPATH="${ROOTSYS}/share/man"
+	PATH="${ROOTSYS}/bin"
+	ROOTPATH="${ROOTSYS}/bin"
+	LDPATH="${ROOTSYS}/lib"
+	EOF
+
+	if use python; then
+		echo "PYTHONPATH=\"${ROOTSYS}/lib\"" >> ${ROOTENV} || die
+	fi
+
+	doenvd ${ROOTENV}
+
+	if use emacs; then
+		elisp-install ${PN}-$(ver_cut 1-2) "${BUILD_DIR}"/root-help.el
+	fi
+
+	pushd "${D}/${ROOTSYS}" > /dev/null
+
+	rm -r emacs bin/*.{csh,sh,fish} || die
+
+	if ! use examples; then
+		rm -r tutorials || die
+	fi
+
+	# create versioned symlinks for binaries
+	cd bin;
+	for exe in *; do
+		dosym "${exe}" "/usr/lib/${PN}/$(ver_cut 1-2)/bin/${exe}-$(ver_cut 1-2)"
+	done
+}
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 53b2390393ae..60e7f05e2b16 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -14,9 +14,9 @@ inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="https://root.cern"
 
-IUSE="+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs
+IUSE="+X aqua +asimage +c++11 c++14 c++17 cuda cudnn +davix debug emacs
 	+examples fits fftw fortran +gdml graphviz +gsl http libcxx +minuit
-	mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python
+	mpi mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python
 	qt5 R +roofit root7 shadow sqlite +ssl +tbb test +tmva +unuran vc
 	vmc +xml xrootd"
 RESTRICT="!test? ( test )"
@@ -41,6 +41,7 @@ LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
 REQUIRED_USE="
 	^^ ( c++11 c++14 c++17 )
 	cuda? ( tmva !c++17 )
+	cudnn? ( cuda )
 	!X? ( !asimage !opengl !qt5 )
 	davix? ( ssl xml )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -81,6 +82,7 @@ CDEPEND="
 	)
 	asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] )
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
+	cudnn? ( dev-libs/cudnn )
 	davix? ( net-libs/davix )
 	emacs? ( >=app-editors/emacs-23.1:* )
 	fftw? ( sci-libs/fftw:3.0= )
@@ -91,6 +93,7 @@ CDEPEND="
 	libcxx? ( sys-libs/libcxx )
 	unuran? ( sci-mathematics/unuran:0= )
 	minuit? ( !sci-libs/minuit )
+	mpi? ( virtual/mpi )
 	mysql? ( dev-db/mysql-connector-c )
 	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
 	oracle? ( dev-db/oracle-instantclient-basic )
@@ -99,7 +102,7 @@ CDEPEND="
 	pythia8? ( sci-physics/pythia:8 )
 	python? ( ${PYTHON_DEPS} )
 	R? ( dev-lang/R )
-	shadow? ( virtual/shadow )
+	shadow? ( sys-apps/shadow )
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? ( dev-libs/openssl:0= )
 	tbb? ( >=dev-cpp/tbb-2018 )
@@ -133,6 +136,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	use cuda && cuda_src_prepare
+
 	cmake-utils_src_prepare
 
 	sed -i "/CLING_BUILD_PLUGINS/d" interpreter/CMakeLists.txt || die
@@ -149,6 +154,9 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_C_COMPILER=$(tc-getCC)
+		-DCMAKE_CXX_COMPILER=$(tc-getCXX)
+		-DCMAKE_CUDA_HOST_COMPILER=$(tc-getCXX)
 		-DCMAKE_C_FLAGS="${CFLAGS}"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
 		-DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
@@ -187,6 +195,7 @@ src_configure() {
 		-Dbuiltin_xrootd=OFF
 		-Dbuiltin_xxhash=OFF
 		-Dbuiltin_zlib=OFF
+		-Dbuiltin_zstd=OFF
 		-Dx11=$(usex X)
 		-Dalien=OFF
 		-Darrow=OFF
@@ -197,9 +206,12 @@ src_configure() {
 		-Dclad=OFF
 		-Dcocoa=$(usex aqua)
 		-Dcuda=$(usex cuda)
+		-Dcudnn=$(usex cudnn)
 		-Dcxxmodules=OFF # requires clang, unstable
 		-Ddavix=$(usex davix)
+		-Ddataframe=ON
 		-Ddcache=OFF
+		-Dfcgi=$(usex http)
 		-Dfftw3=$(usex fftw)
 		-Dfitsio=$(usex fits)
 		-Dfortran=$(usex fortran)
@@ -219,6 +231,7 @@ src_configure() {
 		-Dminuit=$(usex minuit)
 		-Dmlp=$(usex tmva)
 		-Dmonalisa=OFF
+		-Dmpi=$(usex mpi)
 		-Dmysql=$(usex mysql)
 		-Dodbc=$(usex odbc)
 		-Dopengl=$(usex opengl)
@@ -226,7 +239,9 @@ src_configure() {
 		-Dpgsql=$(usex postgres)
 		-Dpythia6=$(usex pythia6)
 		-Dpythia8=$(usex pythia8)
-		-Dpython=$(usex python)
+		-Dpyroot=$(usex python) # python was renamed to pyroot
+		-Dpython=$(usex python) # kept for backward compatibility
+		-Dpyroot_experimental=OFF # use standard PyROOT for now
 		-Dqt5web=$(usex qt5)
 		-Droofit=$(usex roofit)
 		-Droot7=$(usex root7)
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
commit	623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree	993eb27c93ec7a2d2d19550300d888fc1fed9e69 /sci-physics
parent	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)