commit:     ccd7d91795592ee578cb68b68fa258e4bfece403
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Tue Mar 26 12:21:12 2024 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Tue Mar 26 12:21:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ccd7d917

app-containers/nvidia-container-toolkit: bump to 1.14.6

Disable tests. Some tests may require specific environmental
setups or additional hardware.

Closes: https://bugs.gentoo.org/831702
Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 app-containers/nvidia-container-toolkit/Manifest    |  3 +++
 .../nvidia-container-toolkit/metadata.xml           | 21 ++++++++++++++-------
 ...build => nvidia-container-toolkit-1.14.6.ebuild} |  9 ++++++---
 .../nvidia-container-toolkit-9999.ebuild            |  9 ++++++---
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/app-containers/nvidia-container-toolkit/Manifest 
b/app-containers/nvidia-container-toolkit/Manifest
index b25852d7f4..daf23fcc6e 100644
--- a/app-containers/nvidia-container-toolkit/Manifest
+++ b/app-containers/nvidia-container-toolkit/Manifest
@@ -7,3 +7,6 @@ DIST nvidia-container-toolkit-1.13.1.tar.gz 2269989 BLAKE2B 
48cdafa390320d467133
 DIST nvidia-container-toolkit-1.13.2-deps.tar.xz 17094568 BLAKE2B 
6f728a572135c52aff9144eb693322c189837674bfb189d5666d0001d379ebcb131a2290a513a9aae76112982068e46a1a1051578f759997874a6089646a2510
 SHA512 
9c508bfa04591b408b42f80f10e78bed6964cfe72aeff66cacb2949fd41a62da2023bee571ccfa030fe33747ca77d74e53fd22f0ad241ac2a21ab41f98541ce4
 DIST nvidia-container-toolkit-1.13.2-vendor.tar.xz 1118008 BLAKE2B 
f9acaa19dbe9f196a9ba92672e0df2308453528d519ac00dd29aa462ecfde20bd095764e5ccc6af477ecc7231162ca464413342849809da8588d8f91de5c92b1
 SHA512 
f28b7c099b58dc710dab2f12b06993445b6cae50e1fb999a0ed30fbc22ef498c4a384d4e6f3f5d144d1b7a245268d46e78b9006cdccdaff5de2e2a1db5e222ea
 DIST nvidia-container-toolkit-1.13.2.tar.gz 2341404 BLAKE2B 
c5ce0d36dcc4158f13b9ec7208444478ce49c058c8cd83e27a749859a7830ee19258580e6c8faf30e58594df565b7d511d81e118145fe5aa8935725ed7ad5161
 SHA512 
0c87df23d7635d37312eb76b80e51c456a7bf23c86ac70813bbb2cb79f52ea6d7be2e69f89a5a356202fdbf1331299aa0920f7c49395130d0504a0cfdc7c9f5b
+DIST nvidia-container-toolkit-1.14.6-deps.tar.xz 19566476 BLAKE2B 
ea65427b74dd7e3281c659e3cf0926a572154e6adefb6de0532a185b7335b8e21ba540c6258bb486536f81dc308bc23da1238b02f30ed110885046edb9589ab2
 SHA512 
2e0171544296921218ba136f99d7d28dfa40b094483b244ac6c0cda54671455eaefa80cc4cdbcfaf91861eb4a4b84b3c9ffe766e04bd18d0cd9b0a897a41de7f
+DIST nvidia-container-toolkit-1.14.6-vendor.tar.xz 1131312 BLAKE2B 
1c8bdf39a1c82d40a15b7d5249335a758d9b5e61dcc90f0d30e3e4d53bb172378a6a7d2c9270e33e85664a5a9a2f4a20b32a1e71655b87efbe1fc5322764ad41
 SHA512 
d34143c54251b68f3608f30cd80994212c606d5b1423ec1ce7824101b34a86d934c5f009c4fd369e0bb99cc2509cd38407f9756f4466524c013661ee8616563e
+DIST nvidia-container-toolkit-1.14.6.tar.gz 2419037 BLAKE2B 
6d0dc186a49b2d1cb09fda3f3c4e3361e22f8891cba96cfaa14f2b70f887040b5b637125f7581159aa4a3e0f4c0542f0899e1d0708806767091a9cc34828deac
 SHA512 
710ccaf80b358c3c420cfc00d34eb9a932feff058de911b87783211a30011af01016047f9e62f055d805234d602cf3bbb2b593825fde2a6f00aa505fea7f3719

diff --git a/app-containers/nvidia-container-toolkit/metadata.xml 
b/app-containers/nvidia-container-toolkit/metadata.xml
index 5728b6aeff..553d9b5572 100644
--- a/app-containers/nvidia-container-toolkit/metadata.xml
+++ b/app-containers/nvidia-container-toolkit/metadata.xml
@@ -9,12 +9,19 @@
                <remote-id 
type="github">NVIDIA/nvidia-container-toolkit</remote-id>
        </upstream>
        <longdescription lang="en">
-       NVIDIA container runtime toolkit, build and run containers leveraging
-       NVIDIA GPUs. tl;dr: nvidia-docker is deprecated because docker now has
-       native gpu support, which this package is required to use. The NVIDIA
-       Container Toolkit (formerly known as NVIDIA Docker) allows containers to
-       access full GPU acceleration. OpenGL, OpenCL and CUDA are supported for
-       production use. Vulkan support is currently in beta. This only works for
-       Linux containers running on Linux host systems with NVIDIA GPUs.
+               NVIDIA container runtime toolkit, build and run containers 
leveraging
+               NVIDIA GPUs. tl;dr: nvidia-docker is deprecated because docker 
now has
+               native gpu support, which this package is required to use. The 
NVIDIA
+               Container Toolkit (formerly known as NVIDIA Docker) allows 
containers to
+               access full GPU acceleration. OpenGL, OpenCL and CUDA are 
supported for
+               production use. Vulkan support is currently in beta. This only 
works for
+               Linux containers running on Linux host systems with NVIDIA GPUs.
+       </longdescription>
+       <longdescription lang="zh">
+               NVIDIA容器运行时工具包,构建和运行利用NVIDIA GPU的容器。简而言之:
+               nvidia-docker已经过时,因为docker现在具有原生的GPU支持,而这个包是使用它
+               所必需的。NVIDIA容器工具包(以前称为NVIDIA Docker)允许容器访问完整的
+               GPU加速。OpenGL、OpenCL和CUDA支持生产使用。Vulkan支持目前处于测试阶段。
+               这只适用于在配备NVIDIA GPU的Linux主机系统上运行的Linux容器。
        </longdescription>
 </pkgmetadata>

diff --git 
a/app-containers/nvidia-container-toolkit/nvidia-container-toolkit-9999.ebuild 
b/app-containers/nvidia-container-toolkit/nvidia-container-toolkit-1.14.6.ebuild
similarity index 87%
copy from 
app-containers/nvidia-container-toolkit/nvidia-container-toolkit-9999.ebuild
copy to 
app-containers/nvidia-container-toolkit/nvidia-container-toolkit-1.14.6.ebuild
index d93ea64803..bfab279c8c 100644
--- 
a/app-containers/nvidia-container-toolkit/nvidia-container-toolkit-9999.ebuild
+++ 
b/app-containers/nvidia-container-toolkit/nvidia-container-toolkit-1.14.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,14 +26,17 @@ else
        "
        S="${WORKDIR}/${PN}-${PV/_rc/-rc.}"
        KEYWORDS="~amd64"
+       RESTRICT="mirror"
 fi
 
 LICENSE="Apache-2.0"
-SLOT="0"
+SLOT="0/${PV}"
 
+# Some tests may require specific environmental setups or additional hardware.
+RESTRICT="test" # Bug 831702
 
 RDEPEND="
-       sys-libs/libnvidia-container
+       sys-libs/libnvidia-container:0/${PV}
 "
 
 DEPEND="${RDEPEND}"

diff --git 
a/app-containers/nvidia-container-toolkit/nvidia-container-toolkit-9999.ebuild 
b/app-containers/nvidia-container-toolkit/nvidia-container-toolkit-9999.ebuild
index d93ea64803..bfab279c8c 100644
--- 
a/app-containers/nvidia-container-toolkit/nvidia-container-toolkit-9999.ebuild
+++ 
b/app-containers/nvidia-container-toolkit/nvidia-container-toolkit-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,14 +26,17 @@ else
        "
        S="${WORKDIR}/${PN}-${PV/_rc/-rc.}"
        KEYWORDS="~amd64"
+       RESTRICT="mirror"
 fi
 
 LICENSE="Apache-2.0"
-SLOT="0"
+SLOT="0/${PV}"
 
+# Some tests may require specific environmental setups or additional hardware.
+RESTRICT="test" # Bug 831702
 
 RDEPEND="
-       sys-libs/libnvidia-container
+       sys-libs/libnvidia-container:0/${PV}
 "
 
 DEPEND="${RDEPEND}"

Reply via email to