Add glibc-2.10 patch, bug 270601

Also remove sparc keyword that was added in 4.2.4 by mistake
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 38 insertions, 10 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 5ff7a9697af1..728f34aaf8fc 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.195 2009/06/04 13:05:35 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.196 2009/06/04 18:18:37 tampakrap Exp $
+
+  04 Jun 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  kopete-3.5.10-r4.ebuild, +files/kopete-3.5.10-glibc210.patch:
+  Add glibc-2.10 patch, bug 270601
 
 *kopete-4.2.4 (04 Jun 2009)
 
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 6e3d8fdd96fb..f50b1870747a 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -7,6 +7,7 @@ AUX kdenetwork-3.5.5-linux-headers-2.6.18.patch 799 RMD160 1e12373bef6f0a69d9b5d
 AUX kopete-0.12_alpha1-xscreensaver.patch 778 RMD160 d188f074982191f6f961c7e32ec97a79746e73df SHA1 85dea3f727af4393740bacb237c80ee666f1bdae SHA256 2152d2d2d1ed29b986d5b7f80a6f7bcabd56e5580146298973b4114353b5686d
 AUX kopete-3.5-rolling_icon.patch 430 RMD160 1574dc336ea63febfb9505b46f89070aff0b7dd4 SHA1 b6ad2c16fa27c3cb987b339dfe9d0546df1e2948 SHA256 2b1c56526712db57a5fe5765ac8d6a404baf53f36bb7d36a457d51c58546a908
 AUX kopete-3.5.10-gcc43.patch 5464 RMD160 d535c743e56e007883012cee6c2acc976e4be71a SHA1 f33768f7d434901c52ca8e3382422d4a2901641f SHA256 1987e03fc57ae56d70ca79efcebd23cf6b73da6a1b6548189315df580d9e6e76
+AUX kopete-3.5.10-glibc210.patch 934 RMD160 770cb726066a025fe31b5365d44999b4c10e4ee1 SHA1 3bf55d0e97fc3f374a4d41bec6e0d07f25217ced SHA256 50bbc35bd60ddb612570e1520c42f8397a14985ec9d7c9c2d1243ff6c6146e73
 AUX kopete-3.5.10-icq-protocol-change2.patch 1193 RMD160 3b64b3e73e676ba470224ae8c8862fb02f2a9778 SHA1 0e850940c96d8a4f28032eeee56e7d1c56896b0d SHA256 6241bf75b41606c081da0ca116e6f1f6d004b3e4adee110da4cabb8bd15626b2
 AUX kopete-3.5.10-jabber-protocol-gtalknickfix.patch 557 RMD160 b4555d2843dbdb8acf60ddd404ccbdb588b25022 SHA1 f871ed82fe6678d0456aab02b3110030d54dcc52 SHA256 a8ada8e5d3d44e3c8f7ef64e05bdec51edc7c9c130b988a53192232d73b33bdd
 AUX kopete-3.5.10-libgadu-CVE-2008-4776.patch 1122 RMD160 f0bee221b4e98731f6dfc2612fb636abb929854a SHA1 b8e3f021ddae685cafcca557ce1054f803e2a88a SHA256 58ce7f80403a6457e4803806b90be339820e4d654ba43a8323ea72b5ef0cd62a
@@ -19,18 +20,18 @@ DIST kdenetwork-4.2.3.tar.bz2 7038337 RMD160 428c5356e716d3d0f60b766f3ad362b0599
 DIST kdenetwork-4.2.4.tar.bz2 7038448 RMD160 2ea29be5b112af974add898419403c9d8cea9436 SHA1 31f3f1c44690339ce523c309a3d2c131563d9f97 SHA256 e6e7e86d2a1d73e39bda57e4be88194cd400353ae7d3420613af4636da61f3e5
 EBUILD kopete-3.5.10-r2.ebuild 4119 RMD160 b024a6b17a68b96e0209d8ab66172017d4129538 SHA1 9fa9816c772ecb5c4349190afb6d6fb1f32c95e8 SHA256 4bb57afc0292fae18849b58aa5deefca3a0ee8cf661a747bd600e4847f0d9d68
 EBUILD kopete-3.5.10-r3.ebuild 4124 RMD160 798886d67892e7f1e128b250ea7910dc454e9081 SHA1 c924985eb2314c213ef6d66a6376d0b9c2e671b9 SHA256 748dc08969de40e24ef0a418a2732a79402119d3b18dac671b72b8964b5b6cb2
-EBUILD kopete-3.5.10-r4.ebuild 4429 RMD160 1d7f1704d45abd0ef1073780993effd1a962dd70 SHA1 1ce2ac57c4f50f1f9877b24357426fa26a26a9d0 SHA256 37936d668087e958f215314aa075e3f538d7624b15ea67ad22df9fa9074f9daf
+EBUILD kopete-3.5.10-r4.ebuild 4471 RMD160 ddfe87a6c04d966cd001c269c1d53f4ece793dd0 SHA1 557e7c06cda50c544708e7fe6e56be3507ae6783 SHA256 84d40357fe603d089d7d0a864d33f4b7711de5e378a7e8634a93a46fc93094bf
 EBUILD kopete-3.5.10.ebuild 4059 RMD160 351d646a33eab02cd9b7d6b6a589f5da0e3c0766 SHA1 c8d11f59fce543b3f9e96fde40b908be5dd08f66 SHA256 2f41468272f57ecc391354dfbcb7f16a3308923a0e6e3615038f3246859c7071
 EBUILD kopete-3.5.9-r2.ebuild 4209 RMD160 a0833a4579ebd3d7053018fcab6019ab8029de70 SHA1 a87e06d671a73b8be426cc095d58d9313045ab94 SHA256 3e5e102e57f5add8ad215192c40ae64b4bcda8b1dd2704fdf181286212283e36
 EBUILD kopete-3.5.9.ebuild 4176 RMD160 cf1327ab6f51b56d533aa0807975477027c76aa2 SHA1 64cd84aceda4987fcbcc38c433e11329aaa4ff7e SHA256 7e95a6a931c2d80e0896e38ef1a40d498a7ffc54d6cb1624a1aeb9a7aeccebeb
 EBUILD kopete-4.2.3.ebuild 3597 RMD160 20be5f1971ae05da999c68a63115f839e53feba5 SHA1 6e57e3834b1a3f8eb1ba28dafdb9256f6a50274d SHA256 3de9470cd03ce7887757319db0105436b55454a0e176c837c1137141c9c0346f
-EBUILD kopete-4.2.4.ebuild 3607 RMD160 f47dd80de940130fdff95d65a4c044ece550d218 SHA1 355212247573f286799f284f046d8f02d5059ea3 SHA256 2e49d64d68d1098c058071fcbfa04b745c8624f6f6b28a42cb1cc59d2c545b91
-MISC ChangeLog 28870 RMD160 1501fca3d2cf3984dc07afbfbfb628defa9731d2 SHA1 0dcaca74fdf659c174b4b37aa1b6f0e2fd45f1d5 SHA256 cd01b99a886c81a6961ff8986142d3636374fa190aae5d90ad5d10f84ce03e48
+EBUILD kopete-4.2.4.ebuild 3603 RMD160 3bd86378c0ffbe78b2ca8e2cfa85ca199b280809 SHA1 daad56aff317a5cd5edb463e2b70cac22549523a SHA256 d97872acc31a2f4a89f48a4df869d3519a42c2046adb581639aa3db25cd11274
+MISC ChangeLog 29029 RMD160 53f3845f50a238816b3b32ba1eda458b943ef1d9 SHA1 1198404ec2379c665f96fbf9f6cc3308c1e417a2 SHA256 78e62259a6dbba8236274c1f95f4fa7e33b103153060eb40b418750ba12556a8
 MISC metadata.xml 2775 RMD160 5a49e29c4f90ad4151651ea9294ed14fb536bf7e SHA1 b37e2d8e9157df1ed5f025ff0a05711ddf55aa30 SHA256 e3e8c7e442f6589de2c11a8713f53915706cf6d23c4787bd85f486f471172c51
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkonxqcACgkQ5BmOA85PVLhgwACggPD4TGvK148vgSos6WWlXUai
-Z3oAn3Lw8SIBiE7X9B2T9nhwrlpogsZl
-=D8vf
+iEYEARECAAYFAkooEAgACgkQjDdoMVfcAHjyCgCfeC8RUt/ZWel7U10yBqnXnTqw
+OhgAniL1n6XuzYVISHubwCTGyYW6bC3M
+=RYmb
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kopete/files/kopete-3.5.10-glibc210.patch b/kde-base/kopete/files/kopete-3.5.10-glibc210.patch
new file mode 100644
index 000000000000..6caa8f17ca86
--- /dev/null
+++ b/kde-base/kopete/files/kopete-3.5.10-glibc210.patch
@@ -0,0 +1,22 @@
+--- kopete-3.5.10-r4-orig/work/kopete-3.5.10/kopete/protocols/oscar/liboscar/rtf.cc	2005-09-10 15:20:23.000000000 +0700
++++ kopete-3.5.10-r4/work/kopete-3.5.10/kopete/protocols/oscar/liboscar/rtf.cc	2009-06-03 04:40:25.000000000 +0700
+@@ -2131,7 +2131,7 @@
+ 
+         FontDef& def = p->fonts[m_nFont-1];
+ 
+-        char *pp = strchr(str, ';');
++        const char *pp = strchr(str, ';');
+         unsigned size;
+         if (pp != NULL)
+            size = (pp - str);
+--- kopete-3.5.10-r4-orig/work/kopete-3.5.10/kopete/protocols/oscar/liboscar/rtf.ll	2005-09-10 15:20:23.000000000 +0700
++++ kopete-3.5.10-r4/work/kopete-3.5.10/kopete/protocols/oscar/liboscar/rtf.ll	2009-06-03 04:40:35.000000000 +0700
+@@ -568,7 +568,7 @@
+ 
+         FontDef& def = p->fonts[m_nFont-1];
+ 
+-        char *pp = strchr(str, ';');
++        const char *pp = strchr(str, ';');
+         unsigned size;
+         if (pp != NULL)
+            size = (pp - str);
diff --git a/kde-base/kopete/kopete-3.5.10-r4.ebuild b/kde-base/kopete/kopete-3.5.10-r4.ebuild
index 8036a28b9214..c612f74ae137 100644
--- a/kde-base/kopete/kopete-3.5.10-r4.ebuild
+++ b/kde-base/kopete/kopete-3.5.10-r4.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/kde-base/kopete/kopete-3.5.10-r4.ebuild,v 1.4 2009/05/29 22:48:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.10-r4.ebuild,v 1.5 2009/06/04 18:18:37 tampakrap Exp $
 
 KMNAME=kdenetwork
 EAPI="1"
@@ -92,6 +92,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-libgadu-CVE-2008-4776.patch"
 	epatch "${FILESDIR}/${P}-icq-protocol-change2.patch"
 	epatch "${FILESDIR}/${P}-jabber-protocol-gtalknickfix.patch"
+	epatch "${FILESDIR}/${P}-glibc210.patch"
 
 	if use emoticons-manager; then
 		epatch "${FILESDIR}/emoticon-manager.patch"
diff --git a/kde-base/kopete/kopete-4.2.4.ebuild b/kde-base/kopete/kopete-4.2.4.ebuild
index a8952f830b16..0ba177905ab0 100644
--- a/kde-base/kopete/kopete-4.2.4.ebuild
+++ b/kde-base/kopete/kopete-4.2.4.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/kde-base/kopete/kopete-4.2.4.ebuild,v 1.1 2009/06/04 13:05:35 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.2.4.ebuild,v 1.2 2009/06/04 18:18:37 tampakrap Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ KMNAME="kdenetwork"
 inherit kde4-meta
 
 DESCRIPTION="KDE multi-protocol IM client"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="debug +handbook ssl"
 
 # Available plugins