Update KDE to 4.2.1.

multimedia/phonon port has been split into phonon itself, phonon-xine
and phono-gstreamer backends. After updating phonon port you have
to install at least one backend. phonon-xine backend is recommended
for KDE.

7 files changed, 3 insertions, 151 deletions

diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index 19d3b7ff3a24..39f5f9d60f72 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	kdenetwork
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	net kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo
index 3dbe63525787..f833f3c5054e 100644
--- a/net/kdenetwork4/distinfo
+++ b/net/kdenetwork4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdenetwork-4.2.0.tar.bz2) = 0ea1628e11d398fdf45276a35edd3cae
-SHA256 (KDE/kdenetwork-4.2.0.tar.bz2) = b44b092da8379292080d44ec60b0286638b89d671a14fb167a5f27619af524cd
-SIZE (KDE/kdenetwork-4.2.0.tar.bz2) = 7459315
+MD5 (KDE/kdenetwork-4.2.1.tar.bz2) = 17ba9800af0bfcf20a49337624f9946a
+SHA256 (KDE/kdenetwork-4.2.1.tar.bz2) = 9b279f18d345039283ce19f02bac793f3d421ddba8a110920a7cd57940f518a5
+SIZE (KDE/kdenetwork-4.2.1.tar.bz2) = 7462237
diff --git a/net/kdenetwork4/files/patch-kopete__plugins__otr__CMakeLists.txt b/net/kdenetwork4/files/patch-kopete__plugins__otr__CMakeLists.txt
deleted file mode 100644
index 49aad1d2a5ce..000000000000
--- a/net/kdenetwork4/files/patch-kopete__plugins__otr__CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../kopete/plugins/otr/CMakeLists.txt.orig	2008-10-01 16:20:37.000000000 +0000
-+++ ../kopete/plugins/otr/CMakeLists.txt	2009-01-28 23:21:50.000000000 +0000
-@@ -10,7 +10,7 @@
- 
- kde4_add_plugin(kopete_otr ${kopete_otr_PART_SRCS})
- 
--target_link_libraries(kopete_otr ${KDE4_KDEUI_LIBS} kopete kopete_otr_shared otr)
-+target_link_libraries(kopete_otr ${KDE4_KDEUI_LIBS} kopete kopete_otr_shared ${LIBOTR_LIBRARY})
- 
- install(TARGETS kopete_otr DESTINATION ${PLUGIN_INSTALL_DIR})
- 
-@@ -24,7 +24,7 @@
- 
- kde4_add_plugin(kcm_kopete_otr ${kcm_kopete_otr_PART_SRCS})
- 
--target_link_libraries(kcm_kopete_otr ${KDE4_KDEUI_LIBS} kopete kopete_otr_shared otr)
-+target_link_libraries(kcm_kopete_otr ${KDE4_KDEUI_LIBS} kopete kopete_otr_shared ${LIBOTR_LIBRARY})
- 
- install(TARGETS kcm_kopete_otr DESTINATION ${PLUGIN_INSTALL_DIR})
- 
-@@ -40,7 +40,7 @@
- 
- kde4_add_library(kopete_otr_shared SHARED ${kopete_otr_shared_LIB_SRCS})
- 
--target_link_libraries(kopete_otr_shared kopete ${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} otr)
-+target_link_libraries(kopete_otr_shared kopete ${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} ${LIBOTR_LIBRARY})
- 
- set_target_properties(kopete_otr_shared PROPERTIES VERSION 1.0.0 SOVERSION 1)
- install(TARGETS kopete_otr_shared ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/net/kdenetwork4/files/patch-svn923812-kopete_protocols_yahoo_libkyahoo-client.cpp b/net/kdenetwork4/files/patch-svn923812-kopete_protocols_yahoo_libkyahoo-client.cpp
deleted file mode 100644
index bc7f63d32a68..000000000000
--- a/net/kdenetwork4/files/patch-svn923812-kopete_protocols_yahoo_libkyahoo-client.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
---- ../kopete/protocols/yahoo/libkyahoo/client.cpp	2009/02/06 02:57:20	921978
-+++ ../kopete/protocols/yahoo/libkyahoo/client.cpp	2009/02/09 14:00:12	923817
-@@ -99,6 +99,8 @@
- 	QString statusMessageOnConnect;
- 	Yahoo::PictureStatus pictureFlag;
- 	int pictureChecksum;
-+	bool buddyListReady;
-+	QStringList pictureRequestQueue;
- };
- 
- Client::Client(QObject *par) :QObject(par)
-@@ -117,12 +119,14 @@
- 	d->loginTask = new LoginTask( d->root );
- 	d->listTask = new ListTask( d->root );
- 	d->pictureFlag = Yahoo::NoPicture;
-+	d->buddyListReady = false;
- 	m_connector = 0L;
- 
- 	m_pingTimer = new QTimer( this );
- 	QObject::connect( m_pingTimer, SIGNAL( timeout() ), this, SLOT( sendPing() ) );
- 
- 	QObject::connect( d->loginTask, SIGNAL( haveSessionID( uint ) ), SLOT( lt_gotSessionID( uint ) ) );
-+	QObject::connect( d->loginTask, SIGNAL( buddyListReady() ), SLOT( processPictureQueue() ) );
- 	QObject::connect( d->loginTask, SIGNAL( loginResponse( int, const QString& ) ), 
- 				SLOT( slotLoginResponse( int, const QString& ) ) );
- 	QObject::connect( d->loginTask, SIGNAL( haveCookies() ), SLOT( slotGotCookies() ) );
-@@ -197,6 +201,7 @@
- 		m_connector->deleteLater();
- 	m_connector = 0L;
- 	d->active = false;
-+	d->buddyListReady = false;
- }
- 
- int Client::error()
-@@ -490,8 +495,33 @@
- 
- // ***** Buddyicon handling *****
- 
-+void Client::processPictureQueue()
-+{
-+	kDebug(YAHOO_RAW_DEBUG) << k_funcinfo << endl;
-+	d->buddyListReady = true;
-+	if( d->pictureRequestQueue.isEmpty() )
-+	{
-+		return;
-+	}
-+
-+	requestPicture( d->pictureRequestQueue.front() );
-+	d->pictureRequestQueue.pop_front();
-+
-+	
-+	if( !d->pictureRequestQueue.isEmpty() )
-+	{
-+		QTimer::singleShot( 1000, this, SLOT(processPictureQueue()) );
-+	}
-+}
-+
- void Client::requestPicture( const QString &userId )
- {
-+	if( !d->buddyListReady )
-+	{
-+		d->pictureRequestQueue << userId;
-+		return;
-+	}
-+
- 	RequestPictureTask *rpt = new RequestPictureTask( d->root );
- 	rpt->setTarget( userId );
- 	rpt->go( true );
diff --git a/net/kdenetwork4/files/patch-svn923812-kopete_protocols_yahoo_libkyahoo-client.h b/net/kdenetwork4/files/patch-svn923812-kopete_protocols_yahoo_libkyahoo-client.h
deleted file mode 100644
index 766d5d2111a0..000000000000
--- a/net/kdenetwork4/files/patch-svn923812-kopete_protocols_yahoo_libkyahoo-client.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../kopete/protocols/yahoo/libkyahoo/client.h	2009/02/06 02:57:20	921978
-+++ ../kopete/protocols/yahoo/libkyahoo/client.h	2009/02/09 14:00:12	923817
-@@ -705,6 +705,12 @@
- 		 * Send a Yahoo Ping packet to the server
- 		 */
- 		void sendPing();
-+
-+		/**
-+		 * Send all queued buddy icon requests
-+		 */
-+		void processPictureQueue();
-+
- 	private:
- 		void distribute( Transfer *transfer );
- 		
diff --git a/net/kdenetwork4/files/patch-svn923812-kopete_protocols_yahoo_logintask.cpp b/net/kdenetwork4/files/patch-svn923812-kopete_protocols_yahoo_logintask.cpp
deleted file mode 100644
index 8ec51280c819..000000000000
--- a/net/kdenetwork4/files/patch-svn923812-kopete_protocols_yahoo_logintask.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
---- ../kopete/protocols/yahoo/libkyahoo/logintask.cpp	2009/01/06 17:13:38	906699
-+++ ../kopete/protocols/yahoo/libkyahoo/logintask.cpp	2009/02/09 14:00:12	923817
-@@ -66,6 +66,12 @@
- 
- 	YMSGTransfer *t = static_cast<YMSGTransfer *>(transfer);
- 
-+
-+	if ( t->service() == Yahoo::ServicePing) {
-+		emit buddyListReady();
-+		return true;
-+	}
-+
- 	switch (mState)
- 	{
- 		case (InitialState):
-@@ -99,6 +105,9 @@
- 	if (!t)
- 		return false;
- 
-+	if ( t->service() == Yahoo::ServicePing)
-+		return true;
-+
- 	switch (mState)
- 	{
- 		case (InitialState):
diff --git a/net/kdenetwork4/files/patch-svn923812-kopete_protocols_yahoo_logintask.h b/net/kdenetwork4/files/patch-svn923812-kopete_protocols_yahoo_logintask.h
deleted file mode 100644
index 6683119db832..000000000000
--- a/net/kdenetwork4/files/patch-svn923812-kopete_protocols_yahoo_logintask.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../kopete/protocols/yahoo/libkyahoo/logintask.h	2009/01/06 17:13:38	906699
-+++ ../kopete/protocols/yahoo/libkyahoo/logintask.h	2009/02/09 14:00:12	923817
-@@ -62,6 +62,7 @@
- 	void haveSessionID( uint );
- 	void haveCookies();
- 	void loginResponse( int, const QString& );
-+	void buddyListReady();
- private:
- 	State mState;
- 	Yahoo::Status m_stateOnConnect;