Apply patch for cuda detection. Per bug #270292. Thanks to Poly-C for patch.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 24 insertions, 14 deletions

diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog
index 676f5e607410..1db5ef72affb 100644
--- a/sci-misc/boinc/ChangeLog
+++ b/sci-misc/boinc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-misc/boinc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.64 2009/05/20 17:02:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.65 2009/05/29 16:42:45 scarabeus Exp $
+
+  29 May 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  boinc-6.4.5-r2.ebuild, files/boinc.init:
+  Apply patch for cuda detection. Per bug #270292. Thanks to Poly-C for
+  patch.
 
   20 May 2009; Tomas Chvatal <scarabeus@gentoo.org> boinc-6.4.5-r2.ebuild:
   Move from Education;Science; to Math;Science; Per bug #269858.
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index c22a0720a7a7..8b0cdbf74849 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 6.4.5-RSA_security.patch 2413 RMD160 8bf2d0573fedbdbc54f0c479747a23f0ff840f22 SHA1 e5fcafdd0da06a8a59350ff85cf3725e9ff8cede SHA256 f21a6904459ffcfd40cc0804d4a7f46e5a9ef013c217f204e100a8adf8cd4f87
 AUX 6.4.5-gcc44.patch 1831 RMD160 82aaff8e51077c712b318a473a77a69ec1e1b615 SHA1 bdd2f4baa48d7949d37150e926dcd0a0625caaf8 SHA256 63d9005aab4e60522f32484694c42f70d291b492c76a839aff348be052845fc4
 AUX 6.4.5-nostrip.patch 1052 RMD160 9a23c9cd8f3a47fe53fe8cccfca6d0b94587f716 SHA1 bae0a9de0c0980fd1f64e8b60a74548554dbe382 SHA256 f301d68819c4d93b930d4179ff2bb604d23ca7e221d843c6ed6cf65f27a53da2
 AUX boinc.conf 711 RMD160 b6bb25b9d10cbefd3de5d653e701e056e2de4587 SHA1 570929cb4ed50d4fc4408624c4d0d330e208609c SHA256 032f07145ee230f069ffdc93befe90c047fba4314aedfc8024bdb44c06798e9e
-AUX boinc.init 3083 RMD160 5e3dffe7cf45f91b340b9e2bfd2986b1b2a25b36 SHA1 3fb5ab86d900c71ae3546f979fe8953082a7b884 SHA256 06508a2a77854e2ad08d61a796d9c3a49e00d9e35850afabf67e60b275e08bcf
+AUX boinc.init 3073 RMD160 efe2e943e09f6bfd37c44d9d2a41aeb8a0ed8bd6 SHA1 c04a3cb684968830cb9314bd7afab5f66b5c69ac SHA256 a52949230afb6e2b5af0c87a0f32210e5885fa3ef02dfbfcc0a411e3e1948200
 DIST boinc-6.4.5.tar.bz2 7639286 RMD160 8f7232a3e7d273076f6b2ae50b565550c03485cc SHA1 24c63d11c8e9ebda17beac359928407ce3b8678d SHA256 f6f1d053f10873ed9b3b6ce8dc4444a49f6c804196a3eb080f574db36e58557a
-EBUILD boinc-6.4.5-r2.ebuild 4461 RMD160 9d8888d0d620da64651e21ebcc103fc56dad599c SHA1 741c13662fb0fa04c52e33d21a0889f4115e2d99 SHA256 d0a6157a711a4beec36cac41b205f47419796197971e739906f5d67cafb8f2e3
-MISC ChangeLog 12304 RMD160 73451bb15f5b2e730668837017b0989e9783acd1 SHA1 2139f0495ae403a6b61a96076836069dc2a1f029 SHA256 84c69b0c757e9231aef692ce9fd4933d0877e508490ef7c36861c390be3dc068
+EBUILD boinc-6.4.5-r2.ebuild 4266 RMD160 cf602867d9b53436dd72c7ed6d11810b7b703266 SHA1 4e7e46c1530a8405de1f795bf37d0e6c92f8e08e SHA256 360773ad414711b116e84a9aad4a840f154112f0d861448a9e51039e7b214623
+MISC ChangeLog 12484 RMD160 93e03257bff765e02b5bc56e426932f05768840c SHA1 cb74a3a95c0d6308cd2fbecf6952e03f1c81c93d SHA256 c7104ee6c0a0a0e8b15d123682753076ea92bb6c3338f37cc08ac805ffde5737
 MISC metadata.xml 697 RMD160 8cfc36bbae9395d2675629d68af1c6354244bd5f SHA1 bcfd28d367a81a6fa8b6a548703270cb066a9392 SHA256 614f44eeb4b76fccb040b9ab7dee69e50152c930a9224946010f39e7eed6e04c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkogEJEACgkQHB6c3gNBRYe0uQCcDaHRiworOJGD6+S9SnOmjM7l
+YmUAoL98Vixfr1VPTHrCGRXqgDksuzs3
+=xFAL
+-----END PGP SIGNATURE-----
diff --git a/sci-misc/boinc/boinc-6.4.5-r2.ebuild b/sci-misc/boinc/boinc-6.4.5-r2.ebuild
index 736d16a5cda5..6222df1eb21a 100644
--- a/sci-misc/boinc/boinc-6.4.5-r2.ebuild
+++ b/sci-misc/boinc/boinc-6.4.5-r2.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/sci-misc/boinc/boinc-6.4.5-r2.ebuild,v 1.2 2009/05/20 17:02:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.4.5-r2.ebuild,v 1.3 2009/05/29 16:42:45 scarabeus Exp $
 
 #
 # Don't forget to keep things in sync with binary boinc package!
@@ -8,7 +8,7 @@
 
 EAPI="2"
 
-inherit flag-o-matic depend.apache eutils wxwidgets multilib
+inherit flag-o-matic depend.apache eutils wxwidgets
 
 DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
 HOMEPAGE="http://boinc.ssl.berkeley.edu/"
@@ -124,12 +124,7 @@ src_install() {
 	rm "${D}"/usr/bin/ca-bundle.crt
 	rm -rf "${D}"/etc/
 
-	# initd script needs to be multilib aware
-	cp "${FILESDIR}"/${PN}.init "${T}"
-	sed -i \
-		-e "s:%LIBDIR%:$(get_libdir):g" \
-		"${T}"/${PN}.init || die "sed for multilib in init script failed"
-	newinitd "${T}"/${PN}.init ${PN}
+	newinitd "${FILESDIR}"/${PN}.init ${PN}
 	newconfd "${FILESDIR}"/${PN}.conf ${PN}
 }
 
diff --git a/sci-misc/boinc/files/boinc.init b/sci-misc/boinc/files/boinc.init
index 6e31db676682..88bf507201cf 100644
--- a/sci-misc/boinc/files/boinc.init
+++ b/sci-misc/boinc/files/boinc.init
@@ -30,9 +30,9 @@ generate_logs() {
 }
 
 cuda_check() {
-	if [[ -f /opt/cuda/%LIBDIR%/libcudart.so ]]; then
+	if [[ -f /opt/cuda/lib/libcudart.so ]]; then
 		# symlink wont harm :]
-		ln -snf /opt/cuda/%LIBDIR%/libcudart.so ${RUNTIMEDIR}/libcudart.so
+		ln -snf /opt/cuda/lib/libcudart.so ${RUNTIMEDIR}/libcudart.so
 	fi
 }