[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/

[Andreas Sturmlechner]

commit:     f71a8924f9891f3893a61f87cfd0d657c45adf96
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 14 21:19:42 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 14 21:20:03 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f71a8924

kde-apps/akonadi: Block <kde-apps/kapptemplate-17.11.80

 * Detected file collision(s):
 *
 *      /usr/share/kdevappwizard/templates/akonadiserializer.tar.bz2
 *      /usr/share/kdevappwizard/templates/akonadiresource.tar.bz2

Package-Manager: Portage-2.3.14, Repoman-2.3.5

 kde-apps/akonadi/akonadi-17.12.49.9999.ebuild | 1 +
 kde-apps/akonadi/akonadi-9999.ebuild          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/kde-apps/akonadi/akonadi-17.12.49.9999.ebuild 
b/kde-apps/akonadi/akonadi-17.12.49.9999.ebuild
index 7aa020039e..3a8b593b7f 100644
--- a/kde-apps/akonadi/akonadi-17.12.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-17.12.49.9999.ebuild
@@ -49,6 +49,7 @@ DEPEND="${COMMON_DEPEND}
        test? ( sys-apps/dbus )
 "
 RDEPEND="${COMMON_DEPEND}
+       !<kde-apps/kapptemplate-17.11.80
        !kde-apps/kdepim-l10n
        !kde-apps/kdepimlibs
        mysql? ( virtual/mysql )

diff --git a/kde-apps/akonadi/akonadi-9999.ebuild 
b/kde-apps/akonadi/akonadi-9999.ebuild
index 7aa020039e..3a8b593b7f 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -49,6 +49,7 @@ DEPEND="${COMMON_DEPEND}
        test? ( sys-apps/dbus )
 "
 RDEPEND="${COMMON_DEPEND}
+       !<kde-apps/kapptemplate-17.11.80
        !kde-apps/kdepim-l10n
        !kde-apps/kdepimlibs
        mysql? ( virtual/mysql )