Use older binaries to maintain compatiblity with gcc3 (bug #279523).

Package-Manager: portage-2.2_rc36/cvs/Linux x86_64

3 files changed, 149 insertions, 5 deletions

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index d415985dc4db..1b43c488dae9 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.14 2009/08/09 22:24:55 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.15 2009/08/09 22:28:14 spock Exp $
+
+*nvidia-cuda-toolkit-2.2-r3 (09 Aug 2009)
+
+  09 Aug 2009; Michał Januszewski <spock@gentoo.org>
+  +nvidia-cuda-toolkit-2.2-r3.ebuild:
+  Use older binaries to maintain compatiblity with gcc3 (bug #279523).
 
   09 Aug 2009; Michał Januszewski <spock@gentoo.org>
   nvidia-cuda-toolkit-2.3.ebuild:
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 6b30ff2f83ed..3da9f6a0ace9 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -8,20 +8,23 @@ DIST cudagdb_2.2_linux_32_rhel5.3.run 1181310 RMD160 44c69588df4dde25b93fb9115ad
 DIST cudagdb_2.2_linux_64_rhel5.3.run 1336512 RMD160 71492aef7db31dafc8b95d6c073d123ca59b15b4 SHA1 254f9b78808a357077bfba199827aa85ec622453 SHA256 c86ad34018a128e1e2abf3d818c3e01bce3cfe8e53c88b221a45ff5cc877cf7c
 DIST cudatoolkit_2.1_linux32_suse11.0.run 21309180 RMD160 d026b0ecbca2f8b53d2d69b53b8548e1a5a0d666 SHA1 2df0fdd256ea1dd42f7b4f455a13bd60cc21a00a SHA256 c13b3ba9628c888228c9b841d4944103de972f19ca7cf26a75d66e48632323cf
 DIST cudatoolkit_2.1_linux64_suse11.0.run 22239014 RMD160 181fbed80fd71b5064baff050c182146f1cd7c67 SHA1 55339726ef1df054682c30e6a0b9ad8d8ddfb452 SHA256 71cb1d040cd88e23183477d6ce193af70d952ca5e24c012075e1b78896e4e311
+DIST cudatoolkit_2.2_linux_32_rhel4.7.run 28263025 RMD160 d51c9d4f6d804defde689be002383bce690ee8a6 SHA1 b86d8d1ae6bd2bf50060c5d852ba262cb31f86be SHA256 7a1860d352b9405c3e300e2e1881796e14dee6aef87b368524f67e3ba3502991
 DIST cudatoolkit_2.2_linux_32_suse11.1.run 28234843 RMD160 50cd85effc3188ee8362235d6e41a5b5f26b7b8f SHA1 f5d44651f86b39d70bbdc35d48095f2c206d859f SHA256 4403d7e2b552b651d4bef2df9feb16b6624b93d7260833c1cd1e1803266382fe
+DIST cudatoolkit_2.2_linux_64_rhel4.7.run 29212173 RMD160 785f2014ade1f0d7f0b2842eebb9c1ccb729392a SHA1 8b6ec7058b024dcd5ab472cb957d70b4137eafad SHA256 29e6f1b03aa5118f6f3156b9ed78c1d2806f5820cc6f6089ce92345443424683
 DIST cudatoolkit_2.2_linux_64_suse11.1.run 29640032 RMD160 8288a864304757847e5ec72445955c4b8890563d SHA1 c30bd24e4ef81e8c4369e38b2910e9de0afe9fd3 SHA256 3c87763084fef5e5854041b46420e71946136e07d5e4fa17721e1b4a83ade965
 DIST cudatoolkit_2.3_linux_32_rhel5.3.run 44143560 RMD160 3ce6dc8ba30e8c87fb561a23f74df1b33183d7f1 SHA1 3844d8a8f789c4699c4e6c3ebfbb2a02d9e46ed6 SHA256 f2fe27927ee3583e2ad686ea1192c91524d2063017f8119bc9268af3cfa7e436
 DIST cudatoolkit_2.3_linux_64_rhel5.3.run 51075373 RMD160 d28ea9f972277fac5fba987b4bdd50299209b377 SHA1 09e28bdf135a4fde9185aeedd86c9c8b0aa17ff2 SHA256 bb3c4bb8ef9794c6306cb01c39cfebc2f913492e5812703c8eb0953461a31a39
 EBUILD nvidia-cuda-toolkit-2.0.ebuild 1763 RMD160 17c53c9e770fb493bec8722736c189c702c1da53 SHA1 161479bc46b7418e6be6a1287d37c0c14269ccca SHA256 54c83752347614e52a0fedacb1f38f72b44779a1856f5f29fad956ccff6d4eaa
 EBUILD nvidia-cuda-toolkit-2.1.ebuild 1855 RMD160 3b7b8aa874cde5d21fe0dda2cb2bc76cc6e00cb0 SHA1 c584ec959e3363c006b0dfd35f51ba966481644b SHA256 f082943e9e730b57664440235bd026bd80cf19423a944072b8922be4e42b9f40
 EBUILD nvidia-cuda-toolkit-2.2-r2.ebuild 3010 RMD160 387e7ac2a80f42726ada954197c6076481f14ad9 SHA1 0676c70e7c2d2b384ade19a9a05f6621762a662c SHA256 acd30eed4fd241c4daad60c3f6c4b30bc8a1571960e4b3bbf1196381f13e30fb
+EBUILD nvidia-cuda-toolkit-2.2-r3.ebuild 3008 RMD160 f821f04dd3d5469a0ec8006f8c8e51e91ff058eb SHA1 d5ae73dcc93afefa468d2e90541a6e71a24601a8 SHA256 822932868afc62902aa12655fb378e4a7d6eed9ebbbb6f6ea73a4d9975ea5baf
 EBUILD nvidia-cuda-toolkit-2.3.ebuild 2943 RMD160 d8f811203fd37e0590e8885bfed38c944f5f7258 SHA1 08850af0cbb3c56ce8f752f9d890114ceb8f1fd1 SHA256 f58bc164b9f0a7fb2ff99d3e454912d5e1d1ef52bb8b1de0cbaa4d23d03f9f5a
-MISC ChangeLog 2859 RMD160 61d1105f6901071f255c3828fcb4cb8c49d28b30 SHA1 b9dae79f3b407b7f5ab0be6bfb08d01693a071ff SHA256 b7422cd6e19cdb77ed7751588c1ecca3b627c16196f94547c34130cc4259b4bb
+MISC ChangeLog 3066 RMD160 e4073289be289f3ddd0b215e2aacc6ddca7a56c9 SHA1 811433b157c9a7e0e98bc5c7f873b85d207d2b45 SHA256 5ed925714f783e515dedc9d936ba748a343c08e35670664d1459d3f8e00486ec
 MISC metadata.xml 421 RMD160 14a7cc955bb561664165d12762f16e8359de799a SHA1 0a11779a8c23235b3b41b36850a24d29f1bcc18a SHA256 65612620b1e6a2a3094b5999da92e493edcc91e1817ddaa73317a0e4972e60d2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkp/TKYACgkQchej4aZK9/eCkwCfb6JD8IXQTJTDtuPLyIEGpec2
-P4IAn1Q9MtrNR5Vlyos5vfLWuO/O4267
-=R82T
+iEYEARECAAYFAkp/TWYACgkQchej4aZK9/fq/QCfahYAyv+ibkhJE8pcFsDtCYqp
+m10AnAmylIMfx34+W9AC/0yg71j46Mj1
+=brGv
 -----END PGP SIGNATURE-----
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.2-r3.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.2-r3.ebuild
new file mode 100644
index 000000000000..b10917f3946c
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.2-r3.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2009 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-2.2-r3.ebuild,v 1.1 2009/08/09 22:28:14 spock Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="NVIDIA CUDA Toolkit"
+HOMEPAGE="http://developer.nvidia.com/cuda"
+
+CUDA_V=${PV//./_}
+
+BASE_URI="http://developer.download.nvidia.com/compute/cuda/${CUDA_V}/toolkit"
+SRC_URI="amd64? ( ${BASE_URI}/cudatoolkit_${PV}_linux_64_rhel4.7.run
+		debugger? ( ${BASE_URI}/cudagdb_2.2_linux_64_rhel5.3.run ) )
+	x86? ( ${BASE_URI}/cudatoolkit_${PV}_linux_32_rhel4.7.run
+		debugger? ( ${BASE_URI}/cudagdb_2.2_linux_32_rhel5.3.run ) )"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debugger doc profiler"
+
+DEPEND="!dev-util/nvidia-cuda-profiler"
+RDEPEND="${DEPEND}
+	profiler? ( x86? (
+		x11-libs/qt-gui
+		x11-libs/qt-core
+		x11-libs/qt-assistant
+		x11-libs/qt-sql[sqlite] )
+	)
+	debugger? ( >=sys-libs/libtermcap-compat-2.0.8-r2 )"
+RESTRICT="strip binchecks"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	for f in ${A} ; do
+		unpack_makeself ${f}
+	done
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-enum_fix.patch"
+}
+
+src_install() {
+	local DEST=/opt/cuda
+	export CONF_LIBDIR_OVERRIDE="lib"
+
+	# HACK: temporary workaround until CONF_LIBDIR_OVERRIDE is respected.
+	export LIBDIR_amd64="lib"
+
+	into ${DEST}
+	dobin bin/*
+	dolib lib/*
+
+	chmod a-x "${D}/${DEST}/bin/nvcc.profile"
+
+	# 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 include/*.h
+	insinto ${DEST}/include/crt
+	doins include/crt/*.h
+
+	insinto ${DEST}/src
+	doins src/*
+
+	into ${DEST}/open64
+	dobin open64/bin/*
+	libopts -m0755
+	dolib open64/lib/*
+
+	if use doc ; then
+		insinto ${DEST}/doc
+		doins -r doc/*
+	fi
+
+	cat > "${T}/env" << EOF
+PATH=${DEST}/bin
+ROOTPATH=${DEST}/bin
+LDPATH=${DEST}/lib
+MANPATH=${DEST}/man
+EOF
+	newenvd "${T}/env" 99cuda
+
+	if use profiler; then
+		into ${DEST}/cudaprof
+		dobin cudaprof/bin/cudaprof
+
+		cat > "${T}/env" << EOF
+PATH=${DEST}/cudaprof/bin
+ROOTPATH=${DEST}/cudaprof/bin
+EOF
+		if use x86 ; then
+			dosym /usr/bin/assistant ${DEST}/cudaprof/bin
+		else
+			dobin cudaprof/bin/assistant
+			insinto ${DEST}/cudaprof/bin
+			doins cudaprof/bin/*.so*
+			insinto ${DEST}/cudaprof/bin/sqldrivers
+			doins cudaprof/bin/sqldrivers/*
+
+			cat >> "${T}/env" << EOF
+LDPATH=${DEST}/cudaprof/bin
+EOF
+		fi
+
+		newenvd "${T}/env" 99cudaprof
+
+		if use doc; then
+			insinto ${DEST}/cudaprof/doc
+			doins cudaprof/doc/*
+			insinto ${DEST}/cudaprof/projects
+			doins cudaprof/projects/*
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog "If you want to natively run the code generated by CUDA, you will need"
+	elog ">=x11-drivers/nvidia-drivers-185.18.08."
+	elog ""
+	elog "This CUDA toolkit release does not support gcc-4.4.  Please make sure"
+	elog "to switch to a lower GCC version before using nvcc."
+	elog ""
+	elog "Run '. /etc/profile' before using the CUDA toolkit. "
+}