Remove unused patches.

(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

6 files changed, 9 insertions, 198 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index bf70eba20a3f..03c64d25720c 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.885 2013/01/05 20:18:51 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.886 2013/01/08 12:09:16 kensington Exp $
+
+  08 Jan 2013; Michael Palimaka <kensington@gentoo.org>
+  -files/kdelibs-4.3.2-solaris-fileunix.patch,
+  -files/kdelibs-4.3.2-solaris-getgrouplist.patch,
+  -files/kdelibs-4.3.2-solaris-ksyscoca.patch,
+  -files/kdelibs-4.8.2-calculator_key.patch,
+  -files/kdelibs-4.8.4-kiopointer.patch:
+  Remove unused patches.
 
 *kdelibs-4.9.5 (05 Jan 2013)
 
diff --git a/kde-base/kdelibs/files/kdelibs-4.3.2-solaris-fileunix.patch b/kde-base/kdelibs/files/kdelibs-4.3.2-solaris-fileunix.patch
deleted file mode 100644
index c03620637dc8..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.3.2-solaris-fileunix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Solaris has no d_type element in dir_ent.
-
-Please refer to
-  https://solaris.bionicmutton.org/hg/kde4-specs-432/rev/be96f7fc958a
-
---- kioslave/file/file_unix.cpp.orig	2009-03-10 13:26:04.000000000 +0100
-+++ kioslave/file/file_unix.cpp	2009-05-04 03:27:15.231305077 +0200
-@@ -42,7 +42,7 @@
- #include <grp.h>
- #include <utime.h>
- #include <pwd.h>
--
-+#include <sys/stat.h>
- #if defined(HAVE_LIMITS_H)
- #include <limits.h>  // PATH_MAX
- #endif
-@@ -338,15 +338,20 @@
-     // files where QFile::encodeName(QFile::decodeName(a)) != a.
-     QList<QByteArray> entryNames;
-     KDE_struct_dirent *ep;
-+    KDE_struct_stat hajmaep;
-     if (details == 0) {
-         // Fast path (for recursive deletion, mostly)
-         // Simply emit the name and file type, nothing else.
-         while ( ( ep = KDE_readdir( dp ) ) != 0 ) {
-             entry.clear();
-             entry.insert(KIO::UDSEntry::UDS_NAME, QFile::decodeName(ep->d_name));
--            entry.insert(KIO::UDSEntry::UDS_FILE_TYPE,
--                         (ep->d_type & DT_DIR) ? S_IFDIR : S_IFREG );
--            if (ep->d_type & DT_LNK) {
-+//            entry.insert(KIO::UDSEntry::UDS_FILE_TYPE,
-+//                         (ep->d_type & DT_DIR) ? S_IFDIR : S_IFREG );
-+KDE_lstat(  ep->d_name, &hajmaep );
-+entry.insert(KIO::UDSEntry::UDS_FILE_TYPE,
-+(S_ISDIR(hajmaep.st_mode)) ? S_IFDIR : S_IFREG );
-+//            if (ep->d_type & DT_LNK) {
-+if (S_ISLNK(hajmaep.st_mode)) {
-                 // for symlinks obey the UDSEntry contract and provide UDS_LINK_DEST
-                 // even if we don't know the link dest (and DeleteJob doesn't care...)
-                 entry.insert(KIO::UDSEntry::UDS_LINK_DEST, QLatin1String("Dummy Link Target"));
diff --git a/kde-base/kdelibs/files/kdelibs-4.3.2-solaris-getgrouplist.patch b/kde-base/kdelibs/files/kdelibs-4.3.2-solaris-getgrouplist.patch
deleted file mode 100644
index 59ab862d5f65..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.3.2-solaris-getgrouplist.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-Solaris does not provide getgrouplist().
-
-Please refer to
-  https://solaris.bionicmutton.org/hg/kde4-specs-432/file/539d9ed6c7b5/specs/patches/kdelibs-getgrouplist.diff
-
---- ./kio/kfile/kpropertiesdialog.cpp.orig	Tue Apr 14 23:40:16 2009
-+++ ./kio/kfile/kpropertiesdialog.cpp	Tue Apr 14 23:40:29 2009
-@@ -141,6 +141,101 @@
- #endif
- #endif
- 
-+/*-
-+ * Copyright (c) 1991, 1993
-+ *	The Regents of the University of California.  All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. All advertising materials mentioning features or use of this software
-+ *    must display the following acknowledgement:
-+ *	This product includes software developed by the University of
-+ *	California, Berkeley and its contributors.
-+ * 4. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+#if 0
-+#if defined(LIBC_SCCS) && !defined(lint)
-+static char sccsid[] = "@(#)getgrouplist.c	8.2 (Berkeley) 12/8/94";
-+#endif /* LIBC_SCCS and not lint */
-+#include <sys/cdefs.h>
-+__FBSDID("$FreeBSD: src/lib/libc/gen/getgrouplist.c,v 1.14 2005/05/03 16:20:03 delphij Exp $");
-+#endif
-+
-+/*
-+ * get credential
-+ */
-+#include <sys/types.h>
-+
-+#include <grp.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+int
-+getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt)
-+{
-+	const struct group *grp;
-+	int i, maxgroups, ngroups, ret;
-+
-+	ret = 0;
-+	ngroups = 0;
-+	maxgroups = *grpcnt;
-+	/*
-+	 * When installing primary group, duplicate it;
-+	 * the first element of groups is the effective gid
-+	 * and will be overwritten when a setgid file is executed.
-+	 */
-+	groups ? groups[ngroups++] = agroup : ngroups++;
-+	if (maxgroups > 1)
-+		groups ? groups[ngroups++] = agroup : ngroups++;
-+	/*
-+	 * Scan the group file to find additional groups.
-+	 */
-+	setgrent();
-+	while ((grp = getgrent()) != NULL) {
-+		if (groups) {
-+			for (i = 0; i < ngroups; i++) {
-+				if (grp->gr_gid == groups[i])
-+					goto skip;
-+			}
-+		}
-+		for (i = 0; grp->gr_mem[i]; i++) {
-+			if (!strcmp(grp->gr_mem[i], uname)) {
-+				if (ngroups >= maxgroups) {
-+					ret = -1;
-+					break;
-+				}
-+				groups ? groups[ngroups++] = grp->gr_gid : ngroups++;
-+				break;
-+			}
-+		}
-+skip:
-+		;
-+	}
-+	endgrent();
-+	*grpcnt = ngroups;
-+	return (ret);
-+}
- using namespace KDEPrivate;
- 
- static QString nameFromFileName(QString nameStr)
diff --git a/kde-base/kdelibs/files/kdelibs-4.3.2-solaris-ksyscoca.patch b/kde-base/kdelibs/files/kdelibs-4.3.2-solaris-ksyscoca.patch
deleted file mode 100644
index 64da2e6cc900..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.3.2-solaris-ksyscoca.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Desc:	Add needed include for mmap() on Solaris.
-Author:	Daniel Vergien
-
---- kdelibs-4.3.2/kdecore/sycoca/ksycoca.cpp.orig	2009-10-14 12:12:45.697358506 +0200
-+++ kdelibs-4.3.2/kdecore/sycoca/ksycoca.cpp	2009-10-14 12:13:16.082152232 +0200
-@@ -46,6 +46,10 @@
- 
- #include "ksycocadevices_p.h"
- 
-+/* needed on solaris 10 for mmap */
-+
-+#include <sys/mman.h>
-+
- // TODO: remove mmap() from kdewin32 and use QFile::mmap() when needed
- #ifdef Q_WS_WIN
- #undef HAVE_MMAP
diff --git a/kde-base/kdelibs/files/kdelibs-4.8.2-calculator_key.patch b/kde-base/kdelibs/files/kdelibs-4.8.2-calculator_key.patch
deleted file mode 100644
index 4c481c62c5fb..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.8.2-calculator_key.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdeui/util/kkeyserver_x11.cpp	2012-02-25 18:53:49.480771132 -0200
-+++ kdeui/util/kkeyserver_x11.cpp	2012-02-25 18:20:38.912403430 -0200
-@@ -355,7 +355,7 @@
-     { Qt::Key_MediaRecord, XF86XK_AudioRecord },
-     { Qt::Key_LaunchMail, XF86XK_Mail },
-     { Qt::Key_Launch0,    XF86XK_MyComputer },
--    { Qt::Key_Calculator,    XF86XK_Calculator },
-+    { Qt::Key_Launch1,    XF86XK_Calculator },
-     { Qt::Key_Memo,    XF86XK_Memo },
-     { Qt::Key_ToDoList,    XF86XK_ToDoList },
-     { Qt::Key_Calendar,    XF86XK_Calendar },
diff --git a/kde-base/kdelibs/files/kdelibs-4.8.4-kiopointer.patch b/kde-base/kdelibs/files/kdelibs-4.8.4-kiopointer.patch
deleted file mode 100644
index a01b22153e20..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.8.4-kiopointer.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/kio/kio/accessmanager.cpp
-+++ b/kio/kio/accessmanager.cpp
-@@ -37,7 +37,7 @@
- #include <klocalizedstring.h>
- 
- #include <QtCore/QUrl>
--#include <QtCore/QWeakPointer>
-+#include <QtCore/QPointer>
- #include <QtGui/QWidget>
- #include <QtDBus/QDBusInterface>
- #include <QtDBus/QDBusConnection>
-@@ -87,7 +87,7 @@
-     bool emitReadyReadOnMetaDataChange;
-     KIO::MetaData requestMetaData;
-     KIO::MetaData sessionMetaData;
--    QWidget* window;
-+    QPointer<QWidget> window;
- };
- 
- namespace Integration {
-