Remove unused patches.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

7 files changed, 23 insertions, 255 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 456542fdbfa6..94ca50e89dd7 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,13 @@
 # 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.966 2013/12/12 03:36:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.967 2013/12/14 21:56:43 johu Exp $
+
+  14 Dec 2013; Johannes Huber <johu@gentoo.org>
+  -files/kdelibs-4.10.2-security-url-dont-show-password.patch,
+  -files/kdelibs-4.10.3-dialog-quit-crash.patch,
+  -files/kdelibs-4.10.5-home.patch, -files/kdelibs-4.11.0-themecrash.patch,
+  -files/kdelibs-4.11.1-jpeg-9.patch:
+  Remove unused patches.
 
   12 Dec 2013; Agostino Sarubbo <ago@gentoo.org> -kdelibs-4.10.5-r1.ebuild:
   Remove old
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 901caf14c298..4d1cdd67595c 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,14 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX dist/01_gentoo_set_xdg_menu_prefix-1.patch 592 SHA256 dea20e8a0e8f0ecc1aec1b38cec994312514aa1e88ba25fede01e1953623f341 SHA512 33a7eeb58b65ce28f0fadc1f6c7133e670391330d084df39990bb0a5b4ddd78f52375c1ebc620823adfe4eee22f10b85064d3fdcb6df0f63c5f6e757357e7ca7 WHIRLPOOL c585ed614ae27e0694156a7af68e222fe13578db95e611b592896475772572c316a05a60b39d1797d28f2c7bea52736ac41c5ee096a92e09e945c34f07ecf69c
 AUX dist/02_gentoo_append_xdg_config_dirs-1.patch 1041 SHA256 849e8cf1ca67eeae9dfd063eed676176f84e13d6e6b7244789c805c93e34edb9 SHA512 e4d057665461dc27bda326178c8c21dbe75458a9cdc3cf976cf1e5b549d18732cd538c17fbad1f67b09188da0650e8d9c16d43076ffcfe06003484ddb442eb04 WHIRLPOOL f741e12a2a03a56a24ee734f6cf56d16d7621d708b87ea3be04e11b99cf24b9af53c88c4304c3b2d225e51c7403f8aacb1fcb152cc227bb5f98d6dea276250be
 AUX kdelibs-4.10.0-udisks.patch 2012 SHA256 a856a103831162da416ea07ab9f18db5d5eb4732ee9203c9d6799a4616e53f25 SHA512 b22d2f70f17618d5f2d11e9037c4d198a1fa11252d59098f120cc77cc12bcb3d90f1a69c63f33abb01217f396f3eb51ea8285e5ff5306eb41e63cc15654ced33 WHIRLPOOL 6c6b33afdb29fda62798f9b7121711bf8f8de44bd4839523316abb9a2a05e6e9f773e700b1e43fc75564aa82d18490aeec5ca04c51418d37d2f9b3c8924daf9f
-AUX kdelibs-4.10.2-security-url-dont-show-password.patch 1284 SHA256 c6feac6a69840fcd91d82dd448000295bba0c113306e4abf71d8222e8ab020cb SHA512 7e6a238406d5e1e770255199b82dd337845427b93906fddaeccbbf86d91bb825f379818304bfbc91d5e8df942e48cd71aa872e0ad5102b7e1ece2484c60ec337 WHIRLPOOL 68e2a4e62b911d4dccd7df77a9343a20b750356a424436c7469d46e09c760535047363a8d36b06d865c39b40fcf3aff71fcdcac8a9686b599de154bcd56523e1
-AUX kdelibs-4.10.3-dialog-quit-crash.patch 729 SHA256 08574995956ff96593d8bc4aa931b6e4a71e5c841217d6acbfe19703d5d16a80 SHA512 f4f9db3aa4a75a668cb9982aec41ac2ea4887b9a1d381f2993f0a3e045a38dd509b0c9c9c0c94f24d127973701386a62b8266eca1c09302ceaf8b590d8101cc7 WHIRLPOOL 74872525e6c0da5799311d4533eb4597393fa9f1b1b073d87194006f849221a97380772e8ac317e4587fba2ee61e9b7ab011a1d8a55be82e0cbbbc1dcbfe8bac
-AUX kdelibs-4.10.5-home.patch 1453 SHA256 1f194854ff93bc3ae6f1a6d1624ae4ed3893a3524aa3d583f3dcfebd32243ae9 SHA512 1e247299c562e4d68c2655cb66315cabe1b7dc464d7da700b2bd9992ec8cb58f8fea44d02296699523e2570039784a167eb5b95294beeef0f50e344fdd2d971b WHIRLPOOL 7d50ececb98fc7f9672478e4b8e3b63092dbfb0dc8a61cd676ee84159d47d40d81b2582e53ceb723b7b99f07f35d7eab82a2ec47300ef95f4f0ff20e0099f2c2
-AUX kdelibs-4.11.0-themecrash.patch 2176 SHA256 cd5121d090b3d6ead27f027c734b96244cca22f06eda9c049b8351df77e169f9 SHA512 65436c7935bcb88da49c57471d5ab4977feabd6c1af98fe1c591d13546cfa4ee4e5d6b91742006d94192250d31846adb5168c2855c2e69c2fccef3b36df55099 WHIRLPOOL cd11a92bb541032f2935c96a70d2ff8d259036ff0f7121d3c7824ef56b39e9ae52d28ef357ec047063a6e893bf4157e99881529e31fddc8b10de645d2b7a634f
-AUX kdelibs-4.11.1-jpeg-9.patch 2313 SHA256 137d5137890a041dd3d7c4423bbff096451717a5480b573f29a297d4f04329ba SHA512 cb59bd3463377e47d14ce8ef4f774cea5d747cf26011a122b8546b4b55ebf4aee7e6d8fb9ceeb1ab7783ce8987d8c716ad7607a4f9521dc16a1c05f356c5d182 WHIRLPOOL 3912e0fd6b6dfdba4cb81189f246f34606e1d968b4b2f54e597f8de11fa2cc2cdb5c1f2c330a448462c0bd80281ba15877ae92755f15ea8eb091d8f05deebef3
 AUX kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch 2210 SHA256 3602e079a4788feceff27f7f6bcaeff33828c259a81d0357f7df092000f98a6a SHA512 9207f2ab33e757d3d8ed3279350ea4326339129f232bb67bcce7b3806480fe551c9ba03a93d289df311e913055c343c925f957eb0b0b24bec6a7ef59017090a2 WHIRLPOOL f63b26fc0657f7e72856b493fc469af1cfaa68bb18b1dd4078f9dae44c37a3bdec9114c6a2c92c55b2cdde4d7cbc2ea072df1157b26e43f844dccf16ec8b1f8d
 AUX kdelibs-4.4.90-xslt.patch 553 SHA256 ffb7b7f44d3e840d1fe5e3b1d859db74f6bf534d44160f48e0f91993200ab55b SHA512 0016a0cb2f4a93cc2a9638a74c8aa42759830304abf97b608393099093a35205bcdfbd0a8a6d501f6628119de34d39c7a40cac9ed99bff7081c651f678533dea WHIRLPOOL 8fd53eb3a5bb083b12f1ff1e68f5ba9208a5badd0210944bf62297899a7416d61cbd29d24adc02024b70789bad289abafcfa24b02370e5ea5929b39022dc6f46
 AUX kdelibs-4.6.2-armlinking.patch 1129 SHA256 9b076d1587bb02b85353f3a155199fd6dace7d1c76f189667787bca89192dee6 SHA512 d0208e095e751d4064e3f9b7d836135bce8c7f1cb7b4f1a20ef4d86d2fd5a08523c563c72ab86a871929000f26e4d50fa58fd81f7996edc57066984ce508ff1d WHIRLPOOL 81535f48c1ab14e37fd0dae7751317e72c53f4c55d4c28be67db8c6782af9a0a5e1ee3aba48680b8d367c9b6dda4d0e481392826b5eb597e1965bfbff70aaf38
@@ -20,23 +15,23 @@ DIST kdelibs-4.11.2.tar.xz 12072516 SHA256 e5a3c44f8967c2f0e67e0dd6333032a66ad5c
 DIST kdelibs-4.11.4.tar.xz 12077000 SHA256 dd52139eff1e635c0a9daa0ac846c72f5c62e0e68fcf986df6da1da04a062ded SHA512 ab09bfc8d6b720d7bec5c9cf9439ce957c5e7716d316787152efdf274e206c4029509a834acc409314fb83f511f4c979c0afd879b49c2742a5ca612cf118231c WHIRLPOOL 3936798e661009841204902c768416a9963b2b52e2a8d5983ea716fe96d83e04cda8632675c4e614482170f974ca1c489dafec7816bf2062177c48f97fcc096b
 EBUILD kdelibs-4.11.2-r1.ebuild 8537 SHA256 ac6256326481a0de2b757797de2c97e8d7c5dad744d424084905d28cd6dae773 SHA512 1beb4bbaa28ad979572ea80f303aa9551089c16f432f746675fc45cac8d1c9e015861c5046c9b9f828c99359430f601fe3d65d21c71bdbc3eb98f64c89c34b49 WHIRLPOOL de605fc81f41228fe59ccff816425b3f2cfe51050b41fe5ea2f1e0e4fa4ec0b935817cf4d67b80ed1f74f17cb947133ef7dc662fe42696051f180b8a4135be97
 EBUILD kdelibs-4.11.4.ebuild 8618 SHA256 c00f0e16421b0c4ea0d148dfb130cf8db236aa14ca007a053a6a43b2e15d2fb2 SHA512 817d8f0b94595b87d51765914e643555927a9134cfa4e1dda56689cadff2073bdbc630ee79e21265eedc33a894c4516c240d39ce0f4b7769e69d9646a38772c4 WHIRLPOOL 5aa166abc00de915d89e496b91b065e7f80f5876893c2d90da99ba79fff3447caca4ff334eb0cf05d422b3ab6bd818f9d3d8833a89872a73f172ae9009edc27a
-MISC ChangeLog 49754 SHA256 1428b1a0a8e6998a95df988f6c36ae5cab73266242479dab16855e8f1f482088 SHA512 705985c71faeff23511d19376aee0c164ff55e65e5946542d4ede8e20f447b01ea40df25b941c23f9ef53457f5b00e6c1dcb764342e71e5227969606c1e312ce WHIRLPOOL 7e38c5293fe1658e6c04e74ac879deae9df0ae1dc4e74c23837a4b06c4b6d2d7b4110a2006191569a66c02e0807db505af1136dc88b10b20270040790278ec18
+MISC ChangeLog 50055 SHA256 f206b530779e007d35c9cc30e426f87b1d83b13e764868b0821181263ebb89f0 SHA512 e65fe9d75b83bcf3b80b7640cf771a7a0188260676a712f8e5b983645067a1c521e42acfe0a4d110f94e41594c0ef85936ac0630599254f7b39e8ba15e9be6ac WHIRLPOOL b37e9346ed95b6502eaecff5fef037940f8934595c30dc7ee59dbdc21c5ae9099ff8775f6e4343065886e0db950ceb1f296c9899da411287fcdfe10091095a05
 MISC ChangeLog-2009 110608 SHA256 845ba7764dc9cabd4753d146e82cc0347a0dbbe21a76a4aab453106e7d70ba1f SHA512 c643c3bd742f1c2c4322217b4d9f2992310e9bf86f585ef687cf68f54ed2a86d2950f7f3c3fc5021a2dd472b6db39e17415ca6cde478e4ef4f91317a116889b5 WHIRLPOOL 8dd58bffc294a811176bc3f9882a0fa8a12c02fcdd692bacfccfc9745646d5062d3980553388fcdc835bbbecefd0783f029d07a5999e7208ceece5a93fa36893
 MISC metadata.xml 391 SHA256 fc53374fd33574da578cb1d31e89f7cbdee57aff3cbf5d7284e778edbce2acc0 SHA512 6c6a2d72311cd226b6f8b4b971bcf3547c43b54148b7286849f37ed1d586984aa39642e83f69034d942c4e478fa41ba7d815a13a0eb01f8ed5b74b3552270c69 WHIRLPOOL 9313efac3ba14c2b1b75703071bde802b41027e46d511bc8cf3efa055cf6967758aac541d60bf10a10e24c96b6f2109e848d12950cf802398d6563290c8c2039
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSqS6nAAoJELp701BxlEWf21sQALZqxDEVEFBiHxBgE/5sy0iG
-XXguMNGWpTJ28I+5jxCLkdBrI84L71qGiTEKcWJpYWq3VWRfweikFPsLpPV9qdGp
-ZZOT0fhJwZcxXrPuZtQXVt9b7auPcLiHNBJ7us2nvKHE87HtNYGf8o1YP73TXIAA
-r0SxgB//8UmLYrE/LwLdEdtn3tXy9Ex7FbakgtghSF4HOZ3U9TzJMPeOP4gavyRo
-S9Yssnqu4f6cZZRf1BazF9AM60oJJ286SDZd6Pv3/d2cNI4LDKIehEAmt20O0hYg
-XJRSJWQ8qCNrPhxHAFUYdYW4P0Q1D50wMFtkeaYMTilqpAmkfNHpfan5JmspE2aT
-Hnp04j0YXuIvZAuR3h+YQjcb9Ls7omb6/1pQndSBRpX8+BRQwj3P6XdHubB+a3mv
-MwvXejlXfom4FeC/4Uc5DnDuxRo2JSBNMdb7TCHqOp7akNrXrdPkotpPqudWqjUw
-xrWox0hnoTnq7BRAWK9Cz0yl4vfpfvLJJOI4oKJj7Mf4mKNkWxPM00UL1dTUDPt+
-OzRrHf3ycS7UMqerSJlDnQUOcqKPz33gt1dfpw4J8JAlwYupQhvhyoZevfnRddd5
-SuOX7Ml9UHoGUocLiV/tyv1OmYoFTerOmj+QJlS8MxdD1RCUsf79xdX71fF9nDle
-G11vrzkbqomyKsDN3rIW
-=7zNM
+iQIcBAEBCAAGBQJSrNQcAAoJEGVpnaTzz9K9nXMP/Rwkfk1ncq5pIor1hq7kVFUi
+pkoXRmMzX6v5bdifennckdCPeXzWXmH6+hibt6oSy3MOPQxqp+05htTizMVifLLm
+dv6upWo5SmM40eeKDSDMlzzOTNGeKL/DBa/fzB5gTbm4NEtgZ4SJ+qANpwBv0m2r
+7znypBXrVMHfwQfAPyVETn757GTXNk34VxJ8HHnz0J3zFPTN951nqApUcPg7NEyy
+dclwh/d32W3ZZWTSac/CIliHHzLnJwwH3BJNE0QTOUV5VeGtSI9jCTg8jCtCMGYk
+oPMf25TQBj7cnchN28P5SBDuGApUkTqPxUVKZoWjVgGKn9dXnz4VZQZ6/Xskln/i
+hC1RzJAta/C6gD/eRQx67Kby9xnpikPvbPMGluTrb0CWJ03b+Yt09iEO+mm6phbv
+uX/gctC3AkBaVB/q+dlkC4trs/LOzhC/0h//20+gL+nl2vCDl3PJvAcTNWW8cZOe
+48MP/30y78+R+Tq6rag+ycW/Wp+vLvhnew964KTtpWpumtV8qDHqpXHoc+KMVnJw
+bQiTL2vJPxuYNRvHq1eBe/W7FXp9/u43SSTRWKpwhbB1gQbF2jIn/RIHW5lJ8iRk
+bBDAy3OcO/KzzT2usZ2Ooc2PfE23hDNFtyJnWhQgrlw+22hYPS7tz/T1atDrmEuE
+u8GL6VGVehX1e3Z8urCO
+=mbGA
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/files/kdelibs-4.10.2-security-url-dont-show-password.patch b/kde-base/kdelibs/files/kdelibs-4.10.2-security-url-dont-show-password.patch
deleted file mode 100644
index 3d98a47ae8b6..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.10.2-security-url-dont-show-password.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 65d736dab592bced4410ccfa4699de89f78c96ca
-Author: Grégory Oestreicher <greg@kamago.net>
-Date:   Wed May 8 23:16:00 2013 +0200
-
-    Don't show passwords contained in HTTP URLs in error messages
-    BUG: 319428
-
-diff --git a/kioslave/http/http.cpp b/kioslave/http/http.cpp
-index 2d139a9..129fc7b 100644
---- a/kioslave/http/http.cpp
-+++ b/kioslave/http/http.cpp
-@@ -3056,7 +3056,7 @@ try_again:
-             ; // Ignore error
-         } else {
-             if (!sendErrorPageNotification()) {
--                error(ERR_INTERNAL_SERVER, m_request.url.url());
-+                error(ERR_INTERNAL_SERVER, m_request.url.prettyUrl());
-                 return false;
-             }
-         }
-@@ -3072,9 +3072,9 @@ try_again:
-         // Tell that we will only get an error page here.
-         if (!sendErrorPageNotification()) {
-             if (m_request.responseCode == 403)
--                error(ERR_ACCESS_DENIED, m_request.url.url());
-+                error(ERR_ACCESS_DENIED, m_request.url.prettyUrl());
-             else
--                error(ERR_DOES_NOT_EXIST, m_request.url.url());
-+                error(ERR_DOES_NOT_EXIST, m_request.url.prettyUrl());
-             return false;
-         }
-     } else if (m_request.responseCode >= 301 && m_request.responseCode<= 303) {
diff --git a/kde-base/kdelibs/files/kdelibs-4.10.3-dialog-quit-crash.patch b/kde-base/kdelibs/files/kdelibs-4.10.3-dialog-quit-crash.patch
deleted file mode 100644
index 5f535463365c..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.10.3-dialog-quit-crash.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 9323adac35d40da69e3cb18504340e984c4afd05
-Author: Anne-Marie Mahfouf <annma@kde.org>
-Date:   Fri May 10 17:12:33 2013 +0200
-
-    Fix crash when quitting apps
-    
-    Backport to 4.10 branch
-    
-    CCBUG: 319137
-
-diff --git a/plasma/private/dialogshadows.cpp b/plasma/private/dialogshadows.cpp
-index b54fb1a..1925670 100644
---- a/plasma/private/dialogshadows.cpp
-+++ b/plasma/private/dialogshadows.cpp
-@@ -336,6 +336,9 @@ void DialogShadows::Private::freeX11Pixmaps()
- {
- #ifdef Q_WS_X11
-     foreach (const QPixmap &pixmap, m_shadowPixmaps) {
-+        if (!QX11Info::display()) {
-+            return;
-+        }
-         if (!pixmap.isNull()) {
-             XFreePixmap(QX11Info::display(), pixmap.handle());
-         }
diff --git a/kde-base/kdelibs/files/kdelibs-4.10.5-home.patch b/kde-base/kdelibs/files/kdelibs-4.10.5-home.patch
deleted file mode 100644
index 73183c9029b9..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.10.5-home.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 176173b60c4611941566a87db438c1ff377a1c83 Mon Sep 17 00:00:00 2001
-From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
-Date: Sun, 21 Jul 2013 16:44:20 +0200
-Subject: [PATCH] Make sure HOME is never unset, to prevent creation of files
- in /
-
-BUG: 249217
-REVIEW: 110655
----
- kdecore/auth/kauthhelpersupport.cpp | 25 +++++++++++++++++++++++++
- 1 file changed, 25 insertions(+)
-
-diff --git a/kdecore/auth/kauthhelpersupport.cpp b/kdecore/auth/kauthhelpersupport.cpp
-index 41b673b..f99b64d 100644
---- a/kdecore/auth/kauthhelpersupport.cpp
-+++ b/kdecore/auth/kauthhelpersupport.cpp
-@@ -23,6 +23,12 @@
- #include <cstdlib>
- #include <syslog.h>
- 
-+#ifdef Q_OS_UNIX
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <pwd.h>
-+#endif
-+
- #include <QCoreApplication>
- #include <QTimer>
- 
-@@ -40,8 +46,27 @@ void helperDebugHandler(QtMsgType type, const char *msg);
- 
- static bool remote_dbg = false;
- 
-+#ifdef Q_OS_UNIX
-+static void fixEnvironment()
-+{
-+    //try correct HOME
-+    char *home = "HOME";
-+    if(getenv(home)==NULL)
-+    {
-+        struct passwd *pw = getpwuid(getuid());
-+        int overwrite = 0;
-+
-+        if (pw!=NULL) setenv(home, pw->pw_dir, overwrite);
-+    }
-+}
-+#endif
-+
- int HelperSupport::helperMain(int argc, char **argv, const char *id, QObject *responder)
- {
-+#ifdef Q_OS_UNIX
-+    fixEnvironment();
-+#endif
-+
-     openlog(id, 0, LOG_USER);
-     qInstallMsgHandler(&HelperSupport::helperDebugHandler);
- 
--- 
-1.8.3.2
-
diff --git a/kde-base/kdelibs/files/kdelibs-4.11.0-themecrash.patch b/kde-base/kdelibs/files/kdelibs-4.11.0-themecrash.patch
deleted file mode 100644
index 971d00b32815..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.11.0-themecrash.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 59e88c777b92935cc95f28e52f84fe97563dec9d Mon Sep 17 00:00:00 2001
-From: Aaron Seigo <aseigo@kde.org>
-Date: Wed, 14 Aug 2013 12:52:52 +0200
-Subject: [PATCH] when the request theme does not exist, delete all old caches
- for it and don't crash
-
-BUG:320855
----
- plasma/theme.cpp | 21 ++++++++++++++-------
- 1 file changed, 14 insertions(+), 7 deletions(-)
-
-diff --git a/plasma/theme.cpp b/plasma/theme.cpp
-index 4554de7..cb44878 100644
---- a/plasma/theme.cpp
-+++ b/plasma/theme.cpp
-@@ -222,18 +222,25 @@ bool ThemePrivate::useCache()
- {
-     if (cacheTheme && !pixmapCache) {
-         const bool isRegularTheme = themeName != systemColorsTheme;
--        QString cacheFile = "plasma_theme_" + themeName;
-+        const QString cacheFile = "plasma_theme_" + themeName;
- 
-         if (isRegularTheme) {
-+            const QString cacheFileBase = cacheFile + "*.kcache";
-+
-             const QString path = KStandardDirs::locate("data", "desktoptheme/" + themeName + "/metadata.desktop");
--            const KPluginInfo pluginInfo(path);
-+            // if the path is empty, then we haven't found the theme and so
-+            // we will leave currentCacheFileName empty, resulting in the deletion of
-+            // *all* matching cache files
-+            QString currentCacheFileName;
-+            if (!path.isEmpty()) {
-+                const KPluginInfo pluginInfo(path);
-+                currentCacheFileName = cacheFile + "_v" + pluginInfo.version() + ".kcache";
-+            }
- 
--            // now we check for, and remove if necessary, old caches
--            const QString cacheFileBase = cacheFile + "*.kcache";
--            cacheFile += "_v" + pluginInfo.version();
--            const QString currentCacheFileName = cacheFile + ".kcache";
-+            // now we check for (and remove) old caches
-             foreach (const QString &file, KGlobal::dirs()->findAllResources("cache", cacheFileBase)) {
--                if (!file.endsWith(currentCacheFileName)) {
-+                if (currentCacheFileName.isEmpty() ||
-+                    !file.endsWith(currentCacheFileName)) {
-                     QFile::remove(file);
-                 }
-             }
--- 
-1.8.3.2
-
diff --git a/kde-base/kdelibs/files/kdelibs-4.11.1-jpeg-9.patch b/kde-base/kdelibs/files/kdelibs-4.11.1-jpeg-9.patch
deleted file mode 100644
index e645de4d2427..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.11.1-jpeg-9.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 206d4137cfd63c47e52ce6630cf6834ab2e759ee Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Thu, 5 Sep 2013 21:03:00 +1000
-Subject: [PATCH] Fix build with libjpeg-9.
-
-The breakage occurs because in libjpeg-9, the boolean typedef changes
-from int to typedef enum { FALSE = 0, TRUE = 1 }.
-
-REVIEW: 112458
----
- khtml/imload/decoders/jpegloader.cpp | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/khtml/imload/decoders/jpegloader.cpp b/khtml/imload/decoders/jpegloader.cpp
-index ea25572..2258469 100644
---- a/khtml/imload/decoders/jpegloader.cpp
-+++ b/khtml/imload/decoders/jpegloader.cpp
-@@ -142,10 +142,10 @@ extern "C" {
- #ifdef BUFFER_DEBUG
-             qDebug("...returning true!");
- #endif
--            return true;
-+            return TRUE;
-         }
-         else
--            return false;  /* I/O suspension mode */
-+            return FALSE;  /* I/O suspension mode */
-     }
- 
-     static
-@@ -313,7 +313,7 @@ int JPEGLoader::Private::processData(uchar* buffer, int length)
- 
-     if(state == Init)
-     {
--        if(jpeg_read_header(&cinfo, true) != JPEG_SUSPENDED) {
-+        if(jpeg_read_header(&cinfo, TRUE) != JPEG_SUSPENDED) {
-             state = startDecompress;
-             
-             // libJPEG can scale down 2x, 4x, and 8x, 
-@@ -337,9 +337,9 @@ int JPEGLoader::Private::processData(uchar* buffer, int length)
-     {
-         jsrc.do_progressive = jpeg_has_multiple_scans( &cinfo );
-         if ( jsrc.do_progressive )
--            cinfo.buffered_image = true;
-+            cinfo.buffered_image = TRUE;
-         else
--            cinfo.buffered_image = false;
-+            cinfo.buffered_image = FALSE;
-         // setup image sizes
-         jpeg_calc_output_dimensions( &cinfo );
-         
-@@ -349,9 +349,9 @@ int JPEGLoader::Private::processData(uchar* buffer, int length)
-         if ( cinfo.jpeg_color_space == JCS_YCCK )
-             cinfo.out_color_space = JCS_CMYK;
- 
--        cinfo.do_fancy_upsampling = true;
--        cinfo.do_block_smoothing = false;
--        cinfo.quantize_colors = false;
-+        cinfo.do_fancy_upsampling = TRUE;
-+        cinfo.do_block_smoothing = FALSE;
-+        cinfo.quantize_colors = FALSE;
- 
-         // false: IO suspension
-         if(jpeg_start_decompress(&cinfo)) {
--- 
-1.8.3.2
-