gentoo auto-resync : 14:10:2022 - 19:44:42

5 files changed, 44 insertions, 20 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index e7495a940fe7..d698fa9ac506 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 00f3c3aa25c3..d3d541b82170 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -2,7 +2,7 @@ AUX root-6.12.06_cling-runtime-sysroot.patch 989 BLAKE2B 8202cc8f2bf72cc25642d0a
 DIST root_v6.24.06.source.tar.gz 185205236 BLAKE2B 6b3343ad8d86373de3abd328480eaa89825bca46ebb5ccc16ddcb8c1060fa023eeb8be3d1832e3ce2ad0beaafe66334f20ed8344ffb6df72d89c6622aa1c947a SHA512 356d6287df2900de9e831347d9513f444bf7cbd29c39fbb5841051ae877dac1e22dc255c64166cd3925b82aac860ae67ef6ce171732c16fd23d7919a47e7cb5a
 DIST root_v6.26.06.source.tar.gz 195214157 BLAKE2B cb9f4b17f7eae36fbd728aa9c03a5705f5d05da0a9c0913fef6145d3fae4843f1a77b3f6251cd6cc322fa7ada4837c0be69aa53b2e1572c72e6e91d1b68aef47 SHA512 ae2b7396e0821adba6cad75346c0bfb1b7a0d4dd1cc4bc9b195c632358fe078949012b6269e55dabadc6ecd8c0fd6d819fa87099046d399ed00a45db56a879d4
 EBUILD root-6.24.06-r2.ebuild 7807 BLAKE2B e668b379eeaf4050b66bb1453ea623faa2f4453f2c12c8a7fa1677a8eec8b02ca18a10f30b4e0ff7187e19222fde0af7cfdcdc258fef04eff581d44f4dac8e03 SHA512 91018bfd4b3a5fa8b230297cdc99c87b805227becfa6cf1dd3dc17cf0f155fe4675c8def38c59419208e192ba4e1e9ec128609e98c8269546a335dceb64bea0e
-EBUILD root-6.26.06.ebuild 7738 BLAKE2B 6f168255774cb932b0d1d8d5edfc92d1297dcbc84895302e9053f73cf9cf4c8a84c9d815ccd7b70aab065a5f20a42d3b50b7688e238aacb987d8e4205941991f SHA512 d652b0883cbc591db3612291aa00e97a12a269672f306fda0daf033ac257421faaa24ee9fc5ebe2701e9ec4fbbf8fba1ccd282bf4c8b8d258472ac0183aab284
-EBUILD root-6.26.9999.ebuild 8188 BLAKE2B a727863c9ee30617419a52fdfa6e9b1eceb5283ac47e17c6728f928839c40530897f8a0b788f81e73cca7e584856c3ac78211f03b4aa2b6b887232d7e404ccdf SHA512 a205e43a613412632aa2297a0305bd8f5735eb3b1bcac8e07801e022603c4399d612ca0a5546b1073568ce7f221c77b7b5b8563372c3e0805b5b7660a40c1793
-EBUILD root-9999.ebuild 8409 BLAKE2B 6f3bb60c84a2ba60552365203a8232b1c54f849d1dbf48ff9ab8a6682ddb3f3ea557d84077b6147457d19bab5d72c0e3e927f99e053e3f7792dad5bd707cda63 SHA512 e9791d6e4eeb351bd576757f2d77745901ec39e064cbb6daa4c842c969089efa5821be4f3fcf4faffac8365780b587ec463268eb9afff9f93739871f938519ab
+EBUILD root-6.26.06.ebuild 8187 BLAKE2B c83b50e4249356f7d4682ecbf779d5dfd64e6dd9d94d2dd4cfe141e753574264d6a0ed43ef80dfe7f075819ba6eca4198fbb06fb7c664a3b48955841deb5afb9 SHA512 84d6fc0786de97ae44fe3d8f80796c157179e4c7d17784edb0ce0cd6de0af419222f99d92a640ee6e3a5e01f725a6c1b278b9a9ac6d7d3e4266c74c657e5d284
+EBUILD root-6.26.9999.ebuild 8238 BLAKE2B 1537890a86aa15e8b2f22a0cfb29ae3e7169344eebd7b0ba863da571647f85912e5140eabf6b567a6c97fd8c4c1dbedf87b8ab607ce90c08a15b506f30344994 SHA512 92dbd4b459a36adf5c04134c64aa6151a8f13400fa56a2dd8c2012ae8df30e187e3c538cac834f2ea237aa0bb17f2a865646663e8bb808eda26ad7ec0a152fe4
+EBUILD root-9999.ebuild 8459 BLAKE2B 424de2b18c5a063b68c979c585e795177b18b4407e079f32961d9590d049c7e06290d2bfa07b8c568a3b07192db78f5036d4932389840d84756b52bf44314487 SHA512 7b144b55152944f68b02d4c37633a389324a168d63c98fb06ee9e531eea12f561a63c6b8efe617234d76deb4ba6fd002227584c5e80f515b9ffe8c5b8523d487
 MISC metadata.xml 3150 BLAKE2B eb4fbf007e655d2a0bc80d8ef608f0ba19324ddea1af595dfa4ff5115e8d62409be4bfbf262cd1e3d9a400bd4f658224aac40690bdae072a870f8e1739e481d3 SHA512 3f3ff439a879e22319e4b97dfbbd01fe62e36904a8152507553ead043833218d59b6ecf87c5ebed339fb36af6573e6a171469e8158364db1f2b92cca97dedff3
diff --git a/sci-physics/root/root-6.26.06.ebuild b/sci-physics/root/root-6.26.06.ebuild
index 76dd06ff9af8..32cd50caca05 100644
--- a/sci-physics/root/root-6.26.06.ebuild
+++ b/sci-physics/root/root-6.26.06.ebuild
@@ -6,24 +6,37 @@ EAPI=8
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8..10} ) # python3_11 fails to compile
 
 inherit cmake cuda elisp-common fortran-2 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++14 +c++17 cuda cudnn +davix debug emacs
 	+examples fits fftw fortran +gdml graphviz +gsl http libcxx +minuit
 	mpi mysql odbc +opengl oracle postgres pythia6 pythia8 +python
 	qt5 R +roofit +root7 shadow sqlite +ssl +tbb test +tmva +unuran uring
 	vc +xml xrootd"
-RESTRICT="!test? ( test )"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+if [[ ${PV} =~ "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/root-project/root.git"
+	if [[ ${PV} == "9999" ]]; then
+		SLOT="0"
+	else
+		SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
+		EGIT_BRANCH="v$(ver_cut 1)-$(ver_cut 2)-00-patches"
+	fi
+else
+	SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz"
+fi
 
-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++14 c++17 )
@@ -209,7 +222,7 @@ src_configure() {
 		-Dcocoa=$(usex aqua)
 		-Dcuda=$(usex cuda)
 		-Dcudnn=$(usex cudnn)
-		-Dcxxmodules=OFF
+		-Dcxxmodules=OFF # requires clang, unstable
 		-Ddataframe=ON
 		-Ddavix=$(usex davix)
 		-Ddcache=OFF
@@ -286,7 +299,12 @@ src_install() {
 	cmake_src_install
 
 	ROOTSYS=${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)
-	ROOTENV="$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)"
+
+	if [[ ${PV} == "9999" ]]; then
+		ROOTENV="9900${PN}-git"
+	else
+		ROOTENV="$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)-git"
+	fi
 
 	cat > ${ROOTENV} <<- EOF || die
 	MANPATH="${ROOTSYS}/share/man"
@@ -314,8 +332,10 @@ src_install() {
 	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
+	if [[ ! ${PV} == "9999" ]]; then
+		cd bin;
+		for exe in *; do
+			dosym "${exe}" "/usr/lib/${PN}/$(ver_cut 1-2)/bin/${exe}-$(ver_cut 1-2)"
+		done
+	fi
 }
diff --git a/sci-physics/root/root-6.26.9999.ebuild b/sci-physics/root/root-6.26.9999.ebuild
index 246be36df972..c1dddda91e80 100644
--- a/sci-physics/root/root-6.26.9999.ebuild
+++ b/sci-physics/root/root-6.26.9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake cuda elisp-common fortran-2 python-single-r1 toolchain-funcs
 
@@ -18,7 +18,8 @@ IUSE="+X aqua +asimage c++14 +c++17 cuda cudnn +davix debug emacs
 	mpi mysql odbc +opengl oracle postgres pythia6 pythia8 +python
 	qt5 R +roofit +root7 shadow sqlite +ssl +tbb test +tmva +unuran uring
 	vc +xml xrootd"
-RESTRICT="!test? ( test )"
+RESTRICT="test"
+PROPERTIES="test_network"
 
 if [[ ${PV} =~ "9999" ]] ; then
 	inherit git-r3
@@ -30,6 +31,7 @@ if [[ ${PV} =~ "9999" ]] ; then
 		EGIT_BRANCH="v$(ver_cut 1)-$(ver_cut 2)-00-patches"
 	fi
 else
+	SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz"
 fi
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 295ee5f051f2..daec368e8ab8 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake cuda elisp-common fortran-2 python-single-r1 toolchain-funcs
 
@@ -18,7 +18,8 @@ IUSE="+X aqua +asimage c++11 c++14 +c++17 cuda cudnn +davix debug emacs
 	mpi mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python
 	qt5 R +roofit +root7 shadow sqlite +ssl +tbb test +tmva +unuran uring
 	vc vmc +xml xrootd"
-RESTRICT="!test? ( test )"
+RESTRICT="test"
+PROPERTIES="test_network"
 
 if [[ ${PV} =~ "9999" ]] ; then
 	inherit git-r3
@@ -30,6 +31,7 @@ if [[ ${PV} =~ "9999" ]] ; then
 		EGIT_BRANCH="v$(ver_cut 1)-$(ver_cut 2)-00-patches"
 	fi
 else
+	SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz"
 fi