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

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

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 e7469b83564..ba468eca164 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 caab8c9038a..a9f1c77f0aa 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 5ff85b862e5..64b25b530f0 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 555d5e2a586..ea1a6fc566b 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 454805cea22..32f18515b11 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 454805cea22..32f18515b11 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 8dee6162b1f..674cd45fa38 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 8dee6162b1f..674cd45fa38 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 5168e3991b8..3b95348ba64 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 5168e3991b8..3b95348ba64 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 793a4c36451..bc95fadf79d 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 793a4c36451..bc95fadf79d 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 ba334978cff..f2b080e9225 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 ba334978cff..4c4ac0788d0 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 f4a453f8d4f..5908a010e90 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 f4a453f8d4f..5908a010e90 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 86a6d6c13ff..93def382b97 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 kcom