diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2025-07-25 18:39:24 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2025-07-25 18:40:41 +0200 |
| commit | 066c946c01b83a71d566df0750b298ae842fc41c (patch) | |
| tree | 5e5285c5c134017be96c653b7aee1ce51170338d | |
| parent | 5bd4e73d89411f2237405a13cca060bf4d9ca471 (diff) | |
| download | kde-066c946c01b83a71d566df0750b298ae842fc41c.tar.gz kde-066c946c01b83a71d566df0750b298ae842fc41c.tar.bz2 kde-066c946c01b83a71d566df0750b298ae842fc41c.zip | |
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>
| -rw-r--r-- | kde-apps/akonadi/akonadi-25.07.90.ebuild | 1 | ||||
| -rw-r--r-- | kde-apps/akonadi/akonadi-25.08.49.9999.ebuild | 1 | ||||
| -rw-r--r-- | kde-apps/akonadi/akonadi-9999.ebuild | 1 |
3 files changed, 3 insertions, 0 deletions
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 " |