From 89260030e727c8e254c8d9aa70f31b2050dfa045 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sun, 23 Apr 2017 19:47:35 +0200
Subject: [PATCH] kde-apps: Add blockers against kde-apps/kdepim-l10n

Package-Manager: Portage-2.3.3, Repoman-2.3.1
---
 kde-apps/akonadi-calendar/akonadi-calendar-17.04.0.ebuild  | 4 +++-
 kde-apps/akonadi-contacts/akonadi-contacts-17.04.0.ebuild  | 4 +++-
 .../akonadi-import-wizard-17.04.0.ebuild                   | 1 +
 kde-apps/akonadi-mime/akonadi-mime-17.04.0.ebuild          | 1 +
 kde-apps/akonadi-notes/akonadi-notes-17.04.0.ebuild        | 7 +++++--
 kde-apps/akonadi-search/akonadi-search-17.04.0.ebuild      | 7 +++++--
 kde-apps/akonadi/akonadi-17.04.0.ebuild                    | 3 ++-
 kde-apps/akregator/akregator-17.04.0.ebuild                | 7 +++++--
 kde-apps/blogilo/blogilo-17.04.0.ebuild                    | 1 +
 kde-apps/calendarjanitor/calendarjanitor-17.04.0.ebuild    | 4 +++-
 kde-apps/calendarsupport/calendarsupport-17.04.0.ebuild    | 4 +++-
 kde-apps/eventviews/eventviews-17.04.0.ebuild              | 4 +++-
 kde-apps/grantlee-editor/grantlee-editor-17.04.0.ebuild    | 1 +
 kde-apps/grantleetheme/grantleetheme-17.04.0.ebuild        | 7 +++++--
 kde-apps/incidenceeditor/incidenceeditor-17.04.0.ebuild    | 1 +
 kde-apps/kaddressbook/kaddressbook-17.04.0.ebuild          | 1 +
 kde-apps/kalarm/kalarm-17.04.0.ebuild                      | 1 +
 kde-apps/kalarmcal/kalarmcal-17.04.0.ebuild                | 1 +
 kde-apps/kblog/kblog-17.04.0.ebuild                        | 4 +++-
 kde-apps/kcalutils/kcalutils-17.04.0.ebuild                | 4 +++-
 kde-apps/kcontacts/kcontacts-17.04.0.ebuild                | 4 +++-
 kde-apps/kdav/kdav-17.04.0.ebuild                          | 4 +++-
 kde-apps/kdepim-addons/kdepim-addons-17.04.0.ebuild        | 1 +
 kde-apps/kdepim-apps-libs/kdepim-apps-libs-17.04.0.ebuild  | 4 +++-
 kde-apps/kdepim-runtime/kdepim-runtime-17.04.0-r1.ebuild   | 1 +
 .../kidentitymanagement/kidentitymanagement-17.04.0.ebuild | 4 +++-
 kde-apps/kimap/kimap-17.04.0.ebuild                        | 4 +++-
 kde-apps/kldap/kldap-17.04.0.ebuild                        | 1 +
 kde-apps/kleopatra/kleopatra-17.04.0.ebuild                | 1 +
 .../kmail-account-wizard-17.04.0.ebuild                    | 1 +
 kde-apps/kmail/kmail-17.04.0.ebuild                        | 1 +
 kde-apps/kmailtransport/kmailtransport-17.04.0.ebuild      | 1 +
 kde-apps/kmime/kmime-17.04.0.ebuild                        | 4 +++-
 kde-apps/knotes/knotes-17.04.0.ebuild                      | 1 +
 kde-apps/konsolekalendar/konsolekalendar-17.04.0.ebuild    | 4 +++-
 kde-apps/kontact/kontact-17.04.0.ebuild                    | 4 +++-
 kde-apps/kontactinterface/kontactinterface-17.04.0.ebuild  | 4 +++-
 kde-apps/korganizer/korganizer-17.04.0.ebuild              | 1 +
 kde-apps/kpimtextedit/kpimtextedit-17.04.0.ebuild          | 7 +++++--
 kde-apps/libgravatar/libgravatar-17.04.0.ebuild            | 4 +++-
 kde-apps/libkdepim/libkdepim-17.04.0.ebuild                | 1 +
 kde-apps/libkgapi/libkgapi-17.04.0.ebuild                  | 4 +++-
 kde-apps/libkleo/libkleo-17.04.0.ebuild                    | 7 +++++--
 kde-apps/libksieve/libksieve-17.04.0.ebuild                | 1 +
 kde-apps/libktnef/libktnef-17.04.0.ebuild                  | 4 +++-
 kde-apps/mailcommon/mailcommon-17.04.0.ebuild              | 7 +++++--
 kde-apps/mailimporter/mailimporter-17.04.0.ebuild          | 4 +++-
 kde-apps/mbox-importer/mbox-importer-17.04.0.ebuild        | 1 +
 kde-apps/messagelib/messagelib-17.04.0.ebuild              | 1 +
 .../pim-data-exporter/pim-data-exporter-17.04.0.ebuild     | 1 +
 kde-apps/pim-sieve-editor/pim-sieve-editor-17.04.0.ebuild  | 1 +
 kde-apps/pimcommon/pimcommon-17.04.0.ebuild                | 1 +
 52 files changed, 121 insertions(+), 35 deletions(-)

diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-17.04.0.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-17.04.0.ebuild
index e31a69ddc72c..10e6379a7d12 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-17.04.0.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-17.04.0.ebuild
@@ -39,6 +39,8 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
 
 RESTRICT+=" test"
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-17.04.0.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-17.04.0.ebuild
index b31d26b669e5..7030cb9808b1 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-17.04.0.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-17.04.0.ebuild
@@ -40,7 +40,9 @@ DEPEND="
 	>=dev-libs/grantlee-5.1.0:5
 	prison? ( $(add_frameworks_dep prison) )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.04.0.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.04.0.ebuild
index 3d4d6c2ae9d9..44577f2fe089 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.04.0.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.04.0.ebuild
@@ -36,5 +36,6 @@ DEPEND="
 	$(add_qt_dep qtxml)
 "
 RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
 	!kde-apps/kmail:4
 "
diff --git a/kde-apps/akonadi-mime/akonadi-mime-17.04.0.ebuild b/kde-apps/akonadi-mime/akonadi-mime-17.04.0.ebuild
index 16d47ca42e93..940f843339b1 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-17.04.0.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-17.04.0.ebuild
@@ -32,5 +32,6 @@ DEPEND="
 	x11-misc/shared-mime-info
 "
 RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
 	!kde-apps/kdepimlibs:4
 "
diff --git a/kde-apps/akonadi-notes/akonadi-notes-17.04.0.ebuild b/kde-apps/akonadi-notes/akonadi-notes-17.04.0.ebuild
index 338eabb75a9d..3692761686ca 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-17.04.0.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-17.04.0.ebuild
@@ -14,12 +14,15 @@ IUSE=""
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
 RESTRICT+=" test"
 
-RDEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep ki18n)
 	$(add_kdeapps_dep kmime)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtxml)
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	$(add_kdeapps_dep akonadi)
 "
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/akonadi-search/akonadi-search-17.04.0.ebuild b/kde-apps/akonadi-search/akonadi-search-17.04.0.ebuild
index 684d88b3968a..1a14fd16d4bd 100644
--- a/kde-apps/akonadi-search/akonadi-search-17.04.0.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-17.04.0.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kconfig)
@@ -30,6 +30,9 @@ RDEPEND="
 	$(add_qt_dep qtwidgets)
 	>=dev-libs/xapian-1.3:=[chert]
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
 "
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/akonadi/akonadi-17.04.0.ebuild b/kde-apps/akonadi/akonadi-17.04.0.ebuild
index 41186be4ba32..dc62c98e3b9e 100644
--- a/kde-apps/akonadi/akonadi-17.04.0.ebuild
+++ b/kde-apps/akonadi/akonadi-17.04.0.ebuild
@@ -49,9 +49,10 @@ DEPEND="${COMMON_DEPEND}
 	test? ( sys-apps/dbus )
 "
 RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/kdepimlibs
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql )
-	!kde-apps/kdepimlibs
 "
 
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
diff --git a/kde-apps/akregator/akregator-17.04.0.ebuild b/kde-apps/akregator/akregator-17.04.0.ebuild
index e4bfdab7a6ae..2a2a0cbe6c25 100644
--- a/kde-apps/akregator/akregator-17.04.0.ebuild
+++ b/kde-apps/akregator/akregator-17.04.0.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 # drop qtwebengine subslot operator when QT_MINIMAL >= 5.8.0
-RDEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
@@ -48,6 +48,9 @@ RDEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	dev-libs/grantlee:5
 "
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/blogilo/blogilo-17.04.0.ebuild b/kde-apps/blogilo/blogilo-17.04.0.ebuild
index 7bce8d7b45a1..e08f008b6383 100644
--- a/kde-apps/blogilo/blogilo-17.04.0.ebuild
+++ b/kde-apps/blogilo/blogilo-17.04.0.ebuild
@@ -40,6 +40,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	!<kde-apps/kdepim-apps-libs-16.04.50
+	!kde-apps/kdepim-l10n
 "
 
 src_configure() {
diff --git a/kde-apps/calendarjanitor/calendarjanitor-17.04.0.ebuild b/kde-apps/calendarjanitor/calendarjanitor-17.04.0.ebuild
index f643c9261a30..70116a2d4161 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-17.04.0.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-17.04.0.ebuild
@@ -24,7 +24,9 @@ DEPEND="
 	$(add_kdeapps_dep kcalcore)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
 
 src_prepare() {
 	kde5_src_prepare
diff --git a/kde-apps/calendarsupport/calendarsupport-17.04.0.ebuild b/kde-apps/calendarsupport/calendarsupport-17.04.0.ebuild
index 914f64623285..6f796a0ec7ca 100644
--- a/kde-apps/calendarsupport/calendarsupport-17.04.0.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-17.04.0.ebuild
@@ -40,4 +40,6 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	dev-libs/libical
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/eventviews/eventviews-17.04.0.ebuild b/kde-apps/eventviews/eventviews-17.04.0.ebuild
index e1b82038557f..4552c4dc37b4 100644
--- a/kde-apps/eventviews/eventviews-17.04.0.ebuild
+++ b/kde-apps/eventviews/eventviews-17.04.0.ebuild
@@ -38,4 +38,6 @@ DEPEND="
 	dev-libs/kdiagram:5
 	dev-libs/libical
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/grantlee-editor/grantlee-editor-17.04.0.ebuild b/kde-apps/grantlee-editor/grantlee-editor-17.04.0.ebuild
index 9a6c05721587..c5a75bf73309 100644
--- a/kde-apps/grantlee-editor/grantlee-editor-17.04.0.ebuild
+++ b/kde-apps/grantlee-editor/grantlee-editor-17.04.0.ebuild
@@ -40,5 +40,6 @@ DEPEND="
 RDEPEND="${DEPEND}
 	!kde-apps/kaddressbook:4
 	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
 	!kde-apps/kmail:4
 "
diff --git a/kde-apps/grantleetheme/grantleetheme-17.04.0.ebuild b/kde-apps/grantleetheme/grantleetheme-17.04.0.ebuild
index d95faf975109..c718b8c04ec0 100644
--- a/kde-apps/grantleetheme/grantleetheme-17.04.0.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-17.04.0.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
@@ -23,9 +23,12 @@ RDEPEND="
 	$(add_qt_dep qtwidgets)
 	dev-libs/grantlee:5
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	$(add_qt_dep qtnetwork)
 "
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
 
 # fails if package not already installed
 RESTRICT+=" test"
diff --git a/kde-apps/incidenceeditor/incidenceeditor-17.04.0.ebuild b/kde-apps/incidenceeditor/incidenceeditor-17.04.0.ebuild
index a8b45470aae9..b55b15704498 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-17.04.0.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-17.04.0.ebuild
@@ -50,4 +50,5 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
 "
diff --git a/kde-apps/kaddressbook/kaddressbook-17.04.0.ebuild b/kde-apps/kaddressbook/kaddressbook-17.04.0.ebuild
index 9a60ac95f413..62a02b54a413 100644
--- a/kde-apps/kaddressbook/kaddressbook-17.04.0.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-17.04.0.ebuild
@@ -55,6 +55,7 @@ DEPEND="${COMMON_DEPEND}
 	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
 "
 RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
 	$(add_kdeapps_dep kdepim-runtime)
 "
 
diff --git a/kde-apps/kalarm/kalarm-17.04.0.ebuild b/kde-apps/kalarm/kalarm-17.04.0.ebuild
index bf7d1e3a6b11..aece114900d3 100644
--- a/kde-apps/kalarm/kalarm-17.04.0.ebuild
+++ b/kde-apps/kalarm/kalarm-17.04.0.ebuild
@@ -63,6 +63,7 @@ DEPEND="
 	)
 "
 RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
 	$(add_kdeapps_dep kdepim-runtime)
 "
 
diff --git a/kde-apps/kalarmcal/kalarmcal-17.04.0.ebuild b/kde-apps/kalarmcal/kalarmcal-17.04.0.ebuild
index 4b6dcf977296..1fbcfd584ec7 100644
--- a/kde-apps/kalarmcal/kalarmcal-17.04.0.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-17.04.0.ebuild
@@ -20,4 +20,5 @@ DEPEND="
 	$(add_qt_dep qtgui)
 "
 RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
 "
diff --git a/kde-apps/kblog/kblog-17.04.0.ebuild b/kde-apps/kblog/kblog-17.04.0.ebuild
index 033997642b82..f1599e11bf43 100644
--- a/kde-apps/kblog/kblog-17.04.0.ebuild
+++ b/kde-apps/kblog/kblog-17.04.0.ebuild
@@ -20,4 +20,6 @@ DEPEND="
 	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep syndication)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/kcalutils/kcalutils-17.04.0.ebuild b/kde-apps/kcalutils/kcalutils-17.04.0.ebuild
index 5f5833d82e34..c60f8564c9c5 100644
--- a/kde-apps/kcalutils/kcalutils-17.04.0.ebuild
+++ b/kde-apps/kcalutils/kcalutils-17.04.0.ebuild
@@ -26,6 +26,8 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	dev-libs/grantlee:5
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
 
 RESTRICT+=" test"
diff --git a/kde-apps/kcontacts/kcontacts-17.04.0.ebuild b/kde-apps/kcontacts/kcontacts-17.04.0.ebuild
index 488e5f5b6f9f..6cbb84171ef3 100644
--- a/kde-apps/kcontacts/kcontacts-17.04.0.ebuild
+++ b/kde-apps/kcontacts/kcontacts-17.04.0.ebuild
@@ -20,7 +20,9 @@ DEPEND="
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
 
 src_prepare() {
 	kde5_src_prepare
diff --git a/kde-apps/kdav/kdav-17.04.0.ebuild b/kde-apps/kdav/kdav-17.04.0.ebuild
index a73018540d33..d569cad24fe5 100644
--- a/kde-apps/kdav/kdav-17.04.0.ebuild
+++ b/kde-apps/kdav/kdav-17.04.0.ebuild
@@ -19,4 +19,6 @@ DEPEND="
 	$(add_qt_dep qtxml)
 	$(add_qt_dep qtxmlpatterns)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/kdepim-addons/kdepim-addons-17.04.0.ebuild b/kde-apps/kdepim-addons/kdepim-addons-17.04.0.ebuild
index d67d72ba461e..b192043010b4 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-17.04.0.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-17.04.0.ebuild
@@ -58,6 +58,7 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kaddressbook:4
+	!kde-apps/kdepim-l10n
 	!kde-apps/kmail:4
 "
 
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-17.04.0.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-17.04.0.ebuild
index cbb67bc0ad31..83b8923352f4 100644
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-17.04.0.ebuild
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-17.04.0.ebuild
@@ -33,7 +33,9 @@ DEPEND="
 	>=dev-libs/grantlee-5.1.0:5
 	prison? ( $(add_frameworks_dep prison) )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-17.04.0-r1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-17.04.0-r1.ebuild
index e8bd49c7047e..e15f7f928e95 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-17.04.0-r1.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-17.04.0-r1.ebuild
@@ -65,6 +65,7 @@ DEPEND="${CDEPEND}
 "
 RDEPEND="${CDEPEND}
 	!kde-apps/kdepim-kioslaves
+	!kde-apps/kdepim-l10n
 	$(add_frameworks_dep oxygen-icons)
 "
 
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-17.04.0.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-17.04.0.ebuild
index 1489f5a6bd8b..3a7c77c2d2bc 100644
--- a/kde-apps/kidentitymanagement/kidentitymanagement-17.04.0.ebuild
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-17.04.0.ebuild
@@ -28,6 +28,8 @@ DEPEND="
 	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
 
 RESTRICT+=" test"
diff --git a/kde-apps/kimap/kimap-17.04.0.ebuild b/kde-apps/kimap/kimap-17.04.0.ebuild
index e21b4517c405..e47e9edfc8f1 100644
--- a/kde-apps/kimap/kimap-17.04.0.ebuild
+++ b/kde-apps/kimap/kimap-17.04.0.ebuild
@@ -20,7 +20,9 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	dev-libs/cyrus-sasl
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
 
 src_test() {
 	# tests cannot be run in parallel #605586
diff --git a/kde-apps/kldap/kldap-17.04.0.ebuild b/kde-apps/kldap/kldap-17.04.0.ebuild
index 2121461ee526..ca242e38a90d 100644
--- a/kde-apps/kldap/kldap-17.04.0.ebuild
+++ b/kde-apps/kldap/kldap-17.04.0.ebuild
@@ -24,6 +24,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	!kde-apps/kdepim-kioslaves
+	!kde-apps/kdepim-l10n
 "
 
 src_prepare() {
diff --git a/kde-apps/kleopatra/kleopatra-17.04.0.ebuild b/kde-apps/kleopatra/kleopatra-17.04.0.ebuild
index 762f245f32b8..a7e73b70cdf4 100644
--- a/kde-apps/kleopatra/kleopatra-17.04.0.ebuild
+++ b/kde-apps/kleopatra/kleopatra-17.04.0.ebuild
@@ -44,6 +44,7 @@ DEPEND="
 	dev-libs/libgpg-error
 "
 RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
 	>=app-crypt/gnupg-2.1
 	app-crypt/paperkey
 "
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-17.04.0.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-17.04.0.ebuild
index 3e9dc52a63ca..5faaa5ed06b9 100644
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-17.04.0.ebuild
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-17.04.0.ebuild
@@ -47,5 +47,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
 	!kde-apps/kdepim-runtime:4
 "
diff --git a/kde-apps/kmail/kmail-17.04.0.ebuild b/kde-apps/kmail/kmail-17.04.0.ebuild
index def0a8834871..8ad233667102 100644
--- a/kde-apps/kmail/kmail-17.04.0.ebuild
+++ b/kde-apps/kmail/kmail-17.04.0.ebuild
@@ -76,6 +76,7 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
 	!kde-apps/ktnef
 	$(add_kdeapps_dep kdepim-runtime)
 "
diff --git a/kde-apps/kmailtransport/kmailtransport-17.04.0.ebuild b/kde-apps/kmailtransport/kmailtransport-17.04.0.ebuild
index 4b9bf10338fc..73f5cb8ba6f2 100644
--- a/kde-apps/kmailtransport/kmailtransport-17.04.0.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-17.04.0.ebuild
@@ -36,6 +36,7 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-kioslaves
+	!kde-apps/kdepim-l10n
 	!kde-apps/kdepimlibs:4
 "
 
diff --git a/kde-apps/kmime/kmime-17.04.0.ebuild b/kde-apps/kmime/kmime-17.04.0.ebuild
index 5e61a5e188b7..ba8bf6558b7c 100644
--- a/kde-apps/kmime/kmime-17.04.0.ebuild
+++ b/kde-apps/kmime/kmime-17.04.0.ebuild
@@ -15,4 +15,6 @@ DEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep ki18n)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/knotes/knotes-17.04.0.ebuild b/kde-apps/knotes/knotes-17.04.0.ebuild
index 1bac61455b13..afa574aa0166 100644
--- a/kde-apps/knotes/knotes-17.04.0.ebuild
+++ b/kde-apps/knotes/knotes-17.04.0.ebuild
@@ -57,6 +57,7 @@ DEPEND="
 	x11-libs/libX11
 "
 RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
 	$(add_kdeapps_dep kdepim-runtime)
 "
 
diff --git a/kde-apps/konsolekalendar/konsolekalendar-17.04.0.ebuild b/kde-apps/konsolekalendar/konsolekalendar-17.04.0.ebuild
index d1b11741c694..3035b9940c94 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-17.04.0.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-17.04.0.ebuild
@@ -25,7 +25,9 @@ DEPEND="
 	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
 
 src_prepare() {
 	kde5_src_prepare
diff --git a/kde-apps/kontact/kontact-17.04.0.ebuild b/kde-apps/kontact/kontact-17.04.0.ebuild
index 9070db9d5e30..1db55263d05d 100644
--- a/kde-apps/kontact/kontact-17.04.0.ebuild
+++ b/kde-apps/kontact/kontact-17.04.0.ebuild
@@ -39,4 +39,6 @@ DEPEND="
 	$(add_qt_dep qtwebengine 'widgets')
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/kontactinterface/kontactinterface-17.04.0.ebuild b/kde-apps/kontactinterface/kontactinterface-17.04.0.ebuild
index d76cacbfe397..e2461b1a0c60 100644
--- a/kde-apps/kontactinterface/kontactinterface-17.04.0.ebuild
+++ b/kde-apps/kontactinterface/kontactinterface-17.04.0.ebuild
@@ -22,4 +22,6 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/korganizer/korganizer-17.04.0.ebuild b/kde-apps/korganizer/korganizer-17.04.0.ebuild
index 67bc6e6a9e71..b55e4c58e2ba 100644
--- a/kde-apps/korganizer/korganizer-17.04.0.ebuild
+++ b/kde-apps/korganizer/korganizer-17.04.0.ebuild
@@ -74,6 +74,7 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
 	$(add_kdeapps_dep kdepim-runtime)
 "
 
diff --git a/kde-apps/kpimtextedit/kpimtextedit-17.04.0.ebuild b/kde-apps/kpimtextedit/kpimtextedit-17.04.0.ebuild
index 7097aaa285fc..026b5025e69f 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-17.04.0.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-17.04.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
 KEYWORDS="~amd64 ~x86"
 IUSE="speech"
 
-RDEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -32,9 +32,12 @@ RDEPEND="
 	dev-libs/grantlee:5
 	speech? ( $(add_qt_dep qtspeech) )
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	test? ( $(add_frameworks_dep ktextwidgets) )
 "
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
 
 RESTRICT+=" test"
 
diff --git a/kde-apps/libgravatar/libgravatar-17.04.0.ebuild b/kde-apps/libgravatar/libgravatar-17.04.0.ebuild
index bf392963e387..e3f91c435ee0 100644
--- a/kde-apps/libgravatar/libgravatar-17.04.0.ebuild
+++ b/kde-apps/libgravatar/libgravatar-17.04.0.ebuild
@@ -23,4 +23,6 @@ DEPEND="
 	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/libkdepim/libkdepim-17.04.0.ebuild b/kde-apps/libkdepim/libkdepim-17.04.0.ebuild
index c799d5a11889..0029caa8920f 100644
--- a/kde-apps/libkdepim/libkdepim-17.04.0.ebuild
+++ b/kde-apps/libkdepim/libkdepim-17.04.0.ebuild
@@ -39,4 +39,5 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
 "
diff --git a/kde-apps/libkgapi/libkgapi-17.04.0.ebuild b/kde-apps/libkgapi/libkgapi-17.04.0.ebuild
index 079ddb8a23be..8f4bcb63881a 100644
--- a/kde-apps/libkgapi/libkgapi-17.04.0.ebuild
+++ b/kde-apps/libkgapi/libkgapi-17.04.0.ebuild
@@ -26,4 +26,6 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/libkleo/libkleo-17.04.0.ebuild b/kde-apps/libkleo/libkleo-17.04.0.ebuild
index 2458681738fe..7cbca924db0e 100644
--- a/kde-apps/libkleo/libkleo-17.04.0.ebuild
+++ b/kde-apps/libkleo/libkleo-17.04.0.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -25,6 +25,9 @@ RDEPEND="
 	$(add_qt_dep qtwidgets)
 	>=app-crypt/gpgme-1.7.1[cxx,qt5]
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
 "
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/libksieve/libksieve-17.04.0.ebuild b/kde-apps/libksieve/libksieve-17.04.0.ebuild
index 9b3b8c338c97..9504310b137c 100644
--- a/kde-apps/libksieve/libksieve-17.04.0.ebuild
+++ b/kde-apps/libksieve/libksieve-17.04.0.ebuild
@@ -48,6 +48,7 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-kioslaves
+	!kde-apps/kdepim-l10n
 "
 
 RESTRICT+=" test"
diff --git a/kde-apps/libktnef/libktnef-17.04.0.ebuild b/kde-apps/libktnef/libktnef-17.04.0.ebuild
index 757edc61cc8c..3343068cb505 100644
--- a/kde-apps/libktnef/libktnef-17.04.0.ebuild
+++ b/kde-apps/libktnef/libktnef-17.04.0.ebuild
@@ -19,4 +19,6 @@ DEPEND="
 	$(add_kdeapps_dep kcalutils)
 	$(add_kdeapps_dep kcontacts)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/mailcommon/mailcommon-17.04.0.ebuild b/kde-apps/mailcommon/mailcommon-17.04.0.ebuild
index 7214025e5a3c..ec1310fce133 100644
--- a/kde-apps/mailcommon/mailcommon-17.04.0.ebuild
+++ b/kde-apps/mailcommon/mailcommon-17.04.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
@@ -47,8 +47,11 @@ RDEPEND="
 	$(add_qt_dep qtxml)
 	media-libs/phonon[qt5]
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 "
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
 
 RESTRICT+=" test"
diff --git a/kde-apps/mailimporter/mailimporter-17.04.0.ebuild b/kde-apps/mailimporter/mailimporter-17.04.0.ebuild
index 2f215113f947..bd04b0cc3902 100644
--- a/kde-apps/mailimporter/mailimporter-17.04.0.ebuild
+++ b/kde-apps/mailimporter/mailimporter-17.04.0.ebuild
@@ -25,4 +25,6 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/mbox-importer/mbox-importer-17.04.0.ebuild b/kde-apps/mbox-importer/mbox-importer-17.04.0.ebuild
index a4b378f95696..907f2b5ce945 100644
--- a/kde-apps/mbox-importer/mbox-importer-17.04.0.ebuild
+++ b/kde-apps/mbox-importer/mbox-importer-17.04.0.ebuild
@@ -27,5 +27,6 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 "
 RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
 	!kde-apps/kmail:4
 "
diff --git a/kde-apps/messagelib/messagelib-17.04.0.ebuild b/kde-apps/messagelib/messagelib-17.04.0.ebuild
index 8ec98bc2e757..231626477887 100644
--- a/kde-apps/messagelib/messagelib-17.04.0.ebuild
+++ b/kde-apps/messagelib/messagelib-17.04.0.ebuild
@@ -64,6 +64,7 @@ DEPEND="
 RDEPEND="${DEPEND}
 	!<kde-apps/kdepim-addons-16.08.50:5
 	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
 	!=kde-apps/kmail-4.4*:4
 "
 
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-17.04.0.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-17.04.0.ebuild
index f46e005ebab5..d46f726b31fb 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-17.04.0.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-17.04.0.ebuild
@@ -41,5 +41,6 @@ DEPEND="
 	$(add_qt_dep qtxml)
 "
 RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
 	!kde-apps/kmail:4
 "
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-17.04.0.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-17.04.0.ebuild
index 8e2b855e49c9..1d89d8fff5f0 100644
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-17.04.0.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-17.04.0.ebuild
@@ -40,4 +40,5 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
 "
diff --git a/kde-apps/pimcommon/pimcommon-17.04.0.ebuild b/kde-apps/pimcommon/pimcommon-17.04.0.ebuild
index 5ac73f794a67..43ba95e2020d 100644
--- a/kde-apps/pimcommon/pimcommon-17.04.0.ebuild
+++ b/kde-apps/pimcommon/pimcommon-17.04.0.ebuild
@@ -55,4 +55,5 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
 "
-- 
2.26.2