gentoo resync : 18.08.2019

7 files changed, 57 insertions, 38 deletions

diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 3a11c0535050..4ac672a7714c 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -9,9 +9,9 @@ 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.00.source.tar.gz 165917160 BLAKE2B 8c83f4dc7a7af8f8627e7711792d09800d3b426ce9ca338aad3bc65c9c307723bd97ca84f0e1790fb844f80be80c8cea9e58c1a6b469880752439db21f7d34cd SHA512 abc4630b773f979e01e0ede7bee095fa3f0f8172218538b37e68230dfce6f0623f24a9567bd40cf1e72ccb4e3398cec858fdfd53ba246ca3615fefd9e5a0d0cd
-EBUILD root-6.12.06-r9.ebuild 7738 BLAKE2B 2ab2e1150a8d85d9008f861be13fe8fd98cbd4b869a5dc3ec33b61151d436358cd6f1ac9b287b8a9dab7711fdbd0c4c961b2c28262b13cb45aee891ca84c9723 SHA512 9cffbfdab77a5b8c0f360bf5e45ae0595b1412b0b9e0c60d7da9f4c590d970ea2ec603ca5135823ff5e4bd04b313fd5e95e828e379fee59a082dcadc2a8132dc
-EBUILD root-6.14.08-r2.ebuild 7924 BLAKE2B ce15e932bcc41237e1453e7dbc5c588ce9148ca5669a76750eba8b27d737d59073bd6b2689e19b712f9f86b0accd19ba76814970c93b7cd692999aa963018b74 SHA512 1def593a5b52df1fbbcfd2afa99a99eea3c9f210951f92fa817a0f9302d83aa4512b507cbfc21223ae28bad53575fa125bb651da0c7131fd795ada9bf6da7021
-EBUILD root-6.16.00-r1.ebuild 8010 BLAKE2B 75e5fcf18928534823e88bb57672f8abc583d2510e8a1e2330ed8a348c947886af6a5d7c04fecbb0a0006892946db77e2fc616ddd8c0be8432a0137f6cb7bb43 SHA512 2f5baadb930f8529da4ce6afa10b0f3a649c6ed56daa5e02f0ea560a2158c871ac94bcc25eedbcecd61eaf9a1f956cf97cc5f2afca545d8d097d18a316171d00
-EBUILD root-6.18.00.ebuild 7472 BLAKE2B d8ded18cfe831a6770f71edc313ecea69483007f60e9acdac205d43c633b7699d4dd10615a6253865169793ec507f9dd41b5aa0d120fbfa6ea24309438525696 SHA512 38057a1b671b635e6d2c5c54d013254ebd0b632a4134366c585a3b4c1460ad7b56cda405679c1a06ea9ed9356055d594574dfce3ad81f77d97504e52a1c83784
-EBUILD root-9999.ebuild 7532 BLAKE2B 3a7431f8f445b489749304386d7bd6cd2368c0a14302c51111087b6b183705a94402f45974be9d5d5d996dc480178ada47812d01ef582862a1e0e2a305482316 SHA512 38cf3ae4d3dae505acf544f0913180f2679f3d8f200b6569f75c3e64289d17cef0f2f2f466d9b39dd0379783d29bea8fc6c874210acccf75d036ba654b38a616
-MISC metadata.xml 3145 BLAKE2B 90d0a9fdb2481d8a7afe627ebe61bc97ff4ccc229f6ceed9cfccec918e2b9b51aa342eddd2f6599220fe639f027532e99fc96e806118cf95eac9a81238a5163f SHA512 7c7219d17879c2c6faaadc9a6c91da1844c95f0b2589cfe7d26a2d0f0f76a6c0a412dda94d50ea2b3568f032bba33c4f32f08c5cb891e792e9d707d5e683de34
+EBUILD root-6.12.06-r11.ebuild 7866 BLAKE2B e12510ed1d12803dd4bac0ad21616aa3d1ce01ee95e74857ff2bc69d6085957d116e5418d5aba030ff9c036e3e3330bb084de4af342c84a59063b1f309e8efac SHA512 a5322adba20a8ac7d68219e63f3c78c1a438a078bca3ef73f47132a7034844bb2781747cf5c6b83b962cd3423b67c6dbd2d2f695873347639bf24fec03c1ee22
+EBUILD root-6.14.08-r4.ebuild 8052 BLAKE2B 82c9067edf53e5102ccbe89c63e3ab122d17dacf2cc686e0c7450238b110fb796490dc8887d59b2c7287f4a74fc05d773fdfab11aa7a6d932b82993349699105 SHA512 5027873eefb0f5655f8d990ed434a84a0a72f39561fca2e6537b9248406c48ad8636f46942680c62d47665629fc80bcd54092852ea6b954946b3ac980efa1dbb
+EBUILD root-6.16.00-r3.ebuild 8138 BLAKE2B f87aa6680d0ff4887ae4149e16d38dd525056441f8465d4375059eec662de50cecb9eb64d00e76f4895d11bafb2dbbd2f47113e7b5cd008d6f25f67b78a7c0d0 SHA512 1e3d0a46d8b3198fe6334a9f8ebfe47144da445042e9fb43a53328c42bfa29e246347586861a83fd594000af458ad2db52f8950fd309547b4b71f7c6f6d6d967
+EBUILD root-6.18.00-r2.ebuild 7600 BLAKE2B 7522424247f422a763fb957948bc4e39a8121daaa79476b1d14d849afb7856ea1df18a6bf2f900b37add07cdadc4779808f70cbaed2123385759187163339a03 SHA512 f3d7fc72787d547382487d0496729f392af6617372a73acf0d6b7cec16faa8c029d739e61ad0a198cb95299b959ca0efbc75552e6ccd24bc98b1ac1016bcc81a
+EBUILD root-9999.ebuild 7616 BLAKE2B d1c3f74707686d2d4804f6efac7cfa734479e86619cbd1a8c977187535555e2ae759d27171f1d9c7ee0b13b7dc98ac5cffa87bc1bbe3a813ce94db083b35181d SHA512 bc88053326c6a61dff904107437fcb7e3ae3b714b3afd39ca7530785716f155c2275811fbf3801ed3364dccdfaa2b0b50a6287d1106ce02197d2cfcedca1194d
+MISC metadata.xml 3218 BLAKE2B f23175b1a5998bbecdcdb6e5f42d08bd8e16aaeee79f43d30e0906977f389e18a19ddceeba24009360c2f717c29162c8e30b807bda993492f27429802dc62883 SHA512 d3bdc5bce1d1ac904e5a7a9f21bca65deb480ecbd1362a3251c93e09ab07fdcdd6dfd8900e62df3853b7e200880850d9010122500a081fdedb6b43adae25a6bd
diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index f2ba440c8cea..8eb44b130ef3 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -33,6 +33,7 @@
     <flag name="libcxx">Build ROOT against <pkg>sys-libs/libcxx</pkg></flag>
     <flag name="memstat">Build memory statistics library, helps to detect memory leaks</flag>
     <flag name="minuit">Build ROOT's internal versions of minuit (fortran) and minuit2 (C++)</flag>
+    <flag name="nosplash">Disable ROOT's splash screen by default</flag>
     <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
     <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
     <flag name="R">Enable support for <pkg>dev-lang/R</pkg></flag>
diff --git a/sci-physics/root/root-6.12.06-r9.ebuild b/sci-physics/root/root-6.12.06-r11.ebuild
index 244f4d26df85..9a28b0fd7fbd 100644
--- a/sci-physics/root/root-6.12.06-r9.ebuild
+++ b/sci-physics/root/root-6.12.06-r11.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=6
 
-CMAKE_BUILD_TYPE=Release
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
@@ -16,11 +15,11 @@ 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 +davix emacs +examples fits fftw fortran
+IUSE="+X aqua +asimage +davix debug 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"
+	+minuit mysql nosplash 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"
 
 SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
 LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
@@ -133,6 +132,10 @@ src_prepare() {
 	# CSS should use local images
 	sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
 
+	if use nosplash; then
+		sed -i -e '/bool gNoLogo/s@false@true@' rootx/src/rootx.cxx
+	fi
+
 	hprefixify core/clingutils/CMakeLists.txt
 }
 
@@ -262,6 +265,7 @@ src_configure() {
 		${EXTRA_ECONF}
 	)
 
+	CMAKE_BUILD_TYPE=$(usex debug Debug Release) \
 	cmake-utils_src_configure
 }
 
diff --git a/sci-physics/root/root-6.14.08-r2.ebuild b/sci-physics/root/root-6.14.08-r4.ebuild
index 69718f3f6257..e3ab9e14f94b 100644
--- a/sci-physics/root/root-6.14.08-r2.ebuild
+++ b/sci-physics/root/root-6.14.08-r4.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=6
 
-CMAKE_BUILD_TYPE=Release
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
@@ -16,12 +15,12 @@ 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 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"
+IUSE="+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs
+	+examples fits fftw fortran +gdml graphviz +gsl http jemalloc
+	kerberos ldap libcxx memstat +minuit mysql nosplash 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"
 
 SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
 LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
@@ -131,6 +130,10 @@ src_prepare() {
 	# CSS should use local images
 	sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
 
+	if use nosplash; then
+		sed -i -e '/bool gNoLogo/s@false@true@' rootx/src/rootx.cxx
+	fi
+
 	hprefixify core/clingutils/CMakeLists.txt
 }
 
@@ -268,6 +271,7 @@ src_configure() {
 		${EXTRA_ECONF}
 	)
 
+	CMAKE_BUILD_TYPE=$(usex debug Debug Release) \
 	cmake-utils_src_configure
 }
 
diff --git a/sci-physics/root/root-6.16.00-r1.ebuild b/sci-physics/root/root-6.16.00-r3.ebuild
index c893ead5cca2..c57209cefee7 100644
--- a/sci-physics/root/root-6.16.00-r1.ebuild
+++ b/sci-physics/root/root-6.16.00-r3.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=6
 
-CMAKE_BUILD_TYPE=Release
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
@@ -16,12 +15,12 @@ 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 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"
+IUSE="+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs
+	+examples fits fftw fortran +gdml graphviz +gsl http jemalloc
+	kerberos ldap libcxx memstat +minuit mysql nosplash 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"
 
 SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
 LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
@@ -133,6 +132,10 @@ src_prepare() {
 	# CSS should use local images
 	sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
 
+	if use nosplash; then
+		sed -i -e '/bool gNoLogo/s@false@true@' rootx/src/rootx.cxx
+	fi
+
 	hprefixify core/clingutils/CMakeLists.txt
 }
 
@@ -271,6 +274,7 @@ src_configure() {
 		${EXTRA_ECONF}
 	)
 
+	CMAKE_BUILD_TYPE=$(usex debug Debug Release) \
 	cmake-utils_src_configure
 }
 
diff --git a/sci-physics/root/root-6.18.00.ebuild b/sci-physics/root/root-6.18.00-r2.ebuild
index 7d471c4b2069..18d23f22fd53 100644
--- a/sci-physics/root/root-6.18.00.ebuild
+++ b/sci-physics/root/root-6.18.00-r2.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=6
 
-CMAKE_BUILD_TYPE=Release
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
@@ -16,11 +15,11 @@ 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"
+IUSE="+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs
+	+examples fits fftw fortran +gdml graphviz +gsl http jemalloc
+	libcxx memstat +minuit mysql nosplash 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"
@@ -127,6 +126,10 @@ src_prepare() {
 	# CSS should use local images
 	sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
 
+	if use nosplash; then
+		sed -i -e '/bool gNoLogo/s@false@true@' rootx/src/rootx.cxx
+	fi
+
 	hprefixify core/clingutils/CMakeLists.txt
 }
 
@@ -250,6 +253,7 @@ src_configure() {
 		${EXTRA_ECONF}
 	)
 
+	CMAKE_BUILD_TYPE=$(usex debug Debug Release) \
 	cmake-utils_src_configure
 }
 
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index d300c32a9370..0b58a32c0138 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=6
 
-CMAKE_BUILD_TYPE=Release
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
@@ -15,11 +14,11 @@ 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 emacs +examples
-	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"
+IUSE="+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs
+	+examples fits fftw fortran +gdml graphviz +gsl http libcxx +minuit
+	mysql nosplash 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
@@ -138,7 +137,9 @@ 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
+	if use nosplash; then
+		sed -i -e '/bool gNoLogo/s@false@true@' rootx/src/rootx.cxx
+	fi
 }
 
 # Note: ROOT uses bundled clang because it is patched and API-incompatible
@@ -253,6 +254,7 @@ src_configure() {
 		${EXTRA_ECONF}
 	)
 
+	CMAKE_BUILD_TYPE=$(usex debug Debug Release) \
 	cmake-utils_src_configure
 }