bump to 4.2 and cleanup QA warnings in ebuild and from repoman

(Portage version: 2.1.11.9/cvs/Linux x86_64)

3 files changed, 119 insertions, 5 deletions

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index f0ed603abe70..003191065bfd 100644
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/nvidia-cuda-toolkit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.50 2012/02/21 22:44:39 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.51 2012/07/31 05:57:22 zerochaos Exp $
+
+*nvidia-cuda-toolkit-4.2 (31 Jul 2012)
+
+  31 Jul 2012; Rick Farina <zerochaos@gentoo.org>
+  +nvidia-cuda-toolkit-4.2.ebuild, metadata.xml:
+  bump to 4.2 and cleanup QA warnings in ebuild and from repoman
 
   21 Feb 2012; Michał Januszewski <spock@gentoo.org>
   +nvidia-cuda-toolkit-3.2.ebuild:
@@ -263,4 +269,3 @@
   +nvidia-cuda-toolkit-2.0.ebuild:
   Initial commit. Thanks to everyone participating in bug #167685 for the
   previous versions of the ebuild.
-
diff --git a/dev-util/nvidia-cuda-toolkit/metadata.xml b/dev-util/nvidia-cuda-toolkit/metadata.xml
index a54226ab499c..676cbf61007c 100644
--- a/dev-util/nvidia-cuda-toolkit/metadata.xml
+++ b/dev-util/nvidia-cuda-toolkit/metadata.xml
@@ -12,9 +12,6 @@
 		<flag name='debugger'>
 			Installs the CUDA debugger.
 		</flag>
-		<flag name='opencl'>
-			Installs OpenCL utilities.
-		</flag>
 	</use>
 </pkgmetadata>
 
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.ebuild
new file mode 100644
index 000000000000..4ebd856253ef
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2012 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-4.2.ebuild,v 1.1 2012/07/31 05:57:22 zerochaos Exp $
+
+EAPI=2
+
+inherit eutils multilib unpacker
+
+DESCRIPTION="NVIDIA CUDA Toolkit"
+HOMEPAGE="http://developer.nvidia.com/cuda"
+
+CUDA_V=${PV//_/-}
+DIR_V=${CUDA_V//./_}
+DIR_V=${DIR_V//beta/Beta}
+
+BASE_URI="http://developer.download.nvidia.com/compute/cuda/${DIR_V}/rel/toolkit"
+SRC_URI="amd64? ( ${BASE_URI}/cudatoolkit_${CUDA_V}.9_linux_64_ubuntu11.04.run )
+	x86? ( ${BASE_URI}/cudatoolkit_${CUDA_V}.9_linux_32_ubuntu11.04.run )"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debugger doc profiler"
+
+RDEPEND="${DEPEND}
+	>=sys-devel/binutils-2.20
+	>=sys-devel/gcc-4.5
+	debugger? ( >=sys-libs/libtermcap-compat-2.0.8-r2 )
+	!<=x11-drivers/nvidia-drivers-270.41"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/cuda/.*"
+QA_EXECSTACK="opt/cuda/bin/cicc"
+
+src_install() {
+	local DEST=/opt/cuda
+
+	into ${DEST}
+	dobin bin/*
+	dobin nvvm/*
+	dolib $(get_libdir)/*
+
+	if ! use debugger; then
+		rm -f "${D}/${DEST}/bin/cuda-gdb"
+	else
+		insinto ${DEST}/extras
+		doins -r extras/Debugger
+	fi
+
+	if use profiler; then
+		# TODO: Use system JRE for the profiler?
+		insinto ${DEST}
+		doins -r libnvvp
+		fperms a+x ${DEST}/libnvvp/nvvp ${DEST}/libnvvp/jre/bin/* ${DEST}/libnvvp/*.so
+
+		cat > "${T}/nvv" << EOF
+#!/bin/sh
+LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${DEST}/lib:${DEST}/lib64 ${DEST}/libnvvp/nvvp
+EOF
+		dobin "${T}/nvv"
+		insinto ${DEST}/extras
+		doins -r extras/CUPTI
+	fi
+
+	chmod a-x "${D}/${DEST}/bin/nvcc.profile"
+	chmod a-x "${D}/${DEST}/bin/ci_include.h"
+
+	# TODO: Manuals are missing from this release. Remove the following
+	# commented-out lines if they are not restored in the next releases.
+	# doman does not respect DESTTREE
+	#insinto ${DEST}/man/man1
+	#doins man/man1/*
+	#insinto ${DEST}/man/man3
+	#doins man/man3/*
+	#prepman ${DEST}
+
+	insinto ${DEST}/include
+	doins -r include/*
+
+	insinto ${DEST}/src
+	doins src/*
+
+	if use doc ; then
+		insinto ${DEST}/doc
+		doins -r doc/*
+	fi
+
+	cat > "${T}/env" << EOF
+PATH=${DEST}/bin
+ROOTPATH=${DEST}/bin
+LDPATH=${DEST}/$(get_libdir)
+MANPATH=${DEST}/man
+EOF
+	newenvd "${T}/env" 99cuda
+
+	export CONF_LIBDIR_OVERRIDE="lib"
+	# HACK: temporary workaround until CONF_LIBDIR_OVERRIDE is respected.
+	export LIBDIR_amd64="lib"
+
+	into ${DEST}/open64
+	dobin open64/bin/*
+	libopts -m0755
+	dolib open64/lib/*
+}
+
+pkg_postinst() {
+	elog "If you want to natively run the code generated by this version of the"
+	elog "CUDA toolkit, you will need >=x11-drivers/nvidia-drivers-260.19.21."
+	elog ""
+	elog "Run '. /etc/profile' before using the CUDA toolkit. "
+}