gentoo resync : 29.06.2021

6 files changed, 37 insertions, 326 deletions

diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 2fd876f8acf7..63314a2be259 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,10 +1,8 @@
 AUX root-6.12.06_cling-runtime-sysroot.patch 989 BLAKE2B 8202cc8f2bf72cc25642d0a03ba26c3969069b291a6a22188879dbedbf0c3c496149f79f671d0eb51d81d0ee36565660d136b4741f5d018c2b05325ff08381f0 SHA512 c96dee9843da1051c54bd6870ef0a04714944ffe1f86800c9a51b8eb8ef84107d3315d3a708dcc0b651248af4bec362c7f31695514505045aeda9c793d40dc58
-DIST root_v6.22.06.source.tar.gz 173073959 BLAKE2B 3db5e5ff73509a87d00aaba5a394c96aaddebac210ce692d10b9174f0bdff5dc5862c25c9ff66e481b9fda96684cfca45ab49824166404f59ad76edb3fbdddde SHA512 39b330f0cd594f06e30e33dd4b0fc86cfd076b006e5287ff61e577deaf76e63f2e5780b72f53c0770b7d2e28e6f61133ff54b5d905ec2ad845c8f00b10be6fb7
 DIST root_v6.22.08.source.tar.gz 173079716 BLAKE2B 0b3c15dfedd0215334dcd59db133aa9097709996e0e9cc20a1ae96f954ee607cad314291148f78a31f24ba78dee84204e617e17a6ed8a390503b068e8120e9f3 SHA512 2355e20b8c4d7ad747c31956a3ad0f6e7b70039f3e6613182bd7c53d0e8776267ee85fc1d8aad9ed0d942e28f4124ad79a7dc1082bb1ea7974be2cb6a8a85b39
-DIST root_v6.24.00.source.tar.gz 185185756 BLAKE2B cf46534c0e9476a428291c65ec1456af10e47d830dd006aacf43307db11ad5732c357aabd09f4297276190d21fc18fdd6966f5f5e6cd437cc46878fa72fde260 SHA512 bba72cbe310c3ce9a64adc990aaeba6df970f17dc7132d2c3fdc83cc72d24973a3e15c02067a95870794e576e4065478d7a3ed52bfb8f0598294356a7fceff03
-EBUILD root-6.22.06-r1.ebuild 7545 BLAKE2B 91f88eb27e20da8fc45baf0543ec45f5a62d90826992e02a40bb2b6aa2e83eef8b5e7b648f6905015a0c4667bbfb885677f72d106a362d6fbbded94b282e721d SHA512 89a59f6bfd50c805e8b8553f08444abc99511184dc3e7f51661f60bba652aefa9431945ee4c3e5d0cbc2cb64c471b61d6894f98491d872ee77b974e2472f1e61
-EBUILD root-6.22.08-r1.ebuild 7545 BLAKE2B 91f88eb27e20da8fc45baf0543ec45f5a62d90826992e02a40bb2b6aa2e83eef8b5e7b648f6905015a0c4667bbfb885677f72d106a362d6fbbded94b282e721d SHA512 89a59f6bfd50c805e8b8553f08444abc99511184dc3e7f51661f60bba652aefa9431945ee4c3e5d0cbc2cb64c471b61d6894f98491d872ee77b974e2472f1e61
-EBUILD root-6.24.00-r1.ebuild 7784 BLAKE2B a42d0a6802b5b9bacf582b372d36edbee53583755abc12102ad736c99cd5748a1c69ef9ad609274891447bcc4c37e0382e96e21df568616705e9814779572d9e SHA512 d1a5da16de6090e3f0ba953750814a5ed9bc5e093f89cd799e087dfe135befa7c10042c438cddf625c4960911e3afc7d825f01b709ce558f1144e5abdfe9d450
-EBUILD root-6.24.9999.ebuild 8255 BLAKE2B 7bc31bf4be577f92f94909037fe9de243d951d2af7dcbd9f30cd4e955479385f5d3b8be190db640581947c3beb4267e0ede8e5dfa50e516262943211ea16e704 SHA512 0d5daf3ac7e83b2fbd32365c5f3e1d4e9156e7b20ccd4937554654cb8f25319803bd8f50de54313915d400ef46eefb98846e0566ab1dd4ee53db4cf23620511c
-EBUILD root-9999.ebuild 8255 BLAKE2B 7bc31bf4be577f92f94909037fe9de243d951d2af7dcbd9f30cd4e955479385f5d3b8be190db640581947c3beb4267e0ede8e5dfa50e516262943211ea16e704 SHA512 0d5daf3ac7e83b2fbd32365c5f3e1d4e9156e7b20ccd4937554654cb8f25319803bd8f50de54313915d400ef46eefb98846e0566ab1dd4ee53db4cf23620511c
+DIST root_v6.24.02.source.tar.gz 185205849 BLAKE2B 2b8b7aaf6d1bf498a52f341128ee3202ae5166d6ad49d8a0a05da64d4ed2887b50c22e67a7ce694e85d4330a1002937e21a4746be0342a9e21631e4b88125535 SHA512 8ff64688c6c675e157a5db504f8347511752dd10142c70af677fde9396841eb0a76bb9ec43631e73c83b09f278e34706a5492e22db52b6c100578329cef3c461
+EBUILD root-6.22.08-r2.ebuild 7557 BLAKE2B 2e3c41b312dbdb8c11d4f67d8bb8dac15506431f1773d0597bcdc925b4c735b59749d893e8e5b26974e49bd9df54631fab49eadbe8eb379f10675134d8e5045d SHA512 29803b06c53036b5a5687713e836ae6188e1117e69861ab13593c77ffab4a56406115efe22385cc1dfdb1c67cab7e2f0f0654bfba89c198e5302c47e85bdd6b0
+EBUILD root-6.24.02-r1.ebuild 7796 BLAKE2B f725be73c40ff29fc384d82415862572fb078a088c9d5b288bd022231338cee252ef56ee49ea3f8203d8af5e9cc50f279696d85661b95dda6cbcc18a3573052a SHA512 26c396a72181963927092a81aa9ad951a032fa4e44368d74e4e2aeb30d0afb260243fe938c54a9562dbddbddefd45a9740e59335f7369c50e63d174a6326c13d
+EBUILD root-6.24.9999.ebuild 8267 BLAKE2B b6dc49068996de8546fc4a815dc6b5f77ad9d1b3213e0b9b1b21a245431c00e219080f9f678a9ea7fce34a9bff6652fd1f83b7d6649547ca81c67712ba52b84a SHA512 49d93ae101dc408d274f4b0c1be0c09b957f61f53336e1d520ed7f8217beb9c74297f7362f6866cbc7d6816cb56781a76042302280dc1891615b64a82c5ea927
+EBUILD root-9999.ebuild 8267 BLAKE2B b6dc49068996de8546fc4a815dc6b5f77ad9d1b3213e0b9b1b21a245431c00e219080f9f678a9ea7fce34a9bff6652fd1f83b7d6649547ca81c67712ba52b84a SHA512 49d93ae101dc408d274f4b0c1be0c09b957f61f53336e1d520ed7f8217beb9c74297f7362f6866cbc7d6816cb56781a76042302280dc1891615b64a82c5ea927
 MISC metadata.xml 3149 BLAKE2B 88e20041b72bc4507f253ea0b9096567f6a7c5c7f7bf6851adfb69c24aedb73fb68b2541538cd01fd51d944425c22f4b7154379ac70d851659efeaa1e3a07337 SHA512 65a82570e75f9b4b3e6f8d1e1cfd1aad5f3e2199843853392b51ea1e1f4dcc7ef6500196aa0f759726cb0d0e17be19055d8c9c87e745fa11d337acc2eaf5ce74
diff --git a/sci-physics/root/root-6.22.08-r1.ebuild b/sci-physics/root/root-6.22.08-r1.ebuild
deleted file mode 100644
index 905c8eea79fb..000000000000
--- a/sci-physics/root/root-6.22.08-r1.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ninja does not work due to fortran
-CMAKE_MAKEFILE_GENERATOR=emake
-FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake cuda elisp-common fortran-2 prefix python-single-r1 toolchain-funcs
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="https://root.cern"
-SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz"
-
-IUSE="+X aqua +asimage +c++11 c++14 c++17 cuda cudnn +davix debug emacs
-	+examples fits fftw fortran +gdml graphviz +gsl http libcxx +minuit
-	mpi mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python
-	qt5 R +roofit root7 shadow sqlite +ssl +tbb test +tmva +unuran vc
-	vmc +xml xrootd"
-RESTRICT="!test? ( test )"
-
-SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
-LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
-KEYWORDS="~amd64 ~x86"
-
-REQUIRED_USE="
-	^^ ( c++11 c++14 c++17 )
-	cuda? ( tmva )
-	cudnn? ( cuda )
-	!X? ( !asimage !opengl !qt5 )
-	davix? ( ssl xml )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	qt5? ( root7 )
-	root7? ( || ( c++14 c++17 ) )
-	tmva? ( gsl )
-"
-
-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=
-	virtual/libcrypt:=
-	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_src_prepare
-
-	sed -i "/CLING_BUILD_PLUGINS/d" interpreter/CMakeLists.txt || die
-
-	# CSS should use local images
-	sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
-
-	eapply_user
-}
-
-# Note: ROOT uses bundled clang because it is patched and API-incompatible
-#       with vanilla clang. The patches enable the C++ interpreter to work.
-#       Since ROOT installs many files into /etc (>100MB in total) that don't
-#       really belong there, we install it into another directory to avoid
-#       making /etc too big.
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_COMPILER=$(tc-getCC)
-		-DCMAKE_CXX_COMPILER=$(tc-getCXX)
-		-DCMAKE_CUDA_HOST_COMPILER=$(tc-getCXX)
-		-DCMAKE_C_FLAGS="${CFLAGS}"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-		-DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
-		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
-		-DCMAKE_INSTALL_LIBDIR="lib"
-		-DDEFAULT_SYSROOT="${EPREFIX}"
-		-DCLING_BUILD_PLUGINS=OFF
-		-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
-		-Dalien=OFF
-		-Darrow=OFF
-		-Dasimage=$(usex asimage)
-		-Dccache=OFF # use ccache via portage
-		-Dcefweb=OFF
-		-Dclad=OFF
-		-Dcocoa=$(usex aqua)
-		-Dcuda=$(usex cuda)
-		-Dcudnn=$(usex cudnn)
-		-Dcxxmodules=OFF # requires clang, unstable
-		-Ddataframe=ON
-		-Ddavix=$(usex davix)
-		-Ddcache=OFF
-		-Dfcgi=$(usex http)
-		-Dfftw3=$(usex fftw)
-		-Dfitsio=$(usex fits)
-		-Dfortran=$(usex fortran)
-		-Dgdml=$(usex gdml)
-		-Dgfal=OFF
-		-Dgminimal=OFF
-		-Dgsl_shared=$(usex gsl)
-		-Dgviz=$(usex graphviz)
-		-Dhttp=$(usex http)
-		-Dimt=$(usex tbb)
-		-Dlibcxx=$(usex libcxx)
-		-Dmathmore=$(usex gsl)
-		-Dmemstat=OFF # deprecated
-		-Dminimal=OFF
-		-Dminuit2=$(usex minuit)
-		-Dminuit=$(usex minuit)
-		-Dmlp=$(usex tmva)
-		-Dmonalisa=OFF
-		-Dmpi=$(usex mpi)
-		-Dmysql=$(usex mysql)
-		-Dodbc=$(usex odbc)
-		-Dopengl=$(usex opengl)
-		-Doracle=$(usex oracle)
-		-Dpgsql=$(usex postgres)
-		-Dpyroot=$(usex python) # python was renamed to pyroot
-		-Dpyroot_legacy=OFF
-		-Dpythia6=$(usex pythia6)
-		-Dpythia8=$(usex pythia8)
-		-Dqt5web=$(usex qt5)
-		-Dr=$(usex R)
-		-Droofit=$(usex roofit)
-		-Droot7=$(usex root7)
-		-Drootbench=OFF
-		-Droottest=OFF
-		-Drpath=OFF
-		-Druntime_cxxmodules=OFF
-		-Dshadowpw=$(usex shadow)
-		-Dspectrum=ON
-		-Dsqlite=$(usex sqlite)
-		-Dssl=$(usex ssl)
-		-Dtcmalloc=OFF
-		-Dtesting=$(usex test)
-		-Dtmva=$(usex tmva)
-		-Dtmva-cpu=$(usex tmva)
-		-Dtmva-gpu=$(usex cuda)
-		-Dtmva-pymva=$(usex tmva)
-		-Dtmva-rmva=$(usex R)
-		-Dunuran=$(usex unuran)
-		-Dvc=$(usex vc)
-		-Dvdt=OFF
-		-Dveccore=OFF
-		-Dvecgeom=OFF
-		-Dvmc=$(usex vmc)
-		-Dx11=$(usex X)
-		-Dxml=$(usex xml)
-		-Dxrootd=$(usex xrootd)
-		${EXTRA_ECONF}
-	)
-
-	CMAKE_BUILD_TYPE=$(usex debug Debug Release) \
-	cmake_src_configure
-}
-
-src_compile() {
-	# needed for hsimple.root
-	addwrite /dev/random
-	cmake_src_compile
-}
-
-src_install() {
-	cmake_src_install
-
-	ROOTSYS=${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)
-	ROOTENV="$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)"
-
-	cat > ${ROOTENV} <<- EOF || die
-	MANPATH="${ROOTSYS}/share/man"
-	PATH="${ROOTSYS}/bin"
-	ROOTPATH="${ROOTSYS}/bin"
-	LDPATH="${ROOTSYS}/lib"
-	EOF
-
-	if use python; then
-		echo "PYTHONPATH=\"${ROOTSYS}/lib\"" >> ${ROOTENV} || die
-	fi
-
-	doenvd ${ROOTENV}
-
-	if use emacs; then
-		elisp-install ${PN}-$(ver_cut 1-2) "${BUILD_DIR}"/root-help.el
-	fi
-
-	pushd "${D}/${ROOTSYS}" > /dev/null
-
-	rm -r emacs bin/*.{csh,sh,fish} || die
-
-	if ! use examples; then
-		rm -r tutorials || die
-	fi
-
-	# create versioned symlinks for binaries
-	cd bin;
-	for exe in *; do
-		dosym "${exe}" "/usr/lib/${PN}/$(ver_cut 1-2)/bin/${exe}-$(ver_cut 1-2)"
-	done
-}
diff --git a/sci-physics/root/root-6.22.06-r1.ebuild b/sci-physics/root/root-6.22.08-r2.ebuild
index 905c8eea79fb..b7c414808d02 100644
--- a/sci-physics/root/root-6.22.06-r1.ebuild
+++ b/sci-physics/root/root-6.22.08-r2.ebuild
@@ -14,10 +14,10 @@ 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
+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
+	qt5 R +roofit +root7 shadow sqlite +ssl +tbb test +tmva +unuran vc
 	vmc +xml xrootd"
 RESTRICT="!test? ( test )"
 
@@ -83,7 +83,12 @@ CDEPEND="
 	minuit? ( !sci-libs/minuit )
 	mpi? ( virtual/mpi )
 	mysql? ( dev-db/mysql-connector-c )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	odbc? (
+		|| (
+			dev-db/libiodbc
+			dev-db/unixODBC
+		)
+	)
 	oracle? ( dev-db/oracle-instantclient-basic )
 	postgres? ( dev-db/postgresql:= )
 	pythia6? ( sci-physics/pythia:6 )
diff --git a/sci-physics/root/root-6.24.00-r1.ebuild b/sci-physics/root/root-6.24.02-r1.ebuild
index 176a2987b026..00c2a627b4d3 100644
--- a/sci-physics/root/root-6.24.00-r1.ebuild
+++ b/sci-physics/root/root-6.24.02-r1.ebuild
@@ -14,10 +14,10 @@ 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
+IUSE="+X aqua +asimage c++11 c++14 +c++17 cuda cudnn +davix debug emacs
 	+examples fits fftw fortran +gdml graphviz +gsl http libcxx +minuit
 	mpi mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python
-	qt5 R +roofit root7 shadow sqlite +ssl +tbb test +tmva +unuran uring
+	qt5 R +roofit +root7 shadow sqlite +ssl +tbb test +tmva +unuran uring
 	vc vmc +xml xrootd"
 RESTRICT="!test? ( test )"
 
@@ -85,7 +85,12 @@ CDEPEND="
 	minuit? ( !sci-libs/minuit )
 	mpi? ( virtual/mpi )
 	mysql? ( dev-db/mysql-connector-c )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	odbc? (
+		|| (
+			dev-db/libiodbc
+			dev-db/unixODBC
+		)
+	)
 	oracle? ( dev-db/oracle-instantclient-basic )
 	postgres? ( dev-db/postgresql:= )
 	pythia6? ( sci-physics/pythia:6 )
diff --git a/sci-physics/root/root-6.24.9999.ebuild b/sci-physics/root/root-6.24.9999.ebuild
index b9d938a4ba84..e91fa0be4928 100644
--- a/sci-physics/root/root-6.24.9999.ebuild
+++ b/sci-physics/root/root-6.24.9999.ebuild
@@ -13,10 +13,10 @@ inherit cmake cuda elisp-common fortran-2 prefix python-single-r1 toolchain-func
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="https://root.cern"
 
-IUSE="+X aqua +asimage +c++11 c++14 c++17 cuda cudnn +davix debug emacs
+IUSE="+X aqua +asimage c++11 c++14 +c++17 cuda cudnn +davix debug emacs
 	+examples fits fftw fortran +gdml graphviz +gsl http libcxx +minuit
 	mpi mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python
-	qt5 R +roofit root7 shadow sqlite +ssl +tbb test +tmva +unuran uring
+	qt5 R +roofit +root7 shadow sqlite +ssl +tbb test +tmva +unuran uring
 	vc vmc +xml xrootd"
 RESTRICT="!test? ( test )"
 
@@ -96,7 +96,12 @@ CDEPEND="
 	minuit? ( !sci-libs/minuit )
 	mpi? ( virtual/mpi )
 	mysql? ( dev-db/mysql-connector-c )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	odbc? (
+		|| (
+			dev-db/libiodbc
+			dev-db/unixODBC
+		)
+	)
 	oracle? ( dev-db/oracle-instantclient-basic )
 	postgres? ( dev-db/postgresql:= )
 	pythia6? ( sci-physics/pythia:6 )
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index b9d938a4ba84..e91fa0be4928 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -13,10 +13,10 @@ inherit cmake cuda elisp-common fortran-2 prefix python-single-r1 toolchain-func
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="https://root.cern"
 
-IUSE="+X aqua +asimage +c++11 c++14 c++17 cuda cudnn +davix debug emacs
+IUSE="+X aqua +asimage c++11 c++14 +c++17 cuda cudnn +davix debug emacs
 	+examples fits fftw fortran +gdml graphviz +gsl http libcxx +minuit
 	mpi mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python
-	qt5 R +roofit root7 shadow sqlite +ssl +tbb test +tmva +unuran uring
+	qt5 R +roofit +root7 shadow sqlite +ssl +tbb test +tmva +unuran uring
 	vc vmc +xml xrootd"
 RESTRICT="!test? ( test )"
 
@@ -96,7 +96,12 @@ CDEPEND="
 	minuit? ( !sci-libs/minuit )
 	mpi? ( virtual/mpi )
 	mysql? ( dev-db/mysql-connector-c )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	odbc? (
+		|| (
+			dev-db/libiodbc
+			dev-db/unixODBC
+		)
+	)
 	oracle? ( dev-db/oracle-instantclient-basic )
 	postgres? ( dev-db/postgresql:= )
 	pythia6? ( sci-physics/pythia:6 )