diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2017-11-14 22:19:42 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-11-14 22:20:03 +0100 |
| commit | f71a8924f9891f3893a61f87cfd0d657c45adf96 (patch) | |
| tree | f1c50b44dd4e292af05311cdf8cacfeb6d3bc066 | |
| parent | Documentation: Fix kde-applications-17.12 (diff) | |
| download | kde-f71a8924f9891f3893a61f87cfd0d657c45adf96.tar.gz kde-f71a8924f9891f3893a61f87cfd0d657c45adf96.tar.bz2 kde-f71a8924f9891f3893a61f87cfd0d657c45adf96.zip | |
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
| -rw-r--r-- | kde-apps/akonadi/akonadi-17.12.49.9999.ebuild | 1 | ||||
| -rw-r--r-- | kde-apps/akonadi/akonadi-9999.ebuild | 1 |
2 files changed, 2 insertions, 0 deletions
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 ) |