Added the patches from bugs 151089 and 154421 which fix compile failures with the kdeenablefinal and sametime USE flags respectively. Minor whitespace fixes.

Package-Manager: portage-2.1.3_rc6

6 files changed, 173 insertions, 17 deletions

diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index 98846e90e08b..6c1c5f289965 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdenetwork
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.264 2007/06/03 21:43:49 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.265 2007/07/08 10:27:19 philantrop Exp $
+
+  08 Jul 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/kopete-3.5.5-enable-final-redefines.patch,
+  +files/kopete-3.5.5-status-visibility.patch, kdenetwork-3.5.5-r1.ebuild,
+  kdenetwork-3.5.5-r2.ebuild:
+  Added the patches from bugs 151089 and 154421 which fix compile failures
+  with the kdeenablefinal and sametime USE flags respectively. Minor
+  whitespace fixes.
 
   03 Jun 2007; Joshua Kinard <kumba@gentoo.org> kdenetwork-3.5.6-r2.ebuild:
   Marked unstable on mips.
diff --git a/kde-base/kdenetwork/Manifest b/kde-base/kdenetwork/Manifest
index d129c0176b7f..2dc1c7e3d971 100644
--- a/kde-base/kdenetwork/Manifest
+++ b/kde-base/kdenetwork/Manifest
@@ -1,11 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kdenetwork-3.5.5-linux-headers-2.6.18.patch 799 RMD160 1e12373bef6f0a69d9b5d453c9a63b84f7b48645 SHA1 642a54568612c62543759eab4550b4db03a42bb0 SHA256 1e282677beb1bec1c32e12c2c289e498b487b9f0bd0fa9c7b38a4944d48d6e9a
 MD5 c4a46d3f1920fbef1afaf9d47f1edc6b files/kdenetwork-3.5.5-linux-headers-2.6.18.patch 799
 RMD160 1e12373bef6f0a69d9b5d453c9a63b84f7b48645 files/kdenetwork-3.5.5-linux-headers-2.6.18.patch 799
 SHA256 1e282677beb1bec1c32e12c2c289e498b487b9f0bd0fa9c7b38a4944d48d6e9a files/kdenetwork-3.5.5-linux-headers-2.6.18.patch 799
+AUX kopete-3.5.5-enable-final-redefines.patch 4914 RMD160 2e1fd23e99077eca324d9de41280ab3566024a86 SHA1 43b4087efc901d941791e6bbe98526d4538b29c0 SHA256 27058d017ddd9ec96fe992cbd0cdc4a8734c1dc9b17ef7c9b8edb4af29245103
+MD5 645a4334dafb7332377c04f07eb24a84 files/kopete-3.5.5-enable-final-redefines.patch 4914
+RMD160 2e1fd23e99077eca324d9de41280ab3566024a86 files/kopete-3.5.5-enable-final-redefines.patch 4914
+SHA256 27058d017ddd9ec96fe992cbd0cdc4a8734c1dc9b17ef7c9b8edb4af29245103 files/kopete-3.5.5-enable-final-redefines.patch 4914
 AUX kopete-3.5.5-icqfix.patch 749 RMD160 129efdaa2bf0dbf88fe4714b4daab5f3606cbc91 SHA1 f3ef29b821ba5f0b62438a7b78a982625e42bd94 SHA256 e165e409343918ac49da0df867f7df34fffa5adfd550ca3079016d0b576a1987
 MD5 33f9ea10ff35fd56a9f3c4cd2b983583 files/kopete-3.5.5-icqfix.patch 749
 RMD160 129efdaa2bf0dbf88fe4714b4daab5f3606cbc91 files/kopete-3.5.5-icqfix.patch 749
 SHA256 e165e409343918ac49da0df867f7df34fffa5adfd550ca3079016d0b576a1987 files/kopete-3.5.5-icqfix.patch 749
+AUX kopete-3.5.5-status-visibility.patch 539 RMD160 669318d277a3be426dbd5f69f6343ca094617fe5 SHA1 39f950365c1cdfb913f2f638724169d0b8181b6d SHA256 3eefe7817999b69c1936c19a7b45bc08d5b181bc3eef71411004ac29e3cceee9
+MD5 552b91dd1c428574ab3c88086ad20815 files/kopete-3.5.5-status-visibility.patch 539
+RMD160 669318d277a3be426dbd5f69f6343ca094617fe5 files/kopete-3.5.5-status-visibility.patch 539
+SHA256 3eefe7817999b69c1936c19a7b45bc08d5b181bc3eef71411004ac29e3cceee9 files/kopete-3.5.5-status-visibility.patch 539
 AUX kopete-3.5.6-cryptobug.patch 1000 RMD160 dd935e379fe667f032a0256284aa5d40518e0610 SHA1 2e1a229bc4d9b03f48c143e9179b51c7e3393ac0 SHA256 9b6d6a810d19965cc3c2f1fa974edc1e8d7aa73faf0166e95e632d36132e34ff
 MD5 8e2130425d317657b48a60a5475f2182 files/kopete-3.5.6-cryptobug.patch 1000
 RMD160 dd935e379fe667f032a0256284aa5d40518e0610 files/kopete-3.5.6-cryptobug.patch 1000
@@ -18,14 +29,14 @@ DIST kdenetwork-3.5-patchset-01.tar.bz2 2986 RMD160 288113734e7767a7526f4b9311c1
 DIST kdenetwork-3.5.5.tar.bz2 9235564 RMD160 3e757d10ee5bf24b2ccf131e693fb614b9fdb9f4 SHA1 a95bac9de9770f551870fb73ce456d779ba36878 SHA256 c3f36e69bbd23902f2bdd9a1a8cda93b0436338ada422bb8ac6bc3d2bcd8e38f
 DIST kdenetwork-3.5.6.tar.bz2 9245468 RMD160 2f93badae14fab4d7911c74d2f427e85ca104827 SHA1 494c67139415e3b18a1d5d054d872e90b8289832 SHA256 786e6c25d5cba4ed1eeac947c5554d7fe57de593abf6551c58c178043b82475e
 DIST kdenetwork-3.5.7.tar.bz2 9370098 RMD160 85b2780b411f91afb7e2dd6670500c9046b8b591 SHA1 f5585acd047a85fb512652decd7876a780dc269a SHA256 979d93802693a76e2e4fc0f7bdd4c44bde48296f842619a2b59100d94346d596
-EBUILD kdenetwork-3.5.5-r1.ebuild 2484 RMD160 a1171baf20d99933b1472a98d669c0cd27158245 SHA1 58efa6bba655125287932b2ab4e4fa741e3978c7 SHA256 164ac1ac1e93971b0f5e1ed65f42eea9fa303c03e86357f8484e1655f030594d
-MD5 f30a730b824152bfb0066ed057d8c9d1 kdenetwork-3.5.5-r1.ebuild 2484
-RMD160 a1171baf20d99933b1472a98d669c0cd27158245 kdenetwork-3.5.5-r1.ebuild 2484
-SHA256 164ac1ac1e93971b0f5e1ed65f42eea9fa303c03e86357f8484e1655f030594d kdenetwork-3.5.5-r1.ebuild 2484
-EBUILD kdenetwork-3.5.5-r2.ebuild 2484 RMD160 dd19c490eafd4fc09ba5c13bf751bb1a9db8352b SHA1 f4c5ccac0563b85803844ebecbe8987649f92388 SHA256 e1e7791d11313ef1777cc16f54d10a2c549de59ea2c7d3d5be552753f04141d5
-MD5 b757b4ff64b152c6fd30885a9c9a9d72 kdenetwork-3.5.5-r2.ebuild 2484
-RMD160 dd19c490eafd4fc09ba5c13bf751bb1a9db8352b kdenetwork-3.5.5-r2.ebuild 2484
-SHA256 e1e7791d11313ef1777cc16f54d10a2c549de59ea2c7d3d5be552753f04141d5 kdenetwork-3.5.5-r2.ebuild 2484
+EBUILD kdenetwork-3.5.5-r1.ebuild 2592 RMD160 0d63bfd0536bf58ade1b7540ff31abfe6b939fc1 SHA1 0fae36aa2d9669ee4b0c774e1164cb7ed7e10510 SHA256 d74cfb08d8aab679454c7edc409744e42d8021b9712ba29f869660b6cdca4926
+MD5 77f100cc174db05e1f2f50d7e62abe34 kdenetwork-3.5.5-r1.ebuild 2592
+RMD160 0d63bfd0536bf58ade1b7540ff31abfe6b939fc1 kdenetwork-3.5.5-r1.ebuild 2592
+SHA256 d74cfb08d8aab679454c7edc409744e42d8021b9712ba29f869660b6cdca4926 kdenetwork-3.5.5-r1.ebuild 2592
+EBUILD kdenetwork-3.5.5-r2.ebuild 2592 RMD160 cc2321d32fb8864e9b185663bae0db431da559dd SHA1 faf3e5d3530b20c46bd276c79c3d58b46d0cc896 SHA256 08c8620afa8feae846f8cc67ce9603dffd53673d02f4c64eeee66ecc2c4b9712
+MD5 48c6ae44ef3795e6e91813b7cd6002f3 kdenetwork-3.5.5-r2.ebuild 2592
+RMD160 cc2321d32fb8864e9b185663bae0db431da559dd kdenetwork-3.5.5-r2.ebuild 2592
+SHA256 08c8620afa8feae846f8cc67ce9603dffd53673d02f4c64eeee66ecc2c4b9712 kdenetwork-3.5.5-r2.ebuild 2592
 EBUILD kdenetwork-3.5.6-r1.ebuild 2670 RMD160 b39ba40c4a8348175754782fc05b3678b7c50762 SHA1 912610a54c7b007347afd246a496da4f63c0ab1c SHA256 b8077a2a6ea5335e90373f13edb1e5d9a2558b1e3a87ef881496534f710c34c0
 MD5 c5d143794ee4be5ba072e8f54a07c78f kdenetwork-3.5.6-r1.ebuild 2670
 RMD160 b39ba40c4a8348175754782fc05b3678b7c50762 kdenetwork-3.5.6-r1.ebuild 2670
@@ -42,10 +53,10 @@ EBUILD kdenetwork-3.5.7.ebuild 2955 RMD160 7cc8c6baa7e89810f76de8515c0143bdcf04c
 MD5 bc17a1e4e1881324134478b376e8e39f kdenetwork-3.5.7.ebuild 2955
 RMD160 7cc8c6baa7e89810f76de8515c0143bdcf04c8b4 kdenetwork-3.5.7.ebuild 2955
 SHA256 2be0277b2c4ffe45b4bfae7b0535dc5c6f68f1e6adc9cc1d1c6d5743ea637d95 kdenetwork-3.5.7.ebuild 2955
-MISC ChangeLog 36380 RMD160 3344d650af1289bf305980b7ee0b72e3be82637d SHA1 0428d331465a1c5b20163c66bd1d6ba3885034e1 SHA256 96c833a02cd6c1cacfbea3f2f813f1a755254fabcee8fd64f0d2c3fa7fe83297
-MD5 2ee8065c79dfb8f7c38488d28791d15c ChangeLog 36380
-RMD160 3344d650af1289bf305980b7ee0b72e3be82637d ChangeLog 36380
-SHA256 96c833a02cd6c1cacfbea3f2f813f1a755254fabcee8fd64f0d2c3fa7fe83297 ChangeLog 36380
+MISC ChangeLog 36762 RMD160 ec7d0e940e06819a769d42941bca1e3de1b1a8e0 SHA1 8feda36aa3836fc8a261de41e28f3ed0b94d0df3 SHA256 6c382c0850513d1bc4abc33b4d2efe980ef2f0aff5936eb8fe9b2231e726ba7b
+MD5 bd31607b0b6dd8713cc382c28bb90bc8 ChangeLog 36762
+RMD160 ec7d0e940e06819a769d42941bca1e3de1b1a8e0 ChangeLog 36762
+SHA256 6c382c0850513d1bc4abc33b4d2efe980ef2f0aff5936eb8fe9b2231e726ba7b ChangeLog 36762
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -68,3 +79,10 @@ SHA256 ecaf8d329908f4d5793e6d91319908764cafce446759c0f51fe509f877cd8219 files/di
 MD5 f435a29213024913dd173e76822408e0 files/digest-kdenetwork-3.5.7 533
 RMD160 eb1a8bff3d55a0e56642da2e55d5de1dea318fbb files/digest-kdenetwork-3.5.7 533
 SHA256 a8b6c61efc9d4e1936c662475233e93b2b58951ede88b2e620c2598b519455c0 files/digest-kdenetwork-3.5.7 533
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGkLwRCkvF58q80IkRAhE8AJ9BHiboT3iPWl/SKito72V44cTVUgCdEAIw
+xe2v3CYTJ3TH5L2exNnNxLI=
+=wLDv
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdenetwork/files/kopete-3.5.5-enable-final-redefines.patch b/kde-base/kdenetwork/files/kopete-3.5.5-enable-final-redefines.patch
new file mode 100644
index 000000000000..0bac4228e9ca
--- /dev/null
+++ b/kde-base/kdenetwork/files/kopete-3.5.5-enable-final-redefines.patch
@@ -0,0 +1,107 @@
+--- kopete-3.5.5/kopete/protocols/jabber/jingle/libjingle/talk/base/asynctcpsocket.cc.orig	2006-12-22 21:43:20.000000000 -0800
++++ kopete-3.5.5/kopete/protocols/jabber/jingle/libjingle/talk/base/asynctcpsocket.cc	2006-12-22 21:46:00.000000000 -0800
+@@ -52,9 +52,9 @@
+ typedef uint16 PacketLength;
+ const size_t PKT_LEN_SIZE = sizeof(PacketLength);
+ 
+-const size_t BUF_SIZE = MAX_PACKET_SIZE + PKT_LEN_SIZE;
++const size_t TCP_BUF_SIZE = MAX_PACKET_SIZE + PKT_LEN_SIZE;
+ 
+-AsyncTCPSocket::AsyncTCPSocket(AsyncSocket* socket) : AsyncPacketSocket(socket), insize_(BUF_SIZE), inpos_(0), outsize_(BUF_SIZE), outpos_(0) {
++AsyncTCPSocket::AsyncTCPSocket(AsyncSocket* socket) : AsyncPacketSocket(socket), insize_(TCP_BUF_SIZE), inpos_(0), outsize_(TCP_BUF_SIZE), outpos_(0) {
+   inbuf_ = new char[insize_];
+   outbuf_ = new char[outsize_];
+ 
+--- kopete-3.5.5/kopete/protocols/jabber/jingle/libjingle/talk/base/asyncudpsocket.cc.orig	2006-10-01 10:26:45.000000000 -0700
++++ kopete-3.5.5/kopete/protocols/jabber/jingle/libjingle/talk/base/asyncudpsocket.cc	2006-12-22 21:44:03.000000000 -0800
+@@ -48,10 +48,10 @@
+ 
+ namespace cricket {
+ 
+-const int BUF_SIZE = 64 * 1024;
++const int UDP_BUF_SIZE = 64 * 1024;
+ 
+ AsyncUDPSocket::AsyncUDPSocket(AsyncSocket* socket) : AsyncPacketSocket(socket) {
+-  size_ = BUF_SIZE;
++  size_ = UDP_BUF_SIZE;
+   buf_ = new char[size_];
+ 
+   assert(socket_);
+--- kopete-3.5.5/kopete/protocols/jabber/jingle/libjingle/talk/base/stl_decl.h.orig	2006-10-01 10:26:45.000000000 -0700
++++ kopete-3.5.5/kopete/protocols/jabber/jingle/libjingle/talk/base/stl_decl.h	2006-12-22 21:49:33.000000000 -0800
+@@ -45,7 +45,7 @@
+   template <class T, class Alloc> class vector;
+   template <class T, class Alloc> class list;
+   template <class T, class Alloc> class slist;
+-  template <class T, class Alloc, size_t BufSiz> class deque;
++  template <class T, class Alloc> class deque;
+   template <class T, class Sequence> class stack;
+   template <class T, class Sequence> class queue;
+   template <class T, class Sequence, class Compare> class priority_queue;
+--- kopete-3.5.5/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.h.orig	2006-10-01 10:26:44.000000000 -0700
++++ kopete-3.5.5/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.h	2006-12-22 23:12:59.000000000 -0800
+@@ -46,6 +46,9 @@
+ class Connection;
+ class AsyncPacketSocket;
+ 
++extern const int RETRY_DELAY;
++extern const uint32 RETRY_TIMEOUT;
++
+ enum ProtocolType { PROTO_UDP, PROTO_TCP, PROTO_SSLTCP, PROTO_LAST = PROTO_SSLTCP };
+ const char * ProtoToString(ProtocolType proto);
+ bool StringToProto(const char * value, ProtocolType& proto);
+--- kopete-3.5.5/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayport.cc.orig	2006-10-01 10:26:44.000000000 -0700
++++ kopete-3.5.5/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayport.cc	2006-12-22 23:14:51.000000000 -0800
+@@ -52,9 +52,7 @@
+ 
+ namespace cricket {
+ 
+-const int KEEPALIVE_DELAY = 10 * 60 * 1000;
+-const int RETRY_DELAY = 50; // 50ms, from ICE spec
+-const uint32 RETRY_TIMEOUT = 50 * 1000; // ICE says 50 secs
++const int RELAY_KEEPALIVE_DELAY = 10 * 60 * 1000;
+ 
+ const uint32 MSG_DISPOSE_SOCKET = 100; // needs to be more than ID used by Port
+ typedef TypedMessageData<AsyncPacketSocket *> DisposeSocketData;
+@@ -460,7 +458,7 @@
+ }
+ 
+ void RelayEntry::ScheduleKeepAlive() {
+-  requests_.SendDelayed(new AllocateRequest(this), KEEPALIVE_DELAY);
++  requests_.SendDelayed(new AllocateRequest(this), RELAY_KEEPALIVE_DELAY);
+ }
+ 
+ void RelayEntry::HandleConnectFailure() {
+--- kopete-3.5.5/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunport.cc.orig	2006-10-01 10:26:44.000000000 -0700
++++ kopete-3.5.5/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunport.cc	2006-12-22 23:11:48.000000000 -0800
+@@ -48,10 +48,11 @@
+ 
+ namespace cricket {
+ 
+-const int KEEPALIVE_DELAY = 10 * 1000; // 10 seconds - sort timeouts
+ const int RETRY_DELAY = 50; // 50ms, from ICE spec
+ const uint32 RETRY_TIMEOUT = 50 * 1000; // ICE says 50 secs
+ 
++const int STUN_KEEPALIVE_DELAY = 10 * 1000; // 10 seconds - sort timeouts
++
+ // Handles a binding request sent to the STUN server.
+ class StunPortBindingRequest : public StunRequest {
+ public:
+@@ -81,7 +82,7 @@
+ 
+     // We will do a keep-alive regardless of whether this request suceeds.
+     // This should have almost no impact on network usage.
+-    port_->requests_.SendDelayed(new StunPortBindingRequest(port_), KEEPALIVE_DELAY);
++    port_->requests_.SendDelayed(new StunPortBindingRequest(port_), STUN_KEEPALIVE_DELAY);
+   }
+ 
+   virtual void OnErrorResponse(StunMessage* response) {
+@@ -96,7 +97,7 @@
+     }
+ 
+     if (GetMillisecondCount() - start_time_ <= RETRY_TIMEOUT)
+-      port_->requests_.SendDelayed(new StunPortBindingRequest(port_), KEEPALIVE_DELAY);
++      port_->requests_.SendDelayed(new StunPortBindingRequest(port_), STUN_KEEPALIVE_DELAY);
+   }
+ 
+   virtual void OnTimeout() {
diff --git a/kde-base/kdenetwork/files/kopete-3.5.5-status-visibility.patch b/kde-base/kdenetwork/files/kopete-3.5.5-status-visibility.patch
new file mode 100644
index 000000000000..e3c09008a8bd
--- /dev/null
+++ b/kde-base/kdenetwork/files/kopete-3.5.5-status-visibility.patch
@@ -0,0 +1,19 @@
+--- kopete-3.5.5/kopete/libkopete/kopeteonlinestatusmanager.h.orig	2006-12-15 23:33:46.000000000 -0800
++++ kopete-3.5.5/kopete/libkopete/kopeteonlinestatusmanager.h	2006-12-15 23:34:33.000000000 -0800
+@@ -21,6 +21,7 @@
+ #include <qobject.h>
+ #include "kopeteonlinestatus.h"
+ #include "kaction.h"
++#include "kopete_export.h"
+ 
+ class QString;
+ class QPixmap;
+@@ -38,7 +39,7 @@
+  *
+  * @author Olivier Goffart 
+  */
+-class OnlineStatusManager : public QObject
++class KOPETE_EXPORT OnlineStatusManager : public QObject
+ {
+ 	Q_OBJECT
+ public:
diff --git a/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild
index 31bf813eb363..16278bf30d18 100644
--- a/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild,v 1.16 2007/04/21 23:03:46 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild,v 1.17 2007/07/08 10:27:19 philantrop Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -46,7 +46,9 @@ DEPEND="${BOTH_DEPEND}
 	dev-util/pkgconfig"
 
 PATCHES="${FILESDIR}/kopete-3.5.5-icqfix.patch
-	${FILESDIR}/kdenetwork-3.5.5-linux-headers-2.6.18.patch"
+		${FILESDIR}/kdenetwork-3.5.5-linux-headers-2.6.18.patch
+		${FILESDIR}/kopete-3.5.5-status-visibility.patch
+		${FILESDIR}/kopete-3.5.5-enable-final-redefines.patch"
 
 pkg_setup() {
 	if use kernel_linux && ! built_with_use =x11-libs/qt-3* opengl; then
diff --git a/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild
index 30b884fb1350..a3cb2fed49fa 100644
--- a/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild,v 1.12 2007/04/21 23:03:46 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild,v 1.13 2007/07/08 10:27:19 philantrop Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -46,7 +46,9 @@ DEPEND="${BOTH_DEPEND}
 	dev-util/pkgconfig"
 
 PATCHES="${FILESDIR}/kopete-3.5.5-icqfix.patch
-	${FILESDIR}/kdenetwork-3.5.5-linux-headers-2.6.18.patch"
+		${FILESDIR}/kdenetwork-3.5.5-linux-headers-2.6.18.patch
+		${FILESDIR}/kopete-3.5.5-status-visibility.patch
+		${FILESDIR}/kopete-3.5.5-enable-final-redefines.patch"
 
 pkg_setup() {
 	if use kernel_linux && ! built_with_use =x11-libs/qt-3* opengl; then