Fix glibc-2.10 compilation issues. Per bug #276868. Thx to Joost Ruis for the patch.

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

4 files changed, 36 insertions, 5 deletions

diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog
index 14f3c0cd38e6..ad4c3f8d54be 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.67 2009/07/24 10:58:33 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.68 2009/07/29 11:48:31 scarabeus Exp $
+
+  29 Jul 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/6.4.5-glibc210.patch, boinc-6.4.5-r2.ebuild:
+  Fix glibc-2.10 compilation issues. Per bug #276868. Thx to Joost Ruis for
+  the patch.
 
   24 Jul 2009; Tomáš Chvátal <scarabeus@gentoo.org> files/boinc.init:
   Remove bashism in initscript. Per bug #278811. Thanks to Michał Górny
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index 3fbb093e31cd..a118deb1f1b1 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,9 +1,20 @@
+-----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-glibc210.patch 300 RMD160 0ca2f52c4265cf5a5763a7c1e2ce27bdc929bde8 SHA1 5a5a51b299e52d8a9ceba8c454b35488260721ea SHA256 b39db0c5208fc3c0a89ae0b0d809e5f8f72e7494c98e1b0b23eadcc5c8243377
 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 3167 RMD160 13383850fc040ed8dfd7d9e71fa36b62fd080c89 SHA1 14f1a9386ebd8d95626c60bbdae8935f8d49e535 SHA256 ac3b25f51f300270661ab5fbd12f9859e23ea18481010ab1f1d76a3f12d9dc21
 DIST boinc-6.4.5.tar.bz2 7639286 RMD160 8f7232a3e7d273076f6b2ae50b565550c03485cc SHA1 24c63d11c8e9ebda17beac359928407ce3b8678d SHA256 f6f1d053f10873ed9b3b6ce8dc4444a49f6c804196a3eb080f574db36e58557a
-EBUILD boinc-6.4.5-r2.ebuild 4266 RMD160 cf602867d9b53436dd72c7ed6d11810b7b703266 SHA1 4e7e46c1530a8405de1f795bf37d0e6c92f8e08e SHA256 360773ad414711b116e84a9aad4a840f154112f0d861448a9e51039e7b214623
-MISC ChangeLog 12769 RMD160 6aed816f0c7959ef85f621264b16c49a47935b56 SHA1 62862de651c2710c504177a8c974cfc0c016ca57 SHA256 dba7369e5ba57755f02ed7c4895636ad4e9f97ca9556d8d0ba01a644c8885774
+EBUILD boinc-6.4.5-r2.ebuild 4359 RMD160 83d148188fd43b08c1b8912c71fdb80e86066509 SHA1 e5ffaf2626113ca936397b74f8c957fe8d3412b6 SHA256 0b22de626ebeceaf99bb6775c604e868408206fd3624b40bd30ec8afbb9946e4
+MISC ChangeLog 12968 RMD160 8b80c8e4d8c94e7cd8960815adad277c048700d2 SHA1 d78a86987efa1f5217f73d43843ca1bf1105a3c2 SHA256 018261576ab2b5616a84a3004809d59909cb615b325484bcd5f7bdeac08c23cf
 MISC metadata.xml 697 RMD160 8cfc36bbae9395d2675629d68af1c6354244bd5f SHA1 bcfd28d367a81a6fa8b6a548703270cb066a9392 SHA256 614f44eeb4b76fccb040b9ab7dee69e50152c930a9224946010f39e7eed6e04c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpwNxgACgkQHB6c3gNBRYfNNgCguP7c7jxliMe8UUKIFOr3m2Dh
+8j8AoJb8f7JT9R5IZThkv9yUrtoAgyoo
+=UFtI
+-----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 6222df1eb21a..275ed685aeb0 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.3 2009/05/29 16:42:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.4.5-r2.ebuild,v 1.4 2009/07/29 11:48:31 scarabeus Exp $
 
 #
 # Don't forget to keep things in sync with binary boinc package!
@@ -55,10 +55,12 @@ src_prepare() {
 	# RSA Security bug fix. Per bug #258011
 	# GCC 4.4 Compilation issue. Per bug #269618
 	# Fix stripping. Per bug #257297
+	# Fix glibc 2.10 compilation issues. Per bug #276868
 	epatch \
 		"${FILESDIR}"/${PV}-RSA_security.patch \
 		"${FILESDIR}"/${PV}-gcc44.patch \
-		"${FILESDIR}"/${PV}-nostrip.patch
+		"${FILESDIR}"/${PV}-nostrip.patch \
+		"${FILESDIR}"/${PV}-glibc210.patch
 }
 
 src_configure() {
diff --git a/sci-misc/boinc/files/6.4.5-glibc210.patch b/sci-misc/boinc/files/6.4.5-glibc210.patch
new file mode 100644
index 000000000000..c1f11f653fc9
--- /dev/null
+++ b/sci-misc/boinc/files/6.4.5-glibc210.patch
@@ -0,0 +1,13 @@
+Index: lib/str_util.h
+===================================================================
+--- lib/str_util.h	(revision 18304)
++++ lib/str_util.h	(working copy)
+@@ -18,6 +18,8 @@
+ #ifndef STR_UTIL_H
+ #define STR_UTIL_H
+ 
++#include "config.h"
++
+ #include <cstdlib>
+ #include <ctime>
+ #include <cctype>