[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/

[Andrew Ammerlaan]

commit:     e40e8c4d9eda3e12971749ff33163d420ea18651
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Tue Jan 12 10:13:05 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Tue Jan 12 10:13:05 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=e40e8c4d

sci-libs/pytorch: fix double EPREFIX

also add missing RESTRICT="!test? ( test )"

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 .../pytorch/{pytorch-1.4.0_p0-r1.ebuild => pytorch-1.4.0_p0-r2.ebuild} | 3 ++-
 sci-libs/pytorch/{pytorch-1.6.0-r1.ebuild => pytorch-1.6.0-r2.ebuild}  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sci-libs/pytorch/pytorch-1.4.0_p0-r1.ebuild 
b/sci-libs/pytorch/pytorch-1.4.0_p0-r2.ebuild
similarity index 98%
rename from sci-libs/pytorch/pytorch-1.4.0_p0-r1.ebuild
rename to sci-libs/pytorch/pytorch-1.4.0_p0-r2.ebuild
index 7e837fad2..15ebe667d 100644
--- a/sci-libs/pytorch/pytorch-1.4.0_p0-r1.ebuild
+++ b/sci-libs/pytorch/pytorch-1.4.0_p0-r2.ebuild
@@ -40,6 +40,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 IUSE="asan atlas cuda eigen +fbgemm ffmpeg gflags glog +gloo leveldb lmdb mkl 
mkldnn mpi namedtensor +nnpack numa +numpy +observers +openblas opencl opencv 
+openmp +python +qnnpack redis static tbb test tools zeromq"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
        python? ( ${PYTHON_REQUIRED_USE} )
@@ -234,7 +235,7 @@ src_install() {
 
        if use python; then
                install_shm_manager() {
-                       TORCH_BIN_DIR="${ED}$(python_get_sitedir)/torch/bin"
+                       TORCH_BIN_DIR="${D}$(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-r2.ebuild
similarity index 99%
rename from sci-libs/pytorch/pytorch-1.6.0-r1.ebuild
rename to sci-libs/pytorch/pytorch-1.6.0-r2.ebuild
index ac8790dab..c3ec2c99d 100644
--- a/sci-libs/pytorch/pytorch-1.6.0-r1.ebuild
+++ b/sci-libs/pytorch/pytorch-1.6.0-r2.ebuild
@@ -62,6 +62,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 IUSE="asan atlas cuda eigen +fbgemm ffmpeg gflags glog +gloo leveldb lmdb mkl 
mkldnn mpi namedtensor +nnpack numa +numpy +observers +openblas opencl opencv 
+openmp +python +qnnpack redis static test tools zeromq"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
        python? ( ${PYTHON_REQUIRED_USE} )
@@ -263,7 +264,7 @@ src_install() {
 
        if use python; then
                install_shm_manager() {
-                       TORCH_BIN_DIR="${ED}$(python_get_sitedir)/torch/bin"
+                       TORCH_BIN_DIR="${D}$(python_get_sitedir)/torch/bin"
 
                        mkdir -pv ${TORCH_BIN_DIR}
                        cp -v "${ED}/usr/bin/torch_shm_manager" 
"${TORCH_BIN_DIR}"