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

["Christoph Junghans" <ottxor@gentoo.org>]

commit:     664673fd5daf989c14a27fbd0e4f32a6c1863094
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Wed Nov 19 11:29:26 2014 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Wed Nov 19 11:29:26 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=664673fd

nvidia-cuda-gdk: Add ~x86 keyword

---
 dev-util/nvidia-cuda-gdk/ChangeLog                    |  4 ++++
 .../nvidia-cuda-gdk/nvidia-cuda-gdk-340.29.ebuild     | 19 +++++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/dev-util/nvidia-cuda-gdk/ChangeLog b/dev-util/nvidia-cuda-gdk/ChangeLog
index 6e289bb..58f8973 100644
--- a/dev-util/nvidia-cuda-gdk/ChangeLog
+++ b/dev-util/nvidia-cuda-gdk/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Nov 2014; Marius Brehler <marbre@linux.sungazer.de>
+  nvidia-cuda-gdk-340.29.ebuild:
+  Add ~x86 keyword
+
 *nvidia-cuda-gdk-340.29 (18 Nov 2014)
 
   18 Nov 2014; Marius Brehler <marbre@linux.sungazer.de>

diff --git a/dev-util/nvidia-cuda-gdk/nvidia-cuda-gdk-340.29.ebuild b/dev-util/nvidia-cuda-gdk/nvidia-cuda-gdk-340.29.ebuild
index a11c79b..54ec87a 100644
--- a/dev-util/nvidia-cuda-gdk/nvidia-cuda-gdk-340.29.ebuild
+++ b/dev-util/nvidia-cuda-gdk/nvidia-cuda-gdk-340.29.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="NVIDIA-gdk"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="+healthmon +nvml +doc examples"
 
 RDEPEND="
@@ -41,13 +41,20 @@ src_compile() {
 }
 
 src_install() {
-	local i j f t
+	local i j f t ARCH
+	if use amd64; then
+		ARCH=amd64;
+	elif use x86; then
+		ARCH=x86;
+	else
+		die;
+	fi
 
 	if use doc; then
 		if use healthmon ; then
 			ebegin "Installing healthmon docs..."
 				doman nvidia-healthmon/docs/man/man8/nvidia-healthmon.8
-				cd "${S}/nvidia-healthmon/nvidia-healthmon-amd64-${PV}" || die
+				cd "${S}/nvidia-healthmon/nvidia-healthmon-${ARCH}-${PV}" || die
 				treecopy $(find -type f \( -name README.txt -name COPYING.txt -o -name "*.pdf" \)) "${ED}"/usr/share/doc/${PF}/nvidia-healthmon/
 				docompress -x $(find "${ED}"/usr/share/doc/${PF}/nvidia-healthmon/ -type f -name readme.txt | sed -e "s:${ED}::")
 				cd "${S}/" || die
@@ -72,11 +79,11 @@ src_install() {
 	if use healthmon; then
 		ebegin "Installing nvidia-healthmon"
 			exeinto "/opt/cuda/gdk/nvidia-healthmon/nvidia-healthmon-tests/"
-			doexe "nvidia-healthmon/nvidia-healthmon-amd64-${PV}/bin"/{*,*.*}
+			doexe "nvidia-healthmon/nvidia-healthmon-${ARCH}-${PV}/bin"/{*,*.*}
 			exeinto "/opt/cuda/gdk/nvidia-healthmon/"
-			doexe "nvidia-healthmon/nvidia-healthmon-amd64-${PV}"/nvidia-healthmon
+			doexe "nvidia-healthmon/nvidia-healthmon-${ARCH}-${PV}"/nvidia-healthmon
 			insinto "/etc/nvidia-healthmon/"
-			doins "nvidia-healthmon/nvidia-healthmon-amd64-${PV}"/nvidia-healthmon.conf
+			doins "nvidia-healthmon/nvidia-healthmon-${ARCH}-${PV}"/nvidia-healthmon.conf
 
 			# install launch script
 			exeinto /opt/bin