Remove unused patch.

Package-Manager: portage-2.1.11.59/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

3 files changed, 14 insertions, 125 deletions

diff --git a/kde-base/nepomuk-core/ChangeLog b/kde-base/nepomuk-core/ChangeLog
index 652818537fca..afb6f03c864a 100644
--- a/kde-base/nepomuk-core/ChangeLog
+++ b/kde-base/nepomuk-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/nepomuk-core
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk-core/ChangeLog,v 1.35 2013/04/01 16:04:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk-core/ChangeLog,v 1.36 2013/04/02 12:47:15 kensington Exp $
+
+  02 Apr 2013; Michael Palimaka <kensington@gentoo.org>
+  -files/nepomuk-core-4.10.0-indexer.patch:
+  Remove unused patch.
 
   01 Apr 2013; Agostino Sarubbo <ago@gentoo.org> -nepomuk-core-4.10.0-r1.ebuild,
   -nepomuk-core-4.10.0.ebuild, -nepomuk-core-4.9.5.ebuild:
diff --git a/kde-base/nepomuk-core/Manifest b/kde-base/nepomuk-core/Manifest
index 22f1414aa1e3..11dc9658f4a2 100644
--- a/kde-base/nepomuk-core/Manifest
+++ b/kde-base/nepomuk-core/Manifest
@@ -1,25 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX nepomuk-core-4.10.0-indexer.patch 3842 SHA256 848b546a1a224e43096f58167cd57147f30d1f9cefbfc3c0746afca8549c3518 SHA512 06e1cab975b54a999c142cd872accab0b0e7dbbbd4655c4eee6ddb1fcbd224dc633ce61120570d5150477436347ee756330d1ac3a60320dc87775faf6b7a4e50 WHIRLPOOL 1247d6feca1b14a6b7dd1a64dd4c2bc40930bb8db208d0df9bc497021dc76bcfcbe669f5ddf3c3a6439af5ea3e71181aa4323bb1932c90edc2f187a344313486
 DIST nepomuk-core-4.10.1.tar.xz 371548 SHA256 968fb2be613492fbc70c3ed4da5e4e2c9b55d90440a0a5374883b6f363d96796 SHA512 130caa6dae64549ee1e4b8ddde5f590eaa182d93b85bb26fd825f73e54f03eb27a347b307dbe4b2eab1c85dbb700d999fee4b83762b4d5676440edf0b9c5326f WHIRLPOOL d73bdafa567bbc0e31fa2a38c77979c7d78c0c22cfe5f0ac3761050fc37fa1ac6a6fd89683863889db4851d36c81abc3ef56d4b7ac1c48af6f2e87df437e527b
 EBUILD nepomuk-core-4.10.1.ebuild 572 SHA256 bf87b28de0637241c18a5d3361b039381aa951bf5c06c9d949655a00521fce62 SHA512 f8ce886a9ceaa13527772058f3b943df301f2c8eb4a6780c28efdcf36fe718118b4e771ff37176d8ac885e474cb004bd78a20e28d345ebd43d7def437517c0d1 WHIRLPOOL 9ff835a21fecdcf0884b409827d308d2a93bc5a0a32db67977a4740c79314cd1812009b0e96f2e75cca9eed7f0aae890b293715f72f8146f0277fd1c1ce611cb
-MISC ChangeLog 5762 SHA256 bce4c11c87aeb3a3d901b44dbc9cceeae51ae008fd21f67dc3b024a0f0f585f0 SHA512 6d91946043a3c2ee382648fd5f98de80ed3adcb039b646d71866cf18663a66c0157f0c9dd9c9da613af1139dae072fda9e60be1462b41bf0e1cc32c10cc505b1 WHIRLPOOL e6b6ec77db3ff87d3db3dffd9a48d7c6a0519a4a799e60efa765e581b247288e52507e83d656bb2bab0f380d8bfc4bc89a41713cfd56ed081ea39df213d28281
+MISC ChangeLog 5893 SHA256 f2bfc70a6ff7cd18ad6c1fffdfd0eaf7edf183778e918419bb6b6daaea26c360 SHA512 00bcde0d1a893c307a57e3bfab82cfe0a1bbec9893d7cd76e65382a8c01ca1313a6490abf49da59b8f910114cf096c096abf31d59896cdb3357b653c584c4e24 WHIRLPOOL 3ac356b6deaae767be6578f6c4ca02280078c1af42504e0fee2447d045619b41568cfa9a5531d4c02662f2543f7a8b348bed152330b79f9f552c790c4cee7ee1
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRWa+WAAoJELp701BxlEWfbewP/ifQlw5VVcA8y1tiIXgzb6iH
-sRITqg4tqHmSs8Sv9CMSGJzxTcj2WD5zb+N4CA5C32NMihmA7e6FYBiAOx6YalpZ
-mrU9hAN8gqI8Tt1poQ8Cr5KP02lRRWpSAP9A/K9lD+mzumXPqEAyFBHqVDQBksSx
-8O87Gjv6az5/v7BRLLYk4AVs+EHYxT1SOmrA2m8KRZ3ItxsM6NI+JafqWnoxjc5l
-ToZvpoUvV0TZiB2PJuPTQrKOI7chYowa+uAKNcxSX3f+5bH9M6WFCh4VkN0PxAu6
-6rh0AaimeZh3eaMufntypb3oZgFy+OSrEClT/zrXfI/4gTpEHoRqDu53wadhMLzG
-f1FSP7rBt7fVSL9OoEMG8/3DItlM8y4TPX2LcthnDaIw45VIIC4n3VGCDhvd0sv7
-UDZoKT9K2P1HxVWx4V3HdDWWpTfyO0hrLd39Ic3S92Wgrlb96d4CBaYHDGHixBfr
-+ODrMHBKHqY+B5VwtaXQRP/eEoMGxPMqjUJhuDn6fUmzyXCPsn2f+447A7GwoRd0
-BbY/x8FzmJ6PGQskGoCmSCf9viFhz+Ri83eCYLKAScsmKsNu1MyVUjJmxmLRj2KD
-p0JiVg/7bHiK6i/iryuNF/iWf9Ab8GMMitX8Rc1rtnsNxlFNabVL6PIGb9VIZM3x
-75eEKg0/3OPzWDuuC51b
-=s7up
+iQEcBAEBCAAGBQJRWtMwAAoJEMbwO6tnXQ0ssXQH/jkeHuq0qufSVX28u+jDusB1
+ckPuBN7b3yAEFmjKSTpaUB/4i8sV8blLo/OuesXB17s8TTJ3UI6fJv89v5DcWSDg
+PQpbtULyIg/fMInYgmO27RtM+EeL/H6Itl13RzqGgG3QrVnb2wnavriIKdStuN6a
+Xzr40csnVoBigJWfEcGYxbww3S4s4EPAzpI5Cvzzi5q1B0N95b6EzcJZwOAvFpFR
+GsezN5TQo0qcSpkxfBRSDamBr75GubQIP+4qo3gBF/vCZmU8kFHzeHGqQ0iGqEVk
+g4rWYULgEr+Lh680EkAlUKoLQzAgeOTswTy8uNmtXu8iYuvtoNVOXq57Jvqyf+8=
+=qagt
 -----END PGP SIGNATURE-----
diff --git a/kde-base/nepomuk-core/files/nepomuk-core-4.10.0-indexer.patch b/kde-base/nepomuk-core/files/nepomuk-core-4.10.0-indexer.patch
deleted file mode 100644
index 9f2231ade4e2..000000000000
--- a/kde-base/nepomuk-core/files/nepomuk-core-4.10.0-indexer.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From b651f9231ac30072418bb06d602951f0f05da22c Mon Sep 17 00:00:00 2001
-From: Vishesh Handa <me@vhanda.in>
-Date: Sat, 9 Feb 2013 02:28:33 +0530
-Subject: [PATCH] Revert "BasicIndexingQueue: Use stacks instead of queues"
-
-This reverts commit 2f33141aa6716550e38b11ec9a0b000dd74eea79.
-
-The commit breaks recursive indexing. Doh!
-
-BUG: 314559
----
- services/fileindexer/basicindexingqueue.cpp | 18 ++++++------------
- services/fileindexer/basicindexingqueue.h   |  5 ++---
- 2 files changed, 8 insertions(+), 15 deletions(-)
-
-diff --git a/services/fileindexer/basicindexingqueue.cpp b/services/fileindexer/basicindexingqueue.cpp
-index a295330..b581786 100644
---- a/services/fileindexer/basicindexingqueue.cpp
-+++ b/services/fileindexer/basicindexingqueue.cpp
-@@ -54,14 +54,14 @@ void BasicIndexingQueue::clear()
- 
- void BasicIndexingQueue::clear(const QString& path)
- {
--    QMutableVectorIterator< QPair<QString, UpdateDirFlags> > it( m_paths );
-+    QMutableListIterator< QPair<QString, UpdateDirFlags> > it( m_paths );
-     while( it.hasNext() ) {
-         it.next();
-         if( it.value().first.startsWith( path ) )
-             it.remove();
-     }
- 
--    QMutableVectorIterator< QPair<QDirIterator*, UpdateDirFlags> > iter( m_iterators );
-+    QMutableListIterator< QPair<QDirIterator*, UpdateDirFlags> > iter( m_iterators );
-     while( iter.hasNext() ) {
-         QDirIterator* dirIter =  iter.next().first;
- 
-@@ -100,7 +100,7 @@ void BasicIndexingQueue::enqueue(const QString& path, UpdateDirFlags flags)
- {
-     kDebug() << path;
-     bool wasEmpty = m_paths.empty();
--    m_paths.push( qMakePair( path, flags ) );
-+    m_paths.enqueue( qMakePair( path, flags ) );
-     callForNextIteration();
- 
-     if( wasEmpty )
-@@ -120,12 +120,12 @@ void BasicIndexingQueue::processNextIteration()
-             processingFile = process( dirIt->next(), pair.second );
-         }
-         else {
--            delete m_iterators.pop().first;
-+            delete m_iterators.dequeue().first;
-         }
-     }
- 
-     else if( !m_paths.isEmpty() ) {
--        QPair< QString, UpdateDirFlags > pair = m_paths.pop();
-+        QPair< QString, UpdateDirFlags > pair = m_paths.dequeue();
-         processingFile = process( pair.first, pair.second );
-     }
- 
-@@ -161,7 +161,7 @@ bool BasicIndexingQueue::process(const QString& path, UpdateDirFlags flags)
-             QDir::Filters dirFilter = QDir::NoDotAndDotDot|QDir::Readable|QDir::Files|QDir::Dirs;
- 
-             QPair<QDirIterator*, UpdateDirFlags> pair = qMakePair( new QDirIterator( path, dirFilter ), flags );
--            m_iterators.push( pair );
-+            m_iterators.enqueue( pair );
-         }
-     }
-     else if( info.isFile() && (forced || indexingRequired) ) {
-@@ -259,12 +259,6 @@ void BasicIndexingQueue::slotIndexingFinished(KJob* job)
- 
-     emit endIndexingFile( url );
- 
--    // Give back the memory
--    if( m_paths.isEmpty() )
--        m_paths.clear();
--    if( m_iterators.isEmpty() )
--        m_iterators.clear();
--
-     // Continue the queue
-     finishIteration();
- }
-diff --git a/services/fileindexer/basicindexingqueue.h b/services/fileindexer/basicindexingqueue.h
-index 29dd9fd..5d1c190 100644
---- a/services/fileindexer/basicindexingqueue.h
-+++ b/services/fileindexer/basicindexingqueue.h
-@@ -23,7 +23,6 @@
- 
- #include "indexingqueue.h"
- #include <KJob>
--#include <QtCore/QStack>
- 
- namespace Nepomuk2 {
- 
-@@ -106,8 +105,8 @@ namespace Nepomuk2 {
-          */
-         bool process(const QString& path, Nepomuk2::UpdateDirFlags flags);
- 
--        QStack< QPair<QString, UpdateDirFlags> > m_paths;
--        QStack< QPair<QDirIterator*, UpdateDirFlags> > m_iterators;
-+        QQueue< QPair<QString, UpdateDirFlags> > m_paths;
-+        QQueue< QPair<QDirIterator*, UpdateDirFlags> > m_iterators;
- 
-         QUrl m_currentUrl;
-         QString m_currentMimeType;
--- 
-1.8.1.2
-