Use system Qt4 libraries on x86. Restrict binchecks as this is a binary package.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

3 files changed, 43 insertions, 25 deletions

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index 1851279cd425..6c0602360743 100644
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -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@gentoo.org>
+  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)
 
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index b8a0bfbf2f8b..e55ec194724f 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -10,14 +10,14 @@ DIST cudatoolkit_2.2_linux_32_suse11.1.run 28234843 RMD160 50cd85effc3188ee83622
 DIST cudatoolkit_2.2_linux_64_suse11.1.run 29640032 RMD160 8288a864304757847e5ec72445955c4b8890563d SHA1 c30bd24e4ef81e8c4369e38b2910e9de0afe9fd3 SHA256 3c87763084fef5e5854041b46420e71946136e07d5e4fa17721e1b4a83ade965
 EBUILD nvidia-cuda-toolkit-2.0.ebuild 1615 RMD160 b61ecb10eaae317d72e63b961f59903c7f9f12c2 SHA1 8a4f1729d0d54b64a653206b483c67ccdbfcfad6 SHA256 e211a0908ad6721867f59fa95b96d950a21738869fcfd6e43ee72c9cedc6e327
 EBUILD nvidia-cuda-toolkit-2.1.ebuild 1708 RMD160 310a568cf25b0fd171f55c5b9a7a5c32eb5ad994 SHA1 ad205269eec4d4a49e4343dc95139e89b35384d9 SHA256 faca233fb1464c5ce6053a4fd44af657215189d7a0ac4e728884bc2b8f8dede1
-EBUILD nvidia-cuda-toolkit-2.2-r1.ebuild 2452 RMD160 76054c24bddd6cb2be053f6d6b72dbeff0c61eb2 SHA1 020c10b54a80408cde72e9608fc08630429fa203 SHA256 f423c48c40d46fb95f9ae3d8bc45773e3761482c03a5674b892345c6b03d4451
+EBUILD nvidia-cuda-toolkit-2.2-r1.ebuild 2644 RMD160 dbe9a6f046aafc08ff33d8b9b5e49597975e371e SHA1 1c943f9af9660962fb5b96d0c1217d9495939791 SHA256 419ce811b7003f44d91b2c6cc0554b1ffa1c853512bc54ec4fc2ca4f98a2a59f
 EBUILD nvidia-cuda-toolkit-2.2.ebuild 1741 RMD160 cb7a54b18f3480e9d6851f816befa0a489e81e33 SHA1 f2e214414c3b98053c9b4157c4ba9f0e62821f7c SHA256 a7565064e53b9cb18aa15bad3a189ece913fafdd170a2f05353650b934b8887b
-MISC ChangeLog 1364 RMD160 38dec7d9a3d1ba2149984d2644eca351b0c50bdb SHA1 a1c0763666fed91aa1a09f58e8c06e34543ddb4e SHA256 88e7233c3eea3ac2e8d58d975338ca5680dc25a67b87c7304af8896ff37518ca
+MISC ChangeLog 1541 RMD160 28eb369a8fa327fe69d729b2bee48376440ea520 SHA1 ed22d2f64dcdd2e0ab632111c5ee58b83a2d779b SHA256 358da8c14a35638f8763d991d0454e78064a2bd29006daa03dcd993504bd08f0
 MISC metadata.xml 355 RMD160 61a9a4dc51bce1060798e97b65a0994791f18536 SHA1 abf0f34bfed6dd1885ea7455d278c1a51a8445fa SHA256 7156b57a062096801a6610f46f0b7acdc2f65e5bf9b283a323e81b184edfb4f7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.12 (GNU/Linux)
 
-iEYEARECAAYFAko8JYUACgkQchej4aZK9/eGZACcCztImMMfPRlxw9AorvoZvFOM
-AiQAn0/QEvPuZcnLkvVLgNltH5KFLvf/
-=QooY
+iEYEARECAAYFAkpQT4gACgkQchej4aZK9/deQgCcC+/brwfIby+eJdkbFqBTgsYV
+ft0AnRjK7YfQ3n9EO+XG2yqxnaFSnJwh
+=2YKc
 -----END PGP SIGNATURE-----
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.2-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.2-r1.ebuild
index 4ae1f0c3c997..6b2af0ad23b9 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.2-r1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.2-r1.ebuild
@@ -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 @@ SLOT="0"
 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 @@ EOF
 	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
 }