commit: 066c946c01b83a71d566df0750b298ae842fc41c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 25 16:39:24 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jul 25 16:40:41 2025 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=066c946c
kde-apps/akonadi: Block colliding <app-office/merkuro-25.07.80
See also upstream commit 93e2083d975fbbd3e9751aa4ebbd52ec9f7cdd65:
"Move org.kde.akonadi module from Merkuro to Akonadi"
Amends f9da165505f3708a1940367fa604aa138ada8fa3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/akonadi/akonadi-25.07.90.ebuild | 1 +
kde-apps/akonadi/akonadi-25.08.49.9999.ebuild | 1 +
kde-apps/akonadi/akonadi-9999.ebuild | 1 +
3 files changed, 3 insertions(+)
diff --git a/kde-apps/akonadi/akonadi-25.07.90.ebuild
b/kde-apps/akonadi/akonadi-25.07.90.ebuild
index fb5a4496ba..6bf9dba92b 100644
--- a/kde-apps/akonadi/akonadi-25.07.90.ebuild
+++ b/kde-apps/akonadi/akonadi-25.07.90.ebuild
@@ -50,6 +50,7 @@ DEPEND="${COMMON_DEPEND}
test? ( sys-apps/dbus )
"
RDEPEND="${COMMON_DEPEND}
+ !<app-office/merkuro-25.07.80
kde-apps/akonadi-config
"
diff --git a/kde-apps/akonadi/akonadi-25.08.49.9999.ebuild
b/kde-apps/akonadi/akonadi-25.08.49.9999.ebuild
index 236e0443b5..047703075c 100644
--- a/kde-apps/akonadi/akonadi-25.08.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-25.08.49.9999.ebuild
@@ -50,6 +50,7 @@ DEPEND="${COMMON_DEPEND}
test? ( sys-apps/dbus )
"
RDEPEND="${COMMON_DEPEND}
+ !<app-office/merkuro-25.07.80
kde-apps/akonadi-config
"
diff --git a/kde-apps/akonadi/akonadi-9999.ebuild
b/kde-apps/akonadi/akonadi-9999.ebuild
index 236e0443b5..047703075c 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -50,6 +50,7 @@ DEPEND="${COMMON_DEPEND}
test? ( sys-apps/dbus )
"
RDEPEND="${COMMON_DEPEND}
+ !<app-office/merkuro-25.07.80
kde-apps/akonadi-config
"
