From 066c946c01b83a71d566df0750b298ae842fc41c Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Fri, 25 Jul 2025 18:39:24 +0200
Subject: 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@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 fb5a4496ba5..6bf9dba92bb 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 236e0443b5b..047703075c7 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 236e0443b5b..047703075c7 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
 "
 
-- 
cgit v1.2.3