gentoo auto-resync : 27:12:2024 - 06:30:34

3 files changed, 6 insertions, 57 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 124c9286e4e8..9db3a0082331 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
index c295c01faad5..63a16b9d445b 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -9,6 +9,6 @@ DIST japanese-usage-dictionary-20180701040110.tar.gz 71285 BLAKE2B dfad056a1d506
 DIST mozc-2.28.5029.102-2.28.5029.102.tar.gz 37247099 BLAKE2B 4bb528991102d34a26321e6fa00a73cc83cb103e0b765f1ebb837dd6894387288b13ed75cc255003d07d6f0c4a82f963684fa4f2bd9b5043cfaddb57a5f5cef0 SHA512 b20aa45757db92f66d1c135eacf907b4cec937226a8d09e5f9f6768ae22a6b8464e3b75276773ce55413f2002ffcc3d8cae136e7fd3acfc0733e48bccf848d5b
 DIST mozc-2.28.5029.102-patches.tar.xz 224380 BLAKE2B 377d2cac6ec8a9c90661f10c0b105d8347ca8080ec43cee3dfd4660feadfe2d9b204d6e4b9e22bd11a5fdbbf26e7f6f298b703b88fb1621ea1847741408c1953 SHA512 5836a19ea68de271475b3ca1efce928b0ad012c96ff7ecdc4474b05daf8b8df022203eb46ec839b76e7d50be7a75b8f278d534d762fac0e612a8f09ae13c7c16
 EBUILD mozc-2.28.5029.102-r1.ebuild 10859 BLAKE2B 31baf08e330182b12946f54eb5fd0982971eda22085de565ab16f4f5a5135eac367843699bc77cf1c7ea97c138a21a25f169888a26039aebc378c546795ed443 SHA512 2a9bca391b312fb79c0601e832ab382833c82113e8d3ba369a39f280cea4efebf375e6c5d87f445766347f66d60bf820aeeb7f59482d7c77044e6c826c61becf
-EBUILD mozc-2.28.5029.102-r3.ebuild 13171 BLAKE2B cc1c81eca0e4477c11b4b12a99f63b94ef88a6adf4d1b4618cb637573f517cd2ccf488b8fccaa5354814a9bc61eaac39f0f3c5e794d2a9cf375880a6950476ed SHA512 87b937686b2f217b963231e6aaf1ed0d5e4d51e8417120b01f7fdbfdf8122d395379dc47679848d78e179a1906ba7b5b2bb224c9f5a0316d9a478bc9bab99372
+EBUILD mozc-2.28.5029.102-r4.ebuild 11674 BLAKE2B 02fa78d9aade0c206b1cdb03c04931f2dcfa3e0238f7a488a16bb0541815095350464c93107cb08bb2fcce5db7b666a3ba7a558a7dd1653174a6a7fbc853d232 SHA512 a0f453648fb65877bf154b1aafbe73f6493e09ca7e272a133d2a2890b96f43f0e7ef402f63b9dfcfbd28181567e618960f355511f90f111053415360af7c6b86
 EBUILD mozc-2.28.5029.102.ebuild 10725 BLAKE2B c2486d67e9986e1f7f21d42bddbc3527dc92270818f1bd982fd99836c9a1fb0c95556331e5f5af57c5731b4be9221ebaff88c72844612e5e14e905e11f8c56fd SHA512 3885d73b7afdaa42883b8ae8944b3e7e3eb2f73a7c3da51c5ad26bbd816d4b13b2da0f21ae5ed3a7c0bf1c87bcadf0e1a81d82b4530b2e1280e6d163935a5738
 MISC metadata.xml 687 BLAKE2B c7f99282b685a2a6f8d1cf53668225ca50587a8a6023637d1c9a74f1078e38cf512a10edc92eb6aa7190414c040dc27d136f8da5ca7fd73e18f3a41746bfb416 SHA512 3979cb05ef5bf5941568b25896e46918aa0783ebbbe298fb90420c790bcd0bc4270c2c65577b90400fbd05e38ea0ae74d2f5b5cb3dd71cc9ebf15e82f9c6e761
diff --git a/app-i18n/mozc/mozc-2.28.5029.102-r3.ebuild b/app-i18n/mozc/mozc-2.28.5029.102-r4.ebuild
index 9e3e0a65db7d..d370973711fd 100644
--- a/app-i18n/mozc/mozc-2.28.5029.102-r3.ebuild
+++ b/app-i18n/mozc/mozc-2.28.5029.102-r4.ebuild
@@ -35,7 +35,6 @@ else
 		https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${PN}-${PV%%_p*}-${MOZC_DATE}.tar.gz
 		https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
 		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.28.5029.102-patches.tar.xz
-		fcitx4? ( https://github.com/fcitx/${PN}/archive/${FCITX_MOZC_GIT_REVISION}.tar.gz -> fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz )
 		fcitx5? ( https://github.com/fcitx/${PN}/archive/${FCITX_MOZC_GIT_REVISION}.tar.gz -> fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz )
 	"
 fi
@@ -47,8 +46,8 @@ fi
 LICENSE="BSD BSD-2 ipadic public-domain unicode"
 SLOT="0"
 KEYWORDS="~amd64 ~loong ~x86"
-IUSE="debug emacs fcitx4 fcitx5 +gui ibus renderer test"
-REQUIRED_USE="|| ( emacs fcitx4 fcitx5 ibus )"
+IUSE="debug emacs fcitx5 +gui ibus renderer test"
+REQUIRED_USE="|| ( emacs fcitx5 ibus )"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -58,16 +57,11 @@ BDEPEND="
 	app-alternatives/ninja
 	virtual/pkgconfig
 	emacs? ( app-editors/emacs:* )
-	fcitx4? ( sys-devel/gettext )
 	fcitx5? ( sys-devel/gettext )
 "
 DEPEND="
 	>=dev-cpp/abseil-cpp-20240116.0:=
 	>=dev-libs/protobuf-3.0.0:=
-	fcitx4? (
-		app-i18n/fcitx:4
-		virtual/libintl
-	)
 	fcitx5? (
 		app-i18n/fcitx:5
 		app-i18n/libime
@@ -98,10 +92,6 @@ RDEPEND="
 	>=dev-cpp/abseil-cpp-20230802.0:=[cxx17(+)]
 	>=dev-libs/protobuf-3.0.0:=
 	emacs? ( app-editors/emacs:* )
-	fcitx4? (
-		app-i18n/fcitx:4
-		virtual/libintl
-	)
 	fcitx5? (
 		app-i18n/fcitx:5
 		app-i18n/libime
@@ -145,12 +135,10 @@ src_unpack() {
 	if [[ "${PV}" == "9999" ]]; then
 		git-r3_src_unpack
 
-		if use fcitx4 || use fcitx5; then
+		if use fcitx5; then
 			local EGIT_SUBMODULES=()
 			git-r3_fetch https://github.com/fcitx/mozc refs/heads/fcitx
 			git-r3_checkout https://github.com/fcitx/mozc "${WORKDIR}/fcitx-mozc"
-		fi
-		if use fcitx5; then
 			cp -pr "${WORKDIR}"/fcitx{,5}-mozc || die
 		fi
 	else
@@ -162,24 +150,15 @@ src_unpack() {
 		unpack japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
 		cp -p japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}/usage_dict.txt ${P}/src/third_party/japanese_usage_dictionary || die
 
-		if use fcitx4 || use fcitx5; then
+		if use fcitx5; then
 			unpack fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz
-			if use fcitx4; then
-				cp -pr mozc-${FCITX_MOZC_GIT_REVISION} fcitx-${PN} || die
-			fi
-			if use fcitx5; then
-				cp -pr mozc-${FCITX_MOZC_GIT_REVISION} fcitx5-${PN} || die
-			fi
+			cp -pr mozc-${FCITX_MOZC_GIT_REVISION} fcitx5-${PN} || die
 			rm -r mozc-${FCITX_MOZC_GIT_REVISION} || die
 		fi
 	fi
 }
 
 src_prepare() {
-	if use fcitx4; then
-		cp -pr "${WORKDIR}/fcitx-mozc/src/unix/fcitx" unix || die
-		PATCHES+=( "${FILESDIR}"/mozc-2.28.5029.102-abseil-20230802.0-fcitx4.patch )
-	fi
 	if use fcitx5; then
 		cp -pr "${WORKDIR}/fcitx5-mozc/src/unix/fcitx5" unix || die
 		PATCHES+=( "${FILESDIR}"/mozc-2.28.5029.102-abseil-20230802.0-fcitx5.patch )
@@ -253,7 +232,6 @@ src_configure() {
 	gyp_arguments+=(-D debug_extra_cflags=)
 	gyp_arguments+=(-D release_extra_cflags=)
 
-	gyp_arguments+=(-D use_fcitx=$(usex fcitx4 YES NO))
 	gyp_arguments+=(-D use_fcitx5=$(usex fcitx5 YES NO))
 	gyp_arguments+=(-D use_libibus=$(usex ibus 1 0))
 	gyp_arguments+=(-D use_libprotobuf=1)
@@ -285,9 +263,6 @@ src_compile() {
 	if use emacs; then
 		targets+=(unix/emacs/emacs.gyp:mozc_emacs_helper)
 	fi
-	if use fcitx4; then
-		targets+=(unix/fcitx/fcitx.gyp:fcitx-mozc)
-	fi
 	if use fcitx5; then
 		targets+=(unix/fcitx5/fcitx5.gyp:fcitx5-mozc)
 	fi
@@ -342,32 +317,6 @@ src_install() {
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN}
 	fi
 
-	if use fcitx4; then
-		exeinto /usr/$(get_libdir)/fcitx
-		doexe out_linux/${BUILD_TYPE}/fcitx-mozc.so
-
-		insinto /usr/share/fcitx/addon
-		doins unix/fcitx/fcitx-mozc.conf
-
-		insinto /usr/share/fcitx/inputmethod
-		doins unix/fcitx/mozc.conf
-
-		insinto /usr/share/fcitx/mozc/icon
-		newins data/images/product_icon_32bpp-128.png mozc.png
-		local image
-		for image in ../../fcitx-${PN}/src/data/images/unix/ui-*.png; do
-			newins "${image}" "mozc-${image#../../fcitx-${PN}/src/data/images/unix/ui-}"
-		done
-
-		local locale mo_file
-		for mo_file in out_linux/${BUILD_TYPE}/gen/unix/fcitx/po/*.mo; do
-			locale="${mo_file##*/}"
-			locale="${locale%.mo}"
-			insinto /usr/share/locale/${locale}/LC_MESSAGES
-			newins "${mo_file}" fcitx-mozc.mo
-		done
-	fi
-
 	if use fcitx5; then
 		exeinto /usr/$(get_libdir)/fcitx5
 		doexe out_linux/${BUILD_TYPE}/fcitx5-mozc.so