diff options
102 files changed, 236 insertions, 68 deletions
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-17.04.49.9999.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-17.04.49.9999.ebuild index 63ae856014c..f1856088945 100644 --- a/kde-apps/akonadi-calendar/akonadi-calendar-17.04.49.9999.ebuild +++ b/kde-apps/akonadi-calendar/akonadi-calendar-17.04.49.9999.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-calendar/akonadi-calendar-9999.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild index 63ae856014c..f1856088945 100644 --- a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild +++ b/kde-apps/akonadi-calendar/akonadi-calendar-9999.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.49.9999.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-17.04.49.9999.ebuild index 97508ac2fff..367373cda69 100644 --- a/kde-apps/akonadi-contacts/akonadi-contacts-17.04.49.9999.ebuild +++ b/kde-apps/akonadi-contacts/akonadi-contacts-17.04.49.9999.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-contacts/akonadi-contacts-9999.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild index 97508ac2fff..367373cda69 100644 --- a/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild +++ b/kde-apps/akonadi-contacts/akonadi-contacts-9999.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.49.9999.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.04.49.9999.ebuild index 2747971b715..3e6fe5022c8 100644 --- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.04.49.9999.ebuild +++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.04.49.9999.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-import-wizard/akonadi-import-wizard-9999.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-9999.ebuild index 2747971b715..3e6fe5022c8 100644 --- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-9999.ebuild +++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-9999.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.49.9999.ebuild b/kde-apps/akonadi-mime/akonadi-mime-17.04.49.9999.ebuild index ef1ac1d124c..65234a9eaba 100644 --- a/kde-apps/akonadi-mime/akonadi-mime-17.04.49.9999.ebuild +++ b/kde-apps/akonadi-mime/akonadi-mime-17.04.49.9999.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-mime/akonadi-mime-9999.ebuild b/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild index ef1ac1d124c..65234a9eaba 100644 --- a/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild +++ b/kde-apps/akonadi-mime/akonadi-mime-9999.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.49.9999.ebuild b/kde-apps/akonadi-notes/akonadi-notes-17.04.49.9999.ebuild index 704a16060ca..78ae31f4df3 100644 --- a/kde-apps/akonadi-notes/akonadi-notes-17.04.49.9999.ebuild +++ b/kde-apps/akonadi-notes/akonadi-notes-17.04.49.9999.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-notes/akonadi-notes-9999.ebuild b/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild index 704a16060ca..78ae31f4df3 100644 --- a/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild +++ b/kde-apps/akonadi-notes/akonadi-notes-9999.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.49.9999.ebuild b/kde-apps/akonadi-search/akonadi-search-17.04.49.9999.ebuild index 7eb910e48b2..f05b5a67cf1 100644 --- a/kde-apps/akonadi-search/akonadi-search-17.04.49.9999.ebuild +++ b/kde-apps/akonadi-search/akonadi-search-17.04.49.9999.ebuild @@ -11,7 +11,7 @@ LICENSE="GPL-2+ LGPL-2.1+" KEYWORDS="" 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-search/akonadi-search-9999.ebuild b/kde-apps/akonadi-search/akonadi-search-9999.ebuild index 7eb910e48b2..f05b5a67cf1 100644 --- a/kde-apps/akonadi-search/akonadi-search-9999.ebuild +++ b/kde-apps/akonadi-search/akonadi-search-9999.ebuild @@ -11,7 +11,7 @@ LICENSE="GPL-2+ LGPL-2.1+" KEYWORDS="" 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.49.9999.ebuild b/kde-apps/akonadi/akonadi-17.04.49.9999.ebuild index ba5bf6463ab..e296f4ad891 100644 --- a/kde-apps/akonadi/akonadi-17.04.49.9999.ebuild +++ b/kde-apps/akonadi/akonadi-17.04.49.9999.ebuild @@ -49,9 +49,10 @@ DEPEND="${COMMON_DEPEND} |