gentoo resync : 05.12.2021

3 files changed, 10 insertions, 85 deletions

diff --git a/sci-libs/tensorflow-estimator/Manifest b/sci-libs/tensorflow-estimator/Manifest
index ff5d23610e66..ffe2694cd5cf 100644
--- a/sci-libs/tensorflow-estimator/Manifest
+++ b/sci-libs/tensorflow-estimator/Manifest
@@ -2,10 +2,8 @@ DIST bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip 72534 BLAK
 DIST bazelbuild-rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip 159656 BLAKE2B c2ebed5165907e5452db2e8797253ce17fb39a00d3ca3aab11dec475399821dd529629d710af6f9892b74d0654293bd7989fa2be24caf5836490e8df566c7c18 SHA512 deecf484f5e888db345a57c3b557d6548e4e71fd4c62ea10b4dc9c47be9d303df55c03bb446158675b131064c4eccb401bf217e131e78d629c8fc1836600cb51
 DIST bazelbuild-rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d.zip 201360 BLAKE2B 0173a8edb17f344b18e42026e2f8a62a1909d4694ab0be83562b6437a3f1ef38889f069269ddd2308b41062e5f375f791be0d2631a8e52ede668203779813b56 SHA512 2ba1dc316d88947c1d17ec67154c052700e3571b8d03370a9f204cf9fe94a1bd58f93a2c4a3c0b02233ee3250053a4c30a4133b5b38745858c1d04be8c9d973f
 DIST bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip 9422 BLAKE2B bbc45c97551ee8126335b611ffca6574dac843d4db9b3221b10d26487f8eecfe38ba0cd67a4039a3ad921c25fea6294c43e4f4e7a57a060a30791acd6c4f9d39 SHA512 ba06242feb711e7fb6e821fd9ac029248b4f3e466fb1acf971d0db8196f3efe4d114ef137acbe4913073f8cbe8ccab4d47d8bafa21b867b2d6a6d57f5a647f0c
-DIST tensorflow-estimator-2.3.0.tar.gz 642118 BLAKE2B 29ecf5b64da20e8e6981375f1631b9b7e8ad061f71d0a3f1ac567bcd04b02102c5854d24e5106660f6bcd7b4ca683bd3bfbde51f236669d0f17e8f847feb7039 SHA512 0befc9c04650a0cd91ce90bc2e9a5d17ae3f7d8d8e4b8f763f223bbb891c73c7e2cbe91a2779af36342008e16f02d118120d94165c6a8e3c14a723b32ee29cb0
-DIST tensorflow-estimator-2.4.0.tar.gz 660203 BLAKE2B b270536fe976fc718bb6ba558d9d91817b14951c8769365348d2cc13b621e30efe2154aa3040d2c0ea750d4f45b1aadd36d7f98b16bc2d3dcdec89f95ec6246b SHA512 31538614fb96c90228eebbc3edf7d7f7157dab1a9271858d47af2104d9fafab9f3386dc42a45ad46999df54fd757d544dd27fc23ee519596dd0a453a652bed13
 DIST tensorflow-estimator-2.5.0.tar.gz 689339 BLAKE2B 6fb491b047cabed6edf67cccc913de54e4c2337eb052ba833239b72b07facaf33410b8a57a8f95fc0e2c225190d9b26b7955579d77883dbc236519cb784784c3 SHA512 dc49d92f4d2e63770dd901b272d7c62db50bfef7107e38f6525b6a458ad9915d1cbcdc9961c70c6ef88b9a38361f7b6712f6a2d30e240a35aab4bb25ffe17e71
-EBUILD tensorflow-estimator-2.3.0.ebuild 1973 BLAKE2B a617c35114a68d2723be036e073365b5c7ba0a7243831ef4ce72ee049215f1e711adef1ed46be51d67833d5b592947aeadf555a4c648318fc69f1064d70db056 SHA512 812402d47e0bd2eebfd3462161442d9094d418421512bf79109a76c42fa61f12195882ecbc9d29cfa7424b8e50f9f78cf44998bc9d4fe3a209992e6ce60568dc
-EBUILD tensorflow-estimator-2.4.0.ebuild 1973 BLAKE2B a617c35114a68d2723be036e073365b5c7ba0a7243831ef4ce72ee049215f1e711adef1ed46be51d67833d5b592947aeadf555a4c648318fc69f1064d70db056 SHA512 812402d47e0bd2eebfd3462161442d9094d418421512bf79109a76c42fa61f12195882ecbc9d29cfa7424b8e50f9f78cf44998bc9d4fe3a209992e6ce60568dc
+DIST tensorflow-estimator-2.7.0.tar.gz 691956 BLAKE2B 8a6cdc88fadbac6275d1c766c4b183dc7d1d374a1e898651ecdf0802d2f5c5bbc01d437a85826e3ef5dc0700b44c69ff84d8610fdf7ac3150fa4c0541f901707 SHA512 e02ee93baf2e36f2e42dec71bd2e31486dc96a7ff25d813fbbe3aae1d0eb1fccdda2cfcad46a87c6cdcd143c1b88915b95bc158ac3240a36734b725b3f89bda3
 EBUILD tensorflow-estimator-2.5.0.ebuild 2175 BLAKE2B e9e90aee52d27b13f193a2a91f84ff97f641ac23fb948cfb34911212c2db3347f30639ebe537573cbd2b5e6788d843fe70f2c473e6b35889906d1b8fe66d292b SHA512 eacca70003a320d3c7c5a51609a8a62d887fae1eaa5e0405c8fa019549cb004fb0a46db79a646a744e2c589fdd66412c0f44a746387a35158ad0d67b4d013fb1
+EBUILD tensorflow-estimator-2.7.0.ebuild 1864 BLAKE2B 7ae71ffe9d5c2ff6675194b280c7d62a33ea4c1cf63998d3465ef904ea829194b1d6ff7a00675a5a593441953716d10b23f0bbb41282e4014298ae577ee3ea18 SHA512 0042f613b7039030daaa6fee801603410906869320c1b773b7ef1cf18d5db9e71643952ec03ecfe2d6a04b4dad9578b9e576731e829a4e6a8e8593d514c89300
 MISC metadata.xml 581 BLAKE2B f3c4be0d25d3337871d9fc5f0d2e1e420fd68f45c2a7fbabaab0557f2f323661d4dd1ab847778ccc5a06bfe86a6fcf77bc4f65a04baa8ed569fd868ca8a03009 SHA512 41e7c5f2bce2166ed98259fa86fcf92cb3e2e186e7387a1cc75d630313791fc83e297288ce52ad25655292eb14b28a651dec3cb6b3101c75c327f447b15d6293
diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.4.0.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.4.0.ebuild
deleted file mode 100644
index afa7f6232c47..000000000000
--- a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.4.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-MY_PN="estimator"
-MY_PV=${PV/_rc/-rc}
-MY_P=${MY_PN}-${MY_PV}
-
-inherit bazel distutils-r1
-
-DESCRIPTION="High-level TensorFlow API that greatly simplifies machine learning programming"
-HOMEPAGE="https://www.tensorflow.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-bazel_external_uris="
-	https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip
-	https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip -> bazelbuild-rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip
-	https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"
-
-SRC_URI="https://github.com/tensorflow/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	${bazel_external_uris}"
-
-RDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/unzip
-	dev-java/java-config
-	>=dev-util/bazel-3"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CONTRIBUTING.md README.md )
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	bazel_load_distfiles "${bazel_external_uris}"
-}
-
-src_prepare() {
-	bazel_setup_bazelrc
-	default
-	python_copy_sources
-}
-
-src_compile() {
-	export JAVA_HOME=$(java-config --jre-home)
-
-	do_compile() {
-		ebazel build //tensorflow_estimator/tools/pip_package:build_pip_package
-		ebazel shutdown
-
-		local srcdir="${T}/src-${EPYTHON/./_}"
-		mkdir -p "${srcdir}" || die
-		bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package --src "${srcdir}" || die
-	}
-
-	python_foreach_impl run_in_build_dir do_compile
-}
-
-src_install() {
-	do_install() {
-		cd "${T}/src-${EPYTHON/./_}" || die
-		esetup.py install
-		python_optimize
-	}
-	python_foreach_impl do_install
-
-	cd "${S}" || die
-	einstalldocs
-}
diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.3.0.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.7.0.ebuild
index afa7f6232c47..f5176e8c9bc9 100644
--- a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.3.0.ebuild
+++ b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.7.0.ebuild
@@ -3,34 +3,36 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 MY_PN="estimator"
 MY_PV=${PV/_rc/-rc}
 MY_P=${MY_PN}-${MY_PV}
 
 inherit bazel distutils-r1
 
-DESCRIPTION="High-level TensorFlow API that greatly simplifies machine learning programming"
+DESCRIPTION="A high-level TensorFlow API that greatly simplifies machine learning programming"
 HOMEPAGE="https://www.tensorflow.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE=""
 
 bazel_external_uris="
-	https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip
-	https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip -> bazelbuild-rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip
+	https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip -> bazelbuild-rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d.zip
 	https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"
 
 SRC_URI="https://github.com/tensorflow/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
 	${bazel_external_uris}"
 
-RDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]"
+RDEPEND="
+	sci-libs/tensorflow[python,${PYTHON_USEDEP}]
+	sci-libs/keras[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-arch/unzip
 	dev-java/java-config
-	>=dev-util/bazel-3"
+	>=dev-util/bazel-3.7.2"
 
 S="${WORKDIR}/${MY_P}"