Include patch to fix bug #224721 if kopete's autoupdate fails.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r4 x86_64

4 files changed, 35 insertions, 7 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 76141bfa8ed2..8c8c8bc7f641 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.152 2008/06/09 15:18:09 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.153 2008/07/04 16:15:37 keytoaster Exp $
+
+  04 Jul 2008; Tobias Heinlein <keytoaster@gentoo.org>
+  +files/kopete-3.5.9-icq-protocol-change.patch, kopete-3.5.9.ebuild:
+  Include patch to fix bug #224721 if kopete's autoupdate fails.
 
   09 Jun 2008; Tobias Heinlein <keytoaster@gentoo.org> -kopete-4.0.2.ebuild,
   -kopete-4.0.3.ebuild:
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index d72f579fccad..ce29919ac836 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -10,6 +10,7 @@ AUX kopete-3.5.5-status-visibility.patch 539 RMD160 669318d277a3be426dbd5f69f634
 AUX kopete-3.5.6-cryptobug.patch 1000 RMD160 dd935e379fe667f032a0256284aa5d40518e0610 SHA1 2e1a229bc4d9b03f48c143e9179b51c7e3393ac0 SHA256 9b6d6a810d19965cc3c2f1fa974edc1e8d7aa73faf0166e95e632d36132e34ff
 AUX kopete-3.5.6-utf8-fix.diff 1532 RMD160 7eabbddef392307c6e24e3e2e432f7502408bb79 SHA1 b36fb568f651731ba3586a971370a477139b9971 SHA256 f143d51b6296f66c9d490aaa2de76dfdf8226380f4b4a2bb99a5032c39672727
 AUX kopete-3.5.7-videodevice.patch 1288 RMD160 8ace50fd07d020985e89e217a2efe1ff7823eeaf SHA1 cd559add41285b21c67eebfbca4e47f4e3933ff0 SHA256 7a74fc97395e15318dda6b1660e54d0f80f914b941d52d3650a479e2d0688f3f
+AUX kopete-3.5.9-icq-protocol-change.patch 1553 RMD160 b08150812b10e779c8399c856390f53f6e83d553 SHA1 dc29430a8c6be45ba7fea9c31de30124b9988d7d SHA256 30183b9a0a3646541e5b43029ba2f53be2b5606f9bbda6ccb93a8084a4221586
 DIST kdenetwork-3.5-patchset-01.tar.bz2 2986 RMD160 288113734e7767a7526f4b9311c1985ac8aa91bf SHA1 cacc9ad8137e5c9e44bda1faa05e26cf2450f4e6 SHA256 0bbde1adaa4e8fff02c1f1fd6ceb66ec9af14dd19ff64567ab0fd03926d7d05b
 DIST kdenetwork-3.5.6.tar.bz2 9245468 RMD160 2f93badae14fab4d7911c74d2f427e85ca104827 SHA1 494c67139415e3b18a1d5d054d872e90b8289832 SHA256 786e6c25d5cba4ed1eeac947c5554d7fe57de593abf6551c58c178043b82475e
 DIST kdenetwork-3.5.8.tar.bz2 9334188 RMD160 3941c56411ab4cdb89ae9de116a24d0906a275da SHA1 ad96484b0fce4d224195407ffdef3b040e5069cc SHA256 7320e3d8fd9fb60ecee88ab70ccf8edf95fecf90bbbcabe4def4b26e48c20785
@@ -18,15 +19,15 @@ DIST kdenetwork-4.0.4.tar.bz2 6373873 RMD160 f56c04d1bdaa45f58c3f293d7b694b51301
 DIST kdenetwork-4.0.5.tar.bz2 6375997 RMD160 3a2b0a7227bbb99448a673a278c9d939f9af253a SHA1 a71cf3ca5b472282a3d23a5e7ca2dfd150a044d1 SHA256 e3a0866819d69987512b4d2da925ab4cd7fff66477398093df8d8be50aa6f977
 EBUILD kopete-3.5.6-r2.ebuild 4280 RMD160 09e7996276e4128084c910ba5136418287397ad7 SHA1 f49ea7c7465b6ae30b7ec3dc730fd4338b6a3129 SHA256 fbd03b49691781d1958fc0cfede0d6df8032eaacb99830d21a15a7d13f19a035
 EBUILD kopete-3.5.8.ebuild 4109 RMD160 253cb2d92a76ef5022ae709e092081937cf92e08 SHA1 d2fee537b45bbdf8eb3eff46f721b1983f6ffa7d SHA256 ca2e4fe2530c1772de4d76dd0e11b220559d64af826c596ec135051556084602
-EBUILD kopete-3.5.9.ebuild 4067 RMD160 e0bf3080fbd0bccf0c9ed5dccc06c7a04d7ed8c6 SHA1 31ca812c7c7f5e8395ac59b01bbac86463c9c656 SHA256 db286bef2bfacdb673da9d5c7014fce08c49744326053140001d46b0f94b9f83
+EBUILD kopete-3.5.9.ebuild 4124 RMD160 41adb002e63ee1b7f7fca0483322959f0ffc6378 SHA1 f2293ea7a33c32cc57b533cf05af9c9bb2440a11 SHA256 06a17e81b1d71d3eca21a71f3332cb03cc5a79daf853218ee3b2c70414508abb
 EBUILD kopete-4.0.4.ebuild 3458 RMD160 98ec46d61d3aaba829c55bcae3a608b48210dbf5 SHA1 d1ad252b08b77dd8b8b6c245a4855fcc181c8436 SHA256 c86a5c420463907ae9b3210f880dd224a5e02bdbebe60dc26b4eff8209875e4d
 EBUILD kopete-4.0.5.ebuild 3462 RMD160 8ca0a466d2e04b75401daa6d7c6ed2e1456ee389 SHA1 48179d0bfa35d525c0700060602894975c517559 SHA256 9daa2d5ca0946ea951d8dc0254c72d393a41da60788793946cce5932463666d3
-MISC ChangeLog 22095 RMD160 15d56a1ba6131f6bacd2ac8c65e145eaf7a5083f SHA1 0d8da8fd75793e8b8b218e926ca92dd0c25cf688 SHA256 720188fddc8607c1fafcc68923a0e2507c50a81cb63726c770beb6093c200ae1
+MISC ChangeLog 22286 RMD160 9435c438f4c90e317df01f153d1e0186363dc208 SHA1 de5d4967626a10153e4f7ab6256a2738ce9e3fda SHA256 eae8762e661184fe4b69605a02b256f30cfc602271328529ef36127cace61964
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhNSb8ACgkQKfQzuokD2Ip24wCg0zQn5hJJccBE+H92c/Qq7P+F
-yFQAoLJk749EX339Krd+tDTzo1csk8NV
-=y/ww
+iEYEARECAAYFAkhuTRcACgkQKfQzuokD2IpMSACg3O5pAbW9YnQbFRGvIGqEehJ/
+Z/sAoIdrKqWhh2229UPvV9cKwmhBIrjP
+=Uwux
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kopete/files/kopete-3.5.9-icq-protocol-change.patch b/kde-base/kopete/files/kopete-3.5.9-icq-protocol-change.patch
new file mode 100644
index 000000000000..f0de7e690678
--- /dev/null
+++ b/kde-base/kopete/files/kopete-3.5.9-icq-protocol-change.patch
@@ -0,0 +1,22 @@
+diff -Naur kdenetwork-3.5.9.orig/kopete/protocols/oscar/oscarversionupdater.cpp kdenetwork-3.5.9/kopete/protocols/oscar/oscarversionupdater.cpp
+--- kdenetwork-3.5.9.orig/kopete/protocols/oscar/oscarversionupdater.cpp	2008-02-14 01:11:52.000000000 +0100
++++ kdenetwork-3.5.9/kopete/protocols/oscar/oscarversionupdater.cpp	2008-07-01 20:06:00.000000000 +0200
+@@ -89,13 +89,13 @@
+ 	kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl;
+ 	KConfigGroup config( KGlobal::config(), "ICQVersion" );
+ 	
+-	mICQVersion.clientString = config.readEntry( "ClientString", "ICQBasic" );
++	mICQVersion.clientString = config.readEntry( "ClientString", "ICQ Client" );
+ 	mICQVersion.clientId = config.readEntry( "ClientId", "0x010A" ).toUShort( 0, 0 );
+-	mICQVersion.major = config.readEntry( "Major", "0x0014" ).toUShort( 0, 0 );
+-	mICQVersion.minor = config.readEntry( "Minor", "0x0034" ).toUShort( 0, 0 );
++	mICQVersion.major = config.readEntry( "Major", "0x0006" ).toUShort( 0, 0 );
++	mICQVersion.minor = config.readEntry( "Minor", "0x0000" ).toUShort( 0, 0 );
+ 	mICQVersion.point = config.readEntry( "Point", "0x0000" ).toUShort( 0, 0 );
+-	mICQVersion.build = config.readEntry( "Build", "0x0BB8" ).toUShort( 0, 0 );
+-	mICQVersion.other = config.readEntry( "Other", "0x0000043D" ).toUInt( 0, 0 );
++	mICQVersion.build = config.readEntry( "Build", "0x17AB" ).toUShort( 0, 0 );
++	mICQVersion.other = config.readEntry( "Other", "0x00007535" ).toUInt( 0, 0 );
+ 	mICQVersion.country = config.readEntry( "Country", "us" );
+ 	mICQVersion.lang = config.readEntry( "Lang", "en" );
+ }
diff --git a/kde-base/kopete/kopete-3.5.9.ebuild b/kde-base/kopete/kopete-3.5.9.ebuild
index bee04ebe1ee6..e4da0c8d6f7d 100644
--- a/kde-base/kopete/kopete-3.5.9.ebuild
+++ b/kde-base/kopete/kopete-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.9.ebuild,v 1.7 2008/05/18 16:38:29 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.9.ebuild,v 1.8 2008/07/04 16:15:37 keytoaster Exp $
 
 KMNAME=kdenetwork
 EAPI="1"
@@ -77,6 +77,7 @@ src_unpack() {
 	epatch "${FILESDIR}/kopete-0.12_alpha1-xscreensaver.patch"
 	epatch "${FILESDIR}/${PN}-3.5.5-icqfix.patch"
 	epatch "${FILESDIR}/kdenetwork-3.5.5-linux-headers-2.6.18.patch"
+	epatch "${FILESDIR}/${P}-icq-protocol-change.patch"
 
 	use latex || kopete_disable plugin latex
 	use crypt || kopete_disable plugin cryptography