From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 72677138ACE for ; Mon, 24 Nov 2014 16:20:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47C45E085C; Mon, 24 Nov 2014 16:20:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BA883E085C for ; Mon, 24 Nov 2014 16:20:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 80F1934049E for ; Mon, 24 Nov 2014 16:20:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EC658AD08 for ; Mon, 24 Nov 2014 16:20:07 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: <1416396566.664673fd5daf989c14a27fbd0e4f32a6c1863094.ottxor@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-gdk/ X-VCS-Repository: proj/sci X-VCS-Files: dev-util/nvidia-cuda-gdk/ChangeLog dev-util/nvidia-cuda-gdk/nvidia-cuda-gdk-340.29.ebuild X-VCS-Directories: dev-util/nvidia-cuda-gdk/ X-VCS-Committer: ottxor X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: 664673fd5daf989c14a27fbd0e4f32a6c1863094 X-VCS-Branch: master Date: Mon, 24 Nov 2014 16:20:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7c8db4a4-a8b5-465c-b109-d81af3522159 X-Archives-Hash: 04279e49467553da8908d9b0ea8b56a6 commit: 664673fd5daf989c14a27fbd0e4f32a6c1863094 Author: Marius Brehler linux sungazer de> AuthorDate: Wed Nov 19 11:29:26 2014 +0000 Commit: Christoph Junghans gentoo 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 + nvidia-cuda-gdk-340.29.ebuild: + Add ~x86 keyword + *nvidia-cuda-gdk-340.29 (18 Nov 2014) 18 Nov 2014; Marius Brehler 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