public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "WANG Xuerui" <xen0n@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx-rime/
Date: Wed,  7 Feb 2024 05:18:17 +0000 (UTC)	[thread overview]
Message-ID: <1707283007.50ba2f6c2828198cea145470e93afc99d8b3eebc.xen0n@gentoo> (raw)

commit:     50ba2f6c2828198cea145470e93afc99d8b3eebc
Author:     Ryan Qian <i <AT> bitbili <DOT> net>
AuthorDate: Fri Feb  2 13:55:07 2024 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Wed Feb  7 05:16:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50ba2f6c

app-i18n/fcitx-rime: fix icon collision between slot 4 and 5

Since the corresponding major dependencies app-i18n/fcitx:5 and
app-i18n/fcitx:4 are mutually blocked, it is sufficient to make these
two also mutually blocked.

Closes: https://bugs.gentoo.org/923579
Signed-off-by: Ryan Qian <i <AT> bitbili.net>
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>

 app-i18n/fcitx-rime/fcitx-rime-5.1.4.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-i18n/fcitx-rime/fcitx-rime-5.1.4.ebuild b/app-i18n/fcitx-rime/fcitx-rime-5.1.4.ebuild
index e480e0cabd8b..dd6e94808af2 100644
--- a/app-i18n/fcitx-rime/fcitx-rime-5.1.4.ebuild
+++ b/app-i18n/fcitx-rime/fcitx-rime-5.1.4.ebuild
@@ -15,6 +15,7 @@ SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
 
 DEPEND="
+	!app-i18n/fcitx-rime:4
 	>=app-i18n/fcitx-5.1.2:5
 	app-i18n/librime
 	app-i18n/rime-data


             reply	other threads:[~2024-02-07  5:18 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-07  5:18 WANG Xuerui [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-08  0:18 [gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx-rime/ Yixun Lan
2024-12-20 20:26 Andreas Sturmlechner
2024-12-02  7:15 Yixun Lan
2024-11-22 15:57 Joonas Niilola
2024-11-22 15:29 Sam James
2024-11-17  9:45 Yixun Lan
2024-07-15  8:55 David Seifert
2024-06-09 18:54 Matt Turner
2024-06-02  3:25 Yixun Lan
2024-01-17 17:04 WANG Xuerui
2024-01-17 16:50 WANG Xuerui
2024-01-17  9:04 Jakov Smolić
2024-01-16 17:50 Arthur Zamarin
2024-01-11 11:23 Yixun Lan
2022-10-10  6:25 Jakov Smolić
2020-10-02 17:45 Mike Gilbert
2020-10-02 17:45 Mike Gilbert
2020-09-24 14:26 Mike Gilbert
2018-06-13 21:07 Mike Gilbert
2017-11-18 10:13 Sergei Trofimovich
2017-11-18 10:03 Sergei Trofimovich
2017-10-23 17:24 Mike Gilbert
2017-10-23 17:24 Mike Gilbert
2017-10-23 17:24 Mike Gilbert
2017-08-22 14:21 Mike Gilbert
2016-06-17 15:28 Mike Gilbert

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1707283007.50ba2f6c2828198cea145470e93afc99d8b3eebc.xen0n@gentoo \
    --to=xen0n@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox