From 2ce95b34223f76fef3ed2685fa9e5e287b6b30a2 Mon Sep 17 00:00:00 2001
From: Michael Palimaka <kensington@gentoo.org>
Date: Tue, 25 Nov 2014 00:53:34 +1100
Subject: [kde-base] Rename kdepim 9999 -> 4.9999 since master is now KF5.

---
 .../akonadiconsole/akonadiconsole-4.9999.ebuild    |  25 +++++
 kde-base/akonadiconsole/akonadiconsole-9999.ebuild |  25 -----
 kde-base/akregator/akregator-4.9999.ebuild         |  22 ++++
 kde-base/akregator/akregator-9999.ebuild           |  22 ----
 kde-base/blogilo/blogilo-4.9999.ebuild             |  26 +++++
 kde-base/blogilo/blogilo-9999.ebuild               |  26 -----
 .../calendarjanitor/calendarjanitor-4.9999.ebuild  |  27 +++++
 .../calendarjanitor/calendarjanitor-9999.ebuild    |  27 -----
 kde-base/kabcclient/kabcclient-4.9999.ebuild       |  26 +++++
 kde-base/kabcclient/kabcclient-9999.ebuild         |  26 -----
 kde-base/kaddressbook/kaddressbook-4.9999.ebuild   |  51 ++++++++++
 kde-base/kaddressbook/kaddressbook-9999.ebuild     |  51 ----------
 kde-base/kalarm/kalarm-4.9999.ebuild               |  26 +++++
 kde-base/kalarm/kalarm-9999.ebuild                 |  26 -----
 .../kdepim-common-libs-4.9999.ebuild               |  81 +++++++++++++++
 .../kdepim-common-libs-9999.ebuild                 |  81 ---------------
 kde-base/kdepim-icons/kdepim-icons-4.9999.ebuild   |  16 +++
 kde-base/kdepim-icons/kdepim-icons-9999.ebuild     |  16 ---
 .../kdepim-kresources-4.9999.ebuild                |  27 +++++
 .../kdepim-kresources-9999.ebuild                  |  27 -----
 .../kdepim-runtime/kdepim-runtime-4.9999.ebuild    |  42 ++++++++
 kde-base/kdepim-runtime/kdepim-runtime-9999.ebuild |  42 --------
 kde-base/kjots/kjots-4.9999.ebuild                 |  26 +++++
 kde-base/kjots/kjots-9999.ebuild                   |  26 -----
 kde-base/kleopatra/kleopatra-4.9999.ebuild         |  40 ++++++++
 kde-base/kleopatra/kleopatra-9999.ebuild           |  40 --------
 kde-base/kmail/kmail-4.9999.ebuild                 | 113 +++++++++++++++++++++
 kde-base/kmail/kmail-9999.ebuild                   | 113 ---------------------
 kde-base/knode/knode-4.9999.ebuild                 |  48 +++++++++
 kde-base/knode/knode-9999.ebuild                   |  48 ---------
 kde-base/knotes/knotes-4.9999.ebuild               |  31 ++++++
 kde-base/knotes/knotes-9999.ebuild                 |  31 ------
 .../konsolekalendar/konsolekalendar-4.9999.ebuild  |  31 ++++++
 .../konsolekalendar/konsolekalendar-9999.ebuild    |  31 ------
 kde-base/kontact/kontact-4.9999.ebuild             |  51 ++++++++++
 kde-base/kontact/kontact-9999.ebuild               |  51 ----------
 kde-base/korganizer/korganizer-4.9999.ebuild       |  76 ++++++++++++++
 kde-base/korganizer/korganizer-9999.ebuild         |  76 --------------
 kde-base/ktimetracker/ktimetracker-4.9999.ebuild   |  38 +++++++
 kde-base/ktimetracker/ktimetracker-9999.ebuild     |  38 -------
 kde-base/ktnef/ktnef-4.9999.ebuild                 |  24 +++++
 kde-base/ktnef/ktnef-9999.ebuild                   |  24 -----
 42 files changed, 847 insertions(+), 847 deletions(-)
 create mode 100644 kde-base/akonadiconsole/akonadiconsole-4.9999.ebuild
 delete mode 100644 kde-base/akonadiconsole/akonadiconsole-9999.ebuild
 create mode 100644 kde-base/akregator/akregator-4.9999.ebuild
 delete mode 100644 kde-base/akregator/akregator-9999.ebuild
 create mode 100644 kde-base/blogilo/blogilo-4.9999.ebuild
 delete mode 100644 kde-base/blogilo/blogilo-9999.ebuild
 create mode 100644 kde-base/calendarjanitor/calendarjanitor-4.9999.ebuild
 delete mode 100644 kde-base/calendarjanitor/calendarjanitor-9999.ebuild
 create mode 100644 kde-base/kabcclient/kabcclient-4.9999.ebuild
 delete mode 100644 kde-base/kabcclient/kabcclient-9999.ebuild
 create mode 100644 kde-base/kaddressbook/kaddressbook-4.9999.ebuild
 delete mode 100644 kde-base/kaddressbook/kaddressbook-9999.ebuild
 create mode 100644 kde-base/kalarm/kalarm-4.9999.ebuild
 delete mode 100644 kde-base/kalarm/kalarm-9999.ebuild
 create mode 100644 kde-base/kdepim-common-libs/kdepim-common-libs-4.9999.ebuild
 delete mode 100644 kde-base/kdepim-common-libs/kdepim-common-libs-9999.ebuild
 create mode 100644 kde-base/kdepim-icons/kdepim-icons-4.9999.ebuild
 delete mode 100644 kde-base/kdepim-icons/kdepim-icons-9999.ebuild
 create mode 100644 kde-base/kdepim-kresources/kdepim-kresources-4.9999.ebuild
 delete mode 100644 kde-base/kdepim-kresources/kdepim-kresources-9999.ebuild
 create mode 100644 kde-base/kdepim-runtime/kdepim-runtime-4.9999.ebuild
 delete mode 100644 kde-base/kdepim-runtime/kdepim-runtime-9999.ebuild
 create mode 100644 kde-base/kjots/kjots-4.9999.ebuild
 delete mode 100644 kde-base/kjots/kjots-9999.ebuild
 create mode 100644 kde-base/kleopatra/kleopatra-4.9999.ebuild
 delete mode 100644 kde-base/kleopatra/kleopatra-9999.ebuild
 create mode 100644 kde-base/kmail/kmail-4.9999.ebuild
 delete mode 100644 kde-base/kmail/kmail-9999.ebuild
 create mode 100644 kde-base/knode/knode-4.9999.ebuild
 delete mode 100644 kde-base/knode/knode-9999.ebuild
 create mode 100644 kde-base/knotes/knotes-4.9999.ebuild
 delete mode 100644 kde-base/knotes/knotes-9999.ebuild
 create mode 100644 kde-base/konsolekalendar/konsolekalendar-4.9999.ebuild
 delete mode 100644 kde-base/konsolekalendar/konsolekalendar-9999.ebuild
 create mode 100644 kde-base/kontact/kontact-4.9999.ebuild
 delete mode 100644 kde-base/kontact/kontact-9999.ebuild
 create mode 100644 kde-base/korganizer/korganizer-4.9999.ebuild
 delete mode 100644 kde-base/korganizer/korganizer-9999.ebuild
 create mode 100644 kde-base/ktimetracker/ktimetracker-4.9999.ebuild
 delete mode 100644 kde-base/ktimetracker/ktimetracker-9999.ebuild
 create mode 100644 kde-base/ktnef/ktnef-4.9999.ebuild
 delete mode 100644 kde-base/ktnef/ktnef-9999.ebuild

diff --git a/kde-base/akonadiconsole/akonadiconsole-4.9999.ebuild b/kde-base/akonadiconsole/akonadiconsole-4.9999.ebuild
new file mode 100644
index 00000000000..2a32508ddea
--- /dev/null
+++ b/kde-base/akonadiconsole/akonadiconsole-4.9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="Akonadi developer console"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="
+	>=app-office/akonadi-server-1.12.90
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	akonadi_next/
+	calendarsupport/
+	messageviewer/
+"
diff --git a/kde-base/akonadiconsole/akonadiconsole-9999.ebuild b/kde-base/akonadiconsole/akonadiconsole-9999.ebuild
deleted file mode 100644
index 2a32508ddea..00000000000
--- a/kde-base/akonadiconsole/akonadiconsole-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="Akonadi developer console"
-KEYWORDS=""
-IUSE="debug"
-
-DEPEND="
-	>=app-office/akonadi-server-1.12.90
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	akonadi_next/
-	calendarsupport/
-	messageviewer/
-"
diff --git a/kde-base/akregator/akregator-4.9999.ebuild b/kde-base/akregator/akregator-4.9999.ebuild
new file mode 100644
index 00000000000..a00dcb817d9
--- /dev/null
+++ b/kde-base/akregator/akregator-4.9999.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="KDE news feed aggregator"
+HOMEPAGE="http://www.kde.org/applications/internet/akregator"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/akregator/akregator-9999.ebuild b/kde-base/akregator/akregator-9999.ebuild
deleted file mode 100644
index a00dcb817d9..00000000000
--- a/kde-base/akregator/akregator-9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KDE news feed aggregator"
-HOMEPAGE="http://www.kde.org/applications/internet/akregator"
-KEYWORDS=""
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/blogilo/blogilo-4.9999.ebuild b/kde-base/blogilo/blogilo-4.9999.ebuild
new file mode 100644
index 00000000000..2e91ea7147d
--- /dev/null
+++ b/kde-base/blogilo/blogilo-4.9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="KDE Blogging Client"
+HOMEPAGE="http://www.kde.org/applications/internet/blogilo"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepim-common-libs)
+	$(add_kdebase_dep kdepimlibs)
+	>=net-libs/libkgapi-2.2.0
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	composereditor-ng/
+	pimcommon/
+"
diff --git a/kde-base/blogilo/blogilo-9999.ebuild b/kde-base/blogilo/blogilo-9999.ebuild
deleted file mode 100644
index 2e91ea7147d..00000000000
--- a/kde-base/blogilo/blogilo-9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KDE Blogging Client"
-HOMEPAGE="http://www.kde.org/applications/internet/blogilo"
-KEYWORDS=""
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepim-common-libs)
-	$(add_kdebase_dep kdepimlibs)
-	>=net-libs/libkgapi-2.2.0
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	composereditor-ng/
-	pimcommon/
-"
diff --git a/kde-base/calendarjanitor/calendarjanitor-4.9999.ebuild b/kde-base/calendarjanitor/calendarjanitor-4.9999.ebuild
new file mode 100644
index 00000000000..3e92d599832
--- /dev/null
+++ b/kde-base/calendarjanitor/calendarjanitor-4.9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KMMODULE="console/${PN}"
+inherit kde4-meta
+
+DESCRIPTION="A tool to scan calendar data for buggy instances"
+HOMEPAGE="http://www.kde.org/"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepim-common-libs)
+	$(add_kdebase_dep kdepimlibs)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	calendarsupport/
+"
+
+KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/calendarjanitor/calendarjanitor-9999.ebuild b/kde-base/calendarjanitor/calendarjanitor-9999.ebuild
deleted file mode 100644
index 3e92d599832..00000000000
--- a/kde-base/calendarjanitor/calendarjanitor-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KMMODULE="console/${PN}"
-inherit kde4-meta
-
-DESCRIPTION="A tool to scan calendar data for buggy instances"
-HOMEPAGE="http://www.kde.org/"
-KEYWORDS=""
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepim-common-libs)
-	$(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	calendarsupport/
-"
-
-KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/kabcclient/kabcclient-4.9999.ebuild b/kde-base/kabcclient/kabcclient-4.9999.ebuild
new file mode 100644
index 00000000000..f3cfcc4655a
--- /dev/null
+++ b/kde-base/kabcclient/kabcclient-4.9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KMMODULE="console/${PN}"
+inherit kde4-meta
+
+DESCRIPTION="A command line client for accessing the KDE addressbook"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	kde4-meta_src_install
+
+	# work around NULL DT_RPATH in kabc2mutt
+	dosym kabcclient ${PREFIX}/bin/kabc2mutt
+}
diff --git a/kde-base/kabcclient/kabcclient-9999.ebuild b/kde-base/kabcclient/kabcclient-9999.ebuild
deleted file mode 100644
index f3cfcc4655a..00000000000
--- a/kde-base/kabcclient/kabcclient-9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KMMODULE="console/${PN}"
-inherit kde4-meta
-
-DESCRIPTION="A command line client for accessing the KDE addressbook"
-KEYWORDS=""
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	kde4-meta_src_install
-
-	# work around NULL DT_RPATH in kabc2mutt
-	dosym kabcclient ${PREFIX}/bin/kabc2mutt
-}
diff --git a/kde-base/kaddressbook/kaddressbook-4.9999.ebuild b/kde-base/kaddressbook/kaddressbook-4.9999.ebuild
new file mode 100644
index 00000000000..f043aa449b2
--- /dev/null
+++ b/kde-base/kaddressbook/kaddressbook-4.9999.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="The KDE Address Book"
+HOMEPAGE="http://www.kde.org/applications/office/kaddressbook/"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="
+	>=dev-libs/grantlee-0.2.0
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+	!kde-base/contactthemeeditor
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRA="
+	grantleeeditor/contactthemeeditor
+	plugins/kaddressbook/
+	plugins/ktexteditor/
+"
+KMCOMPILEONLY="
+	grantleetheme/
+	kaddressbookgrantlee/
+"
+KMEXTRACTONLY="
+	akonadi_next/
+	calendarsupport/
+	grantleeeditor/grantleethemeeditor/
+	libkleo/
+	pimcommon/
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
+		echo
+		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
+		echo
+	fi
+}
diff --git a/kde-base/kaddressbook/kaddressbook-9999.ebuild b/kde-base/kaddressbook/kaddressbook-9999.ebuild
deleted file mode 100644
index f043aa449b2..00000000000
--- a/kde-base/kaddressbook/kaddressbook-9999.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="The KDE Address Book"
-HOMEPAGE="http://www.kde.org/applications/office/kaddressbook/"
-KEYWORDS=""
-IUSE="debug"
-
-DEPEND="
-	>=dev-libs/grantlee-0.2.0
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-	!kde-base/contactthemeeditor
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRA="
-	grantleeeditor/contactthemeeditor
-	plugins/kaddressbook/
-	plugins/ktexteditor/
-"
-KMCOMPILEONLY="
-	grantleetheme/
-	kaddressbookgrantlee/
-"
-KMEXTRACTONLY="
-	akonadi_next/
-	calendarsupport/
-	grantleeeditor/grantleethemeeditor/
-	libkleo/
-	pimcommon/
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
-		echo
-		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
-		echo
-	fi
-}
diff --git a/kde-base/kalarm/kalarm-4.9999.ebuild b/kde-base/kalarm/kalarm-4.9999.ebuild
new file mode 100644
index 00000000000..c33577563e0
--- /dev/null
+++ b/kde-base/kalarm/kalarm-4.9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
+HOMEPAGE+=" http://userbase.kde.org/KAlarm"
+KEYWORDS=""
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+	media-libs/phonon[qt4]
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+
+KMEXTRACTONLY="
+	kmail/
+"
diff --git a/kde-base/kalarm/kalarm-9999.ebuild b/kde-base/kalarm/kalarm-9999.ebuild
deleted file mode 100644
index c33577563e0..00000000000
--- a/kde-base/kalarm/kalarm-9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
-HOMEPAGE+=" http://userbase.kde.org/KAlarm"
-KEYWORDS=""
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-	media-libs/phonon[qt4]
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-
-KMEXTRACTONLY="
-	kmail/
-"
diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.9999.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.9999.ebuild
new file mode 100644
index 00000000000..ed598178f1e
--- /dev/null
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.9999.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KMNAME="kdepim"
+KMNOMODULE="true"
+inherit kde4-meta
+
+DESCRIPTION="Common libraries for KDE PIM apps"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="
+	app-crypt/gpgme
+	>=app-office/akonadi-server-1.12.90
+	dev-libs/grantlee
+	$(add_kdebase_dep baloo)
+	$(add_kdebase_dep kdepimlibs)
+"
+RDEPEND="${DEPEND}
+	!kde-base/akonadi:4
+	!kde-base/libkdepim:4
+	!kde-base/libkleo:4
+	!kde-base/libkpgp:4
+	!<kde-base/kaddressbook-4.11.50:4
+	!kde-base/kdepim-wizards:4
+	!<kde-base/kmail-4.4.80:4
+	!=kde-base/kmail-4.11*
+	!=kde-base/kmail-4.12.0
+	!=kde-base/kmail-4.12.1
+	!<kde-base/kmail-4.13.60
+	!<kde-base/korganizer-4.5.67:4
+	app-crypt/gnupg
+	$(add_kdebase_dep kdepim-runtime)
+"
+
+RESTRICT="test"
+# bug 393131
+
+KMEXTRA="
+	agents/sendlateragent/
+	akonadi_next/
+	calendarsupport/
+	calendarviews/
+	composereditor-ng/
+	grantleeeditor/grantleethemeeditor/
+	grantleetheme/
+	kaddressbookgrantlee/
+	incidenceeditor-ng/
+	libkdepim/
+	libkdepimdbusinterfaces/
+	libkleo/
+	libkpgp/
+	kdgantt2/
+	messagecomposer/
+	messagecore/
+	messagelist/
+	messageviewer/
+	noteshared/
+	pimcommon/
+	templateparser/
+"
+KMEXTRACTONLY="
+	kleopatra/
+	kmail/
+	knode/org.kde.knode.xml
+	korgac/org.kde.korganizer.KOrgac.xml
+	korganizer/org.kde.korganizer.Korganizer.xml
+	mailcommon/
+"
+KMSAVELIBS="true"
+
+PATCHES=( "${FILESDIR}/install-composereditorng.patch" )
+
+src_prepare() {
+	kde4-meta_src_prepare
+	sed -e '/folderarchiveagent.desktop/d' \
+		-i agents/CMakeLists.txt || die
+}
diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-9999.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-9999.ebuild
deleted file mode 100644
index ed598178f1e..00000000000
--- a/kde-base/kdepim-common-libs/kdepim-common-libs-9999.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KMNAME="kdepim"
-KMNOMODULE="true"
-inherit kde4-meta
-
-DESCRIPTION="Common libraries for KDE PIM apps"
-KEYWORDS=""
-IUSE="debug"
-
-DEPEND="
-	app-crypt/gpgme
-	>=app-office/akonadi-server-1.12.90
-	dev-libs/grantlee
-	$(add_kdebase_dep baloo)
-	$(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}
-	!kde-base/akonadi:4
-	!kde-base/libkdepim:4
-	!kde-base/libkleo:4
-	!kde-base/libkpgp:4
-	!<kde-base/kaddressbook-4.11.50:4
-	!kde-base/kdepim-wizards:4
-	!<kde-base/kmail-4.4.80:4
-	!=kde-base/kmail-4.11*
-	!=kde-base/kmail-4.12.0
-	!=kde-base/kmail-4.12.1
-	!<kde-base/kmail-4.13.60
-	!<kde-base/korganizer-4.5.67:4
-	app-crypt/gnupg
-	$(add_kdebase_dep kdepim-runtime)
-"
-
-RESTRICT="test"
-# bug 393131
-
-KMEXTRA="
-	agents/sendlateragent/
-	akonadi_next/
-	calendarsupport/
-	calendarviews/
-	composereditor-ng/
-	grantleeeditor/grantleethemeeditor/
-	grantleetheme/
-	kaddressbookgrantlee/
-	incidenceeditor-ng/
-	libkdepim/
-	libkdepimdbusinterfaces/
-	libkleo/
-	libkpgp/
-	kdgantt2/
-	messagecomposer/
-	messagecore/
-	messagelist/
-	messageviewer/
-	noteshared/
-	pimcommon/
-	templateparser/
-"
-KMEXTRACTONLY="
-	kleopatra/
-	kmail/
-	knode/org.kde.knode.xml
-	korgac/org.kde.korganizer.KOrgac.xml
-	korganizer/org.kde.korganizer.Korganizer.xml
-	mailcommon/
-"
-KMSAVELIBS="true"
-
-PATCHES=( "${FILESDIR}/install-composereditorng.patch" )
-
-src_prepare() {
-	kde4-meta_src_prepare
-	sed -e '/folderarchiveagent.desktop/d' \
-		-i agents/CMakeLists.txt || die
-}
diff --git a/kde-base/kdepim-icons/kdepim-icons-4.9999.ebuild b/kde-base/kdepim-icons/kdepim-icons-4.9999.ebuild
new file mode 100644
index 00000000000..db524ab238f
--- /dev/null
+++ b/kde-base/kdepim-icons/kdepim-icons-4.9999.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KMNAME="kdepim"
+KMMODULE="icons"
+inherit kde4-meta
+
+DESCRIPTION="KDE PIM icons"
+IUSE=""
+KEYWORDS=""
+
+DEPEND="$(add_kdebase_dep kdepimlibs)"
+RDEPEND=""
diff --git a/kde-base/kdepim-icons/kdepim-icons-9999.ebuild b/kde-base/kdepim-icons/kdepim-icons-9999.ebuild
deleted file mode 100644
index db524ab238f..00000000000
--- a/kde-base/kdepim-icons/kdepim-icons-9999.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KMNAME="kdepim"
-KMMODULE="icons"
-inherit kde4-meta
-
-DESCRIPTION="KDE PIM icons"
-IUSE=""
-KEYWORDS=""
-
-DEPEND="$(add_kdebase_dep kdepimlibs)"
-RDEPEND=""
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-4.9999.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-4.9999.ebuild
new file mode 100644
index 00000000000..95cb8f23d48
--- /dev/null
+++ b/kde-base/kdepim-kresources/kdepim-kresources-4.9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KMNAME="kdepim"
+KMMODULE="kresources"
+inherit kde4-meta
+
+DESCRIPTION="KDE PIM groupware plugin collection"
+IUSE="debug"
+KEYWORDS=""
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	kmail/
+	knotes/
+	korganizer/version.h
+"
+
+KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-9999.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-9999.ebuild
deleted file mode 100644
index 95cb8f23d48..00000000000
--- a/kde-base/kdepim-kresources/kdepim-kresources-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KMNAME="kdepim"
-KMMODULE="kresources"
-inherit kde4-meta
-
-DESCRIPTION="KDE PIM groupware plugin collection"
-IUSE="debug"
-KEYWORDS=""
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	kmail/
-	knotes/
-	korganizer/version.h
-"
-
-KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.9999.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.9999.ebuild
new file mode 100644
index 00000000000..c0e64e5d0f8
--- /dev/null
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.9999.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KMNAME="kdepim-runtime"
+inherit kde4-base
+
+DESCRIPTION="KDE PIM runtime plugin collection"
+KEYWORDS=""
+IUSE="debug facebook google kolab"
+
+RESTRICT="test"
+# Would need test programs _testrunner and akonaditest from kdepimlibs, see bug 313233
+
+DEPEND="
+	>=app-office/akonadi-server-1.12.90
+	dev-libs/boost:=
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	$(add_kdebase_dep kdepimlibs)
+	x11-misc/shared-mime-info
+	facebook? ( net-libs/libkfbapi )
+	google? ( >=net-libs/libkgapi-2.0 )
+	kolab? ( >=net-libs/libkolab-0.5 )
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kdepim-icons)
+	!kde-misc/akonadi-google
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package facebook LibKFbAPI)
+		$(cmake-utils_use_find_package google LibKGAPI2)
+		$(cmake-utils_use_find_package kolab Libkolab)
+		$(cmake-utils_use_find_package kolab Libkolabxml)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-9999.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-9999.ebuild
deleted file mode 100644
index c0e64e5d0f8..00000000000
--- a/kde-base/kdepim-runtime/kdepim-runtime-9999.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KMNAME="kdepim-runtime"
-inherit kde4-base
-
-DESCRIPTION="KDE PIM runtime plugin collection"
-KEYWORDS=""
-IUSE="debug facebook google kolab"
-
-RESTRICT="test"
-# Would need test programs _testrunner and akonaditest from kdepimlibs, see bug 313233
-
-DEPEND="
-	>=app-office/akonadi-server-1.12.90
-	dev-libs/boost:=
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	$(add_kdebase_dep kdepimlibs)
-	x11-misc/shared-mime-info
-	facebook? ( net-libs/libkfbapi )
-	google? ( >=net-libs/libkgapi-2.0 )
-	kolab? ( >=net-libs/libkolab-0.5 )
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdepim-icons)
-	!kde-misc/akonadi-google
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package facebook LibKFbAPI)
-		$(cmake-utils_use_find_package google LibKGAPI2)
-		$(cmake-utils_use_find_package kolab Libkolab)
-		$(cmake-utils_use_find_package kolab Libkolabxml)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/kde-base/kjots/kjots-4.9999.ebuild b/kde-base/kjots/kjots-4.9999.ebuild
new file mode 100644
index 00000000000..31602890568
--- /dev/null
+++ b/kde-base/kjots/kjots-4.9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="KDE note taking utility"
+HOMEPAGE="http://www.kde.org/applications/utilities/kjots/"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="
+	>=dev-libs/grantlee-0.2.0
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	akonadi_next/
+	noteshared/
+"
diff --git a/kde-base/kjots/kjots-9999.ebuild b/kde-base/kjots/kjots-9999.ebuild
deleted file mode 100644
index 31602890568..00000000000
--- a/kde-base/kjots/kjots-9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KDE note taking utility"
-HOMEPAGE="http://www.kde.org/applications/utilities/kjots/"
-KEYWORDS=""
-IUSE="debug"
-
-DEPEND="
-	>=dev-libs/grantlee-0.2.0
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	akonadi_next/
-	noteshared/
-"
diff --git a/kde-base/kleopatra/kleopatra-4.9999.ebuild b/kde-base/kleopatra/kleopatra-4.9999.ebuild
new file mode 100644
index 00000000000..afcc7a8738a
--- /dev/null
+++ b/kde-base/kleopatra/kleopatra-4.9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="Kleopatra - KDE X.509 key manager"
+HOMEPAGE="http://www.kde.org/applications/utilities/kleopatra/"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="
+	>=app-crypt/gpgme-1.3.2
+	dev-libs/boost:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+"
+
+KMEXTRACTONLY="
+	libkleo/
+"
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA="
+			doc/kwatchgnupg
+		"
+	fi
+
+	kde4-meta_src_unpack
+}
diff --git a/kde-base/kleopatra/kleopatra-9999.ebuild b/kde-base/kleopatra/kleopatra-9999.ebuild
deleted file mode 100644
index afcc7a8738a..00000000000
--- a/kde-base/kleopatra/kleopatra-9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="Kleopatra - KDE X.509 key manager"
-HOMEPAGE="http://www.kde.org/applications/utilities/kleopatra/"
-KEYWORDS=""
-IUSE="debug"
-
-DEPEND="
-	>=app-crypt/gpgme-1.3.2
-	dev-libs/boost:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}
-	app-crypt/gnupg
-"
-
-KMEXTRACTONLY="
-	libkleo/
-"
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA="
-			doc/kwatchgnupg
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
diff --git a/kde-base/kmail/kmail-4.9999.ebuild b/kde-base/kmail/kmail-4.9999.ebuild
new file mode 100644
index 00000000000..dfcfa2a4263
--- /dev/null
+++ b/kde-base/kmail/kmail-4.9999.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+VIRTUALX_REQUIRED=test
+inherit flag-o-matic kde4-meta
+
+DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE"
+HOMEPAGE="http://www.kde.org/applications/internet/kmail/"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep korganizer)
+	$(add_kdebase_dep kdepim-common-libs "" 4.12.1-r2)
+"
+RDEPEND="
+	${DEPEND}
+	!=kde-base/kdepim-common-libs-4.12.1-r1
+"
+
+RESTRICT="test"
+# bug 393147
+
+KMEXTRACTONLY="
+	agents/folderarchiveagent.desktop
+	agents/sendlateragent/
+	akonadi_next/
+	calendarsupport/
+	calendarviews/
+	grantleeeditor/grantleethemeeditor/
+	korganizer/
+	kresources/
+	libkleo/
+	libkpgp/
+	libkdepimdbusinterfaces/
+	kdgantt2/
+"
+KMCOMPILEONLY="
+	grantleetheme/
+	kaddressbookgrantlee/
+	messagecomposer/
+	messagecore/
+	messagelist/
+	messageviewer/
+	pimcommon/
+	templateparser/
+	incidenceeditor-ng/
+	calendarsupport/
+	noteshared/
+"
+KMEXTRA="
+	agents/archivemailagent/
+	agents/followupreminderagent/
+	agents/mailfilteragent/
+	grantleeeditor/headerthemeeditor/
+	kmailcvt/
+	ksendemail/
+	importwizard/
+	libksieve/
+	mailcommon/
+	mailimporter/
+	mboximporter/
+	pimsettingexporter/
+	plugins/messageviewer/
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+src_configure() {
+	# Bug 308903
+	use ppc64 && append-flags -mminimal-toc
+
+	kde4-meta_src_configure
+}
+
+src_compile() {
+	kde4-meta_src_compile kmail_xml
+	kde4-meta_src_compile
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
+		echo
+		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
+		echo
+	fi
+	if ! has_version kde-base/kleopatra:${SLOT}; then
+		echo
+		elog "For certificate management and the gnupg log viewer, please install kde-base/kleopatra:${SLOT}"
+		echo
+	fi
+
+	if has_version "app-office/akonadi-server[sqlite]"; then
+		ewarn
+		ewarn "We strongly recommend you set your Akonadi database backend to QMYSQL in your"
+		ewarn "user configuration. This is the backend recommended by KDE upstream."
+		ewarn "Reports indicate that kde-base/kmail-4.10 does not work properly with the sqlite"
+		ewarn "backend anymore."
+		if has_version "app-office/akonadi-server[-mysql]"; then
+			ewarn "FOR THAT, YOU WILL HAVE TO RE-BUILD app-office/akonadi-server WITH mysql USEFLAG ENABLED."
+		fi
+		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
+		ewarn
+	fi
+}
diff --git a/kde-base/kmail/kmail-9999.ebuild b/kde-base/kmail/kmail-9999.ebuild
deleted file mode 100644
index dfcfa2a4263..00000000000
--- a/kde-base/kmail/kmail-9999.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-VIRTUALX_REQUIRED=test
-inherit flag-o-matic kde4-meta
-
-DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE"
-HOMEPAGE="http://www.kde.org/applications/internet/kmail/"
-KEYWORDS=""
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep korganizer)
-	$(add_kdebase_dep kdepim-common-libs "" 4.12.1-r2)
-"
-RDEPEND="
-	${DEPEND}
-	!=kde-base/kdepim-common-libs-4.12.1-r1
-"
-
-RESTRICT="test"
-# bug 393147
-
-KMEXTRACTONLY="
-	agents/folderarchiveagent.desktop
-	agents/sendlateragent/
-	akonadi_next/
-	calendarsupport/
-	calendarviews/
-	grantleeeditor/grantleethemeeditor/
-	korganizer/
-	kresources/
-	libkleo/
-	libkpgp/
-	libkdepimdbusinterfaces/
-	kdgantt2/
-"
-KMCOMPILEONLY="
-	grantleetheme/
-	kaddressbookgrantlee/
-	messagecomposer/
-	messagecore/
-	messagelist/
-	messageviewer/
-	pimcommon/
-	templateparser/
-	incidenceeditor-ng/
-	calendarsupport/
-	noteshared/
-"
-KMEXTRA="
-	agents/archivemailagent/
-	agents/followupreminderagent/
-	agents/mailfilteragent/
-	grantleeeditor/headerthemeeditor/
-	kmailcvt/
-	ksendemail/
-	importwizard/
-	libksieve/
-	mailcommon/
-	mailimporter/
-	mboximporter/
-	pimsettingexporter/
-	plugins/messageviewer/
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-src_configure() {
-	# Bug 308903
-	use ppc64 && append-flags -mminimal-toc
-
-	kde4-meta_src_configure
-}
-
-src_compile() {
-	kde4-meta_src_compile kmail_xml
-	kde4-meta_src_compile
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
-		echo
-		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
-		echo
-	fi
-	if ! has_version kde-base/kleopatra:${SLOT}; then
-		echo
-		elog "For certificate management and the gnupg log viewer, please install kde-base/kleopatra:${SLOT}"
-		echo
-	fi
-
-	if has_version "app-office/akonadi-server[sqlite]"; then
-		ewarn
-		ewarn "We strongly recommend you set your Akonadi database backend to QMYSQL in your"
-		ewarn "user configuration. This is the backend recommended by KDE upstream."
-		ewarn "Reports indicate that kde-base/kmail-4.10 does not work properly with the sqlite"
-		ewarn "backend anymore."
-		if has_version "app-office/akonadi-server[-mysql]"; then
-			ewarn "FOR THAT, YOU WILL HAVE TO RE-BUILD app-office/akonadi-server WITH mysql USEFLAG ENABLED."
-		fi
-		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
-		ewarn
-	fi
-}
diff --git a/kde-base/knode/knode-4.9999.ebuild b/kde-base/knode/knode-4.9999.ebuild
new file mode 100644
index 00000000000..bcc66d1df11
--- /dev/null
+++ b/kde-base/knode/knode-4.9999.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="A newsreader for KDE"
+HOMEPAGE="http://www.kde.org/applications/internet/knode/"
+KEYWORDS=""
+IUSE="debug"
+
+# test fails, last checked for 4.2.96
+RESTRICT=test
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs "" 4.12.1-r1)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	agents/
+	libkleo/
+	libkpgp/
+	messagecomposer/
+	messageviewer/
+	messagecore/
+"
+KMCOMPILEONLY="
+	grantleetheme/
+	kaddressbookgrantlee/
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA="
+			doc/kioslave/news
+		"
+	fi
+
+	kde4-meta_src_unpack
+}
diff --git a/kde-base/knode/knode-9999.ebuild b/kde-base/knode/knode-9999.ebuild
deleted file mode 100644
index bcc66d1df11..00000000000
--- a/kde-base/knode/knode-9999.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="A newsreader for KDE"
-HOMEPAGE="http://www.kde.org/applications/internet/knode/"
-KEYWORDS=""
-IUSE="debug"
-
-# test fails, last checked for 4.2.96
-RESTRICT=test
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs "" 4.12.1-r1)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	agents/
-	libkleo/
-	libkpgp/
-	messagecomposer/
-	messageviewer/
-	messagecore/
-"
-KMCOMPILEONLY="
-	grantleetheme/
-	kaddressbookgrantlee/
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA="
-			doc/kioslave/news
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
diff --git a/kde-base/knotes/knotes-4.9999.ebuild b/kde-base/knotes/knotes-4.9999.ebuild
new file mode 100644
index 00000000000..3ba5c633b25
--- /dev/null
+++ b/kde-base/knotes/knotes-4.9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="KDE Notes application"
+HOMEPAGE="http://www.kde.org/applications/utilities/knotes/"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMCOMPILEONLY="
+	noteshared/
+"
+
+KMEXTRACTONLY="
+	akonadi_next/
+	pimcommon/
+"
+
+KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/knotes/knotes-9999.ebuild b/kde-base/knotes/knotes-9999.ebuild
deleted file mode 100644
index 3ba5c633b25..00000000000
--- a/kde-base/knotes/knotes-9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KDE Notes application"
-HOMEPAGE="http://www.kde.org/applications/utilities/knotes/"
-KEYWORDS=""
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMCOMPILEONLY="
-	noteshared/
-"
-
-KMEXTRACTONLY="
-	akonadi_next/
-	pimcommon/
-"
-
-KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/konsolekalendar/konsolekalendar-4.9999.ebuild b/kde-base/konsolekalendar/konsolekalendar-4.9999.ebuild
new file mode 100644
index 00000000000..c18e30c3047
--- /dev/null
+++ b/kde-base/konsolekalendar/konsolekalendar-4.9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KMMODULE="console/${PN}"
+inherit kde4-meta
+
+DESCRIPTION="A command line interface to KDE calendars"
+HOMEPAGE+=" http://userbase.kde.org/KonsoleKalendar"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMCOMPILEONLY="
+	calendarsupport/
+"
+KMEXTRACTONLY="
+	calendarviews/
+	libkdepimdbusinterfaces/
+"
+
+KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/konsolekalendar/konsolekalendar-9999.ebuild b/kde-base/konsolekalendar/konsolekalendar-9999.ebuild
deleted file mode 100644
index c18e30c3047..00000000000
--- a/kde-base/konsolekalendar/konsolekalendar-9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KMMODULE="console/${PN}"
-inherit kde4-meta
-
-DESCRIPTION="A command line interface to KDE calendars"
-HOMEPAGE+=" http://userbase.kde.org/KonsoleKalendar"
-KEYWORDS=""
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMCOMPILEONLY="
-	calendarsupport/
-"
-KMEXTRACTONLY="
-	calendarviews/
-	libkdepimdbusinterfaces/
-"
-
-KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/kontact/kontact-4.9999.ebuild b/kde-base/kontact/kontact-4.9999.ebuild
new file mode 100644
index 00000000000..3e95fc17342
--- /dev/null
+++ b/kde-base/kontact/kontact-4.9999.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="KDE personal information manager"
+HOMEPAGE="http://www.kde.org/applications/office/kontact/"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMLOADLIBS="kdepim-common-libs"
+KMSAVELIBS="true"
+
+# We remove plugins that are related to external kdepim programs. This way
+# kontact doesn't have to depend on all programs it has plugins for.
+# kcontactmanager gone from kdesvn
+#
+KMEXTRACTONLY="
+	kontact/plugins/akregator/
+	kontact/plugins/kaddressbook/
+	kontact/plugins/kjots/
+	kontact/plugins/kmail/
+	kontact/plugins/knode/
+	kontact/plugins/knotes/
+	kontact/plugins/korganizer/
+	kontact/plugins/ktimetracker/
+	kontact/plugins/planner/
+	kontact/plugins/specialdates/
+	libkdepimdbusinterfaces/
+"
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA+="
+			doc/kontact-admin/
+		"
+	fi
+
+	kde4-meta_src_unpack
+}
diff --git a/kde-base/kontact/kontact-9999.ebuild b/kde-base/kontact/kontact-9999.ebuild
deleted file mode 100644
index 3e95fc17342..00000000000
--- a/kde-base/kontact/kontact-9999.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KDE personal information manager"
-HOMEPAGE="http://www.kde.org/applications/office/kontact/"
-KEYWORDS=""
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMLOADLIBS="kdepim-common-libs"
-KMSAVELIBS="true"
-
-# We remove plugins that are related to external kdepim programs. This way
-# kontact doesn't have to depend on all programs it has plugins for.
-# kcontactmanager gone from kdesvn
-#
-KMEXTRACTONLY="
-	kontact/plugins/akregator/
-	kontact/plugins/kaddressbook/
-	kontact/plugins/kjots/
-	kontact/plugins/kmail/
-	kontact/plugins/knode/
-	kontact/plugins/knotes/
-	kontact/plugins/korganizer/
-	kontact/plugins/ktimetracker/
-	kontact/plugins/planner/
-	kontact/plugins/specialdates/
-	libkdepimdbusinterfaces/
-"
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA+="
-			doc/kontact-admin/
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
diff --git a/kde-base/korganizer/korganizer-4.9999.ebuild b/kde-base/korganizer/korganizer-4.9999.ebuild
new file mode 100644
index 00000000000..c680fbd43d9
--- /dev/null
+++ b/kde-base/korganizer/korganizer-4.9999.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="A Personal Organizer for KDE"
+HOMEPAGE="http://www.kde.org/applications/office/korganizer/"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep ktimezoned)
+"
+
+RESTRICT="test"
+# bug 393135
+
+KMLOADLIBS="kdepim-common-libs"
+
+KMEXTRA="
+	korgac/
+"
+
+KMEXTRACTONLY="
+	akonadi_next/
+	calendarviews/
+	kdgantt2/
+	kmail/
+	pimcommon/
+	knode/org.kde.knode.xml
+	libkdepimdbusinterfaces/
+	korgac/org.kde.korganizer.KOrgac.xml
+"
+
+KMCOMPILEONLY="
+	incidenceeditor-ng/
+	calendarsupport/
+"
+
+src_unpack() {
+	if use kontact; then
+		KMEXTRA="${KMEXTRA}
+			kontact/plugins/planner/
+			kontact/plugins/specialdates/
+		"
+	fi
+
+	kde4-meta_src_unpack
+}
+
+src_install() {
+	kde4-meta_src_install
+	# colliding with kdepim-common-libs
+	rm -rf "${ED}"/usr/share/kde4/servicetypes/calendarplugin.desktop
+	rm -rf "${ED}"/usr/share/kde4/servicetypes/calendardecoration.desktop
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
+		echo
+		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
+		echo
+	fi
+}
diff --git a/kde-base/korganizer/korganizer-9999.ebuild b/kde-base/korganizer/korganizer-9999.ebuild
deleted file mode 100644
index c680fbd43d9..00000000000
--- a/kde-base/korganizer/korganizer-9999.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="A Personal Organizer for KDE"
-HOMEPAGE="http://www.kde.org/applications/office/korganizer/"
-KEYWORDS=""
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep ktimezoned)
-"
-
-RESTRICT="test"
-# bug 393135
-
-KMLOADLIBS="kdepim-common-libs"
-
-KMEXTRA="
-	korgac/
-"
-
-KMEXTRACTONLY="
-	akonadi_next/
-	calendarviews/
-	kdgantt2/
-	kmail/
-	pimcommon/
-	knode/org.kde.knode.xml
-	libkdepimdbusinterfaces/
-	korgac/org.kde.korganizer.KOrgac.xml
-"
-
-KMCOMPILEONLY="
-	incidenceeditor-ng/
-	calendarsupport/
-"
-
-src_unpack() {
-	if use kontact; then
-		KMEXTRA="${KMEXTRA}
-			kontact/plugins/planner/
-			kontact/plugins/specialdates/
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
-
-src_install() {
-	kde4-meta_src_install
-	# colliding with kdepim-common-libs
-	rm -rf "${ED}"/usr/share/kde4/servicetypes/calendarplugin.desktop
-	rm -rf "${ED}"/usr/share/kde4/servicetypes/calendardecoration.desktop
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
-		echo
-		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
-		echo
-	fi
-}
diff --git a/kde-base/ktimetracker/ktimetracker-4.9999.ebuild b/kde-base/ktimetracker/ktimetracker-4.9999.ebuild
new file mode 100644
index 00000000000..e038a230372
--- /dev/null
+++ b/kde-base/ktimetracker/ktimetracker-4.9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="KTimeTracker tracks time spent on various tasks"
+HOEMPAGE="http://www.kde.org/applications/utilities/ktimetracker/"
+KEYWORDS=""
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep kdepim-kresources)
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+	x11-libs/libXScrnSaver
+"
+DEPEND="${RDEPEND}
+	x11-proto/scrnsaverproto
+"
+
+KMEXTRACTONLY="
+	kresources/
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+src_unpack() {
+	if use kontact; then
+		KMEXTRA="${KMEXTRA} kontact/plugins/ktimetracker"
+	fi
+
+	kde4-meta_src_unpack
+}
diff --git a/kde-base/ktimetracker/ktimetracker-9999.ebuild b/kde-base/ktimetracker/ktimetracker-9999.ebuild
deleted file mode 100644
index e038a230372..00000000000
--- a/kde-base/ktimetracker/ktimetracker-9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KTimeTracker tracks time spent on various tasks"
-HOEMPAGE="http://www.kde.org/applications/utilities/ktimetracker/"
-KEYWORDS=""
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep kdepim-kresources)
-	$(add_kdebase_dep kdepimlibs)
-	$(add_kdebase_dep kdepim-common-libs)
-	x11-libs/libXScrnSaver
-"
-DEPEND="${RDEPEND}
-	x11-proto/scrnsaverproto
-"
-
-KMEXTRACTONLY="
-	kresources/
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-src_unpack() {
-	if use kontact; then
-		KMEXTRA="${KMEXTRA} kontact/plugins/ktimetracker"
-	fi
-
-	kde4-meta_src_unpack
-}
diff --git a/kde-base/ktnef/ktnef-4.9999.ebuild b/kde-base/ktnef/ktnef-4.9999.ebuild
new file mode 100644
index 00000000000..309732ca292
--- /dev/null
+++ b/kde-base/ktnef/ktnef-4.9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="A viewer for TNEF attachments"
+KEYWORDS=""
+LICENSE="LGPL-2.1"
+IUSE="debug"
+
+DEPEND="
+	app-office/akonadi-server
+	$(add_kdebase_dep kdepimlibs)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	akonadi/
+"
diff --git a/kde-base/ktnef/ktnef-9999.ebuild b/kde-base/ktnef/ktnef-9999.ebuild
deleted file mode 100644
index 309732ca292..00000000000
--- a/kde-base/ktnef/ktnef-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="A viewer for TNEF attachments"
-KEYWORDS=""
-LICENSE="LGPL-2.1"
-IUSE="debug"
-
-DEPEND="
-	app-office/akonadi-server
-	$(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	akonadi/
-"
-- 
cgit v1.2.3