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 65FF21382C5 for ; Tue, 12 Jan 2021 10:07:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70590E0898; Tue, 12 Jan 2021 10:07:45 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 58214E0898 for ; Tue, 12 Jan 2021 10:07:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 49F8D340E25 for ; Tue, 12 Jan 2021 10:07:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DD28D4C for ; Tue, 12 Jan 2021 10:07:41 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1610446060.3ada98e36e771cba1c7e4eb4833421b8f4fe745d.andrewammerlaan@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/pytorch/pytorch-1.4.0_p0-r1.ebuild sci-libs/pytorch/pytorch-1.6.0-r1.ebuild X-VCS-Directories: sci-libs/pytorch/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 3ada98e36e771cba1c7e4eb4833421b8f4fe745d X-VCS-Branch: master Date: Tue, 12 Jan 2021 10:07:41 +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: 9be03f35-5bd7-4536-b491-34c5ec36def4 X-Archives-Hash: b0716312a8e87714486e87655df0126c commit: 3ada98e36e771cba1c7e4eb4833421b8f4fe745d Author: Andrew Ammerlaan riseup net> AuthorDate: Tue Jan 12 10:07:26 2021 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Tue Jan 12 10:07:40 2021 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=3ada98e3 sci-libs/pytorch: use python_get_sitedir for install path Bug: https://github.com/gentoo/sci/issues/1039 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan riseup.net> sci-libs/pytorch/pytorch-1.4.0_p0-r1.ebuild | 4 ++-- sci-libs/pytorch/pytorch-1.6.0-r1.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sci-libs/pytorch/pytorch-1.4.0_p0-r1.ebuild b/sci-libs/pytorch/pytorch-1.4.0_p0-r1.ebuild index 8c84e7a09..7e837fad2 100644 --- a/sci-libs/pytorch/pytorch-1.4.0_p0-r1.ebuild +++ b/sci-libs/pytorch/pytorch-1.4.0_p0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -234,7 +234,7 @@ src_install() { if use python; then install_shm_manager() { - TORCH_BIN_DIR="${ED}/usr/lib64/${EPYTHON}/site-packages/torch/bin" + TORCH_BIN_DIR="${ED}$(python_get_sitedir)/torch/bin" mkdir -pv ${TORCH_BIN_DIR} cp -v "${ED}/usr/bin/torch_shm_manager" "${TORCH_BIN_DIR}" diff --git a/sci-libs/pytorch/pytorch-1.6.0-r1.ebuild b/sci-libs/pytorch/pytorch-1.6.0-r1.ebuild index 807308c4e..ac8790dab 100644 --- a/sci-libs/pytorch/pytorch-1.6.0-r1.ebuild +++ b/sci-libs/pytorch/pytorch-1.6.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -263,7 +263,7 @@ src_install() { if use python; then install_shm_manager() { - TORCH_BIN_DIR="${ED}/usr/lib64/${EPYTHON}/site-packages/torch/bin" + TORCH_BIN_DIR="${ED}$(python_get_sitedir)/torch/bin" mkdir -pv ${TORCH_BIN_DIR} cp -v "${ED}/usr/bin/torch_shm_manager" "${TORCH_BIN_DIR}"