From: Andreas Sturmlechner Date: Sun, 23 Apr 2017 17:47:35 +0000 (+0200) Subject: kde-apps: Add blockers against kde-apps/kdepim-l10n X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=89260030e727c8e254c8d9aa70f31b2050dfa045;p=gentoo.git kde-apps: Add blockers against kde-apps/kdepim-l10n Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- 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} !