From 42a82c1486640e6f26b5cbf1873e6f4e7bd7e95c Mon Sep 17 00:00:00 2001
From: Yongxiang Liang <tanekliang@gmail.com>
Date: Wed, 17 Jan 2024 19:08:56 +0800
Subject: 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@gmail.com>
Signed-off-by: WANG Xuerui <xen0n@gentoo.org>
---
 app-i18n/fcitx-rime/fcitx-rime-0.3.2-r1.ebuild | 48 ++++++++++++++++++++++++
 app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild    | 51 --------------------------
 app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild   |  9 ++---
 3 files changed, 51 insertions(+), 57 deletions(-)
 create mode 100644 app-i18n/fcitx-rime/fcitx-rime-0.3.2-r1.ebuild
 delete mode 100644 app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild

(limited to 'app-i18n/fcitx-rime')

diff --git a/app-i18n/fcitx-rime/fcitx-rime-0.3.2-r1.ebuild b/app-i18n/fcitx-rime/fcitx-rime-0.3.2-r1.ebuild
new file mode 100644
index 000000000000..b9da1cbd7122
--- /dev/null
+++ b/app-i18n/fcitx-rime/fcitx-rime-0.3.2-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2012-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake xdg-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fcitx/fcitx-rime"
+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="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
+
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
+	virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
+	<app-i18n/librime-1.9.0:=
+	virtual/libintl"
+RDEPEND="${DEPEND}
+	app-i18n/rime-data"
+
+DOCS=()
+
+src_configure() {
+	local mycmakeargs=(
+		-DRIME_DATA_DIR="${EPREFIX}/usr/share/rime-data"
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild b/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
deleted file mode 100644
index 06a5ed3da016..000000000000
--- a/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2012-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit cmake xdg-utils
-
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx-rime"
-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
-	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:=
-	virtual/libintl"
-RDEPEND="${DEPEND}
-	app-i18n/rime-data"
-
-DOCS=()
-
-src_configure() {
-	local mycmakeargs=(
-		-DRIME_DATA_DIR="${EPREFIX}/usr/share/rime-data"
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
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
-- 
cgit v1.2.3-65-gdbad