Fix multilib support for cuda. Per bug #266637.

Package-Manager: portage-2.2_rc30/cvs/Linux x86_64

4 files changed, 21 insertions, 10 deletions

diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog
index 67b576b81995..2c545e729c85 100644
--- a/sci-misc/boinc/ChangeLog
+++ b/sci-misc/boinc/ChangeLog
@@ -1,6 +1,10 @@
 # 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.58 2009/03/30 14:00:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.59 2009/04/23 16:00:16 scarabeus Exp $
+
+  23 Apr 2009; Tomas Chvatal <scarabeus@gentoo.org> files/boinc.init,
+  boinc-6.4.5-r1.ebuild:
+  Fix multilib support for cuda. Per bug #266637.
 
   30 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> boinc-6.4.5-r1.ebuild:
   Add block on quickswitch since their files collide. Per bug #210877.
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index 2a8465186638..5bb4f81035e0 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,7 +1,7 @@
 AUX 6.4.5-RSA_security.patch 2413 RMD160 8bf2d0573fedbdbc54f0c479747a23f0ff840f22 SHA1 e5fcafdd0da06a8a59350ff85cf3725e9ff8cede SHA256 f21a6904459ffcfd40cc0804d4a7f46e5a9ef013c217f204e100a8adf8cd4f87
 AUX boinc.conf 711 RMD160 b6bb25b9d10cbefd3de5d653e701e056e2de4587 SHA1 570929cb4ed50d4fc4408624c4d0d330e208609c SHA256 032f07145ee230f069ffdc93befe90c047fba4314aedfc8024bdb44c06798e9e
-AUX boinc.init 2984 RMD160 c257b4fcf0eb99499b603dcf9a76384a55fba6a1 SHA1 57a85836571824fae1a14379697264f5db42b70a SHA256 5f21375d6fd6dc4402db1d7afaf540202a461a029afc9b2be37fb8bc4ad96805
+AUX boinc.init 2994 RMD160 8be77d31066cad14ffd976910e1007f88ae3012e SHA1 2f260f6d484d5b3ebb81b10ca7c68d322dd9079f SHA256 af7c58b8f15fd77fca4f56e67144f0c45e2230567363a29839d94033bca59df1
 DIST boinc-6.4.5.tar.bz2 7639286 RMD160 8f7232a3e7d273076f6b2ae50b565550c03485cc SHA1 24c63d11c8e9ebda17beac359928407ce3b8678d SHA256 f6f1d053f10873ed9b3b6ce8dc4444a49f6c804196a3eb080f574db36e58557a
-EBUILD boinc-6.4.5-r1.ebuild 4029 RMD160 2409879948a41c535b24bc37ae2acd8413419cf2 SHA1 6d3703b576b8e552f9719fa141a97e2d093110ab SHA256 903d733081a1c8c1749353cda3f6a01f84fe6e2aac75cd510b215d1c43b7f040
-MISC ChangeLog 11356 RMD160 e46fd3aeed75092b369b046dd66eb6402e30a5d0 SHA1 df3cdb7320d864e19ab03eede780d587f4f942ac SHA256 4ed8202b775719f6d94160004eef43bda6d83f8f3a4d0c8adb2403160b054535
+EBUILD boinc-6.4.5-r1.ebuild 4333 RMD160 5170c5b67ea73b7cc1498e61997924983ec18f35 SHA1 518e6490d61f3f0d0f068d113c4184946eb38f9b SHA256 f863c7c08ac7d69864202310af44acce68f6ae151be61d3d66bbb26b4e0e16f7
+MISC ChangeLog 11502 RMD160 e61f5032768981701882849bdd88db9063a156d7 SHA1 7d2b20b1c3acb5ae3d4aa0b4efad4a276ea62d9e SHA256 3976ddacc3ebcdacd757d2572d916d2c8e749f03628c896b9cdedeb7d8cad03e
 MISC metadata.xml 697 RMD160 8cfc36bbae9395d2675629d68af1c6354244bd5f SHA1 bcfd28d367a81a6fa8b6a548703270cb066a9392 SHA256 614f44eeb4b76fccb040b9ab7dee69e50152c930a9224946010f39e7eed6e04c
diff --git a/sci-misc/boinc/boinc-6.4.5-r1.ebuild b/sci-misc/boinc/boinc-6.4.5-r1.ebuild
index b0629d764fd0..ffdb8d2968a9 100644
--- a/sci-misc/boinc/boinc-6.4.5-r1.ebuild
+++ b/sci-misc/boinc/boinc-6.4.5-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/sci-misc/boinc/boinc-6.4.5-r1.ebuild,v 1.4 2009/03/30 14:00:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.4.5-r1.ebuild,v 1.5 2009/04/23 16:00:16 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
+inherit flag-o-matic depend.apache eutils wxwidgets multilib
 
 DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
 HOMEPAGE="http://boinc.ssl.berkeley.edu/"
@@ -102,7 +102,7 @@ src_configure() {
 }
 
 src_compile() {
-	# disable paralel build.
+	# disable parallel build.
 	emake -j1 || die "emake failed"
 }
 
@@ -121,12 +121,19 @@ src_install() {
 	rm "${D}"/usr/bin/ca-bundle.crt
 	rm -rf "${D}"/etc/
 
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
+	# 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}
 	newconfd "${FILESDIR}"/${PN}.conf ${PN}
 }
 
 pkg_setup() {
 	enewgroup ${PN}
+	# note this works only for first install so we have to
+	# elog user about the need of being in video group
 	if use cuda; then
 		enewuser ${PN} -1 -1 /var/lib/${PN} "${PN},video"
 	else
diff --git a/sci-misc/boinc/files/boinc.init b/sci-misc/boinc/files/boinc.init
index 5897b50c8c40..3735c4bd12f1 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/lib/libcudart.so ]]; then
+	if [[ -f /opt/cuda/%LIBDIR%/libcudart.so ]]; then
 		# symlink wont harm :]
-		ln -snf /opt/cuda/lib/libcudart.so $RUNTIMEDIR/libcudart.so
+		ln -snf /opt/cuda/%LIBDIR%/libcudart.so $RUNTIMEDIR/libcudart.so
 	fi
 }