Drop unneeded patch

Package-Manager: portage--svn/cvs/Linux i686

12 files changed, 28 insertions, 722 deletions

diff --git a/kde-base/kdepimlibs/ChangeLog b/kde-base/kdepimlibs/ChangeLog
index be5bcccc56c8..a6dd4a30dbe6 100644
--- a/kde-base/kdepimlibs/ChangeLog
+++ b/kde-base/kdepimlibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdepimlibs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.46 2009/11/09 09:42:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.47 2009/11/09 10:14:17 abcd Exp $
+
+  09 Nov 2009; Jonathan Callen <abcd@gentoo.org>
+  -files/kdepimlibs-4.2.4-gpgme-1.2.0.patch:
+  Drop unneeded patch
 
   09 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
   kdepimlibs-4.3.3.ebuild:
diff --git a/kde-base/kdepimlibs/files/kdepimlibs-4.2.4-gpgme-1.2.0.patch b/kde-base/kdepimlibs/files/kdepimlibs-4.2.4-gpgme-1.2.0.patch
deleted file mode 100644
index 3b80ad6d09b8..000000000000
--- a/kde-base/kdepimlibs/files/kdepimlibs-4.2.4-gpgme-1.2.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gpgme++/context.cpp
-+++ gpgme++/context.cpp
-@@ -93,6 +93,7 @@
-   }
- 
-   Context * Context::createForProtocol( Protocol proto ) {
-+    gpgme_check_version ( NULL );
-     gpgme_ctx_t ctx = 0;
-     if ( gpgme_new ( &ctx ) != 0 )
-       return 0;
diff --git a/kde-base/kdeplasma-addons/ChangeLog b/kde-base/kdeplasma-addons/ChangeLog
index 7a16952d3822..36be75115279 100644
--- a/kde-base/kdeplasma-addons/ChangeLog
+++ b/kde-base/kdeplasma-addons/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdeplasma-addons
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.37 2009/11/08 23:30:54 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.38 2009/11/09 10:15:57 abcd Exp $
+
+  09 Nov 2009; Jonathan Callen <abcd@gentoo.org> -files/lancelot-qt45.patch:
+  Drop unneeded patch
 
   08 Nov 2009; Alexey Shvetsov <alexxy@gentoo.org>
   -kdeplasma-addons-4.3.2.ebuild:
diff --git a/kde-base/kdeplasma-addons/files/lancelot-qt45.patch b/kde-base/kdeplasma-addons/files/lancelot-qt45.patch
deleted file mode 100644
index b1c9887d55dc..000000000000
--- a/kde-base/kdeplasma-addons/files/lancelot-qt45.patch
+++ /dev/null
@@ -1,263 +0,0 @@
---- applets/lancelot/libs/lancelot/Global.cpp~	2008-12-21 20:20:19.000000000 +0000
-+++ applets/lancelot/libs/lancelot/Global.cpp	2009-02-14 20:57:06.000000000 +0000
-@@ -326,8 +326,11 @@
- 
-     d->confMain = new KConfig("lancelot" + app + "rc");
- 
-+    Plasma::Theme::defaultTheme()->setUseGlobalSettings(true);
-+    qDebug() << "What is the plasma theme: " << Plasma::Theme::defaultTheme()->themeName();
-     QString search = "desktoptheme/" + Plasma::Theme::defaultTheme()->themeName() + "/lancelot/" + app + "theme.config";
-     kDebug() << search;
-+    qDebug() << "Trying:" << search;
- 
-     QString path =  KStandardDirs::locate( "data", search );
-     if (path == "") {
-@@ -338,6 +341,8 @@
-         path = "lancelotrc";
-     }
-     kDebug() << path;
-+    
-+    qDebug() << "Using theme:" << path;
-     d->confTheme = new KConfig(path);
- 
-     Instance::Private::activeInstance = this;
---- applets/lancelot/libs/lancelot/widgets/PassagewayView.cpp~	2009-01-06 17:23:55.000000000 +0000
-+++ applets/lancelot/libs/lancelot/widgets/PassagewayView.cpp	2009-02-14 21:35:13.000000000 +0000
-@@ -20,6 +20,10 @@
- #include "PassagewayView.h"
- 
- #include <QWidget>
-+#include <QGraphicsSceneMouseEvent>
-+#include <QGraphicsView>
-+#include <QApplication>
-+#include <climits>
- 
- namespace Lancelot {
- 
-@@ -65,6 +69,8 @@
-       : layout(NULL), buttonsLayout(NULL), listsLayout(NULL), parent(p), focusIndex(0)
-     {
-         parent->setLayout(layout = new NodeLayout());
-+        layout->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
-+        layout->setMaximumSize(INT_MAX, INT_MAX);
- 
-         layout->addItem(
-             buttonsLayout = new QGraphicsLinearLayout(Qt::Horizontal),
-@@ -72,6 +78,9 @@
-             NodeLayout::NodeCoordinate(1, 0, 0, 32)
-         );
- 
-+        buttonsLayout->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
-+        buttonsLayout->setMaximumSize(INT_MAX, INT_MAX);
-+        
-         ExtenderButton * spacer =
-             new ExtenderButton(parent);
-         spacer->setGroupByName("PassagewayView-Spacer");
-@@ -88,6 +97,9 @@
- 
-         listsLayout->setSizer(new PassagewayViewSizer());
- 
-+        listsLayout->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
-+        listsLayout->setMaximumSize(INT_MAX, INT_MAX);
-+
-         buttonsLayout->setSpacing(0.0);
- 
-         next(Step("", QIcon(), entranceModel));
-@@ -161,7 +173,11 @@
-             path.takeLast();
- 
-             buttonsLayout->removeItem(button);
--            layout->activate();
-+
-+            // This really shouldn't be needed :(
-+            buttonsLayout->setGeometry(buttonsLayout->geometry());
-+            
-+            
-             listsLayout->pop();
- 
-             button->deleteLater();
-@@ -196,19 +212,18 @@
-         list->setCategoriesGroupByName("ActionListView-CategoriesPass");
-         list->setCategoriesActivable(true);
- 
--        // if (lists.count() > 0) {
--        //     lists.last()->clearSelection();
--        // }
--
-         focusIndex = lists.count();
-         lists.append(list);
- 
--        // list->initialSelection();
-         path.append(step);
- 
-         buttonsLayout->addItem(button);
-         listsLayout->push(list);
- 
-+        // This really shouldn't be needed :(
-+        buttonsLayout->setGeometry(buttonsLayout->geometry());
-+        listsLayout->setGeometry(listsLayout->geometry());
-+
-         QObject::connect(
-             list, SIGNAL(activated(int)),
-             parent, SLOT(listItemActivated(int))
---- applets/lancelot/app/src/models/ContactsKopete.cpp	2009/02/14 16:58:48	926097
-+++ applets/lancelot/app/src/models/ContactsKopete.cpp	2009/02/15 10:37:30	926398
-@@ -22,7 +22,7 @@
- #include <KStandardDirs>
- #include <KDebug>
- 
--#define UPDATE_INTERVAL 30000
-+#define UPDATE_INTERVAL 15000
- #define CHECK_RUNNING_INTERVAL 5000
- 
- namespace Models {
---- applets/lancelot/libs/lancelot/layouts/CardLayout.cpp	2008/08/16 21:14:21	848082
-+++ applets/lancelot/libs/lancelot/layouts/CardLayout.cpp	2009/02/15 10:37:30	926398
-@@ -31,6 +31,35 @@
-     {
-     }
- 
-+    void _hide(QGraphicsWidget * widget) {
-+        // since Qt has some strange bug (or it
-+        // just doesn't behave as it should,
-+        // this is a temporary solution
-+        // so instead of hiding the item,
-+        // we are moving it somewhere
-+        // out of bounds
-+        // this is a very dirty hack!
-+
-+        QRectF g = widget->geometry();
-+        if (g.left() < 0) {
-+            return;
-+        }
-+        g.moveRight(- g.left());
-+        widget->setGeometry(g);
-+    }
-+
-+    void _show(QGraphicsWidget * widget) {
-+        // see the comment in _hide
-+
-+        QRectF g = widget->geometry();
-+        if (g.left() >= 0) {
-+            return;
-+        }
-+
-+        g.moveLeft(- g.right());
-+        widget->setGeometry(g);
-+    }
-+
-     void relayout()
-     {
-         QRectF g = q->geometry();
-@@ -40,9 +69,11 @@
-         }
- 
-         foreach (QGraphicsWidget * l, widgets) {
--            l->show();
-+            _show(l);
-             l->setGeometry(g);
--            if (shown != l) l->hide();
-+            if (shown != l) {
-+                _hide(l);
-+            }
-         }
-     }
- 
-@@ -107,6 +138,7 @@
-     if (widget) {
-         d->widgets[id] = widget;
-         // widget->hide(); // BUGS in QT
-+        d->_hide(widget);
-     } else {
-         d->removeItem(id);
-     }
-@@ -142,17 +174,17 @@
-     if (!d->widgets.contains(id)) return;
-     if (d->shown == d->widgets[id]) return;
-     if (d->shown) {
--        d->shown->hide();
-+        d->_hide(d->shown);
-     }
-     d->shown = d->widgets[id];
-     d->shown->setGeometry(geometry());
--    d->shown->show();
-+    d->_show(d->shown);
- }
- 
- void CardLayout::hideAll()
- {
-     if (!d->shown) return;
--    d->shown->hide();
-+    d->_hide(d->shown);
-     d->shown = NULL;
- }
- 
---- applets/lancelot/libs/lancelot/layouts/FullBorderLayout.cpp	2008/11/24 16:25:50	888490
-+++ applets/lancelot/libs/lancelot/layouts/FullBorderLayout.cpp	2009/02/15 10:37:30	926398
-@@ -41,10 +41,10 @@
-     {
-     }
- 
--    QMap< FullBorderLayout::Place, QGraphicsLayoutItem * > itemPositions;
--    QMap< FullBorderLayout::Border, qreal > sizes;
-+    QMap < FullBorderLayout::Place, QGraphicsLayoutItem * > itemPositions;
-+    QMap < FullBorderLayout::Border, qreal > sizes;
- 
--    void calculateBorderSizes(qreal & top, qreal & bottom, qreal & left, qreal & right) const
-+    void calculateBorderSizes(qreal & top, qreal & bottom, qreal & left, qreal & right) // const
-     {
-         // top
-         top = sizes[FullBorderLayout::TopBorder];
-@@ -121,7 +121,8 @@
- void FullBorderLayout::setGeometry(const QRectF & rect)
- {
-     QGraphicsLayout::setGeometry(rect);
--    kDebug() << rect;
-+    // WHATA HELL!?
-+    qDebug() << "FullBorderLayout::setGeometry()";
- 
-     QRectF effectiveRect = geometry();
-     qreal left = 0, top = 0, right = 0, bottom = 0;
-@@ -158,7 +159,6 @@
-     itemRect.setHeight(effectiveRect.height() - topBorder - bottomBorder);
- 
-     if (d->itemPositions[Right]) {
--        kDebug() << "right" << itemRect;
-         d->itemPositions[Right]->setGeometry(itemRect);
-     }
- 
-@@ -197,7 +197,6 @@
-             );
- 
-     if (d->itemPositions[Center]) {
--        kDebug() << "center" << itemRect;
-         d->itemPositions[Center]->setGeometry(itemRect);
-     }
- }
---- applets/lancelot/libs/lancelot/widgets/CustomListView.cpp	2009/02/08 10:49:35	923110
-+++ applets/lancelot/libs/lancelot/widgets/CustomListView.cpp	2009/02/15 10:37:30	926398
-@@ -163,9 +163,9 @@
-             QGraphicsWidget * item = itemForIndex(i);
-             QRectF itemGeometry = item->geometry();
-             if (viewport.intersects(itemGeometry)) {
--                if (q->isVisible()) {
-+                //if (q->isVisible()) {
-                     item->show();
--                }
-+                //}
-                 transform.reset();
-                 if (!viewport.contains(itemGeometry)) {
-                     QRectF clip = viewport.intersect(itemGeometry);
---- applets/lancelot/libs/lancelot/widgets/ScrollPane.cpp	2009/01/18 18:26:08	913061
-+++ applets/lancelot/libs/lancelot/widgets/ScrollPane.cpp	2009/02/15 10:37:30	926398
-@@ -229,8 +229,10 @@
- 
- void ScrollPane::setGeometry(const QRectF & rect) //>
- {
-+    QRectF old_geometry = geometry();
-     Widget::setGeometry(rect);
- 
-+    if (rect == old_geometry) return ;
-     scrollableWidgetSizeUpdateNeeded();
- } //<
- 
diff --git a/kde-base/khotkeys/ChangeLog b/kde-base/khotkeys/ChangeLog
index df3e30c98eaf..24f5165bfe8f 100644
--- a/kde-base/khotkeys/ChangeLog
+++ b/kde-base/khotkeys/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/khotkeys
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/ChangeLog,v 1.135 2009/11/08 23:39:49 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/ChangeLog,v 1.136 2009/11/09 10:17:04 abcd Exp $
+
+  09 Nov 2009; Jonathan Callen <abcd@gentoo.org>
+  -files/khotkeys-4-parallel.patch:
+  Drop unneeded patch
 
   08 Nov 2009; Alexey Shvetsov <alexxy@gentoo.org> -khotkeys-4.3.2.ebuild:
   Drop KDE 4.3.2
diff --git a/kde-base/khotkeys/files/khotkeys-4-parallel.patch b/kde-base/khotkeys/files/khotkeys-4-parallel.patch
deleted file mode 100644
index 6051c0723ae6..000000000000
--- a/kde-base/khotkeys/files/khotkeys-4-parallel.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- khotkeys/update/CMakeLists.txt.old	2009-06-02 23:06:15.604322396 +0300
-+++ khotkeys/update/CMakeLists.txt	2009-06-02 23:06:05.516480905 +0300
-@@ -12,6 +12,8 @@
- 
- kde4_add_executable( khotkeys_update ${khotkeys_update_SRCS})
- 
-+add_dependencies( khotkeys_update kded_khotkeys )
-+
- target_link_libraries( khotkeys_update khotkeysprivate kworkspace ${KDE4_KDE3SUPPORT_LIBS} )
- if(X11_XTest_FOUND)
-   target_link_libraries( khotkeys_update ${X11_XTest_LIB} )
---- khotkeys/kcm_hotkeys/CMakeLists.txt.old	2009-06-02 23:05:32.685403364 +0300
-+++ khotkeys/kcm_hotkeys/CMakeLists.txt	2009-06-02 23:05:15.410616052 +0300
-@@ -50,6 +50,8 @@
-     ${kcm_hotkeys_PART_SRCS}
-     )
- 
-+add_dependencies(kcm_hotkeys kded_khotkeys)
-+
- target_link_libraries(
-     kcm_hotkeys
-     khotkeysprivate
diff --git a/kde-base/knetworkconf/ChangeLog b/kde-base/knetworkconf/ChangeLog
index adac0277592d..58cb1323e394 100644
--- a/kde-base/knetworkconf/ChangeLog
+++ b/kde-base/knetworkconf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/knetworkconf
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knetworkconf/ChangeLog,v 1.54 2009/11/08 23:47:52 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knetworkconf/ChangeLog,v 1.55 2009/11/09 10:19:14 abcd Exp $
+
+  09 Nov 2009; Jonathan Callen <abcd@gentoo.org>
+  -files/backends-scriptsdir.patch:
+  Drop unneeded patch
 
   08 Nov 2009; Alexey Shvetsov <alexxy@gentoo.org>
   -knetworkconf-4.3.2.ebuild:
diff --git a/kde-base/knetworkconf/files/backends-scriptsdir.patch b/kde-base/knetworkconf/files/backends-scriptsdir.patch
deleted file mode 100644
index 8512eb435217..000000000000
--- a/kde-base/knetworkconf/files/backends-scriptsdir.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- knetworkconf/backends/CMakeLists.txt.orig   2009-02-27 10:22:42.000000000 -0600
-+++ knetworkconf/backends/CMakeLists.txt        2009-02-27 10:22:58.000000000 -0600
-@@ -1,4 +1,4 @@
--
-+set(scriptsdir "${DATA_INSTALL_DIR}/knetworkconf/backends")
-
-
- ########### install files ###############
\ No newline at end of file
diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 85f4706fc048..b375a840273e 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,9 @@
 # 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.224 2009/11/08 23:52:38 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.225 2009/11/09 10:21:33 abcd Exp $
+
+  09 Nov 2009; Jonathan Callen <abcd@gentoo.org> -files/4.2.4-yahoo.patch:
+  Drop unneeded patch
 
   08 Nov 2009; Alexey Shvetsov <alexxy@gentoo.org> -kopete-4.3.2.ebuild:
   Drop KDE 4.3.2
diff --git a/kde-base/kopete/files/4.2.4-yahoo.patch b/kde-base/kopete/files/4.2.4-yahoo.patch
deleted file mode 100644
index a251b32881fb..000000000000
--- a/kde-base/kopete/files/4.2.4-yahoo.patch
+++ /dev/null
@@ -1,396 +0,0 @@
-Index: branches/KDE/4.2/kdenetwork/kopete/protocols/yahoo/libkyahoo/logintask.h
-===================================================================
---- branches/KDE/4.2/kdenetwork/kopete/protocols/yahoo/libkyahoo/logintask.h	(revision 986795)
-+++ branches/KDE/4.2/kdenetwork/kopete/protocols/yahoo/libkyahoo/logintask.h	(revision 986796)
-@@ -26,7 +26,13 @@
- 
- class QString;
- class YMSGTransfer;
-+class KJob;
- 
-+namespace KIO
-+{
-+	class Job;
-+}
-+
- /**
- @author Duncan Mac-Vicar
- */
-@@ -58,6 +64,15 @@
- 	void sendAuthResp_pre_0x0b(const QString &sn, const QString &seed);
- 	void handleAuthResp(YMSGTransfer *transfer);
- 	void parseCookies( YMSGTransfer *transfer );
-+	void sendAuthSixteenStage1(const QString& sn, const QString& seed);
-+	void sendAuthSixteenStage2(const QString& token);
-+	void sendAuthSixteenStage3(const QString& cryptString);
-+protected Q_SLOTS:
-+	void handleAuthSixteenStage1Data(KIO::Job*, const QByteArray& data);
-+	void handleAuthSixteenStage1Result(KJob*);
-+	void handleAuthSixteenStage2Data(KIO::Job*, const QByteArray& data);
-+	void handleAuthSixteenStage2Result(KJob*);
-+
- signals:
- 	void haveSessionID( uint );
- 	void haveCookies();
-@@ -71,6 +86,10 @@
- 	QString m_cCookie;
- 	QString m_loginCookie;
- 	QString m_verificationWord;
-+	QString m_stage1Data;
-+	QString m_stage2Data;
-+	QString m_challengeString;
-+	uint m_sessionID;
- };
- 
- #endif
-Index: branches/KDE/4.2/kdenetwork/kopete/protocols/yahoo/libkyahoo/logintask.cpp
-===================================================================
---- branches/KDE/4.2/kdenetwork/kopete/protocols/yahoo/libkyahoo/logintask.cpp	(revision 986795)
-+++ branches/KDE/4.2/kdenetwork/kopete/protocols/yahoo/libkyahoo/logintask.cpp	(revision 986796)
-@@ -3,10 +3,10 @@
-     Handles logging into to the Yahoo service
- 
-     Copyright (c) 2004 Duncan Mac-Vicar P. <duncan@kde.org>
--
-     Copyright (c) 2005-2006 André Duffeck <duffeck@kde.org>
-+    Copyright     2009 Matt Rogers <mattr@kde.org>
- 
--    Kopete (c) 2002-2006 by the Kopete developers <kopete-devel@kde.org>
-+    Kopete (c) 2002-2009 by the Kopete developers <kopete-devel@kde.org>
- 
-     *************************************************************************
-     *                                                                       *
-@@ -28,6 +28,10 @@
- #include <qstring.h>
- #include <kdebug.h>
- #include <stdlib.h>
-+
-+#include <QCryptographicHash>
-+#include <KDE/KJob>
-+#include <KDE/KIO/Job>
- extern "C"
- {
- #include "libyahoo.h"
-@@ -177,52 +181,197 @@
- 	
- 	QString sn = t->firstParam( 1 );
- 	QString seed = t->firstParam( 94 );
-+	m_challengeString = seed;
- 	QString version_s = t->firstParam( 13 );
--	uint sessionID = t->id();
-+	m_sessionID = t->id();
- 	int version = version_s.toInt();
- 	
- 	switch (version)
- 	{
- 		case 0:
--		kDebug(YAHOO_RAW_DEBUG) << " Version pre 0x0b "<< version_s;	
--		break;
-+		case 1:
-+		case 2:
-+			kDebug(YAHOO_RAW_DEBUG) << "Using version 16 authorization" << endl;
-+			sendAuthSixteenStage1(sn, seed);
-+			break;
- 		default:
--		kDebug(YAHOO_RAW_DEBUG) << " Version 0x0b "<< version_s;
--		sendAuthResp_0x0b(sn, seed, sessionID);
-+			kWarning(YAHOO_RAW_DEBUG) << "Unknown authentication method used!"
-+			                          << "Attempting current authentication anyways";
-+			sendAuthSixteenStage1(sn, seed);
- 		break;
- 	}	
- 	mState = SentAuthResp;
- 
--	emit haveSessionID( sessionID );
-+	emit haveSessionID( m_sessionID );
- }
- 
--void LoginTask::sendAuthResp_0x0b(const QString &sn, const QString &seed, uint sessionID)
-+void LoginTask::sendAuthSixteenStage1(const QString& sn, const QString& seed)
- {
--	kDebug(YAHOO_RAW_DEBUG) << " with seed " << seed;
--	char *resp_6 = (char *) malloc(100);
--	char *resp_96 = (char *) malloc(100);
--	authresp_0x0b(seed.toLatin1(), sn.toLatin1(), (client()->password()).toLatin1(), resp_6, resp_96);
--	kDebug(YAHOO_RAW_DEBUG) << "resp_6: " << resp_6 << " resp_69: " << resp_96;
-+	const QString YahooTokenUrl = "https://login.yahoo.com/config/pwtoken_get?src=ymsgr&ts=&login=%1&passwd=%2&chal=%3";
-+	kDebug(YAHOO_RAW_DEBUG) << "seed:" << seed;
-+	m_stage1Data.clear();
-+	/* construct a URL from the seed and request tokens */
-+	QByteArray encodedUrl;
-+	QString fullUrl = YahooTokenUrl.arg(sn, client()->password(), seed);
-+	KUrl tokenUrl(fullUrl);
-+	KIO::Job* job = KIO::get(tokenUrl, KIO::Reload, KIO::HideProgressInfo);
-+	connect(job, SIGNAL(data(KIO::Job*, const QByteArray&)),
-+	        this, SLOT(handleAuthSixteenStage1Data(KIO::Job*, const QByteArray&)));
-+	connect(job, SIGNAL(result(KJob*)),
-+	        this, SLOT(handleAuthSixteenStage1Result(KJob*)));
-+}
-+
-+void LoginTask::handleAuthSixteenStage1Data(KIO::Job* job, const QByteArray& data)
-+{
-+	kDebug(YAHOO_RAW_DEBUG) << "data:" << data;
-+	m_stage1Data.append(data);
-+}
-+
-+void LoginTask::handleAuthSixteenStage1Result(KJob* job)
-+{
-+	int responseNumber = -1;
-+	QString token;
-+	int error = job->error();
-+	kDebug(YAHOO_RAW_DEBUG) << "error:" << error;
-+	if (error == 0)
-+	{
-+		QStringList responses = m_stage1Data.split("\r\n");
-+		if (responses.count() >= 3)
-+		{
-+			responseNumber = responses[0].toInt();
-+			token = responses[1];
-+			token.remove("ymsgr=");
-+			kDebug(YAHOO_RAW_DEBUG) << "response is:" << responseNumber;
-+			kDebug(YAHOO_RAW_DEBUG) << "token is:" << token;
-+		}
-+
-+		if (responseNumber != 0)
-+		{
-+			switch(responseNumber)
-+			{
-+			case -1:
-+				/* error in the received stream */
-+				emit loginResponse(Yahoo::LoginSock, QString());
-+				kDebug(YAHOO_RAW_DEBUG) << "unknown error logging in";
-+				break;
-+			case 1212:
-+				/* password incorrect */
-+				emit loginResponse(Yahoo::LoginPasswd, QString());
-+				kDebug(YAHOO_RAW_DEBUG) << "password incorrect";
-+				break;
-+			case 1213:
-+				/* security lock */
-+				emit loginResponse(Yahoo::LoginLock, QString());
-+				break;
-+			case 1235:
-+				/* username does not exist */
-+				emit loginResponse(Yahoo::LoginUname, QString());
-+				kDebug(YAHOO_RAW_DEBUG) << "user does not exist";
-+				break;
-+			case 1214:
-+			case 1236:
-+				emit loginResponse(Yahoo::LoginVerify, QString());
-+				break;
-+			case 100: /* username or password missing */
-+				/*FIXME handle this */
-+				break;
-+			default:
-+				/* FIXME unknown error. handle it! */
-+				break;
-+			}
-+		}
-+		else
-+		{
-+			/* start stage 2 here */
-+			sendAuthSixteenStage2(token);
-+		}
-+	}
-+}
-+
-+void LoginTask::sendAuthSixteenStage2(const QString& token)
-+{
-+	const QString YahooLoginUrl = "https://login.yahoo.com/config/pwtoken_login?src=ymsgr&ts=&token=%1";
-+	kDebug(YAHOO_RAW_DEBUG) << "token:" << token;
-+	m_stage2Data.clear();
-+	QString fullUrl = YahooLoginUrl.arg(token);
-+	KUrl loginUrl(fullUrl);
-+	KIO::Job* job = KIO::get(loginUrl, KIO::Reload, KIO::HideProgressInfo);
-+	connect(job, SIGNAL(data(KIO::Job*, const QByteArray&)),
-+	        this, SLOT(handleAuthSixteenStage2Data(KIO::Job*, const QByteArray&)));
-+	connect(job, SIGNAL(result(KJob*)),
-+	        this, SLOT(handleAuthSixteenStage2Result(KJob*)));
-+}
-+
-+void LoginTask::handleAuthSixteenStage2Data(KIO::Job*, const QByteArray& data)
-+{
-+	kDebug(YAHOO_RAW_DEBUG) << "data:" << data;
-+	m_stage2Data.append(data);
-+}
-+
-+void LoginTask::handleAuthSixteenStage2Result(KJob* job)
-+{
-+	QString crumb;
-+	int responseNumber = -1;
-+	int error = job->error();
-+	kDebug(YAHOO_RAW_DEBUG) << "error:" << error;
-+	if (error == 0)
-+	{
-+		QStringList responses = m_stage2Data.split("\r\n");
-+		kDebug(YAHOO_RAW_DEBUG) << responses;
-+		responseNumber = responses[0].toInt();
-+		if (responseNumber == 0)
-+		{
-+			crumb = responses[1];
-+			crumb.remove("crumb=");
-+			m_yCookie = responses[2].remove(0,2); /* remove Y= */
-+			m_tCookie = responses[3].remove(0,2); /* remove T= */
-+		}
-+
-+		if (responseNumber != 0)
-+		{
-+			switch(responseNumber)
-+			{
-+			case -1:
-+				emit loginResponse(Yahoo::LoginSock, QString());
-+				break;
-+			case 100:
-+				emit loginResponse(Yahoo::LoginSock, QString());
-+				break;
-+			default: /* try to login anyways */
-+				break;
-+			}
-+		}
-+		else
-+		{
-+			QString cryptString = crumb;
-+			cryptString.append(m_challengeString);
-+			sendAuthSixteenStage3(cryptString);
-+		}
-+	}
-+}
-+
-+void LoginTask::sendAuthSixteenStage3(const QString& cryptString)
-+{
-+	kDebug(YAHOO_RAW_DEBUG) << " with crypt string" << cryptString;
-+	QByteArray cryptStringHash = QCryptographicHash::hash( cryptString.toAscii(),
-+	                                                       QCryptographicHash::Md5 );
-+	cryptStringHash = cryptStringHash.toBase64();
-+	cryptStringHash = cryptStringHash.replace('+', '.');
-+	cryptStringHash = cryptStringHash.replace('/', '_');
-+	cryptStringHash = cryptStringHash.replace('=', '-');
-+
- 	YMSGTransfer *t = new YMSGTransfer(Yahoo::ServiceAuthResp, m_stateOnConnect);
--	t->setId( sessionID );
--	t->setParam( 0 , sn.toLocal8Bit());
--	t->setParam( 2 , sn.toLocal8Bit());
-+	t->setId( m_sessionID );
-+   	t->setParam( 1, client()->userId().toLocal8Bit());
-+	t->setParam( 0 , client()->userId().toLocal8Bit());
-+	t->setParam( 277, m_yCookie.toLocal8Bit() );
-+	t->setParam( 278, m_tCookie.toLocal8Bit() );
-+	t->setParam( 307, cryptStringHash );
-+	t->setParam( 244, 2097087 );
-+	t->setParam( 2 , client()->userId().toLocal8Bit());
- 	t->setParam( 2, 1 ); // Both parameter 2s wind up in the packet
--	t->setParam( 6 , resp_6);
--	t->setParam( 1, sn.toLocal8Bit());
--	t->setParam( 244, 2097087 );
- 	t->setParam( 135, YMSG_PROGRAM_VERSION_STRING );
--	t->setParam( 148, 480 );
--	t->setParam( 59 , "B\\tfckeert1kk1nl&b=2" );	// ???
- 
--	if( !m_verificationWord.isEmpty() )
--	{
--		t->setParam( 227 , m_verificationWord.toLocal8Bit() );
--		m_verificationWord.clear();
--	}
--
--	free(resp_6);
--	free(resp_96);
- 	send(t);
- 
- }
-Index: branches/KDE/4.2/kdenetwork/kopete/protocols/yahoo/yahooeditaccount.cpp
-===================================================================
---- branches/KDE/4.2/kdenetwork/kopete/protocols/yahoo/yahooeditaccount.cpp	(revision 986795)
-+++ branches/KDE/4.2/kdenetwork/kopete/protocols/yahoo/yahooeditaccount.cpp	(revision 986796)
-@@ -63,9 +63,9 @@
- 		mAutoConnect->setChecked(acct->excludeConnect());
- 		mPasswordWidget->load( &acct->password() );
- 
--		QString pagerServer = account()->configGroup()->readEntry("Server", "scs.msg.yahoo.com");
-+		QString pagerServer = account()->configGroup()->readEntry("Server", "scsa.msg.yahoo.com");
- 		int pagerPort = account()->configGroup()->readEntry("Port", 5050);
--		if( pagerServer != "scs.msg.yahoo.com" || pagerPort != 5050 )
-+		if( pagerServer != "scsa.msg.yahoo.com" || pagerPort != 5050 )
- 			optionOverrideServer->setChecked( true );
- 		else
- 			optionOverrideServer->setChecked( false );
-@@ -133,7 +133,7 @@
- 	}
- 	else
- 	{
--		yahooAccount->setServer( "scs.msg.yahoo.com" );
-+		yahooAccount->setServer( "scsa.msg.yahoo.com" );
- 		yahooAccount->setPort( 5050 );
- 	}
- 
-Index: branches/KDE/4.2/kdenetwork/kopete/protocols/yahoo/yahooaccount.cpp
-===================================================================
---- branches/KDE/4.2/kdenetwork/kopete/protocols/yahoo/yahooaccount.cpp	(revision 986795)
-+++ branches/KDE/4.2/kdenetwork/kopete/protocols/yahoo/yahooaccount.cpp	(revision 986796)
-@@ -539,7 +539,7 @@
- 		return;
- 	}
- 
--	QString server = configGroup()->readEntry( "Server", "scs.msg.yahoo.com" );
-+	QString server = configGroup()->readEntry( "Server", "scsa.msg.yahoo.com" );
- 	int port = configGroup()->readEntry( "Port", 5050 );
- 
- 	initConnectionSignals( MakeConnections );
-Index: branches/KDE/4.2/kdenetwork/kopete/kopete/kconf_update/kopete-update_yahoo_server.upd
-===================================================================
---- branches/KDE/4.2/kdenetwork/kopete/kopete/kconf_update/kopete-update_yahoo_server.upd	(revision 0)
-+++ branches/KDE/4.2/kdenetwork/kopete/kopete/kconf_update/kopete-update_yahoo_server.upd	(revision 986796)
-@@ -0,0 +1,4 @@
-+Id=kopete-update-yahoo-server/r1
-+File=kopeterc
-+Options=overwrite
-+Script=kopete-update_yahoo_server.pl,perl
-Index: branches/KDE/4.2/kdenetwork/kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
-===================================================================
---- branches/KDE/4.2/kdenetwork/kopete/kopete/kconf_update/kopete-update_yahoo_server.pl	(revision 0)
-+++ branches/KDE/4.2/kdenetwork/kopete/kopete/kconf_update/kopete-update_yahoo_server.pl	(revision 986796)
-@@ -0,0 +1,20 @@
-+#!/usr/bin/perl
-+
-+# Rename the old Gaim style to Pidgin
-+
-+my $inYahoo = 0;
-+foreach (<>) {
-+    $inYahoo = 1 if (/^\[Account_YahooProtocol_.*$/);
-+    if ($inYahoo) {
-+        if (/^Server\=(.*)/) {
-+            my $oldServer = $1;
-+            if ($oldServer =~ m/\.yahoo\.com$/) {
-+                print "Server=scsa.msg.yahoo.com\n";
-+                $inYahoo = 0;
-+                next;
-+            }
-+        }
-+    }
-+
-+    print $_;
-+}
-
-Property changes on: branches/KDE/4.2/kdenetwork/kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
-___________________________________________________________________
-Added: svn:executable
-   + *
-
-Index: branches/KDE/4.2/kdenetwork/kopete/kopete/kconf_update/CMakeLists.txt
-===================================================================
---- branches/KDE/4.2/kdenetwork/kopete/kopete/kconf_update/CMakeLists.txt	(revision 986795)
-+++ branches/KDE/4.2/kdenetwork/kopete/kopete/kconf_update/CMakeLists.txt	(revision 986796)
-@@ -4,10 +4,11 @@
- endif(NOT WIN32)
- 
- 
--install( FILES kopete-pluginloader.upd  kopete-nameTracking.upd  kopete-initialstatus.upd  DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
-+install( FILES kopete-pluginloader.upd  kopete-nameTracking.upd  kopete-initialstatus.upd  kopete-update_yahoo_server.upd  DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
- 
--install( PROGRAMS kopete-pluginloader.pl
--	kopete-account-0.10.pl kopete-initialstatus.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
-+install( PROGRAMS kopete-pluginloader.pl kopete-update_yahoo_server.pl
-+	kopete-account-0.10.pl kopete-initialstatus.pl
-+  DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
- 
- 
- #TODO kconf_program ?
diff --git a/kde-base/ksmserver/ChangeLog b/kde-base/ksmserver/ChangeLog
index 635ca8557c47..be10abb98725 100644
--- a/kde-base/ksmserver/ChangeLog
+++ b/kde-base/ksmserver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/ksmserver
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ChangeLog,v 1.133 2009/11/08 23:58:27 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ChangeLog,v 1.134 2009/11/09 10:23:28 abcd Exp $
+
+  09 Nov 2009; Jonathan Callen <abcd@gentoo.org>
+  -files/ksmserver-4.2.1-disable-sse2-for-gcc3.patch:
+  Drop unneeded patch
 
   08 Nov 2009; Alexey Shvetsov <alexxy@gentoo.org> -ksmserver-4.3.2.ebuild:
   Drop KDE 4.3.2
diff --git a/kde-base/ksmserver/files/ksmserver-4.2.1-disable-sse2-for-gcc3.patch b/kde-base/ksmserver/files/ksmserver-4.2.1-disable-sse2-for-gcc3.patch
deleted file mode 100644
index 362dd91c2cbe..000000000000
--- a/kde-base/ksmserver/files/ksmserver-4.2.1-disable-sse2-for-gcc3.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Added-By: Gordon Malm <gengor@gentoo.org>
-
-Disable SSE2 in fadeeffect for <gcc-4
-
-See: http://bugs.gentoo.org/show_bug.cgi?id=256804
-
---- a/ksmserver/fadeeffect.cpp
-+++ b/ksmserver/fadeeffect.cpp
-@@ -41,7 +41,7 @@
- #  if defined(__MMX__)
- #    define HAVE_MMX
- #  endif
--#  if defined(__SSE2__)
-+#  if defined(__SSE2__) && __GNUC__ > 3
- #    define HAVE_SSE2
- #  endif
- #endif