public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: kde-apps/kaddressbook/, kde-apps/kaccounts-mobile/, kde-apps/messagelib/, ...
@ 2019-09-19 15:47 Andreas Sturmlechner
  0 siblings, 0 replies; only message in thread
From: Andreas Sturmlechner @ 2019-09-19 15:47 UTC (permalink / raw
  To: gentoo-commits

commit:     04e59592c689388aa37ee66821c607744f6a613e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 19 07:18:44 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 19 07:37:09 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=04e59592

*/*: Switch to kde-frameworks/kcalendarcore, kde-frameworks/kcontacts

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/kmymoney/kmymoney-5.0.9999.ebuild                          | 2 +-
 app-office/kmymoney/kmymoney-9999.ebuild                              | 2 +-
 app-office/kraft/kraft-9999.ebuild                                    | 2 +-
 dev-libs/kpeoplevcard/kpeoplevcard-9999.ebuild                        | 2 +-
 kde-apps/akonadi-calendar/akonadi-calendar-19.08.49.9999.ebuild       | 2 +-
 kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild                | 2 +-
 kde-apps/akonadi-contacts/akonadi-contacts-19.08.49.9999.ebuild       | 2 +-
 kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild                | 2 +-
 .../akonadi-import-wizard/akonadi-import-wizard-19.08.49.9999.ebuild  | 2 +-
 kde-apps/akonadi-import-wizard/akonadi-import-wizard-9999.ebuild      | 2 +-
 kde-apps/akonadi-search/akonadi-search-19.08.49.9999.ebuild           | 4 ++--
 kde-apps/akonadi-search/akonadi-search-9999.ebuild                    | 4 ++--
 kde-apps/akonadiconsole/akonadiconsole-19.08.49.9999.ebuild           | 4 ++--
 kde-apps/akonadiconsole/akonadiconsole-9999.ebuild                    | 4 ++--
 kde-apps/calendarjanitor/calendarjanitor-19.08.49.9999.ebuild         | 2 +-
 kde-apps/calendarjanitor/calendarjanitor-9999.ebuild                  | 2 +-
 kde-apps/calendarsupport/calendarsupport-19.08.49.9999.ebuild         | 2 +-
 kde-apps/calendarsupport/calendarsupport-9999.ebuild                  | 2 +-
 kde-apps/eventviews/eventviews-19.08.49.9999.ebuild                   | 4 ++--
 kde-apps/eventviews/eventviews-9999.ebuild                            | 4 ++--
 kde-apps/grantlee-editor/grantlee-editor-19.08.49.9999.ebuild         | 2 +-
 kde-apps/grantlee-editor/grantlee-editor-9999.ebuild                  | 2 +-
 kde-apps/incidenceeditor/incidenceeditor-19.08.49.9999.ebuild         | 4 ++--
 kde-apps/incidenceeditor/incidenceeditor-9999.ebuild                  | 4 ++--
 kde-apps/kaccounts-mobile/kaccounts-mobile-9999.ebuild                | 2 +-
 kde-apps/kaddressbook/kaddressbook-19.08.49.9999.ebuild               | 2 +-
 kde-apps/kaddressbook/kaddressbook-9999.ebuild                        | 2 +-
 kde-apps/kalarm/kalarm-19.08.49.9999.ebuild                           | 4 ++--
 kde-apps/kalarm/kalarm-9999.ebuild                                    | 4 ++--
 kde-apps/kalarmcal/kalarmcal-19.08.49.9999.ebuild                     | 2 +-
 kde-apps/kalarmcal/kalarmcal-9999.ebuild                              | 2 +-
 kde-apps/kblog/kblog-19.08.49.9999.ebuild                             | 2 +-
 kde-apps/kblog/kblog-9999.ebuild                                      | 2 +-
 kde-apps/kcalutils/kcalutils-19.08.49.9999.ebuild                     | 2 +-
 kde-apps/kcalutils/kcalutils-9999.ebuild                              | 2 +-
 kde-apps/kdepim-addons/kdepim-addons-19.08.49.9999.ebuild             | 2 +-
 kde-apps/kdepim-addons/kdepim-addons-9999.ebuild                      | 2 +-
 kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.08.49.9999.ebuild       | 2 +-
 kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild                | 2 +-
 kde-apps/kdepim-meta/kdepim-meta-19.08.49.9999.ebuild                 | 2 --
 kde-apps/kdepim-meta/kdepim-meta-9999.ebuild                          | 2 --
 kde-apps/kdepim-runtime/kdepim-runtime-19.08.49.9999.ebuild           | 4 ++--
 kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild                    | 4 ++--
 kde-apps/kgpg/kgpg-19.08.49.9999.ebuild                               | 2 +-
 kde-apps/kgpg/kgpg-9999.ebuild                                        | 2 +-
 kde-apps/kitinerary/kitinerary-19.08.49.9999.ebuild                   | 4 ++--
 kde-apps/kitinerary/kitinerary-9999.ebuild                            | 4 ++--
 kde-apps/kmail/kmail-19.08.49.9999.ebuild                             | 4 ++--
 kde-apps/kmail/kmail-9999.ebuild                                      | 4 ++--
 kde-apps/knotes/knotes-19.08.49.9999.ebuild                           | 4 ++--
 kde-apps/knotes/knotes-9999.ebuild                                    | 4 ++--
 kde-apps/konsolekalendar/konsolekalendar-19.08.49.9999.ebuild         | 2 +-
 kde-apps/konsolekalendar/konsolekalendar-9999.ebuild                  | 2 +-
 kde-apps/kopete/kopete-19.08.49.9999.ebuild                           | 2 +-
 kde-apps/kopete/kopete-9999.ebuild                                    | 2 +-
 kde-apps/korganizer/korganizer-19.08.49.9999.ebuild                   | 4 ++--
 kde-apps/korganizer/korganizer-9999.ebuild                            | 4 ++--
 kde-apps/libkdepim/libkdepim-19.08.49.9999.ebuild                     | 2 +-
 kde-apps/libkdepim/libkdepim-9999.ebuild                              | 2 +-
 kde-apps/libkgapi/libkgapi-19.08.49.9999.ebuild                       | 4 ++--
 kde-apps/libkgapi/libkgapi-9999.ebuild                                | 4 ++--
 kde-apps/libktnef/libktnef-19.08.49.9999.ebuild                       | 4 ++--
 kde-apps/libktnef/libktnef-9999.ebuild                                | 4 ++--
 kde-apps/mailcommon/mailcommon-19.08.49.9999.ebuild                   | 2 +-
 kde-apps/mailcommon/mailcommon-9999.ebuild                            | 2 +-
 kde-apps/messagelib/messagelib-19.08.49.9999.ebuild                   | 4 ++--
 kde-apps/messagelib/messagelib-9999.ebuild                            | 4 ++--
 kde-apps/pim-data-exporter/pim-data-exporter-19.08.49.9999.ebuild     | 2 +-
 kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild              | 2 +-
 kde-apps/pim-sieve-editor/pim-sieve-editor-19.08.49.9999.ebuild       | 4 ++--
 kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild                | 4 ++--
 kde-apps/pimcommon/pimcommon-19.08.49.9999.ebuild                     | 2 +-
 kde-apps/pimcommon/pimcommon-9999.ebuild                              | 2 +-
 .../akonadi-phabricator-resource-9999.ebuild                          | 2 +-
 kde-misc/akonadiclient/akonadiclient-9999.ebuild                      | 2 +-
 kde-misc/itinerary/itinerary-9999.ebuild                              | 2 +-
 kde-misc/ktimetracker/ktimetracker-9999.ebuild                        | 2 +-
 kde-misc/zanshin/zanshin-9999.ebuild                                  | 4 ++--
 media-gfx/digikam/digikam-9999.ebuild                                 | 4 ++--
 79 files changed, 107 insertions(+), 111 deletions(-)

diff --git a/app-office/kmymoney/kmymoney-5.0.9999.ebuild b/app-office/kmymoney/kmymoney-5.0.9999.ebuild
index e7469b8356..ba468eca16 100644
--- a/app-office/kmymoney/kmymoney-5.0.9999.ebuild
+++ b/app-office/kmymoney/kmymoney-5.0.9999.ebuild
@@ -61,8 +61,8 @@ COMMON_DEPEND="
 	dev-libs/libgpg-error
 	activities? ( $(add_frameworks_dep kactivities) )
 	addressbook? (
+		$(add_frameworks_dep kcontacts)
 		$(add_kdeapps_dep akonadi)
-		$(add_kdeapps_dep kcontacts)
 		$(add_kdeapps_dep kidentitymanagement)
 	)
 	calendar? ( dev-libs/libical:= )

diff --git a/app-office/kmymoney/kmymoney-9999.ebuild b/app-office/kmymoney/kmymoney-9999.ebuild
index caab8c9038..a9f1c77f0a 100644
--- a/app-office/kmymoney/kmymoney-9999.ebuild
+++ b/app-office/kmymoney/kmymoney-9999.ebuild
@@ -60,8 +60,8 @@ COMMON_DEPEND="
 	dev-libs/libgpg-error
 	activities? ( $(add_frameworks_dep kactivities) )
 	addressbook? (
+		$(add_frameworks_dep kcontacts)
 		$(add_kdeapps_dep akonadi)
-		$(add_kdeapps_dep kcontacts)
 		$(add_kdeapps_dep kidentitymanagement)
 	)
 	calendar? ( dev-libs/libical:= )

diff --git a/app-office/kraft/kraft-9999.ebuild b/app-office/kraft/kraft-9999.ebuild
index 5ff85b862e..64b25b530f 100644
--- a/app-office/kraft/kraft-9999.ebuild
+++ b/app-office/kraft/kraft-9999.ebuild
@@ -16,11 +16,11 @@ IUSE="pim"
 DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep kcontacts)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtsql)
 	$(add_qt_dep qtwidgets)

diff --git a/dev-libs/kpeoplevcard/kpeoplevcard-9999.ebuild b/dev-libs/kpeoplevcard/kpeoplevcard-9999.ebuild
index 555d5e2a58..ea1a6fc566 100644
--- a/dev-libs/kpeoplevcard/kpeoplevcard-9999.ebuild
+++ b/dev-libs/kpeoplevcard/kpeoplevcard-9999.ebuild
@@ -13,9 +13,9 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kpeople)
-	$(add_kdeapps_dep kcontacts)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "

diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-19.08.49.9999.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-19.08.49.9999.ebuild
index 454805cea2..32f18515b1 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-19.08.49.9999.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-19.08.49.9999.ebuild
@@ -12,6 +12,7 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -27,7 +28,6 @@ DEPEND="
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kmailtransport)

diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
index 454805cea2..32f18515b1 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
@@ -12,6 +12,7 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -27,7 +28,6 @@ DEPEND="
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kmailtransport)

diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-19.08.49.9999.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-19.08.49.9999.ebuild
index 8dee6162b1..674cd45fa3 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-19.08.49.9999.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-19.08.49.9999.ebuild
@@ -19,6 +19,7 @@ DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kiconthemes)
@@ -30,7 +31,6 @@ DEPEND="
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep prison)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kmime)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)

diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild
index 8dee6162b1..674cd45fa3 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild
@@ -19,6 +19,7 @@ DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kiconthemes)
@@ -30,7 +31,6 @@ DEPEND="
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep prison)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kmime)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)

diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.08.49.9999.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.08.49.9999.ebuild
index 5168e3991b..3b95348ba6 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.08.49.9999.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.08.49.9999.ebuild
@@ -15,6 +15,7 @@ IUSE=""
 DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
@@ -23,7 +24,6 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kmailtransport)
 	$(add_kdeapps_dep libkdepim)

diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-9999.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-9999.ebuild
index 5168e3991b..3b95348ba6 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-9999.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-9999.ebuild
@@ -15,6 +15,7 @@ IUSE=""
 DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
@@ -23,7 +24,6 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kmailtransport)
 	$(add_kdeapps_dep libkdepim)

diff --git a/kde-apps/akonadi-search/akonadi-search-19.08.49.9999.ebuild b/kde-apps/akonadi-search/akonadi-search-19.08.49.9999.ebuild
index 793a4c3645..bc95fadf79 100644
--- a/kde-apps/akonadi-search/akonadi-search-19.08.49.9999.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-19.08.49.9999.ebuild
@@ -17,10 +17,12 @@ BDEPEND="
 	test? ( $(add_kdeapps_dep akonadi 'tools') )
 "
 COMMON_DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kio)
@@ -28,8 +30,6 @@ COMMON_DEPEND="
 	$(add_frameworks_dep krunner)
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kmime)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)

diff --git a/kde-apps/akonadi-search/akonadi-search-9999.ebuild b/kde-apps/akonadi-search/akonadi-search-9999.ebuild
index 793a4c3645..bc95fadf79 100644
--- a/kde-apps/akonadi-search/akonadi-search-9999.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-9999.ebuild
@@ -17,10 +17,12 @@ BDEPEND="
 	test? ( $(add_kdeapps_dep akonadi 'tools') )
 "
 COMMON_DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kio)
@@ -28,8 +30,6 @@ COMMON_DEPEND="
 	$(add_frameworks_dep krunner)
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kmime)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)

diff --git a/kde-apps/akonadiconsole/akonadiconsole-19.08.49.9999.ebuild b/kde-apps/akonadiconsole/akonadiconsole-19.08.49.9999.ebuild
index ba334978cf..f2b080e922 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-19.08.49.9999.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-19.08.49.9999.ebuild
@@ -14,9 +14,11 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
@@ -31,8 +33,6 @@ DEPEND="
 	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-search)
 	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kmime)
 	$(add_kdeapps_dep libkdepim)
 	$(add_kdeapps_dep messagelib)

diff --git a/kde-apps/akonadiconsole/akonadiconsole-9999.ebuild b/kde-apps/akonadiconsole/akonadiconsole-9999.ebuild
index ba334978cf..4c4ac0788d 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-9999.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-9999.ebuild
@@ -31,8 +31,8 @@ DEPEND="
 	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-search)
 	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
+	$(add_frameworks_dep kcalendarcore)
+	$(add_frameworks_dep kcontacts)
 	$(add_kdeapps_dep kmime)
 	$(add_kdeapps_dep libkdepim)
 	$(add_kdeapps_dep messagelib)

diff --git a/kde-apps/calendarjanitor/calendarjanitor-19.08.49.9999.ebuild b/kde-apps/calendarjanitor/calendarjanitor-19.08.49.9999.ebuild
index f4a453f8d4..5908a010e9 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-19.08.49.9999.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-19.08.49.9999.ebuild
@@ -15,12 +15,12 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcoreaddons)
 	$(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)
 "
 RDEPEND="${DEPEND}

diff --git a/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild b/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild
index f4a453f8d4..5908a010e9 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild
@@ -15,12 +15,12 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcoreaddons)
 	$(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)
 "
 RDEPEND="${DEPEND}

diff --git a/kde-apps/calendarsupport/calendarsupport-19.08.49.9999.ebuild b/kde-apps/calendarsupport/calendarsupport-19.08.49.9999.ebuild
index 86a6d6c13f..93def382b9 100644
--- a/kde-apps/calendarsupport/calendarsupport-19.08.49.9999.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-19.08.49.9999.ebuild
@@ -12,6 +12,7 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -26,7 +27,6 @@ DEPEND="
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-calendar)
 	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
 	$(add_kdeapps_dep kdepim-apps-libs)
 	$(add_kdeapps_dep kidentitymanagement)

diff --git a/kde-apps/calendarsupport/calendarsupport-9999.ebuild b/kde-apps/calendarsupport/calendarsupport-9999.ebuild
index 86a6d6c13f..93def382b9 100644
--- a/kde-apps/calendarsupport/calendarsupport-9999.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-9999.ebuild
@@ -12,6 +12,7 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -26,7 +27,6 @@ DEPEND="
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-calendar)
 	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
 	$(add_kdeapps_dep kdepim-apps-libs)
 	$(add_kdeapps_dep kidentitymanagement)

diff --git a/kde-apps/eventviews/eventviews-19.08.49.9999.ebuild b/kde-apps/eventviews/eventviews-19.08.49.9999.ebuild
index a86cf051a9..f9f7bd18d8 100644
--- a/kde-apps/eventviews/eventviews-19.08.49.9999.ebuild
+++ b/kde-apps/eventviews/eventviews-19.08.49.9999.ebuild
@@ -13,10 +13,12 @@ IUSE=""
 
 # drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
 DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep ki18n)
@@ -27,9 +29,7 @@ DEPEND="
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-calendar)
 	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kmime)
 	$(add_kdeapps_dep libkdepim)
 	$(add_qt_dep designer)

diff --git a/kde-apps/eventviews/eventviews-9999.ebuild b/kde-apps/eventviews/eventviews-9999.ebuild
index a86cf051a9..f9f7bd18d8 100644
--- a/kde-apps/eventviews/eventviews-9999.ebuild
+++ b/kde-apps/eventviews/eventviews-9999.ebuild
@@ -13,10 +13,12 @@ IUSE=""
 
 # drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
 DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep ki18n)
@@ -27,9 +29,7 @@ DEPEND="
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-calendar)
 	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kmime)
 	$(add_kdeapps_dep libkdepim)
 	$(add_qt_dep designer)

diff --git a/kde-apps/grantlee-editor/grantlee-editor-19.08.49.9999.ebuild b/kde-apps/grantlee-editor/grantlee-editor-19.08.49.9999.ebuild
index 4a5ff58889..bbd16dad18 100644
--- a/kde-apps/grantlee-editor/grantlee-editor-19.08.49.9999.ebuild
+++ b/kde-apps/grantlee-editor/grantlee-editor-19.08.49.9999.ebuild
@@ -16,6 +16,7 @@ DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
@@ -27,7 +28,6 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kmime)
 	$(add_kdeapps_dep kpimtextedit)
 	$(add_kdeapps_dep messagelib)

diff --git a/kde-apps/grantlee-editor/grantlee-editor-9999.ebuild b/kde-apps/grantlee-editor/grantlee-editor-9999.ebuild
index 4a5ff58889..bbd16dad18 100644
--- a/kde-apps/grantlee-editor/grantlee-editor-9999.ebuild
+++ b/kde-apps/grantlee-editor/grantlee-editor-9999.ebuild
@@ -16,6 +16,7 @@ DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
@@ -27,7 +28,6 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kmime)
 	$(add_kdeapps_dep kpimtextedit)
 	$(add_kdeapps_dep messagelib)

diff --git a/kde-apps/incidenceeditor/incidenceeditor-19.08.49.9999.ebuild b/kde-apps/incidenceeditor/incidenceeditor-19.08.49.9999.ebuild
index 37c3b14e3a..bac95b1dc4 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-19.08.49.9999.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-19.08.49.9999.ebuild
@@ -13,10 +13,12 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
@@ -33,9 +35,7 @@ DEPEND="
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep calendarsupport)
 	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kdepim-apps-libs)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kldap)

diff --git a/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild b/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
index 37c3b14e3a..bac95b1dc4 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
@@ -13,10 +13,12 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
@@ -33,9 +35,7 @@ DEPEND="
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep calendarsupport)
 	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kdepim-apps-libs)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kldap)

diff --git a/kde-apps/kaccounts-mobile/kaccounts-mobile-9999.ebuild b/kde-apps/kaccounts-mobile/kaccounts-mobile-9999.ebuild
index 0061ca76ea..8ba6e81e95 100644
--- a/kde-apps/kaccounts-mobile/kaccounts-mobile-9999.ebuild
+++ b/kde-apps/kaccounts-mobile/kaccounts-mobile-9999.ebuild
@@ -17,10 +17,10 @@ BDEPEND="
 "
 DEPEND="
 	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
-	$(add_kdeapps_dep kcontacts)
 	$(add_qt_dep qtdeclarative)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtnetwork)

diff --git a/kde-apps/kaddressbook/kaddressbook-19.08.49.9999.ebuild b/kde-apps/kaddressbook/kaddressbook-19.08.49.9999.ebuild
index 6c9f1f2109..2f8bbabf96 100644
--- a/kde-apps/kaddressbook/kaddressbook-19.08.49.9999.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-19.08.49.9999.ebuild
@@ -21,6 +21,7 @@ DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep ki18n)
@@ -37,7 +38,6 @@ DEPEND="
 	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-search)
 	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kdepim-apps-libs)
 	$(add_kdeapps_dep kontactinterface)
 	$(add_kdeapps_dep libgravatar)

diff --git a/kde-apps/kaddressbook/kaddressbook-9999.ebuild b/kde-apps/kaddressbook/kaddressbook-9999.ebuild
index 6c9f1f2109..2f8bbabf96 100644
--- a/kde-apps/kaddressbook/kaddressbook-9999.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-9999.ebuild
@@ -21,6 +21,7 @@ DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep ki18n)
@@ -37,7 +38,6 @@ DEPEND="
 	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-search)
 	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kdepim-apps-libs)
 	$(add_kdeapps_dep kontactinterface)
 	$(add_kdeapps_dep libgravatar)

diff --git a/kde-apps/kalarm/kalarm-19.08.49.9999.ebuild b/kde-apps/kalarm/kalarm-19.08.49.9999.ebuild
index 8d57935981..32c7578a1c 100644
--- a/kde-apps/kalarm/kalarm-19.08.49.9999.ebuild
+++ b/kde-apps/kalarm/kalarm-19.08.49.9999.ebuild
@@ -17,11 +17,13 @@ BDEPEND="
 "
 DEPEND="
 	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
@@ -44,9 +46,7 @@ DEPEND="
 	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep kalarmcal)
-	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kdepim-apps-libs)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kmailtransport)

diff --git a/kde-apps/kalarm/kalarm-9999.ebuild b/kde-apps/kalarm/kalarm-9999.ebuild
index 1fcd56cd00..682ec1cabc 100644
--- a/kde-apps/kalarm/kalarm-9999.ebuild
+++ b/kde-apps/kalarm/kalarm-9999.ebuild
@@ -17,11 +17,13 @@ BDEPEND="
 "
 DEPEND="
 	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
@@ -43,9 +45,7 @@ DEPEND="
 	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep kalarmcal)
-	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kdepim-apps-libs)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kmailtransport)

diff --git a/kde-apps/kalarmcal/kalarmcal-19.08.49.9999.ebuild b/kde-apps/kalarmcal/kalarmcal-19.08.49.9999.ebuild
index 29679e5d17..b151247463 100644
--- a/kde-apps/kalarmcal/kalarmcal-19.08.49.9999.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-19.08.49.9999.ebuild
@@ -12,11 +12,11 @@ KEYWORDS=""
 IUSE=""
 
 COMMON_DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kholidays)
 	$(add_frameworks_dep ki18n)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_qt_dep qtgui)

diff --git a/kde-apps/kalarmcal/kalarmcal-9999.ebuild b/kde-apps/kalarmcal/kalarmcal-9999.ebuild
index 29679e5d17..b151247463 100644
--- a/kde-apps/kalarmcal/kalarmcal-9999.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-9999.ebuild
@@ -12,11 +12,11 @@ KEYWORDS=""
 IUSE=""
 
 COMMON_DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kholidays)
 	$(add_frameworks_dep ki18n)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_qt_dep qtgui)

diff --git a/kde-apps/kblog/kblog-19.08.49.9999.ebuild b/kde-apps/kblog/kblog-19.08.49.9999.ebuild
index 136a040996..6975c2c131 100644
--- a/kde-apps/kblog/kblog-19.08.49.9999.ebuild
+++ b/kde-apps/kblog/kblog-19.08.49.9999.ebuild
@@ -12,12 +12,12 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kxmlrpcclient)
 	$(add_frameworks_dep syndication)
-	$(add_kdeapps_dep kcalcore)
 "
 RDEPEND="${DEPEND}
 	!kde-apps/kdepim-l10n

diff --git a/kde-apps/kblog/kblog-9999.ebuild b/kde-apps/kblog/kblog-9999.ebuild
index 136a040996..6975c2c131 100644
--- a/kde-apps/kblog/kblog-9999.ebuild
+++ b/kde-apps/kblog/kblog-9999.ebuild
@@ -12,12 +12,12 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kxmlrpcclient)
 	$(add_frameworks_dep syndication)
-	$(add_kdeapps_dep kcalcore)
 "
 RDEPEND="${DEPEND}
 	!kde-apps/kdepim-l10n

diff --git a/kde-apps/kcalutils/kcalutils-19.08.49.9999.ebuild b/kde-apps/kcalutils/kcalutils-19.08.49.9999.ebuild
index 34483cbe23..671d0e84d0 100644
--- a/kde-apps/kcalutils/kcalutils-19.08.49.9999.ebuild
+++ b/kde-apps/kcalutils/kcalutils-19.08.49.9999.ebuild
@@ -13,6 +13,7 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -20,7 +21,6 @@ DEPEND="
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)

diff --git a/kde-apps/kcalutils/kcalutils-9999.ebuild b/kde-apps/kcalutils/kcalutils-9999.ebuild
index 34483cbe23..671d0e84d0 100644
--- a/kde-apps/kcalutils/kcalutils-9999.ebuild
+++ b/kde-apps/kcalutils/kcalutils-9999.ebuild
@@ -13,6 +13,7 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -20,7 +21,6 @@ DEPEND="
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)

diff --git a/kde-apps/kdepim-addons/kdepim-addons-19.08.49.9999.ebuild b/kde-apps/kdepim-addons/kdepim-addons-19.08.49.9999.ebuild
index 62401c3543..6799bff5c3 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-19.08.49.9999.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-19.08.49.9999.ebuild
@@ -19,6 +19,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep ki18n)
@@ -36,7 +37,6 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep eventviews)
 	$(add_kdeapps_dep grantleetheme)
 	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kdepim-apps-libs)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kimap)

diff --git a/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild b/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
index f98a8a84a5..62f46524fe 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
@@ -20,6 +20,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep ki18n)
@@ -37,7 +38,6 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep eventviews)
 	$(add_kdeapps_dep grantleetheme)
 	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kdepim-apps-libs)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kimap)

diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.08.49.9999.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.08.49.9999.ebuild
index 2640615efc..6410a79ed1 100644
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.08.49.9999.ebuild
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.08.49.9999.ebuild
@@ -15,6 +15,7 @@ IUSE=""
 DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
@@ -25,7 +26,6 @@ DEPEND="
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep libkleo)
 	$(add_kdeapps_dep pimcommon)
 	$(add_qt_dep qtdbus)

diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
index 2640615efc..6410a79ed1 100644
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
@@ -15,6 +15,7 @@ IUSE=""
 DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
@@ -25,7 +26,6 @@ DEPEND="
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep libkleo)
 	$(add_kdeapps_dep pimcommon)
 	$(add_qt_dep qtdbus)

diff --git a/kde-apps/kdepim-meta/kdepim-meta-19.08.49.9999.ebuild b/kde-apps/kdepim-meta/kdepim-meta-19.08.49.9999.ebuild
index e647fe170f..3f60686af9 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-19.08.49.9999.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-19.08.49.9999.ebuild
@@ -30,9 +30,7 @@ RDEPEND="
 	>=kde-apps/kaddressbook-${PV}:${SLOT}
 	>=kde-apps/kalarm-${PV}:${SLOT}
 	>=kde-apps/kalarmcal-${PV}:${SLOT}
-	>=kde-apps/kcalcore-${PV}:${SLOT}
 	>=kde-apps/kcalutils-${PV}:${SLOT}
-	>=kde-apps/kcontacts-${PV}:${SLOT}
 	>=kde-apps/kdepim-addons-${PV}:${SLOT}
 	>=kde-apps/kdepim-apps-libs-${PV}:${SLOT}
 	>=kde-apps/kdepim-runtime-${PV}:${SLOT}

diff --git a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
index e647fe170f..3f60686af9 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
@@ -30,9 +30,7 @@ RDEPEND="
 	>=kde-apps/kaddressbook-${PV}:${SLOT}
 	>=kde-apps/kalarm-${PV}:${SLOT}
 	>=kde-apps/kalarmcal-${PV}:${SLOT}
-	>=kde-apps/kcalcore-${PV}:${SLOT}
 	>=kde-apps/kcalutils-${PV}:${SLOT}
-	>=kde-apps/kcontacts-${PV}:${SLOT}
 	>=kde-apps/kdepim-addons-${PV}:${SLOT}
 	>=kde-apps/kdepim-apps-libs-${PV}:${SLOT}
 	>=kde-apps/kdepim-runtime-${PV}:${SLOT}

diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-19.08.49.9999.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-19.08.49.9999.ebuild
index d80ed74619..4a0b30fee1 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-19.08.49.9999.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-19.08.49.9999.ebuild
@@ -18,10 +18,12 @@ BDEPEND="
 	dev-libs/libxslt
 "
 COMMON_DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kholidays)
@@ -43,9 +45,7 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep akonadi-notes)
 	$(add_kdeapps_dep kalarmcal)
-	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kdav)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kimap)

diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
index 372b1943b9..6a882de56e 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
@@ -18,10 +18,12 @@ BDEPEND="
 	dev-libs/libxslt
 "
 COMMON_DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kholidays)
@@ -43,9 +45,7 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep akonadi-notes)
 	$(add_kdeapps_dep kalarmcal)
-	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kdav)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kimap)

diff --git a/kde-apps/kgpg/kgpg-19.08.49.9999.ebuild b/kde-apps/kgpg/kgpg-19.08.49.9999.ebuild
index 6546c84b40..407f318461 100644
--- a/kde-apps/kgpg/kgpg-19.08.49.9999.ebuild
+++ b/kde-apps/kgpg/kgpg-19.08.49.9999.ebuild
@@ -18,6 +18,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
@@ -33,7 +34,6 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep kcontacts)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtnetwork)

diff --git a/kde-apps/kgpg/kgpg-9999.ebuild b/kde-apps/kgpg/kgpg-9999.ebuild
index 6546c84b40..407f318461 100644
--- a/kde-apps/kgpg/kgpg-9999.ebuild
+++ b/kde-apps/kgpg/kgpg-9999.ebuild
@@ -18,6 +18,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
@@ -33,7 +34,6 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep kcontacts)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtnetwork)

diff --git a/kde-apps/kitinerary/kitinerary-19.08.49.9999.ebuild b/kde-apps/kitinerary/kitinerary-19.08.49.9999.ebuild
index f6b4bf5232..90274d01e5 100644
--- a/kde-apps/kitinerary/kitinerary-19.08.49.9999.ebuild
+++ b/kde-apps/kitinerary/kitinerary-19.08.49.9999.ebuild
@@ -16,9 +16,9 @@ IUSE="+barcode pdf"
 
 DEPEND="
 	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcalendarcore)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kmime)
 	$(add_kdeapps_dep kpkpass)
 	$(add_qt_dep qtdeclarative)

diff --git a/kde-apps/kitinerary/kitinerary-9999.ebuild b/kde-apps/kitinerary/kitinerary-9999.ebuild
index f6b4bf5232..90274d01e5 100644
--- a/kde-apps/kitinerary/kitinerary-9999.ebuild
+++ b/kde-apps/kitinerary/kitinerary-9999.ebuild
@@ -16,9 +16,9 @@ IUSE="+barcode pdf"
 
 DEPEND="
 	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcalendarcore)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kmime)
 	$(add_kdeapps_dep kpkpass)
 	$(add_qt_dep qtdeclarative)

diff --git a/kde-apps/kmail/kmail-19.08.49.9999.ebuild b/kde-apps/kmail/kmail-19.08.49.9999.ebuild
index cd07a79ea9..7e038a1c4a 100644
--- a/kde-apps/kmail/kmail-19.08.49.9999.ebuild
+++ b/kde-apps/kmail/kmail-19.08.49.9999.ebuild
@@ -20,11 +20,13 @@ BDEPEND="
 "
 COMMON_DEPEND="
 	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
@@ -47,8 +49,6 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kdepim-apps-libs)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kmailtransport)

diff --git a/kde-apps/kmail/kmail-9999.ebuild b/kde-apps/kmail/kmail-9999.ebuild
index 63424e210f..08d45567f6 100644
--- a/kde-apps/kmail/kmail-9999.ebuild
+++ b/kde-apps/kmail/kmail-9999.ebuild
@@ -21,11 +21,13 @@ BDEPEND="
 "
 COMMON_DEPEND="
 	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
@@ -48,8 +50,6 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kdepim-apps-libs)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kmailtransport)

diff --git a/kde-apps/knotes/knotes-19.08.49.9999.ebuild b/kde-apps/knotes/knotes-19.08.49.9999.ebuild
index b7bbf229f7..0d258d1198 100644
--- a/kde-apps/knotes/knotes-19.08.49.9999.ebuild
+++ b/kde-apps/knotes/knotes-19.08.49.9999.ebuild
@@ -16,10 +16,12 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdnssd)
@@ -39,9 +41,7 @@ DEPEND="
 	$(add_kdeapps_dep akonadi-notes)
 	$(add_kdeapps_dep akonadi-search)
 	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kmime)
 	$(add_kdeapps_dep kontactinterface)
 	$(add_kdeapps_dep libkdepim)

diff --git a/kde-apps/knotes/knotes-9999.ebuild b/kde-apps/knotes/knotes-9999.ebuild
index b7bbf229f7..0d258d1198 100644
--- a/kde-apps/knotes/knotes-9999.ebuild
+++ b/kde-apps/knotes/knotes-9999.ebuild
@@ -16,10 +16,12 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdnssd)
@@ -39,9 +41,7 @@ DEPEND="
 	$(add_kdeapps_dep akonadi-notes)
 	$(add_kdeapps_dep akonadi-search)
 	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kmime)
 	$(add_kdeapps_dep kontactinterface)
 	$(add_kdeapps_dep libkdepim)

diff --git a/kde-apps/konsolekalendar/konsolekalendar-19.08.49.9999.ebuild b/kde-apps/konsolekalendar/konsolekalendar-19.08.49.9999.ebuild
index 766d9a2234..594f120c40 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-19.08.49.9999.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-19.08.49.9999.ebuild
@@ -15,13 +15,13 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
 	$(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)
 "
 RDEPEND="${DEPEND}

diff --git a/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild b/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild
index 766d9a2234..594f120c40 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild
@@ -15,13 +15,13 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
 	$(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)
 "
 RDEPEND="${DEPEND}

diff --git a/kde-apps/kopete/kopete-19.08.49.9999.ebuild b/kde-apps/kopete/kopete-19.08.49.9999.ebuild
index 2e178d1d34..af324e5972 100644
--- a/kde-apps/kopete/kopete-19.08.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-19.08.49.9999.ebuild
@@ -60,6 +60,7 @@ IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 COMMON_DEPEND="
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep khtml)
@@ -72,7 +73,6 @@ COMMON_DEPEND="
 	$(add_frameworks_dep knotifyconfig)
 	$(add_frameworks_dep kparts)
 	$(add_frameworks_dep ktexteditor)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep libkleo)
 	$(add_qt_dep qtgui)

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index 2e178d1d34..af324e5972 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -60,6 +60,7 @@ IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 COMMON_DEPEND="
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep khtml)
@@ -72,7 +73,6 @@ COMMON_DEPEND="
 	$(add_frameworks_dep knotifyconfig)
 	$(add_frameworks_dep kparts)
 	$(add_frameworks_dep ktexteditor)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep libkleo)
 	$(add_qt_dep qtgui)

diff --git a/kde-apps/korganizer/korganizer-19.08.49.9999.ebuild b/kde-apps/korganizer/korganizer-19.08.49.9999.ebuild
index 48afade493..8765dc85ed 100644
--- a/kde-apps/korganizer/korganizer-19.08.49.9999.ebuild
+++ b/kde-apps/korganizer/korganizer-19.08.49.9999.ebuild
@@ -18,11 +18,13 @@ BDEPEND="
 	test? ( $(add_kdeapps_dep akonadi 'tools') )
 "
 COMMON_DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
@@ -49,9 +51,7 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep calendarsupport)
 	$(add_kdeapps_dep eventviews)
 	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kdepim-apps-libs)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kmailtransport)

diff --git a/kde-apps/korganizer/korganizer-9999.ebuild b/kde-apps/korganizer/korganizer-9999.ebuild
index 48afade493..8765dc85ed 100644
--- a/kde-apps/korganizer/korganizer-9999.ebuild
+++ b/kde-apps/korganizer/korganizer-9999.ebuild
@@ -18,11 +18,13 @@ BDEPEND="
 	test? ( $(add_kdeapps_dep akonadi 'tools') )
 "
 COMMON_DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
@@ -49,9 +51,7 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep calendarsupport)
 	$(add_kdeapps_dep eventviews)
 	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kdepim-apps-libs)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kmailtransport)

diff --git a/kde-apps/libkdepim/libkdepim-19.08.49.9999.ebuild b/kde-apps/libkdepim/libkdepim-19.08.49.9999.ebuild
index eb83188cb8..4715b711a6 100644
--- a/kde-apps/libkdepim/libkdepim-19.08.49.9999.ebuild
+++ b/kde-apps/libkdepim/libkdepim-19.08.49.9999.ebuild
@@ -19,6 +19,7 @@ DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
@@ -30,7 +31,6 @@ DEPEND="
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kldap)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)

diff --git a/kde-apps/libkdepim/libkdepim-9999.ebuild b/kde-apps/libkdepim/libkdepim-9999.ebuild
index eb83188cb8..4715b711a6 100644
--- a/kde-apps/libkdepim/libkdepim-9999.ebuild
+++ b/kde-apps/libkdepim/libkdepim-9999.ebuild
@@ -19,6 +19,7 @@ DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
@@ -30,7 +31,6 @@ DEPEND="
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kldap)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)

diff --git a/kde-apps/libkgapi/libkgapi-19.08.49.9999.ebuild b/kde-apps/libkgapi/libkgapi-19.08.49.9999.ebuild
index 2cbdb74515..6e4f148f5b 100644
--- a/kde-apps/libkgapi/libkgapi-19.08.49.9999.ebuild
+++ b/kde-apps/libkgapi/libkgapi-19.08.49.9999.ebuild
@@ -18,10 +18,10 @@ BDEPEND="
 	nls? ( $(add_qt_dep linguist-tools) )
 "
 DEPEND="
+	$(add_frameworks_dep kcalendarcore)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kwindowsystem)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtwebengine 'widgets')

diff --git a/kde-apps/libkgapi/libkgapi-9999.ebuild b/kde-apps/libkgapi/libkgapi-9999.ebuild
index 2cbdb74515..6e4f148f5b 100644
--- a/kde-apps/libkgapi/libkgapi-9999.ebuild
+++ b/kde-apps/libkgapi/libkgapi-9999.ebuild
@@ -18,10 +18,10 @@ BDEPEND="
 	nls? ( $(add_qt_dep linguist-tools) )
 "
 DEPEND="
+	$(add_frameworks_dep kcalendarcore)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kwindowsystem)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtwebengine 'widgets')

diff --git a/kde-apps/libktnef/libktnef-19.08.49.9999.ebuild b/kde-apps/libktnef/libktnef-19.08.49.9999.ebuild
index d4df3147ed..ac8e54fa30 100644
--- a/kde-apps/libktnef/libktnef-19.08.49.9999.ebuild
+++ b/kde-apps/libktnef/libktnef-19.08.49.9999.ebuild
@@ -13,10 +13,10 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	$(add_frameworks_dep kcalendarcore)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
 	$(add_qt_dep qtwidgets)
 "
 RDEPEND="${DEPEND}

diff --git a/kde-apps/libktnef/libktnef-9999.ebuild b/kde-apps/libktnef/libktnef-9999.ebuild
index d4df3147ed..ac8e54fa30 100644
--- a/kde-apps/libktnef/libktnef-9999.ebuild
+++ b/kde-apps/libktnef/libktnef-9999.ebuild
@@ -13,10 +13,10 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	$(add_frameworks_dep kcalendarcore)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
 	$(add_qt_dep qtwidgets)
 "
 RDEPEND="${DEPEND}

diff --git a/kde-apps/mailcommon/mailcommon-19.08.49.9999.ebuild b/kde-apps/mailcommon/mailcommon-19.08.49.9999.ebuild
index a5f7e73072..07fa4cd331 100644
--- a/kde-apps/mailcommon/mailcommon-19.08.49.9999.ebuild
+++ b/kde-apps/mailcommon/mailcommon-19.08.49.9999.ebuild
@@ -23,6 +23,7 @@ DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
@@ -37,7 +38,6 @@ DEPEND="
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kmailtransport)
 	$(add_kdeapps_dep kmime)
 	$(add_kdeapps_dep kpimtextedit)

diff --git a/kde-apps/mailcommon/mailcommon-9999.ebuild b/kde-apps/mailcommon/mailcommon-9999.ebuild
index 27891f3004..0ced9ecb0c 100644
--- a/kde-apps/mailcommon/mailcommon-9999.ebuild
+++ b/kde-apps/mailcommon/mailcommon-9999.ebuild
@@ -23,6 +23,7 @@ DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
@@ -37,7 +38,6 @@ DEPEND="
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kmailtransport)
 	$(add_kdeapps_dep kmime)
 	$(add_kdeapps_dep kpimtextedit)

diff --git a/kde-apps/messagelib/messagelib-19.08.49.9999.ebuild b/kde-apps/messagelib/messagelib-19.08.49.9999.ebuild
index 30e3dfbf92..7cc825da3b 100644
--- a/kde-apps/messagelib/messagelib-19.08.49.9999.ebuild
+++ b/kde-apps/messagelib/messagelib-19.08.49.9999.ebuild
@@ -14,10 +14,12 @@ IUSE=""
 
 DEPEND="
 	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep ki18n)
@@ -39,8 +41,6 @@ DEPEND="
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep grantleetheme)
 	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kdepim-apps-libs)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kldap)

diff --git a/kde-apps/messagelib/messagelib-9999.ebuild b/kde-apps/messagelib/messagelib-9999.ebuild
index 30e3dfbf92..7cc825da3b 100644
--- a/kde-apps/messagelib/messagelib-9999.ebuild
+++ b/kde-apps/messagelib/messagelib-9999.ebuild
@@ -14,10 +14,12 @@ IUSE=""
 
 DEPEND="
 	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep ki18n)
@@ -39,8 +41,6 @@ DEPEND="
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep grantleetheme)
 	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kdepim-apps-libs)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kldap)

diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-19.08.49.9999.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-19.08.49.9999.ebuild
index e43de004b0..70cb7fac3e 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-19.08.49.9999.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-19.08.49.9999.ebuild
@@ -18,6 +18,7 @@ DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
@@ -28,7 +29,6 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kmailtransport)
 	$(add_kdeapps_dep kmime)

diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild
index e43de004b0..70cb7fac3e 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild
@@ -18,6 +18,7 @@ DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
@@ -28,7 +29,6 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kmailtransport)
 	$(add_kdeapps_dep kmime)

diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-19.08.49.9999.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-19.08.49.9999.ebuild
index bf6d456b2d..f28612b52a 100644
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-19.08.49.9999.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-19.08.49.9999.ebuild
@@ -15,8 +15,10 @@ IUSE=""
 
 DEPEND="
 	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
@@ -29,8 +31,6 @@ DEPEND="
 	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kmailtransport)
 	$(add_kdeapps_dep libksieve)
 	$(add_kdeapps_dep pimcommon)

diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild
index bf6d456b2d..f28612b52a 100644
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild
@@ -15,8 +15,10 @@ IUSE=""
 
 DEPEND="
 	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
@@ -29,8 +31,6 @@ DEPEND="
 	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kmailtransport)
 	$(add_kdeapps_dep libksieve)
 	$(add_kdeapps_dep pimcommon)

diff --git a/kde-apps/pimcommon/pimcommon-19.08.49.9999.ebuild b/kde-apps/pimcommon/pimcommon-19.08.49.9999.ebuild
index 1f701bba77..7023f6b328 100644
--- a/kde-apps/pimcommon/pimcommon-19.08.49.9999.ebuild
+++ b/kde-apps/pimcommon/pimcommon-19.08.49.9999.ebuild
@@ -22,6 +22,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep ki18n)
@@ -35,7 +36,6 @@ COMMON_DEPEND="
 	$(add_frameworks_dep purpose)
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kimap)
 	$(add_kdeapps_dep kpimtextedit)
 	$(add_kdeapps_dep libkdepim)

diff --git a/kde-apps/pimcommon/pimcommon-9999.ebuild b/kde-apps/pimcommon/pimcommon-9999.ebuild
index 1f701bba77..7023f6b328 100644
--- a/kde-apps/pimcommon/pimcommon-9999.ebuild
+++ b/kde-apps/pimcommon/pimcommon-9999.ebuild
@@ -22,6 +22,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep ki18n)
@@ -35,7 +36,6 @@ COMMON_DEPEND="
 	$(add_frameworks_dep purpose)
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kimap)
 	$(add_kdeapps_dep kpimtextedit)
 	$(add_kdeapps_dep libkdepim)

diff --git a/kde-misc/akonadi-phabricator-resource/akonadi-phabricator-resource-9999.ebuild b/kde-misc/akonadi-phabricator-resource/akonadi-phabricator-resource-9999.ebuild
index 9cbda0c85b..31fe6a7436 100644
--- a/kde-misc/akonadi-phabricator-resource/akonadi-phabricator-resource-9999.ebuild
+++ b/kde-misc/akonadi-phabricator-resource/akonadi-phabricator-resource-9999.ebuild
@@ -14,12 +14,12 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcalcore)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtnetwork)

diff --git a/kde-misc/akonadiclient/akonadiclient-9999.ebuild b/kde-misc/akonadiclient/akonadiclient-9999.ebuild
index f54ffd8137..5129c4059a 100644
--- a/kde-misc/akonadiclient/akonadiclient-9999.ebuild
+++ b/kde-misc/akonadiclient/akonadiclient-9999.ebuild
@@ -16,10 +16,10 @@ IUSE=""
 
 DEPEND="
 	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_kdeapps_dep akonadi 'xml')
-	$(add_kdeapps_dep kcontacts)
 	$(add_qt_dep qtwidgets)
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-misc/itinerary/itinerary-9999.ebuild b/kde-misc/itinerary/itinerary-9999.ebuild
index 685e5f8a88..401da518d5 100644
--- a/kde-misc/itinerary/itinerary-9999.ebuild
+++ b/kde-misc/itinerary/itinerary-9999.ebuild
@@ -14,10 +14,10 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kholidays)
 	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kitinerary)
 	$(add_kdeapps_dep kpkpass)
 	$(add_qt_dep qtdeclarative)

diff --git a/kde-misc/ktimetracker/ktimetracker-9999.ebuild b/kde-misc/ktimetracker/ktimetracker-9999.ebuild
index 04c607d08a..b9baab6289 100644
--- a/kde-misc/ktimetracker/ktimetracker-9999.ebuild
+++ b/kde-misc/ktimetracker/ktimetracker-9999.ebuild
@@ -14,6 +14,7 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
@@ -26,7 +27,6 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep kcalcore)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)

diff --git a/kde-misc/zanshin/zanshin-9999.ebuild b/kde-misc/zanshin/zanshin-9999.ebuild
index a9a49c3363..f24ff35dd8 100644
--- a/kde-misc/zanshin/zanshin-9999.ebuild
+++ b/kde-misc/zanshin/zanshin-9999.ebuild
@@ -19,10 +19,12 @@ BDEPEND="
 	test? ( $(add_kdeapps_dep akonadi 'tools') )
 "
 COMMON_DEPEND="
+	$(add_frameworks_dep kcalendarcore)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcontacts)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
@@ -37,8 +39,6 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-calendar)
 	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kmime)
 	$(add_kdeapps_dep kontactinterface)
 	$(add_qt_dep qtdbus)

diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild
index 3ffd1cfb3f..bd9a6f5057 100644
--- a/media-gfx/digikam/digikam-9999.ebuild
+++ b/media-gfx/digikam/digikam-9999.ebuild
@@ -61,10 +61,10 @@ COMMON_DEPEND="
 	media-libs/tiff:0
 	virtual/jpeg:0
 	addressbook? (
+		$(add_frameworks_dep kcontacts)
 		$(add_kdeapps_dep akonadi-contacts)
-		$(add_kdeapps_dep kcontacts)
 	)
-	calendar? ( $(add_kdeapps_dep kcalcore) )
+	calendar? ( $(add_frameworks_dep kcalendarcore) )
 	dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contrib_dnn] )
 	gphoto2? ( media-libs/libgphoto2:= )
 	imagemagick? ( media-gfx/imagemagick:= )


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

only message in thread, other threads:[~2019-09-19 15:47 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-19 15:47 [gentoo-commits] proj/kde:master commit in: kde-apps/kaddressbook/, kde-apps/kaccounts-mobile/, kde-apps/messagelib/, Andreas Sturmlechner

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