From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6D855138350 for ; Tue, 7 Apr 2020 03:17:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC2C9E0CCF; Tue, 7 Apr 2020 03:17:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2BD76E0BA2 for ; Tue, 7 Apr 2020 03:17:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A606334F020 for ; Tue, 7 Apr 2020 03:17:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 46417103 for ; Tue, 7 Apr 2020 03:17:54 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1586228688.f10f76acf38ba9c7df5d6437aa8ad93732aad977.perfinion@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/tensorflow/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/tensorflow/tensorflow-1.15.0.ebuild sci-libs/tensorflow/tensorflow-2.0.0.ebuild sci-libs/tensorflow/tensorflow-2.1.0.ebuild sci-libs/tensorflow/tensorflow-2.2.0_rc2.ebuild X-VCS-Directories: sci-libs/tensorflow/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: f10f76acf38ba9c7df5d6437aa8ad93732aad977 X-VCS-Branch: master Date: Tue, 7 Apr 2020 03:17:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fa272816-020a-490d-a819-d2669c32f185 X-Archives-Hash: 4f9fabca85ba0221db6eaf7fae049fd2 commit: f10f76acf38ba9c7df5d6437aa8ad93732aad977 Author: Jason Zaman gentoo org> AuthorDate: Sun Mar 29 23:51:42 2020 +0000 Commit: Jason Zaman gentoo org> CommitDate: Tue Apr 7 03:04:48 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f10f76ac sci-libs/tensorflow: replace python_export with python_get_sitedir Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Jason Zaman gentoo.org> sci-libs/tensorflow/tensorflow-1.15.0.ebuild | 8 +++----- sci-libs/tensorflow/tensorflow-2.0.0.ebuild | 8 +++----- sci-libs/tensorflow/tensorflow-2.1.0.ebuild | 8 +++----- sci-libs/tensorflow/tensorflow-2.2.0_rc2.ebuild | 8 +++----- 4 files changed, 12 insertions(+), 20 deletions(-) diff --git a/sci-libs/tensorflow/tensorflow-1.15.0.ebuild b/sci-libs/tensorflow/tensorflow-1.15.0.ebuild index 7844e3a1a28..8190ff5d464 100644 --- a/sci-libs/tensorflow/tensorflow-1.15.0.ebuild +++ b/sci-libs/tensorflow/tensorflow-1.15.0.ebuild @@ -189,9 +189,8 @@ src_configure() { export TF_SET_ANDROID_WORKSPACE=0 if use python; then - python_export PYTHON_SITEDIR export PYTHON_BIN_PATH="${PYTHON}" - export PYTHON_LIB_PATH="${PYTHON_SITEDIR}" + export PYTHON_LIB_PATH="$(python_get_sitedir)" else export PYTHON_BIN_PATH="$(which python)" export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')" @@ -320,9 +319,8 @@ src_install() { esetup.py install # libtensorflow_framework.so is in /usr/lib already - python_export PYTHON_SITEDIR PYTHON_SCRIPTDIR - rm -f "${D}/${PYTHON_SITEDIR}"/${PN}/lib${PN}_framework.so* || die - rm -f "${D}/${PYTHON_SITEDIR}"/${PN}_core/lib${PN}_framework.so* || die + rm -f "${D}/$(python_get_sitedir)"/${PN}/lib${PN}_framework.so* || die + rm -f "${D}/$(python_get_sitedir)"/${PN}_core/lib${PN}_framework.so* || die python_optimize } diff --git a/sci-libs/tensorflow/tensorflow-2.0.0.ebuild b/sci-libs/tensorflow/tensorflow-2.0.0.ebuild index 902eac64ba8..4e04d4e51c6 100644 --- a/sci-libs/tensorflow/tensorflow-2.0.0.ebuild +++ b/sci-libs/tensorflow/tensorflow-2.0.0.ebuild @@ -188,9 +188,8 @@ src_configure() { export TF_SET_ANDROID_WORKSPACE=0 if use python; then - python_export PYTHON_SITEDIR export PYTHON_BIN_PATH="${PYTHON}" - export PYTHON_LIB_PATH="${PYTHON_SITEDIR}" + export PYTHON_LIB_PATH="$(python_get_sitedir)" else export PYTHON_BIN_PATH="$(which python)" export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')" @@ -319,9 +318,8 @@ src_install() { esetup.py install # libtensorflow_framework.so is in /usr/lib already - python_export PYTHON_SITEDIR PYTHON_SCRIPTDIR - rm -f "${D}/${PYTHON_SITEDIR}"/${PN}/lib${PN}_framework.so* || die - rm -f "${D}/${PYTHON_SITEDIR}"/${PN}_core/lib${PN}_framework.so* || die + rm -f "${D}/$(python_get_sitedir)"/${PN}/lib${PN}_framework.so* || die + rm -f "${D}/$(python_get_sitedir)"/${PN}_core/lib${PN}_framework.so* || die python_optimize } diff --git a/sci-libs/tensorflow/tensorflow-2.1.0.ebuild b/sci-libs/tensorflow/tensorflow-2.1.0.ebuild index ff79ebeaaeb..4f7b9c8ecf7 100644 --- a/sci-libs/tensorflow/tensorflow-2.1.0.ebuild +++ b/sci-libs/tensorflow/tensorflow-2.1.0.ebuild @@ -194,9 +194,8 @@ src_configure() { export TF_SET_ANDROID_WORKSPACE=0 if use python; then - python_export PYTHON_SITEDIR export PYTHON_BIN_PATH="${PYTHON}" - export PYTHON_LIB_PATH="${PYTHON_SITEDIR}" + export PYTHON_LIB_PATH="$(python_get_sitedir)" else export PYTHON_BIN_PATH="$(which python)" export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')" @@ -326,9 +325,8 @@ src_install() { esetup.py install # libtensorflow_framework.so is in /usr/lib already - python_export PYTHON_SITEDIR PYTHON_SCRIPTDIR - rm -f "${D}/${PYTHON_SITEDIR}"/${PN}/lib${PN}_framework.so* || die - rm -f "${D}/${PYTHON_SITEDIR}"/${PN}_core/lib${PN}_framework.so* || die + rm -f "${D}/$(python_get_sitedir)"/${PN}/lib${PN}_framework.so* || die + rm -f "${D}/$(python_get_sitedir)"/${PN}_core/lib${PN}_framework.so* || die python_optimize } diff --git a/sci-libs/tensorflow/tensorflow-2.2.0_rc2.ebuild b/sci-libs/tensorflow/tensorflow-2.2.0_rc2.ebuild index 019244a3ce2..c0ab709f7b9 100644 --- a/sci-libs/tensorflow/tensorflow-2.2.0_rc2.ebuild +++ b/sci-libs/tensorflow/tensorflow-2.2.0_rc2.ebuild @@ -196,9 +196,8 @@ src_configure() { export TF_SET_ANDROID_WORKSPACE=0 if use python; then - python_export PYTHON_SITEDIR export PYTHON_BIN_PATH="${PYTHON}" - export PYTHON_LIB_PATH="${PYTHON_SITEDIR}" + export PYTHON_LIB_PATH="$(python_get_sitedir)" else export PYTHON_BIN_PATH="$(which python)" export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')" @@ -327,9 +326,8 @@ src_install() { esetup.py install # libtensorflow_framework.so is in /usr/lib already - python_export PYTHON_SITEDIR PYTHON_SCRIPTDIR - rm -f "${D}/${PYTHON_SITEDIR}"/${PN}/lib${PN}_framework.so* || die - rm -f "${D}/${PYTHON_SITEDIR}"/${PN}_core/lib${PN}_framework.so* || die + rm -f "${D}/$(python_get_sitedir)"/${PN}/lib${PN}_framework.so* || die + rm -f "${D}/$(python_get_sitedir)"/${PN}_core/lib${PN}_framework.so* || die python_optimize }