[gentoo-commits] repo/gentoo:master commit in: sci-libs/tensorflow/

[Guilherme Amadio]

commit:     0cdff42fddd297f60d7b47d95fcdefc0ccf66793
Author:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  2 06:50:07 2018 +0000
Commit:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Thu Aug  2 11:33:56 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cdff42f

sci-libs/tensorflow: add prefix support

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 sci-libs/tensorflow/tensorflow-1.9.0.ebuild | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sci-libs/tensorflow/tensorflow-1.9.0.ebuild 
b/sci-libs/tensorflow/tensorflow-1.9.0.ebuild
index 696d6345d09..f1842e6e36f 100644
--- a/sci-libs/tensorflow/tensorflow-1.9.0.ebuild
+++ b/sci-libs/tensorflow/tensorflow-1.9.0.ebuild
@@ -301,8 +301,8 @@ src_configure() {
                export TF_CUDA_CLANG=0
                export TF_NEED_TENSORRT=0
                if use cuda; then
-                       export CUDA_TOOLKIT_PATH="${EROOT%/}/opt/cuda"
-                       export CUDNN_INSTALL_PATH="${EROOT%/}/opt/cuda"
+                       export CUDA_TOOLKIT_PATH="${EPREFIX%/}/opt/cuda"
+                       export CUDNN_INSTALL_PATH="${EPREFIX%/}/opt/cuda"
                        export 
GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
                        export TF_NCCL_VERSION="1"
 
@@ -371,7 +371,7 @@ src_install() {
                # Symlink to the main .so file
                python_export PYTHON_SITEDIR
                rm -rf "${D}/${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" || 
die
-               dosym "../../../lib${PN}_framework.so" 
"${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" || die
+               dosym "../../../lib${PN}_framework.so" 
"${PYTHON_SITEDIR#${EPREFIX%/}}/${PN}/lib${PN}_framework.so" || die
 
                python_optimize
        }
@@ -379,12 +379,12 @@ src_install() {
        if use python; then
                python_foreach_impl run_in_build_dir do_install
 
-               rm -f "${D}"/usr/lib/python-exec/*/tensorboard || die "failed 
to remove tensorboard"
+               rm -f "${ED}"/usr/lib/python-exec/*/tensorboard || die "failed 
to remove tensorboard"
 
                # Symlink to python-exec scripts
-               for i in "${D}"/usr/lib/python-exec/*/*; do
+               for i in "${ED}"/usr/lib/python-exec/*/*; do
                        n="${i##*/}"
-                       [[ -e "${D}/usr/bin/${n}" ]] || dosym 
../lib/python-exec/python-exec2 "/usr/bin/$n"
+                       [[ -e "${ED}/usr/bin/${n}" ]] || dosym 
../lib/python-exec/python-exec2 "/usr/bin/$n"
                done
 
                python_setup
@@ -413,7 +413,7 @@ src_install() {
 
        einfo "Installing libs"
        # Generate pkg-config file
-       ${PN}/c/generate-pc.sh --prefix=/usr --libdir=$(get_libdir) 
--version=${MY_PV} || die
+       ${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) 
--version=${MY_PV} || die
        insinto /usr/$(get_libdir)/pkgconfig
        doins ${PN}.pc