summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2013-12-18 20:07:02 +0000
committerJohannes Huber <johu@gentoo.org>2013-12-18 20:07:02 +0000
commit9fa2c303925f26b5be987aab1e555fb59942e877 (patch)
treee669fb8dc417d589909f4a723a76150638c438a9 /kde-base
parentVersion bump KDE SC 4.12.0 (diff)
downloadhistorical-9fa2c303925f26b5be987aab1e555fb59942e877.tar.gz
historical-9fa2c303925f26b5be987aab1e555fb59942e877.tar.bz2
historical-9fa2c303925f26b5be987aab1e555fb59942e877.zip
Oldpim revision bump adds compat patches for KDE SC 4.12.
Package-Manager: portage-2.2.7/cvs/Linux x86_64 Manifest-Sign-Key: 0xF3CFD2BD
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdepim-runtime/ChangeLog13
-rw-r--r--kde-base/kdepim-runtime/Manifest33
-rw-r--r--kde-base/kdepim-runtime/files/4.4/9996-no-knut-anymore.patch12
-rw-r--r--kde-base/kdepim-runtime/files/4.4/9997-the-future-is-here.patch23
-rw-r--r--kde-base/kdepim-runtime/files/4.4/9998-external-akonadi-xml.patch53
-rw-r--r--kde-base/kdepim-runtime/files/4.4/9999-no-akonadi-xml.patch11
-rw-r--r--kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r2.ebuild44
-rw-r--r--kde-base/libkomparediff2/Manifest24
8 files changed, 196 insertions, 17 deletions
diff --git a/kde-base/kdepim-runtime/ChangeLog b/kde-base/kdepim-runtime/ChangeLog
index 7307ce333c61..0a3cca896982 100644
--- a/kde-base/kdepim-runtime/ChangeLog
+++ b/kde-base/kdepim-runtime/ChangeLog
@@ -1,6 +1,17 @@
# ChangeLog for kde-base/kdepim-runtime
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.176 2013/12/18 19:57:56 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.177 2013/12/18 20:06:58 johu Exp $
+
+*kdepim-runtime-4.4.11.1-r2 (18 Dec 2013)
+
+ 18 Dec 2013; Johannes Huber <johu@gentoo.org>
+ +files/4.4/9996-no-knut-anymore.patch,
+ +files/4.4/9997-the-future-is-here.patch,
+ +files/4.4/9998-external-akonadi-xml.patch,
+ +files/4.4/9999-no-akonadi-xml.patch, +kdepim-runtime-4.4.11.1-r2.ebuild,
+ files/4.4/0001-Less-warnings-when-building-against-a-new-kdepimlibs.patch,
+ files/4.4/0002-Implement-readOnly-for-Akonadi-kresources.patch:
+ Oldpim revision bump adds compat patches for KDE SC 4.12.
*kdepim-runtime-4.12.0 (18 Dec 2013)
diff --git a/kde-base/kdepim-runtime/Manifest b/kde-base/kdepim-runtime/Manifest
index 92c5e849df4f..e4a8b21f1640 100644
--- a/kde-base/kdepim-runtime/Manifest
+++ b/kde-base/kdepim-runtime/Manifest
@@ -3,6 +3,10 @@ Hash: SHA256
AUX 4.4/0001-Less-warnings-when-building-against-a-new-kdepimlibs.patch 909 SHA256 ab132ee0abe2b2d847344b53ddad902fef720975327a6110faf70bd60837087e SHA512 f549ee9acd4914ee3f7e241af6e15f4f9c6f7bb25f016fa8d80b0d764c622f563d55a5a16098747c09bbde2392477cfcb31e21f84f1d00a4b09da7c52b164d0c WHIRLPOOL cef4d0796d0dd0da271aec96e8ea2823d3cfad8cfe194bcf9538346949c5bb902f2dae7abedc360995115e8a53b198674912938c6762e8d31f55147d963fb276
AUX 4.4/0002-Implement-readOnly-for-Akonadi-kresources.patch 4012 SHA256 6d22b29e0594df9fedd2fce966262fcae307eb9ad7d67040d928f35a1cef234c SHA512 70fb1256867d9526169aa1ec2aeefb1c42cf82fca842bd342b9859f6ba3f252f941d218a76374aa09e0ef8068b2d3a460f9ea4e23cddc43565841021b7aec62a WHIRLPOOL 4e554bd3576f4ac1bd58de4fb5f805732c8653dc2eb50b50ca811fb7431f3b1a81f0d04404aaeb16bb660eaf199a41aae37ac4755d7ad160ddd0343baf2b5203
+AUX 4.4/9996-no-knut-anymore.patch 401 SHA256 350e73d10e35092facfb8e677c4391a0e9a47c21f29d7d18e335f819ba406f1a SHA512 f1a896cf884efc35f2bd00f055f3205224a352cd0c20b7b4305f98d298b11d5bc758d28334cfad04784587ddfacaba12400e7bffe6a6aef67245f12eb3a166cd WHIRLPOOL 0c8ad473f390e18c35847f3aaeaa48ef94f3d03f0efc1c814ca951f3cf3d9ccb8d4518490deef71a40a0dbada870f3213516789937fac5f13d89633ddbcf4a93
+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.11.2.tar.xz 1227080 SHA256 95bb87f3c911d012aa4831bb8d6b8dbe56cadf2529f9753d74fa6db3164e438e SHA512 9bb78c9dd67dbe0923c1bb2a4f43e9ef5c8a06559a07edfbdf533e3722d290806cd88c972d689bb88bf7853f913cfe290ec2ac94f97ff9d59cddb2bee9cfeb22 WHIRLPOOL af87f0c9d31c8223d8bef8c5ab92f7277850f180dc1d88909da2b69f1e2f9da23694f7e70fa02aa65a50a01a5e32161cc78f03b378911421e590f098a052b0fc
DIST kdepim-runtime-4.11.4.tar.xz 1230924 SHA256 190dee8676325465c5837ad712f348e37b7cb41262ff70a6b6dd90cbba80b22f SHA512 f2e2acf5aeb78a4babe3b475a15c0c59a0409f8cc13a39b15fc3e6a53aa69c6a69a879634366376c33ee705dd2ccf0c6b5a07f61004de534a6164d835fceca41 WHIRLPOOL 1367eb533c0c839f0a2f27e876c10b3b90e0c8ac1572c658b10a7e067b82462e2bf88fc0f984d0885d092e36d8c3996cad67e866601292b582fbfa98e9a6e0fa
@@ -12,22 +16,23 @@ EBUILD kdepim-runtime-4.11.2-r1.ebuild 1286 SHA256 4a5378cd5a107df9b4c1d04fc81a1
EBUILD kdepim-runtime-4.11.4.ebuild 1244 SHA256 7c1e7cb863adf25f4cc652064c48e27f19c51e369bc9d721495a835e93ef70ae SHA512 a4351167e14a836de9db1aee0b2f93cf6ca0fe352ecf41406568c8a45856d2e2ae6ebd15821e4c2e8a21cc5bb69ad23ee130a532c530e8158c7b4a2f2b425f96 WHIRLPOOL e5b4c7caa5b650f4b821277081b9d7a63c1aa84b9dc185387fab62f4cafd454fb3323f5376f366e0b5fb6c4f2dabf84bfdb9c228e5a9731db5623e9d3681a952
EBUILD kdepim-runtime-4.12.0.ebuild 1201 SHA256 f2d5b48e945931a1ef2523d53f02c575fcbc8038addd94c1228b8073a7274a71 SHA512 b2f1e67c0408adc7973b0661c443d88e64e91002928307481e11786961d607e32713c30222c28d4d8290b5cd2c5aa277c8bcaa4cb1524b4c25ec35dbd28a0f58 WHIRLPOOL 9d043ea9953b5c26586e9338624a2219e6f6f86bf752ecf81cdaba9268120ab378899c37d83ec8e62693e6a523aafc45e1bb30fb30027696f4c36273a8d8c742
EBUILD kdepim-runtime-4.4.11.1-r1.ebuild 1026 SHA256 b121a55b51022ef20e836d484f13396be7aca1ffee56f66e3f28b0036a783e09 SHA512 744faaab0b61ca73b1c99ecb7308bc286a96a6fd7c57c7b052368956e88719f714c3ce20f89eaa0c17e8e75d7b4ac1ae3c27571d8c6316e3b90ad9e225e360d9 WHIRLPOOL e627ef7f7048d5760c0b17a839df7f1e5044df129cff31d4e32cdc8c43ea064980c17480ab45b98d4bf9df971e64ff8c8293bbde0420a645b254f1593a52fc49
-MISC ChangeLog 25072 SHA256 28af64d1f1faa25a65965a8cdb23aa89052496c33b2fd19d8407f8e37bd0eb92 SHA512 5222b2ee68e257d56e62b9e0bab34d24077e073004395958c958553dd386cf2516d23252fa6d371dfeb6c9cf0daa186f9a53268b8e4c6bcffeb2d64c975b9950 WHIRLPOOL 56d9d5c8d01c1245169d315c651174bf4aab7c29077f8bac40ebf07b22d2a34db22f6cce3b63793630815585a90429715653b29d3b8f6a11d02d2c93937048b8
+EBUILD kdepim-runtime-4.4.11.1-r2.ebuild 1033 SHA256 64a90512d3176e3f9833db37c0b2704e2af0a558129b83d26022d13a110cd3f0 SHA512 445f4ec0fa6e2d7c90aef9674b56148ebba4b4f11e64f62e12843363495dd6944ea2b7fb59b7d4444359b89e8e87ac0e85a37a0f54782018181e1b92a655966a WHIRLPOOL 50d3548a8c6f6b1dbb20979e8561741424fe387655451ac4f1ba18da36209518ab5e8d0ced59ab03675c4971421c66dd53e4f51bd88d6ca7e07b370147542f90
+MISC ChangeLog 25574 SHA256 5f27fdf49cd72777a74e691bb74394a5c52eac4a9376974c8fe1f810ac9181fb SHA512 b60a3cdfd73d4c5f950d411040b531c3029d5491b5cfffc5a7a17021a129c165f381ee7e0dba27b41c2fb5a060ef3ebceb322cd936d46faac89687f8a6b2d21c WHIRLPOOL 628cae65c1d8366199015a4e4cad7ed76e658e879fccc66f8292ec5caaa425408f0ba95e08d4e7bd4b240a656b1289dd76809b59748a2c7031b10173535d175d
MISC metadata.xml 350 SHA256 bafffe596d33a865d1b37fe2debe878eb0858e69f7ad79a2d30c5229ba73f6c4 SHA512 48644af0621dbd39d5d60c25b4326469eaa5b80525798e721113287933f174e63702a33ce20fa54b08b2f9aca7d00684b1a4aeecb9c0eaabc3612a2deefbfdc1 WHIRLPOOL 32fe40728eb501b4a519ec6daff3d85d86b0a020aaae504928f24948cb2d5e8782f106daa3c7f66deb2aee84963dd80540f1e0dd8185229b9bbe556da01801b8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQIcBAEBCAAGBQJSsf6LAAoJEGVpnaTzz9K9BjkP/3/zvpMn7e0FMZk681j/SVmZ
-UA8P8429EPy6rVV8DhZ6nO0NOqKjKcyBb6h/DPXstICzltrTi/2uldMfFyNVDdt7
-jdsLhlfTTY+YzGXtt/VgrGg7SLlevI1ItOqSqyhHEZwdcpikme7njI9WSwuQuSL3
-T0x9sGJj8zWwibANpzundhzURR42aRW/Py6syGCADEZDSKgx2H0rrCw1MooRMbSY
-8D1o4eEpFu5h2Trs2FWN4CvdzM7lMMMUZbwI2wEs18vI9pJVtCltccMHK5p7gAng
-2o0naKfW5JzUdLOOm4WeXlQXx7INWZqJAo6fjl21C9Wn94P8NZMKVu8OO+9iWCoe
-/w0/z95tmaQxgasCqSEwx/hnjmKBTL/AlTP5J8sLNO8BeJDx9BhjXyZFJR4/EYXX
-/eYRd4GOggGgivJofmLtABWeLqcfEz9kXvy6dkQll/DyuTJH2NEHWzEOvA0J7ZG+
-uXZ6yASXvWVhdnWpwbOzi18Mp4Q1pdRHIxMlVo75Bx7F7cIQxHTtcSpAsF3JtXQ+
-ip4Ct/CA3EW4AP1gOPYqQoDbuuvoJYZ85mYCLgVqODgQWXbk+zNtYwQVnX6Gnkeu
-J0kSD1fb9bfHBjJRei3Ahyc3t3Hu/uxKdPKGuwbh2Mru/0+LJaRPpXfZ/wnYthyw
-gAH5iPfdKxPFA9pJrFm/
-=xVCj
+iQIcBAEBCAAGBQJSsgBjAAoJEGVpnaTzz9K90awQAJ2x6qTnIYuMRq3+2noUhbS/
+ms4zmpBlTCtxylWuWcKu4mmqGtD0g94quBoCBuL8Z2g2VqtzTF7bF30KRdRXEBR+
+MJB+yeggCoQRs7Nt6/hWCe8Lbt+aL5jnB/9cshRPArgsJ7fNRt7eheBwsLuMptlL
+H5R5Y8KbC/ihySGcsBB/5eNwRT6NPzM6F+bCYAh1TY7jWQBH9Y7qe8i+3zugfUKC
+kHTrseTDnuPHFaA5//0bK/Apc/4oewD61A4M9eyEQC8Kp74MDTvwEBfM66W7DLgS
+H59uapMx1suFrXtOGPXL26rJKt1DrBvAfYheIRTF5xCV+bKnCUDSiT/PQtTGYiMC
+EmVEXZ3QfcLBiJCY1+3pEF2TTPp8cIohcWiQy5kpsKKxYqW3rBvuFRI1WuNldSPg
+siyvsLsT3GRmv6VprHRo5GRuQloENHIp7/mp828N/MWFUfHsew3XrQf5Biq+oKuh
+9nXl/wPomO/lEK0YqJBCe2VwpiAJgvofyti+RQR22MW3ok49prgJz8Ifu1Q+NCIB
+au+bm40raMQtEIBWFZyHOi0uI3K+JrKbZtzAz0mpigCa9sI611k5R9QlI9wojGmf
+LWR2c8n5rTEiczRbYKnk3KI1S5ROwqua8VogrdYkiWJ9xbjMekVlgT/VU/eR4fIT
+UTt64CXiLARXWF0HipZd
+=vAW9
-----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim-runtime/files/4.4/9996-no-knut-anymore.patch b/kde-base/kdepim-runtime/files/4.4/9996-no-knut-anymore.patch
new file mode 100644
index 000000000000..3383024c4aae
--- /dev/null
+++ b/kde-base/kdepim-runtime/files/4.4/9996-no-knut-anymore.patch
@@ -0,0 +1,12 @@
+diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
+index d436115..8f1033c 100644
+--- a/resources/CMakeLists.txt
++++ b/resources/CMakeLists.txt
+@@ -30,7 +30,6 @@ add_subdirectory( ical )
+ add_subdirectory( imap )
+ add_subdirectory( kabc )
+ add_subdirectory( kcal )
+-add_subdirectory( knut )
+ add_subdirectory( kolabproxy )
+ add_subdirectory( localbookmarks )
+ add_subdirectory( maildir )
diff --git a/kde-base/kdepim-runtime/files/4.4/9997-the-future-is-here.patch b/kde-base/kdepim-runtime/files/4.4/9997-the-future-is-here.patch
new file mode 100644
index 000000000000..5a9b886e7a5e
--- /dev/null
+++ b/kde-base/kdepim-runtime/files/4.4/9997-the-future-is-here.patch
@@ -0,0 +1,23 @@
+diff -ruN kdepim-runtime-4.4.11.1.orig/resourcetester/xmloperations.cpp kdepim-runtime-4.4.11.1/resourcetester/xmloperations.cpp
+--- kdepim-runtime-4.4.11.1.orig/resourcetester/xmloperations.cpp 2013-12-15 15:41:43.629536906 +0100
++++ kdepim-runtime-4.4.11.1/resourcetester/xmloperations.cpp 2013-12-15 15:42:33.492539695 +0100
+@@ -34,7 +34,6 @@
+ #include <QStringList>
+
+ using namespace Akonadi;
+-using namespace AkonadiFuture;
+
+ template <typename T> QTextStream& operator<<( QTextStream &s, const QSet<T> &set )
+ {
+diff -ruN kdepim-runtime-4.4.11.1.orig/resourcetester/xmloperations.h kdepim-runtime-4.4.11.1/resourcetester/xmloperations.h
+--- kdepim-runtime-4.4.11.1.orig/resourcetester/xmloperations.h 2013-12-15 15:41:43.629536906 +0100
++++ kdepim-runtime-4.4.11.1/resourcetester/xmloperations.h 2013-12-15 15:42:22.195539063 +0100
+@@ -114,7 +114,7 @@
+
+ private:
+ Akonadi::Collection::List mRoots;
+- AkonadiFuture::XmlDocument mDocument;
++ Akonadi::XmlDocument mDocument;
+ QString mFileName;
+ QString mErrorMsg;
+ CollectionFields mCollectionFields;
diff --git a/kde-base/kdepim-runtime/files/4.4/9998-external-akonadi-xml.patch b/kde-base/kdepim-runtime/files/4.4/9998-external-akonadi-xml.patch
new file mode 100644
index 000000000000..1358a02b38cc
--- /dev/null
+++ b/kde-base/kdepim-runtime/files/4.4/9998-external-akonadi-xml.patch
@@ -0,0 +1,53 @@
+From ae557eb6f7c106012a96e6dcc86bc15c71c48c7f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil@redhat.com>
+Date: Wed, 9 Oct 2013 13:17:28 +0200
+Subject: [PATCH] Fix build of resourcetester against akonadi-xml in kdepimlibs
+
+---
+ resourcetester/CMakeLists.txt | 2 +-
+ resourcetester/xmloperations.cpp | 2 +-
+ resourcetester/xmloperations.h | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/resourcetester/CMakeLists.txt b/resourcetester/CMakeLists.txt
+index 74bd851..c9d0313 100644
+--- a/resourcetester/CMakeLists.txt
++++ b/resourcetester/CMakeLists.txt
+@@ -20,7 +20,7 @@ set( resourcetester_SRCS
+ kde4_add_executable(resourcetester ${resourcetester_SRCS})
+
+ target_link_libraries( resourcetester
+- akonadi-xml
++ ${KDEPIMLIBS_AKONADI_XML_LIBS}
+ ${KDEPIMLIBS_AKONADI_LIBS}
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTGUI_LIBRARY}
+diff --git a/resourcetester/xmloperations.cpp b/resourcetester/xmloperations.cpp
+index 9bc5202..59b5754 100644
+--- a/resourcetester/xmloperations.cpp
++++ b/resourcetester/xmloperations.cpp
+@@ -25,7 +25,7 @@
+ #include <akonadi/collectionfetchscope.h>
+ #include <akonadi/itemfetchjob.h>
+ #include <akonadi/itemfetchscope.h>
+-#include "xml/xmlwritejob.h"
++#include <akonadi/xml/xmlwritejob.h>
+
+ #include <KDebug>
+
+diff --git a/resourcetester/xmloperations.h b/resourcetester/xmloperations.h
+index c32b622..e75ad59 100644
+--- a/resourcetester/xmloperations.h
++++ b/resourcetester/xmloperations.h
+@@ -22,7 +22,7 @@
+
+ #include <akonadi/collection.h>
+ #include <akonadi/item.h>
+-#include "xml/xmldocument.h"
++#include <akonadi/xml/xmldocument.h>
+
+ #include <QtCore/QMetaEnum>
+ #include <QtCore/QObject>
+--
+1.8.5.1
+
diff --git a/kde-base/kdepim-runtime/files/4.4/9999-no-akonadi-xml.patch b/kde-base/kdepim-runtime/files/4.4/9999-no-akonadi-xml.patch
new file mode 100644
index 000000000000..35c88a39c048
--- /dev/null
+++ b/kde-base/kdepim-runtime/files/4.4/9999-no-akonadi-xml.patch
@@ -0,0 +1,11 @@
+diff -ruN kdepim-runtime-4.4.11.1.orig/CMakeLists.txt kdepim-runtime-4.4.11.1/CMakeLists.txt
+--- kdepim-runtime-4.4.11.1.orig/CMakeLists.txt 2011-04-21 15:41:44.000000000 +0200
++++ kdepim-runtime-4.4.11.1/CMakeLists.txt 2013-12-15 14:29:33.078294758 +0100
+@@ -102,7 +102,6 @@
+ ############### Now, we add the components ###############
+
+ add_subdirectory(libkdepim-copy)
+-add_subdirectory(xml)
+ add_subdirectory(resourcetester)
+ add_subdirectory(resources)
+ add_subdirectory(agents)
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r2.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r2.ebuild
new file mode 100644
index 000000000000..706b17ef24b2
--- /dev/null
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r2.ebuild,v 1.1 2013/12/18 20:06:58 johu Exp $
+
+EAPI=5
+
+if [[ ${PV} = *9999* ]]; then
+ KMNAME="kdepim"
+ KMMODULE="runtime"
+ inherit kde4-meta
+else
+ inherit kde4-base
+fi
+
+DESCRIPTION="KDE PIM runtime plugin collection"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RESTRICT="test"
+# Would need test programs _testrunner and akonaditest from kdepimlibs
+
+COMMON_DEPEND="
+ app-misc/strigi
+ >=app-office/akonadi-server-1.3.1
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ $(add_kdebase_dep kdelibs 'semantic-desktop' 4.12)
+ $(add_kdebase_dep kdepimlibs '' 4.12)
+ $(add_kdebase_dep libkdepim)
+ x11-misc/shared-mime-info
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_kdebase_dep kdepim-icons)
+"
+
+add_blocker akonadi '<4.3.90'
+
+PATCHES=(
+ "${FILESDIR}/4.4/"000[1-2]-*.patch
+ "${FILESDIR}/4.4/"999[6-9]-*.patch
+)
diff --git a/kde-base/libkomparediff2/Manifest b/kde-base/libkomparediff2/Manifest
index e1d76cdfe73f..ee02389bdcf7 100644
--- a/kde-base/libkomparediff2/Manifest
+++ b/kde-base/libkomparediff2/Manifest
@@ -1,4 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
DIST libkomparediff2-4.12.0.tar.xz 55372 SHA256 9746fc758ca2c19073693c1963b344c6a43a2a691ac9160808bd726c1e7e3189 SHA512 6375f5a40919df9de73e3ffa86faf79349b208401412d80e0c1c7b1dc5fc6a0cf922b1220f27769d3cfa298470662bda5293ceae4295002543491c73eeb5cc77 WHIRLPOOL 66a239433d89ac37a294660c8b66413cd4489a3247f75a0a2eed7243ff9c0a2efa0050f5f8abeb60a7ff97a1166ecf265be9c7dfb808e3befff3cdab79304dc2
-EBUILD libkomparediff2-4.12.0.ebuild 320 SHA256 c24917cf6787a89d333f42fc916fd7fc28848c459f942f454af6f91815119b6f SHA512 727c2f7c6af150e996007425ba93ee2ff27b6899da21d64f70f58e680693c341c2a3e30dc20430de384229a693b52eadcc1c66278b268009bb6413726b0941b2 WHIRLPOOL b58d92c757184a02a7ac3138eaa663270de3b635ef3ecfa1b3b79603e05c263b0a7fce0b2ad98a646d580d6259b4397ab1e4f392d99f0bcd3b541a59c9070b08
-MISC ChangeLog 274 SHA256 0f7bf35199f0e30efda2641c9ecf3e28e5ce64af80434e7f73354ffcc1379954 SHA512 cf6b382449ab15a17877af1830c725878866bef7d09e32290d0e914b50977a9c42ba7e08029416b5df73dea65c4218bc31562ad13cd6a4b4c473de6622d0a1db WHIRLPOOL d0b7183d153679cc2b811f81acb3c636993e83fe6b30df3bedd455247b0eaa441cdbd27ddf22a4355cb8caee2923262e237352665fb9697a102ac7c01c4306b0
+EBUILD libkomparediff2-4.12.0.ebuild 434 SHA256 bd3a1b9a9f2295f54e2c15e62ae5d6611a5e2389d2812c9a9b4f441c2ec2b9b8 SHA512 3746ab86160a0c09d757d3961c811a4e1086f64678d8ea4360113caba253ce0930ec58e31b72f3a991af04464c7305c74893bdbf363018ab47bca9f4a16c8756 WHIRLPOOL 5e52d720d26d83498de5f9cd51fd434772e1525e75eab339483436af6123b840b8d5a0d74e707c1624196778272254e6a50279a21741b15ce999f48f04568606
+MISC ChangeLog 368 SHA256 aa3c263d58812d0b53ab6e8dfe93a27a6d4969f897f206e0cd7d680088c51b50 SHA512 9a83b5fdb2d195312da8d6a820e8e50036ba192f743d7dfcd911afb1de9480b8bc10ea39f6192e86f8a104e7fae7b05b0a9c3ef2763d96aa6993516d1077c4bb WHIRLPOOL 12d41664c61086ef8530047f200f41f2a06a0b8e4608a150efba7f537de617e86c807d5ae27c23c90053d0c94677269cc2b40b86c3d02d0082b83f954e243eab
MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAEBCAAGBQJSsf6QAAoJEGVpnaTzz9K9zpsQAIx3y+lWpcpIqVQvv8uOXojU
+YsgJEpzwii8vTC7NoECzPsg3aqEhM1LdFCaM576yPxTF1/GXsDXPIYqoS5Yp2rDg
+5lz4J+wMBut6j0yuXC5bFK5uf7jcctD8Tet0TveWpypU7C3L3F3vDXqe5GPNQwUL
+3LLVoPAw+0YGL4BckMnA/pkQuU+auj5zCmwwpFBd6A2C6IuHbm5Mtpy+TO0xCELh
+2Vyiw6UlEmwWQXpnLC5tmjbqM3rY3Cgfew9h+EBN4sP+vHZrqw5fC8Wspgb0vxXS
+Qkhgk40cJzTkPZR5YAUmCvczsjTHevj7c8M5CMuw/wepIudnuYfzhygHjB9XJY/u
+i7XSKI3b5tOnWZeskWrzbWPXauPN4y0MAAm9do5HGVfDy1e6PpGUhdBjXGX7Wg2i
+CYVhkxtIkC739LboW1jle5DybWvGnlyamaM1wZ+JDIRXdoTLTmgrvlM9YmxezZIB
+JoKnAhHEtUjpAFAJ8YfCafav7JMmaM10bLkfEkldy0BDaC8YFOzCAwFwqDv8z2vl
+BpjK3kEufNtQxZGQbR0FZ3q5wi16Vb8b7ZIgBJk+4BJiqBLXI6o2hUzMaIUa56/0
+YDZMFwxJWPJG2jzKUt7GwV/aIKthHiPdaMkSChG43V5aFt/LTU4onz86sHLaWUrD
+upBEmnclRXTFhXNDVXvI
+=JfCC
+-----END PGP SIGNATURE-----