[gentoo-commits] gentoo-x86 commit in dev-util/nvidia-cuda-toolkit: ChangeLog nvidia-cuda-toolkit-2.2-r1.ebuild

[Michael Januszewski (spock)]

spock       09/07/05 07:00:11

  Modified:             ChangeLog nvidia-cuda-toolkit-2.2-r1.ebuild
  Log:
  Use system Qt4 libraries on x86.  Restrict binchecks as this is a binary package.
  (Portage version: 2.1.6.13/cvs/Linux x86_64)

Revision  Changes    Path
1.7                  dev-util/nvidia-cuda-toolkit/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog?r1=1.6&r2=1.7

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ChangeLog	19 Jun 2009 23:57:06 -0000	1.6
+++ ChangeLog	5 Jul 2009 07:00:11 -0000	1.7
@@ -1,6 +1,11 @@
 # 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.6 2009/06/19 23:57:06 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.7 2009/07/05 07:00:11 spock Exp $
+
+  05 Jul 2009; Michał Januszewski <spock@g.o>
+  nvidia-cuda-toolkit-2.2-r1.ebuild:
+  Use system Qt4 libraries on x86. Restrict binchecks as this is a binary
+  package.
 
 *nvidia-cuda-toolkit-2.2-r1 (19 Jun 2009)
 



1.2                  dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.2-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.2-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.2-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.2-r1.ebuild?r1=1.1&r2=1.2

Index: nvidia-cuda-toolkit-2.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.2-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nvidia-cuda-toolkit-2.2-r1.ebuild	19 Jun 2009 23:57:06 -0000	1.1
+++ nvidia-cuda-toolkit-2.2-r1.ebuild	5 Jul 2009 07:00:11 -0000	1.2
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2009/06/19 23:57:06 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.2-r1.ebuild,v 1.2 2009/07/05 07:00:11 spock Exp $
 
 EAPI=2
 
@@ -20,9 +20,15 @@
 KEYWORDS="~amd64 ~x86"
 IUSE="doc profiler"
 
-DEPEND="!dev-util/nvidia-cuda-profiler"
-RDEPEND=""
-RESTRICT="strip"
+DEPEND="!dev-util/nvidia-cuda-profiler
+	profiler? (	x86? (
+		x11-libs/qt-gui
+		x11-libs/qt-core
+		x11-libs/qt-assistant
+		x11-libs/qt-sql[sqlite] )
+	)"
+RDEPEND="${DEPEND}"
+RESTRICT="strip binchecks"
 
 S="${WORKDIR}"
 
@@ -81,28 +87,35 @@
 	newenvd "${T}/env" 99cuda
 
 	if use profiler; then
-		# Visual profiler needs qt4.
-		# TODO: use system libraries on x86 systems.
 		into ${DEST}/cudaprof
-		dobin cudaprof/bin/{cudaprof,assistant}
-		insinto ${DEST}/cudaprof/bin
-		doins cudaprof/bin/*.so*
-		insinto ${DEST}/cudaprof/bin/sqldrivers
-		doins cudaprof/bin/sqldrivers/*
-
-		if use doc; then
-			insinto ${DEST}/cudaprof/doc
-			doins cudaprof/doc/*
-			insinto ${DEST}/cudaprof/projects
-			doins cudaprof/projects/*
-		fi
+		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
 }