Added patch to allow linking on systems with older boinc versions installed.

Package-Manager: portage-2.0.53

4 files changed, 38 insertions, 7 deletions

diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog
index 9b9aee34b38c..1e8cb04b652a 100644
--- a/sci-misc/boinc/ChangeLog
+++ b/sci-misc/boinc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-misc/boinc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.16 2005/12/05 18:34:10 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.17 2005/12/11 21:23:28 cryos Exp $
+
+  11 Dec 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  +files/08_all_Makefile.patch, boinc-5.2.14.ebuild:
+  Added patch to allow linking on systems with older boinc versions installed.
 
 *boinc-5.2.14 (05 Dec 2005)
 
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index fa2252ea7713..83a6c0523098 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,9 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 3fa51d083f27f623ef8ff3ff7257da0c ChangeLog 3784
+MD5 c8aef4af75c0ec92d841819c55edfe0f ChangeLog 3969
 MD5 2e4104084577e624961e3622335525e5 boinc-4.72.20050813-r3.ebuild 2323
-MD5 42f12ca0814942fcc1d29b9971ca4285 boinc-5.2.14.ebuild 2331
+MD5 3356cfae15b028ba11bb777339309196 boinc-5.2.14.ebuild 2373
+MD5 52c02ebc56426be6995963efa6cdd075 files/08_all_Makefile.patch 792
 MD5 603e1bde6bb2873a014b6b8984e21564 files/boinc-4.72.20050813-gcc4-fix.patch 315
 MD5 5418cddcce4923a19fdf0c6bafea11bf files/boinc.conf 440
 MD5 2e064f401619e4905a21342edec0f4e7 files/boinc.init 1732
@@ -13,7 +14,7 @@ MD5 4b2e94b92c84896e0204d9e7710f9c6a metadata.xml 420
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDlIgxntT9W3vfTuoRApaqAKCimc7BbE5w7iabPIDIytkJprRJXACfWjb6
-m53XKFc5tN4B4c6nWvHVxAU=
-=VVvi
+iD8DBQFDnJjqntT9W3vfTuoRAh21AKCmCTug1XnbSKqg6P6Be30ZeefGdQCcDLLg
+pA0zDVGz7FGf8YQFYJf8eEM=
+=axEd
 -----END PGP SIGNATURE-----
diff --git a/sci-misc/boinc/boinc-5.2.14.ebuild b/sci-misc/boinc/boinc-5.2.14.ebuild
index 8f9e84a392dd..0bd92ef5820e 100644
--- a/sci-misc/boinc/boinc-5.2.14.ebuild
+++ b/sci-misc/boinc/boinc-5.2.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-5.2.14.ebuild,v 1.1 2005/12/05 18:34:10 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-5.2.14.ebuild,v 1.2 2005/12/11 21:23:28 cryos Exp $
 
 inherit eutils
 
@@ -43,6 +43,7 @@ src_unpack() {
 
 	# Applu patches, most of which from Debian
 	EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" epatch
+	epatch ${FILESDIR}/08_all_Makefile.patch
 
 	# point to a proper mouse device
 	sed -e "s:/dev/mouse:/dev/input/mice:g" -i client/hostinfo_unix.C || die
diff --git a/sci-misc/boinc/files/08_all_Makefile.patch b/sci-misc/boinc/files/08_all_Makefile.patch
new file mode 100644
index 000000000000..4968ed7bbaee
--- /dev/null
+++ b/sci-misc/boinc/files/08_all_Makefile.patch
@@ -0,0 +1,25 @@
+# 08_all-Makefile.patches by Marcus D. Hanwell <cryos@gentoo.org>
+#
+# Link to ../lib with a higher precedence than /usr/lib - allows upgrades
+--- client/Makefile.in	2005-12-05 01:28:26.000000000 +0000
++++ client/Makefile.in	2005-12-11 21:00:07.000000000 +0000
+@@ -336,7 +336,7 @@
+ 
+ AM_CFLAGS = $(AM_CPPFLAGS)
+ AM_CXXFLAGS = $(AM_CPPFLAGS)
+-AM_LDFLAGS = 
++AM_LDFLAGS = -L../lib
+ 
+ # dependencies to make sure libs gets compiled before
+ # programs linking to them:
+--- clientgui/Makefile.in	2005-12-11 21:07:55.000000000 +0000
++++ clientgui/Makefile.in	2005-12-11 21:07:29.000000000 +0000
+@@ -354,7 +354,7 @@
+ 
+ AM_CFLAGS = $(AM_CPPFLAGS)
+ AM_CXXFLAGS = $(AM_CPPFLAGS)
+-AM_LDFLAGS = 
++AM_LDFLAGS = -L../lib
+ 
+ # dependencies to make sure libs gets compiled before
+ # programs linking to them: