From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1363569-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 31D25158087
for <garchives@archives.gentoo.org>; Tue, 1 Feb 2022 19:02:41 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 1E1CA2BC05F;
Tue, 1 Feb 2022 19:02:40 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id E06FF2BC05A
for <gentoo-commits@lists.gentoo.org>; Tue, 1 Feb 2022 19:02:39 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 0F533342FDE
for <gentoo-commits@lists.gentoo.org>; Tue, 1 Feb 2022 19:02:39 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 7FC6C2AF
for <gentoo-commits@lists.gentoo.org>; Tue, 1 Feb 2022 19:02:37 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1643741879.7c9f5b4a7858c396d473a90c0fda5fbc9a018809.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/tensorflow/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-libs/tensorflow/tensorflow-2.5.0-r3.ebuild sci-libs/tensorflow/tensorflow-2.7.0.ebuild
X-VCS-Directories: sci-libs/tensorflow/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 7c9f5b4a7858c396d473a90c0fda5fbc9a018809
X-VCS-Branch: master
Date: Tue, 1 Feb 2022 19:02:37 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: e1a0bb81-62b5-412f-a62f-9b60b261b84c
X-Archives-Hash: 6e4b7f8d1af192b1164e22f9119066fb
commit: 7c9f5b4a7858c396d473a90c0fda5fbc9a018809
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 1 18:57:59 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Feb 1 18:57:59 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c9f5b4a
sci-libs/tensorflow: Fix Python dependencies
DISTUTILS_USE_SETUPTOOLS is not used with DISTUTILS_OPTIONAL, the dep
on setuptools needs to be declared explicitly.
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sci-libs/tensorflow/tensorflow-2.5.0-r3.ebuild | 15 ++++++---------
sci-libs/tensorflow/tensorflow-2.7.0.ebuild | 14 +++++---------
2 files changed, 11 insertions(+), 18 deletions(-)
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} )"