gentoo resync : 10.02.2019

7 files changed, 94 insertions, 111 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index c14d0c966210..a986bff2a8d0 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/clhep/Manifest b/sci-physics/clhep/Manifest
index ca3aa22896cc..926c0697fe38 100644
--- a/sci-physics/clhep/Manifest
+++ b/sci-physics/clhep/Manifest
@@ -1,5 +1,5 @@
 DIST clhep-2.2.0.5.tgz 1847046 BLAKE2B 8dddc6b9acbf41abdd849ef1aa1087d93f48fc83937ee67e687e28c421d290683e5381c2b9f8034e2651e3ccec2fd2e0ba8bee73dc55618e22c0e4df7ce3a378 SHA512 07d9359604196344fe3b13cc103727693fd70818c22849e54507530221812843a943cb8ed66eea421e498edcc9c0f584826823ea7939cbf53b90b17d412aed1a
 DIST clhep-2.4.0.4.tgz 1536520 BLAKE2B 7ab58aeab685950393c8059f77e95cbbf7bf61f04e8113c6fd7b09200cce497716d5a0e023143dde395db895f48848a78e579e38968d9f27a50769034003e11e SHA512 349c1225713a3bc91fe94e27f938e919b434e6466df94dcde915c7e8ed313b9b2e7186e67a9b580ede21aec0050507a070c279920590148ebbec0ac5733fb008
 EBUILD clhep-2.2.0.5.ebuild 1329 BLAKE2B 44ff5e92f552290ffb31f352274d86186d841ea529b127ea6ad2ea598177cba37ce31f6177a3b3c7c17e507fb98c35c6df85c768fcd8739fcd486531e948fdb3 SHA512 09fa9b6135205ee61b162b00bf8552fc1b515b2e49bb7ec63862f438d8077a6607b8541d66a7ee2e5f269a8fb301782ad6f7fffa4ba2a2c81526e55c742264b5
-EBUILD clhep-2.4.0.4.ebuild 1110 BLAKE2B d79ec57e7b1a44d7e038cdea4bcbdc7da55ed1a6a748b49b835ed249c04ca178d07db19fef8fbd19f37690d094f5264d63f0ac1a31bbdbf99c3be851ecb61dd4 SHA512 8f60847cbf23ea0138e0199d380fb6ac175e079f35bb8d652f98297f182fc4d6dcbe8bc38e59f35b64a4332780649ed7e58a06232af7c68a7f5f41a752038429
+EBUILD clhep-2.4.0.4.ebuild 1109 BLAKE2B ca40e4513859bcd48ec2eb75eef937f9414ee389461ce026ff9f1fa7272b523cf2da5007efbaf9a3d46fa0b3c67107bc2ac5afe18cc6b756b23500fd2e041b9c SHA512 f7c780bb4c008280829e25dce9b92f772a0d74a5089a23f6b22d97d47031a3f309f894ef6f13c2a40057f91e7472f8f27891812c41af5abe157bb644f2160786
 MISC metadata.xml 496 BLAKE2B 60254470fbb21294249dd75b34aebb0d29d090aba3a41f75e02950ccd77fe1ca0043eec460844f2de4b2a9b4bd4e34f2faa6c00b81daf8e615b78d92f503ade3 SHA512 768aeefc23a2ea89eb63b0eb6fd084c253243b6d67b822702dffc8f49a7170d30e55ebc08875ff238e618639882f93fe6e1390e3d8456f3850d75d5a98bf3b96
diff --git a/sci-physics/clhep/clhep-2.4.0.4.ebuild b/sci-physics/clhep/clhep-2.4.0.4.ebuild
index 5f32e859e2c6..1a4f4b585e1a 100644
--- a/sci-physics/clhep/clhep-2.4.0.4.ebuild
+++ b/sci-physics/clhep/clhep-2.4.0.4.ebuild
@@ -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 hppa ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 IUSE="doc test threads"
 
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 639be4d4508a..ec11950469e7 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -6,10 +6,10 @@ AUX root-6.12.06_cling-runtime-sysroot.patch 989 BLAKE2B 8202cc8f2bf72cc25642d0a
 AUX root-6.13.02-hsimple.patch 1694 BLAKE2B 877304f0c51c34645d1c6fb1814e9914539351775c3de6dc621080e469047cd634a95095c083a633ee2c793f79bcb90e0966e607a9f620cb34d807dea9be4c14 SHA512 6533ed9f7402da534d76a39e9536c97245430148ffea0634937e16e483919532f8810049a1358d3268ba9f7a7ee71ddc7d96772b390db582a6342508dd4e3e1d
 AUX root-6.14.06-oracle.patch 666 BLAKE2B 8ca54fa3d6d836805a88f3ff713e34c1d5db8ffabe4eab7d213d4e0d6a3750cbe0bc8fd14e40ff98f3a4a225b641ebfc6abcf0d34034f90718b0567935bb0209 SHA512 095678f4b3e277cf9b3cd64e0811e20d9c486f2ed524792e55b087441e652ea7b9ee9c2358319ae2be6e4b35828873669d5b9c89f61d68aaa76db62abc4c5a46
 DIST root_v6.12.06.source.tar.gz 162284452 BLAKE2B 944b5e899677bab40842d7ec969ff08cfa470e63be9a02b948a49ae088e8da72ce433a5071d9196bfd98f71e6861b1bda285354012620eee6c61cffcee71a0c8 SHA512 3d44749ccfc3d40a2f516ae53ef40fb244ed785eee0dbc18ff822bbb811a15b943039d30282ef5358a283d485e62531880c877ec77a86089503b06d6f37e42e1
-DIST root_v6.14.06.source.tar.gz 162462837 BLAKE2B a6904b67d1f5964768fa884bd2b5c648390d0b3626b5be8f39ff0e311bf14690d2aff7eb9d6047fa8d5a9de894935067ea8c033592b9795fc34b61aa5f65fcdb SHA512 83698e1213ae9bd4a87ef3160b459c962199585bed7378efc0cfefdc352e6651a17286a11cd925dbcb5d04e1b832d47a3a69849d048731ea9d0d84f9b0f996a4
 DIST root_v6.14.08.source.tar.gz 162474562 BLAKE2B f8bfdabb4d91bbdfbab0b17626fff1f8aa265292996d857025cbd1543306f3ec540a1afb080788bfc7149ea835932b59d7c54dcd802354e31294ba2e5e9d2366 SHA512 827e39efbf3c69429a0a256127ca9f87550d9084c34c715bddccbf87a8c111c367b9a0ac6882aac747c9b48f4a3effb3747b4df567429910c93ee64dfe35df5b
-EBUILD root-6.12.06-r8.ebuild 7960 BLAKE2B 78811e6ccd29c98f1fba08a64c7bdd7f5497ff22da7fd264cceb2008fc6adaa39ef3be219843b22861b8dec1657c6496f34e2cd74d68edebdb67df714fc41060 SHA512 69c96c970a26957618db2759e15099892367f5411d3ab1db2f88743cf144445c4f8dabd51cfedc2a164fdacae86fcccbb507079a5d7ec375fa3647a3cbe014ce
-EBUILD root-6.14.06-r2.ebuild 8196 BLAKE2B b686e1e20afb4528e8df24040f86cf2260d9d2e0b9adfbe495fe6eb70248b6ce9bf8612d762c2ace2f198dbde4fcf2f7907f39510ebd91582f7892db7b1b04b0 SHA512 712ef6de41924d93bca6642f4b9bc1d0efa6bb7d82c204a7be516b2b9d27427cafe3f4e0e85f97fa5fa5b8941234abb7de0260878577e4528dce5b2025b723fb
-EBUILD root-6.14.08-r1.ebuild 8322 BLAKE2B f2007da7527df847d1dcbc0b313349f6d5832086367d8723d81d6fd42cf22109c125d3827967f7837af0bb3b6fe45ba889456ba2afe0303f5dcf9f3aebc5d7fa SHA512 5168e8c5ed63dcab7cd058c4d1c7ceed3bbf062aa15cece2f7ca89ba1c860cb78cbaffcea68e36e7c480452b995ee3b98a9b007f8dcb73cda56d6ce5b3d55f4e
+DIST root_v6.16.00.source.tar.gz 164836293 BLAKE2B 9d8f02631bdc1fa1775cbdaf50dd1feacd9b3c86b81d679ba6f0ca3c5787cd1d22ef7c33358b608361a01ad4f0aff3e8c749649d24773a35c52ce87f808d08f5 SHA512 17e5b9815973773e30ff83c2f4028e9e93691c1ecb824c162c8b3e02d1f6666fb8e0b72a5d0652a90032af146d92d271cbffcd634fb6fe6a63bdf46d672789bf
+EBUILD root-6.12.06-r9.ebuild 7754 BLAKE2B 312e1b90cffa62547d03ea7274b5812df3a690539a03464c89c681c9589b3895a075bc83fe056a7507f5afd25b3744200ad0b90cb617debb59bffd3a280efcf8 SHA512 3016c0308adf200ab1b4a06752bb40d04df4de63bbe846b0afb89c1555af7779677711a4e78ce6ee90c6d27e4c471ab3c46bd46812b46b6f40c0d6ba024cfe11
+EBUILD root-6.14.08-r2.ebuild 8018 BLAKE2B 3553813ada68f33a841265dfdf5c81c1243e06cc9881739d600d2c7ae35c99fe56b882f11e8a23680b77e5b39d9465b2d7bdf5c84ba0daf5fddcc672980d2dd4 SHA512 437ae540021e46f02fba66a816c860180da6b7fd30d780697b67e81492faf239932219c0799acea367e164ccb4e32fcf781c3f071ad340bb5fd1791b82478d22
+EBUILD root-6.16.00.ebuild 8047 BLAKE2B ee28bae5ee066baa9ab753927ca9e30331955238e22bc3cce402a1a2dfd29ee29579dc504128467e2b5aae2cefe30e0fdc359b760caf388618f5d3fd201c2a38 SHA512 4e6aef4125629df5e1a3a2cf8b394155fe63fc0c6afd94155329fd443cfaad392aacd6eea903f489dbb16be2b1925a6a9a011e11a478e182f728eff3b74e5608
 EBUILD root-9999.ebuild 8307 BLAKE2B 1932ca3501767e729fab5658681c75d75ea7b839fda2f43777f5ff76d9cfbdd589793378cda3119f5e1457d48ffe42d116d628ccc36148c270b67e56af407068 SHA512 b6ee00de46d9ced77e54182b750810bd7548de48ce8aa63f4a898b5df7604fe06685cfc7015b2a61556ae1c8284f93ccd5492559285ef232b14881ac9c461aa5
 MISC metadata.xml 3079 BLAKE2B a67a71c5dcde9c3d05420b7edefeee32a8e623e10d03f75169a02044377106641ed6dc96c65aa71f42c94c4b29777c0267e9163870cbb392e1dc7715b8ccc542 SHA512 24bb9b7d0d0263f363639f4861a071bfb7f1bdd5e15ec4b166c44114b25343edb008f7ac896dd899cbcdd068abd762aa84924a6e50384ee214de28beb08cfd2a
diff --git a/sci-physics/root/root-6.12.06-r8.ebuild b/sci-physics/root/root-6.12.06-r9.ebuild
index 373b866eeaea..3baa2bb1b7ee 100644
--- a/sci-physics/root/root-6.12.06-r8.ebuild
+++ b/sci-physics/root/root-6.12.06-r9.ebuild
@@ -146,9 +146,9 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_C_FLAGS="${CFLAGS}"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)/share/man"
-		-DMCAKE_INSTALL_LIBDIR=$(get_libdir)
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
+		-DCMAKE_INSTALL_LIBDIR="lib"
 		-DDEFAULT_SYSROOT="${EPREFIX}"
 		-Dexplicitlink=ON
 		-Dexceptions=ON
@@ -269,45 +269,37 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 
-	ROOTSYS=${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)
+	ROOTSYS=${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)
 	ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)
 
-	# ROOT fails without this symlink because it only looks in lib
-	if [[ ! -d ${D}/${ROOTSYS}/lib ]]; then
-		dosym $(get_libdir) /usr/$(get_libdir)/${PN}/$(ver_cut 1-2)/lib
-	fi
-
 	cat > ${ROOTENV} <<- EOF || die
 	MANPATH="${ROOTSYS}/share/man"
 	PATH="${ROOTSYS}/bin"
 	ROOTPATH="${ROOTSYS}/bin"
-	LDPATH="${ROOTSYS}/$(get_libdir)"
+	LDPATH="${ROOTSYS}/lib"
 	EOF
 
 	if use python; then
-		echo "PYTHONPATH=${ROOTSYS}/$(get_libdir)" >> ${ROOTENV} || die
+		echo "PYTHONPATH=${ROOTSYS}/lib" >> ${ROOTENV} || die
 	fi
 
 	doenvd ${ROOTENV}
 
-	pushd "${D}/${ROOTSYS}" > /dev/null
-
 	if use emacs; then
 		elisp-install ${PN}-$(ver_cut 1-2) "${BUILD_DIR}"/root-help.el
 	fi
 
-	if ! use gdml; then
-		rm -r geom || die
-	fi
+	pushd "${D}/${ROOTSYS}" > /dev/null
 
-	if ! use examples; then
-		rm -r test tutorials || die
-	fi
+	rm -r test emacs bin/*.{csh,sh} || die
 
-	if use tmva; then
-		rm -r tmva || die
+	if ! use examples; then
+		rm -r tutorials || die
 	fi
 
-	# clean up unnecessary files from installation
-	rm -r emacs || die
+	# create versioned symlinks for binaries
+	cd bin;
+	for exe in *; do
+		dosym "${exe}" "/usr/lib/${PN}/$(ver_cut 1-2)/bin/${exe}-$(ver_cut 1-2)"
+	done
 }
diff --git a/sci-physics/root/root-6.14.06-r2.ebuild b/sci-physics/root/root-6.14.08-r2.ebuild
index 7dcecbbc9244..2a1d13bad9d2 100644
--- a/sci-physics/root/root-6.14.06-r2.ebuild
+++ b/sci-physics/root/root-6.14.08-r2.ebuild
@@ -29,6 +29,7 @@ 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} )
@@ -41,18 +42,18 @@ CDEPEND="
 	app-arch/lz4
 	app-arch/xz-utils
 	fortran? ( dev-lang/cfortran )
-	dev-libs/libpcre:3=
+	dev-libs/libpcre:3
 	dev-libs/xxhash
 	media-fonts/dejavu
-	media-libs/freetype:2=
+	media-libs/freetype:2
 	media-libs/libpng:0=
 	sys-libs/ncurses:=
 	sys-libs/zlib
 	X? (
-		x11-libs/libX11:0=
-		x11-libs/libXext:0=
-		x11-libs/libXft:0=
-		x11-libs/libXpm:0=
+		x11-libs/libX11:0
+		x11-libs/libXext:0
+		x11-libs/libXft:0
+		x11-libs/libXpm:0
 		opengl? (
 			media-libs/ftgl:0=
 			media-libs/glew:0=
@@ -76,8 +77,8 @@ CDEPEND="
 	emacs? ( virtual/emacs )
 	fftw? ( sci-libs/fftw:3.0= )
 	fits? ( sci-libs/cfitsio:0= )
-	graphviz? ( media-gfx/graphviz:0= )
-	gsl? ( sci-libs/gsl )
+	graphviz? ( media-gfx/graphviz )
+	gsl? ( sci-libs/gsl:= )
 	http? ( dev-libs/fcgi:0= )
 	jemalloc? ( dev-libs/jemalloc )
 	kerberos? ( virtual/krb5 )
@@ -89,16 +90,16 @@ CDEPEND="
 	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	postgres? ( dev-db/postgresql:= )
-	pythia6? ( sci-physics/pythia:6= )
-	pythia8? ( sci-physics/pythia:8= )
+	pythia6? ( sci-physics/pythia:6 )
+	pythia8? ( sci-physics/pythia:8 )
 	python? ( ${PYTHON_DEPS} )
 	R? ( dev-lang/R )
 	shadow? ( virtual/shadow )
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? ( dev-libs/openssl:0= )
-	tbb? ( dev-cpp/tbb )
+	tbb? ( >=dev-cpp/tbb-2018 )
 	tmva? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	vc? ( dev-libs/vc )
+	vc? ( dev-libs/vc:= )
 	xml? ( dev-libs/libxml2:2= )
 	xrootd? ( net-libs/xrootd:0= )
 "
@@ -119,12 +120,10 @@ pkg_setup() {
 	use fortran && fortran-2_pkg_setup
 	use python && python-single-r1_pkg_setup
 
-	elog "There are extra options on packages not yet in Gentoo:"
-	elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
-	elog "HDFS, Monalisa, MaxDB/SapDB, SRP, VecCore."
-	elog "You can use the environment variable EXTRA_ECONF for this."
-	elog "For example, for Chirp, you would set: "
-	elog "EXTRA_ECONF=\"-Dchirp=ON\""
+	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() {
@@ -134,11 +133,13 @@ src_prepare() {
 
 	# 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
+#       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.
 
@@ -147,9 +148,9 @@ src_configure() {
 		-DCMAKE_C_FLAGS="${CFLAGS}"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
 		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)/share/man"
-		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
+		-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
@@ -283,41 +284,37 @@ src_compile() {
 src_install() {
 	cmake-utils_src_install
 
-	ROOTSYS=${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)
+	ROOTSYS=${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)
 	ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)
 
-	# ROOT fails without this symlink because it only looks in lib
-	if [[ ! -d ${D}/${ROOTSYS}/lib ]]; then
-		dosym $(get_libdir) /usr/$(get_libdir)/${PN}/$(ver_cut 1-2)/lib
-	fi
-
 	cat > ${ROOTENV} <<- EOF || die
 	MANPATH="${ROOTSYS}/share/man"
 	PATH="${ROOTSYS}/bin"
 	ROOTPATH="${ROOTSYS}/bin"
-	LDPATH="${ROOTSYS}/$(get_libdir)"
+	LDPATH="${ROOTSYS}/lib"
 	EOF
 
 	if use python; then
-		echo "PYTHONPATH=${ROOTSYS}/$(get_libdir)" >> ${ROOTENV} || die
+		echo "PYTHONPATH=\"${ROOTSYS}/lib\"" >> ${ROOTENV} || die
 	fi
 
 	doenvd ${ROOTENV}
 
-	pushd "${D}/${ROOTSYS}" > /dev/null
-
 	if use emacs; then
 		elisp-install ${PN}-$(ver_cut 1-2) "${BUILD_DIR}"/root-help.el
 	fi
 
+	pushd "${D}/${ROOTSYS}" > /dev/null
+
+	rm -r test emacs bin/*.{csh,sh} || die
+
 	if ! use examples; then
 		rm -r tutorials || die
 	fi
 
-	if ! use tmva; then
-		rm -r tmva || die
-	fi
-
-	# clean up unnecessary files from installation
-	rm -r emacs test || die
+	# create versioned symlinks for binaries
+	cd bin;
+	for exe in *; do
+		dosym "${exe}" "/usr/lib/${PN}/$(ver_cut 1-2)/bin/${exe}-$(ver_cut 1-2)"
+	done
 }
diff --git a/sci-physics/root/root-6.14.08-r1.ebuild b/sci-physics/root/root-6.16.00.ebuild
index 591ae2768d3a..b70e8aff1498 100644
--- a/sci-physics/root/root-6.14.08-r1.ebuild
+++ b/sci-physics/root/root-6.16.00.ebuild
@@ -10,7 +10,7 @@ FORTRAN_NEEDED="fortran"
 PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
-	prefix python-single-r1 toolchain-funcs
+	llvm prefix python-single-r1 toolchain-funcs
 
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="https://root.cern"
@@ -29,6 +29,7 @@ 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} )
@@ -41,18 +42,19 @@ CDEPEND="
 	app-arch/lz4
 	app-arch/xz-utils
 	fortran? ( dev-lang/cfortran )
-	dev-libs/libpcre:3=
+	dev-libs/libpcre:3
 	dev-libs/xxhash
 	media-fonts/dejavu
-	media-libs/freetype:2=
+	media-libs/freetype:2
 	media-libs/libpng:0=
+	sys-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=
+		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=
@@ -76,8 +78,8 @@ CDEPEND="
 	emacs? ( virtual/emacs )
 	fftw? ( sci-libs/fftw:3.0= )
 	fits? ( sci-libs/cfitsio:0= )
-	graphviz? ( media-gfx/graphviz:0= )
-	gsl? ( sci-libs/gsl )
+	graphviz? ( media-gfx/graphviz )
+	gsl? ( sci-libs/gsl:= )
 	http? ( dev-libs/fcgi:0= )
 	jemalloc? ( dev-libs/jemalloc )
 	kerberos? ( virtual/krb5 )
@@ -89,8 +91,8 @@ CDEPEND="
 	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	postgres? ( dev-db/postgresql:= )
-	pythia6? ( sci-physics/pythia:6= )
-	pythia8? ( sci-physics/pythia:8= )
+	pythia6? ( sci-physics/pythia:6 )
+	pythia8? ( sci-physics/pythia:8 )
 	python? ( ${PYTHON_DEPS} )
 	R? ( dev-lang/R )
 	shadow? ( virtual/shadow )
@@ -98,7 +100,7 @@ CDEPEND="
 	ssl? ( dev-libs/openssl:0= )
 	tbb? ( >=dev-cpp/tbb-2018 )
 	tmva? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	vc? ( dev-libs/vc )
+	vc? ( dev-libs/vc:= )
 	xml? ( dev-libs/libxml2:2= )
 	xrootd? ( net-libs/xrootd:0= )
 "
@@ -110,21 +112,19 @@ RDEPEND="${CDEPEND}
 	xinetd? ( sys-apps/xinetd )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-6.12.04-no-ocaml.patch
 	"${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch
-	"${FILESDIR}"/${PN}-6.14.06-oracle.patch
 )
 
 pkg_setup() {
+	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 yet in Gentoo:"
-	elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
-	elog "HDFS, Monalisa, MaxDB/SapDB, SRP, VecCore."
-	elog "You can use the environment variable EXTRA_ECONF for this."
-	elog "For example, for Chirp, you would set: "
-	elog "EXTRA_ECONF=\"-Dchirp=ON\""
+	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() {
@@ -140,7 +140,7 @@ src_prepare() {
 
 # 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
+#       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.
 
@@ -149,9 +149,10 @@ src_configure() {
 		-DCMAKE_C_FLAGS="${CFLAGS}"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
 		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)/share/man"
-		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
+		-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
@@ -160,7 +161,7 @@ src_configure() {
 		-Dgnuinstall=OFF
 		-Dshared=ON
 		-Dsoversion=ON
-		-Dbuiltin_llvm=ON
+		-Dbuiltin_llvm=OFF
 		-Dbuiltin_clang=ON
 		-Dbuiltin_afterimage=OFF
 		-Dbuiltin_cfitsio=OFF
@@ -285,44 +286,37 @@ src_compile() {
 src_install() {
 	cmake-utils_src_install
 
-	ROOTSYS=${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)
+	ROOTSYS=${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)
 	ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)
 
-	# ROOT fails without this symlink because it only looks in lib
-	if [[ ! -d ${D}/${ROOTSYS}/lib ]]; then
-		dosym $(get_libdir) /usr/$(get_libdir)/${PN}/$(ver_cut 1-2)/lib
-	fi
-
 	cat > ${ROOTENV} <<- EOF || die
 	MANPATH="${ROOTSYS}/share/man"
 	PATH="${ROOTSYS}/bin"
 	ROOTPATH="${ROOTSYS}/bin"
-	LDPATH="${ROOTSYS}/$(get_libdir)"
+	LDPATH="${ROOTSYS}/lib"
 	EOF
 
 	if use python; then
-		echo "PYTHONPATH=${ROOTSYS}/$(get_libdir)" >> ${ROOTENV} || die
+		echo "PYTHONPATH=\"${ROOTSYS}/lib\"" >> ${ROOTENV} || die
 	fi
 
 	doenvd ${ROOTENV}
 
-	pushd "${D}/${ROOTSYS}" > /dev/null
-
 	if use emacs; then
 		elisp-install ${PN}-$(ver_cut 1-2) "${BUILD_DIR}"/root-help.el
 	fi
 
+	pushd "${D}/${ROOTSYS}" > /dev/null
+
+	rm -r test emacs bin/*.{csh,sh,fish} || die
+
 	if ! use examples; then
 		rm -r tutorials || die
 	fi
 
-	if ! use tmva; then
-		rm -r tmva || die
-	fi
-
-	# Environment variables are managed by env.d.
-	rm -f bin/*.{c,}sh || die
-
-	# clean up unnecessary files from installation
-	rm -r emacs test || die
+	# 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
 }