commit:     4fb1bccf8f7d49a5ce14afa2a1b6ff2c7a5da117
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 17:32:08 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 17:32:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fb1bccf

dev-util/nvidia-cuda-toolkit: drop 10.2.89-r4

Closes: https://bugs.gentoo.org/749903
Bug: https://bugs.gentoo.org/760708
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-util/nvidia-cuda-toolkit/Manifest              |   1 -
 dev-util/nvidia-cuda-toolkit/metadata.xml          |   1 -
 .../nvidia-cuda-toolkit-10.2.89-r4.ebuild          | 158 ---------------------
 profiles/package.mask                              |   6 -
 4 files changed, 166 deletions(-)

diff --git a/dev-util/nvidia-cuda-toolkit/Manifest 
b/dev-util/nvidia-cuda-toolkit/Manifest
index 297e4c9a4f78..1934523e51cb 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -1,4 +1,3 @@
-DIST cuda_10.2.89_440.33.01_linux.run 2645419389 BLAKE2B 
236aa70a7b45e3636c2c229fffa7d1ca0699ab4365865a73edab607a209c42c2899133dd6a83c61c5929fa754668ad15aec4d847639af1c00a8e6657c8487c77
 SHA512 
ad8da539ff5df7caf411d1e497ff3d6978cfa8a1fd9150fa4846089e92a604ea56be8631f3efdfe7229a655b8d2d28e6edb32f5731530a77d6f00241cc7aab6e
 DIST cuda_11.5.1_495.29.05_linux.run 3420998120 BLAKE2B 
0d3f9626f97c60291397ebd0edc04e2c84942473d943d95af6fae244e5809721335bb90eaa6c019c9391de516d20599ca5631e99764616b6d25eacf1899d99d9
 SHA512 
71fb354714cac09265b5102223f919e34e3a8503593dd4f2e7b9542ae7787de96d64c490276b36b685da9e691cc2704419b67cfa376dcd3647e4d0f93b02db9b
 DIST cuda_11.6.0_510.39.01_linux.run 3488951771 BLAKE2B 
f66d8b7779dc8e1e06ef5b83f1b565b6d500eb802aac1726c1393e0c0f065960761e8f6cdee955fd87362446331f7cb14febeb42efa5b89d86050e77b61b6ce9
 SHA512 
257b7b0bce1fa93cc442d8f335aec78681a3e4d457e31f04fb1cd01b91208aa35833f3793d8e2ef6d5db15e86c4d7659adb6ad127c57cbdabaa8dd14ef36a931
 DIST cuda_11.6.1_510.47.03_linux.run 3529826023 BLAKE2B 
93acd3a2984e89b1458d11051f4927e7bd2ac20bccce9166a2a4efcf16cf01a1ccbb6fa8be2f7a82ef1b5a403e4814c1e24aca493dd246c3a3c16e9107fbc1cc
 SHA512 
75c8f28bcd3de638f780b4d8c5e80cea3023fb0e57b4075bd6905071da273e9d09281d947d660f2e4ab6d71f47c12cc021f12656fd8fbf56d11cf7e520e90a9e

diff --git a/dev-util/nvidia-cuda-toolkit/metadata.xml 
b/dev-util/nvidia-cuda-toolkit/metadata.xml
index 468441600353..73fc67a96b66 100644
--- a/dev-util/nvidia-cuda-toolkit/metadata.xml
+++ b/dev-util/nvidia-cuda-toolkit/metadata.xml
@@ -7,7 +7,6 @@
        </maintainer>
        <use>
                <flag name="debugger">Install the CUDA debugger</flag>
-               <flag name="eclipse">Install Eclipse plugins</flag>
                <flag name="nsight">Install profiling and optimizing tools 
(nsight-compute, nsight-systems)</flag>
                <flag name="profiler">Install the NVIDIA CUDA profiler (nvprof) 
and the related libraries</flag>
                <flag name="sanitizer">Install compute-sanitizer tool</flag>

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r4.ebuild 
b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r4.ebuild
deleted file mode 100644
index 311eec73bdac..000000000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r4.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs toolchain-funcs unpacker
-
-MYD=$(ver_cut 1-2 ${PV})
-DRIVER_PV="440.33.01"
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone";
-SRC_URI="https://developer.download.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run";
-
-LICENSE="NVIDIA-CUDA"
-SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger doc eclipse profiler"
-RESTRICT="bindist mirror"
-
-BDEPEND=""
-RDEPEND="
-       <sys-devel/gcc-9[cxx]
-       >=x11-drivers/nvidia-drivers-${DRIVER_PV}
-       debugger? (
-               dev-libs/openssl-compat:1.0.0
-               sys-libs/libtermcap-compat
-               sys-libs/ncurses-compat:5[tinfo]
-       )
-       eclipse? (
-               dev-libs/openssl-compat:1.0.0
-               >=virtual/jre-1.8:*
-       )
-       profiler? (
-               dev-libs/openssl-compat:1.0.0
-               >=virtual/jre-1.8:*
-       )"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="6800M"
-
-pkg_setup() {
-       check-reqs_pkg_setup
-}
-
-src_prepare() {
-       local cuda_supported_gcc
-
-       # ATTENTION: change requires revbump
-       cuda_supported_gcc="6.5 7.5 8.5"
-
-       sed \
-               -e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-               "${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-
-       default
-}
-
-src_install() {
-       local i remove=( doc )
-       local cudadir=/opt/cuda
-       local ecudadir="${EPREFIX}${cudadir}"
-
-       cd builds/cuda-toolkit
-       if use doc; then
-               DOCS+=( doc/pdf/. )
-               HTML_DOCS+=( doc/html/. )
-       fi
-       einstalldocs
-
-       mv doc/man/man3/{,cuda-}deprecated.3 || die
-       doman doc/man/man*/*
-
-       use debugger || remove+=( bin/cuda-gdb bin/cuda-gdbserver 
extras/Debugger share/gdb extras/cuda-gdb-${PV}.src.tar.gz )
-
-       if use profiler; then
-               # hack found in install-linux.pl
-               for i in nvvp nsight; do
-                       cat > bin/${i} <<- EOF || die
-                               #!/usr/bin/env sh
-                               
LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-                                       UBUNTU_MENUPROXY=0 
LIBOVERLAY_SCROLLBAR=0 \
-                                       ${ecudadir}/lib${i}/${i} -vm 
${EPREFIX}/usr/bin/java
-                       EOF
-                       chmod a+x bin/${i} || die
-               done
-       else
-               use eclipse || remove+=( libnvvp libnsight nsightee_plugins 
nsight-compute-2019.5.0 nsight-systems-2019.5.2 bin/nsight 
bin/nsight_ee_plugins_manage.sh bin/nvvp bin/computeprof )
-               remove+=( extras/CUPTI bin/nvprof )
-       fi
-
-       for i in "${remove[@]}"; do
-               ebegin "Cleaning ${i}..."
-               rm -r "${i}" || die
-               eend $?
-       done
-
-       dodir ${cudadir}
-       into ${cudadir}
-
-       # Install binaries separately to make sure the X permission is set
-       local bindirs=( bin nvvm/bin extras/demo_suite  $(usex profiler 
"libnsight/nsight") )
-       for i in $(find "${bindirs[@]}" -maxdepth 1 -type f); do
-               exeinto ${cudadir}/${i%/*}
-               doexe ${i}
-               rm ${i} || die
-       done
-       exeinto ${cudadir}/bin
-       doexe "${T}"/cuda-config
-
-       # Install the rest
-       insinto ${cudadir}
-       doins -r *
-
-       cat > "${T}"/99cuda <<- EOF || die
-               PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
-               ROOTPATH=${ecudadir}/bin
-               LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
-       EOF
-       doenvd "${T}"/99cuda
-
-       #Cuda prepackages libraries, don't revdep-build on them
-       echo "SEARCH_DIRS_MASK=\"${ecudadir}\"" > "${T}/80${PN}" || die
-       insinto "/etc/revdep-rebuild"
-       doins "${T}/80${PN}"
-}
-
-pkg_postinst_check() {
-       local a b
-       a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
-       b="0.0"
-       for v in $a; do
-               if ver_test "${v}" -gt "${b}"; then
-                       b="${v}"
-               fi
-       done
-
-       # if gcc and if not gcc-version is at least greatest supported
-       if tc-is-gcc && \
-               ver_test $(gcc-version) -gt ${b}; then
-                       ewarn ""
-                       ewarn "gcc > ${b} will not work with CUDA"
-                       ewarn "Make sure you set an earlier version of gcc with 
gcc-config"
-                       ewarn "or append --compiler-bindir= pointing to a gcc 
bindir like"
-                       ewarn 
"--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
-                       ewarn "to the nvcc compiler flags"
-                       ewarn ""
-       fi
-}
-
-pkg_postinst() {
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               pkg_postinst_check
-       fi
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index d74fe01aff32..6347b5937f03 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -360,12 +360,6 @@ app-misc/emelfm2
 # Alpha version
 =app-editors/ghex-4.0.0_alpha
 
-# David Seifert <[email protected]> (2021-12-20)
-# Requires GCC 8, security vulnerabilities, switch to CUDA 11,
-# consider using clang+NVPTX backend for sm_30 cards.
-# Removal in 90 days, bug #721808, #760708.
-<dev-util/nvidia-cuda-toolkit-11
-
 # Mart Raudsepp <[email protected]> (2021-12-18)
 # GNOME 42 mask, bug #835448
 >=gui-libs/libhandy-1.5.0

Reply via email to