Remove unused patch.

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

9 files changed, 57 insertions, 323 deletions

diff --git a/kde-base/analitza/ChangeLog b/kde-base/analitza/ChangeLog
index ed761b9c5680..215a419b6ac9 100644
--- a/kde-base/analitza/ChangeLog
+++ b/kde-base/analitza/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/analitza
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/analitza/ChangeLog,v 1.112 2014/05/08 10:31:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/analitza/ChangeLog,v 1.113 2014/05/08 20:46:37 johu Exp $
+
+  08 May 2014; Johannes Huber <johu@gentoo.org>
+  -files/analitza-4.11.3-arm.patch:
+  Remove unused patch.
 
   08 May 2014; Agostino Sarubbo <ago@gentoo.org> -analitza-4.11.5.ebuild:
   Remove old
diff --git a/kde-base/analitza/Manifest b/kde-base/analitza/Manifest
index 4abcd2a42140..221d7e4e27fe 100644
--- a/kde-base/analitza/Manifest
+++ b/kde-base/analitza/Manifest
@@ -1,27 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX analitza-4.11.3-arm.patch 2009 SHA256 1e5e216ebc5d95d9222d78967d0489d1a572408b8ffd814592907c76b3f443c8 SHA512 50f7f820fc8c87b9b0d7646af489138e4be9d973d19ddc0a9b05254e040edf40c115120731a793dddae08561d046c6fb4c6a87b969fcccc6eb19df234d75da97 WHIRLPOOL a6bdcca8f09f5fb0e3452c9e3a53400b15fc0baf9c60f55aca0ebcb9d88ce1478c267bff8aa31f0a19e19c79c2a9acfc5b7d67ac658d1954b4ca0093fb76e952
 DIST analitza-4.12.5.tar.xz 179856 SHA256 ae9dc37187293c35abd193315069ed8242e589bd862e8a05b24cc4c4a36f864c SHA512 3011359d15a1fefab0a9693acf35ebc0dc98c3cc05fdf2453c0adbffdef8d6e050d7a59f69cb383ec1e7bbf5910296db6c96e2daf266b8bc1d9c4f1d4aa19479 WHIRLPOOL 3b6e99a1de253431a7ee233564291096a2085643963730ff092cd95c031ca72d002fd0f914f55fc2900bed5e496c4f20a661baaab2dab146390ef0b5ea561a68
 DIST analitza-4.13.0.tar.xz 184752 SHA256 37bb37190922d57f414b6ac4be3c5d752966f01d7ae4eeec38fcfc04f3832da5 SHA512 356f4308311ddf78de7310afff6f211159ce455e90d3c2cad6d120dc9cd214145b25163914a6088825218e55e5fcaa9916a55990ca1dd4ffa37c19e4c06f568f WHIRLPOOL 80e31bac23e9488290207bc67e39f75a8006f95de13d6ff5948ddad9bf859fc83296c04e699356ebe35289fac740ae413f6e0f93ab24f6d92469587a21a75a0a
 EBUILD analitza-4.12.5.ebuild 665 SHA256 2332541d3b384c68a1998bb1e387bd7e77ba00fbd5247f9ff1ce1f4ccf426c64 SHA512 5e11a337fb0cbbffadb55420de81777a1ad6fcc6ce58f1c42d6e3278e686a32f1ae7480f54a04b4a1010751a86e200cea5fbfd734043be0e3642eaf36458e223 WHIRLPOOL 8ed2dcb975870fcb989b922aeec3a3648cc80127ca84a29171910abf15141371b7a14d45a93b025ef7382e3fdb8d84d15974e00b8ba046eef1c5dd1355e77473
 EBUILD analitza-4.13.0.ebuild 670 SHA256 9f1b3a38c31356a4c9fa79d2a74ea350a230cc8b94dc9de86c860e4432250150 SHA512 346387eed0956e5575d9da4dea972b73037bb997d6894f1b8ff82da5ebfec6f29f101accde893909cb49a7932bae7796b541f4958e3acb7ce4b903341ce39175 WHIRLPOOL d832dfb106c4bf9b452004fa819f44fad296593828eaaaa06cd11715f4de22904a1888a189f00d17e9b07597873730f1c5a92410f5a186f983d5950407d5e9aa
-MISC ChangeLog 13091 SHA256 dac823f89b5d4bb0d34bf273a76da4b0b818db920ef46c76cff65b7f966ef1f5 SHA512 f852c616d08805d7ac6c437024a41d08680290c51fa312e720f4c432ed5bc866ecd962e9df73e0e9aab774eb35be9a97600fcb3260d867283ddec01d261161bc WHIRLPOOL 5e9fcd9fce0e20b9a665b4008eb1fd71e72da8fed1eb3045d6ad075a9681c5fae1c5c241183f35a26ff35aa220b72ac97bcf99a35c7048daaae56824eba5f89b
+MISC ChangeLog 13200 SHA256 b79801b6010ed6ff442fe32044e5be5373d64f2a6b0b783880db8fdfaaac3802 SHA512 8689b74c68423f9792e832f01203805c1fd1a65390df4663551b35ea7c9ba6bffc37a1182d908cee5c8a354bbd55f82f4a4b18cbbcd8c0e806203ab3eaf1d206 WHIRLPOOL 51ca3a55b22ed30e1abbe5f8080f462677c57f7179f0c3bc8b2b7ca18ada0280aba7dbcd8efa19c9fa60af99c4bc16a10de52704edb0eb40e63bdfda2b38e88d
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTa11kAAoJELp701BxlEWfCs4QAITeZdt8ryHcmKtu7SK7QSk/
-QBN30scz8G74mlk/ftyVyIMJHCq0Qs9L9L3/NjeQeNKmnm3WPyU+o8gqedlN5hzv
-R9TirzSWoafFp1KNDTOEaEv26cs6WfSSaUpsxqqoU3N8MAcqsGaKT7wCak0GLBgP
-XJqUaLyT2VCbFccAobOdfvfGrFPXfU8A8etlH6JutGGZy7ozdiaHWYlRGdFq1Hen
-2J+cg5TVM0R9S0ONKsKeAtC4OJTti5llcFI1f24pjemrGSb7RsHys+PgfAgeaxPp
-grL5E3r+xu0n0mUgknBgjixUS3iLLHIZ6YcWj7YbDfiDVzJrJ/5P4lT4QCcF28iB
-XYnejW2MqgHlHAqyEe1kyNW2aKfhM4MnklS/R5mK+GtDLayeQVSdEHRlkbomFnQ/
-kIRSyznozywbkhJqbjqt13Z/VFyJakDHtvN+DZXjZGMluXSq799Hip6JzxugZm3q
-FbqQDpvqnLgzX8euJ2709iJDioJjEglU//kyWU5WP9kyFVm5KD/uFxdQRMAIumvl
-34rG1zf9rDXeIQsATc3n9ZayRyPTaAQ1wYhvo/ip7/dHgSW+38T33qRtK1xf2PXr
-VLaz40QAij8XfVvobCOw6KNY3KkckQorPOniJ4H6FnAlXGNkoCMMXTU1N511eqqp
-5yrBRRfmJwfdYyzUc4gn
-=YLXz
+iQIcBAEBCAAGBQJTa+0xAAoJEGVpnaTzz9K9PygP/jL5dH+iIZbA9muyIu+dWXl0
+w0lj0DwTma4dEc6ZxG3sDTtWZ67nLaQdR9bR0vH7rLWcmh+PIL+UMtvYa1q337ra
+pB3tMa17/lq9mWvsJXvt+qtfoh5bGzDtrcIgDuJgEO+Xf9d67ew+oicB+6JTCfUL
+/VKosxbqi1x50DpaqTGCx3f4ulhe4nUQilaDcqxziQHV9dZ4dHQrDZxWF2TWBtmi
+YxnVjwmFpo3q2tPSP2uC6B7ZN7hJL6ZKtnuugZbDcXpuoshMWItkyu9mLpnpde5b
+ucXA5zF9jtBJ+WJfq1KAghrGjnDG2WZR7Jb9Cqtl/qvYi0BwrF5kL0ERs6I2dBx2
+JUEis7deEitvqP8NgoJwhko8xJ/KGZruf2ovFa8vHLie8LLHWvjWkvalnqznU4E+
+1T9W1CGYwcK4aKiUkJSZXpJKROgfJy94qMDBotLaA7t2UCK3MNboaachi79DO1vb
+15sB98OeybAUECgOYzW/iNKjX/QFqXNVFnO93v/JvzdW6TMKtHivkAtBJWFKLvYp
+edubowx1JIv2aW5+NkELs1gv/m5zGk/539kdnE7Hob78tMiM74FOi/jH6faTx3I9
+//hEPbtZ7+9a7VQee90fynr6cODGTJzoW3PZGLWvj9ZVGCV2PH1vxOYfppAXuvnK
+sM9D3J5vsFXgVuojFI+4
+=DSms
 -----END PGP SIGNATURE-----
diff --git a/kde-base/analitza/files/analitza-4.11.3-arm.patch b/kde-base/analitza/files/analitza-4.11.3-arm.patch
deleted file mode 100644
index 9180f046bd39..000000000000
--- a/kde-base/analitza/files/analitza-4.11.3-arm.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-commit 07dc31770db7a7d2e5273db0c2b32578a7e13c4e
-Author: Maximiliano Curia <maxy@debian.org>
-Date:   Wed Oct 30 23:53:19 2013 +0100
-
-    Fix compile in armhf
-    
-    Acked by Aleix
-    REVIEW: 111121
-    BUGS: 321244
-
-diff --git a/analitzaplot/plotter3d.cpp b/analitzaplot/plotter3d.cpp
-index accac1a..476b31a 100644
---- a/analitzaplot/plotter3d.cpp
-+++ b/analitzaplot/plotter3d.cpp
-@@ -143,6 +143,10 @@ void Plotter3D::setViewport(const QRectF& vp)
-     renderGL();
- }
- 
-+// add overloaded functions which call the underlying OpenGL function
-+inline void glMultMatrix(const GLfloat  *m) { glMultMatrixf(m); }
-+inline void glMultMatrix(const GLdouble *m) { glMultMatrixd(m); }
-+
- void Plotter3D::drawPlots()
- {
-     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-@@ -153,7 +157,7 @@ void Plotter3D::drawPlots()
- 
-     glMatrixMode(GL_MODELVIEW);
-     glLoadIdentity();
--    glMultMatrixd(m_rot.data());
-+    glMultMatrix(m_rot.constData());
- 
-     // Object Drawing :
-     glCallList(m_sceneObjects.value(Axes));
-@@ -398,6 +402,14 @@ void Plotter3D::scale(GLdouble factor)
-     renderGL();
- }
- 
-+inline QMatrix4x4 get_matrix(GLfloat *m)
-+{
-+    return QMatrix4x4(m[0],  m[1],  m[2],  m[3],
-+                      m[4],  m[5],  m[6],  m[7],
-+                      m[8],  m[9],  m[10], m[11],
-+                      m[12], m[13], m[14], m[15]);
-+}
-+
- void Plotter3D::rotate(int dx, int dy)
- {
-     GLdouble ax = -dy;
-@@ -412,11 +424,11 @@ void Plotter3D::rotate(int dx, int dy)
-         m_rot.rotate(angle, m_rotFixed.normalized());
-         renderGL();
-     } else {
--        GLdouble matrix[16] = {0}; // model view matrix from current OpenGL state
-+        GLfloat matrix[16] = {0}; // model view matrix from current OpenGL state
- 
--        glGetDoublev(GL_MODELVIEW_MATRIX, matrix);
-+        glGetFloatv(GL_MODELVIEW_MATRIX, matrix);
- 
--        QMatrix4x4 matrix4(matrix);
-+        QMatrix4x4 matrix4(get_matrix(matrix));
-         bool couldInvert;
-         matrix4 = matrix4.inverted(&couldInvert);
- 
diff --git a/kde-base/kdepim-common-libs/ChangeLog b/kde-base/kdepim-common-libs/ChangeLog
index e21abdff4ab2..fd12801fda2e 100644
--- a/kde-base/kdepim-common-libs/ChangeLog
+++ b/kde-base/kdepim-common-libs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdepim-common-libs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/ChangeLog,v 1.157 2014/05/08 10:32:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/ChangeLog,v 1.158 2014/05/08 20:50:18 johu Exp $
+
+  08 May 2014; Johannes Huber <johu@gentoo.org>
+  -files/kdepim-common-libs-4.11.2-gnupgattach.patch:
+  Remove unused patch.
 
   08 May 2014; Agostino Sarubbo <ago@gentoo.org>
   -kdepim-common-libs-4.11.5.ebuild:
diff --git a/kde-base/kdepim-common-libs/Manifest b/kde-base/kdepim-common-libs/Manifest
index c26e3914330c..0390316232b6 100644
--- a/kde-base/kdepim-common-libs/Manifest
+++ b/kde-base/kdepim-common-libs/Manifest
@@ -2,27 +2,26 @@
 Hash: SHA256
 
 AUX install-composereditorng.patch 664 SHA256 8bfc7bb3c70300a32e8dd6091427d776225e5f354e40e86892cf51c4197bc03e SHA512 06df064dcb93d9873dc0eac4f567593e9ee50eee054dcab93cf02132438e622158b133fae9f67e1a328975870457cea7c8ecc8e786abcd456196a85f23559ee1 WHIRLPOOL ecb715687cf9b6dac70d50629fac15b2140ac37b678a785615a2b20c82904406c6c0b588ce2e9f15215ee84462b6d5d89d81883f4834dcfe93eb3ba1b8a70e21
-AUX kdepim-common-libs-4.11.2-gnupgattach.patch 2284 SHA256 d80c4c4c1c4232c93b86da59ae25c9c71502ac09558d8d41c3db6e1b876d6a11 SHA512 8c696564ee8cfb6bdf4a583e7ae81d1b817e5b6b6f21df1c7855615ece7be097ff8ed3d5fc19243e46212dcad80abc9ae964227b67a4f37b8243521a5980776d WHIRLPOOL c3252d441c360e9f12f98d4c9770c58e9703a206b68fc5eef636d06a98c543e5666857d807bc06d5f0db231ad4838176d9c428a6689dbdf1e9a690458ea5115d
 DIST kdepim-4.12.5.tar.xz 14259060 SHA256 5e26dc33b5d36eb305a24a834b153515990ea8a501498b63ee10103df94c6ff0 SHA512 fa0a35210a3442fc5944133619ed7d867ce01500d01d17712e5363970f5d39aeb03885dafd9e265a6b37280bfa47d51a24ae7ee229077ed9bc68c433533eb6e5 WHIRLPOOL 0c5a6ec47f9d1b6843e11ecc2890d6f2110325c1cce5d3949cc321fa8d8338e4e24fe38af01929ed9f83db0ee6a76ec48e8a8c1a2d91a38aea574851b842bb34
 DIST kdepim-4.13.0.tar.xz 14433052 SHA256 b7058b11dfeb9ab4814ee4fa82de37c0da8bee7ecad75a0b8d69dfcd708744f0 SHA512 1607cf8116f8f49e170a6d9d5c6df0f7780a17eacdfcf58b5ad0abf97ffa044884b67c99708e727840ef9c887da453ac2bceb0fe9948d9a9453ffcade86a67ce WHIRLPOOL 9fd9e52fefe6ca36988236105655128fe43d31c74572c282887d5b937c9513182780548364a39679092383aeca76a05fa80be01b52b085832a152cb25ee8f0f8
 EBUILD kdepim-common-libs-4.12.5.ebuild 1586 SHA256 7c9eaba584eb7cc369a9355b0870ce86d8e0acd036bd5fa7c938a17a80754f5a SHA512 e8f94f0af5a6ebffcbc6dc82e917b0e92aaae927fb0be7a806be0e022a910a07663ac83931f2e0c53781a91fb8027917660ad820f31778e68395bd564b722c6c WHIRLPOOL 63314f02fce67a68ca706a9c5b42fe0146a4d4aec69802dcb4d21e464cb9222e08870cad0fa092e46b1d8bf22e2c2a4278d0497ce37153c228ea8829af286d25
 EBUILD kdepim-common-libs-4.13.0.ebuild 1667 SHA256 0fe699a18191aa85966205ec841d408ca107140743037d7920e016724efd0b66 SHA512 07e0bd148aa5dd12e394089df4b7f45fb5e39de87ae6f686df54378964ab6030c0a37a5f27513b9484cc581a9c97ce6b5cdb4a7a543d9770a4d1dad0261f8816 WHIRLPOOL 7d2ab1002c5fb3141bfa333727d49d1c5c906c91ba6a60043ca1b6be0d868337bae946091fbb1b1c9a709eb3d6650c5a46a13f807f6f9388b1ef0a854e96e958
-MISC ChangeLog 22360 SHA256 8880d46d513840743452f3ee07e50c458acb214a93175480b40b888dbae64545 SHA512 7ebeb7a5e6d109f323cefec1f172640f0c457ca5b318687c64907160dfeae0fc94392afd0628d876be083444c80e89c3d7060ebaf043101b6f3599ae7eb87bdc WHIRLPOOL 7b5c019a0d594fad84f7ea878911d9e4b5678501eaaec9226ca7247320fd87281c5828fd8188d94a455f867fbd2bbb3973d63681cc858acddb1e4b7fa9e7eb3d
+MISC ChangeLog 22487 SHA256 0c38c001c0d66d14f77d475d591ff56c308d4f5d0a9cb4f61642650bc4613933 SHA512 b98e19c1374b5eeee5632c43fc5211a121ac8a26d8d7bd150c00ebae9e04cb9f5c8655e68c89f6a6227c6c29c31841bfbee5041d4098d372ae085093f15e50fd WHIRLPOOL 43654868e355c07a21e40313dc45a34513a7d453b50648bda48dc4428675878920598369aa787df8dc8d1876be94fb9d8740efaa2964d408d2ef4da1e195a17d
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTa11rAAoJELp701BxlEWfL5EP/jQrbaSNwngW1L/BWWRMLNei
-D6cf72yJPm1FAyv45Aj2cz5YMC2Bvs3orG05n/cF97vm7YBwG9Ra4DLQg0XnI99F
-9USF76YS+wm1LScEMa7Y9BJHcggUBj+5sWrlV8ulM8sLNXR1RkGcJBbpBoFU7xhH
-XwPzLcdPPIiPBwXEKo4kYaBs83PsDMpN48ZpOhjZb8EBSZPm23GEyOqebffhANnq
-OqlBuakc3OR/9Mz8tM7sGpqTquJp395NxyH8qW2BYgqGTCla+NHXr9HVt9+G0leY
-80vTq0xUbsB1/4SMI1mAHzogtCJe/3mGdOe6aOuV/MX9aijg3EkqH0NCqkjMCsD3
-fyVr2vvjwBDCzNeiUIvrf7RwAZ8U7TXu1MN3cXCmsHJMUtGfOSQdPcIglfZ7Dl18
-hm9CYyO15sjQaHLkjGLkBkYiaXqbip47XyugAztjLlmUPcXnoRPArlQ8hMz5JZxl
-FOIPMWfulq5rSffvT+z5QTvZjtMjtTsxEbL56IZ9Oc3I66+fSkt11n0scLLa3c+2
-AisqNXNULo9B8J0pBv1JtrKYzPqufbY3CwnDlHAR02uD11xwQP/K8usaSMLGhtRr
-IbOFHdb0sx+qa09NvmMhN2DpzPIV6HSUaHtdr1NX+Oz/GB0SideZ+/nRXUMtb9/R
-Hf8ctQWM1bfvxMI/wiS9
-=++2D
+iQIcBAEBCAAGBQJTa+4MAAoJEGVpnaTzz9K9Y1IP/0X3x7fHe6M1aJeNao5tqlgL
+UCtka6ZaTp4hGd88tTyZcedLRdCdKD8E5wmptxmL+FuFuXpZ+tFQsUU2ZTHdRBc2
+OBX0TP/OGZam4mKjMC8e294RBmFIz1XGhnQ6oZLzcIyHkzoCPL58x0C7KBiPGVwr
+6BZdbfTpr31P7AlPz0d6EUou0UEih5/v1X6PcoUFPQQrz06rez+M5gA6cdcfzukI
+V+3pFTCPUAZs8ZwI8Wp6//5Dn+KgaEWEMnQwE4pRZS1j8fmlky6RC6DZgKUD6gUj
+cKXCpjk156bnl8Sv9ZTiDSnyhZGGyQ9n/7JI5Jbh7a/ZmZhaGJx8nf7j+kao21Rh
+JyL/Db2k32vl3uKUynP+5WrtFinOsLr6a+OZHGAwQ1Yh20wS8Efga1BgnAZM4LkZ
+MZwEaF0ugfY2uP6KkrqZs8pmjkEH8UANB+JKrpD4J454/UnApZMxsxMxyaWDfgQ7
+7qXoQHewTG8mWx8R86eu4hFi0zhOLYg7nsWe0DOSNDJ4WyFLi9gquajpXRrkB3yG
+DV/bwD7OjQUP6gqsT5sHAWfbw2xZGgtLutaVkpj51L+F0AnCXMShdbSEBabcaBsF
+Cgu05nehPxRjr1ShyEmkiyvtbtXK2VR8lhvCZgGPEF/tHKeorEPqnvLSw8FLIbvv
+wsBGUYUgQzinKU6dcVBN
+=5sTs
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim-common-libs/files/kdepim-common-libs-4.11.2-gnupgattach.patch b/kde-base/kdepim-common-libs/files/kdepim-common-libs-4.11.2-gnupgattach.patch
deleted file mode 100644
index 3dce746a0d35..000000000000
--- a/kde-base/kdepim-common-libs/files/kdepim-common-libs-4.11.2-gnupgattach.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-commit bbbdbc2180036040cac2b66492e6f0fd01c2b28c
-Author: Sandro Knauß <mail@sandroknauss.de>
-Date:   Mon Oct 21 02:47:31 2013 +0200
-
-    Fix 286481 - Unable to open attachments in encrypted messages
-    
-    The node has to get a correct extra content and the filename must be
-    correctly point to the attachments inside the encrypted message.
-    
-    BUG: 286481
-    BUG: 300937
-    FIXED-IN: 4.11.3
-    REVIEW: 113361
-
-diff --git a/messageviewer/viewer/nodehelper.cpp b/messageviewer/viewer/nodehelper.cpp
-index 311f655..8c8ff79 100644
---- a/messageviewer/viewer/nodehelper.cpp
-+++ b/messageviewer/viewer/nodehelper.cpp
-@@ -223,7 +223,7 @@ QString NodeHelper::writeNodeToTempFile(KMime::Content* node)
-     return existingFileName.toLocalFile();
-   }
- 
--  QString fname = createTempDir( node->index().toString() );
-+  QString fname = createTempDir( persistentIndex( node ) );
-   if ( fname.isEmpty() )
-     return QString();
- 
-@@ -237,7 +237,6 @@ QString NodeHelper::writeNodeToTempFile(KMime::Content* node)
-   fname += '/' + fileName;
- 
-   //kDebug() << "Create temp file: " << fname;
--
-   QByteArray data = node->decodedContent();
-   if ( node->contentType()->isText() && data.size() > 0 ) {
-     // convert CRLF to LF before writing text attachments to disk
-@@ -260,7 +259,7 @@ KUrl NodeHelper::tempFileUrlFromNode( const KMime::Content *node )
-   if (!node)
-     return KUrl();
- 
--  const QString index = node->index().toString();
-+  const QString index = persistentIndex( node );
- 
-   foreach ( const QString &path, mAttachmentFilesDir->temporaryFiles() ) {
-     int right = path.lastIndexOf( '/' );
-diff --git a/messageviewer/viewer/objecttreeparser.cpp b/messageviewer/viewer/objecttreeparser.cpp
-index cde17da..369ad95 100644
---- a/messageviewer/viewer/objecttreeparser.cpp
-+++ b/messageviewer/viewer/objecttreeparser.cpp
-@@ -803,7 +803,7 @@ bool ObjectTreeParser::writeOpaqueOrMultipartSignedData( KMime::Content* data,
-       bIsOpaqueSigned = true;
- 
-       CryptoProtocolSaver cpws( this, cryptProto );
--      createAndParseTempNode( data, doCheck ? cleartext.data() : cleartextData->data(),
-+      createAndParseTempNode( &sign, doCheck ? cleartext.data() : cleartextData->data(),
-                               "opaque signed data" );
- 
-       if ( htmlWriter() )
diff --git a/kde-base/kdepim-runtime/ChangeLog b/kde-base/kdepim-runtime/ChangeLog
index a4bffe8fd664..d55f5391d388 100644
--- a/kde-base/kdepim-runtime/ChangeLog
+++ b/kde-base/kdepim-runtime/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdepim-runtime
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.208 2014/05/08 10:32:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.209 2014/05/08 20:51:52 johu Exp $
+
+  08 May 2014; Johannes Huber <johu@gentoo.org>
+  -files/kdepim-runtime-4.11.2-flags.patch:
+  Remove unused patch.
 
   08 May 2014; Agostino Sarubbo <ago@gentoo.org> -kdepim-runtime-4.11.5.ebuild:
   Remove old
diff --git a/kde-base/kdepim-runtime/Manifest b/kde-base/kdepim-runtime/Manifest
index 17b7820ed1f3..8f2ded212b7a 100644
--- a/kde-base/kdepim-runtime/Manifest
+++ b/kde-base/kdepim-runtime/Manifest
@@ -7,7 +7,6 @@ AUX 4.4/9996-no-knut-anymore.patch 401 SHA256 350e73d10e35092facfb8e677c4391a0e9
 AUX 4.4/9997-the-future-is-here.patch 1082 SHA256 225f57511928bd58ab8d9c483f9b6f9e0d46cd91bcba3eb8c0c0b5a9100f7f51 SHA512 dd6c40ba45fecc822edc50b5682ee07fb1fa7af5c662224f211c5f6ca31fb52b69e6d73977079179d2d45f1a52793cec207aae4b4528901184b1230617b06c0c WHIRLPOOL 39385786489115b6f10e1e228e599604fb04f34d65aedca48876ddfac4b9b4d5c5835140fe5404398efb0bc986e82b47a42ad5aec02ec1da00df088b2e115f5b
 AUX 4.4/9998-external-akonadi-xml.patch 1683 SHA256 3353d278f1c6e221fd7014a6ac5809e23210105650056dfd4ac6bac7fad378a0 SHA512 23d581f1bb91e73f0bdacb230d00f31587f47728569f1a5cb508e234abd34145db1ea13094346b562042abdc8294b4fdeaf265c82b84f5f2bba42f819c109600 WHIRLPOOL 96fe72ee145b01bf1544ee9be7425d06c430e1959846dafe61aa7a8c6938b5abe294895a30406c3d74876dbf6c38b79cefc32d7345e2402c3d2d0acb5b2583ab
 AUX 4.4/9999-no-akonadi-xml.patch 484 SHA256 2c899eaec621a209f201586eda0ce68d8eab55164161394c21072ae27edf5894 SHA512 914e1f69f0a97ad6cf50d9688c328d0559c6a2ebe9e52dcc5afa2967d1b747f472028c5e0a08490831f99dace8687f618a4d02a3df26c124b798d0d0cb7ceaa8 WHIRLPOOL 06f67f725ff129ca2923eb0069d4cc324618eda0140721031ab528b3bbaaf038f8e0ec92e46e41379dea80d1f05090a2f0cfa5faf2da691b349e6f0acf376f43
-AUX kdepim-runtime-4.11.2-flags.patch 6459 SHA256 684cd5513d81cc2c3c50c6fba6102861f4910a0f2dcef7c814e7cd90f211f59f SHA512 ea99fb6279fbf1cfd4d5e40e2b556238259b501f61351a9959948d4d56efca5bcc0d439effc8f762f156be2a15bead615614f50c9d4dd4a39ca4927a718e2ccc WHIRLPOOL d3ec6636e789a5fc09bc6c0146307f1d0f8fc43f3d15b2aa050394db6c14e35eeb52fc1a6c292854451e713772ff182a9285a208f8f8e6031157d108b6401b52
 DIST kdepim-runtime-4.12.5.tar.xz 1192900 SHA256 33ecebd946550bbf0a4427e3fb18b27d3eea5940067cea76444bd74d9f38d51c SHA512 d1746661b37ae128e8e368c4bdbbbaa5fd0e75cc99a01bb361b18c5036c596286db9aafddb16e5eac8080121ec35fa3cf79be9d0ab0a6720e9538ad8e459c273 WHIRLPOOL b639a19cfba09b88baae3c6111cab26e9a0320a7fd9e1301beb9b543d6a08f370b4cfa963846998571faf0450bad3da55936debaae552bce4588861a475ee28d
 DIST kdepim-runtime-4.13.0.tar.xz 1130372 SHA256 e1bac73618cc2c988e50d890748031f4c8a2c91cdfefbeb39a095c1bbe042282 SHA512 688deeb7972f7f8ebf5dee558918762ded5b4c1033cbf480cbe3188d8848c61a2666563d90a54f0264e1d9db3026c5ac6a5784f7133e9bcecdfd4a8dac90b2f9 WHIRLPOOL 43d64ccc1232282d31aebac01fd1cb29946e49f871eee64edd5c21a3a93bcec6b29232495188a212e2cc00a6c04363c801853d845d76b8bf338e1e07f00db3cc
 DIST kdepim-runtime-4.4.11.1.tar.bz2 619924 SHA256 0b2bbf59e5d8184bb1f1fc02ed442808cee6bf36f097dc84789089c6bd46c5f6 SHA512 37f0de7b37ef1d4b116c258e35644f99a6734082cdd5a984962246dc58ab9124020cdd31350a06058e067b0ea3fcddbd864beef6dbb13ca529b637a2a51071ad WHIRLPOOL c1fe887ebc1162aab17cda15f294b94ec06e3690221647fabe0fe2ab7ae718f2624bf100cc068771744ec4a951c539004ee2139bae965e32ac49002c66929b71
@@ -15,22 +14,22 @@ EBUILD kdepim-runtime-4.12.5.ebuild 1224 SHA256 47d80d25d582af8c567f3f55c2f1436b
 EBUILD kdepim-runtime-4.13.0.ebuild 1160 SHA256 d735a73fd023d03805ed5e662c28cc515bb4a07a73897bcc419e052489164ab7 SHA512 4ae8f8f8cab05f4386d7fc8c43a7741880b5ec4872abe1123c5ac7598326f338084388dbb6ffa73c5616a24462b00f5b9834f71cfc8f4f65409a7c36a2c09498 WHIRLPOOL 7b24e8f3090fee9dab1fbb905356bc815624ef77cd16386a1accda40cc6d74264a1de6e9b432feb017dc767bda3a2725c2d8dffd781ab7cf4f233ccf1a308300
 EBUILD kdepim-runtime-4.4.11.1-r1.ebuild 1002 SHA256 9f23510531f6877d3c4d04b97597836803c503f8390d54e29c9a8046660cc4a5 SHA512 e35996708c470bb511c28b4dd043240d42594afaa4b105b393fc8b54613fca6e513c06c74eb4cb4a5ddaff53a18d09100c34e3ba40af2001634e56ae819d6368 WHIRLPOOL bb615c648bd49deabe3de1c868daf4285e7428221f38cf1de0d716eb8237bd5dfc3eafb0df17a0d76b03d9e4787f085677b33a2ba9546248335efe43ac35c761
 EBUILD kdepim-runtime-4.4.11.1-r2.ebuild 1015 SHA256 cecc759c966f724e9fd93d08760facb34bddf424e176d1bab67c3bdd54a575f7 SHA512 dd3a7fb8558efe18e2535fa3850623db0031f31fbdd1e01583864d413f12d382f89c80a3708a54b66e0ed38794891a665b5ab77879c0653f1223cac6fcf7b57d WHIRLPOOL 4eaa95a6bad4243800b5d701a1087fd6b3c64c63cac14b2a73c1e6512ce6e276d303097f06e300953706eed6f7e4c7d370fa65f6cf6ca73005ddf1b225818acc
-MISC ChangeLog 29535 SHA256 86afa29b254c64603091964605963fbe2f2f985a8279b7ecbec81018593ecb03 SHA512 3182c07e36a98701e44bc81c5b61531f1ba24bfd5589774e1d3e8177585e563541ee89f30409d119e56cefcb350bb001231b46fab5b68835621fd40c6d74b462 WHIRLPOOL 4e877b0d077c8306ff69f9c71ec5a8af7f8e748a33d70414095cfdd16bbf97297727d9b5c71a6655367dad8e28527c5c64a5d979f658659ac80c70645d316b3c
+MISC ChangeLog 29652 SHA256 2fbbc28df74450fdc1ade12583bb70700acac40a7f41f300fd4b53d52cb478da SHA512 ab89b0bec69f40ddc7f4e898a3028202817b746fb60f458a8bd9ce50caf56ca6963dca47b3d011e2e2ee8380eb8226dc388df61c15f638dd5aa72701fb46d8ce WHIRLPOOL 3013447fb22aa01853e9350c628ec09a6017f9db5af2f439a78be8404d4c16760c257d31f39876787222c50b175e5d2c91d30aae29364272605eca94809e6467
 MISC metadata.xml 350 SHA256 bafffe596d33a865d1b37fe2debe878eb0858e69f7ad79a2d30c5229ba73f6c4 SHA512 48644af0621dbd39d5d60c25b4326469eaa5b80525798e721113287933f174e63702a33ce20fa54b08b2f9aca7d00684b1a4aeecb9c0eaabc3612a2deefbfdc1 WHIRLPOOL 32fe40728eb501b4a519ec6daff3d85d86b0a020aaae504928f24948cb2d5e8782f106daa3c7f66deb2aee84963dd80540f1e0dd8185229b9bbe556da01801b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTa11rAAoJELp701BxlEWfgWMP/jJTLpPYPOAq5pY8jGQyWZZr
-RMs1tp0EIQUGUV0m1hATUmlXwtfUQQkLSepLKycju7rlgGoQdSdjQpfX4aZ+t5sW
-NifqZwM41VILAQuXMcR6VDQxtVKSomHg7K42yhaeoMRUDqBJ72iwX7BO4lESZudx
-3osZnq5+zzgZeGzo8WorJPSARE4Cr55jl2E/76HBYVdyOETeApCA69LDCRB5UUxW
-A0nlkdJWZtCKGgXGAFt60rTw50vJ6oysABC1jgWy3rDYFoJYto+aCllWP3+LXmr4
-qGp1RglA0YYV9FUV/PDQXFA6eQM1CGxp6ET6rMeLR5lrM4CP5FRjrb54urUVp0Rb
-HyJI73newoSbo5qie70EFP3g/htFWW3j6sjO875GvsiNk2HUv+5GMBU7EzqNbBX6
-VZ8iSqlLp+mUqiG6baG7YRXoY5Q/ijKNCR7wv1smFfAVs0cso8yPZ2uJjfd4EcoL
-xsgWTKU4Isp2sXeWkuwujWuSXBTosLKlhZm1JHcEf3BpIfHuUvBkxdiHvOiEpTmw
-pA/8b1PvE+RuTyeMgnn9qb2FYuTYx+JIQsjnQTjh+tR03EOs6pni2QCaZsLxqHn2
-BEhWpzQ2BjjNZ5h058oNdk0ornKfAmK2GIuvW6DwkZvG5jU2p5LCOVikUlI0o9KA
-0TgvRd/H74WR2AQ173fl
-=o/Nj
+iQIcBAEBCAAGBQJTa+5pAAoJEGVpnaTzz9K9beAQAK7yJ2Mmf6ODsZFbRSgkeqbJ
+bfyKtgJS95GY+Hybfz39JGds1RVT++pkprRDFGOd+nbRPNOMoQtTuYzGnT4LnwvQ
+hGIFK7lPx2NuzPtkXLlmvUJbdSQEmPM9tiq56PtBFeirUXwkS30LDTROMGpF7cXm
+Fi3Kwnv9poypC7ATkiX868DR4l3rKKsvTvBlith5svir3xjC1gCtIEE+/zXK6gaQ
+ANjKvM/ePaJvpu7SI93YA9OCx7fbXyDOELZwywEvoSiTTW6PPKmZHvCnhf7S8Hef
+hDh3lc/pJeaFnjrW470TTr+GXtopLixFihmggoTubDgkc1Um6qni3eJaK/lUUrbN
+3VAbds6ecg6kfcJhINQhfZzvhc1ZdCuUrDefKNS3my4E6IY8SxIw1+SSSnB+/qj2
+xSpqcZ/5Sfbs7aer0Rpt63+e/Npk6AZqjOV1D/t2ZYHI1cg4Lm5D7KkcZsi6ftjM
+Y6aHDyFRY+Q3WnPJAGQNQnUoCzR3JeWlJt8LGRMzxH6KQmBbWV0bx0rCYAjkynVV
+wbXr0IgoADDU75pMHxZTdYJ93MEIbv7xZSVrIRsKeCyugNMAlaIwfmr4smEXHfRg
+7vPi04q0ecyd7FMl1ZPPwnh2TTVU9R1KNoK3bkkNkAokVtyC7AEvkAyX5o/8vFYW
+v8TRo7QUrA9bVzkF6VOv
+=OJn0
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim-runtime/files/kdepim-runtime-4.11.2-flags.patch b/kde-base/kdepim-runtime/files/kdepim-runtime-4.11.2-flags.patch
deleted file mode 100644
index b6ca2df2d529..000000000000
--- a/kde-base/kdepim-runtime/files/kdepim-runtime-4.11.2-flags.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-commit c561149538336804f212f5a12ea6cf3d1a3a19f5
-Author: Andre Woebbeking <Woebbeking@kde.org>
-Date:   Fri Sep 27 22:19:42 2013 +0200
-
-    Don't bother IMAP servers with not supported flags
-    
-    Created a new method ResourceTask::fromAkonadiToSupportedImapFlags() to convert
-    Akonadi to IMAP flags supported by the server and use it everywhere instead of
-    fromAkonadiFlags().
-    
-    fromAkonadiFlags() was made private to make it impossible to call it by accident.
-    
-    BUG:278082
-    FIXED-IN: 4.11.3
-    REVIEW:112724
-    
-    CCBUG:287356
-    
-    This also reduces the risk to trigger 287356 as the insert on the IMAP server
-    doesn't fail due to unsupported IMAP flags.
-
-diff --git a/resources/imap/additemtask.cpp b/resources/imap/additemtask.cpp
-index da965a1..af427ff 100644
---- a/resources/imap/additemtask.cpp
-+++ b/resources/imap/additemtask.cpp
-@@ -64,7 +64,7 @@ void AddItemTask::doStart( KIMAP::Session *session )
-   KIMAP::AppendJob *job = new KIMAP::AppendJob( session );
-   job->setMailBox( mailBox );
-   job->setContent( msg->encodedContent( true ) );
--  job->setFlags( fromAkonadiFlags( item().flags().toList() ) );
-+  job->setFlags( fromAkonadiToSupportedImapFlags( item().flags().toList() ) );
-   connect( job, SIGNAL(result(KJob*)), SLOT(onAppendMessageDone(KJob*)) );
-   job->start();
- }
-diff --git a/resources/imap/changeitemsflagstask.cpp b/resources/imap/changeitemsflagstask.cpp
-index 1c7f415..d7eb183 100644
---- a/resources/imap/changeitemsflagstask.cpp
-+++ b/resources/imap/changeitemsflagstask.cpp
-@@ -91,7 +91,7 @@ KIMAP::StoreJob* ChangeItemsFlagsTask::prepareJob( KIMAP::Session *session )
- void ChangeItemsFlagsTask::triggerAppendFlagsJob(KIMAP::Session* session)
- {
-   KIMAP::StoreJob *store = prepareJob( session );
--  store->setFlags( fromAkonadiFlags( addedFlags().toList() ) );
-+  store->setFlags( fromAkonadiToSupportedImapFlags( addedFlags().toList() ) );
-   store->setMode( KIMAP::StoreJob::AppendFlags );
-   connect( store, SIGNAL(result(KJob*)), SLOT(onAppendFlagsDone(KJob*)) );
-   store->start();
-@@ -100,7 +100,7 @@ void ChangeItemsFlagsTask::triggerAppendFlagsJob(KIMAP::Session* session)
- void ChangeItemsFlagsTask::triggerRemoveFlagsJob(KIMAP::Session* session)
- {
-   KIMAP::StoreJob *store = prepareJob( session );
--  store->setFlags( fromAkonadiFlags( removedFlags().toList() ) );
-+  store->setFlags( fromAkonadiToSupportedImapFlags( removedFlags().toList() ) );
-   store->setMode( KIMAP::StoreJob::RemoveFlags );
-   connect( store, SIGNAL(result(KJob*)), SLOT(onRemoveFlagsDone(KJob*)) );
-   store->start();
-diff --git a/resources/imap/changeitemtask.cpp b/resources/imap/changeitemtask.cpp
-index 1a5e969..242e202 100644
---- a/resources/imap/changeitemtask.cpp
-+++ b/resources/imap/changeitemtask.cpp
-@@ -34,7 +34,6 @@
- 
- #include "imapflags.h"
- #include "uidnextattribute.h"
--#include "collectionflagsattribute.h"
- 
- ChangeItemTask::ChangeItemTask( ResourceStateInterface::Ptr resource, QObject *parent )
-   : ResourceTask( DeferIfNoSession, resource, parent ), m_session( 0 ), m_oldUid( 0 ), m_newUid( 0 )
-@@ -67,7 +66,7 @@ void ChangeItemTask::doStart( KIMAP::Session *session )
- 
-     job->setMailBox( mailBox );
-     job->setContent( msg->encodedContent( true ) );
--    job->setFlags( fromAkonadiFlags( item().flags().toList() ) );
-+    job->setFlags( fromAkonadiToSupportedImapFlags( item().flags().toList() ) );
- 
-     connect( job, SIGNAL(result(KJob*)),
-              this, SLOT(onAppendMessageDone(KJob*)) );
-@@ -105,19 +104,7 @@ void ChangeItemTask::onPreStoreSelectDone( KJob *job )
- 
- void ChangeItemTask::triggerStoreJob()
- {
--  QList<QByteArray> flags = fromAkonadiFlags( item().flags().toList() );
--  Akonadi::CollectionFlagsAttribute *flagAttr = item().parentCollection().attribute<Akonadi::CollectionFlagsAttribute>();
--  // the server does not support arbitrary flags, so filter out those it can't handle
--  if ( flagAttr && !flagAttr->flags().isEmpty() && !flagAttr->flags().contains( "\\*" ) ) {
--    for ( QList< QByteArray >::iterator it = flags.begin(); it != flags.end(); ) {
--      if ( flagAttr->flags().contains( *it ) ) {
--        ++it;
--      } else {
--        kDebug() << "Server does not support flag" << *it;
--        it = flags.erase( it );
--      }
--    }
--  }
-+  QList<QByteArray> flags = fromAkonadiToSupportedImapFlags( item().flags().toList() );
- 
-   KIMAP::StoreJob *store = new KIMAP::StoreJob( m_session );
- 
-diff --git a/resources/imap/resourcetask.cpp b/resources/imap/resourcetask.cpp
-index a41e884..1de07f3 100644
---- a/resources/imap/resourcetask.cpp
-+++ b/resources/imap/resourcetask.cpp
-@@ -25,6 +25,7 @@
- 
- #include <KDE/KLocale>
- 
-+#include "collectionflagsattribute.h"
- #include "imapflags.h"
- #include "sessionpool.h"
- #include "resourcestateinterface.h"
-@@ -347,6 +348,26 @@ void ResourceTask::showInformationDialog( const QString &message, const QString
-   m_resource->showInformationDialog( message, title, dontShowAgainName );
- }
- 
-+QList<QByteArray> ResourceTask::fromAkonadiToSupportedImapFlags( const QList<QByteArray> &flags ) const
-+{
-+  QList<QByteArray> imapFlags = fromAkonadiFlags( flags );
-+
-+  const Akonadi::CollectionFlagsAttribute *flagAttr = collection().attribute<Akonadi::CollectionFlagsAttribute>();
-+  // the server does not support arbitrary flags, so filter out those it can't handle
-+  if ( flagAttr && !flagAttr->flags().isEmpty() && !flagAttr->flags().contains( "\\*" ) ) {
-+    for ( QList< QByteArray >::iterator it = imapFlags.begin(); it != imapFlags.end(); ) {
-+      if ( flagAttr->flags().contains( *it ) ) {
-+        ++it;
-+      } else {
-+        kDebug() << "Server does not support flag" << *it;
-+        it = imapFlags.erase( it );
-+      }
-+    }
-+  }
-+
-+  return imapFlags;
-+}
-+
- QList<QByteArray> ResourceTask::fromAkonadiFlags( const QList<QByteArray> &flags )
- {
-   QList<QByteArray> newFlags;
-diff --git a/resources/imap/resourcetask.h b/resources/imap/resourcetask.h
-index f2bfed0..69c1a64 100644
---- a/resources/imap/resourcetask.h
-+++ b/resources/imap/resourcetask.h
-@@ -125,7 +125,12 @@ protected:
-   const QChar separatorCharacter() const;
-   void setSeparatorCharacter( const QChar &separator );
- 
-+  QList<QByteArray> fromAkonadiToSupportedImapFlags( const QList<QByteArray> &flags ) const;
-+
-   static QList<QByteArray> toAkonadiFlags( const QList<QByteArray> &flags );
-+
-+private:
-+
-   static QList<QByteArray> fromAkonadiFlags( const QList<QByteArray> &flags );
- 
- private slots: