commit: 42a82c1486640e6f26b5cbf1873e6f4e7bd7e95c Author: Yongxiang Liang <tanekliang <AT> gmail <DOT> com> AuthorDate: Wed Jan 17 11:08:56 2024 +0000 Commit: WANG Xuerui <xen0n <AT> gentoo <DOT> org> CommitDate: Wed Jan 17 17:03:04 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42a82c14
app-i18n/fcitx-rime: Fix dependency on librime Closes: https://bugs.gentoo.org/922232 Closes: https://github.com/gentoo/gentoo/pull/34860 Signed-off-by: Yongxiang Liang <tanekliang <AT> gmail.com> Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org> .../{fcitx-rime-0.3.2.ebuild => fcitx-rime-0.3.2-r1.ebuild} | 9 +++------ app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild b/app-i18n/fcitx-rime/fcitx-rime-0.3.2-r1.ebuild similarity index 86% rename from app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild rename to app-i18n/fcitx-rime/fcitx-rime-0.3.2-r1.ebuild index 06a5ed3da016..b9da1cbd7122 100644 --- a/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild +++ b/app-i18n/fcitx-rime/fcitx-rime-0.3.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2012-2020 Gentoo Authors +# Copyright 2012-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -13,21 +13,18 @@ fi DESCRIPTION="Chinese RIME input methods for Fcitx" HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-rime"; -if [[ "${PV}" =~ (^|\.)9999$ ]]; then - SRC_URI="" -else +if [[ ! "${PV}" =~ (^|\.)9999$ ]]; then SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"; fi LICENSE="GPL-2" SLOT="4" KEYWORDS="amd64 ppc ppc64 ~riscv x86" -IUSE="" BDEPEND=">=app-i18n/fcitx-4.2.9:4 virtual/pkgconfig" DEPEND=">=app-i18n/fcitx-4.2.9:4 - >=app-i18n/librime-1.0.0:= + <app-i18n/librime-1.9.0:= virtual/libintl" RDEPEND="${DEPEND} app-i18n/rime-data" diff --git a/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild b/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild index 49fb4753f008..c40551dffd5e 100644 --- a/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild +++ b/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2012-2020 Gentoo Authors +# Copyright 2012-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -13,15 +13,12 @@ fi DESCRIPTION="Chinese RIME input methods for Fcitx" HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-rime"; -if [[ "${PV}" =~ (^|\.)9999$ ]]; then - SRC_URI="" -else +if [[ ! "${PV}" =~ (^|\.)9999$ ]]; then SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"; fi LICENSE="GPL-2" SLOT="4" -KEYWORDS="" IUSE="+configuration_tool" BDEPEND=">=app-i18n/fcitx-4.2.9:4 @@ -31,7 +28,7 @@ BDEPEND=">=app-i18n/fcitx-4.2.9:4 dev-qt/qtwidgets:5 )" DEPEND=">=app-i18n/fcitx-4.2.9:4 - >=app-i18n/librime-1.0.0:= + <app-i18n/librime-1.9.0:= virtual/libintl configuration_tool? ( >=app-i18n/fcitx-qt5-1.1:4
