gentoo auto-resync : 11:12:2023 - 17:14:47

5 files changed, 146 insertions, 7 deletions

diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index dadfc6ff8e0b..0c1075418e46 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1,11 +1,13 @@
 AUX fcitx-4.2.9.8-enchant.patch 857 BLAKE2B 2de4fa00bf532b3b95af0ca0fe4b2fc61af4e6883d5b272682346751e66b83c5a6c9ce3323a6540c10474873afc4df0c279ec4dd1f1c57090a0e0f551abc46de SHA512 908501484c535ba88e4b4179752edb4b456e2294031fe4476d6b5ca972edd3568d992822622a293433690dd15fdac6e834fa979ea1cb6a1f8f7754eb0fbf5f01
 AUX fcitx-4.2.9.8-xkb.patch 796 BLAKE2B 8325574736faebd7938d8fdb19bb149586a8c83ba2342f454d3c665a22e6de642ac36cbf90a4e23a87fd2a9759fd51a42e96930fb429b98fde82cebb6dfa23e8 SHA512 321b73519c442e0595866a692a30e9cfb0464817d79162a7075b00711a73bc4c33fde5ec760bd48ca53ec842d62f98e8d8e8fed2474523d15ca4477dccfa8a2b
 DIST fcitx-4.2.9.8_dict.tar.xz 8737888 BLAKE2B 2de3ccbf1b37a9bcf1a3cb257d7837669e946765722c3d6f442ad071d7d81a6e8178e47051fc3aa53b9b4771d3aca602c2e22fa7a3d117a9e1f2779497e02c52 SHA512 50a954c3178f53fd2d441cdaf81fb44a7fe8dfb263fa6d8dd4ee4884fc7ae8321880c726c9366d11e2a4ac8da2233268d06e5d0800d4527ba0bdb1a1430248ed
+DIST fcitx-5.1.5.tar.xz 7485640 BLAKE2B cc0d8db941de2ed2a7a14b8e95567e92bc21b7873e515cbd8d2433209efbd45b3c0efe618d8c4c3b0b38dbe3737590c8314acde2254ea795db7c8134d77db540 SHA512 d4b5400401b9941cf23dcc5682b026a576bfe57f93a8f65e93127aadedde853c3d026105fac893aaf872a7c8418f3a0d9487e42bcc1427e62c7439f7fb0a3a80
 DIST fcitx-data-en_dict-20121020.tar.gz 630491 BLAKE2B 2df897b1c9fb3a2ce186ee590e5f3ccbc7930f047218bf0fefa317f74b3287fc0be9c393d3310fe07208379118ec4c46608a1c703ef37b3aee65b2d790cb7f0d SHA512 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2
 DIST fcitx-data-pinyin.tar.gz 1608886 BLAKE2B 3b7e72559bb838b4f2245e6faf2d627df17e9383ef8fe382e10333c1a95d79409ec042caa7d77c9bcd956b1c5d5456dab9d82208cd89d90e2be759c76f56f3d1 SHA512 1ee19eed3ee58be6cd6562ec363fe3bf630fff5e8820b3bfdd6d4618fceb082695e888dec5366a3685d58706f720e19319d891c223227237aed12674ea982131
 DIST fcitx-data-py_stroke-20121124.tar.gz 445601 BLAKE2B 43b29b30da11b18196918e4df847406871eff75595b62608ad86b0ef6de83ec5e1b722645cabb809281075b393b5970e4d9580594caa73060c866c2d3cd988e7 SHA512 d80ff9a3549e07c7a6935e686785f9a076c58f1a782a832ae28ee65e2a213d67f089f450ce09bed87ec2a141c32b9c1fcb83c221ddcab436858fa9009f161fb3
 DIST fcitx-data-py_table-20121124.tar.gz 186822 BLAKE2B d696413f2e88f1ca87938d632e12997d14a31a66eaf011c6a7b3c0f607cf45f48e53644ea07d73dbbb0ad898dee6d5ff2d0e4fc2fdcae923acbc03d3d387aaeb SHA512 0fa72ce6820a316e9729bc0d7a08af5ca3468134de9ff1bf0c559a398846a7bcf7313a3609d943e6bab637d930cf45ad9acfe25a8d3df078a774b071a7296486
 DIST fcitx-data-table.tar.gz 4144686 BLAKE2B 696845bb234915a364d614d47cc3baf8421a12ca1778611b0843e52e651da98b5ed9f3e0c9895a829b67f1bcceb1f982a7f6606c8a2d383af8c4573a150c71ef SHA512 99e1d69c679355fcf3e117a1ef39b131cbd3af841387d2335757247d840b90ff6b7323e16fca98cf7a043033faf250d2e9c6d47b96845d18c278a0cf6f30fec9
-EBUILD fcitx-4.2.9.8.ebuild 4497 BLAKE2B 44e1b0f1edaafbfd8f15064d909d9225f33a3af497fbd839339de7cb90d2035e215a3a57d862ad3a779f2f24d87c6ce2ae8f864d41769276e7be62448f29e937 SHA512 7ef7db57394377807121edd74a13ece5af0b55d745ba55cdd57318e4355c594289a8c4665852a6f0a7a375402d5d8898551e94dabe0aedecc3aa00b1cfddd6f0
-EBUILD fcitx-4.9999.ebuild 4408 BLAKE2B 544d9b87e19ef234c020b0c10d20824366a41f7fdcd2b5299ba0bd7208621db581a94c8ea6b75deefc63f644c429440f1d3649d6fe803adfe23f39d66e2f9610 SHA512 ea2b630bf1c46ee223e9bbc53797c3c1b613512475850ebc923a367904c46a95beaa98b34bd8f768052ced7447ebcb1d716df51efbc85d28efbeeb84a5cfecea
-MISC metadata.xml 1204 BLAKE2B c26f883789723e398a69df012332cc44268eebc4026efc1e179026887f10d1ff106bf1142085e862c1c8ee4b92102b04627b8657ffa94551f79b82486ae0a57c SHA512 227458a5ffc4d4ee13040236cf8a0611b0c27d6724b5d7ec6bff21def571a67811d75d45381301eba998d7f9ccdeaece6974fd11b372c3807264b835881d60e2
+EBUILD fcitx-4.2.9.8.ebuild 4516 BLAKE2B 36287c47d7b88761335a7c0693a718a334bf9ae42ad7def5631b512f131a785e3e085a62a747dbe219f7a91c2a80f712a21b563770c1df2dcb54e4d19d631900 SHA512 1e990dfb1add9635e62ec2de6ea9845c753b71c5813799759cc432d5dc2aefa65bf97e59d68e190180821f509c687111ea7d91fa1eb23884d40906bfbaaab74d
+EBUILD fcitx-4.9999.ebuild 4427 BLAKE2B 7e341a0c33852dce669b4adda68e1677cd7a947140d571aba8f8bbdf965ee3737badc9fdd5fc0e76ad7fe647648d74a40b22b3821b435716bd64431a9ba40abb SHA512 4ab850f1a6a315107bdd0c194eb65c1ba9975c2de227b7e623fa3835274aba5b20fa8e3282523ec89aba2343a6f4286eb6d70ff13b9b625155e4dd2f7f3b5cf4
+EBUILD fcitx-5.1.5.ebuild 2469 BLAKE2B 685641e4a2724350fefb86f605e1d06ca0d9b6e04ca8bced2f9dfe282c2e0d0b98e1e89630ef049098ef719dc1858ab934f8092e3457ec8d98a6d6dce962b40a SHA512 fc17a4f0860516b700935aebbcb8873a516dd42be2fab42a2ee44c23f579f91a93f8851aeac6df909a0161345dd45d02d0ea2923148ed903929b4686310f88c8
+MISC metadata.xml 1817 BLAKE2B 23b8efdb7c6dcf2eb7429de4f3bb0961884703131eb7d05a68bd99c5d43b62dfe6b3c60690e1b12edd296fb0643334aa93bf0a1b14f9aaf678602ed04fa875d9 SHA512 aaccb606992c91aea5141849cfe70db50c4bcad3f67764827bbc2fc3bfda0469771c052ac918222530cb3dd8ac823fe04fce797aab9bc4f27e94c1e78a53fc64
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
new file mode 100644
index 000000000000..6b204f822625
--- /dev/null
+++ b/app-i18n/fcitx/fcitx-5.1.5.ebuild
@@ -0,0 +1,123 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="fcitx5"
+
+inherit cmake xdg
+
+DESCRIPTION="Fcitx 5 is a generic input method framework"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx5"
+SRC_URI="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-${PV}_dict.tar.xz -> ${P}.tar.xz"
+
+LICENSE="LGPL-2+ Unicode-DFS-2016"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="+autostart doc +emoji +enchant +keyboard presage +server systemd test wayland +X"
+REQUIRED_USE="
+	|| ( wayland X )
+	X? ( keyboard )
+	wayland? ( keyboard )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!app-i18n/fcitx:4
+	dev-libs/libfmt
+	sys-devel/gettext
+	virtual/libintl
+	x11-libs/cairo[X?]
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango[X?]
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-fontutils
+	)
+	emoji? ( sys-libs/zlib )
+	enchant? ( app-text/enchant:2 )
+	keyboard? (
+		app-text/iso-codes
+		dev-libs/expat
+		dev-libs/json-c:=
+		x11-misc/xkeyboard-config
+		x11-libs/libxkbcommon[X?,wayland?]
+	)
+	systemd? (
+		sys-apps/systemd
+	)
+	!systemd? (
+		dev-libs/libevent
+		sys-apps/dbus
+	)
+	wayland? (
+		dev-libs/glib:2
+		dev-libs/wayland
+		dev-libs/wayland-protocols
+		dev-util/wayland-scanner
+	)
+	X? (
+		dev-libs/glib:2
+		>=x11-libs/xcb-imdkit-1.0.3:5
+		x11-libs/libX11
+		x11-libs/libxkbfile
+		x11-libs/xcb-util
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-wm
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	kde-frameworks/extra-cmake-modules:0
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DBUS=on
+		-DENABLE_XDGAUTOSTART=$(usex autostart)
+		-DENABLE_SERVER=$(usex server)
+		-DENABLE_KEYBOARD=$(usex keyboard)
+		-DENABLE_TEST=$(usex test)
+		-DENABLE_ENCHANT=$(usex enchant)
+		-DENABLE_EMOJI=$(usex emoji)
+		-DENABLE_PRESAGE=$(usex presage)
+		-DENABLE_WAYLAND=$(usex wayland)
+		-DENABLE_X11=$(usex X)
+		-DENABLE_DOC=$(usex doc)
+		-DUSE_SYSTEMD=$(usex systemd)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	cmake_src_install
+	use doc && dodoc -r "${BUILD_DIR}"/doc/*
+}
+
+src_test() {
+	# break by sandbox
+	local CMAKE_SKIP_TESTS=(
+		testdbus
+		testservicewatcher
+	)
+	cmake_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog
+	elog "Follow the instrcutions on:"
+	elog "https://wiki.gentoo.org/wiki/Fcitx#Using_Fcitx"
+	elog "https://fcitx-im.org/wiki/Setup_Fcitx_5"
+	elog "https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland"
+	elog
+}
diff --git a/app-i18n/fcitx/metadata.xml b/app-i18n/fcitx/metadata.xml
index 1c1d8afb1ddd..fe51f3e337e0 100644
--- a/app-i18n/fcitx/metadata.xml
+++ b/app-i18n/fcitx/metadata.xml
@@ -2,20 +2,32 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
+		<email>tanekliang@gmail.com</email>
+		<name>Yongxiang Liang</name>
+	</maintainer>
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
 	<use>
 		<flag name="autostart">Enable XDG-compatible autostart of Fcitx</flag>
+		<flag name="emoji">Enable emoji loading for CLDR</flag>
 		<flag name="enchant">Enable Enchant backend (using <pkg>app-text/enchant</pkg>) for spelling hinting</flag>
 		<flag name="gtk2">Install input method module for GTK+ 2</flag>
 		<flag name="gtk3">Install input method module for GTK+ 3</flag>
+		<flag name="keyboard">Enable key event translation with XKB and build keyboard engine</flag>
 		<flag name="opencc">Enable OpenCC engine (using <pkg>app-i18n/opencc</pkg>) for converter between Simplified Chinese and Traditional Chinese</flag>
 		<flag name="pango">Enable support for <pkg>x11-libs/pango</pkg></flag>
+		<flag name="presage">Enable presage for word predication (not stable)</flag>
+		<flag name="server">Build a fcitx as server, disable this option if you want to use fcitx as an embedded library</flag>
 		<flag name="table">Install table input methods for Simplified Chinese</flag>
 		<flag name="xkb">Enable support for XKB (required for fcitx-xkb, fcitx-xkbdbus, part of fcitx-keyboard)</flag>
 	</use>