Remove old.

(Portage version: 2.2.0_alpha123/cvs/Linux x86_64)

6 files changed, 7 insertions, 194 deletions

diff --git a/net-im/kmess/ChangeLog b/net-im/kmess/ChangeLog
index 1e9dfb2c413e..f14794b88fb7 100644
--- a/net-im/kmess/ChangeLog
+++ b/net-im/kmess/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/kmess
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/ChangeLog,v 1.93 2012/08/31 13:07:32 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/ChangeLog,v 1.94 2012/08/31 13:10:55 johu Exp $
+
+  31 Aug 2012; Johannes Huber <johu@gentoo.org>
+  -files/2.0.5-msn_login_url_fix.patch, -files/kmess-2.0.6-contact-list.patch,
+  -files/kmess-2.0.6-follow-location-redirects.patch,
+  -files/kmess-2.0.6-login-fix.patch, -kmess-2.0.6-r3.ebuild:
+  Remove old.
 
   31 Aug 2012; Johannes Huber <johu@gentoo.org> kmess-2.0.6.2.ebuild:
   Stable for x86, wrt bug #432868
diff --git a/net-im/kmess/files/2.0.5-msn_login_url_fix.patch b/net-im/kmess/files/2.0.5-msn_login_url_fix.patch
deleted file mode 100644
index 386f219444aa..000000000000
--- a/net-im/kmess/files/2.0.5-msn_login_url_fix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
- 2011-01-08 (Valerio)
-  * Fixed crash when taking any action in the Contact Added User dialog.
-    Also removed an unnecessary signal-bouncing slot.
---- a/src/network/msnnotificationconnection.cpp
-+++ b/src/network/msnnotificationconnection.cpp
-@@ -1029,16 +1029,12 @@
-     hash.insert( QString::number(ack), "INBOX" );
- 
-     // Ask for compose URL
--    ack = sendCommand("URL", "COMPOSE");
-+    ack = sendCommand("URL", "COMPOSE some.invalid@kmess.email" );
-     hash.insert( QString::number(ack), "COMPOSE" );
- 
-     // Ask the personal profile URL
--    ack = sendCommand("URL", "PROFILE");
-+    ack = sendCommand("URL", "PROFILE 0x" + QString::number( CurrentAccount::instance()->getLanguageCode().toInt(), 8 ) );
-     hash.insert( QString::number(ack), "PROFILE" );
--
--    // Ask the URL for change account info
--    ack = sendCommand("URL", "PERSON");
--    hash.insert( QString::number(ack), "PERSON" );
-   }
- 
-   // Notify observers that the server is connected
---- a/src/utils/kmessshared.cpp
-+++ b/src/utils/kmessshared.cpp
-@@ -139,13 +139,11 @@
-     return QString();
-   }
- 
-+  // this will have our (urlencoded) dodgy email address we used to satisfy URL COMPOSE
-+  // at the initial login. replace it where we actually want it to go.
-   QString command( folder );
--
--  // Check if the user wants to send an email
--  if( ! mailto.isEmpty() )
--  {
--    command += "?mailto=1&to=" + mailto;
--  }
-+  
-+  command = command.replace( "some.invalid%40kmess.email", mailto );
- 
-   // Use the method into passport to compute the token
-   QString token( PassportLoginService::createHotmailToken( currentAccount->getToken( "Passport" ),
diff --git a/net-im/kmess/files/kmess-2.0.6-contact-list.patch b/net-im/kmess/files/kmess-2.0.6-contact-list.patch
deleted file mode 100644
index 59f8c4099fb4..000000000000
--- a/net-im/kmess/files/kmess-2.0.6-contact-list.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: kmess-2.0.6/src/network/soap/addressbookservice.cpp
-===================================================================
---- kmess-2.0.6.orig/src/network/soap/addressbookservice.cpp
-+++ kmess-2.0.6/src/network/soap/addressbookservice.cpp
-@@ -35,13 +35,12 @@
- /**
-  * @brief URL of the Address Book Service
-  */
--#define SERVICE_URL_ADDRESSBOOK           "https://omega.contacts.msn.com/abservice/abservice.asmx"
-+#define SERVICE_URL_ADDRESSBOOK           "https://local-sn.contacts.msn.com/abservice/abservice.asmx"
- 
- /**
-  * @brief URL of the Address Book Sharing Service
-  */
--#define SERVICE_URL_ADDRESSBOOK_SHARING   "https://omega.contacts.msn.com/abservice/SharingService.asmx"
--
-+#define SERVICE_URL_ADDRESSBOOK_SHARING   "https://local-sn.contacts.msn.com/abservice/SharingService.asmx"
- 
- 
- /**
-Index: kmess-2.0.6/src/network/soap/httpsoapconnection.cpp
-===================================================================
---- kmess-2.0.6.orig/src/network/soap/httpsoapconnection.cpp
-+++ kmess-2.0.6/src/network/soap/httpsoapconnection.cpp
-@@ -546,6 +546,13 @@ void HttpSoapConnection::slotRequestFini
-         kmDebug() << "Received hostname suggestion from:" << originalUrl << "to:" << preferredHostName;
- #endif
- 
-+        if( preferredHostName.compare("proxy-sn.contacts.msn.com") == 0 )
-+        {
-+#ifdef KMESSDEBUG_HTTPSOAPCONNECTION_GENERAL
-+          kmDebug() << "Overriding hostname" << preferredHostName << "with local-sn.contacts.msn.com";
-+#endif
-+          preferredHostName = "local-sn.contacts.msn.com";
-+ 	}
-         redirectionCounts_[ originalHost ] = 0;
-         redirections_[ originalHost ] = preferredHostName;
-       }
diff --git a/net-im/kmess/files/kmess-2.0.6-follow-location-redirects.patch b/net-im/kmess/files/kmess-2.0.6-follow-location-redirects.patch
deleted file mode 100644
index fbabdeff44dd..000000000000
--- a/net-im/kmess/files/kmess-2.0.6-follow-location-redirects.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Follow Location redirects, MS seems to have moved some accounts to other
-servers. Forum topic reference:
-Connection problem to wlm - http://kmess.org/board/viewtopic.php?f=4&t=20549
-diff -Nur a/src/network/soap/httpsoapconnection.cpp b/src/network/soap/httpsoapconnection.cpp
---- a/src/network/soap/httpsoapconnection.cpp	2011-02-16 08:16:45.000000000 +0100
-+++ b/src/network/soap/httpsoapconnection.cpp	2011-11-08 16:53:29.612517607 +0100
-@@ -456,6 +456,7 @@
-   const QByteArray& replyContents = reply->readAll();
-   const int         statusCode    = reply->attribute( QNetworkRequest::HttpStatusCodeAttribute   ).toInt();
-   const QString     error         ( reply->attribute( QNetworkRequest::HttpReasonPhraseAttribute ).toString() );
-+  QUrl redirectUrl = reply->attribute( QNetworkRequest::RedirectionTargetAttribute ).toUrl();
- 
- #ifdef KMESSDEBUG_HTTPSOAPCONNECTION_GENERAL
-   bool requestSuccess = false;
-@@ -490,13 +491,16 @@
- #endif
- 
-     // Parse the message contents
--    if( currentResponse->isFaultMessage() )
-+    if( !redirectUrl.isEmpty() || currentResponse->isFaultMessage() )
-     {
--      // Verify if the server is redirecting us to another server
-       if( currentResponse->getFaultCode() == "psf:Redirect" )
-       {
-+        redirectUrl = XmlFunctions::getNodeValue( currentResponse->getFault(), "redirectUrl" );
-+      }
-+      // Verify if the server is redirecting us to another server
-+      if( !redirectUrl.isEmpty() )
-+      {
-         const QUrl& originalUrl = currentResponse->getEndPoint();
--        const QUrl redirectUrl( XmlFunctions::getNodeValue( currentResponse->getFault(), "redirectUrl" ) );
-         const QString originalHost( originalUrl.host() );
-         const QString redirectHost( redirectUrl.host() );
- 
diff --git a/net-im/kmess/files/kmess-2.0.6-login-fix.patch b/net-im/kmess/files/kmess-2.0.6-login-fix.patch
deleted file mode 100644
index 40a3073dcefa..000000000000
--- a/net-im/kmess/files/kmess-2.0.6-login-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
- 2011-01-13 (Adam)
---- a/src/network/msnnotificationconnection.cpp
-+++ b/src/network/msnnotificationconnection.cpp
-@@ -1033,7 +1033,9 @@
-     hash.insert( QString::number(ack), "COMPOSE" );
- 
-     // Ask the personal profile URL
--    ack = sendCommand("URL", "PROFILE 0x" + QString::number( CurrentAccount::instance()->getLanguageCode().toInt(), 8 ) );
-+    // default to US English if no preference
-+    quint32 langcode = CurrentAccount::instance()->getLanguageCode().toInt();
-+    ack = sendCommand("URL", "PROFILE 0x" + QString::number( ( langcode == 0 ? 1033 : langcode ), 8 ) );
-     hash.insert( QString::number(ack), "PROFILE" );
-   }
- 
diff --git a/net-im/kmess/kmess-2.0.6-r3.ebuild b/net-im/kmess/kmess-2.0.6-r3.ebuild
deleted file mode 100644
index 01f2fec438b1..000000000000
--- a/net-im/kmess/kmess-2.0.6-r3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/kmess-2.0.6-r3.ebuild,v 1.3 2011/11/17 18:51:51 phajdan.jr Exp $
-
-EAPI=3
-
-KDE_LINGUAS="ar ca de el es et fi fr gl hu it ja nl pt_BR ru sk tr zh_CN zh_TW"
-inherit kde4-base
-
-MY_P="${P/_/}"
-
-DESCRIPTION="KMess is an alternative MSN Messenger chat client for Linux"
-HOMEPAGE="http://www.kmess.org"
-SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-SLOT="4"
-IUSE="debug gif konqueror libnotify xscreensaver"
-RESTRICT="test"
-
-COMMONDEPEND="
-	app-crypt/qca:2
-	app-crypt/qca-ossl:2
-	dev-libs/libxml2
-	dev-libs/libxslt
-	gif? ( media-libs/giflib )
-	konqueror? ( $(add_kdebase_dep libkonq) )
-	libnotify? ( $(add_kdebase_dep knotify) )
-	xscreensaver? ( x11-libs/libXScrnSaver )
-"
-DEPEND="${COMMONDEPEND}
-	app-text/docbook-xml-dtd:4.2
-	xscreensaver? ( x11-proto/scrnsaverproto )
-"
-RDEPEND="${COMMONDEPEND}
-	konqueror? ( $(add_kdebase_dep konqueror) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-login-fix.patch
-	"${FILESDIR}"/${P}-follow-location-redirects.patch
-)
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with gif GIF)
-		$(cmake-utils_use_with konqueror LibKonq)
-		$(cmake-utils_use_want xscreensaver XSCREENSAVER)"
-
-	kde4-base_src_configure
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	echo
-	elog "KMess can use the following optional packages:"
-	elog "- www-plugins/adobe-flash 	provides support for winks"
-	echo
-}