gentoo resync : 30.06.2019

11 files changed, 528 insertions, 44 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 60747aca9f6f..f9d9fa3d0812 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/clhep/Manifest b/sci-physics/clhep/Manifest
index 926c0697fe38..ff095fbe6396 100644
--- a/sci-physics/clhep/Manifest
+++ b/sci-physics/clhep/Manifest
@@ -1,5 +1,7 @@
 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 1329 BLAKE2B 44ff5e92f552290ffb31f352274d86186d841ea529b127ea6ad2ea598177cba37ce31f6177a3b3c7c17e507fb98c35c6df85c768fcd8739fcd486531e948fdb3 SHA512 09fa9b6135205ee61b162b00bf8552fc1b515b2e49bb7ec63862f438d8077a6607b8541d66a7ee2e5f269a8fb301782ad6f7fffa4ba2a2c81526e55c742264b5
 EBUILD clhep-2.4.0.4.ebuild 1109 BLAKE2B ca40e4513859bcd48ec2eb75eef937f9414ee389461ce026ff9f1fa7272b523cf2da5007efbaf9a3d46fa0b3c67107bc2ac5afe18cc6b756b23500fd2e041b9c SHA512 f7c780bb4c008280829e25dce9b92f772a0d74a5089a23f6b22d97d47031a3f309f894ef6f13c2a40057f91e7472f8f27891812c41af5abe157bb644f2160786
+EBUILD clhep-2.4.1.2.ebuild 1096 BLAKE2B 632a9b6afefae15c712f8aa21d873f262605c277be7a98e0ea9a158338b241e5a6660872cc320664564f94805488e9a8ce7e2e1e75f141e7516537236e93991f SHA512 83dfe65c01a9c1e688857dcf342d975eef88c2b4c50da72646f73866e346bbcd1836228e4501fc0c35c0737d210a12dda477f6ba1160dade868b3f0c359e2b35
 MISC metadata.xml 496 BLAKE2B 60254470fbb21294249dd75b34aebb0d29d090aba3a41f75e02950ccd77fe1ca0043eec460844f2de4b2a9b4bd4e34f2faa6c00b81daf8e615b78d92f503ade3 SHA512 768aeefc23a2ea89eb63b0eb6fd084c253243b6d67b822702dffc8f49a7170d30e55ebc08875ff238e618639882f93fe6e1390e3d8456f3850d75d5a98bf3b96
diff --git a/sci-physics/clhep/clhep-2.4.1.2.ebuild b/sci-physics/clhep/clhep-2.4.1.2.ebuild
new file mode 100644
index 000000000000..8eac6ef22dd0
--- /dev/null
+++ b/sci-physics/clhep/clhep-2.4.1.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 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 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+IUSE="doc test threads"
+
+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
+		sed -i \
+			-e '/add_subdirectory(test)/d' \
+			*/CMakeLists.txt || die
+	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 a1907601928a..a031855b4c06 100644
--- a/sci-physics/geant-data/Manifest
+++ b/sci-physics/geant-data/Manifest
@@ -1,13 +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 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 G4PARTICLEXS.1.1.tar.gz 3388648 BLAKE2B ed179d003a84007dc26319f2b3e7349586f8e1ef58de8acb8e8560867195ada039cb62b763afc58e5e234425db39297a9f586a0249c59bca5199e78d5f219861 SHA512 feaf86d0382c199f7a443bffd4d083e635ab3e9c535b535b426c447a8e25f2ddbaac39965038eb1b9cac12132a9c19c7b86c5670863dc4e93d3aa1f4ecebf369
 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 G4RadioactiveDecay.5.3.tar.gz 1022013 BLAKE2B a9470e3cf1eb50c0e79d5c136e88b94c83123a1ed7f88da7eada669a7c3497ab54a647f6a4b84a11904ffcfb4194503bd6fa660127351c958f3b18dcd2919a29 SHA512 a11169de1044eae15e4f5ca43ec25e917aa31b901ab1bdc3055cb999281124f4b98a8c20e53043c012f1e7572172467209ec306c21770f66e7039f7199cffc5a
+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 149189664 BLAKE2B d948367be89b9bf6b4202b59e5eadbba812c07f538b4e7c914d84c29e8d27efd8492649619ba8233956e4836b356445fbfffe9b59e51a199acbd35b7d4768c74 SHA512 74b46cd66be635879cf2122f8095ac75aed86584697fc93762bd1738a7edb8d6e70fc5cc94c6e35714ca13e54ad9d57d0f6036ea1651f3d5a4f4481c7716c43c
 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
diff --git a/sci-physics/geant-data/geant-data-4.10.05.ebuild b/sci-physics/geant-data/geant-data-4.10.05.ebuild
new file mode 100644
index 000000000000..df59a575cc3f
--- /dev/null
+++ b/sci-physics/geant-data/geant-data-4.10.05.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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.7.7
+	G4PhotonEvaporation.5.3
+	G4RadioactiveDecay.5.3
+	G4SAIDDATA.2.0
+	G4PARTICLEXS.1.1
+	G4ABLA.3.1
+	G4INCL.1.0
+	G4PII.1.3
+	G4ENSDFSTATE.2.2
+	G4RealSurface.2.1.1
+	G4TENDL.1.3.2"
+
+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/Manifest b/sci-physics/geant/Manifest
index d36449ea91bd..b44fac65a4a5 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -1,3 +1,5 @@
 DIST geant4.10.03.tar.gz 33143770 BLAKE2B f84c4dc680c45bc5728485e3e38852de90ae0f89dfe4cf65677aa86f6d90b4cbe5d2ffec812b08d05c88f8abb73f006f3a5319bcfd48c20872299ccfd91c7e39 SHA512 61d67e57f1576ab10562f2309995897008b4be1aa60f7e471b4f5efc2d852788d5faf60e64ea7024a4af4035d98c04c0be23df8593a4ed3a510af6b476013c56
+DIST geant4.10.05.p01.tar.gz 34413415 BLAKE2B d98a9308e37f166dccf8f9640a54ee74ab2b1d07275609666aec6d929b0193269a18075762cebaa154abcad5c8359a128b6629ff973cb6cdc8f54535151997a3 SHA512 ace2097251ee4cdda3511c3dd8191c97e1001f73d421797e3cd517ed41fa5adc73efcddfb2c8b6fb75231e5af8ddb4bd63a402ccb99b40ce2c140588d328b582
 EBUILD geant-4.10.03-r1.ebuild 2722 BLAKE2B 5cf9435abe415df1f08f399b288584c996bcae35a09fd6faee0bb8bd1ca4257eb3cfdf4a69ac3edd7a55c43a5cd7b997ec32646f12ae01224b9fc0b59c5ec621 SHA512 58cab146b13bcebec8654e22b363a17cdb3859c4a0eb740f88587db0642abf6531cdfe2803b9acd5cee912fe681a1202cd9d790c4a078bd225c77860277ff7e4
+EBUILD geant-4.10.05_p01.ebuild 2642 BLAKE2B 324ac7143b851d13a13de09a6cc578454439b2783686cf9458ab9ca478950f04789e0e5cff59f2ce6627be117102d9e88e8b5eb20c0cf746748bea1bc432feb5 SHA512 63ba64e7e920163df7fe9343e75b6c3a6cd70337f965e26931e3f521f5ace78deb79f4fdac3dfb1e8e1dd214587e9457de62b4aa4eacea522ad95a6580a2b90f
 MISC metadata.xml 1306 BLAKE2B 22a8b02b71c8e182649a701f1e28192c3bb7f7f3722bfee91490aaea9f96111be2aafe162ac1ba07fddd7b088db15c7b87a2f8c3f9a9fd2fac0e8317b605b91e SHA512 8c84f9185232134dd9da7937244bc07b5ac1fd6f7f3732491e759b000be357b51b9434c861d81ec8c5956431ae44947e475af0b86fd8368e0ad9c68b10979ae1
diff --git a/sci-physics/geant/geant-4.10.05_p01.ebuild b/sci-physics/geant/geant-4.10.05_p01.ebuild
new file mode 100644
index 000000000000..80ee3ae7420c
--- /dev/null
+++ b/sci-physics/geant/geant-4.10.05_p01.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eapi7-ver
+
+MY_P=${PN}${PV/_/.}
+SPV="$(ver_cut 1-2).$(printf %1d $(ver_cut 3))"
+
+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"
+
+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"
+
+RDEPEND="
+	dev-libs/expat
+	>=sci-physics/clhep-2.3.3.0:2=
+	dawn? ( media-gfx/dawn )
+	gdml? ( dev-libs/xerces-c )
+	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
+	)
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND} prefix? ( app-shells/tcsh )"
+PDEPEND="
+	data? ( ~sci-physics/geant-data-${PV/_p*/} )
+	doc? ( ~app-doc/geant-docs-${PV/_p*/} )"
+
+HTML_DOCS=( ReleaseNotes/ReleaseNotes${SPV}.html )
+
+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
+		-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_USE_G3TOG4=$(usex geant3)
+		-DGEANT4_USE_XM=$(usex motif)
+		-DGEANT4_USE_OPENGL_X11=$(usex opengl)
+		-DGEANT4_USE_INVENTOR=$(usex inventor)
+		-DGEANT4_USE_QT=$(usex qt5)
+		-DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx)
+		-DGEANT4_USE_NETWORKVRML=$(usex vrml)
+		-DGEANT4_USE_SYSTEM_ZLIB=$(usex zlib)
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+	)
+	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
+	[[ -f ReleaseNotes/Patch${SPV}-1.txt ]] && DOCS+=( ReleaseNotes/Patch${SPV}-*.txt )
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "The following scripts are provided for backward compatibility:"
+	elog "$(ls -1 ${EROOT%/}/usr/share/${PN^}${SPV}.*/geant4make/*sh)"
+}
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 21baa6ba9235..6d6d1f2ccc78 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -8,9 +8,11 @@ AUX root-6.16.00-disable-header-search.patch 1670 BLAKE2B cc9fda55bc867585432d9a
 DIST root_v6.12.06.source.tar.gz 162284452 BLAKE2B 944b5e899677bab40842d7ec969ff08cfa470e63be9a02b948a49ae088e8da72ce433a5071d9196bfd98f71e6861b1bda285354012620eee6c61cffcee71a0c8 SHA512 3d44749ccfc3d40a2f516ae53ef40fb244ed785eee0dbc18ff822bbb811a15b943039d30282ef5358a283d485e62531880c877ec77a86089503b06d6f37e42e1
 DIST root_v6.14.08.source.tar.gz 162474562 BLAKE2B f8bfdabb4d91bbdfbab0b17626fff1f8aa265292996d857025cbd1543306f3ec540a1afb080788bfc7149ea835932b59d7c54dcd802354e31294ba2e5e9d2366 SHA512 827e39efbf3c69429a0a256127ca9f87550d9084c34c715bddccbf87a8c111c367b9a0ac6882aac747c9b48f4a3effb3747b4df567429910c93ee64dfe35df5b
 DIST root_v6.16.00.source.tar.gz 164836293 BLAKE2B 9d8f02631bdc1fa1775cbdaf50dd1feacd9b3c86b81d679ba6f0ca3c5787cd1d22ef7c33358b608361a01ad4f0aff3e8c749649d24773a35c52ce87f808d08f5 SHA512 17e5b9815973773e30ff83c2f4028e9e93691c1ecb824c162c8b3e02d1f6666fb8e0b72a5d0652a90032af146d92d271cbffcd634fb6fe6a63bdf46d672789bf
+DIST root_v6.18.00.source.tar.gz 165917160 BLAKE2B 8c83f4dc7a7af8f8627e7711792d09800d3b426ce9ca338aad3bc65c9c307723bd97ca84f0e1790fb844f80be80c8cea9e58c1a6b469880752439db21f7d34cd SHA512 abc4630b773f979e01e0ede7bee095fa3f0f8172218538b37e68230dfce6f0623f24a9567bd40cf1e72ccb4e3398cec858fdfd53ba246ca3615fefd9e5a0d0cd
 EBUILD root-6.12.06-r9.ebuild 7694 BLAKE2B fb1fdf4f36493df97893a9181fd9a64feba98bb39b89943d2fd162244e4e25b71e381bd21be23c922416bd1ceb1c2621020ff23debc3dc33e2a2c604b01f2cbe SHA512 300e9f8ae90c29ef7a214d4a4d898c25128e00c1ee61900478ff802fa8280617dadfd05061e25428c7de38dfb93156dd09dc93b9ada93afd200641800d624245
 EBUILD root-6.14.08-r2.ebuild 7958 BLAKE2B 3d97b689b73e3dca32dd092730afb963d643aafc6a5948d7e378f1fe930555d6f71916773f57cd24c06b79e4e6a6de5aeb2d554ff762ef7d2813f5d5a111bd48 SHA512 da86353beb076717afaa692f798adba69629a38ac391a809a51b26bc99861158170ea1dc7beee4f592b5e3d5a92e7b265b3cc883390b2590d51f4fe6b5bbf251
 EBUILD root-6.16.00-r1.ebuild 8044 BLAKE2B d247bce9342e6612d53cc75992e7a5195a7d10b6b60f4b6ddde05c230d6df36f24d2142a9baffb006699bd5230470d118241af917b2d7fdc075e9ba6c453bf7a SHA512 c466be0558379c97ac5b685b392b6539d845eeb69cf0e980a9eea5637cf29dc7a57b288f3b361343e48c2100c8acf46cc5d858dbae4294d89534b8cded4cab7e
 EBUILD root-6.16.00.ebuild 7987 BLAKE2B b01e5e5069219006dee484a15b24f0ebcc350140522f9f99d8ef8eb32e2e2c2fe39d4243eaa3a1733c7dde04d6fba9a633c061f8f233fb291635917962fc4407 SHA512 77737611ce737357cb94b2c289baf7c1c29ed3de1dae0249cd805cb432f0b51e9b9103e2235065c6c72dd0a063ef9cba6f92e3eb10be152a022ca642f29f7bc8
-EBUILD root-9999.ebuild 8328 BLAKE2B 627bb2f349f7ed1960d993ad3cc8feac267f8f9d6946f6507ef55ea8e5c094d29a89d36e233d6e4807ff0e3d1acaf41b6df8c21d4cd16ef77c5d19872c03e589 SHA512 3580e2c14a474f74f9781d17f8fc5ea7ffdab0cd7d8089d977ed71ac393648fff32f5f70a606b8cadde08ae2505324d0f1510fbe08ee3da284adce6077d808e9
-MISC metadata.xml 3079 BLAKE2B a67a71c5dcde9c3d05420b7edefeee32a8e623e10d03f75169a02044377106641ed6dc96c65aa71f42c94c4b29777c0267e9163870cbb392e1dc7715b8ccc542 SHA512 24bb9b7d0d0263f363639f4861a071bfb7f1bdd5e15ec4b166c44114b25343edb008f7ac896dd899cbcdd068abd762aa84924a6e50384ee214de28beb08cfd2a
+EBUILD root-6.18.00.ebuild 7506 BLAKE2B aaa23dfabd5a488c762a6c3edaa465ef6379e4b07513743b72948b87ebf3a351985bc3c7a62820be246093a96b17d2af87b6a981f59eb1fba6acfbbe7a021095 SHA512 1b9cb10c81554abe3d642f18845bb7685a688c10f283629b248265a94f1cfb79bf9617d3e816e0e6dc73db668143d4e084ad2bc79a4585aabb764d9e79ae8d81
+EBUILD root-9999.ebuild 7566 BLAKE2B 532908c435949f4d1522ddee1aa535d69a92cf9f59e74dd1c1fff2ae8eb4acf0b476be92cb308758fad8636e6626243b37478577f6aa1f0b16daad354e20bf68 SHA512 9b3b7d122f733a3e4095704dd3bb60db33677cb9dac2d1c66f33ffe3e37d910094cdafe8908accb369b4ae46b95730ecee80eba5b27d5e43e9f685fb72a20e14
+MISC metadata.xml 3145 BLAKE2B 90d0a9fdb2481d8a7afe627ebe61bc97ff4ccc229f6ceed9cfccec918e2b9b51aa342eddd2f6599220fe639f027532e99fc96e806118cf95eac9a81238a5163f SHA512 7c7219d17879c2c6faaadc9a6c91da1844c95f0b2589cfe7d26a2d0f0f76a6c0a412dda94d50ea2b3568f032bba33c4f32f08c5cb891e792e9d707d5e683de34
diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 3c004c040558..f2ba440c8cea 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -44,6 +44,7 @@
     <flag name="tmva">Built TMVA (ROOT's multi-variate analysis toolkit for machine learning)</flag>
     <flag name="unuran">Enable support for <pkg>sci-mathematics/unuran</pkg></flag>
     <flag name="vc">Enable support for <pkg>dev-libs/vc</pkg> with VecCore</flag>
+    <flag name="vmc">Built the Virtual Monte Carlo library</flag>
     <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
   </use>
 </pkgmetadata>
diff --git a/sci-physics/root/root-6.18.00.ebuild b/sci-physics/root/root-6.18.00.ebuild
new file mode 100644
index 000000000000..9ce194c23498
--- /dev/null
+++ b/sci-physics/root/root-6.18.00.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_BUILD_TYPE=Release
+# ninja does not work due to fortran
+CMAKE_MAKEFILE_GENERATOR=emake
+FORTRAN_NEEDED="fortran"
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
+	llvm prefix python-single-r1 toolchain-funcs
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="https://root.cern"
+SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz"
+
+IUSE="+X aqua +asimage +c++11 c++14 c++17 cuda +davix emacs +examples
+	fits fftw fortran +gdml graphviz +gsl http jemalloc libcxx memstat
+	+minuit mysql odbc +opengl oracle postgres prefix pythia6 pythia8
+	+python qt5 R +roofit root7 shadow sqlite +ssl +tbb test +threads
+	+tiff +tmva +unuran vc +vmc +xml xrootd"
+
+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 )
+	!X? ( !asimage !opengl !qt5 !tiff )
+	davix? ( ssl xml )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	qt5? ( root7 )
+	root7? ( || ( c++14 c++17 ) )
+	tmva? ( gsl )
+"
+
+CDEPEND="
+	app-arch/lz4
+	app-arch/xz-utils
+	fortran? ( dev-lang/cfortran )
+	dev-libs/libpcre:3
+	dev-libs/xxhash
+	media-fonts/dejavu
+	media-libs/freetype:2
+	media-libs/libpng:0=
+	sys-devel/llvm:5=
+	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 )
+	davix? ( net-libs/davix )
+	emacs? ( virtual/emacs )
+	fftw? ( sci-libs/fftw:3.0= )
+	fits? ( sci-libs/cfitsio:0= )
+	graphviz? ( media-gfx/graphviz )
+	gsl? ( sci-libs/gsl:= )
+	http? ( dev-libs/fcgi:0= )
+	jemalloc? ( dev-libs/jemalloc )
+	libcxx? ( sys-libs/libcxx )
+	unuran? ( sci-mathematics/unuran:0= )
+	minuit? ( !sci-libs/minuit )
+	mysql? ( dev-db/mysql-connector-c )
+	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql:= )
+	pythia6? ( sci-physics/pythia:6 )
+	pythia8? ( sci-physics/pythia:8 )
+	python? ( ${PYTHON_DEPS} )
+	R? ( dev-lang/R )
+	shadow? ( virtual/shadow )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl:0= )
+	tbb? ( >=dev-cpp/tbb-2018 )
+	tmva? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	vc? ( dev-libs/vc:= )
+	xml? ( dev-libs/libxml2:2= )
+	xrootd? ( net-libs/xrootd:0= )
+"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch
+)
+
+pkg_setup() {
+	LLVM_MAX_SLOT=5 llvm_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() {
+	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"
+
+	hprefixify core/clingutils/CMakeLists.txt
+}
+
+# Note: ROOT uses bundled clang because it is patched and API-incompatible
+#       with vanilla clang. The patches enable the C++ interpreter to work.
+#       Since ROOT installs many files into /etc (>100MB in total) that don't
+#       really belong there, we install it into another directory to avoid
+#       making /etc too big.
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS}"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+		-DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DLLVM_CONFIG="$(type -P "${CHOST}-llvm-config")"
+		-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=OFF
+		-Dbuiltin_clang=ON
+		-Dbuiltin_afterimage=OFF
+		-Dbuiltin_cfitsio=OFF
+		-Dbuiltin_davix=OFF
+		-Dbuiltin_fftw3=OFF
+		-Dbuiltin_freetype=OFF
+		-Dbuiltin_ftgl=OFF
+		-Dbuiltin_gl2ps=OFF
+		-Dbuiltin_glew=OFF
+		-Dbuiltin_gsl=OFF
+		-Dbuiltin_lz4=OFF
+		-Dbuiltin_lzma=OFF
+		-Dbuiltin_openssl=OFF
+		-Dbuiltin_pcre=OFF
+		-Dbuiltin_tbb=OFF
+		-Dbuiltin_unuran=OFF
+		-Dbuiltin_vc=OFF
+		-Dbuiltin_vdt=OFF
+		-Dbuiltin_veccore=OFF
+		-Dbuiltin_xrootd=OFF
+		-Dbuiltin_xxhash=OFF
+		-Dbuiltin_zlib=OFF
+		-Dx11=$(usex X)
+		-Dxft=$(usex X)
+		-Dalien=OFF
+		-Darrow=OFF
+		-Dasimage=$(usex asimage)
+		-Dastiff=$(usex tiff)
+		-Dlibcxx=$(usex libcxx)
+		-Dccache=OFF # use ccache via portage
+		-Dcefweb=OFF
+		-Dchirp=OFF
+		-Dclad=OFF
+		-Dcling=ON # cling=OFF is broken
+		-Dcocoa=$(usex aqua)
+		-Dcuda=$(usex cuda)
+		-Dcxxmodules=OFF # requires clang, unstable
+		-Ddavix=$(usex davix)
+		-Ddcache=OFF
+		-Dfftw3=$(usex fftw)
+		-Dfitsio=$(usex fits)
+		-Dfortran=$(usex fortran)
+		-Dftgl=$(usex opengl)
+		-Dgdml=$(usex gdml)
+		-Dgenvector=ON # genvector=OFF ignored
+		-Dgeocad=OFF
+		-Dgfal=OFF
+		-Dgl2ps=$(usex opengl)
+		-Dgminimal=OFF
+		-Dgsl_shared=$(usex gsl)
+		-Dgviz=$(usex graphviz)
+		-Dhttp=$(usex http)
+		-Dimt=$(usex tbb)
+		-Djemalloc=$(usex jemalloc)
+		-Dmathmore=$(usex gsl)
+		-Dmemstat=$(usex memstat)
+		-Dminimal=OFF
+		-Dminuit2=$(usex minuit)
+		-Dminuit=$(usex minuit)
+		-Dmonalisa=OFF
+		-Dmysql=$(usex mysql)
+		-Dodbc=$(usex odbc)
+		-Dopengl=$(usex opengl)
+		-Doracle=$(usex oracle)
+		-Dpch=ON # pch=OFF is broken
+		-Dpgsql=$(usex postgres)
+		-Dpythia6=$(usex pythia6)
+		-Dpythia8=$(usex pythia8)
+		-Dpython=$(usex python)
+		-Dqt5web=$(usex qt5)
+		-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)
+		-Dthread=$(usex threads)
+		-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-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 77c8e057cd0c..ef22dfe2f86a 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -16,11 +16,10 @@ 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 emacs +examples
-	fits fftw fortran +gdml graphviz +gsl http jemalloc kerberos ldap
-	libcxx memstat +minuit mysql odbc +opengl oracle postgres prefix
-	pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite +ssl
-	table +tbb test +threads +tiff +tmva +unuran vc xinetd +xml xrootd
-	zeroconf"
+	fits fftw fortran +gdml graphviz +gsl http libcxx +minuit mysql
+	odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt5 R
+	+roofit root7 shadow sqlite +ssl +tbb test +tmva +unuran vc vmc
+	+xml xrootd"
 
 if [[ ${PV} =~ "9999" ]] ; then
 	inherit git-r3
@@ -42,7 +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 )
-	!X? ( !asimage !opengl !qt5 !tiff )
+	!X? ( !asimage !opengl !qt5 )
 	davix? ( ssl xml )
 	python? ( ${PYTHON_REQUIRED_USE} )
 	qt5? ( root7 )
@@ -80,8 +79,7 @@ CDEPEND="
 			dev-qt/qtwebengine:5[widgets]
 		)
 	)
-	asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+	asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] )
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
 	davix? ( net-libs/davix )
 	emacs? ( virtual/emacs )
@@ -90,9 +88,6 @@ CDEPEND="
 	graphviz? ( media-gfx/graphviz )
 	gsl? ( sci-libs/gsl:= )
 	http? ( dev-libs/fcgi:0= )
-	jemalloc? ( dev-libs/jemalloc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:0= )
 	libcxx? ( sys-libs/libcxx )
 	unuran? ( sci-mathematics/unuran:0= )
 	minuit? ( !sci-libs/minuit )
@@ -117,8 +112,7 @@ CDEPEND="
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 
-RDEPEND="${CDEPEND}
-	xinetd? ( sys-apps/xinetd )"
+RDEPEND="${CDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch
@@ -157,6 +151,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_C_FLAGS="${CFLAGS}"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+		-DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DLLVM_CONFIG="$(type -P "${CHOST}-llvm-config")"
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)"
@@ -194,24 +189,15 @@ src_configure() {
 		-Dbuiltin_xxhash=OFF
 		-Dbuiltin_zlib=OFF
 		-Dx11=$(usex X)
-		-Dxft=$(usex X)
-		-Dafdsmgrd=OFF
-		-Dafs=OFF # not implemented
 		-Dalien=OFF
+		-Darrow=OFF
 		-Dasimage=$(usex asimage)
-		-Dastiff=$(usex tiff)
-		-Dbonjour=$(usex zeroconf)
 		-Dlibcxx=$(usex libcxx)
 		-Dccache=OFF # use ccache via portage
-		-Dcastor=OFF
-		-Dchirp=OFF
+		-Dcefweb=OFF
 		-Dclad=OFF
-		-Dcling=ON # cling=OFF is broken
 		-Dcocoa=$(usex aqua)
 		-Dcuda=$(usex cuda)
-		-Dcxx11=$(usex c++11)
-		-Dcxx14=$(usex c++14)
-		-Dcxx17=$(usex c++17)
 		-Dcxxmodules=OFF # requires clang, unstable
 		-Ddavix=$(usex davix)
 		-Ddcache=OFF
@@ -220,62 +206,47 @@ src_configure() {
 		-Dfortran=$(usex fortran)
 		-Dftgl=$(usex opengl)
 		-Dgdml=$(usex gdml)
-		-Dgenvector=ON # genvector=OFF ignored
-		-Dgeocad=OFF
 		-Dgfal=OFF
 		-Dgl2ps=$(usex opengl)
-		-Dglite=OFF # not implemented
-		-Dglobus=OFF
 		-Dgminimal=OFF
 		-Dgsl_shared=$(usex gsl)
 		-Dgviz=$(usex graphviz)
-		-Dhdfs=OFF
 		-Dhttp=$(usex http)
 		-Dimt=$(usex tbb)
-		-Djemalloc=$(usex jemalloc)
-		-Dkrb5=$(usex kerberos)
-		-Dldap=$(usex ldap)
 		-Dmathmore=$(usex gsl)
-		-Dmemstat=$(usex memstat)
+		-Dmemstat=OFF # deprecated
 		-Dminimal=OFF
 		-Dminuit2=$(usex minuit)
 		-Dminuit=$(usex minuit)
+		-Dmlp=$(usex tmva)
 		-Dmonalisa=OFF
 		-Dmysql=$(usex mysql)
 		-Dodbc=$(usex odbc)
 		-Dopengl=$(usex opengl)
 		-Doracle=$(usex oracle)
-		-Dpch=ON # pch=OFF is broken
 		-Dpgsql=$(usex postgres)
 		-Dpythia6=$(usex pythia6)
 		-Dpythia8=$(usex pythia8)
 		-Dpython=$(usex python)
 		-Dqt5web=$(usex qt5)
-		-Dqtgsi=OFF
-		-Dqt=OFF
-		-Drfio=OFF
 		-Droofit=$(usex roofit)
 		-Droot7=$(usex root7)
 		-Drootbench=OFF
 		-Droottest=OFF
 		-Drpath=OFF
-		-Druby=OFF # deprecated and broken
 		-Druntime_cxxmodules=OFF # does not work yet
 		-Dr=$(usex R)
-		-Dsapdb=OFF # not implemented
 		-Dshadowpw=$(usex shadow)
 		-Dsqlite=$(usex sqlite)
-		-Dsrp=OFF # not implemented
 		-Dssl=$(usex ssl)
-		-Dtable=$(usex table)
 		-Dtcmalloc=OFF
 		-Dtesting=$(usex test)
-		-Dthread=$(usex threads)
 		-Dtmva=$(usex tmva)
 		-Dtmva-cpu=$(usex tmva)
 		-Dtmva-gpu=$(usex cuda)
 		-Dunuran=$(usex unuran)
 		-Dvc=$(usex vc)
+		-Dvmc=$(usex vmc)
 		-Dvdt=OFF
 		-Dveccore=OFF
 		-Dxml=$(usex xml)