rm old files

Package-Manager: portage-2.2.0_alpha80/cvs/Linux x86_64

8 files changed, 20 insertions, 289 deletions

diff --git a/kde-base/kaddressbook/ChangeLog b/kde-base/kaddressbook/ChangeLog
index 96b1561568d2..ae65fa4e05ed 100644
--- a/kde-base/kaddressbook/ChangeLog
+++ b/kde-base/kaddressbook/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kaddressbook
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.203 2011/12/11 18:52:10 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.204 2011/12/12 00:46:46 abcd Exp $
+
+  12 Dec 2011; Jonathan Callen <abcd@gentoo.org>
+  -files/kaddressbook-4.4.10-asyncako.patch:
+  rm old files
 
 *kaddressbook-4.7.4 (11 Dec 2011)
 
diff --git a/kde-base/kaddressbook/files/kaddressbook-4.4.10-asyncako.patch b/kde-base/kaddressbook/files/kaddressbook-4.4.10-asyncako.patch
deleted file mode 100644
index ac2acd394c59..000000000000
--- a/kde-base/kaddressbook/files/kaddressbook-4.4.10-asyncako.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit cfa404b7188e4c26bddbc9579728f6d25f8cd214
-Author: Stephen Kelly <steveire@gmail.com>
-Date:   Tue Apr 5 11:09:43 2011 +0200
-
-    Start kdepim 4.4 asynchronously if built against 4.6.
-    
-    The synchronous mechanism doesn't have enough time to start
-    before it reports failure.
-
-diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp
-index 4c8ca42..200f8ec 100644
---- a/kaddressbook/main.cpp
-+++ b/kaddressbook/main.cpp
-@@ -49,11 +49,13 @@ int main( int argc, char **argv )
-   MainWindow *window = new MainWindow;
-   window->show();
- 
-+#if !KDE_IS_VERSION(4,6,0)
-   if ( !Akonadi::Control::start( window ) ) {
-     //TODO: add message box after string freeze
-     kWarning() << "Unable to start Akonadi server, exit application";
-     return 1;
-   }
-+#endif
- 
-   return app.exec();
- }
diff --git a/kde-base/kalgebra/ChangeLog b/kde-base/kalgebra/ChangeLog
index 5e3329d5ced1..d5bd740afa2a 100644
--- a/kde-base/kalgebra/ChangeLog
+++ b/kde-base/kalgebra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kalgebra
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/ChangeLog,v 1.108 2011/12/11 18:52:35 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/ChangeLog,v 1.109 2011/12/12 00:48:24 abcd Exp $
+
+  12 Dec 2011; Jonathan Callen <abcd@gentoo.org>
+  -files/kalgebra-4.3.2-solaris-graph2d.patch:
+  rm old files
 
 *kalgebra-4.7.4 (11 Dec 2011)
 
diff --git a/kde-base/kalgebra/files/kalgebra-4.3.2-solaris-graph2d.patch b/kde-base/kalgebra/files/kalgebra-4.3.2-solaris-graph2d.patch
deleted file mode 100644
index 41056d6da5c1..000000000000
--- a/kde-base/kalgebra/files/kalgebra-4.3.2-solaris-graph2d.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Desc:	Fix missing isinf() for Solaris (same way as for kcalc).
-Author:	Heiko Przybyl <zuxez@cs.tu-berlin.de>
---- kalgebra-4.3.2/kalgebra/src/graph2d.cpp.orig	2009-10-16 15:31:29.804959916 +0200
-+++ kalgebra-4.3.2/kalgebra/src/graph2d.cpp	2009-10-16 15:35:36.879338408 +0200
-@@ -38,6 +38,17 @@
- #include "analitza.h"
- #include "functionsmodel.h"
- 
-+// Stolen from kcalc.
-+#if defined(Q_OS_SOLARIS)
-+// Strictly by the standard, ininf() is a c99-ism which
-+// is unavailable in C++. The IEEE FP headers provide
-+// a function with similar functionality, so use that instead.
-+// However, !finite(a) == isinf(a) || isnan(a), so it's 
-+// not 100% correct.
-+#include <ieeefp.h>
-+#define isinf(a) !finite(a)
-+#endif
-+
- // #define DEBUG_GRAPH
- 
- using namespace std;
diff --git a/kde-base/kdebase-kioslaves/ChangeLog b/kde-base/kdebase-kioslaves/ChangeLog
index a392a4c7e8c8..ac306605abbe 100644
--- a/kde-base/kdebase-kioslaves/ChangeLog
+++ b/kde-base/kdebase-kioslaves/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase-kioslaves
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.241 2011/12/11 18:52:12 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.242 2011/12/12 00:49:47 abcd Exp $
+
+  12 Dec 2011; Jonathan Callen <abcd@gentoo.org>
+  -files/kdebase-kioslaves-4.7.0-sftp.patch:
+  rm old files
 
 *kdebase-kioslaves-4.7.4 (11 Dec 2011)
 
diff --git a/kde-base/kdebase-kioslaves/files/kdebase-kioslaves-4.7.0-sftp.patch b/kde-base/kdebase-kioslaves/files/kdebase-kioslaves-4.7.0-sftp.patch
deleted file mode 100644
index a9843295fdf5..000000000000
--- a/kde-base/kdebase-kioslaves/files/kdebase-kioslaves-4.7.0-sftp.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-commit 23e4ab03091e9d824e78171ea92a2da2326256d8
-Author: Dawit Alemayehu <adawit@kde.org>
-Date:   Thu Aug 25 00:29:14 2011 -0400
-
-    Fix the logic for user name change redirection so it won't break normal
-    login into sftp servers.
-
-diff --git a/kioslave/sftp/kio_sftp.cpp b/kioslave/sftp/kio_sftp.cpp
-index eb5c8a8..2a55ff9 100644
---- a/kioslave/sftp/kio_sftp.cpp
-+++ b/kioslave/sftp/kio_sftp.cpp
-@@ -429,12 +429,11 @@ sftpProtocol::~sftpProtocol() {
- }
- 
- void sftpProtocol::setHost(const QString& host, quint16 port, const QString& user, const QString& pass) {
--  kDebug(KIO_SFTP_DB) << "setHost(): " << user << "@" << host << ":" << port;
-+  kDebug(KIO_SFTP_DB) << user << "@" << host << ":" << port;
- 
-   // Close connection if the request is to another server...
--  if (mConnected &&
--      (host != mHost || port != mPort ||
--       user != mUsername || pass != mPassword)) {
-+  if (host != mHost || port != mPort ||
-+      user != mUsername || pass != mPassword) {
-     closeConnection();
-   }
- 
-@@ -451,9 +450,7 @@ void sftpProtocol::setHost(const QString& host, quint16 port, const QString& use
-     }
-   }
- 
--  kDebug(KIO_SFTP_DB) << "setHost(): mPort=" << mPort;
--
--  mUsername = mOrigUsername = user;
-+  mUsername = user;
-   mPassword = pass;
- }
- 
-@@ -479,6 +476,7 @@ void sftpProtocol::openConnection() {
-   info.url.setPort(mPort);
-   info.url.setUser(mUsername);
-   info.username = mUsername;
-+  const QString origPasswd (mPassword);
- 
-   // Check for cached authentication info if no password is specified...
-   if (mPassword.isEmpty()) {
-@@ -497,6 +495,7 @@ void sftpProtocol::openConnection() {
-   int rc, state, hlen;
-   int timeout_sec = 30, timeout_usec = 0;
- 
-+login_start:
-   mSession = ssh_new();
-   if (mSession == NULL) {
-     error(KIO::ERR_INTERNAL, i18n("Could not create a new SSH session."));
-@@ -722,8 +721,12 @@ void sftpProtocol::openConnection() {
-       firstTime = false;
- 
-       if (!mUsername.isEmpty() && mUsername != info.username) {
--        info.url.setUser(info.username); // update the AuthInfo URL's username
-         kDebug(KIO_SFTP_DB) << "Username changed from" << mUsername << "to" << info.username;
-+        info.url.setUser(info.username);
-+        mUsername = info.username;
-+        mPassword = info.password;
-+        closeConnection();
-+        goto login_start;
-       }
-     }
- 
-@@ -770,6 +773,7 @@ void sftpProtocol::openConnection() {
-   setTimeoutSpecialCommand(KIO_SFTP_SPECIAL_TIMEOUT);
- 
-   mConnected = true;
-+  mPassword = origPasswd;
-   connected();
- 
-   info.password.fill('x');
-@@ -777,13 +781,17 @@ void sftpProtocol::openConnection() {
- }
- 
- void sftpProtocol::closeConnection() {
--  kDebug(KIO_SFTP_DB) << "closeConnection()";
-+  kDebug(KIO_SFTP_DB);
- 
--  sftp_free(mSftp);
--  mSftp = NULL;
-+  if (mSftp) {
-+    sftp_free(mSftp);
-+    mSftp = NULL;
-+  }
- 
--  ssh_disconnect(mSession);
--  mSession = NULL;
-+  if (mSession) {
-+    ssh_disconnect(mSession);
-+    mSession = NULL;
-+  }
- 
-   mConnected = false;
- }
-@@ -1824,28 +1832,28 @@ sftpProtocol::GetRequest::~GetRequest() {
-   sftp_attributes_free(mSb);
- }
- 
--bool sftpProtocol::requiresUserNameRedirection()
-+void sftpProtocol::requiresUserNameRedirection()
- {
--    kDebug(KIO_SFTP_DB) << "Connected ?" << mConnected << "Original:" << mOrigUsername << "Current:" << mUsername;
--    if (!mConnected || mOrigUsername.isEmpty() || mOrigUsername == mUsername)
--        return false;
--
--    KUrl realURL;
--    realURL.setProtocol( QLatin1String("sftp") );
--    realURL.setUser( mUsername );
--    realURL.setPass( mPassword );
--    realURL.setHost( mHost );
--    if ( mPort > 0)
--      realURL.setPort( mPort );
--    kDebug(KIO_SFTP_DB) << "User name changed! Redirecting to" << realURL.prettyUrl();
--    redirection( realURL );
--    finished();
--    mOrigUsername = mUsername;
--    return true;
-+    KUrl redirectUrl;
-+    redirectUrl.setProtocol( QLatin1String("sftp") );
-+    redirectUrl.setUser( mUsername );
-+    redirectUrl.setPass( mPassword );
-+    redirectUrl.setHost( mHost );
-+    if (mPort > 0)
-+      redirectUrl.setPort( mPort );
-+    kDebug(KIO_SFTP_DB) << "redirecting to" << redirectUrl;
-+    redirection( redirectUrl );
- }
- 
- bool sftpProtocol::sftpConnect()
- {
-+    const QString origUsername = mUsername;
-     openConnection();
--    return !requiresUserNameRedirection();
-+    kDebug(KIO_SFTP_DB) << "connected ?" << mConnected << "username: old=" << origUsername << "new=" << mUsername;
-+    if (!origUsername.isEmpty() && origUsername != mUsername) {
-+        requiresUserNameRedirection();
-+        finished();
-+        return false;
-+    }
-+    return true;
- }
-diff --git a/kioslave/sftp/kio_sftp.h b/kioslave/sftp/kio_sftp.h
-index 7cd16d1..c937e2e 100644
---- a/kioslave/sftp/kio_sftp.h
-+++ b/kioslave/sftp/kio_sftp.h
-@@ -101,9 +101,6 @@ private: // Private variables
-   /** The sftp session for the connection */
-   sftp_session mSftp;
- 
--  /** Username originally set when setHost was called. */
--  QString mOrigUsername;
--
-   /** Username to use when connecting */
-   QString mUsername;
- 
-@@ -194,7 +191,7 @@ private: // private methods
-                       KIO::UDSEntry &entry, short int details);
- 
-   QString canonicalizePath(const QString &path);
--  bool requiresUserNameRedirection();
-+  void requiresUserNameRedirection();
-   bool sftpConnect();
- };
- 
diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index 595eae5bf628..c4c9054077cc 100644
--- a/kde-base/kdebase-startkde/ChangeLog
+++ b/kde-base/kdebase-startkde/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase-startkde
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.255 2011/12/11 18:52:28 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.256 2011/12/12 00:51:50 abcd Exp $
+
+  12 Dec 2011; Jonathan Callen <abcd@gentoo.org>
+  -files/gentoo-startkde4-2.patch:
+  rm old files
 
 *kdebase-startkde-4.7.4 (11 Dec 2011)
 
diff --git a/kde-base/kdebase-startkde/files/gentoo-startkde4-2.patch b/kde-base/kdebase-startkde/files/gentoo-startkde4-2.patch
deleted file mode 100644
index f23dc0230e1c..000000000000
--- a/kde-base/kdebase-startkde/files/gentoo-startkde4-2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -Naur kdebase-startkde-4.2.0-orig/startkde.cmake kdebase-startkde-4.2.0/startkde.cmake
---- kdebase-startkde-4.2.0-orig/startkde.cmake	2009-01-17 05:00:28.000000000 -0600
-+++ kdebase-startkde-4.2.0/startkde.cmake	2009-02-21 12:52:02.000000000 -0600
-@@ -7,6 +7,35 @@
- # because we still need to do some cleanup.
- trap 'echo GOT SIGHUP' HUP
- 
-+_KDEDIR=@GENTOO_PORTAGE_EPREFIX@@REPLACE_PREFIX@
-+if [ "$_KDEDIR" != "@GENTOO_PORTAGE_EPREFIX@/usr" ]; then
-+	export PATH=${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#@GENTOO_PORTAGE_EPREFIX@/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g')
-+	export ROOTPATH=${_KDEDIR}/sbin:${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#@GENTOO_PORTAGE_EPREFIX@/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g')
-+fi
-+@REPLACE_LDPATH@
-+export STRIGI_PLUGIN_PATH="${_KDEDIR}/@REPLACE_LIBDIR@/strigi:${STRIGI_PLUGIN_PATH}"
-+export XDG_DATA_DIRS=${_KDEDIR}/share:$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#@GENTOO_PORTAGE_EPREFIX@/usr/kde/[^/]*/share/\?:##g;s/:$//g')
-+
-+if [ -z "$HOME" ]; then
-+	xmessage "HOME is unset. Your user config seems to be broken. Aborting."
-+	exit 1
-+fi
-+
-+# Gentoo: handle the possible home directory layout for config directory
-+# Note that we change the default KDEHOME in kdelibs to .kde4 or .kde${SLOT}
-+# for -kdeprefix and +kdeprefix respectively.
-+if [ "${_KDEDIR}" = "@GENTOO_PORTAGE_EPREFIX@/usr" ]; then
-+	# If the directory doesn't exist make it
-+	[ -e "${HOME}/.kde4" ] || mkdir "$HOME/.kde4"
-+else
-+	# Use multiple directories based upon the KDE directory
-+	[ -e "$HOME/.kde$(basename $_KDEDIR)" ] || mkdir "$HOME/.kde$(basename $_KDEDIR)"
-+	if [ ! -d "$HOME/.kde$(basename $_KDEDIR)" ]; then
-+		xmessage "$HOME/.kde$(basename $_KDEDIR) exists but is not a dir. Aborting."
-+		exit 1
-+	fi
-+fi
-+
- # Check if a KDE session already is running and whether it's possible to connect to X
- kcheckrunning
- kcheckrunning_result=$?
-@@ -214,6 +243,13 @@
-   done
- done
- 
-+# Gentoo part for FHS installs
-+if [ "${_KDEDIR}" = "@GENTOO_PORTAGE_EPREFIX@/usr" ]; then
-+  for file in "@GENTOO_PORTAGE_EPREFIX@/etc/kde/startup/"*.sh; do
-+    test -r "${file}" && . "${file}"
-+  done
-+fi
-+
- # Set the path for Qt plugins provided by KDE
- if test -n "$QT_PLUGIN_PATH"; then
-   QT_PLUGIN_PATH="$QT_PLUGIN_PATH:`kde4-config --path qtplugins`"
-@@ -427,6 +463,13 @@
-   done
- done
- 
-+# Gentoo part for FHS installs
-+if [ "${_KDEDIR}" = "@GENTOO_PORTAGE_EPREFIX@/usr" ]; then
-+  for file in "@GENTOO_PORTAGE_EPREFIX@/etc/kde/shutdown/"*.sh; do
-+    test -r "${file}" && . "${file}"
-+  done
-+fi
-+
- unset KDE_FULL_SESSION
- xprop -root -remove KDE_FULL_SESSION
- unset KDE_SESSION_VERSION