Restore old version needed by media-libs/opencv and fix deps

Package-Manager: portage-2.2.14/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 145 insertions, 2 deletions

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index c46e126ce580..5c3c3e663497 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.90 2014/11/04 02:42:21 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.91 2014/11/04 05:37:40 patrick Exp $
+
+*nvidia-cuda-toolkit-4.2.9-r2 (04 Nov 2014)
+
+  04 Nov 2014; Patrick Lauer <patrick@gentoo.org>
+  +nvidia-cuda-toolkit-4.2.9-r2.ebuild:
+  Restore old version needed by media-libs/opencv and fix deps
 
   04 Nov 2014; Patrick Lauer <patrick@gentoo.org>
   -nvidia-cuda-toolkit-4.2.9-r2.ebuild:
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index c067472e28a7..10e3d0190d10 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -5,9 +5,12 @@ DIST cuda_6.0.37_linux_32.run 779831016 SHA256 54084c2c808b0a4af91b5bb9cf0757f40
 DIST cuda_6.0.37_linux_64.run 1032032789 SHA256 991e436c7a6c94ec67cf44204d136adfef87baa3ded270544fa211179779bc40 SHA512 251f87fa797eb0ba40f76d94852c3a8a401057bdc6d921dcaf294d9972755b77b7180bbbfb655aa3fa9be6ea499e558ab02fa122ad225ddb0afdbbf3622483de WHIRLPOOL 88567cf44508cad899ab5591ee22785330b570b1447725ba120c829b9982e4629288a2c6033eb02e091c98b811fe68747d0405eacb6931389eabe05905de4d71
 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 cudatoolkit_4.2.9_linux_32_ubuntu11.04.run 209998124 SHA256 0c91d51e49c7cabc13fafa75cbf547c6902557cb5c3e19b4cf3c83c26172a03f SHA512 f1ca065e9cbe6273f165388d3579e28868c7b1330b341cabab9fdd6695fd3450dd8c77978a5aa3063617b371c68c37661b4f2d8fcbc4e585bb508254bef064ef WHIRLPOOL 9cbb668a1fba9748c0a42ce9a93ba0e7ff592c48155b0d87c22999f90aea29fc02120febcf4b07b8bd1ded96ca057ca0450261ea30ffdf5076e0991b10474a18
+DIST cudatoolkit_4.2.9_linux_64_ubuntu11.04.run 282394341 SHA256 22d857db6b3831670bc2ca7ed22ac257b6946f68f6e4b6f534ec98b69690ad38 SHA512 3a54c278f486cbc92a7e262f39183c7babca8ab6d04c5f85ff875d3b2bcdd699631049be375fde2a3ba2746bd5ea04ba0149616e245556257c470632b91b4b1c WHIRLPOOL eac55ac70ac986772b4cbd1b76940b41eaca20276ac68e59ccfb5a09eb41de7c023d78dc85392ebfb9e5d36ee7f29e31e0173aeca0b89a510e7c89c087b72f1f
+EBUILD nvidia-cuda-toolkit-4.2.9-r2.ebuild 3283 SHA256 a3452c87dd36602fb030ef76b2fd6127d38c001468d332dd3674db3e04f1dafd SHA512 2f556991b72cd96fb55b71ba50e378ef1d45c06084017c60c01bbd83c19a32ed2424def4437a8262d1ceb48bf295dad071f19fba80d02d27fa03fe5352d79ba0 WHIRLPOOL 3793efa520ae744491a4c7064cc699e786c1638f4b9d7d24959a11b1a0c6a8b4f65d7d835196b2f6a6e020fd038635e5b0eb22e931bb71dd6942c940ece2b369
 EBUILD nvidia-cuda-toolkit-5.5.22.ebuild 3536 SHA256 2ed359ba1bf26f3e902818030c41bac4b2e4a217b5d48f73e4cb6d4250451227 SHA512 54d394a1aeaeb7ca69c981e77e56323a359b10ac295dad50e7f5e36b428768e0b81e1d78e32afe4c919dfa9715e3477728e5b485d87a49151a563823410ea071 WHIRLPOOL f5e0d1382adaf51fdf2556c84c55ff462572cc03051244ff724b98b160dab6e187b655c78966947a8e125c2fda592062b186df1e307d00791b1e4f317d9c9a6f
 EBUILD nvidia-cuda-toolkit-6.0.37-r3.ebuild 3534 SHA256 21fcc770d3138d2e95a53a662aa38a8f4bdbce2b1027a1ddc3de8a315942385c SHA512 c04964fb02a9cd93c72f76f5fde1b6dbe218579b4e9c66c8aff61f54ff0565b6bc14ed3db25eecc0ab429b0f28dfc2a45671a945396da3b81da162a69842169f WHIRLPOOL f2c0fc8e1f32164296dd53dfcd16fd850b32f048474b56ec15414db584148abcf1108ee0b283240d4d126439659388a5836ec49ad4e3c71b4cc5eb37095416ac
 EBUILD nvidia-cuda-toolkit-6.0.37-r4.ebuild 3580 SHA256 37c64256a8696999fa3dafb423fdf9f28cff30ca6081527ea28cd2f8852d9cb6 SHA512 0eea8cfb4a1bc9cf1cc130129a47fc0694a3121edec20ada4d4b09a394e5bc622d5397373aa0ce33899efd64721ce19eac39ac06c02005de429036d6dc14a8d3 WHIRLPOOL c544219700b1b20237b6722fa338c5f2c4f5399f3b9cfe3657a7e045e71328972e2059c755c29e5c62529c08f04782cdae45a77851e697af46f00b3f6d7108a0
 EBUILD nvidia-cuda-toolkit-6.5.14.ebuild 3574 SHA256 6b90c7c816ac8f3caac79e0ef446b5bd8c5c85df8a68471c71678d463e545939 SHA512 1e335ab1dfdeb57f4dd603690e5d8e5aa703768fb262c1bbd7f78b0068374fa3bb69970ba73e24c6eb03d297be7a1eb35777ff9dece027e46d5b8edd848650ea WHIRLPOOL cab2c428d514c22db4e73cad4768b194df3ebf5ef7646e14175e034a1bf04d65d8bced733020c020fb6edf54e8906b1dde14b8596b119dff9e669455d23ff531
-MISC ChangeLog 17189 SHA256 dbb7133097f413e3260e38a0a0c6a8185115adbad204bd67f0d35af28704d55d SHA512 253f5acbf606cda39aa3721a072f63e1a127088d23b66a6dd11c735fbf518257cda69752346ded5c74f3dd12b1fbd09bc38fb15ea4bca713e78db4666ecc8339 WHIRLPOOL e60d3a592d08e15dd3324867379c42d390d86a6bfcbf1c65461488343d5fb7ed6faac8eca854a9363edc3387285008731a06943cb4c70a90e2e6545b59a828be
+MISC ChangeLog 17388 SHA256 58789b31f58232807eac604939b76fd4db02c3646eca683d0f90edd138a1337d SHA512 63b665b065b058349356413624fdc31a3287400300c33e53b3cb3e490d3254625b125e4142011f9480bb4bf8ead17bbf8705288db80d79efef6f0d995e9fe138 WHIRLPOOL e7852e0bdce16318f321089d289d503f2693be33f861ea8fb557063e7aee5e61f286d8b5157d760f7fc957556ad59300dc33749d2a35a1d6575de2013d4669e8
 MISC metadata.xml 506 SHA256 16d98da28f74ec82ae271f04e456547db8da2a9c576bf262ad897f4a3259fb56 SHA512 c1be2bc00a75ee9db0339938964d80214648df5a6cc16f3d1250f80d3142a1e511750dba34b54794227457db0d1a0f5ca4f692f34b9566ac3f58fef43196626e WHIRLPOOL 02f0c08cb4ab40b543e23c51ae81a7f04e452f3949808bd29a2790c565c2739d131d4d19fc3d4d279381a5ed05ad0623ba560aba82f7a3b510e44f8cf35c6473
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r2.ebuild
new file mode 100644
index 000000000000..970231984c30
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2014 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.9-r2.ebuild,v 1.11 2014/11/04 05:37:40 patrick Exp $
+
+EAPI=5
+
+inherit cuda unpacker versionator
+
+MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
+DISTRO=ubuntu11.04
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="http://developer.nvidia.com/cuda"
+CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/toolkit"
+SRC_URI="
+	amd64? ( ${CURI}/cudatoolkit_${PV}_linux_64_${DISTRO}.run )
+	x86? ( ${CURI}/cudatoolkit_${PV}_linux_32_${DISTRO}.run )"
+
+SLOT="0"
+LICENSE="NVIDIA-CUDA"
+KEYWORDS="-* amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="debugger doc eclipse profiler"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	|| (
+		=sys-devel/gcc-4.4.7
+		=sys-devel/gcc-4.5.4
+		=sys-devel/gcc-4.6.4
+		)
+	!<=x11-drivers/nvidia-drivers-270.41
+	|| (
+		>=x11-drivers/nvidia-drivers-331[uvm]
+		<x11-drivers/nvidia-drivers-331
+	)
+	debugger? ( sys-libs/libtermcap-compat )
+	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_prepare() {
+	local cuda_supported_gcc dfiles files
+
+	cuda_supported_gcc="4.4 4.5 4.6"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	dfiles="install-linux.pl libnvvp/jre run_files"
+	use amd64 && dfiles+=" cuda-installer.pl"
+	for files in ${dfiles}; do
+		if [[ -e ${files} ]]; then
+			find ${files} -delete || die
+		fi
+	done
+}
+
+src_install() {
+	local i
+	local remove="doc"
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}"${cudadir}
+
+	if use doc; then
+		dodoc doc/*{txt,pdf}
+		dohtml -r doc/{*.html,html}
+	fi
+
+	use debugger || remove+=" bin/cuda-gdb extras/Debugger"
+
+	if use profiler; then
+		# hack found in install-linux.pl
+		cat > bin/nvvp <<- EOF
+			#!${EPREFIX}bin/sh
+			LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
+				UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 ${ecudadir}/libnvvp/nvvp
+		EOF
+		chmod a+x bin/nvvp
+	else
+		use eclipse || remove+=" libnvvp"
+		remove+=" extras/CUPTI"
+	fi
+
+	for i in ${remove}; do
+		if [[ -e ${i} ]]; then
+			find ${i} -delete || die
+		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
+
+	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
+}