public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/, dev-util/nvidia-cuda-toolkit/files/, ...
@ 2013-08-12 21:28 Sebastien Fabbro
  0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro @ 2013-08-12 21:28 UTC (permalink / raw
  To: gentoo-commits

commit:     9b1e60ca40ea60b6955bfad6edb1732f998189e0
Author:     Andreas Schäfer <gentryx <AT> gmx <DOT> de>
AuthorDate: Mon Aug 12 12:25:45 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 12:25:45 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9b1e60ca

removing packages as they've been superseded by the trunk

---
 dev-util/nvidia-cuda-toolkit/files/cuda-config.in  |  28 --
 .../nvidia-cuda-toolkit-5.5.22.ebuild              | 134 ------
 .../nvidia-drivers/files/95-nvidia-settings        |   2 -
 x11-drivers/nvidia-drivers/files/nvidia-169.07     |  14 -
 x11-drivers/nvidia-drivers/files/nvidia-smi.init   |  25 --
 x11-drivers/nvidia-drivers/files/nvidia-udev.sh    |  17 -
 x11-drivers/nvidia-drivers/files/nvidia.udev-rule  |   6 -
 .../nvidia-drivers/nvidia-drivers-325.15.ebuild    | 466 ---------------------
 8 files changed, 692 deletions(-)

diff --git a/dev-util/nvidia-cuda-toolkit/files/cuda-config.in b/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
deleted file mode 100644
index ca0d1d7..0000000
--- a/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-SUPPORT_GCC_VERSIONS_BY_CUDA="CUDA_SUPPORTED_GCC"
-
-_print_help() {
-	cat <<- EOF
-	Usage:
-		$(basename $0) [options]
-	
-		-s | --supported   Returns by current CUDA supported gcc versions
-		-h | --help        Shows this help
-	EOF
-}
-
-case ${1} in
-	-s|--supported)
-		echo "${SUPPORT_GCC_VERSIONS_BY_CUDA}"
-		exit 0
-		;;
-	-h|--help)
-		_print_help
-		exit -1
-		;;
-	*)
-		_print_help
-		exit 1
-		;;
-esac

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild
deleted file mode 100644
index 7e261d5..0000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r4.ebuild,v 1.1 2013/04/20 15:04:03 zerochaos Exp $
-
-EAPI=5
-
-inherit cuda unpacker versionator
-
-MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="http://developer.nvidia.com/cuda"
-CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/installers/"
-SRC_URI=""
-SRC_URI="
-	amd64? ( ${CURI}/cuda_${PV}_linux_64.run )
-	x86? ( ${CURI}/cuda_${PV}_linux_32.run )"
-
-SLOT="0/${PV}"
-LICENSE="NVIDIA-r1"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debugger doc eclipse profiler"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	sys-devel/gcc:4.6[cxx]
-	!<=x11-drivers/nvidia-drivers-270.41
-	debugger? (
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses[tinfo]
-		)
-	eclipse? ( >=virtual/jre-1.6 )
-	profiler? ( >=virtual/jre-1.6 )"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	:
-}
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda*run
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	cuda_supported_gcc="4.6"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-
-}
-
-src_install() {
-	local i j
-	local remove="doc jre run_files install-linux.pl "
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}"${cudadir}
-
-	# dodoc doc/*txt
-	if use doc; then
-		dodoc doc/pdf/*
-		dohtml -r doc/html/*
-	fi
-
-	use debugger || remove+=" bin/cuda-gdb extras/Debugger"
-	( use profiler || use eclipse ) || remove+=" libnsight"
-	use amd64 || remove+=" cuda-installer.pl"
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for j in nvvp nsight; do
-			cat > bin/${j} <<- EOF
-				#!${EPREFIX}/bin/sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${j}/${j} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${j}
-		done
-	else
-		use eclipse || remove+=" libnvvp"
-		remove+=" extras/CUPTI"
-	fi
-
-	for i in ${remove}; do
-	ebegin "Cleaning ${i}..."
-		if [[ -e ${i} ]]; then
-			find ${i} -delete || die
-			eend
-		else
-			eend $1
-		fi
-	done
-
-	dodir ${cudadir}
-	mv * "${ED}"${cudadir}
-
-	cat > "${T}"/99cuda <<- EOF
-		PATH=${ecudadir}/bin:${ecudadir}/libnvvp
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
-	EOF
-	doenvd "${T}"/99cuda
-
-	make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
-
-	dobin "${T}"/cuda-config
-}
-
-pkg_postinst() {
-	local a b
-	a="$(version_sort $(cuda-config -s))"; a=( $a )
-	# greatest supported version
-	b=${a[${#a[@]}-1]}
-
-	# if gcc and if not gcc-version is at least greatesst supported
-	if [[ $(tc-getCC) == *gcc* ]] && \
-		! version_is_at_least $(gcc-version) ${b}; then
-			echo
-			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"
-			echo
-	fi
-}

diff --git a/x11-drivers/nvidia-drivers/files/95-nvidia-settings b/x11-drivers/nvidia-drivers/files/95-nvidia-settings
deleted file mode 100644
index e9d6274..0000000
--- a/x11-drivers/nvidia-drivers/files/95-nvidia-settings
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/opt/bin/nvidia-settings --load-config-only

diff --git a/x11-drivers/nvidia-drivers/files/nvidia-169.07 b/x11-drivers/nvidia-drivers/files/nvidia-169.07
deleted file mode 100644
index a96b0cd..0000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-169.07
+++ /dev/null
@@ -1,14 +0,0 @@
-# Nvidia drivers support
-alias char-major-195 nvidia
-alias /dev/nvidiactl char-major-195
-
-# To tweak the driver the following options can be used, note that
-# you should be careful, as it could cause instability!! For more 
-# options see /usr/share/doc/PACKAGE/README 
-#
-# !!! SECURITY WARNING !!!
-# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW
-# WHAT YOU ARE DOING.
-# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH,
-# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE.
-options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1

diff --git a/x11-drivers/nvidia-drivers/files/nvidia-smi.init b/x11-drivers/nvidia-drivers/files/nvidia-smi.init
deleted file mode 100644
index 71bbc6d..0000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-smi.init
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/nvidia-smi.init,v 1.2 2013/05/09 16:32:00 jer Exp $
-
-pidfile="/run/nvidia-smi.pid"
-
-depend() {
-    after modules
-}
-
-start() {
-	ebegin "Starting NVIDIA System Management Interface"
-	rm -f ${pidfile}
-	start-stop-daemon --start --quiet --pidfile ${pidfile} \
-		--make-pidfile --background --exec /opt/bin/nvidia-smi -- \
-		-q -l 300
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping NVIDIA System Management Interface"
-	start-stop-daemon --stop --quiet --pidfile ${pidfile}
-	eend $?
-}

diff --git a/x11-drivers/nvidia-drivers/files/nvidia-udev.sh b/x11-drivers/nvidia-drivers/files/nvidia-udev.sh
deleted file mode 100644
index 9487b08..0000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-udev.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-if [ $# -ne 1 ]; then
-	echo "Invalid args" >&2
-	exit 1
-fi
-
-case $1 in
-	add|ADD)
-		/opt/bin/nvidia-smi > /dev/null
-		;;
-	remove|REMOVE)
-		rm -f /dev/nvidia*
-		;;
-esac
-
-exit 0

diff --git a/x11-drivers/nvidia-drivers/files/nvidia.udev-rule b/x11-drivers/nvidia-drivers/files/nvidia.udev-rule
deleted file mode 100644
index 2eb30bb..0000000
--- a/x11-drivers/nvidia-drivers/files/nvidia.udev-rule
+++ /dev/null
@@ -1,6 +0,0 @@
-ACTION=="add", DEVPATH=="/module/nvidia", SUBSYSTEM=="module", RUN+="nvidia-udev.sh $env{ACTION}"
-# Previously the ACTION was "add|remove" but one user on bug #376527 had a
-# problem until he recompiled udev-171-r5, which is one of the versions I
-# tested with and it was fine. I'm breaking the rules out just to be safe
-# so someone else doesn't have an issue
-ACTION=="remove", DEVPATH=="/module/nvidia", SUBSYSTEM=="module", RUN+="nvidia-udev.sh $env{ACTION}"

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-325.15.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-325.15.ebuild
deleted file mode 100644
index 1281979..0000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-325.15.ebuild
+++ /dev/null
@@ -1,466 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-325.08.ebuild,v 1.2 2013/07/22 13:52:21 jer Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user udev
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA X11 driver and GLX libraries"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="GPL-2 NVIDIA-r1"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-COMMON="
-	app-admin/eselect-opencl
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	X? (
-		>=app-admin/eselect-opengl-1.0.9
-	)
-"
-DEPEND="
-	${COMMON}
-	app-arch/xz-utils
-	kernel_linux? ( virtual/linux-sources )
-"
-RDEPEND="
-	${COMMON}
-	acpi? ( sys-power/acpid )
-	tools? (
-		dev-libs/atk
-		dev-libs/glib
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/pango[X]
-	)
-	X? (
-		<x11-base/xorg-server-1.14.99
-		>=x11-libs/libvdpau-0.3-r1
-		multilib? (
-			|| (
-				 (
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-				 )
-				app-emulation/emul-linux-x86-xlibs
-			)
-		)
-	)
-"
-
-REQUIRED_USE="tools? ( X )"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-
-	if use amd64 && has_multilib_profile && \
-		[ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default ABI"
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-
-	if use kernel_linux && kernel_is ge 3 10 ; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-3.10"
-		ewarn "<sys-kernel/vanilla-sources-3.10"
-		ewarn ""
-		ewarn "You are free to utilize epatch_user to provide whatever"
-		ewarn "support you feel is appropriate, but will not receive"
-		ewarn "support as a result of those changes."
-		ewarn ""
-		ewarn "Do not file a bug report about this."
-	fi
-
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# Kernel features/options to check for
-	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
-	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use kernel_linux; then
-		linux-mod_pkg_setup
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_unpack() {
-	if ! use kernel_FreeBSD; then
-		cd "${S}"
-		unpack_makeself
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	if use kernel_linux; then
-		if kernel_is lt 2 6 9 ; then
-			eerror "You must build this against 2.6.9 or higher kernels."
-		fi
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-#		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-
-	if use pax_kernel; then
-		ewarn "Using PAX patches is not supported. You will be asked to"
-		ewarn "use a standard kernel should you have issues. Should you"
-		ewarn "need support with these patches, contact the PaX team."
-		epatch "${FILESDIR}"/nvidia-drivers-pax-const.patch
-		epatch "${FILESDIR}"/nvidia-drivers-pax-usercopy.patch
-	fi
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use kernel_linux; then
-		linux-mod_src_compile
-	fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if its not /usr/lib
-donvidia() {
-	# Full path to library minus SOVER
-	MY_LIB="$1"
-
-	# SOVER to use
-	MY_SOVER="$2"
-
-	# Where to install
-	MY_DEST="$3"
-
-	if [[ -z "${MY_DEST}" ]]; then
-		MY_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	else
-		exeinto ${MY_DEST}
-		action="doexe"
-	fi
-
-	# Get just the library name
-	libname=$(basename $1)
-
-	# Install the library with the correct SOVER
-	${action} ${MY_LIB}.${MY_SOVER} || \
-		die "failed to install ${libname}"
-
-	# If SOVER wasn't 1, then we need to create a .1 symlink
-	if [[ "${MY_SOVER}" != "1" ]]; then
-		dosym ${libname}.${MY_SOVER} \
-			${MY_DEST}/${libname}.1 || \
-			die "failed to create ${libname} symlink"
-	fi
-
-	# Always create the symlink from the raw lib to the .1
-	dosym ${libname}.1 \
-		${MY_DEST}/${libname} || \
-		die "failed to create ${libname} symlink"
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-
-		VIDEOGROUP="$(egetent group video | cut -d ':' -f 3)"
-		if [ -z "$VIDEOGROUP" ]; then
-			eerror "Failed to determine the video group gid."
-			die "Failed to determine the video group gid."
-		fi
-
-		# Add the aliases
-		[ -f "${FILESDIR}/nvidia-169.07" ] || die "nvidia missing in FILESDIR"
-		sed -e 's:PACKAGE:'${PF}':g' \
-			-e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-169.07 > \
-			"${WORKDIR}"/nvidia
-		insinto /etc/modprobe.d
-		newins "${WORKDIR}"/nvidia nvidia.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(udev_get_udevdir)"
-		doexe "${FILESDIR}"/nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
-			/usr/$(get_libdir)/opengl/nvidia/extensions
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins ${NV_OBJ}/nvidia.icd
-	fi
-
-	# Documentation
-	dohtml ${NV_DOC}/html/*
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1"
-		use tools && doman "${NV_MAN}/nvidia-settings.1"
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}/nvidia-smi.1.gz"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
-		use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
-		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
-	fi
-
-	# Helper Apps
-	exeinto /opt/bin/
-
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-	fi
-
-	if use kernel_linux ; then
-		doexe ${NV_OBJ}/nvidia-cuda-mps-control
-		doexe ${NV_OBJ}/nvidia-cuda-mps-server
-		doexe ${NV_OBJ}/nvidia-debugdump
-		doexe ${NV_OBJ}/nvidia-modprobe
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-		doman nvidia-cuda-mps-control.1.gz
-		doman nvidia-modprobe.1.gz
-		doman nvidia-persistenced.1.gz
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-	fi
-
-	if use tools; then
-		doexe ${NV_OBJ}/nvidia-settings
-	fi
-
-	exeinto /usr/bin/
-	doexe ${NV_OBJ}/nvidia-bug-report.sh
-
-	# Desktop entries for nvidia-settings
-	if use tools ; then
-		# There is no icon in the FreeBSD tarball.
-		use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png nvidia-drivers-settings.png
-		domenu "${FILESDIR}"/nvidia-drivers-settings.desktop
-		exeinto /etc/X11/xinit/xinitrc.d
-		doexe "${FILESDIR}"/95-nvidia-settings
-	fi
-
-	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
-
-	if has_multilib_profile && use multilib ; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis) ; do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local libdir=${NV_OBJ}
-
-	if use kernel_linux && has_multilib_profile && \
-			[[ ${ABI} == "x86" ]] ; then
-		libdir=${NV_OBJ}/32
-	fi
-
-	if use X; then
-		# The GLX libraries
-		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
-		if use kernel_FreeBSD; then
-			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
-		else
-			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
-		fi
-
-		# VDPAU
-		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
-	fi
-
-	# NVIDIA monitoring library
-	if use kernel_linux ; then
-		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
-	fi
-
-	# CUDA & OpenCL
-	if use kernel_linux; then
-		donvidia ${libdir}/libcuda.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
-		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
-		donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
-	fi
-}
-
-pkg_preinst() {
-	use kernel_linux && linux-mod_pkg_preinst
-
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	# Switch to the nvidia implementation
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-	elog "This ebuild installs a kernel module and X driver. Both must"
-	elog "match explicitly in their version. This means, if you restart"
-	elog "X, you must modprobe -r nvidia before starting it back up"
-	elog
-	elog "To use the NVIDIA GLX, run \"eselect opengl set nvidia\""
-	elog
-	elog "To use the NVIDIA CUDA/OpenCL, run \"eselect opencl set nvidia\""
-	elog
-	elog "NVIDIA has requested that any bug reports submitted have the"
-	elog "output of nvidia-bug-report.sh included."
-	elog
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-	if ! use tools; then
-		elog "USE=tools controls whether the nvidia-settings application"
-		elog "is installed. If you would like to use it, enable that"
-		elog "flag and re-emerge this ebuild. Optionally you can install"
-		elog "media-video/nvidia-settings"
-		elog
-	fi
-}
-
-pkg_prerm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/, dev-util/nvidia-cuda-toolkit/files/, ...
@ 2015-05-18 13:05 Justin Lecher
  0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2015-05-18 13:05 UTC (permalink / raw
  To: gentoo-commits

commit:     7bf2762a5aa4a1806ee96a6a3e08f3877f11cddd
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Tue May 12 11:56:50 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue May 12 11:56:50 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=7bf2762a

Move to tree

 dev-util/nvidia-cuda-sdk/ChangeLog                 |  14 --
 dev-util/nvidia-cuda-sdk/metadata.xml              |  17 ---
 .../nvidia-cuda-sdk/nvidia-cuda-sdk-7.0.18.ebuild  | 151 --------------------
 .../nvidia-cuda-sdk/nvidia-cuda-sdk-7.0.28.ebuild  | 144 -------------------
 dev-util/nvidia-cuda-toolkit/ChangeLog             |  21 ---
 dev-util/nvidia-cuda-toolkit/files/cuda-config.in  |  28 ----
 dev-util/nvidia-cuda-toolkit/metadata.xml          |  18 ---
 .../nvidia-cuda-toolkit-7.0.18-r1.ebuild           | 154 ---------------------
 .../nvidia-cuda-toolkit-7.0.28.ebuild              | 143 -------------------
 9 files changed, 690 deletions(-)

diff --git a/dev-util/nvidia-cuda-sdk/ChangeLog b/dev-util/nvidia-cuda-sdk/ChangeLog
deleted file mode 100644
index 6c6af0f..0000000
--- a/dev-util/nvidia-cuda-sdk/ChangeLog
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*nvidia-cuda-sdk-7.0.28 (19 Mar 2015)
-
-  19 Mar 2015; Marius Brehler <marbre@linux.sungazer.de>
-  +nvidia-cuda-sdk-7.0.28.ebuild:
-  Version bump
-
-*nvidia-cuda-sdk-7.0.18 (14 Jan 2015)
-
-  14 Jan 2015; Marius Brehler <marbre@linux.sungazer.de> +metadata.xml,
-  +nvidia-cuda-sdk-7.0.18.ebuild:
-  Add version 7.0.18 (release candidate)

diff --git a/dev-util/nvidia-cuda-sdk/metadata.xml b/dev-util/nvidia-cuda-sdk/metadata.xml
deleted file mode 100644
index 288e495..0000000
--- a/dev-util/nvidia-cuda-sdk/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci</herd>
-  <maintainer>
-    <email>jlec@gentoo.org</email>
-    <name>Justin Lecher</name>
-  </maintainer>
-  <use>
-    <flag name="opencl">
-			Build OpenCL binaries.
-		</flag>
-    <flag name="cuda">
-			Build CUDA binaries.
-		</flag>
-  </use>
-</pkgmetadata>

diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.0.18.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.0.18.ebuild
deleted file mode 100644
index cfc9f99..0000000
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.0.18.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit cuda eutils flag-o-matic portability toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="http://developer.nvidia.com/cuda"
-CURI="https://developer.nvidia.com/rdp/cuda-70-rc-downloads"
-SRC_URI="cuda_${PV}_rc_linux.run"
-
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="debug +doc +examples opencl +cuda"
-
-RDEPEND="
-	~dev-util/nvidia-cuda-toolkit-${PV}
-	media-libs/freeglut
-	examples? (
-		media-libs/freeimage
-		media-libs/glew
-		virtual/mpi
-		>=x11-drivers/nvidia-drivers-346.35[uvm]
-		)"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test fetch"
-
-pkg_nofetch() {
-	einfo "Please download the Fedora 21 \"Runfile Installer\""
-	einfo "  - cuda_${P}_rc_linux.run"
-	einfo "from ${CURI} and place it in ${DISTDIR}"
-}
-
-S=${WORKDIR}/cuda-samples
-
-QA_EXECSTACK=(
-	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
-	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
-	)
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-samples*run
-}
-
-pkg_setup() {
-	if use cuda || use opencl; then
-		cuda_pkg_setup
-	fi
-}
-
-src_prepare() {
-	export RAWLDFLAGS="$(raw-ldflags)"
-#	epatch "${FILESDIR}"/${P}-asneeded.patch
-
-	sed \
-		-e 's:-O2::g' \
-		-e 's:-O3::g' \
-		-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
-		-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
-		-e "/CC/s:gcc:$(tc-getCC):g" \
-		-e "/GCC/s:g++:$(tc-getCXX):g" \
-		-e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
-		-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
-		-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
-		-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
-		-e 's:-Wimplicit::g' \
-		-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
-		-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$(pkg-config --libs glew)|g" \
-		-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
-		-i $(find . -type f -name "Makefile") || die
-
-#		-e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
-	find common/inc/GL -delete || die
-	find . -type f -name "*\.a" -delete || die
-}
-
-src_compile() {
-	use examples || return
-	local myopts verbose="verbose=1"
-	use debug && myopts+=" dbg=1"
-	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
-	emake \
-		cuda-install="${EPREFIX}/opt/cuda" \
-		CUDA_PATH="${EPREFIX}/opt/cuda/" \
-		MPI_GCC=10 \
-		${myopts} ${verbose}
-}
-
-src_test() {
-	local _dir _subdir
-
-	addwrite /dev/nvidiactl
-	addwrite /dev/nvidia0
-
-	for _dir in {0..9}*; do
-		pushd ${_dir} > /dev/null
-		for _subdir in *; do
-			emake -C ${_subdir} run
-		done
-		popd > /dev/null
-	done
-}
-
-src_install() {
-	local i j f t crap=""
-
-	if use doc; then
-		ebegin "Installing docs ..."
-			treecopy $(find -type f \( -name readme.txt -o -name "*.pdf" \)) "${ED}"/usr/share/doc/${PF}/
-			docompress -x $(find "${ED}"/usr/share/doc/${PF}/ -type f -name readme.txt | sed -e "s:${ED}::")
-		eend
-	fi
-
-	crap+=" *.txt Samples.htm*"
-
-	ebegin "Cleaning before installation..."
-		for i in ${crap}; do
-			if [[ -e ${i} ]]; then
-				find ${i} -delete || die
-			fi
-		done
-		find -type f \( -name "*.o" -o -name "*.pdf" -o -name "readme.txt" \) -delete || die
-	eend
-
-	ebegin "Moving files..."
-		for f in $(find .); do
-			local t="$(dirname ${f})"
-			if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
-				continue
-			fi
-			if [[ ! -d ${f} ]]; then
-				if [[ -x ${f} ]]; then
-					exeinto /opt/cuda/sdk/${t}
-					doexe ${f}
-				else
-					insinto /opt/cuda/sdk/${t}
-					doins ${f}
-				fi
-			fi
-	done
-	eend
-}

diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.0.28.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.0.28.ebuild
deleted file mode 100644
index cacb7e8..0000000
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.0.28.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit cuda eutils flag-o-matic portability toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="https://developer.nvidia.com/cuda-downloads"
-SRC_URI="http://developer.download.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_linux.run"
-
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="debug +doc +examples opencl +cuda"
-
-RDEPEND="
-	~dev-util/nvidia-cuda-toolkit-${PV}
-	media-libs/freeglut
-	examples? (
-		media-libs/freeimage
-		media-libs/glew
-		virtual/mpi
-		>=x11-drivers/nvidia-drivers-346.35[uvm]
-		)"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/samples
-
-QA_EXECSTACK=(
-	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
-	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
-	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
-	)
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-samples*run
-}
-
-pkg_setup() {
-	if use cuda || use opencl; then
-		cuda_pkg_setup
-	fi
-}
-
-src_prepare() {
-	export RAWLDFLAGS="$(raw-ldflags)"
-#	epatch "${FILESDIR}"/${P}-asneeded.patch
-
-	sed \
-		-e 's:-O2::g' \
-		-e 's:-O3::g' \
-		-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
-		-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
-		-e "/CC/s:gcc:$(tc-getCC):g" \
-		-e "/GCC/s:g++:$(tc-getCXX):g" \
-		-e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
-		-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
-		-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
-		-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
-		-e 's:-Wimplicit::g' \
-		-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
-		-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$(pkg-config --libs glew)|g" \
-		-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
-		-i $(find . -type f -name "Makefile") || die
-
-#		-e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
-	find common/inc/GL -delete || die
-	find . -type f -name "*\.a" -delete || die
-}
-
-src_compile() {
-	use examples || return
-	local myopts verbose="verbose=1"
-	use debug && myopts+=" dbg=1"
-	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
-	emake \
-		cuda-install="${EPREFIX}/opt/cuda" \
-		CUDA_PATH="${EPREFIX}/opt/cuda/" \
-		MPI_GCC=10 \
-		${myopts} ${verbose}
-}
-
-src_test() {
-	local _dir _subdir
-
-	addwrite /dev/nvidiactl
-	addwrite /dev/nvidia0
-
-	for _dir in {0..9}*; do
-		pushd ${_dir} > /dev/null
-		for _subdir in *; do
-			emake -C ${_subdir} run
-		done
-		popd > /dev/null
-	done
-}
-
-src_install() {
-	local i j f t crap=""
-
-	if use doc; then
-		ebegin "Installing docs ..."
-			treecopy $(find -type f \( -name readme.txt -o -name "*.pdf" \)) "${ED}"/usr/share/doc/${PF}/
-			docompress -x $(find "${ED}"/usr/share/doc/${PF}/ -type f -name readme.txt | sed -e "s:${ED}::")
-		eend
-	fi
-
-	crap+=" *.txt Samples.htm*"
-
-	ebegin "Cleaning before installation..."
-		for i in ${crap}; do
-			if [[ -e ${i} ]]; then
-				find ${i} -delete || die
-			fi
-		done
-		find -type f \( -name "*.o" -o -name "*.pdf" -o -name "readme.txt" \) -delete || die
-	eend
-
-	ebegin "Moving files..."
-		for f in $(find .); do
-			local t="$(dirname ${f})"
-			if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
-				continue
-			fi
-			if [[ ! -d ${f} ]]; then
-				if [[ -x ${f} ]]; then
-					exeinto /opt/cuda/sdk/${t}
-					doexe ${f}
-				else
-					insinto /opt/cuda/sdk/${t}
-					doins ${f}
-				fi
-			fi
-	done
-	eend
-}

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
deleted file mode 100644
index c079b7e..0000000
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*nvidia-cuda-toolkit-7.0.28 (19 Mar 2015)
-
-  19 Mar 2015; Marius Brehler <marbre@linux.sungazer.de>
-  +nvidia-cuda-toolkit-7.0.28.ebuild:
-  Version bump
-
-*nvidia-cuda-toolkit-7.0.18-r1 (19 Feb 2015)
-
-  19 Feb 2015; Justin Lecher <jlec@gentoo.org>
-  +nvidia-cuda-toolkit-7.0.18-r1.ebuild, -nvidia-cuda-toolkit-7.0.18.ebuild:
-  dev-util/nvidia-cuda-toolkit: Create convinience symlink lib32 -> lib
-
-*nvidia-cuda-sdk-7.0.18 (14 Jan 2015)
-
-  14 Jan 2014; Marius Brehler <marbre@linux.sungazer.de> +files/cuda-config.in,
-  +metadata.xml, +nvidia-cuda-toolkit-7.0.18.ebuild:
-  Add version 7.0.18 (release candidate)
-  

diff --git a/dev-util/nvidia-cuda-toolkit/files/cuda-config.in b/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
deleted file mode 100644
index ca0d1d7..0000000
--- a/dev-util/nvidia-cuda-toolkit/files/cuda-config.in
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-SUPPORT_GCC_VERSIONS_BY_CUDA="CUDA_SUPPORTED_GCC"
-
-_print_help() {
-	cat <<- EOF
-	Usage:
-		$(basename $0) [options]
-	
-		-s | --supported   Returns by current CUDA supported gcc versions
-		-h | --help        Shows this help
-	EOF
-}
-
-case ${1} in
-	-s|--supported)
-		echo "${SUPPORT_GCC_VERSIONS_BY_CUDA}"
-		exit 0
-		;;
-	-h|--help)
-		_print_help
-		exit -1
-		;;
-	*)
-		_print_help
-		exit 1
-		;;
-esac

diff --git a/dev-util/nvidia-cuda-toolkit/metadata.xml b/dev-util/nvidia-cuda-toolkit/metadata.xml
deleted file mode 100644
index 5e09419..0000000
--- a/dev-util/nvidia-cuda-toolkit/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci</herd>
-  <maintainer>
-    <email>jlec@gentoo.org</email>
-    <name>Justin Lecher</name>
-  </maintainer>
-  <use>
-    <flag name="profiler">
-			Installs the NVIDIA CUDA visual profiler.
-		</flag>
-    <flag name="debugger">
-			Installs the CUDA debugger.
-		</flag>
-    <flag name="eclipse">Install the <pkg>dev-util/eclipse-sdk</pkg> plugins</flag>
-  </use>
-</pkgmetadata>

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.18-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.18-r1.ebuild
deleted file mode 100644
index 69df15f..0000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.18-r1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit check-reqs cuda unpacker versionator
-
-MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="http://developer.nvidia.com/cuda"
-CURI="https://developer.nvidia.com/rdp/cuda-70-rc-downloads"
-SRC_URI="cuda_${PV}_rc_linux.run"
-
-SLOT="0/${PV}"
-LICENSE="NVIDIA-CUDA"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger doc eclipse profiler"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=sys-devel/gcc-4.7[cxx]
-	>=x11-drivers/nvidia-drivers-346.35[uvm]
-	debugger? (
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses[tinfo]
-		)
-	eclipse? ( >=virtual/jre-1.6 )
-	profiler? ( >=virtual/jre-1.6 )"
-
-RESTRICT="fetch"
-
-pkg_nofetch() {
-	einfo "Please download the Fedora 21 \"Runfile Installer\""
-	einfo "  - cuda_${P}_rc_linux.run"
-	einfo "from ${CURI} and place it in ${DISTDIR}"
-}
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="1500M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-linux*.run
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	cuda_supported_gcc="4.7 4.8 4.9"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-}
-
-src_install() {
-	local i j
-	local remove="doc jre run_files install-linux.pl "
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}"${cudadir}
-
-	# dodoc doc/*txt
-	if use doc; then
-		dodoc doc/pdf/*
-		dohtml -r doc/html/*
-	fi
-
-	if use amd64; then
-		mv doc/man/man3/{,cuda-}deprecated.3 || die
-		doman doc/man/man*/*
-	fi
-
-	use debugger || remove+=" bin/cuda-gdb extras/Debugger"
-	( use profiler || use eclipse ) || remove+=" libnsight"
-	use amd64 || remove+=" cuda-installer.pl"
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for j in nvvp nsight; do
-			cat > bin/${j} <<- EOF
-				#!${EPREFIX}/bin/sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${j}/${j} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${j}
-		done
-	else
-		use eclipse || remove+=" libnvvp"
-		remove+=" extras/CUPTI"
-	fi
-
-	for i in ${remove}; do
-	ebegin "Cleaning ${i}..."
-		if [[ -e ${i} ]]; then
-			find ${i} -delete || die
-			eend
-		else
-			eend $1
-		fi
-	done
-
-	ln -sf lib lib32 || die
-
-	dodir ${cudadir}
-	mv * "${ED}"${cudadir} || die
-
-	cat > "${T}"/99cuda <<- EOF
-		PATH=${ecudadir}/bin$(use profiler && echo ":${ecudadir}/libnvvp")
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
-	EOF
-	doenvd "${T}"/99cuda
-
-	use profiler && \
-		make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
-
-	dobin "${T}"/cuda-config
-}
-
-pkg_postinst_check() {
-	local a b
-	a="$(version_sort $(cuda-config -s))"; a=( $a )
-	# greatest supported version
-	b=${a[${#a[@]}-1]}
-
-	# if gcc and if not gcc-version is at least greatesst supported
-	if [[ $(tc-getCC) == *gcc* ]] && \
-		! version_is_at_least $(gcc-version) ${b}; then
-			echo
-			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"
-			echo
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-}

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.28.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.28.ebuild
deleted file mode 100644
index 955d8a5..0000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.28.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit check-reqs cuda unpacker versionator
-
-MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
-
-DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
-HOMEPAGE="http://developer.nvidia.com/cuda"
-SRC_URI="http://developer.download.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_linux.run"
-
-SLOT="0/${PV}"
-LICENSE="NVIDIA-CUDA"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger doc eclipse profiler"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=sys-devel/gcc-4.7[cxx]
-	>=x11-drivers/nvidia-drivers-346.35[uvm]
-	debugger? (
-		sys-libs/libtermcap-compat
-		sys-libs/ncurses[tinfo]
-		)
-	eclipse? ( >=virtual/jre-1.6 )
-	profiler? ( >=virtual/jre-1.6 )"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/cuda/*"
-
-CHECKREQS_DISK_BUILD="1500M"
-
-pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-linux*.run
-}
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	cuda_supported_gcc="4.7 4.8 4.9"
-
-	sed \
-		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
-		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
-}
-
-src_install() {
-	local i j
-	local remove="doc jre run_files install-linux.pl "
-	local cudadir=/opt/cuda
-	local ecudadir="${EPREFIX}"${cudadir}
-
-	# dodoc doc/*txt
-	if use doc; then
-		dodoc doc/pdf/*
-		dohtml -r doc/html/*
-	fi
-
-	mv doc/man/man3/{,cuda-}deprecated.3 || die
-	doman doc/man/man*/*
-
-	use debugger || remove+=" bin/cuda-gdb extras/Debugger"
-	( use profiler || use eclipse ) || remove+=" libnsight"
-	remove+=" cuda-installer.pl"
-
-	if use profiler; then
-		# hack found in install-linux.pl
-		for j in nvvp nsight; do
-			cat > bin/${j} <<- EOF
-				#!${EPREFIX}/bin/sh
-				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
-					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
-					${ecudadir}/lib${j}/${j} -vm ${EPREFIX}/usr/bin/java
-			EOF
-			chmod a+x bin/${j}
-		done
-	else
-		use eclipse || remove+=" libnvvp"
-		remove+=" extras/CUPTI"
-	fi
-
-	for i in ${remove}; do
-	ebegin "Cleaning ${i}..."
-		if [[ -e ${i} ]]; then
-			find ${i} -delete || die
-			eend
-		else
-			eend $1
-		fi
-	done
-
-	ln -sf lib lib32 || die
-
-	dodir ${cudadir}
-	mv * "${ED}"${cudadir} || die
-
-	cat > "${T}"/99cuda <<- EOF
-		PATH=${ecudadir}/bin$(use profiler && echo ":${ecudadir}/libnvvp")
-		ROOTPATH=${ecudadir}/bin
-		LDPATH=${ecudadir}/lib64:${ecudadir}/lib
-	EOF
-	doenvd "${T}"/99cuda
-
-	use profiler && \
-		make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib64:${ecudadir}/lib
-
-	dobin "${T}"/cuda-config
-}
-
-pkg_postinst_check() {
-	local a b
-	a="$(version_sort $(cuda-config -s))"; a=( $a )
-	# greatest supported version
-	b=${a[${#a[@]}-1]}
-
-	# if gcc and if not gcc-version is at least greatesst supported
-	if [[ $(tc-getCC) == *gcc* ]] && \
-		! version_is_at_least $(gcc-version) ${b}; then
-			echo
-			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"
-			echo
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_postinst_check
-	fi
-}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-05-18 13:05 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-18 13:05 [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/, dev-util/nvidia-cuda-toolkit/files/, Justin Lecher
  -- strict thread matches above, loose matches on Subject: below --
2013-08-12 21:28 Sebastien Fabbro

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox