gentoo resync : 27.01.2018

2 files changed, 146 insertions, 0 deletions

diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest
index 641bebb73f7e..6b798970d9bb 100644
--- a/dev-util/nvidia-cuda-sdk/Manifest
+++ b/dev-util/nvidia-cuda-sdk/Manifest
@@ -4,9 +4,11 @@ DIST cuda_7.5.18_linux.run 1195424633 BLAKE2B 35933c3c3355231cd59e579e6ac6a30cca
 DIST cuda_8.0.44_linux.run 1457082926 BLAKE2B a6408ddf8984dc4b0725cc4f53549c4d4fc4b3bd4de2771896953dbe023aa6d04ad38f5d6bf1ab3ff5752d2c18b400f478c9dbb263755267836c5de79e4f8f51 SHA512 1bf9d8e6b853c2a971b8d908a043adc5b11ec7033faed04a773c42680882753f98bc33b46f6b301c24c0f780f74bc237dce5766fc857f1a905e6c1f200728d86
 DIST cuda_8.0.61_375.26_linux.run 1465528129 BLAKE2B d52ddf1dcf5246f230f210d10d1f6e7b540c892dea5a8cd770f0d062b30b01f5c8467d930430b383464d40a9b4a14eaaf22a365e081955e4452ec4f55e08da0b SHA512 d22303719a9feff64f95bf6a966f1caa2bf0cf8c955e475ce08ce54faa5e098d336c2db223ef0185c1f23b9c52b7d2f81a63515485219cfc016d72bda979248b
 DIST cuda_9.0.176_384.81_linux.run 1643293725 BLAKE2B 4155de544f877f6c420c2463bc68679cc89774f0516d1885d5c3f483ad86e7f25ecf6042b8240431b814230136f3026196a013bb18184fa2ec9af555bb7ea723 SHA512 00e24638c02d049c575732dee5237db21f7c451b606f37cf95e44e89d47d0cb055255e9f70dc013298c9e0d224147f239488558904556b68572e3f31935489a9
+DIST cuda_9.1.85_387.26_linux.run 1639829845 BLAKE2B c9f6544893b8e4d0b4c51d66f1cf17a593e65af6e7748e2994abda8ffcb839a7bb19cb0eebfbc52347293296025f000241d1c9842af0c41d31928770c4639b79 SHA512 492a5fa58fc93ac718ca093f24bb5e74dd2586338c42f2e11e328c7f16756e3511a1c555b12cb1990bb782d0d1600976f4c9e5b3d4857e371b0431daf06b2827
 EBUILD nvidia-cuda-sdk-6.5.19.ebuild 3992 BLAKE2B 3cd45f806009b7ef888c59c566af037109d20a6a4f5306ff6a6187266cfba019575f94c35df3780377a437074d630edcc88e3c4c3510a2511a27808f4d7d1012 SHA512 367460c2bc89549774ead4cde22c875ed3df9f8002fdd6666289649c6749295389204a11cd0cd6ab201cb2eed1e43d1cda45aea42b9864c9a7fb5ba813aaa04e
 EBUILD nvidia-cuda-sdk-7.5.18.ebuild 3568 BLAKE2B 45c89d2ea4116aa687ea797997cdf03bd7f14626ef49e505144ef9864aa88c7130878dee1896e0b0fbffec5b7815a4f753c1b5a71e4582676efb03aa62c0663a SHA512 199004e748db588de447c71ac2bddb08fdfbbc099a335ecbcd7e57978cc3cbb9cfdd6a87765c6b315cfac067248c133eeff1a98fc2e9d331a138ccb5266a1f7e
 EBUILD nvidia-cuda-sdk-8.0.44-r1.ebuild 3757 BLAKE2B 2a63de4062e746841c0e975aa68a5e40b358267b7682ca54bcad4c4b97ca3a1ac463c98ce081138d56013945cd22e9ff818d9b4391f8f6e15c1ddb8f4813aa70 SHA512 b2270c56dc77e85db6963c01965afb4a85b7acf3790630d955adf0d64d2ca09203c9423285684c99432037c8378dd5856c5ccf4b91a0b364f54c282765c149d9
 EBUILD nvidia-cuda-sdk-8.0.61.ebuild 3803 BLAKE2B bb1f549d41e64984e8b3ae629461f3bc616bb776324fd2d29e529a66453bb2304c8ad6d397e7c5b790d759455869b88f9796bf12f760a2816e651caa85226480 SHA512 91ed589b1841b6069e24ea8fd12fc55d73c7bca0b33cd6b7b37746fbd3c896ce8224a5622b7750720595d1f36a7daecc3661612148f58e6e6e79028b2a0333fa
 EBUILD nvidia-cuda-sdk-9.0.176.ebuild 3803 BLAKE2B af3448e2d60b3f1ba82594628a783d17fab1d5de9a45eb1a8974ad6b233a41ca447a38a593e88bb63ffacf67fda7b554b2fba5a77a326987c7755265004f5a49 SHA512 22d346ee211e410d74b110d62252e1299f4eb77a51295e329fd757a73010732d9d32c1c68f51b3b6e81af1e34207b3a74419e8df9a20e20632ca681ecc98cbf4
+EBUILD nvidia-cuda-sdk-9.1.85.ebuild 3798 BLAKE2B c10c6cd7aaef1b99089f36d319f7f5375fb117c3f8840fc367c44368a7cac7366d54f377c9d775207dec61d0ca67885ef2ba61a70daee4d5326453dc7e831f71 SHA512 e5c37b2319ffd7d91b4d24721ffbd4617aec28924ebef86ffd44d7a3de2eeebf726a6bf518cad195261e485f7fc8d4850565ba83186026962ca9d49e49bfdddb
 MISC metadata.xml 366 BLAKE2B 379204c3535fb9e98e2026ae695a62618006c42a590b13803db1990c07119a3a40e7bb4474c73f3717340987fc3ed2829dc9d6b0774103a2b4f6c0726bdf58d2 SHA512 174f0718320ba2b8c7b427d43ed2b35f781313cc97397958c5c4c49163ef6d02eae5658071238d764392905c403d13094c898f95f22e1a0360a24ae2a7d08459
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.1.85.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.1.85.ebuild
new file mode 100644
index 000000000000..1f648f706dc4
--- /dev/null
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.1.85.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cuda flag-o-matic portability toolchain-funcs unpacker versionator
+
+MYD=$(get_version_component_range 1-2)
+DRIVER_PV="387.26"
+
+DESCRIPTION="NVIDIA CUDA Software Development Kit"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod2/local_installers/cuda_${PV}_${DRIVER_PV}_linux -> cuda_${PV}_${DRIVER_PV}_linux.run"
+
+LICENSE="CUDPP"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="+cuda debug +doc +examples opencl mpi"
+
+RDEPEND="
+	~dev-util/nvidia-cuda-toolkit-${PV}
+	media-libs/freeglut
+	examples? (
+		media-libs/freeimage
+		media-libs/glew:0=
+		>=x11-drivers/nvidia-drivers-${DRIVER_PV}[uvm]
+		mpi? ( virtual/mpi )
+		)"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+S=${WORKDIR}/samples
+
+QA_EXECSTACK=(
+	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
+	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
+	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
+	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
+	)
+
+src_unpack() {
+	# We first need to unpack the cuda_${PV}_linux.run file
+	# which includes the cuda-samples*run file.
+	unpacker
+	unpacker run_files/cuda-samples*run
+}
+
+pkg_setup() {
+	if use cuda || use opencl; then
+		cuda_pkg_setup
+	fi
+}
+
+src_prepare() {
+	export RAWLDFLAGS="$(raw-ldflags)"
+#	epatch "${FILESDIR}"/${P}-asneeded.patch
+
+	local file
+	while IFS="" read -d $'\0' -r file; do
+		sed \
+			-e 's:-O[23]::g' \
+			-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
+			-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
+			-e "/CC/s:gcc:$(tc-getCC):g" \
+			-e "/GCC/s:g++:$(tc-getCXX):g" \
+			-e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
+			-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
+			-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
+			-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
+			-e 's:-Wimplicit::g' \
+			-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
+			-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
+			-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
+			-i "${file}" || die
+			# -e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
+	done < <(find . -type f -name 'Makefile' -print0)
+
+	rm -rf common/inc/GL || die
+	find . -type f -name '*.a' -delete || die
+
+	eapply_user
+}
+
+src_compile() {
+	use examples || return
+	local myopts=("verbose=1")
+	use debug && myopts+=("dbg=1")
+	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
+	emake \
+		cuda-install="${EPREFIX}/opt/cuda" \
+		CUDA_PATH="${EPREFIX}/opt/cuda/" \
+		MPI_GCC=10 \
+		"${myopts[@]}"
+}
+
+src_test() {
+	addwrite /dev/nvidiactl
+	addwrite /dev/nvidia0
+
+	local i
+	for i in {0..9}*/*; do
+		emake -C "${i}" run
+	done
+}
+
+src_install() {
+	local f t crap=( *.txt Samples.htm* )
+
+	if use doc; then
+		ebegin "Installing docs ..."
+			while IFS="" read -d $'\0' -r f; do
+				treecopy "${f}" "${ED%/}"/usr/share/doc/${PF}/
+			done < <(find -type f \( -name 'readme.txt' -o -name '*.pdf' \) -print0)
+
+			while IFS="" read -d $'\0' -r f; do
+				docompress -x "${f#${ED%/}}"
+			done < <(find "${ED%/}"/usr/share/doc/${PF}/ -type f -name 'readme.txt' -print0)
+		eend
+	fi
+
+	ebegin "Cleaning before installation..."
+		for f in "${crap[@]}"; do
+			rm -f "${f}" || die
+		done
+		find -type f \( -name '*.o' -o -name '*.pdf' -o -name 'readme.txt' \) -delete || die
+	eend
+
+	ebegin "Moving files..."
+		while IFS="" read -d $'\0' -r f; do
+			t="$(dirname ${f})"
+			if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
+				continue
+			fi
+			if [[ -x ${f} ]]; then
+				exeinto /opt/cuda/sdk/"${t}"
+				doexe "${f}"
+			else
+				insinto /opt/cuda/sdk/"${t}"
+				doins "${f}"
+			fi
+		done < <(find . -type f -print0)
+	eend
+}