| 1 |
commit: f71a8924f9891f3893a61f87cfd0d657c45adf96 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 14 21:19:42 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 14 21:20:03 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f71a8924 |
| 7 |
|
| 8 |
kde-apps/akonadi: Block <kde-apps/kapptemplate-17.11.80 |
| 9 |
|
| 10 |
* Detected file collision(s): |
| 11 |
* |
| 12 |
* /usr/share/kdevappwizard/templates/akonadiserializer.tar.bz2 |
| 13 |
* /usr/share/kdevappwizard/templates/akonadiresource.tar.bz2 |
| 14 |
|
| 15 |
Package-Manager: Portage-2.3.14, Repoman-2.3.5 |
| 16 |
|
| 17 |
kde-apps/akonadi/akonadi-17.12.49.9999.ebuild | 1 + |
| 18 |
kde-apps/akonadi/akonadi-9999.ebuild | 1 + |
| 19 |
2 files changed, 2 insertions(+) |
| 20 |
|
| 21 |
diff --git a/kde-apps/akonadi/akonadi-17.12.49.9999.ebuild b/kde-apps/akonadi/akonadi-17.12.49.9999.ebuild |
| 22 |
index 7aa020039e..3a8b593b7f 100644 |
| 23 |
--- a/kde-apps/akonadi/akonadi-17.12.49.9999.ebuild |
| 24 |
+++ b/kde-apps/akonadi/akonadi-17.12.49.9999.ebuild |
| 25 |
@@ -49,6 +49,7 @@ DEPEND="${COMMON_DEPEND} |
| 26 |
test? ( sys-apps/dbus ) |
| 27 |
" |
| 28 |
RDEPEND="${COMMON_DEPEND} |
| 29 |
+ !<kde-apps/kapptemplate-17.11.80 |
| 30 |
!kde-apps/kdepim-l10n |
| 31 |
!kde-apps/kdepimlibs |
| 32 |
mysql? ( virtual/mysql ) |
| 33 |
|
| 34 |
diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild |
| 35 |
index 7aa020039e..3a8b593b7f 100644 |
| 36 |
--- a/kde-apps/akonadi/akonadi-9999.ebuild |
| 37 |
+++ b/kde-apps/akonadi/akonadi-9999.ebuild |
| 38 |
@@ -49,6 +49,7 @@ DEPEND="${COMMON_DEPEND} |
| 39 |
test? ( sys-apps/dbus ) |
| 40 |
" |
| 41 |
RDEPEND="${COMMON_DEPEND} |
| 42 |
+ !<kde-apps/kapptemplate-17.11.80 |
| 43 |
!kde-apps/kdepim-l10n |
| 44 |
!kde-apps/kdepimlibs |
| 45 |
mysql? ( virtual/mysql ) |
Archives