commit: 539fe1546164fc2cf0e6bfae2e19e6cd727783f4 Author: Yongxiang Liang <tanekliang <AT> gmail <DOT> com> AuthorDate: Thu Nov 30 16:42:29 2023 +0000 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> CommitDate: Mon Dec 11 13:33:25 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=539fe154
app-i18n/fcitx: block fcitx:4 and fcitx:5 each other If we want to install both fcitx4 and fcitx5 at the same time, we just need to adjust the location of one of the icon files. But consider that fcitx4 and fcitx5 are registered in the same im module. For example, their XMODIFIERS variables are both "@im=fcitx". Running them at the same time is undefined behavior. Bug: https://bugs.gentoo.org/760501 Signed-off-by: Yongxiang Liang <tanekliang <AT> gmail.com> Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> app-i18n/fcitx/fcitx-4.2.9.8.ebuild | 5 +++-- app-i18n/fcitx/fcitx-4.9999.ebuild | 5 +++-- app-i18n/fcitx/fcitx-5.1.5.ebuild | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app-i18n/fcitx/fcitx-4.2.9.8.ebuild b/app-i18n/fcitx/fcitx-4.2.9.8.ebuild index 066e06f5c894..2dd9ab5f65a6 100644 --- a/app-i18n/fcitx/fcitx-4.2.9.8.ebuild +++ b/app-i18n/fcitx/fcitx-4.2.9.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 2003-2022 Gentoo Authors +# Copyright 2003-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -39,7 +39,8 @@ BDEPEND="dev-util/glib-utils virtual/pkgconfig introspection? ( dev-libs/gobject-introspection ) nls? ( sys-devel/gettext )" -DEPEND="dev-libs/glib:2 +DEPEND="!app-i18n/fcitx:5 + dev-libs/glib:2 sys-apps/dbus sys-apps/util-linux virtual/libiconv diff --git a/app-i18n/fcitx/fcitx-4.9999.ebuild b/app-i18n/fcitx/fcitx-4.9999.ebuild index 93c53f5e7164..57d117c67567 100644 --- a/app-i18n/fcitx/fcitx-4.9999.ebuild +++ b/app-i18n/fcitx/fcitx-4.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2003-2022 Gentoo Authors +# Copyright 2003-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -39,7 +39,8 @@ BDEPEND="dev-util/glib-utils virtual/pkgconfig introspection? ( dev-libs/gobject-introspection ) nls? ( sys-devel/gettext )" -DEPEND="dev-libs/glib:2 +DEPEND="!app-i18n/fcitx:5 + dev-libs/glib:2 sys-apps/dbus sys-apps/util-linux virtual/libiconv diff --git a/app-i18n/fcitx/fcitx-5.1.5.ebuild b/app-i18n/fcitx/fcitx-5.1.5.ebuild index db0daa3828d7..6b204f822625 100644 --- a/app-i18n/fcitx/fcitx-5.1.5.ebuild +++ b/app-i18n/fcitx/fcitx-5.1.5.ebuild @@ -23,6 +23,7 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" RDEPEND=" + !app-i18n/fcitx:4 dev-libs/libfmt sys-devel/gettext virtual/libintl
