[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-contact/, kde-apps/kldap/, kde-apps/libakonadi/files/, ...

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-contact/, kde-apps/kldap/, kde-apps/libakonadi/files/, ...
@ 2016-02-18 14:44 Michael Palimaka
  0 siblings, 0 replies; only message in thread
From: Michael Palimaka @ 2016-02-18 14:44 UTC (permalink / raw
  To: gentoo-commits

commit:     4691ac309d6de29341460f73349ee9b0fa3802ec
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Feb 17 19:54:14 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 14:23:57 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4691ac30

kde-apps: Add KDE PIM 15.12.2

Package-Manager: portage-2.2.27

 ...9999.ebuild => akonadi-calendar-15.12.2.ebuild} |   4 +-
 .../akonadi-calendar-15.12.49.9999.ebuild          |   2 +-
 .../akonadi-calendar/akonadi-calendar-9999.ebuild  |   2 +-
 .../akonadi-contact-15.12.2.ebuild}                |  28 +++-
 ....49.9999.ebuild => akonadi-mime-15.12.2.ebuild} |  20 +--
 .../akonadi-mime/akonadi-mime-15.12.49.9999.ebuild |  18 +-
 ...49.9999.ebuild => akonadi-notes-15.12.2.ebuild} |  18 +-
 .../akonadi-notes-15.12.49.9999.ebuild             |  16 +-
 ...9.9999.ebuild => akonadi-search-15.12.2.ebuild} |   4 +-
 .../akonadi-search-15.12.49.9999.ebuild            |   2 +-
 kde-apps/akonadi-search/akonadi-search-9999.ebuild |   2 +-
 ...9.ebuild => akonadi-socialutils-15.12.2.ebuild} |  18 +-
 .../akonadi-socialutils-15.12.49.9999.ebuild       |  16 +-
 kde-apps/akonadi/akonadi-15.12.2.ebuild            |  97 +++++++++++
 .../akonadiconsole-15.12.2.ebuild}                 |  65 ++++----
 .../akregator-15.12.2.ebuild}                      |  59 ++++---
 kde-apps/blogilo/blogilo-15.12.2.ebuild            |  70 ++++++++
 .../calendarjanitor/calendarjanitor-15.12.2.ebuild |  62 +++++++
 ....9999.ebuild => calendarsupport-15.12.2.ebuild} |   4 +-
 .../calendarsupport-15.12.49.9999.ebuild           |   2 +-
 .../calendarsupport/calendarsupport-9999.ebuild    |   2 +-
 ...9.9999.ebuild => composereditor-15.12.2.ebuild} |  22 ++-
 .../composereditor-15.12.49.9999.ebuild            |  20 ++-
 ...12.49.9999.ebuild => eventviews-15.12.2.ebuild} |   4 +-
 .../eventviews/eventviews-15.12.49.9999.ebuild     |   2 +-
 kde-apps/eventviews/eventviews-9999.ebuild         |   2 +-
 ...15.12.49.9999.ebuild => gpgmepp-15.12.2.ebuild} |   4 +-
 kde-apps/gpgmepp/gpgmepp-15.12.49.9999.ebuild      |   2 +-
 kde-apps/gpgmepp/gpgmepp-9999.ebuild               |   2 +-
 ...49.9999.ebuild => grantleetheme-15.12.2.ebuild} |   4 +-
 .../grantleetheme-15.12.49.9999.ebuild             |   2 +-
 kde-apps/grantleetheme/grantleetheme-9999.ebuild   |   2 +-
 ....9999.ebuild => incidenceeditor-15.12.2.ebuild} |  22 ++-
 .../incidenceeditor-15.12.49.9999.ebuild           |  20 ++-
 .../incidenceeditor/incidenceeditor-9999.ebuild    |   2 +-
 kde-apps/kaddressbook/kaddressbook-15.12.2.ebuild  |  91 +++++++++++
 ....ebuild => kaddressbookgrantlee-15.12.2.ebuild} |   4 +-
 .../kaddressbookgrantlee-15.12.49.9999.ebuild      |   2 +-
 ....12.49.9999.ebuild => kalarmcal-15.12.2.ebuild} |   4 +-
 kde-apps/kalarmcal/kalarmcal-15.12.49.9999.ebuild  |   2 +-
 kde-apps/kalarmcal/kalarmcal-9999.ebuild           |   2 +-
 .../{kblog-9999.ebuild => kblog-15.12.2.ebuild}    |   4 +-
 kde-apps/kblog/kblog-15.12.49.9999.ebuild          |   2 +-
 kde-apps/kblog/kblog-9999.ebuild                   |   2 +-
 ...calcore-9999.ebuild => kcalcore-15.12.2.ebuild} |   4 +-
 kde-apps/kcalcore/kcalcore-15.12.49.9999.ebuild    |   2 +-
 kde-apps/kcalcore/kcalcore-9999.ebuild             |   2 +-
 ...lutils-9999.ebuild => kcalutils-15.12.2.ebuild} |   4 +-
 kde-apps/kcalutils/kcalutils-15.12.49.9999.ebuild  |   2 +-
 kde-apps/kcalutils/kcalutils-9999.ebuild           |   2 +-
 ....12.49.9999.ebuild => kcontacts-15.12.2.ebuild} |   4 +-
 kde-apps/kcontacts/kcontacts-15.12.49.9999.ebuild  |   2 +-
 kde-apps/kcontacts/kcontacts-9999.ebuild           |   2 +-
 ...9999.ebuild => kdepim-kioslaves-15.12.2.ebuild} |   5 +-
 .../kdepim-kioslaves-15.12.49.9999.ebuild          |  16 +-
 .../kdepim-kioslaves/kdepim-kioslaves-9999.ebuild  |   2 +-
 kde-apps/kdepim-l10n/kdepim-l10n-15.12.2.ebuild    | 140 ++++++++++++++++
 kde-apps/kdepim-meta/kdepim-meta-15.12.2.ebuild    |  78 +++++++++
 .../kdepim-runtime-15.12.2.ebuild}                 |  64 ++++----
 kde-apps/kdepim/kdepim-15.12.2.ebuild              | 182 +++++++++++++++++++++
 ...5.12.49.9999.ebuild => kdgantt2-15.12.2.ebuild} |   4 +-
 kde-apps/kdgantt2/kdgantt2-15.12.49.9999.ebuild    |   2 +-
 kde-apps/kdgantt2/kdgantt2-9999.ebuild             |   2 +-
 ...lidays-9999.ebuild => kholidays-15.12.2.ebuild} |   4 +-
 kde-apps/kholidays/kholidays-15.12.49.9999.ebuild  |   2 +-
 kde-apps/kholidays/kholidays-9999.ebuild           |   2 +-
 ...9.ebuild => kidentitymanagement-15.12.2.ebuild} |   4 +-
 .../kidentitymanagement-15.12.49.9999.ebuild       |   2 +-
 .../kidentitymanagement-9999.ebuild                |   2 +-
 ...p-15.12.49.9999.ebuild => kimap-15.12.2.ebuild} |   4 +-
 kde-apps/kimap/kimap-15.12.49.9999.ebuild          |   2 +-
 kde-apps/kimap/kimap-9999.ebuild                   |   2 +-
 ...p-15.12.49.9999.ebuild => kldap-15.12.2.ebuild} |   6 +-
 kde-apps/kldap/kldap-15.12.49.9999.ebuild          |   4 +-
 kde-apps/kldap/kldap-9999.ebuild                   |   4 +-
 .../kmailtransport-15.12.2.ebuild}                 |  27 +--
 ...x-15.12.49.9999.ebuild => kmbox-15.12.2.ebuild} |   4 +-
 kde-apps/kmbox/kmbox-15.12.49.9999.ebuild          |   2 +-
 kde-apps/kmbox/kmbox-9999.ebuild                   |   2 +-
 ...e-15.12.49.9999.ebuild => kmime-15.12.2.ebuild} |   4 +-
 kde-apps/kmime/kmime-15.12.49.9999.ebuild          |   2 +-
 kde-apps/kmime/kmime-9999.ebuild                   |   2 +-
 kde-apps/knotes/knotes-15.12.2.ebuild              |  93 +++++++++++
 .../konsolekalendar/konsolekalendar-15.12.2.ebuild |  63 +++++++
 ...9999.ebuild => kontactinterface-15.12.2.ebuild} |   4 +-
 .../kontactinterface-15.12.49.9999.ebuild          |   2 +-
 .../kontactinterface/kontactinterface-9999.ebuild  |   2 +-
 ....49.9999.ebuild => kpimtextedit-15.12.2.ebuild} |   4 +-
 .../kpimtextedit/kpimtextedit-15.12.49.9999.ebuild |   2 +-
 kde-apps/kpimtextedit/kpimtextedit-9999.ebuild     |   2 +-
 kde-apps/ktnef/ktnef-15.12.2.ebuild                |  60 +++++++
 .../libakonadi-15.12.2-testtools-optional.patch    |  12 +-
 ...12.49.9999.ebuild => libakonadi-15.12.2.ebuild} |   4 +-
 .../libakonadi/libakonadi-15.12.49.9999.ebuild     |   2 +-
 ...9.ebuild => libfollowupreminder-15.12.2.ebuild} |   4 +-
 .../libfollowupreminder-15.12.49.9999.ebuild       |   2 +-
 ...2.49.9999.ebuild => libgravatar-15.12.2.ebuild} |   4 +-
 .../libgravatar/libgravatar-15.12.49.9999.ebuild   |   2 +-
 kde-apps/libgravatar/libgravatar-9999.ebuild       |   2 +-
 ....12.49.9999.ebuild => libkdepim-15.12.2.ebuild} |   4 +-
 kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild  |   2 +-
 kde-apps/libkdepim/libkdepim-9999.ebuild           |   2 +-
 ...uild => libkdepimdbusinterfaces-15.12.2.ebuild} |   4 +-
 .../libkdepimdbusinterfaces-15.12.49.9999.ebuild   |   2 +-
 ...15.12.49.9999.ebuild => libkleo-15.12.2.ebuild} |   4 +-
 kde-apps/libkleo/libkleo-15.12.49.9999.ebuild      |   2 +-
 kde-apps/libkleo/libkleo-9999.ebuild               |   2 +-
 ....12.49.9999.ebuild => libksieve-15.12.2.ebuild} |   4 +-
 kde-apps/libksieve/libksieve-15.12.49.9999.ebuild  |   2 +-
 kde-apps/libksieve/libksieve-9999.ebuild           |   2 +-
 kde-apps/libktnef/libktnef-15.12.2.ebuild          |  27 +++
 ....49.9999.ebuild => libsendlater-15.12.2.ebuild} |   4 +-
 .../libsendlater/libsendlater-15.12.49.9999.ebuild |   2 +-
 ...12.49.9999.ebuild => mailcommon-15.12.2.ebuild} |   4 +-
 .../mailcommon/mailcommon-15.12.49.9999.ebuild     |   2 +-
 kde-apps/mailcommon/mailcommon-9999.ebuild         |   2 +-
 ....49.9999.ebuild => mailimporter-15.12.2.ebuild} |   4 +-
 .../mailimporter/mailimporter-15.12.49.9999.ebuild |   2 +-
 kde-apps/mailimporter/mailimporter-9999.ebuild     |   2 +-
 ....9999.ebuild => messagecomposer-15.12.2.ebuild} |   4 +-
 .../messagecomposer-15.12.49.9999.ebuild           |   2 +-
 ...2.49.9999.ebuild => messagecore-15.12.2.ebuild} |   4 +-
 .../messagecore/messagecore-15.12.49.9999.ebuild   |   2 +-
 ...2.49.9999.ebuild => messagelist-15.12.2.ebuild} |   4 +-
 .../messagelist/messagelist-15.12.49.9999.ebuild   |   2 +-
 ...49.9999.ebuild => messageviewer-15.12.2.ebuild} |   4 +-
 .../messageviewer-15.12.49.9999.ebuild             |   2 +-
 ....12.49.9999.ebuild => pimcommon-15.12.2.ebuild} |   4 +-
 kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild  |   2 +-
 kde-apps/pimcommon/pimcommon-9999.ebuild           |   2 +-
 ...2.49.9999.ebuild => syndication-15.12.2.ebuild} |   4 +-
 .../syndication/syndication-15.12.49.9999.ebuild   |   2 +-
 kde-apps/syndication/syndication-9999.ebuild       |   2 +-
 ...9.9999.ebuild => templateparser-15.12.2.ebuild} |   4 +-
 .../templateparser-15.12.49.9999.ebuild            |   2 +-
 135 files changed, 1351 insertions(+), 372 deletions(-)

diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-15.12.49.9999.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-15.12.2.ebuild
similarity index 97%
copy from kde-apps/akonadi-calendar/akonadi-calendar-15.12.49.9999.ebuild
copy to kde-apps/akonadi-calendar/akonadi-calendar-15.12.2.ebuild
index e61d172..b3fae5c 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-15.12.49.9999.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-15.12.2.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 inherit kde5
 
 DESCRIPTION="Library for akonadi calendar integration"
 LICENSE="GPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 RDEPEND="

diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-15.12.49.9999.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-15.12.49.9999.ebuild
index e61d172..3483932 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-15.12.49.9999.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 inherit kde5

diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
index f92193f..3a0e149 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 inherit kde5

diff --git a/kde-apps/akonadi-mime/akonadi-mime-15.12.49.9999.ebuild b/kde-apps/akonadi-contact/akonadi-contact-15.12.2.ebuild
similarity index 60%
copy from kde-apps/akonadi-mime/akonadi-mime-15.12.49.9999.ebuild
copy to kde-apps/akonadi-contact/akonadi-contact-15.12.2.ebuild
index 89f15bb..bbfe88f 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-15.12.49.9999.ebuild
+++ b/kde-apps/akonadi-contact/akonadi-contact-15.12.2.ebuild
@@ -2,42 +2,52 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST=true
 KMNAME=kdepimlibs
 inherit kde5
 
-DESCRIPTION="Library for akonadi mime types"
-KEYWORDS=""
+DESCRIPTION="Library for akonadi contact integration"
+KEYWORDS=" ~amd64 ~x86"
 LICENSE="LGPL-2.1"
-IUSE=""
+IUSE="prison"
 
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
 RESTRICT="test"
 
 COMMON_DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep libakonadi)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kmime)
-	dev-libs/libxslt
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
-	x11-misc/shared-mime-info
+	media-libs/phonon[qt5]
+	prison? ( media-libs/prison:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 "
 RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepimlibs
+	!kde-apps/kdepimlibs:4
+	!kde-apps/kdepimlibs:5
 "
 
 if [[ ${KDE_BUILD_TYPE} = live ]] ; then
@@ -48,7 +58,7 @@ fi
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_build test TESTING)
+		$(cmake-utils_use_find_package prison KF5Prison)
 	)
 	kde5_src_configure
 }

diff --git a/kde-apps/akonadi-mime/akonadi-mime-15.12.49.9999.ebuild b/kde-apps/akonadi-mime/akonadi-mime-15.12.2.ebuild
similarity index 84%
copy from kde-apps/akonadi-mime/akonadi-mime-15.12.49.9999.ebuild
copy to kde-apps/akonadi-mime/akonadi-mime-15.12.2.ebuild
index 89f15bb..c43591b 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-15.12.49.9999.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-15.12.2.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-KDE_TEST=true
-KMNAME=kdepimlibs
+KDE_TEST="true"
+KMNAME="kdepimlibs"
 inherit kde5
 
 DESCRIPTION="Library for akonadi mime types"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 LICENSE="LGPL-2.1"
 IUSE=""
 
@@ -27,17 +27,18 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep libakonadi)
 	$(add_kdeapps_dep kmime)
-	dev-libs/libxslt
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
+	dev-libs/libxslt
 	x11-misc/shared-mime-info
 "
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 "
 RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepimlibs
+	!kde-apps/kdepimlibs:4
+	!kde-apps/kdepimlibs:5
 "
 
 if [[ ${KDE_BUILD_TYPE} = live ]] ; then
@@ -45,10 +46,3 @@ if [[ ${KDE_BUILD_TYPE} = live ]] ; then
 else
 	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
 fi
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build test TESTING)
-	)
-	kde5_src_configure
-}

diff --git a/kde-apps/akonadi-mime/akonadi-mime-15.12.49.9999.ebuild b/kde-apps/akonadi-mime/akonadi-mime-15.12.49.9999.ebuild
index 89f15bb..0e7c478 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-15.12.49.9999.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-15.12.49.9999.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-KDE_TEST=true
-KMNAME=kdepimlibs
+KDE_TEST="true"
+KMNAME="kdepimlibs"
 inherit kde5
 
 DESCRIPTION="Library for akonadi mime types"
@@ -27,17 +27,18 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep libakonadi)
 	$(add_kdeapps_dep kmime)
-	dev-libs/libxslt
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
+	dev-libs/libxslt
 	x11-misc/shared-mime-info
 "
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 "
 RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepimlibs
+	!kde-apps/kdepimlibs:4
+	!kde-apps/kdepimlibs:5
 "
 
 if [[ ${KDE_BUILD_TYPE} = live ]] ; then
@@ -45,10 +46,3 @@ if [[ ${KDE_BUILD_TYPE} = live ]] ; then
 else
 	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
 fi
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build test TESTING)
-	)
-	kde5_src_configure
-}

diff --git a/kde-apps/akonadi-notes/akonadi-notes-15.12.49.9999.ebuild b/kde-apps/akonadi-notes/akonadi-notes-15.12.2.ebuild
similarity index 78%
copy from kde-apps/akonadi-notes/akonadi-notes-15.12.49.9999.ebuild
copy to kde-apps/akonadi-notes/akonadi-notes-15.12.2.ebuild
index 871f7fa..af44cba 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-15.12.49.9999.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-15.12.2.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-KDE_TEST=true
-KMNAME=kdepimlibs
+KDE_TEST="true"
+KMNAME="kdepimlibs"
 inherit kde5
 
 DESCRIPTION="Library for akonadi notes integration"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 LICENSE="LGPL-2.1"
 IUSE=""
 
@@ -27,7 +27,8 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 "
 RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepimlibs
+	!kde-apps/kdepimlibs:4
+	!kde-apps/kdepimlibs:5
 "
 
 if [[ ${KDE_BUILD_TYPE} = live ]] ; then
@@ -35,10 +36,3 @@ if [[ ${KDE_BUILD_TYPE} = live ]] ; then
 else
 	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
 fi
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build test TESTING)
-	)
-	kde5_src_configure
-}

diff --git a/kde-apps/akonadi-notes/akonadi-notes-15.12.49.9999.ebuild b/kde-apps/akonadi-notes/akonadi-notes-15.12.49.9999.ebuild
index 871f7fa..dcd9178 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-15.12.49.9999.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-15.12.49.9999.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-KDE_TEST=true
-KMNAME=kdepimlibs
+KDE_TEST="true"
+KMNAME="kdepimlibs"
 inherit kde5
 
 DESCRIPTION="Library for akonadi notes integration"
@@ -27,7 +27,8 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 "
 RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepimlibs
+	!kde-apps/kdepimlibs:4
+	!kde-apps/kdepimlibs:5
 "
 
 if [[ ${KDE_BUILD_TYPE} = live ]] ; then
@@ -35,10 +36,3 @@ if [[ ${KDE_BUILD_TYPE} = live ]] ; then
 else
 	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
 fi
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build test TESTING)
-	)
-	kde5_src_configure
-}

diff --git a/kde-apps/akonadi-search/akonadi-search-15.12.49.9999.ebuild b/kde-apps/akonadi-search/akonadi-search-15.12.2.ebuild
similarity index 96%
copy from kde-apps/akonadi-search/akonadi-search-15.12.49.9999.ebuild
copy to kde-apps/akonadi-search/akonadi-search-15.12.2.ebuild
index d6ca1ed..925b1a5 100644
--- a/kde-apps/akonadi-search/akonadi-search-15.12.49.9999.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-15.12.2.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit kde5
 
 DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
 HOMEPAGE="https://projects.kde.org/projects/playground/pim/akonadi-search"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 RDEPEND="

diff --git a/kde-apps/akonadi-search/akonadi-search-15.12.49.9999.ebuild b/kde-apps/akonadi-search/akonadi-search-15.12.49.9999.ebuild
index d6ca1ed..2120b2e 100644
--- a/kde-apps/akonadi-search/akonadi-search-15.12.49.9999.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit kde5
 

diff --git a/kde-apps/akonadi-search/akonadi-search-9999.ebuild b/kde-apps/akonadi-search/akonadi-search-9999.ebuild
index 9df8ba3..ae8b3a0 100644
--- a/kde-apps/akonadi-search/akonadi-search-9999.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit kde5
 

diff --git a/kde-apps/akonadi-socialutils/akonadi-socialutils-15.12.49.9999.ebuild b/kde-apps/akonadi-socialutils/akonadi-socialutils-15.12.2.ebuild
similarity index 80%
copy from kde-apps/akonadi-socialutils/akonadi-socialutils-15.12.49.9999.ebuild
copy to kde-apps/akonadi-socialutils/akonadi-socialutils-15.12.2.ebuild
index 3580919..e406d48 100644
--- a/kde-apps/akonadi-socialutils/akonadi-socialutils-15.12.49.9999.ebuild
+++ b/kde-apps/akonadi-socialutils/akonadi-socialutils-15.12.2.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-KDE_TEST=true
-KMNAME=kdepimlibs
+KDE_TEST="true"
+KMNAME="kdepimlibs"
 inherit kde5
 
 DESCRIPTION="Library for social utils integration"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 LICENSE="LGPL-2.1"
 IUSE=""
 
@@ -29,7 +29,8 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 "
 RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepimlibs
+	!kde-apps/kdepimlibs:4
+	!kde-apps/kdepimlibs:5
 "
 
 if [[ ${KDE_BUILD_TYPE} = live ]] ; then
@@ -37,10 +38,3 @@ if [[ ${KDE_BUILD_TYPE} = live ]] ; then
 else
 	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
 fi
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build test TESTING)
-	)
-	kde5_src_configure
-}

diff --git a/kde-apps/akonadi-socialutils/akonadi-socialutils-15.12.49.9999.ebuild b/kde-apps/akonadi-socialutils/akonadi-socialutils-15.12.49.9999.ebuild
index 3580919..b3f3317 100644
--- a/kde-apps/akonadi-socialutils/akonadi-socialutils-15.12.49.9999.ebuild
+++ b/kde-apps/akonadi-socialutils/akonadi-socialutils-15.12.49.9999.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-KDE_TEST=true
-KMNAME=kdepimlibs
+KDE_TEST="true"
+KMNAME="kdepimlibs"
 inherit kde5
 
 DESCRIPTION="Library for social utils integration"
@@ -29,7 +29,8 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 "
 RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepimlibs
+	!kde-apps/kdepimlibs:4
+	!kde-apps/kdepimlibs:5
 "
 
 if [[ ${KDE_BUILD_TYPE} = live ]] ; then
@@ -37,10 +38,3 @@ if [[ ${KDE_BUILD_TYPE} = live ]] ; then
 else
 	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
 fi
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build test TESTING)
-	)
-	kde5_src_configure
-}

diff --git a/kde-apps/akonadi/akonadi-15.12.2.ebuild b/kde-apps/akonadi/akonadi-15.12.2.ebuild
new file mode 100644
index 0000000..b5ff99c
--- /dev/null
+++ b/kde-apps/akonadi/akonadi-15.12.2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST=true
+VIRTUALDBUS_TEST=true
+inherit kde5
+
+DESCRIPTION="Storage service for PIM data"
+HOMEPAGE="https://pim.kde.org/akonadi"
+KEYWORDS=" ~amd64 ~x86"
+LICENSE="LGPL-2.1"
+IUSE="+mysql postgres sqlite"
+
+REQUIRED_USE="|| ( sqlite mysql postgres )"
+
+CDEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql 'mysql?,postgres?')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	x11-misc/shared-mime-info
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${CDEPEND}
+	dev-libs/libxslt
+	test? ( sys-apps/dbus )
+"
+RDEPEND="${CDEPEND}
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+	!app-office/akonadi-server
+"
+
+PATCHES=( "${FILESDIR}/${PN}-15.12-mysql56-crash.patch" )
+
+pkg_setup() {
+	# Set default storage backend in order: MySQL, SQLite PostgreSQL
+	# reverse driver check to keep the order
+	if use postgres; then
+		DRIVER="QPSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use sqlite; then
+		DRIVER="QSQLITE3"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use mysql; then
+		DRIVER="QMYSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	# Notify about MySQL is recommend by upstream
+	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
+		ewarn
+		ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your"
+		ewarn "user configuration. This is the backend recommended by KDE upstream."
+		ewarn "In particular, kde-apps/kmail-4.10 does not work properly with the sqlite"
+		ewarn "backend anymore."
+		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
+		ewarn "Available drivers are:${AVAILABLE}"
+		ewarn
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	# Who knows, maybe it accidentally fixes our permission issues
+	cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+	insinto /usr/share/config/akonadi
+	doins "${T}"/akonadiserverrc
+
+	kde5_src_install
+}
+
+pkg_postinst() {
+	elog "${DRIVER} has been set as your default akonadi storage backend."
+	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are: ${AVAILABLE}"
+}

diff --git a/kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild b/kde-apps/akonadiconsole/akonadiconsole-15.12.2.ebuild
similarity index 50%
copy from kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild
copy to kde-apps/akonadiconsole/akonadiconsole-15.12.2.ebuild
index df69e69..9248f3a 100644
--- a/kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-15.12.2.ebuild
@@ -2,20 +2,20 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-KDE_TEST="false"
+KDE_HANDBOOK="false"
+KDE_PUNT_BOGUS_DEPS="true"
 KMNAME="kdepim"
 inherit kde5
 
-DESCRIPTION="Common PIM libraries"
-LICENSE="LGPL-2+"
-KEYWORDS=""
-IUSE="designer"
+DESCRIPTION="Akonadi developer console"
+HOMEPAGE="https://www.kde.org/"
+KEYWORDS=" ~amd64 ~x86"
 
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
+IUSE=""
+
+DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -23,55 +23,52 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kdelibs4support)
 	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kitemmodels)
 	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
+	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-contact)
-	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kimap)
 	$(add_kdeapps_dep kmime)
 	$(add_kdeapps_dep kpimtextedit)
 	$(add_kdeapps_dep libakonadi)
 	$(add_kdeapps_dep libkdepim)
-	dev-libs/libxslt
+	$(add_kdeapps_dep messageviewer)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebkit)
 	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-	designer? ( $(add_qt_dep designer) )
+	dev-libs/libxslt
 "
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/kdepim-15.08.50:5
-	!kde-apps/kdepim-common-libs:4
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-15.12.2:5
 "
 
 if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${PN}"
+	S="${WORKDIR}/${P}"
 else
-	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
+	S="${WORKDIR}/${KMNAME}-${PV}"
 fi
 
-PATCHES=( "${FILESDIR}/${PN}-15.12.0-find-qt5designer.patch" )
+src_prepare() {
+	kde5_src_prepare
+
+	# necessary for 15.12 branch aka split-in-adv-of-upstream
+	sed -e '/^include.*kleopatra\/ConfigureChecks/ s/^/#DONT/' \
+		-i CMakeLists.txt || die
+}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package designer Qt5Designer)
+		-DKDEPIM_BUILD_WITH_INSTALLED_LIB=TRUE
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=ON
 	)
+
 	kde5_src_configure
 }

diff --git a/kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild b/kde-apps/akregator/akregator-15.12.2.ebuild
similarity index 55%
copy from kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild
copy to kde-apps/akregator/akregator-15.12.2.ebuild
index df69e69..c120d39 100644
--- a/kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild
+++ b/kde-apps/akregator/akregator-15.12.2.ebuild
@@ -2,76 +2,81 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
+KDE_HANDBOOK="false"
+KDE_PIM_KONTACTPLUGIN="true"
 KDE_TEST="false"
 KMNAME="kdepim"
 inherit kde5
 
-DESCRIPTION="Common PIM libraries"
-LICENSE="LGPL-2+"
-KEYWORDS=""
-IUSE="designer"
+DESCRIPTION="News feed aggregator"
+HOMEPAGE="https://www.kde.org/applications/internet/akregator"
+KEYWORDS=" ~amd64 ~x86"
+
+IUSE=""
 
 COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep khtml)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
 	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_kdeapps_dep akonadi-contact)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kmime)
 	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libakonadi)
 	$(add_kdeapps_dep libkdepim)
-	dev-libs/libxslt
+	$(add_kdeapps_dep pimcommon)
+	$(add_kdeapps_dep syndication)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebkit)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
+	dev-libs/grantlee:5
+	dev-libs/libxslt
 "
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
-	designer? ( $(add_qt_dep designer) )
 "
 RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/kdepim-15.08.50:5
-	!kde-apps/kdepim-common-libs:4
+	!<kde-apps/kdepim-15.12.2:5
 "
 
 if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${PN}"
+	S="${WORKDIR}/${P}"
 else
-	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
+	S="${WORKDIR}/${KMNAME}-${PV}"
 fi
 
-PATCHES=( "${FILESDIR}/${PN}-15.12.0-find-qt5designer.patch" )
+src_prepare() {
+	kde5_src_prepare
+
+	sed -e '/^include.*kleopatra\/ConfigureChecks/ s/^/#DONT/' \
+		-i CMakeLists.txt || die
+}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package designer Qt5Designer)
+		-DKDEPIM_BUILD_WITH_INSTALLED_LIB=TRUE
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=ON
 	)
+
 	kde5_src_configure
 }

diff --git a/kde-apps/blogilo/blogilo-15.12.2.ebuild b/kde-apps/blogilo/blogilo-15.12.2.ebuild
new file mode 100644
index 0000000..f0bb86e
--- /dev/null
+++ b/kde-apps/blogilo/blogilo-15.12.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+KDE_PUNT_BOGUS_DEPS="true"
+KMNAME="kdepim"
+inherit kde5
+
+DESCRIPTION="KDE Blogging Client"
+HOMEPAGE="https://www.kde.org/applications/internet/blogilo"
+KEYWORDS=" ~amd64 ~x86"
+
+IUSE="google"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdewebkit)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep composereditor)
+	$(add_kdeapps_dep kblog)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	dev-libs/libxslt
+	google? ( net-libs/libkgapi:5 )
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-15.12.2:5
+"
+
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+	S="${WORKDIR}/${P}"
+else
+	S="${WORKDIR}/${KMNAME}-${PV}"
+fi
+
+src_prepare() {
+	kde5_src_prepare
+
+	# necessary for 15.12 branch aka split-in-adv-of-upstream
+	sed -e '/^include.*kleopatra\/ConfigureChecks/ s/^/#DONT/' \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDEPIM_BUILD_WITH_INSTALLED_LIB=TRUE
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=ON
+		$(cmake-utils_use_find_package google KF5GAPI)
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/calendarjanitor/calendarjanitor-15.12.2.ebuild b/kde-apps/calendarjanitor/calendarjanitor-15.12.2.ebuild
new file mode 100644
index 0000000..c71589e
--- /dev/null
+++ b/kde-apps/calendarjanitor/calendarjanitor-15.12.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_PUNT_BOGUS_DEPS="true"
+KDE_TEST="false"
+KMNAME="kdepim"
+inherit kde5
+
+DESCRIPTION="A tool to scan calendar data for buggy instances"
+HOMEPAGE="https://www.kde.org/"
+KEYWORDS=" ~amd64 ~x86"
+
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep kcalcore)
+	$(add_qt_dep qtwidgets)
+	dev-libs/libxslt
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-15.12.2:5
+"
+
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+	S="${WORKDIR}/${P}"
+else
+	S="${WORKDIR}/${KMNAME}-${PV}"
+fi
+
+PATCHES=( "${FILESDIR}/kdepim-console.patch" )
+
+src_prepare() {
+
+	sed -e '/^include.*kleopatra\/ConfigureChecks/ s/^/#DONT/' \
+		-i CMakeLists.txt || die
+
+	mv console/calendarjanitor calendarjanitor || die "Failed to move calendarjanitor"
+	mv console/konsolekalendar konsolekalendar || die "Failed to move konsolekalendar"
+
+	kde5_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDEPIM_BUILD_WITH_INSTALLED_LIB=TRUE
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=ON
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/calendarsupport/calendarsupport-15.12.49.9999.ebuild b/kde-apps/calendarsupport/calendarsupport-15.12.2.ebuild
similarity index 97%
copy from kde-apps/calendarsupport/calendarsupport-15.12.49.9999.ebuild
copy to kde-apps/calendarsupport/calendarsupport-15.12.2.ebuild
index 72694d3..5343db16 100644
--- a/kde-apps/calendarsupport/calendarsupport-15.12.49.9999.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="false"
@@ -11,7 +11,7 @@ inherit kde5
 
 DESCRIPTION="Calendar support library"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="

diff --git a/kde-apps/calendarsupport/calendarsupport-15.12.49.9999.ebuild b/kde-apps/calendarsupport/calendarsupport-15.12.49.9999.ebuild
index 72694d3..b7b78d3 100644
--- a/kde-apps/calendarsupport/calendarsupport-15.12.49.9999.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="false"

diff --git a/kde-apps/calendarsupport/calendarsupport-9999.ebuild b/kde-apps/calendarsupport/calendarsupport-9999.ebuild
index 3699c00..7dbdd2f 100644
--- a/kde-apps/calendarsupport/calendarsupport-9999.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="false"

diff --git a/kde-apps/composereditor/composereditor-15.12.49.9999.ebuild b/kde-apps/composereditor/composereditor-15.12.2.ebuild
similarity index 72%
copy from kde-apps/composereditor/composereditor-15.12.49.9999.ebuild
copy to kde-apps/composereditor/composereditor-15.12.2.ebuild
index 1a3fa8b..74ca1d9 100644
--- a/kde-apps/composereditor/composereditor-15.12.49.9999.ebuild
+++ b/kde-apps/composereditor/composereditor-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 MY_PN="${PN}-ng"
 KDE_TEST="false"
@@ -11,7 +11,7 @@ inherit kde5
 
 DESCRIPTION="Composer editor for KDE PIM"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
@@ -43,8 +43,16 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-common-libs:4
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${MY_PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${MY_PN}"
-fi
+src_prepare() {
+	if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+		S="${WORKDIR}/${P}/${PN}"
+		mv "${WORKDIR}/${P}/${MY_PN}" "${S}" \
+			|| die "Failed to prepare source directory"
+	else
+		S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
+		mv "${WORKDIR}/${KMNAME}-${PV}/${MY_PN}" "${S}" \
+			|| die "Failed to prepare source directory"
+	fi
+
+	kde5_src_prepare
+}

diff --git a/kde-apps/composereditor/composereditor-15.12.49.9999.ebuild b/kde-apps/composereditor/composereditor-15.12.49.9999.ebuild
index 1a3fa8b..4e001bc 100644
--- a/kde-apps/composereditor/composereditor-15.12.49.9999.ebuild
+++ b/kde-apps/composereditor/composereditor-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 MY_PN="${PN}-ng"
 KDE_TEST="false"
@@ -43,8 +43,16 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-common-libs:4
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${MY_PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${MY_PN}"
-fi
+src_prepare() {
+	if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+		S="${WORKDIR}/${P}/${PN}"
+		mv "${WORKDIR}/${P}/${MY_PN}" "${S}" \
+			|| die "Failed to prepare source directory"
+	else
+		S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
+		mv "${WORKDIR}/${KMNAME}-${PV}/${MY_PN}" "${S}" \
+			|| die "Failed to prepare source directory"
+	fi
+
+	kde5_src_prepare
+}

diff --git a/kde-apps/eventviews/eventviews-15.12.49.9999.ebuild b/kde-apps/eventviews/eventviews-15.12.2.ebuild
similarity index 97%
copy from kde-apps/eventviews/eventviews-15.12.49.9999.ebuild
copy to kde-apps/eventviews/eventviews-15.12.2.ebuild
index 6a3b238..baf3389 100644
--- a/kde-apps/eventviews/eventviews-15.12.49.9999.ebuild
+++ b/kde-apps/eventviews/eventviews-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 KMNAME="kdepim"
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Calendar viewer for KDE PIM"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="

diff --git a/kde-apps/eventviews/eventviews-15.12.49.9999.ebuild b/kde-apps/eventviews/eventviews-15.12.49.9999.ebuild
index 6a3b238..cda6535 100644
--- a/kde-apps/eventviews/eventviews-15.12.49.9999.ebuild
+++ b/kde-apps/eventviews/eventviews-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 KMNAME="kdepim"

diff --git a/kde-apps/eventviews/eventviews-9999.ebuild b/kde-apps/eventviews/eventviews-9999.ebuild
index 2729ec4..5e32c89 100644
--- a/kde-apps/eventviews/eventviews-9999.ebuild
+++ b/kde-apps/eventviews/eventviews-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 inherit kde5

diff --git a/kde-apps/gpgmepp/gpgmepp-15.12.49.9999.ebuild b/kde-apps/gpgmepp/gpgmepp-15.12.2.ebuild
similarity index 90%
copy from kde-apps/gpgmepp/gpgmepp-15.12.49.9999.ebuild
copy to kde-apps/gpgmepp/gpgmepp-15.12.2.ebuild
index 403e32e..b84af51 100644
--- a/kde-apps/gpgmepp/gpgmepp-15.12.49.9999.ebuild
+++ b/kde-apps/gpgmepp/gpgmepp-15.12.2.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_BLOCK_SLOT4="false"
 inherit kde5
 
 DESCRIPTION="C++ bindings for gpgme"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 RDEPEND="

diff --git a/kde-apps/gpgmepp/gpgmepp-15.12.49.9999.ebuild b/kde-apps/gpgmepp/gpgmepp-15.12.49.9999.ebuild
index 403e32e..a38d23e 100644
--- a/kde-apps/gpgmepp/gpgmepp-15.12.49.9999.ebuild
+++ b/kde-apps/gpgmepp/gpgmepp-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_BLOCK_SLOT4="false"
 inherit kde5

diff --git a/kde-apps/gpgmepp/gpgmepp-9999.ebuild b/kde-apps/gpgmepp/gpgmepp-9999.ebuild
index 403e32e..a38d23e 100644
--- a/kde-apps/gpgmepp/gpgmepp-9999.ebuild
+++ b/kde-apps/gpgmepp/gpgmepp-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_BLOCK_SLOT4="false"
 inherit kde5

diff --git a/kde-apps/grantleetheme/grantleetheme-15.12.49.9999.ebuild b/kde-apps/grantleetheme/grantleetheme-15.12.2.ebuild
similarity index 96%
copy from kde-apps/grantleetheme/grantleetheme-15.12.49.9999.ebuild
copy to kde-apps/grantleetheme/grantleetheme-15.12.2.ebuild
index 9d6b0e4..fb6597b 100644
--- a/kde-apps/grantleetheme/grantleetheme-15.12.49.9999.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 KMNAME="kdepim"
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Library for Grantlee plugins"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="

diff --git a/kde-apps/grantleetheme/grantleetheme-15.12.49.9999.ebuild b/kde-apps/grantleetheme/grantleetheme-15.12.49.9999.ebuild
index 9d6b0e4..94a8c67 100644
--- a/kde-apps/grantleetheme/grantleetheme-15.12.49.9999.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 KMNAME="kdepim"

diff --git a/kde-apps/grantleetheme/grantleetheme-9999.ebuild b/kde-apps/grantleetheme/grantleetheme-9999.ebuild
index 9b42567..883e6f4 100644
--- a/kde-apps/grantleetheme/grantleetheme-9999.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 inherit kde5

diff --git a/kde-apps/incidenceeditor/incidenceeditor-15.12.49.9999.ebuild b/kde-apps/incidenceeditor/incidenceeditor-15.12.2.ebuild
similarity index 80%
copy from kde-apps/incidenceeditor/incidenceeditor-15.12.49.9999.ebuild
copy to kde-apps/incidenceeditor/incidenceeditor-15.12.2.ebuild
index 03b6f46..be007b2 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-15.12.49.9999.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 MY_PN="${PN}-ng"
 KDE_TEST="true"
@@ -11,7 +11,7 @@ inherit kde5
 
 DESCRIPTION="Incidence editor for korganizer"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
@@ -60,8 +60,16 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-common-libs:4
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${MY_PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${MY_PN}"
-fi
+src_prepare() {
+	if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+		S="${WORKDIR}/${P}/${PN}"
+		mv "${WORKDIR}/${P}/${MY_PN}" "${S}" \
+			|| die "Failed to prepare source directory"
+	else
+		S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
+		mv "${WORKDIR}/${KMNAME}-${PV}/${MY_PN}" "${S}" \
+			|| die "Failed to prepare source directory"
+	fi
+
+	kde5_src_prepare
+}

diff --git a/kde-apps/incidenceeditor/incidenceeditor-15.12.49.9999.ebuild b/kde-apps/incidenceeditor/incidenceeditor-15.12.49.9999.ebuild
index 03b6f46..9c3e402 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-15.12.49.9999.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 MY_PN="${PN}-ng"
 KDE_TEST="true"
@@ -60,8 +60,16 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-common-libs:4
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${MY_PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${MY_PN}"
-fi
+src_prepare() {
+	if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+		S="${WORKDIR}/${P}/${PN}"
+		mv "${WORKDIR}/${P}/${MY_PN}" "${S}" \
+			|| die "Failed to prepare source directory"
+	else
+		S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
+		mv "${WORKDIR}/${KMNAME}-${PV}/${MY_PN}" "${S}" \
+			|| die "Failed to prepare source directory"
+	fi
+
+	kde5_src_prepare
+}

diff --git a/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild b/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
index eb0e927..b3f6ae3 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 inherit kde5

diff --git a/kde-apps/kaddressbook/kaddressbook-15.12.2.ebuild b/kde-apps/kaddressbook/kaddressbook-15.12.2.ebuild
new file mode 100644
index 0000000..7ccc19a
--- /dev/null
+++ b/kde-apps/kaddressbook/kaddressbook-15.12.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="false"
+KDE_PIM_KONTACTPLUGIN="true"
+KDE_TEST="true"
+KMNAME="kdepim"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="The KDE Address Book"
+HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/"
+KEYWORDS=" ~amd64 ~x86"
+
+IUSE="prison"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep gpgmepp)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	dev-libs/grantlee:5
+	dev-libs/libxslt
+	prison? ( media-libs/prison:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+	test? (
+		$(add_kdeapps_dep akonadi sqlite)
+		$(add_kdeapps_dep libakonadi tools)
+		$(add_qt_dep qtsql 'sqlite')
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kdepim-15.12.2:5
+	$(add_kdeapps_dep kdepim)
+	$(add_kdeapps_dep kdepim-runtime)
+"
+
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+	S="${WORKDIR}/${P}"
+else
+	S="${WORKDIR}/${KMNAME}-${PV}"
+fi
+
+src_prepare() {
+	kde5_src_prepare
+
+	sed -e '/^include.*kleopatra\/ConfigureChecks/ s/^/#DONT/' \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDEPIM_BUILD_WITH_INSTALLED_LIB=TRUE
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=ON
+		$(cmake-utils_use_find_package prison KF5Prison)
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-15.12.49.9999.ebuild b/kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-15.12.2.ebuild
similarity index 97%
copy from kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-15.12.49.9999.ebuild
copy to kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-15.12.2.ebuild
index 1a438b0..9f54dd8 100644
--- a/kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-15.12.49.9999.ebuild
+++ b/kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="false"
 KMNAME="kdepim"
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Grantlee templating for kaddressbook"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE="prison"
 
 COMMON_DEPEND="

diff --git a/kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-15.12.49.9999.ebuild b/kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-15.12.49.9999.ebuild
index 1a438b0..37518d0 100644
--- a/kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-15.12.49.9999.ebuild
+++ b/kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="false"
 KMNAME="kdepim"

diff --git a/kde-apps/kalarmcal/kalarmcal-15.12.49.9999.ebuild b/kde-apps/kalarmcal/kalarmcal-15.12.2.ebuild
similarity index 94%
copy from kde-apps/kalarmcal/kalarmcal-15.12.49.9999.ebuild
copy to kde-apps/kalarmcal/kalarmcal-15.12.2.ebuild
index 6b0d3fc..78d67b0 100644
--- a/kde-apps/kalarmcal/kalarmcal-15.12.49.9999.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-15.12.2.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit kde5
 
 DESCRIPTION="Client library to access and handling of KAlarm calendar data"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 RDEPEND="

diff --git a/kde-apps/kalarmcal/kalarmcal-15.12.49.9999.ebuild b/kde-apps/kalarmcal/kalarmcal-15.12.49.9999.ebuild
index 6b0d3fc..b310430 100644
--- a/kde-apps/kalarmcal/kalarmcal-15.12.49.9999.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit kde5
 

diff --git a/kde-apps/kalarmcal/kalarmcal-9999.ebuild b/kde-apps/kalarmcal/kalarmcal-9999.ebuild
index 41d9f54..29d61a2 100644
--- a/kde-apps/kalarmcal/kalarmcal-9999.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit kde5
 

diff --git a/kde-apps/kblog/kblog-9999.ebuild b/kde-apps/kblog/kblog-15.12.2.ebuild
similarity index 94%
copy from kde-apps/kblog/kblog-9999.ebuild
copy to kde-apps/kblog/kblog-15.12.2.ebuild
index b782e93..8889217 100644
--- a/kde-apps/kblog/kblog-9999.ebuild
+++ b/kde-apps/kblog/kblog-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Library providing client-side support for web application remote blogging APIs"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 RDEPEND="

diff --git a/kde-apps/kblog/kblog-15.12.49.9999.ebuild b/kde-apps/kblog/kblog-15.12.49.9999.ebuild
index b782e93..a5929d7 100644
--- a/kde-apps/kblog/kblog-15.12.49.9999.ebuild
+++ b/kde-apps/kblog/kblog-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"

diff --git a/kde-apps/kblog/kblog-9999.ebuild b/kde-apps/kblog/kblog-9999.ebuild
index b782e93..a5929d7 100644
--- a/kde-apps/kblog/kblog-9999.ebuild
+++ b/kde-apps/kblog/kblog-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"

diff --git a/kde-apps/kcalcore/kcalcore-9999.ebuild b/kde-apps/kcalcore/kcalcore-15.12.2.ebuild
similarity index 94%
copy from kde-apps/kcalcore/kcalcore-9999.ebuild
copy to kde-apps/kcalcore/kcalcore-15.12.2.ebuild
index d4843de..96fc86d 100644
--- a/kde-apps/kcalcore/kcalcore-9999.ebuild
+++ b/kde-apps/kcalcore/kcalcore-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"
@@ -11,7 +11,7 @@ inherit kde5
 
 DESCRIPTION="Library for handling calendar data"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 DEPEND="

diff --git a/kde-apps/kcalcore/kcalcore-15.12.49.9999.ebuild b/kde-apps/kcalcore/kcalcore-15.12.49.9999.ebuild
index d4843de..a118695 100644
--- a/kde-apps/kcalcore/kcalcore-15.12.49.9999.ebuild
+++ b/kde-apps/kcalcore/kcalcore-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"

diff --git a/kde-apps/kcalcore/kcalcore-9999.ebuild b/kde-apps/kcalcore/kcalcore-9999.ebuild
index d4843de..a118695 100644
--- a/kde-apps/kcalcore/kcalcore-9999.ebuild
+++ b/kde-apps/kcalcore/kcalcore-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"

diff --git a/kde-apps/kcalutils/kcalutils-9999.ebuild b/kde-apps/kcalutils/kcalutils-15.12.2.ebuild
similarity index 96%
copy from kde-apps/kcalutils/kcalutils-9999.ebuild
copy to kde-apps/kcalutils/kcalutils-15.12.2.ebuild
index 2958ee4..15049ec 100644
--- a/kde-apps/kcalutils/kcalutils-9999.ebuild
+++ b/kde-apps/kcalutils/kcalutils-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"
@@ -11,7 +11,7 @@ inherit kde5
 
 DESCRIPTION="Library providing utility functions for the handling of calendar data"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="

diff --git a/kde-apps/kcalutils/kcalutils-15.12.49.9999.ebuild b/kde-apps/kcalutils/kcalutils-15.12.49.9999.ebuild
index 2958ee4..36d0c69 100644
--- a/kde-apps/kcalutils/kcalutils-15.12.49.9999.ebuild
+++ b/kde-apps/kcalutils/kcalutils-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"

diff --git a/kde-apps/kcalutils/kcalutils-9999.ebuild b/kde-apps/kcalutils/kcalutils-9999.ebuild
index 2958ee4..36d0c69 100644
--- a/kde-apps/kcalutils/kcalutils-9999.ebuild
+++ b/kde-apps/kcalutils/kcalutils-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"

diff --git a/kde-apps/kcontacts/kcontacts-15.12.49.9999.ebuild b/kde-apps/kcontacts/kcontacts-15.12.2.ebuild
similarity index 95%
copy from kde-apps/kcontacts/kcontacts-15.12.49.9999.ebuild
copy to kde-apps/kcontacts/kcontacts-15.12.2.ebuild
index 34fea42..555e9b1 100644
--- a/kde-apps/kcontacts/kcontacts-15.12.49.9999.ebuild
+++ b/kde-apps/kcontacts/kcontacts-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"
@@ -11,7 +11,7 @@ inherit kde5
 
 DESCRIPTION="Address book API for KDE"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 RDEPEND="

diff --git a/kde-apps/kcontacts/kcontacts-15.12.49.9999.ebuild b/kde-apps/kcontacts/kcontacts-15.12.49.9999.ebuild
index 34fea42..85c11a5 100644
--- a/kde-apps/kcontacts/kcontacts-15.12.49.9999.ebuild
+++ b/kde-apps/kcontacts/kcontacts-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"

diff --git a/kde-apps/kcontacts/kcontacts-9999.ebuild b/kde-apps/kcontacts/kcontacts-9999.ebuild
index 34fea42..85c11a5 100644
--- a/kde-apps/kcontacts/kcontacts-9999.ebuild
+++ b/kde-apps/kcontacts/kcontacts-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"

diff --git a/kde-apps/kdepim-kioslaves/kdepim-kioslaves-9999.ebuild b/kde-apps/kdepim-kioslaves/kdepim-kioslaves-15.12.2.ebuild
similarity index 93%
copy from kde-apps/kdepim-kioslaves/kdepim-kioslaves-9999.ebuild
copy to kde-apps/kdepim-kioslaves/kdepim-kioslaves-15.12.2.ebuild
index 50a5f42..8c368a2 100644
--- a/kde-apps/kdepim-kioslaves/kdepim-kioslaves-9999.ebuild
+++ b/kde-apps/kdepim-kioslaves/kdepim-kioslaves-15.12.2.ebuild
@@ -4,16 +4,15 @@
 
 EAPI=6
 
-FRAMEWORKS_MINIMAL="5.19.0"
 KDE_DOC_DIR="docs"
 KDE_HANDBOOK="true"
 KDE_TEST="true"
 KMNAME="kdepimlibs"
-VIRTUALX_REQUIRED=test
+VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Kioslave plugins for various PIM apps"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 LICENSE="LGPL-2.1"
 IUSE="ssl"
 

diff --git a/kde-apps/kdepim-kioslaves/kdepim-kioslaves-15.12.49.9999.ebuild b/kde-apps/kdepim-kioslaves/kdepim-kioslaves-15.12.49.9999.ebuild
index f145674..933aff9 100644
--- a/kde-apps/kdepim-kioslaves/kdepim-kioslaves-15.12.49.9999.ebuild
+++ b/kde-apps/kdepim-kioslaves/kdepim-kioslaves-15.12.49.9999.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-KDE_DOC_DIR=docs
-KDE_HANDBOOK=true
-KDE_TEST=true
-KMNAME=kdepimlibs
-VIRTUALX_REQUIRED=test
+KDE_DOC_DIR="docs"
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+KMNAME="kdepimlibs"
+VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Kioslave plugins for various PIM apps"
@@ -31,7 +31,8 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 "
 RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepimlibs
+	!kde-apps/kdepimlibs:4
+	!kde-apps/kdepimlibs:5
 "
 
 if [[ ${KDE_BUILD_TYPE} = live ]] ; then
@@ -43,7 +44,6 @@ fi
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package ssl Sasl2)
-		$(cmake-utils_use_build test TESTING)
 	)
 	kde5_src_configure
 }

diff --git a/kde-apps/kdepim-kioslaves/kdepim-kioslaves-9999.ebuild b/kde-apps/kdepim-kioslaves/kdepim-kioslaves-9999.ebuild
index 50a5f42..2445cec 100644
--- a/kde-apps/kdepim-kioslaves/kdepim-kioslaves-9999.ebuild
+++ b/kde-apps/kdepim-kioslaves/kdepim-kioslaves-9999.ebuild
@@ -9,7 +9,7 @@ KDE_DOC_DIR="docs"
 KDE_HANDBOOK="true"
 KDE_TEST="true"
 KMNAME="kdepimlibs"
-VIRTUALX_REQUIRED=test
+VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Kioslave plugins for various PIM apps"

diff --git a/kde-apps/kdepim-l10n/kdepim-l10n-15.12.2.ebuild b/kde-apps/kdepim-l10n/kdepim-l10n-15.12.2.ebuild
new file mode 100644
index 0000000..528b77e
--- /dev/null
+++ b/kde-apps/kdepim-l10n/kdepim-l10n-15.12.2.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="KDE PIM internationalization package"
+HOMEPAGE="http://l10n.kde.org"
+
+DEPEND="
+	$(add_frameworks_dep ki18n)
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+"
+RDEPEND="
+	!<kde-apps/kde-l10n-15.08.0-r1
+	!<kde-apps/kde4-l10n-4.14.3-r1
+	!kde-base/kdepim-l10n
+"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.xz::' -e 's:kde-l10n-::' |tr '\n' ' '
+MY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl
+he hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt_BR ro ru
+sk sl sr sv tr ug uk wa zh_CN zh_TW"
+
+PIM_L10N="kdepim kdepimlibs kdepim-runtime pim"
+
+URI_BASE="${SRC_URI/-${PV}.tar.xz/}"
+SRC_URI=""
+
+for MY_LANG in ${MY_LANGS} ; do
+	IUSE="${IUSE} linguas_${MY_LANG}"
+	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE/kdepim/kde}/kde-l10n-${MY_LANG}-${PV}.tar.xz )"
+done
+
+S="${WORKDIR}"
+
+src_unpack() {
+	if [[ -z ${A} ]]; then
+		elog
+		elog "You either have the LINGUAS variable unset, or it only"
+		elog "contains languages not supported by ${P}."
+		elog "You won't have any additional language support."
+		elog
+		elog "${P} supports these language codes:"
+		elog "${MY_LANGS}"
+		elog
+	fi
+
+	[[ -n ${A} ]] && unpack ${A}
+}
+
+src_prepare() {
+	local LNG DIR
+	# add all linguas to cmake
+	if [[ -n ${A} ]]; then
+		eapply_user
+		for LNG in ${LINGUAS}; do
+			DIR="kde-l10n-${LNG}-${PV}"
+			SDIR="${S}/${DIR}/5/${LNG}"
+			if [[ -d "${DIR}" ]] ; then
+				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
+
+				# Drop KDE4-based part
+				sed -e '/add_subdirectory(4)/ s/^/#/'\
+					-i "${S}"/${DIR}/CMakeLists.txt || die
+
+				# Remove everything except kdepim, kdepimlibs, kdepim-runtime and pim
+				for SUBDIR in data docs messages scripts ; do
+					if [[ -d "${SDIR}/${SUBDIR}" ]] ; then
+						einfo "   ${SUBDIR} subdirectory"
+						echo > "${SDIR}/${SUBDIR}/CMakeLists.txt"
+						for pim in ${PIM_L10N}; do
+							[[ -d "${SDIR}/${SUBDIR}/${pim}" ]] && \
+								( echo "add_subdirectory(${pim})" >> "${SDIR}/${SUBDIR}/CMakeLists.txt" )
+						done
+					fi
+				done
+
+				# In some cases we may have sub-lingua subdirs, e.g. sr :(
+				for XSUBDIR in "${SDIR}/${LNG}"@* ; do
+					XLNG=$(echo ${XSUBDIR}|sed -e 's:^.*/::')
+					if [[ -d "${XSUBDIR}" ]] ; then
+						einfo "   ${XLNG} variant"
+						# remove everything except kdepim and kdepim-runtime
+						for SUBDIR in data docs messages scripts ; do
+							if [[ -d "${XSUBDIR}/${SUBDIR}" ]] ; then
+								einfo "      ${SUBDIR} subdirectory"
+								echo > "${XSUBDIR}/${SUBDIR}/CMakeLists.txt"
+								for pim in ${PIM_L10N}; do
+									[[ -d "${XSUBDIR}/${SUBDIR}/${pim}" ]] && \
+										( echo "add_subdirectory(${pim})" >> "${XSUBDIR}/${SUBDIR}/CMakeLists.txt" )
+								done
+							fi
+						done
+					fi
+				done
+
+				# Handbook optional
+				sed -e '/KF5DocTools/ s/ REQUIRED//'\
+					-i "${SDIR}"/CMakeLists.txt || die
+				if ! use handbook ; then
+					sed -e '/add_subdirectory(docs)/ s/^/#/'\
+						-i "${SDIR}"/CMakeLists.txt || die
+				fi
+
+				# Fix broken LINGUAS=sr (KDE4 leftover)
+				if [[ ${LNG} = "sr" ]] ; then
+					sed -e '/add_subdirectory(lokalize)/ s/^/#/'\
+						-i "${SDIR}"/data/kdesdk/CMakeLists.txt || die
+				fi
+			fi
+		done
+	fi
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_find_package handbook KF5DocTools)
+	)
+	[[ -n ${A} ]] && kde5_src_configure
+}
+
+src_compile() {
+	[[ -n ${A} ]] && kde5_src_compile
+}
+
+src_test() {
+	[[ -n ${A} ]] && kde5_src_test
+}
+
+src_install() {
+	[[ -n ${A} ]] && kde5_src_install
+}

diff --git a/kde-apps/kdepim-meta/kdepim-meta-15.12.2.ebuild b/kde-apps/kdepim-meta/kdepim-meta-15.12.2.ebuild
new file mode 100644
index 0000000..1de1df2
--- /dev/null
+++ b/kde-apps/kdepim-meta/kdepim-meta-15.12.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
+HOMEPAGE="https://www.kde.org/applications/development"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="nls"
+
+[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
+
+RDEPEND="
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadiconsole)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep akonadi-socialutils)
+	$(add_kdeapps_dep akregator)
+	$(add_kdeapps_dep blogilo)
+	$(add_kdeapps_dep calendarjanitor)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep composereditor)
+	$(add_kdeapps_dep eventviews)
+	$(add_kdeapps_dep gpgmepp)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep incidenceeditor)
+	$(add_kdeapps_dep kaddressbook)
+	$(add_kdeapps_dep kaddressbookgrantlee)
+	$(add_kdeapps_dep kalarmcal)
+	$(add_kdeapps_dep kblog)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim)
+	$(add_kdeapps_dep kdepim-kioslaves)
+	$(add_kdeapps_dep kdepim-runtime)
+	$(add_kdeapps_dep kdgantt2)
+	$(add_kdeapps_dep kholidays)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kimap)
+	$(add_kdeapps_dep kldap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmbox)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep knotes)
+	$(add_kdeapps_dep konsolekalendar)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep ktnef)
+	$(add_kdeapps_dep libakonadi)
+	$(add_kdeapps_dep libfollowupreminder)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkdepimdbusinterfaces)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep libksieve)
+	$(add_kdeapps_dep libktnef)
+	$(add_kdeapps_dep libsendlater)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep mailimporter)
+	$(add_kdeapps_dep messagecomposer)
+	$(add_kdeapps_dep messagecore)
+	$(add_kdeapps_dep messagelist)
+	$(add_kdeapps_dep messageviewer)
+	$(add_kdeapps_dep pimcommon)
+	$(add_kdeapps_dep syndication)
+	$(add_kdeapps_dep templateparser)
+	nls? (
+		$(add_kdeapps_dep kdepim-l10n '' ${L10N_MINIMAL})
+	)
+"

diff --git a/kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-15.12.2.ebuild
similarity index 54%
copy from kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild
copy to kde-apps/kdepim-runtime/kdepim-runtime-15.12.2.ebuild
index df69e69..af89713 100644
--- a/kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-15.12.2.ebuild
@@ -2,19 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-KDE_TEST="false"
-KMNAME="kdepim"
 inherit kde5
 
-DESCRIPTION="Common PIM libraries"
-LICENSE="LGPL-2+"
-KEYWORDS=""
-IUSE="designer"
+DESCRIPTION="KDE PIM runtime plugin collection"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="google"
 
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
+# TODO kolab, Qt5TextToSpeech
+
+CDEPEND="
+	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -23,55 +22,60 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kdelibs4support)
 	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kitemmodels)
 	$(add_frameworks_dep kitemviews)
 	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
 	$(add_kdeapps_dep akonadi-contact)
 	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep akonadi-socialutils)
+	$(add_kdeapps_dep kalarmcal)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
 	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kimap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmbox)
 	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
 	$(add_kdeapps_dep libakonadi)
-	$(add_kdeapps_dep libkdepim)
-	dev-libs/libxslt
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebkit)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+	dev-libs/libical:=
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${CDEPEND}
+	$(add_frameworks_dep kross)
+	dev-libs/cyrus-sasl:2
+	dev-libs/libxml2:2
+	dev-libs/libxslt
 	sys-devel/gettext
-	designer? ( $(add_qt_dep designer) )
+	x11-misc/shared-mime-info
+	google? ( >=net-libs/libkgapi-5.1.0:5 )
 "
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/kdepim-15.08.50:5
-	!kde-apps/kdepim-common-libs:4
+RDEPEND="${CDEPEND}
+	!kde-apps/kdepim-runtime:4
+	|| ( $(add_kdeapps_dep kdepim-icons) $(add_frameworks_dep oxygen-icons) )
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
-fi
-
-PATCHES=( "${FILESDIR}/${PN}-15.12.0-find-qt5designer.patch" )
-
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package designer Qt5Designer)
+		$(cmake-utils_use_find_package google KF5GAPI)
 	)
+
 	kde5_src_configure
 }

diff --git a/kde-apps/kdepim/kdepim-15.12.2.ebuild b/kde-apps/kdepim/kdepim-15.12.2.ebuild
new file mode 100644
index 0000000..73e4131
--- /dev/null
+++ b/kde-apps/kdepim/kdepim-15.12.2.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PIM_FTS="kalarm kleopatra kmail kontact korganizer"
+
+KDE_HANDBOOK="true"
+KDE_PIM_KEEP_SUBDIR="${PIM_FTS} accountwizard agents grantleeeditor importwizard korgac
+mboximporter pimsettingexporter plugins sieveeditor storageservicemanager"
+KDE_PIM_KONTACTPLUGIN="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Personal Information Management Suite"
+HOMEPAGE="https://www.kde.org/applications/office/kontact/"
+KEYWORDS=" ~amd64 ~x86"
+
+IUSE="$(printf 'kdepim_features_%s ' ${PIM_FTS})"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdewebkit)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep kxmlrpcclient)
+	$(add_frameworks_dep sonnet)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep akonadi-socialutils)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep composereditor)
+	$(add_kdeapps_dep eventviews)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep incidenceeditor)
+	$(add_kdeapps_dep kaddressbookgrantlee)
+	$(add_kdeapps_dep kalarmcal)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-kioslaves)
+	$(add_kdeapps_dep kdgantt2)
+	$(add_kdeapps_dep kholidays)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kimap)
+	$(add_kdeapps_dep kldap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmbox)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libakonadi)
+	$(add_kdeapps_dep libfollowupreminder)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkdepimdbusinterfaces)
+	$(add_kdeapps_dep libksieve)
+	$(add_kdeapps_dep libsendlater)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep mailimporter)
+	$(add_kdeapps_dep messagecomposer)
+	$(add_kdeapps_dep messagecore)
+	$(add_kdeapps_dep messagelist)
+	$(add_kdeapps_dep messageviewer)
+	$(add_kdeapps_dep pimcommon)
+	$(add_kdeapps_dep syndication)
+	$(add_kdeapps_dep templateparser)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtopengl)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	dev-libs/boost:=
+	dev-libs/grantlee:5
+	dev-libs/libxslt
+	media-libs/phonon[qt5]
+	kdepim_features_kleopatra? (
+		$(add_kdeapps_dep gpgmepp)
+		$(add_kdeapps_dep libkleo)
+		>=app-crypt/gpgme-1.3.2
+		dev-libs/libassuan
+		dev-libs/libgpg-error
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+	test? (
+		$(add_kdeapps_dep akonadi sqlite)
+		$(add_kdeapps_dep libakonadi tools)
+		$(add_qt_dep qtsql 'sqlite')
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kabcclient:4
+	!kde-apps/kalarm:4
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-runtime:4
+	!kde-apps/kjots:4
+	!kde-apps/kleopatra:4
+	!kde-apps/kmail:4
+	!kde-apps/knode:4
+	!kde-apps/kontact:4
+	!kde-apps/korganizer:4
+	!kde-apps/ktimetracker:4
+	$(add_kdeapps_dep kdepim-runtime)
+	kdepim_features_kleopatra? ( app-crypt/gnupg )
+"
+# kontact: summary plugin; kalarm: email scheduler
+REQUIRED_USE="
+	kdepim_features_kontact? ( kdepim_features_kmail )
+	kdepim_features_kalarm? ( kdepim_features_kmail )
+"
+
+src_prepare() {
+	kde5_src_prepare
+
+	rm -r agents/notesagent || die "Failed to remove split notesagent"
+	sed -e '/add_subdirectory(notesagent)/ s/^/#DONT/' \
+		-i agents/CMakeLists.txt || die
+
+	sed -i \
+		-e "/akregator/ s/^/#DONT/" \
+		-e "/blogilo/ s/^/#DONT/" \
+		-e "/kleopatra/ s/^/#DONT/" \
+		-e "/knotes/ s/^/#DONT/" \
+		-e "/konsolekalendar/ s/^/#DONT/" \
+		-e "/ktnef/ s/^/#DONT/" \
+		doc/CMakeLists.txt || die "Failed to disable split docs"
+
+	# applications
+	for pim_ft in ${PIM_FTS}; do
+		use kdepim_features_${pim_ft} || cmake_comment_add_subdirectory ${pim_ft}
+	done
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDEPIM_BUILD_WITH_INSTALLED_LIB=TRUE
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/kdgantt2/kdgantt2-15.12.49.9999.ebuild b/kde-apps/kdgantt2/kdgantt2-15.12.2.ebuild
similarity index 94%
copy from kde-apps/kdgantt2/kdgantt2-15.12.49.9999.ebuild
copy to kde-apps/kdgantt2/kdgantt2-15.12.2.ebuild
index 649f766..ce91061 100644
--- a/kde-apps/kdgantt2/kdgantt2-15.12.49.9999.ebuild
+++ b/kde-apps/kdgantt2/kdgantt2-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="false"
@@ -11,7 +11,7 @@ inherit kde5
 
 DESCRIPTION="KDGantt library"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="

diff --git a/kde-apps/kdgantt2/kdgantt2-15.12.49.9999.ebuild b/kde-apps/kdgantt2/kdgantt2-15.12.49.9999.ebuild
index 649f766..adbbf9e 100644
--- a/kde-apps/kdgantt2/kdgantt2-15.12.49.9999.ebuild
+++ b/kde-apps/kdgantt2/kdgantt2-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="false"

diff --git a/kde-apps/kdgantt2/kdgantt2-9999.ebuild b/kde-apps/kdgantt2/kdgantt2-9999.ebuild
index 68ad5a4..59fb519 100644
--- a/kde-apps/kdgantt2/kdgantt2-9999.ebuild
+++ b/kde-apps/kdgantt2/kdgantt2-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="false"

diff --git a/kde-apps/kholidays/kholidays-9999.ebuild b/kde-apps/kholidays/kholidays-15.12.2.ebuild
similarity index 90%
copy from kde-apps/kholidays/kholidays-9999.ebuild
copy to kde-apps/kholidays/kholidays-15.12.2.ebuild
index b551cad..68a0880 100644
--- a/kde-apps/kholidays/kholidays-9999.ebuild
+++ b/kde-apps/kholidays/kholidays-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Library to determine holidays and other special events for a geographical region"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 DEPEND=""

diff --git a/kde-apps/kholidays/kholidays-15.12.49.9999.ebuild b/kde-apps/kholidays/kholidays-15.12.49.9999.ebuild
index b551cad..f63961c 100644
--- a/kde-apps/kholidays/kholidays-15.12.49.9999.ebuild
+++ b/kde-apps/kholidays/kholidays-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"

diff --git a/kde-apps/kholidays/kholidays-9999.ebuild b/kde-apps/kholidays/kholidays-9999.ebuild
index b551cad..f63961c 100644
--- a/kde-apps/kholidays/kholidays-9999.ebuild
+++ b/kde-apps/kholidays/kholidays-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"

diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-15.12.2.ebuild
similarity index 95%
copy from kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild
copy to kde-apps/kidentitymanagement/kidentitymanagement-15.12.2.ebuild
index a611d8a..6e0d2b4 100644
--- a/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Library for managing identitites"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 RDEPEND="

diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-15.12.49.9999.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-15.12.49.9999.ebuild
index a611d8a..a648169 100644
--- a/kde-apps/kidentitymanagement/kidentitymanagement-15.12.49.9999.ebuild
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 VIRTUALX_REQUIRED="test"

diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild
index a611d8a..a648169 100644
--- a/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 VIRTUALX_REQUIRED="test"

diff --git a/kde-apps/kimap/kimap-15.12.49.9999.ebuild b/kde-apps/kimap/kimap-15.12.2.ebuild
similarity index 93%
copy from kde-apps/kimap/kimap-15.12.49.9999.ebuild
copy to kde-apps/kimap/kimap-15.12.2.ebuild
index 3f830e7..a2cd2a1 100644
--- a/kde-apps/kimap/kimap-15.12.49.9999.ebuild
+++ b/kde-apps/kimap/kimap-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Library for interacting with IMAP servers"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 DEPEND="

diff --git a/kde-apps/kimap/kimap-15.12.49.9999.ebuild b/kde-apps/kimap/kimap-15.12.49.9999.ebuild
index 3f830e7..a3ac0ea 100644
--- a/kde-apps/kimap/kimap-15.12.49.9999.ebuild
+++ b/kde-apps/kimap/kimap-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"

diff --git a/kde-apps/kimap/kimap-9999.ebuild b/kde-apps/kimap/kimap-9999.ebuild
index 3f830e7..a3ac0ea 100644
--- a/kde-apps/kimap/kimap-9999.ebuild
+++ b/kde-apps/kimap/kimap-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"

diff --git a/kde-apps/kldap/kldap-15.12.49.9999.ebuild b/kde-apps/kldap/kldap-15.12.2.ebuild
similarity index 93%
copy from kde-apps/kldap/kldap-15.12.49.9999.ebuild
copy to kde-apps/kldap/kldap-15.12.2.ebuild
index 146d8a1..e2fb190 100644
--- a/kde-apps/kldap/kldap-15.12.49.9999.ebuild
+++ b/kde-apps/kldap/kldap-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"
@@ -10,16 +10,16 @@ inherit kde5
 
 DESCRIPTION="Library for interacting with LDAP servers"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kwidgetsaddons)
-	dev-libs/cyrus-sasl
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
+	dev-libs/cyrus-sasl
 	net-nds/openldap
 "
 DEPEND="${RDEPEND}"

diff --git a/kde-apps/kldap/kldap-15.12.49.9999.ebuild b/kde-apps/kldap/kldap-15.12.49.9999.ebuild
index 146d8a1..dac319f 100644
--- a/kde-apps/kldap/kldap-15.12.49.9999.ebuild
+++ b/kde-apps/kldap/kldap-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"
@@ -17,9 +17,9 @@ RDEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kwidgetsaddons)
-	dev-libs/cyrus-sasl
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
+	dev-libs/cyrus-sasl
 	net-nds/openldap
 "
 DEPEND="${RDEPEND}"

diff --git a/kde-apps/kldap/kldap-9999.ebuild b/kde-apps/kldap/kldap-9999.ebuild
index 146d8a1..dac319f 100644
--- a/kde-apps/kldap/kldap-9999.ebuild
+++ b/kde-apps/kldap/kldap-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"
@@ -17,9 +17,9 @@ RDEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kwidgetsaddons)
-	dev-libs/cyrus-sasl
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
+	dev-libs/cyrus-sasl
 	net-nds/openldap
 "
 DEPEND="${RDEPEND}"

diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild b/kde-apps/kmailtransport/kmailtransport-15.12.2.ebuild
similarity index 56%
copy from kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild
copy to kde-apps/kmailtransport/kmailtransport-15.12.2.ebuild
index a611d8a..566954e 100644
--- a/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-15.12.2.ebuild
@@ -2,31 +2,36 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
 inherit kde5
 
-DESCRIPTION="Library for managing identitites"
-LICENSE="LGPL-2+"
-KEYWORDS=""
+DESCRIPTION="Mail transport service"
+LICENSE="GPL-2"
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
-RDEPEND="
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_frameworks_dep kcodecs)
+DEPEND="
+	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libakonadi)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtwidgets)
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepimlibs:4
+"
+
+RESTRICT="test"

diff --git a/kde-apps/kmbox/kmbox-15.12.49.9999.ebuild b/kde-apps/kmbox/kmbox-15.12.2.ebuild
similarity index 90%
copy from kde-apps/kmbox/kmbox-15.12.49.9999.ebuild
copy to kde-apps/kmbox/kmbox-15.12.2.ebuild
index 2d891b1..f7d2f74 100644
--- a/kde-apps/kmbox/kmbox-15.12.49.9999.ebuild
+++ b/kde-apps/kmbox/kmbox-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Library for accessing MBox format mail storages"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 RDEPEND="$(add_kdeapps_dep kmime)"

diff --git a/kde-apps/kmbox/kmbox-15.12.49.9999.ebuild b/kde-apps/kmbox/kmbox-15.12.49.9999.ebuild
index 2d891b1..b0abe4e 100644
--- a/kde-apps/kmbox/kmbox-15.12.49.9999.ebuild
+++ b/kde-apps/kmbox/kmbox-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"

diff --git a/kde-apps/kmbox/kmbox-9999.ebuild b/kde-apps/kmbox/kmbox-9999.ebuild
index 2d891b1..b0abe4e 100644
--- a/kde-apps/kmbox/kmbox-9999.ebuild
+++ b/kde-apps/kmbox/kmbox-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"

diff --git a/kde-apps/kmime/kmime-15.12.49.9999.ebuild b/kde-apps/kmime/kmime-15.12.2.ebuild
similarity index 93%
copy from kde-apps/kmime/kmime-15.12.49.9999.ebuild
copy to kde-apps/kmime/kmime-15.12.2.ebuild
index a3c8539..4e2838f 100644
--- a/kde-apps/kmime/kmime-15.12.49.9999.ebuild
+++ b/kde-apps/kmime/kmime-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Libary for handling mail messages and newsgroup articles"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 DEPEND="

diff --git a/kde-apps/kmime/kmime-15.12.49.9999.ebuild b/kde-apps/kmime/kmime-15.12.49.9999.ebuild
index a3c8539..b845b31 100644
--- a/kde-apps/kmime/kmime-15.12.49.9999.ebuild
+++ b/kde-apps/kmime/kmime-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"

diff --git a/kde-apps/kmime/kmime-9999.ebuild b/kde-apps/kmime/kmime-9999.ebuild
index a3c8539..b845b31 100644
--- a/kde-apps/kmime/kmime-9999.ebuild
+++ b/kde-apps/kmime/kmime-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"

diff --git a/kde-apps/knotes/knotes-15.12.2.ebuild b/kde-apps/knotes/knotes-15.12.2.ebuild
new file mode 100644
index 0000000..1470fcb
--- /dev/null
+++ b/kde-apps/knotes/knotes-15.12.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+KDE_PIM_KEEP_SUBDIR="noteshared"
+KDE_PIM_KONTACTPLUGIN="true"
+KDE_PUNT_BOGUS_DEPS="true"
+KMNAME="kdepim"
+inherit kde5
+
+DESCRIPTION="Akonadi developer console"
+HOMEPAGE="https://www.kde.org/"
+KEYWORDS=" ~amd64 ~x86"
+
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libakonadi)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	dev-libs/grantlee:5
+	dev-libs/libxslt
+	x11-libs/libX11
+	kontact? (
+		$(add_frameworks_dep kitemviews)
+		$(add_frameworks_dep kparts)
+		$(add_kdeapps_dep kcalcore)
+		$(add_kdeapps_dep kcalutils)
+		$(add_kdeapps_dep kcontacts)
+		$(add_kdeapps_dep libkdepim)
+	)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-15.12.2:5
+	!kde-apps/noteshared:5
+"
+
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+	S="${WORKDIR}/${P}"
+else
+	S="${WORKDIR}/${KMNAME}-${PV}"
+fi
+
+src_prepare() {
+	kde5_src_prepare
+
+	# necessary for 15.12 branch aka split-in-adv-of-upstream
+	sed -e '/^include.*kleopatra\/ConfigureChecks/ s/^/#DONT/' \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDEPIM_BUILD_WITH_INSTALLED_LIB=TRUE
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON
+	)
+# 	# FIXME: Does not build (last checked 2016-02-17)
+# 		$(cmake-utils_use_find_package X Qt5X11Extras)
+# 		$(cmake-utils_use_find_package X X11)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/konsolekalendar/konsolekalendar-15.12.2.ebuild b/kde-apps/konsolekalendar/konsolekalendar-15.12.2.ebuild
new file mode 100644
index 0000000..84403a4
--- /dev/null
+++ b/kde-apps/konsolekalendar/konsolekalendar-15.12.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+KDE_PUNT_BOGUS_DEPS="true"
+KMNAME="kdepim"
+inherit kde5
+
+DESCRIPTION="A command line interface to KDE calendars"
+HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
+KEYWORDS=" ~amd64 ~x86"
+
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	dev-libs/libxslt
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-15.12.2:5
+"
+
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+	S="${WORKDIR}/${P}"
+else
+	S="${WORKDIR}/${KMNAME}-${PV}"
+fi
+
+PATCHES=( "${FILESDIR}/kdepim-console.patch" )
+
+src_prepare() {
+	# necessary for 15.12 branch aka split-in-adv-of-upstream
+	sed -e '/^include.*kleopatra\/ConfigureChecks/ s/^/#DONT/' \
+		-i CMakeLists.txt || die
+
+	mv console/calendarjanitor calendarjanitor || die "Failed to move calendarjanitor"
+	mv console/konsolekalendar konsolekalendar || die "Failed to move konsolekalendar"
+
+	kde5_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDEPIM_BUILD_WITH_INSTALLED_LIB=TRUE
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=ON
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/kontactinterface/kontactinterface-15.12.49.9999.ebuild b/kde-apps/kontactinterface/kontactinterface-15.12.2.ebuild
similarity index 94%
copy from kde-apps/kontactinterface/kontactinterface-15.12.49.9999.ebuild
copy to kde-apps/kontactinterface/kontactinterface-15.12.2.ebuild
index 6b29dc4..0135fde 100644
--- a/kde-apps/kontactinterface/kontactinterface-15.12.49.9999.ebuild
+++ b/kde-apps/kontactinterface/kontactinterface-15.12.2.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 inherit kde5
 
 DESCRIPTION="Library for embedding KParts in a Kontact component"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 RDEPEND="

diff --git a/kde-apps/kontactinterface/kontactinterface-15.12.49.9999.ebuild b/kde-apps/kontactinterface/kontactinterface-15.12.49.9999.ebuild
index 6b29dc4..c7786a5 100644
--- a/kde-apps/kontactinterface/kontactinterface-15.12.49.9999.ebuild
+++ b/kde-apps/kontactinterface/kontactinterface-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 inherit kde5

diff --git a/kde-apps/kontactinterface/kontactinterface-9999.ebuild b/kde-apps/kontactinterface/kontactinterface-9999.ebuild
index 6b29dc4..c7786a5 100644
--- a/kde-apps/kontactinterface/kontactinterface-9999.ebuild
+++ b/kde-apps/kontactinterface/kontactinterface-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 inherit kde5

diff --git a/kde-apps/kpimtextedit/kpimtextedit-15.12.49.9999.ebuild b/kde-apps/kpimtextedit/kpimtextedit-15.12.2.ebuild
similarity index 96%
copy from kde-apps/kpimtextedit/kpimtextedit-15.12.49.9999.ebuild
copy to kde-apps/kpimtextedit/kpimtextedit-15.12.2.ebuild
index 6518b60..24e7cbe 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-15.12.49.9999.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"
@@ -11,7 +11,7 @@ inherit kde5
 
 DESCRIPTION="A textedit with PIM-specific features"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 RDEPEND="

diff --git a/kde-apps/kpimtextedit/kpimtextedit-15.12.49.9999.ebuild b/kde-apps/kpimtextedit/kpimtextedit-15.12.49.9999.ebuild
index 6518b60..d82fd85 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-15.12.49.9999.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"

diff --git a/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild b/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
index 6518b60..d82fd85 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"

diff --git a/kde-apps/ktnef/ktnef-15.12.2.ebuild b/kde-apps/ktnef/ktnef-15.12.2.ebuild
new file mode 100644
index 0000000..13dce93
--- /dev/null
+++ b/kde-apps/ktnef/ktnef-15.12.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+KDE_PUNT_BOGUS_DEPS="true"
+KMNAME="kdepim"
+inherit kde5
+
+DESCRIPTION="A viewer for TNEF attachments"
+HOMEPAGE="https://www.kde.org/"
+KEYWORDS=" ~amd64 ~x86"
+
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libktnef)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/libxslt
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-15.12.2:5
+"
+
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+	S="${WORKDIR}/${P}"
+else
+	S="${WORKDIR}/${KMNAME}-${PV}"
+fi
+
+src_prepare() {
+	kde5_src_prepare
+
+	sed -e '/^include.*kleopatra\/ConfigureChecks/ s/^/#DONT/' \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDEPIM_BUILD_WITH_INSTALLED_LIB=TRUE
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=ON
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/libakonadi/files/libakonadi-15.12.2-testtools-optional.patch b/kde-apps/libakonadi/files/libakonadi-15.12.2-testtools-optional.patch
index e92bd38..56c8151 100644
--- a/kde-apps/libakonadi/files/libakonadi-15.12.2-testtools-optional.patch
+++ b/kde-apps/libakonadi/files/libakonadi-15.12.2-testtools-optional.patch
@@ -4,10 +4,10 @@ Date:   Sun Jan 17 13:34:17 2016 +0100
 
     [libakonadi] Make tools optional
 
-diff --git a/akonadi/CMakeLists.txt b/akonadi/CMakeLists.txt
+diff --git a/CMakeLists.txt b/CMakeLists.txt
 index c80db92..e36c0ab 100644
---- a/akonadi/CMakeLists.txt
-+++ b/akonadi/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -43,6 +43,8 @@ else()
      set(KF5Akonadi_DATA_DIR "${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_DATADIR_KF5}/akonadi")
  endif()
@@ -39,10 +39,10 @@ index c80db92..e36c0ab 100644
  endif()
  ########### CMake Config Files ###########
  
-diff --git a/akonadi/autotests/CMakeLists.txt b/akonadi/autotests/CMakeLists.txt
+diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
 index 308cf22..dc69a26 100644
---- a/akonadi/autotests/CMakeLists.txt
-+++ b/akonadi/autotests/CMakeLists.txt
+--- a/autotests/CMakeLists.txt
++++ b/autotests/CMakeLists.txt
 @@ -25,11 +25,6 @@ include_directories(
    ${Boost_INCLUDE_DIR}
  )

diff --git a/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild b/kde-apps/libakonadi/libakonadi-15.12.2.ebuild
similarity index 98%
copy from kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild
copy to kde-apps/libakonadi/libakonadi-15.12.2.ebuild
index 0523317..a921c78 100644
--- a/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild
+++ b/kde-apps/libakonadi/libakonadi-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN=true
 KDE_TEST=true
@@ -11,7 +11,7 @@ VIRTUALX_REQUIRED=test
 inherit kde5
 
 DESCRIPTION="Common akonadi libraries for PIM apps"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 LICENSE="LGPL-2.1"
 IUSE="designer tools"
 

diff --git a/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild b/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild
index 0523317..77af367 100644
--- a/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild
+++ b/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN=true
 KDE_TEST=true

diff --git a/kde-apps/libfollowupreminder/libfollowupreminder-15.12.49.9999.ebuild b/kde-apps/libfollowupreminder/libfollowupreminder-15.12.2.ebuild
similarity index 95%
copy from kde-apps/libfollowupreminder/libfollowupreminder-15.12.49.9999.ebuild
copy to kde-apps/libfollowupreminder/libfollowupreminder-15.12.2.ebuild
index 753b422..c5d5656 100644
--- a/kde-apps/libfollowupreminder/libfollowupreminder-15.12.49.9999.ebuild
+++ b/kde-apps/libfollowupreminder/libfollowupreminder-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="false"
 KMNAME="kdepim"
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Library for followup reminders"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="

diff --git a/kde-apps/libfollowupreminder/libfollowupreminder-15.12.49.9999.ebuild b/kde-apps/libfollowupreminder/libfollowupreminder-15.12.49.9999.ebuild
index 753b422..f4d2b50 100644
--- a/kde-apps/libfollowupreminder/libfollowupreminder-15.12.49.9999.ebuild
+++ b/kde-apps/libfollowupreminder/libfollowupreminder-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="false"
 KMNAME="kdepim"

diff --git a/kde-apps/libgravatar/libgravatar-15.12.49.9999.ebuild b/kde-apps/libgravatar/libgravatar-15.12.2.ebuild
similarity index 96%
copy from kde-apps/libgravatar/libgravatar-15.12.49.9999.ebuild
copy to kde-apps/libgravatar/libgravatar-15.12.2.ebuild
index df3cad0..d398eb5 100644
--- a/kde-apps/libgravatar/libgravatar-15.12.49.9999.ebuild
+++ b/kde-apps/libgravatar/libgravatar-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 KMNAME="kdepim"
@@ -11,7 +11,7 @@ inherit kde5
 
 DESCRIPTION="Library for gravatar integration"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="

diff --git a/kde-apps/libgravatar/libgravatar-15.12.49.9999.ebuild b/kde-apps/libgravatar/libgravatar-15.12.49.9999.ebuild
index df3cad0..e55b4b2 100644
--- a/kde-apps/libgravatar/libgravatar-15.12.49.9999.ebuild
+++ b/kde-apps/libgravatar/libgravatar-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 KMNAME="kdepim"

diff --git a/kde-apps/libgravatar/libgravatar-9999.ebuild b/kde-apps/libgravatar/libgravatar-9999.ebuild
index de9d301..a3de101 100644
--- a/kde-apps/libgravatar/libgravatar-9999.ebuild
+++ b/kde-apps/libgravatar/libgravatar-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 VIRTUALX_REQUIRED="test"

diff --git a/kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild b/kde-apps/libkdepim/libkdepim-15.12.2.ebuild
similarity index 97%
copy from kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild
copy to kde-apps/libkdepim/libkdepim-15.12.2.ebuild
index 7254a68..08812a1 100644
--- a/kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild
+++ b/kde-apps/libkdepim/libkdepim-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 KMNAME="kdepim"
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Common PIM libraries"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE="designer"
 
 COMMON_DEPEND="

diff --git a/kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild b/kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild
index 7254a68..0d02c63 100644
--- a/kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild
+++ b/kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 KMNAME="kdepim"

diff --git a/kde-apps/libkdepim/libkdepim-9999.ebuild b/kde-apps/libkdepim/libkdepim-9999.ebuild
index 4b03bee..91fdc96 100644
--- a/kde-apps/libkdepim/libkdepim-9999.ebuild
+++ b/kde-apps/libkdepim/libkdepim-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 inherit kde5

diff --git a/kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-15.12.49.9999.ebuild b/kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-15.12.2.ebuild
similarity index 96%
copy from kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-15.12.49.9999.ebuild
copy to kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-15.12.2.ebuild
index 50dba20..46378aa 100644
--- a/kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-15.12.49.9999.ebuild
+++ b/kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="false"
 KMNAME="kdepim"
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="KDE PIM DBus library"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="

diff --git a/kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-15.12.49.9999.ebuild b/kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-15.12.49.9999.ebuild
index 50dba20..cf084d6 100644
--- a/kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-15.12.49.9999.ebuild
+++ b/kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="false"
 KMNAME="kdepim"

diff --git a/kde-apps/libkleo/libkleo-15.12.49.9999.ebuild b/kde-apps/libkleo/libkleo-15.12.2.ebuild
similarity index 96%
copy from kde-apps/libkleo/libkleo-15.12.49.9999.ebuild
copy to kde-apps/libkleo/libkleo-15.12.2.ebuild
index 89100de..27fb1a0 100644
--- a/kde-apps/libkleo/libkleo-15.12.49.9999.ebuild
+++ b/kde-apps/libkleo/libkleo-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="false"
 KMNAME="kdepim"
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Library for encryption handling"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="

diff --git a/kde-apps/libkleo/libkleo-15.12.49.9999.ebuild b/kde-apps/libkleo/libkleo-15.12.49.9999.ebuild
index 89100de..f369f6e 100644
--- a/kde-apps/libkleo/libkleo-15.12.49.9999.ebuild
+++ b/kde-apps/libkleo/libkleo-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="false"
 KMNAME="kdepim"

diff --git a/kde-apps/libkleo/libkleo-9999.ebuild b/kde-apps/libkleo/libkleo-9999.ebuild
index 70acca0..74e8eaf 100644
--- a/kde-apps/libkleo/libkleo-9999.ebuild
+++ b/kde-apps/libkleo/libkleo-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="false"
 inherit kde5

diff --git a/kde-apps/libksieve/libksieve-15.12.49.9999.ebuild b/kde-apps/libksieve/libksieve-15.12.2.ebuild
similarity index 96%
copy from kde-apps/libksieve/libksieve-15.12.49.9999.ebuild
copy to kde-apps/libksieve/libksieve-15.12.2.ebuild
index cb3f4de..126addb 100644
--- a/kde-apps/libksieve/libksieve-15.12.49.9999.ebuild
+++ b/kde-apps/libksieve/libksieve-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 KMNAME="kdepim"
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Common PIM libraries"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="

diff --git a/kde-apps/libksieve/libksieve-15.12.49.9999.ebuild b/kde-apps/libksieve/libksieve-15.12.49.9999.ebuild
index cb3f4de..04360b9 100644
--- a/kde-apps/libksieve/libksieve-15.12.49.9999.ebuild
+++ b/kde-apps/libksieve/libksieve-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 KMNAME="kdepim"

diff --git a/kde-apps/libksieve/libksieve-9999.ebuild b/kde-apps/libksieve/libksieve-9999.ebuild
index 1a49c4f..4971a25 100644
--- a/kde-apps/libksieve/libksieve-9999.ebuild
+++ b/kde-apps/libksieve/libksieve-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 inherit kde5

diff --git a/kde-apps/libktnef/libktnef-15.12.2.ebuild b/kde-apps/libktnef/libktnef-15.12.2.ebuild
new file mode 100644
index 0000000..782af44
--- /dev/null
+++ b/kde-apps/libktnef/libktnef-15.12.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_DOXYGEN="true"
+KDE_TEST="true"
+KMNAME="ktnef"
+inherit kde5
+
+DESCRIPTION="Library for handling TNEF data"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/ktnef:4
+	!<kde-apps/ktnef-15.12.2:5
+"

diff --git a/kde-apps/libsendlater/libsendlater-15.12.49.9999.ebuild b/kde-apps/libsendlater/libsendlater-15.12.2.ebuild
similarity index 95%
copy from kde-apps/libsendlater/libsendlater-15.12.49.9999.ebuild
copy to kde-apps/libsendlater/libsendlater-15.12.2.ebuild
index 2caa0c7..4bbb247 100644
--- a/kde-apps/libsendlater/libsendlater-15.12.49.9999.ebuild
+++ b/kde-apps/libsendlater/libsendlater-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="false"
 KMNAME="kdepim"
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Library for sending mails later"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="

diff --git a/kde-apps/libsendlater/libsendlater-15.12.49.9999.ebuild b/kde-apps/libsendlater/libsendlater-15.12.49.9999.ebuild
index 2caa0c7..2248e1f 100644
--- a/kde-apps/libsendlater/libsendlater-15.12.49.9999.ebuild
+++ b/kde-apps/libsendlater/libsendlater-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="false"
 KMNAME="kdepim"

diff --git a/kde-apps/mailcommon/mailcommon-15.12.49.9999.ebuild b/kde-apps/mailcommon/mailcommon-15.12.2.ebuild
similarity index 97%
copy from kde-apps/mailcommon/mailcommon-15.12.49.9999.ebuild
copy to kde-apps/mailcommon/mailcommon-15.12.2.ebuild
index f4115e9..78b05d0 100644
--- a/kde-apps/mailcommon/mailcommon-15.12.49.9999.ebuild
+++ b/kde-apps/mailcommon/mailcommon-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="false"
 KMNAME="kdepim"
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Common mail library"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE="designer"
 
 COMMON_DEPEND="

diff --git a/kde-apps/mailcommon/mailcommon-15.12.49.9999.ebuild b/kde-apps/mailcommon/mailcommon-15.12.49.9999.ebuild
index f4115e9..f54b867 100644
--- a/kde-apps/mailcommon/mailcommon-15.12.49.9999.ebuild
+++ b/kde-apps/mailcommon/mailcommon-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="false"
 KMNAME="kdepim"

diff --git a/kde-apps/mailcommon/mailcommon-9999.ebuild b/kde-apps/mailcommon/mailcommon-9999.ebuild
index f110ff1..999704f 100644
--- a/kde-apps/mailcommon/mailcommon-9999.ebuild
+++ b/kde-apps/mailcommon/mailcommon-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="false"
 inherit kde5

diff --git a/kde-apps/mailimporter/mailimporter-15.12.49.9999.ebuild b/kde-apps/mailimporter/mailimporter-15.12.2.ebuild
similarity index 96%
copy from kde-apps/mailimporter/mailimporter-15.12.49.9999.ebuild
copy to kde-apps/mailimporter/mailimporter-15.12.2.ebuild
index 7faabc1..962b0a1 100644
--- a/kde-apps/mailimporter/mailimporter-15.12.49.9999.ebuild
+++ b/kde-apps/mailimporter/mailimporter-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 KMNAME="kdepim"
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Library to import mail from various sources"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="

diff --git a/kde-apps/mailimporter/mailimporter-15.12.49.9999.ebuild b/kde-apps/mailimporter/mailimporter-15.12.49.9999.ebuild
index 7faabc1..60167b3 100644
--- a/kde-apps/mailimporter/mailimporter-15.12.49.9999.ebuild
+++ b/kde-apps/mailimporter/mailimporter-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 KMNAME="kdepim"

diff --git a/kde-apps/mailimporter/mailimporter-9999.ebuild b/kde-apps/mailimporter/mailimporter-9999.ebuild
index 809f4d8..3d2ef48 100644
--- a/kde-apps/mailimporter/mailimporter-9999.ebuild
+++ b/kde-apps/mailimporter/mailimporter-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 inherit kde5

diff --git a/kde-apps/messagecomposer/messagecomposer-15.12.49.9999.ebuild b/kde-apps/messagecomposer/messagecomposer-15.12.2.ebuild
similarity index 97%
copy from kde-apps/messagecomposer/messagecomposer-15.12.49.9999.ebuild
copy to kde-apps/messagecomposer/messagecomposer-15.12.2.ebuild
index b3ab95c..dfe72c3 100644
--- a/kde-apps/messagecomposer/messagecomposer-15.12.49.9999.ebuild
+++ b/kde-apps/messagecomposer/messagecomposer-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 KMNAME="kdepim"
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Message composer for KMail"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="

diff --git a/kde-apps/messagecomposer/messagecomposer-15.12.49.9999.ebuild b/kde-apps/messagecomposer/messagecomposer-15.12.49.9999.ebuild
index b3ab95c..061eed3 100644
--- a/kde-apps/messagecomposer/messagecomposer-15.12.49.9999.ebuild
+++ b/kde-apps/messagecomposer/messagecomposer-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 KMNAME="kdepim"

diff --git a/kde-apps/messagecore/messagecore-15.12.49.9999.ebuild b/kde-apps/messagecore/messagecore-15.12.2.ebuild
similarity index 96%
copy from kde-apps/messagecore/messagecore-15.12.49.9999.ebuild
copy to kde-apps/messagecore/messagecore-15.12.2.ebuild
index ba4f9a0..bb75364 100644
--- a/kde-apps/messagecore/messagecore-15.12.49.9999.ebuild
+++ b/kde-apps/messagecore/messagecore-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 KMNAME="kdepim"
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Library for core messaging functions"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="

diff --git a/kde-apps/messagecore/messagecore-15.12.49.9999.ebuild b/kde-apps/messagecore/messagecore-15.12.49.9999.ebuild
index ba4f9a0..97a652c 100644
--- a/kde-apps/messagecore/messagecore-15.12.49.9999.ebuild
+++ b/kde-apps/messagecore/messagecore-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 KMNAME="kdepim"

diff --git a/kde-apps/messagelist/messagelist-15.12.49.9999.ebuild b/kde-apps/messagelist/messagelist-15.12.2.ebuild
similarity index 97%
copy from kde-apps/messagelist/messagelist-15.12.49.9999.ebuild
copy to kde-apps/messagelist/messagelist-15.12.2.ebuild
index 58210e7..cf593a9 100644
--- a/kde-apps/messagelist/messagelist-15.12.49.9999.ebuild
+++ b/kde-apps/messagelist/messagelist-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 KMNAME="kdepim"
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Message list view for KMail"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="

diff --git a/kde-apps/messagelist/messagelist-15.12.49.9999.ebuild b/kde-apps/messagelist/messagelist-15.12.49.9999.ebuild
index 58210e7..4b5d6ea 100644
--- a/kde-apps/messagelist/messagelist-15.12.49.9999.ebuild
+++ b/kde-apps/messagelist/messagelist-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 KMNAME="kdepim"

diff --git a/kde-apps/messageviewer/messageviewer-15.12.49.9999.ebuild b/kde-apps/messageviewer/messageviewer-15.12.2.ebuild
similarity index 98%
copy from kde-apps/messageviewer/messageviewer-15.12.49.9999.ebuild
copy to kde-apps/messageviewer/messageviewer-15.12.2.ebuild
index d1d1172..64daf75 100644
--- a/kde-apps/messageviewer/messageviewer-15.12.49.9999.ebuild
+++ b/kde-apps/messageviewer/messageviewer-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 KMNAME="kdepim"
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Libary and plugins for viewing various message types and styles"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="

diff --git a/kde-apps/messageviewer/messageviewer-15.12.49.9999.ebuild b/kde-apps/messageviewer/messageviewer-15.12.49.9999.ebuild
index d1d1172..7919db2 100644
--- a/kde-apps/messageviewer/messageviewer-15.12.49.9999.ebuild
+++ b/kde-apps/messageviewer/messageviewer-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 KMNAME="kdepim"

diff --git a/kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild b/kde-apps/pimcommon/pimcommon-15.12.2.ebuild
similarity index 98%
copy from kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild
copy to kde-apps/pimcommon/pimcommon-15.12.2.ebuild
index df69e69..d4421d8 100644
--- a/kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild
+++ b/kde-apps/pimcommon/pimcommon-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="false"
 KMNAME="kdepim"
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Common PIM libraries"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE="designer"
 
 COMMON_DEPEND="

diff --git a/kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild b/kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild
index df69e69..f8bc216 100644
--- a/kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild
+++ b/kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="false"
 KMNAME="kdepim"

diff --git a/kde-apps/pimcommon/pimcommon-9999.ebuild b/kde-apps/pimcommon/pimcommon-9999.ebuild
index 41c9e89..927ddd7 100644
--- a/kde-apps/pimcommon/pimcommon-9999.ebuild
+++ b/kde-apps/pimcommon/pimcommon-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="false"
 inherit kde5

diff --git a/kde-apps/syndication/syndication-15.12.49.9999.ebuild b/kde-apps/syndication/syndication-15.12.2.ebuild
similarity index 92%
copy from kde-apps/syndication/syndication-15.12.49.9999.ebuild
copy to kde-apps/syndication/syndication-15.12.2.ebuild
index 65027ba..565c801 100644
--- a/kde-apps/syndication/syndication-15.12.49.9999.ebuild
+++ b/kde-apps/syndication/syndication-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Library for parsing RSS and Atom feeds"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 RDEPEND="

diff --git a/kde-apps/syndication/syndication-15.12.49.9999.ebuild b/kde-apps/syndication/syndication-15.12.49.9999.ebuild
index 65027ba..a0a9e9f 100644
--- a/kde-apps/syndication/syndication-15.12.49.9999.ebuild
+++ b/kde-apps/syndication/syndication-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"

diff --git a/kde-apps/syndication/syndication-9999.ebuild b/kde-apps/syndication/syndication-9999.ebuild
index 65027ba..a0a9e9f 100644
--- a/kde-apps/syndication/syndication-9999.ebuild
+++ b/kde-apps/syndication/syndication-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN="true"
 KDE_TEST="true"

diff --git a/kde-apps/templateparser/templateparser-15.12.49.9999.ebuild b/kde-apps/templateparser/templateparser-15.12.2.ebuild
similarity index 97%
copy from kde-apps/templateparser/templateparser-15.12.49.9999.ebuild
copy to kde-apps/templateparser/templateparser-15.12.2.ebuild
index 4893853..0f1d49e 100644
--- a/kde-apps/templateparser/templateparser-15.12.49.9999.ebuild
+++ b/kde-apps/templateparser/templateparser-15.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 KMNAME="kdepim"
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="KDE PIM template parser"
 LICENSE="LGPL-2+"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="

diff --git a/kde-apps/templateparser/templateparser-15.12.49.9999.ebuild b/kde-apps/templateparser/templateparser-15.12.49.9999.ebuild
index 4893853..e0eb1b5 100644
--- a/kde-apps/templateparser/templateparser-15.12.49.9999.ebuild
+++ b/kde-apps/templateparser/templateparser-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="true"
 KMNAME="kdepim"


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2016-02-18 14:45 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-18 14:44 [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-contact/, kde-apps/kldap/, kde-apps/libakonadi/files/, Michael Palimaka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox