gentoo resync : 02.02.2022

3 files changed, 13 insertions, 20 deletions

diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index d9ab5a623197..5aa2925674fc 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -48,6 +48,6 @@ DIST tensorflow-patches-2.7.0.tar.bz2 2928 BLAKE2B 4814c3b31d1c6236711c41f62b565
 DIST tensorflow-runtime-64c92c8013b557087351c91b5423b6046d10f206.tar.gz 15224747 BLAKE2B b6aaaf4f6dd488dbfc49f6f9bd6d7820894b7f205ab76c38288175c70dd9ee656128a0655fc1f7ca1ada33d96193c9bb3569da02d0b591aea9ffbb9cf1f223b8 SHA512 1e66742ccda9778fdf9e0e1e83b0524d6b3e82e7792918ae058c031e81b033bc51cebf49752832aa2f27a53a6a9846256e4e9e9eec7c5285ad2db2cb8995ecfc
 DIST tensorflow-toolchains-v1.1.10.tar.gz 137512 BLAKE2B 774b22a599070564c0f77ed0da79f6a96359b196dd3007370be885b796c236b9a29c01597507a3049f82cf489824c8016740b778cacb2b8cd859500f9ecb1887 SHA512 1daf4684f5b364a89b3cc475cf2d13d0d0622fc14d2b32d7ad8518932538e716782d755cfcedc98d129a3986bc7c38bfc7854c8ad596891e397510b75ae2f93e
 DIST tensorflow-toolchains-v1.2.7.tar.gz 97867 BLAKE2B 2f613366b34b81d044da1407ff6371c6183b14593c719ea82ffc964c310df72282ba102be50a9c65655f9185b4ab59d707fe823608b6e452ebf9afc70589bcd5 SHA512 b70da3594aa0499b4e158258ba29ef30044cb6e354e2608b79274f712976b687b09e28a2576d3d89e6bd8ff41416ee19f2d5505b712ec98488c8b8cb839ede84
-EBUILD tensorflow-2.5.0-r3.ebuild 15558 BLAKE2B 8766664141227fc2b0ad04c3061fbca8eda2e52f036e1333b2005510aabcd5d2ccb449556bb53259cb7169cb40bf608222590495f580f4e1e9258f769a5833a0 SHA512 65d239aaa14a18d9147a0830e6f2f86246a026b070830cb93959dc5b76c984486ba5bae032733069365edc6df9102285b98a7d3b0eb29d28d819e05bb6e0e076
-EBUILD tensorflow-2.7.0.ebuild 15934 BLAKE2B 9014ea213ceb9139c3cad48da4b1bcf64b82b8b8755e82b9f013bda31cce05ff35ce7f9ab3f8db2e7c1c900e17c4da4810d1910896f4b508f9782243f295096f SHA512 457015c937361ad884f7ec81cba91c5e821648a95ad5b89edb23a5455ee01ab13df207811541bdb6a7d0da19903481d1a6512b0728c723aa90af236aca915534
+EBUILD tensorflow-2.5.0-r3.ebuild 15589 BLAKE2B f9c8d5e5b60c8b259ed17f78314380d111d945486866902b40df7cc090a7bcff2bcb92e386530a10d3abc43e0b30255651c445f5b16df4acf4c5a4ff83500f92 SHA512 b629a9216c691b4076d340a45cc067add1a45ec5c1ef653817c3c9f792d5e0c5abd2a69eb8c3a9260b61ee10473fe08fe62f3643c31ff8846b1f7a9ad9bfb2fc
+EBUILD tensorflow-2.7.0.ebuild 15923 BLAKE2B 3578ec3cb7f6dbf54c1e3171284d862c407b9c1f078e7b9ceafe9aafbc97a24e47b188e63230c31494e74b7886c6a9b20aa0cb8b66535de80f747627fbac562a SHA512 5d84e03c16d3a6358af0d2e4c089e634e15af89a2956c70ac2bf903f6e2e3f1b926b7c5c96ff981c04a2c31954cba99e68e9b6db61f03da86b8b9df3ca9a5239
 MISC metadata.xml 501 BLAKE2B 16095ae1e7ff9fdd7efe0bb5184ce1d7e46cb5c8f98a650ec4f69742262c678b9945d35b12ba518f8a9b36cad8cd23483a95aca0141ddbe07e4210cef16d2949 SHA512 d1f08e9360ab7c4ec516787807cc53f795d99dde6287b7024535bae4dae4a0107117548784bb25ac07cee15ad1676d98e9c9d472ec97023dfc3e0bdd72a26d28
diff --git a/sci-libs/tensorflow/tensorflow-2.5.0-r3.ebuild b/sci-libs/tensorflow/tensorflow-2.5.0-r3.ebuild
index e3c79720e512..0c3051005d95 100644
--- a/sci-libs/tensorflow/tensorflow-2.5.0-r3.ebuild
+++ b/sci-libs/tensorflow/tensorflow-2.5.0-r3.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 MY_PV=${PV/_rc/-rc}
 MY_P=${PN}-${MY_PV}
 
@@ -106,6 +105,7 @@ RDEPEND="
 		>=dev-python/opt-einsum-3.3.0[${PYTHON_USEDEP}]
 		>=dev-python/protobuf-python-3.13.0[${PYTHON_USEDEP}]
 		dev-python/pybind11[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 		dev-python/tblib[${PYTHON_USEDEP}]
 		dev-python/termcolor[${PYTHON_USEDEP}]
@@ -117,11 +117,7 @@ RDEPEND="
 		>=sci-libs/keras-preprocessing-1.1.2[${PYTHON_USEDEP}]
 		>=sci-visualization/tensorboard-2.5.0[${PYTHON_USEDEP}]
 	)"
-DEPEND="${RDEPEND}
-	python? (
-		dev-python/mock
-		dev-python/setuptools
-	)"
+DEPEND="${RDEPEND}"
 PDEPEND="python? (
 		>=sci-libs/tensorflow-estimator-2.5.0[${PYTHON_USEDEP}]
 	)"
@@ -135,8 +131,9 @@ BDEPEND="
 	)
 	!python? ( dev-lang/python )
 	python? (
-		dev-python/cython
-		dev-python/mock
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
 		>=dev-python/grpcio-tools-1.28
 	)"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sci-libs/tensorflow/tensorflow-2.7.0.ebuild b/sci-libs/tensorflow/tensorflow-2.7.0.ebuild
index 3cfc701dff2f..2ab771170c61 100644
--- a/sci-libs/tensorflow/tensorflow-2.7.0.ebuild
+++ b/sci-libs/tensorflow/tensorflow-2.7.0.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 MY_PV=${PV/_rc/-rc}
 MY_P=${PN}-${MY_PV}
 
@@ -118,11 +117,7 @@ RDEPEND="
 		>=net-libs/google-cloud-cpp-0.10.0
 		>=sci-visualization/tensorboard-2.7.0[${PYTHON_USEDEP}]
 	)"
-DEPEND="${RDEPEND}
-	python? (
-		dev-python/mock
-		dev-python/setuptools
-	)"
+DEPEND="${RDEPEND}"
 PDEPEND="python? (
 		>=sci-libs/keras-2.7.0[${PYTHON_USEDEP}]
 		>=sci-libs/tensorflow-estimator-2.7.0[${PYTHON_USEDEP}]
@@ -137,8 +132,9 @@ BDEPEND="
 	)
 	!python? ( dev-lang/python )
 	python? (
-		dev-python/cython
-		dev-python/mock
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
 		>=dev-python/grpcio-tools-1.28
 	)"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"