kde-apps/akonadi-contact -> kde-apps/akonadi-contacts

Package-Manager: portage-2.2.28

64 files changed, 59 insertions, 64 deletions

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 00b5bb3715..7214bb2e14 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -131,7 +131,7 @@ COMMON_DEPEND="
 		$(add_kdeapps_dep kreport)
 		kdepim? (
 			$(add_kdeapps_dep akonadi)
-			$(add_kdeapps_dep akonadi-contact)
+			$(add_kdeapps_dep akonadi-contacts)
 			$(add_kdeapps_dep kcalcore)
 			$(add_kdeapps_dep kcontacts)
 			$(add_kdeapps_dep kdgantt2)
diff --git a/kde-apps/accountwizard/accountwizard-16.07.80.ebuild b/kde-apps/accountwizard/accountwizard-16.07.80.ebuild
index 6668ee85ac..a02ecc70ec 100644
--- a/kde-apps/accountwizard/accountwizard-16.07.80.ebuild
+++ b/kde-apps/accountwizard/accountwizard-16.07.80.ebuild
@@ -35,7 +35,7 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kldap)
diff --git a/kde-apps/accountwizard/accountwizard-16.08.49.9999.ebuild b/kde-apps/accountwizard/accountwizard-16.08.49.9999.ebuild
index c5a0d5f6e1..5b2208c19e 100644
--- a/kde-apps/accountwizard/accountwizard-16.08.49.9999.ebuild
+++ b/kde-apps/accountwizard/accountwizard-16.08.49.9999.ebuild
@@ -35,7 +35,7 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kldap)
diff --git a/kde-apps/accountwizard/accountwizard-9999.ebuild b/kde-apps/accountwizard/accountwizard-9999.ebuild
index c5a0d5f6e1..5b2208c19e 100644
--- a/kde-apps/accountwizard/accountwizard-9999.ebuild
+++ b/kde-apps/accountwizard/accountwizard-9999.ebuild
@@ -35,7 +35,7 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kldap)
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-16.07.80.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-16.07.80.ebuild
index 480398e2ad..e7415cafb4 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-16.07.80.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-16.07.80.ebuild
@@ -28,7 +28,7 @@ DEPEND="
 	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-16.08.49.9999.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-16.08.49.9999.ebuild
index d90fe9fe2d..a9c51712cb 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-16.08.49.9999.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-16.08.49.9999.ebuild
@@ -28,7 +28,7 @@ DEPEND="
 	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
index d90fe9fe2d..a9c51712cb 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
@@ -28,7 +28,7 @@ DEPEND="
 	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
diff --git a/kde-apps/akonadi-contact/Manifest b/kde-apps/akonadi-contacts/Manifest
index 3e6d936ee4..3e6d936ee4 100644
--- a/kde-apps/akonadi-contact/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
diff --git a/kde-apps/akonadi-contact/akonadi-contact-16.07.80.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-16.07.80.ebuild
index a0231be56d..41aa18e4fc 100644
--- a/kde-apps/akonadi-contact/akonadi-contact-16.07.80.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-16.07.80.ebuild
@@ -5,8 +5,6 @@
 EAPI=6
 
 KDE_TEST="forceoptional"
-# TODO pkg move with 16.08 release
-KMNAME="${PN}s"
 inherit kde5
 
 DESCRIPTION="Library for akonadi contact integration"
diff --git a/kde-apps/akonadi-contact/akonadi-contact-16.08.49.9999.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-16.08.49.9999.ebuild
index 0057bd5bba..cd18806ea8 100644
--- a/kde-apps/akonadi-contact/akonadi-contact-16.08.49.9999.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-16.08.49.9999.ebuild
@@ -5,8 +5,6 @@
 EAPI=6
 
 KDE_TEST="forceoptional"
-# TODO pkg move with 16.08 release
-KMNAME="${PN}s"
 inherit kde5
 
 DESCRIPTION="Library for akonadi contact integration"
diff --git a/kde-apps/akonadi-contact/akonadi-contact-9999.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild
index 0057bd5bba..cd18806ea8 100644
--- a/kde-apps/akonadi-contact/akonadi-contact-9999.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild
@@ -5,8 +5,6 @@
 EAPI=6
 
 KDE_TEST="forceoptional"
-# TODO pkg move with 16.08 release
-KMNAME="${PN}s"
 inherit kde5
 
 DESCRIPTION="Library for akonadi contact integration"
diff --git a/kde-apps/akonadi-contact/metadata.xml b/kde-apps/akonadi-contacts/metadata.xml
index b17398a5cb..b17398a5cb 100644
--- a/kde-apps/akonadi-contact/metadata.xml
+++ b/kde-apps/akonadi-contacts/metadata.xml
diff --git a/kde-apps/akonadiconsole/akonadiconsole-16.07.80.ebuild b/kde-apps/akonadiconsole/akonadiconsole-16.07.80.ebuild
index 302dab045c..fab1c94ae0 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-16.07.80.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-16.07.80.ebuild
@@ -30,7 +30,7 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep calendarsupport)
 	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcontacts)
diff --git a/kde-apps/akonadiconsole/akonadiconsole-16.08.49.9999.ebuild b/kde-apps/akonadiconsole/akonadiconsole-16.08.49.9999.ebuild
index d40bc100b9..db91cb2aed 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-16.08.49.9999.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-16.08.49.9999.ebuild
@@ -30,7 +30,7 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep calendarsupport)
 	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcontacts)
diff --git a/kde-apps/akonadiconsole/akonadiconsole-9999.ebuild b/kde-apps/akonadiconsole/akonadiconsole-9999.ebuild
index d40bc100b9..db91cb2aed 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-9999.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-9999.ebuild
@@ -30,7 +30,7 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep calendarsupport)
 	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcontacts)
diff --git a/kde-apps/grantleeeditor/grantleeeditor-16.07.80.ebuild b/kde-apps/grantleeeditor/grantleeeditor-16.07.80.ebuild
index 42b49496eb..cf53a4ae1d 100644
--- a/kde-apps/grantleeeditor/grantleeeditor-16.07.80.ebuild
+++ b/kde-apps/grantleeeditor/grantleeeditor-16.07.80.ebuild
@@ -28,7 +28,7 @@ DEPEND="
 	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep kblog)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kmime)
diff --git a/kde-apps/grantleeeditor/grantleeeditor-16.08.49.9999.ebuild b/kde-apps/grantleeeditor/grantleeeditor-16.08.49.9999.ebuild
index d55549f3d0..2aded930ea 100644
--- a/kde-apps/grantleeeditor/grantleeeditor-16.08.49.9999.ebuild
+++ b/kde-apps/grantleeeditor/grantleeeditor-16.08.49.9999.ebuild
@@ -28,7 +28,7 @@ DEPEND="
 	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep kblog)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kmime)
diff --git a/kde-apps/grantleeeditor/grantleeeditor-9999.ebuild b/kde-apps/grantleeeditor/grantleeeditor-9999.ebuild
index d55549f3d0..2aded930ea 100644
--- a/kde-apps/grantleeeditor/grantleeeditor-9999.ebuild
+++ b/kde-apps/grantleeeditor/grantleeeditor-9999.ebuild
@@ -28,7 +28,7 @@ DEPEND="
 	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep kblog)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kmime)
diff --git a/kde-apps/incidenceeditor/incidenceeditor-16.07.80.ebuild b/kde-apps/incidenceeditor/incidenceeditor-16.07.80.ebuild
index 72d8faafab..904c221677 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-16.07.80.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-16.07.80.ebuild
@@ -31,7 +31,7 @@ DEPEND="
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep calendarsupport)
 	$(add_kdeapps_dep eventviews)
diff --git a/kde-apps/incidenceeditor/incidenceeditor-16.08.49.9999.ebuild b/kde-apps/incidenceeditor/incidenceeditor-16.08.49.9999.ebuild
index b3f8fe3f6b..804c9cd158 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-16.08.49.9999.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-16.08.49.9999.ebuild
@@ -31,7 +31,7 @@ DEPEND="
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep calendarsupport)
 	$(add_kdeapps_dep eventviews)
diff --git a/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild b/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
index da63567334..ccdd0fa6af 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
@@ -31,7 +31,7 @@ DEPEND="
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep calendarsupport)
 	$(add_kdeapps_dep eventviews)
diff --git a/kde-apps/kaddressbook/kaddressbook-16.07.80.ebuild b/kde-apps/kaddressbook/kaddressbook-16.07.80.ebuild
index a853807788..ac28bb136f 100644
--- a/kde-apps/kaddressbook/kaddressbook-16.07.80.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-16.07.80.ebuild
@@ -36,7 +36,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-search)
 	$(add_kdeapps_dep gpgmepp)
 	$(add_kdeapps_dep grantleetheme)
diff --git a/kde-apps/kaddressbook/kaddressbook-16.08.49.9999.ebuild b/kde-apps/kaddressbook/kaddressbook-16.08.49.9999.ebuild
index c4e4f970b0..f859b0eafe 100644
--- a/kde-apps/kaddressbook/kaddressbook-16.08.49.9999.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-16.08.49.9999.ebuild
@@ -36,7 +36,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-search)
 	$(add_kdeapps_dep gpgmepp)
 	$(add_kdeapps_dep grantleetheme)
diff --git a/kde-apps/kaddressbook/kaddressbook-9999.ebuild b/kde-apps/kaddressbook/kaddressbook-9999.ebuild
index c4e4f970b0..f859b0eafe 100644
--- a/kde-apps/kaddressbook/kaddressbook-9999.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-9999.ebuild
@@ -36,7 +36,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-search)
 	$(add_kdeapps_dep gpgmepp)
 	$(add_kdeapps_dep grantleetheme)
diff --git a/kde-apps/kalarm/kalarm-16.07.80.ebuild b/kde-apps/kalarm/kalarm-16.07.80.ebuild
index a867408261..1796394555 100644
--- a/kde-apps/kalarm/kalarm-16.07.80.ebuild
+++ b/kde-apps/kalarm/kalarm-16.07.80.ebuild
@@ -37,7 +37,7 @@ DEPEND="
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep kalarmcal)
 	$(add_kdeapps_dep kcalcore)
diff --git a/kde-apps/kalarm/kalarm-16.08.49.9999.ebuild b/kde-apps/kalarm/kalarm-16.08.49.9999.ebuild
index bd4d57fd44..d53c5706aa 100644
--- a/kde-apps/kalarm/kalarm-16.08.49.9999.ebuild
+++ b/kde-apps/kalarm/kalarm-16.08.49.9999.ebuild
@@ -37,7 +37,7 @@ DEPEND="
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep kalarmcal)
 	$(add_kdeapps_dep kcalcore)
diff --git a/kde-apps/kalarm/kalarm-9999.ebuild b/kde-apps/kalarm/kalarm-9999.ebuild
index bd4d57fd44..d53c5706aa 100644
--- a/kde-apps/kalarm/kalarm-9999.ebuild
+++ b/kde-apps/kalarm/kalarm-9999.ebuild
@@ -37,7 +37,7 @@ DEPEND="
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep kalarmcal)
 	$(add_kdeapps_dep kcalcore)
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.07.80.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.07.80.ebuild
index 1267c2ad7b..6219e296ed 100644
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.07.80.ebuild
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.07.80.ebuild
@@ -22,7 +22,7 @@ DEPEND="
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep grantleetheme)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep libkleo)
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.08.49.9999.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.08.49.9999.ebuild
index 60047ddd82..9952f387bb 100644
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.08.49.9999.ebuild
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.08.49.9999.ebuild
@@ -22,7 +22,7 @@ DEPEND="
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep grantleetheme)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep libkleo)
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 60047ddd82..9952f387bb 100644
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
@@ -22,7 +22,7 @@ DEPEND="
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep grantleetheme)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep libkleo)
diff --git a/kde-apps/kdepim-meta/kdepim-meta-16.07.80.ebuild b/kde-apps/kdepim-meta/kdepim-meta-16.07.80.ebuild
index 1d4ec0d90a..f76c635e6c 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-16.07.80.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-16.07.80.ebuild
@@ -18,7 +18,7 @@ RDEPEND="
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadiconsole)
 	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep akonadi-notes)
 	$(add_kdeapps_dep akonadi-search)
diff --git a/kde-apps/kdepim-meta/kdepim-meta-16.08.49.9999.ebuild b/kde-apps/kdepim-meta/kdepim-meta-16.08.49.9999.ebuild
index 4701ba3ef1..026a457522 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-16.08.49.9999.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-16.08.49.9999.ebuild
@@ -18,7 +18,7 @@ RDEPEND="
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadiconsole)
 	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep akonadi-notes)
 	$(add_kdeapps_dep akonadi-search)
diff --git a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
index 2b7c16ce89..9b99bed714 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
@@ -18,7 +18,7 @@ RDEPEND="
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadiconsole)
 	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep akonadi-notes)
 	$(add_kdeapps_dep akonadi-search)
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-16.07.80.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-16.07.80.ebuild
index a5aaf88759..9e1a0cbdd5 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-16.07.80.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-16.07.80.ebuild
@@ -40,7 +40,7 @@ CDEPEND="
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep akonadi-notes)
 	$(add_kdeapps_dep kalarmcal)
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-16.08.49.9999.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-16.08.49.9999.ebuild
index c78090c073..701a55f9ec 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-16.08.49.9999.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-16.08.49.9999.ebuild
@@ -40,7 +40,7 @@ CDEPEND="
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep akonadi-notes)
 	$(add_kdeapps_dep kalarmcal)
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
index c78090c073..701a55f9ec 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
@@ -40,7 +40,7 @@ CDEPEND="
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep akonadi-notes)
 	$(add_kdeapps_dep kalarmcal)
diff --git a/kde-apps/kgpg/kgpg-5.9999.ebuild b/kde-apps/kgpg/kgpg-5.9999.ebuild
index 5aafd33f20..30c522d69a 100644
--- a/kde-apps/kgpg/kgpg-5.9999.ebuild
+++ b/kde-apps/kgpg/kgpg-5.9999.ebuild
@@ -35,7 +35,7 @@ DEPEND="
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep kcontacts)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
diff --git a/kde-apps/kmail/kmail-16.07.80.ebuild b/kde-apps/kmail/kmail-16.07.80.ebuild
index 6f7b8e3247..ac69a40539 100644
--- a/kde-apps/kmail/kmail-16.07.80.ebuild
+++ b/kde-apps/kmail/kmail-16.07.80.ebuild
@@ -42,7 +42,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep sonnet)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep akonadi-search)
 	$(add_kdeapps_dep gpgmepp)
diff --git a/kde-apps/kmail/kmail-16.08.49.9999.ebuild b/kde-apps/kmail/kmail-16.08.49.9999.ebuild
index 8328d8dcf9..447a4b0a95 100644
--- a/kde-apps/kmail/kmail-16.08.49.9999.ebuild
+++ b/kde-apps/kmail/kmail-16.08.49.9999.ebuild
@@ -42,7 +42,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep sonnet)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep akonadi-search)
 	$(add_kdeapps_dep gpgmepp)
diff --git a/kde-apps/kmail/kmail-9999.ebuild b/kde-apps/kmail/kmail-9999.ebuild
index 8328d8dcf9..447a4b0a95 100644
--- a/kde-apps/kmail/kmail-9999.ebuild
+++ b/kde-apps/kmail/kmail-9999.ebuild
@@ -42,7 +42,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep sonnet)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep akonadi-search)
 	$(add_kdeapps_dep gpgmepp)
diff --git a/kde-apps/korganizer/korganizer-16.07.80.ebuild b/kde-apps/korganizer/korganizer-16.07.80.ebuild
index b6bc2d4dc3..3d4efd3a1a 100644
--- a/kde-apps/korganizer/korganizer-16.07.80.ebuild
+++ b/kde-apps/korganizer/korganizer-16.07.80.ebuild
@@ -43,7 +43,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep sonnet)
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep akonadi-notes)
 	$(add_kdeapps_dep akonadi-search)
diff --git a/kde-apps/korganizer/korganizer-16.08.49.9999.ebuild b/kde-apps/korganizer/korganizer-16.08.49.9999.ebuild
index 091d2554d5..09b4dada82 100644
--- a/kde-apps/korganizer/korganizer-16.08.49.9999.ebuild
+++ b/kde-apps/korganizer/korganizer-16.08.49.9999.ebuild
@@ -43,7 +43,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep sonnet)
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep akonadi-notes)
 	$(add_kdeapps_dep akonadi-search)
diff --git a/kde-apps/korganizer/korganizer-9999.ebuild b/kde-apps/korganizer/korganizer-9999.ebuild
index 091d2554d5..09b4dada82 100644
--- a/kde-apps/korganizer/korganizer-9999.ebuild
+++ b/kde-apps/korganizer/korganizer-9999.ebuild
@@ -43,7 +43,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep sonnet)
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep akonadi-notes)
 	$(add_kdeapps_dep akonadi-search)
diff --git a/kde-apps/libkdepim/libkdepim-16.07.80.ebuild b/kde-apps/libkdepim/libkdepim-16.07.80.ebuild
index b9aeec5640..a93a67abab 100644
--- a/kde-apps/libkdepim/libkdepim-16.07.80.ebuild
+++ b/kde-apps/libkdepim/libkdepim-16.07.80.ebuild
@@ -29,7 +29,7 @@ DEPEND="
 	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-search)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kldap)
diff --git a/kde-apps/libkdepim/libkdepim-16.08.49.9999.ebuild b/kde-apps/libkdepim/libkdepim-16.08.49.9999.ebuild
index c0978ed5a3..41b5530155 100644
--- a/kde-apps/libkdepim/libkdepim-16.08.49.9999.ebuild
+++ b/kde-apps/libkdepim/libkdepim-16.08.49.9999.ebuild
@@ -29,7 +29,7 @@ DEPEND="
 	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-search)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kldap)
diff --git a/kde-apps/libkdepim/libkdepim-9999.ebuild b/kde-apps/libkdepim/libkdepim-9999.ebuild
index c0978ed5a3..41b5530155 100644
--- a/kde-apps/libkdepim/libkdepim-9999.ebuild
+++ b/kde-apps/libkdepim/libkdepim-9999.ebuild
@@ -29,7 +29,7 @@ DEPEND="
 	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-search)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kldap)
diff --git a/kde-apps/mailcommon/mailcommon-16.07.80.ebuild b/kde-apps/mailcommon/mailcommon-16.07.80.ebuild
index e057fc3f1a..cc6efba425 100644
--- a/kde-apps/mailcommon/mailcommon-16.07.80.ebuild
+++ b/kde-apps/mailcommon/mailcommon-16.07.80.ebuild
@@ -30,7 +30,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kldap)
diff --git a/kde-apps/mailcommon/mailcommon-16.08.49.9999.ebuild b/kde-apps/mailcommon/mailcommon-16.08.49.9999.ebuild
index 27a7f5990e..bd5338f6d2 100644
--- a/kde-apps/mailcommon/mailcommon-16.08.49.9999.ebuild
+++ b/kde-apps/mailcommon/mailcommon-16.08.49.9999.ebuild
@@ -30,7 +30,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kldap)
diff --git a/kde-apps/mailcommon/mailcommon-9999.ebuild b/kde-apps/mailcommon/mailcommon-9999.ebuild
index 27a7f5990e..bd5338f6d2 100644
--- a/kde-apps/mailcommon/mailcommon-9999.ebuild
+++ b/kde-apps/mailcommon/mailcommon-9999.ebuild
@@ -30,7 +30,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kldap)
diff --git a/kde-apps/messagelib/messagelib-16.07.80.ebuild b/kde-apps/messagelib/messagelib-16.07.80.ebuild
index efde054bb1..a6d4efcd7a 100644
--- a/kde-apps/messagelib/messagelib-16.07.80.ebuild
+++ b/kde-apps/messagelib/messagelib-16.07.80.ebuild
@@ -63,7 +63,7 @@ COMMON_DEPEND="
 	>=dev-libs/grantlee-5.1.0:5
 "
 DEPEND="${COMMON_DEPEND}
-	test? ( $(add_kdeapps_dep akonadi-contact) )
+	test? ( $(add_kdeapps_dep akonadi-contacts) )
 "
 RDEPEND="${COMMON_DEPEND}
 	!<kde-apps/kdepim-addons-16.04.50:5
diff --git a/kde-apps/messagelib/messagelib-16.08.49.9999.ebuild b/kde-apps/messagelib/messagelib-16.08.49.9999.ebuild
index b0de858c59..a42532c0c7 100644
--- a/kde-apps/messagelib/messagelib-16.08.49.9999.ebuild
+++ b/kde-apps/messagelib/messagelib-16.08.49.9999.ebuild
@@ -63,7 +63,7 @@ COMMON_DEPEND="
 	>=dev-libs/grantlee-5.1.0:5
 "
 DEPEND="${COMMON_DEPEND}
-	test? ( $(add_kdeapps_dep akonadi-contact) )
+	test? ( $(add_kdeapps_dep akonadi-contacts) )
 "
 RDEPEND="${COMMON_DEPEND}
 	!<kde-apps/kdepim-addons-16.04.50:5
diff --git a/kde-apps/messagelib/messagelib-9999.ebuild b/kde-apps/messagelib/messagelib-9999.ebuild
index b0de858c59..a42532c0c7 100644
--- a/kde-apps/messagelib/messagelib-9999.ebuild
+++ b/kde-apps/messagelib/messagelib-9999.ebuild
@@ -63,7 +63,7 @@ COMMON_DEPEND="
 	>=dev-libs/grantlee-5.1.0:5
 "
 DEPEND="${COMMON_DEPEND}
-	test? ( $(add_kdeapps_dep akonadi-contact) )
+	test? ( $(add_kdeapps_dep akonadi-contacts) )
 "
 RDEPEND="${COMMON_DEPEND}
 	!<kde-apps/kdepim-addons-16.04.50:5
diff --git a/kde-apps/pimcommon/pimcommon-16.07.80.ebuild b/kde-apps/pimcommon/pimcommon-16.07.80.ebuild
index 8e7bb5ff3d..bd7e605bb8 100644
--- a/kde-apps/pimcommon/pimcommon-16.07.80.ebuild
+++ b/kde-apps/pimcommon/pimcommon-16.07.80.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kimap)
diff --git a/kde-apps/pimcommon/pimcommon-16.08.49.9999.ebuild b/kde-apps/pimcommon/pimcommon-16.08.49.9999.ebuild
index 6752496817..7063aa0e72 100644
--- a/kde-apps/pimcommon/pimcommon-16.08.49.9999.ebuild
+++ b/kde-apps/pimcommon/pimcommon-16.08.49.9999.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kimap)
diff --git a/kde-apps/pimcommon/pimcommon-9999.ebuild b/kde-apps/pimcommon/pimcommon-9999.ebuild
index 6752496817..7063aa0e72 100644
--- a/kde-apps/pimcommon/pimcommon-9999.ebuild
+++ b/kde-apps/pimcommon/pimcommon-9999.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kimap)
diff --git a/kde-apps/pimsettingexporter/pimsettingexporter-16.07.80.ebuild b/kde-apps/pimsettingexporter/pimsettingexporter-16.07.80.ebuild
index 6745a88bb7..1aaea0c405 100644
--- a/kde-apps/pimsettingexporter/pimsettingexporter-16.07.80.ebuild
+++ b/kde-apps/pimsettingexporter/pimsettingexporter-16.07.80.ebuild
@@ -30,7 +30,7 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep calendarsupport)
 	$(add_kdeapps_dep kalarmcal)
 	$(add_kdeapps_dep kcalcore)
diff --git a/kde-apps/pimsettingexporter/pimsettingexporter-16.08.49.9999.ebuild b/kde-apps/pimsettingexporter/pimsettingexporter-16.08.49.9999.ebuild
index 885d18c54b..e6a0032876 100644
--- a/kde-apps/pimsettingexporter/pimsettingexporter-16.08.49.9999.ebuild
+++ b/kde-apps/pimsettingexporter/pimsettingexporter-16.08.49.9999.ebuild
@@ -30,7 +30,7 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep calendarsupport)
 	$(add_kdeapps_dep kalarmcal)
 	$(add_kdeapps_dep kcalcore)
diff --git a/kde-apps/pimsettingexporter/pimsettingexporter-9999.ebuild b/kde-apps/pimsettingexporter/pimsettingexporter-9999.ebuild
index 885d18c54b..e6a0032876 100644
--- a/kde-apps/pimsettingexporter/pimsettingexporter-9999.ebuild
+++ b/kde-apps/pimsettingexporter/pimsettingexporter-9999.ebuild
@@ -30,7 +30,7 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep calendarsupport)
 	$(add_kdeapps_dep kalarmcal)
 	$(add_kdeapps_dep kcalcore)
diff --git a/kde-apps/sieveeditor/sieveeditor-16.07.80.ebuild b/kde-apps/sieveeditor/sieveeditor-16.07.80.ebuild
index 19f21b1dc0..f49f60997b 100644
--- a/kde-apps/sieveeditor/sieveeditor-16.07.80.ebuild
+++ b/kde-apps/sieveeditor/sieveeditor-16.07.80.ebuild
@@ -28,7 +28,7 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep calendarsupport)
 	$(add_kdeapps_dep kcalcore)
diff --git a/kde-apps/sieveeditor/sieveeditor-16.08.49.9999.ebuild b/kde-apps/sieveeditor/sieveeditor-16.08.49.9999.ebuild
index ab52e24e80..2f93b58958 100644
--- a/kde-apps/sieveeditor/sieveeditor-16.08.49.9999.ebuild
+++ b/kde-apps/sieveeditor/sieveeditor-16.08.49.9999.ebuild
@@ -28,7 +28,7 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep calendarsupport)
 	$(add_kdeapps_dep kcalcore)
diff --git a/kde-apps/sieveeditor/sieveeditor-9999.ebuild b/kde-apps/sieveeditor/sieveeditor-9999.ebuild
index ab52e24e80..2f93b58958 100644
--- a/kde-apps/sieveeditor/sieveeditor-9999.ebuild
+++ b/kde-apps/sieveeditor/sieveeditor-9999.ebuild
@@ -28,7 +28,7 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-contacts)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep calendarsupport)
 	$(add_kdeapps_dep kcalcore)
diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild
index cdebd33110..96f19c855e 100644
--- a/media-gfx/digikam/digikam-9999.ebuild
+++ b/media-gfx/digikam/digikam-9999.ebuild
@@ -69,7 +69,7 @@ COMMON_DEPEND="
 	media-libs/tiff:0
 	virtual/jpeg:0
 	addressbook? (
-		$(add_kdeapps_dep akonadi-contact)
+		$(add_kdeapps_dep akonadi-contacts)
 		$(add_kdeapps_dep kcontacts)
 	)
 	scanner? ( $(add_kdeapps_dep libksane) )
diff --git a/profiles/package.mask/kde-applications-16.07.80 b/profiles/package.mask/kde-applications-16.07.80
index 975c93abde..7c62493186 100644
--- a/profiles/package.mask/kde-applications-16.07.80
+++ b/profiles/package.mask/kde-applications-16.07.80
@@ -156,7 +156,7 @@
 ~kde-apps/accountwizard-16.07.80
 ~kde-apps/akonadi-16.07.80
 ~kde-apps/akonadi-calendar-16.07.80
-~kde-apps/akonadi-contact-16.07.80
+~kde-apps/akonadi-contacts-16.07.80
 ~kde-apps/akonadi-mime-16.07.80
 ~kde-apps/akonadi-notes-16.07.80
 ~kde-apps/akonadi-search-16.07.80
diff --git a/profiles/updates/3Q-2016 b/profiles/updates/3Q-2016
new file mode 100644
index 0000000000..6f982f51a8
--- /dev/null
+++ b/profiles/updates/3Q-2016
@@ -0,0 +1 @@
+move kde-apps/akonadi-contact kde-apps/akonadi-contacts