dev-util/nvidia-cuda-toolkit-7.0.28-r1.ebuild : Version bump with experimental support for gcc up to 5.2

4 files changed, 46 insertions, 22 deletions

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index 3c987b2..72fa90c 100644
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+
+*nvidia-cuda-toolkit-7.0.28-r1.ebuild
+
+  03 Sep 2015; Sven Eden <yamakuzure@gmx.net>
+  -nvidia-cuda-toolkit-6.5.14-r1.ebuild,
+  +nvidia-cuda-toolkit-7.0.28-r1.ebuild:
+  Experimentally enable support up to 5.2.* ; Use at your own discretion!
+
+
 *nvidia-cuda-toolkit-6.5.19-r1 (26 Nov 2014)
 
   26 Nov 2014; Sven Eden <yamakuzure@gmx.net>
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index e3877db..bbbb14f 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -1,10 +1,10 @@
 AUX 6_5-raise_gcc_supported_version_to_9.patch 599 SHA256 b9d51ec4d9266812a659bdb01975aac70428cb9987ea515e3a4bde8ff47bb375 SHA512 c58f72a2d50560b4386dc6c59d9cc4db328f6adb50118230a18ded2bb7a106c95e4f1444573d43a8c1a229c9861d487d0758ab764292998a287b992f42b67541 WHIRLPOOL c7801eeed79237627e845a3b63978bde2f6aa2a67e4e4d771f2a82175426ba45e749c28c9b777d97cd9c77315060395089ae1fb476c6c5f2cfc228bd2ac24bdd
+AUX 7_0-raise_gcc_supported_version_to_5_2.patch 724 SHA256 3104972621bec84512573c5e0d30f7444dcf659a851f882840fed5849c9dfe87 SHA512 a00cc905d08cc38028e17413caef520ea4b409fcf46db3ce01628000adff1589f116b8c868f6b84d2fb816bed2d99c5a661bec84b18bd8b7f7540577256f083e WHIRLPOOL 534e9f6ed66fb5b15e09d29b6e4cc5a66686e30e9aacdfc803b71401696c49c60bb929cdd5042974dc1c5f719e68bb0e1a0901c66bb71b8ef72c940f96746132
 AUX cuda-config.in 406 SHA256 7271463891ff75dd83f4cb42bb3004d3204243d0e38f9cbd5b4ec4560865496a SHA512 df6d16bd2e800868bdf8401b6f82a387b701ea297ddf6e8feb0daf5222e62a33f156e5f45cf1ee4e1aa51559dfbd56b897c257dae1bb9568e839bf806bfebd5b WHIRLPOOL 4a26ee11d97676827cb01644891fdca495c3373585ddfbb5fab9f988186da384f27482c4be9e27d834036ffa87f7ee19f9ad7da2d8536babe874dda4ff991147
-DIST cuda_6.5.14_linux_32.run 76788277 SHA256 63fa1fe5d013e9944d6c1a3a71768fa4dcb35d6a157c1b06765bb56198c205c5 SHA512 89649ee0f4543b37037b7c8f5ed0b8bd502512afb4d93e3158b3df4786123be05a5288986b5abbfe15c14eb010777d2527b715225bea96a354a898c34e4a2fcc WHIRLPOOL c1094dd84883ef08d91c6eec3634a285496418db1e76b70f449f833dcb01069a620af504b6df7fe2752559688ed1f60f4adda8c97d849d648cba1be0f8196954
-DIST cuda_6.5.14_linux_64.run 972320904 SHA256 f3e527f34f317314fe8fcd8c85f10560729069298c0f73105ba89225db69da48 SHA512 fecca731b86955f5bc7b09d88b02951e3ee5d4b1f1cf5f92658227a029b87cd35d6ac22956a5fa0afe62dcdc57191f1d12bb08c9f7cc05128727cd8455947b1e WHIRLPOOL 0b890771dcca352168fed1b1df9b29504b03f8c29da59cec29914c541283998edf65f5ca6a41362143a2d5d7359822b036894f563c56b39583b1ac4c64e35180
 DIST cuda_6.5.19_linux_32.run 81882112 SHA256 9f767f38b84f52c097bec81669f99e4a6c4c9c09b5da1bc09fe49e0f804bc7a6 SHA512 1ce9bd6b472b7e4f1fb181eb340dfcb757714d59a89aaa02146cfe1a97c8ccb7eb7699b4ec823276f277eb4d82d95050eaba17e7ed5fd2e47b9b5d78531c5d4e WHIRLPOOL ac94b4e7f29811b4240623fb69b3c54214e7f0c60a286d899944dbab9da7fd3c122760199a3357667e33879bd48fbf352d5d39029acca6021e7caf21785557ed
 DIST cuda_6.5.19_linux_64.run 982446238 SHA256 5279bc159b72b7445d8aae5f289d24bb4042c35422ef32da68049d8f666d3ff5 SHA512 06854f020a5f72cf4bd714859e6966248ac2f589284113674e869fdaa1254cae27d4101940758ecda5df4724ad3e448a1f6d0c053b6cbc28107750872b6a5797 WHIRLPOOL 6ae8e53719e12997de60ec3688167f3fe33b1145d01217182e39ac386c25b358c8ba6cee45ad6c80e33ef66fd9a511338dce4589f10a31635b8437b6e528fd7a
-EBUILD nvidia-cuda-toolkit-6.5.14-r1.ebuild 3658 SHA256 82737409e364ce8a7c1213a185a20f07977912bcee49d85b672e762e9af809fb SHA512 65f340eaaad850d330e57657969e424b0556373d2f654d41f92e6cb6b402dadc4a7c18b473ea1068b856b932f7043d5bd063bd4800c49755306e9fbc1e3cd8eb WHIRLPOOL d9cfac8674baab338d946955b59e0c32f34bd771bbf32ea66491517d984cf7f17026046612b35dd3459dec263f296fca67bbdb0e19be3bb4bbac27dbbcc13a10
+DIST cuda_7.0.28_linux.run 1118797679 SHA256 d1292e9c2bbaddad24c46e0b0d15a7130831bfac0382f7159321f41ae385a5ce SHA512 f002433133e40000cbb78283e08c25f7397612957c0440605311f8921bcebd54a808069ca36b218be66a054e8afab4871b2bf1bd4d419c6f98a0d74b00a9bc78 WHIRLPOOL dcf21d2e356a1797b9e79ac9edfb3924a1d4a2914382dbe21b2172c200dd4f7d93905ac44fbc2e994ce14b7ab28e78163f4c81ddcc6cbb97e4ce085efd2d8475
 EBUILD nvidia-cuda-toolkit-6.5.19-r1.ebuild 4090 SHA256 acd070e6d8d3fb390422d17ed0617a694ac913a37b0b5584a2f88bd8bfac73f3 SHA512 ed27237378b28404cc7f7e06dd3c589bc7e437be3fd4b89c9f9228988453b7dbd9cd6f0daf33bf6417545140a4475dd915981cce803aa77f045236a978d8d7a7 WHIRLPOOL de56b1b50b00aeca7e10d2fd1f9a1d1d8d8714e6aadc838237e48c7d43fdd1f76913ec3036c48501674be80a1ac3e90d8661a30e52660d71dce55a4aafec4f16
-MISC ChangeLog 17407 SHA256 0297c1bad403b2a35e25b7c7efd6fcab2873865d236940503620de90ba98798d SHA512 46e8ff237ced779058a696e087c16641061c9444367b20f60d607ea341255f3ac1b92cb03eef5087b5a9a158a2809e0466c19ec2e4c13f530f44dde22850decd WHIRLPOOL ebc1a5be699a5547e134af3a5fa374c867bfe295aa7e5fe85e35b9d89d44510fe33ce9c7ddd45a5ba906382fe219e62fa421f9c6f4dde68e449c802f0357c8e1
+EBUILD nvidia-cuda-toolkit-7.0.28-r1.ebuild 3430 SHA256 488cf8a59aaea31f721a64abf673c7b6bcf5404c094d7000737b05f8f1b2eece SHA512 6a81d7b55bbc457b832654caf9dcea11cc7ebb51b069a7a018432b2704c308128a7609a1833478e91549ae62ead6dc8618d2d37568c8ea78b973fee55b78825f WHIRLPOOL f50b474a222b0812d195e1378b819283b82c476c78c3bb2bae48cb1da768e9f5c28ad4bc1dee0dd087f9601a1d6af0b6cd6ec4a05386260f7c013b2766fdd092
+MISC ChangeLog 17651 SHA256 5610f1e04678778c16f6ff13587c0b2f45e346ac8d049e3710511e14e40ecb23 SHA512 6ba879f67f09cd8155937c7a6b443be4706038b503a6c1a02b260ad648d41dc70b0b2be903080c77c6446e4183aa9ad2332d6a687d8bd003e630e227b1f51712 WHIRLPOOL 9148c357f174943f2dac8a714edd39e0cdbefd30da45d748900f4ff2b62b27e9f812bc0d0b08f44c06af5cb3af1fa4bab3163ced42f466d8f18aad1cd5558d9e
 MISC metadata.xml 506 SHA256 16d98da28f74ec82ae271f04e456547db8da2a9c576bf262ad897f4a3259fb56 SHA512 c1be2bc00a75ee9db0339938964d80214648df5a6cc16f3d1250f80d3142a1e511750dba34b54794227457db0d1a0f5ca4f692f34b9566ac3f58fef43196626e WHIRLPOOL 02f0c08cb4ab40b543e23c51ae81a7f04e452f3949808bd29a2790c565c2739d131d4d19fc3d4d279381a5ed05ad0623ba560aba82f7a3b510e44f8cf35c6473
diff --git a/dev-util/nvidia-cuda-toolkit/files/7_0-raise_gcc_supported_version_to_5_2.patch b/dev-util/nvidia-cuda-toolkit/files/7_0-raise_gcc_supported_version_to_5_2.patch
new file mode 100644
index 0000000..2b27365
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/files/7_0-raise_gcc_supported_version_to_5_2.patch
@@ -0,0 +1,17 @@
+--- a/include/host_config.h	2015-03-06 09:43:05.000000000 +0100
++++ b/include/host_config.h	2015-09-03 18:30:08.733054542 +0200
+@@ -100,11 +100,11 @@
+ 
+ #if defined(__GNUC__)
+ 
+-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 9)
++#if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ > 2)
+ 
+-#error -- unsupported GNU version! gcc 4.10 and up are not supported!
++#error -- unsupported GNU version! gcc 5.3 and up are not supported!
+ 
+-#endif /* __GNUC__> 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 9) */
++#endif /* __GNUC__> 5 || (__GNUC__ == 5 && __GNUC_MINOR__ > 2) */
+ 
+ #if defined(__APPLE__) && defined(__MACH__) && !defined(__clang__)
+ #error -- clang and clang++ are the only supported host compilers on Mac OS X!
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.28-r1.ebuild
index eaa3578..14eb345 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14-r1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.28-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header:  $
+# $Id$
 
 EAPI=5
 
@@ -10,20 +10,17 @@ 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="
-	amd64? ( ${CURI}/cuda_${PV}_linux_64.run )
-	x86? ( ${CURI}/cuda_${PV}_linux_32.run )"
+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 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="-* ~amd64 ~amd64-linux"
 IUSE="debugger doc eclipse profiler"
 
 DEPEND=""
 RDEPEND="${DEPEND}
-	<sys-devel/gcc-4.10[cxx]
-	>=x11-drivers/nvidia-drivers-340.32[uvm]
+	>=sys-devel/gcc-4.7[cxx]
+	>=x11-drivers/nvidia-drivers-346.35[uvm]
 	debugger? (
 		sys-libs/libtermcap-compat
 		sys-libs/ncurses[tinfo]
@@ -48,16 +45,15 @@ src_unpack() {
 }
 
 src_prepare() {
-	# Raised to gcc-4.9, as the CUDA toolkit works with
-	# gcc-4.9 since version 5.5 according to:
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=757961
-	local cuda_supported_gcc="4.9"
+	local cuda_supported_gcc
+
+	cuda_supported_gcc="4.7 4.8 4.9 5.0 5.1 5.2"
 
 	sed \
 		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
 		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
 
-	epatch "${FILESDIR}/${MYD}-raise_gcc_supported_version_to_9.patch"
+	epatch "${FILESDIR}/${MYD}-raise_gcc_supported_version_to_5_2.patch"
 }
 
 src_install() {
@@ -77,7 +73,7 @@ src_install() {
 
 	use debugger || remove+=" bin/cuda-gdb extras/Debugger"
 	( use profiler || use eclipse ) || remove+=" libnsight"
-	use amd64 || remove+=" cuda-installer.pl"
+	remove+=" cuda-installer.pl"
 
 	if use profiler; then
 		# hack found in install-linux.pl
@@ -105,18 +101,20 @@ src_install() {
 		fi
 	done
 
+	ln -sf lib lib32 || die
+
 	dodir ${cudadir}
-	mv * "${ED}"${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")
+		LDPATH=${ecudadir}/lib64:${ecudadir}/lib
 	EOF
 	doenvd "${T}"/99cuda
 
 	use profiler && \
-		make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
+		make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib64:${ecudadir}/lib
 
 	dobin "${T}"/cuda-config
 }