[gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-sdk/

["Sebastien Fabbro" <bicatali@gentoo.org>]

commit:     15c15ed6c16a2f60e480689aafa8960bcf80d480
Author:     Sebastien Fabbro <sfabbro <AT> uvic <DOT> ca>
AuthorDate: Wed Jul  4 18:50:20 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Jul  4 18:50:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=15c15ed6

dev-util/nvidia-cuda-sdk: Adapted to newer nvidia-cuda-sdk

(Portage version: 2.2.01.20430-prefix/git/Linux x86_64, unsigned Manifest commit)

---
 dev-util/nvidia-cuda-sdk/ChangeLog                 |    6 ++++++
 dev-util/nvidia-cuda-sdk/metadata.xml              |    2 --
 ...sdk-4.2.ebuild => nvidia-cuda-sdk-4.2.9.ebuild} |   13 +++++--------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/dev-util/nvidia-cuda-sdk/ChangeLog b/dev-util/nvidia-cuda-sdk/ChangeLog
index 8912130..7eba571 100644
--- a/dev-util/nvidia-cuda-sdk/ChangeLog
+++ b/dev-util/nvidia-cuda-sdk/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog,v 1.30 2012/02/05 16:39:02 spock Exp $
 
+*nvidia-cuda-sdk-4.2.9 (04 Jul 2012)
+
+  04 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +nvidia-cuda-sdk-4.2.9.ebuild, -nvidia-cuda-sdk-4.2.ebuild, metadata.xml:
+  dev-util/nvidia-cuda-sdk: Adapted to newer nvidia-cuda-sdk
+
 *nvidia-cuda-sdk-4.2 (03 Jul 2012)
 
   03 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org>

diff --git a/dev-util/nvidia-cuda-sdk/metadata.xml b/dev-util/nvidia-cuda-sdk/metadata.xml
index 8016fc8..23cb88d 100644
--- a/dev-util/nvidia-cuda-sdk/metadata.xml
+++ b/dev-util/nvidia-cuda-sdk/metadata.xml
@@ -8,8 +8,6 @@
   software with CUDA C/C++ or DirectCompute.
 </longdescription>
 <use>
-  <flag name='emulation'>Build binaries for device emulation mode. These binaries will not require a CUDA-capable GPU to run.
-  </flag>
   <flag name='opencl'>Build OpenCL binaries</flag>
   <flag name='cuda'>Build CUDA binaries</flag>
 </use>

diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9.ebuild
similarity index 79%
rename from dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.ebuild
rename to dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9.ebuild
index 6176d5f..6ce3153 100644
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9.ebuild
@@ -4,22 +4,20 @@
 
 EAPI=4
 
-inherit unpacker toolchain-funcs
+inherit unpacker toolchain-funcs versionator
 
 DESCRIPTION="NVIDIA CUDA Software Development Kit"
 HOMEPAGE="http://developer.nvidia.com/cuda"
 
-CUDA_V=${PV//_/-}
-DIR_V=${CUDA_V//./_}
-DIR_V=${DIR_V//beta/Beta}
+MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
 
-SRC_URI="http://developer.download.nvidia.com/compute/cuda/${DIR_V}/rel/sdk/gpucomputingsdk_${CUDA_V}.9_linux.run"
+SRC_URI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/sdk/gpucomputingsdk_${PV}_linux.run"
 LICENSE="CUDPP"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug +doc +examples opencl +cuda"
 
-RDEPEND=">=dev-util/nvidia-cuda-toolkit-4.2
+RDEPEND=">=dev-util/nvidia-cuda-toolkit-${PV}
 	examples? ( >=x11-drivers/nvidia-drivers-260.19.21 )
 	media-libs/freeglut"
 DEPEND="${RDEPEND}"
@@ -28,12 +26,11 @@ S="${WORKDIR}"
 
 pkg_setup() {
 	if use cuda || use opencl && [[ $(tc-getCXX) == *gcc* ]] && \
-		! version_is_at_least "4.5" "$(gcc-version)"; then
+		! version_is_at_least 4.5 "$(gcc-version)"; then
 		eerror "This package requires >=sys-devel/gcc-4.5 to build sucessfully"
 		eerror "Please use gcc-config to switch to a compatible GCC version"
 		die ">=sys-devel/gcc-4.4 required"
 	fi
-	echo $(gcc-major-version) $(gcc-minor-version)
 }
 
 src_compile() {