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

16 files changed, 570 insertions, 8 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 77eb25a19348..7d13d2261309 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/fcitx-configtool/Manifest b/app-i18n/fcitx-configtool/Manifest
index 4bfd262636f3..dbca8c9eccba 100644
--- a/app-i18n/fcitx-configtool/Manifest
+++ b/app-i18n/fcitx-configtool/Manifest
@@ -1,4 +1,6 @@
 DIST fcitx-configtool-0.4.10.tar.xz 50440 BLAKE2B f2f2241d3ea139f6f3de9b8c6ffcc71c789dfa291efe4c551596eebc8a04f13f9fe698cc25d8349a174399044d15ddca2aeab952ac2bc7f0f4e9e47d453329ca SHA512 1c1267e9de694bbd5f258b5bba1e7514c4f8556cdc82a1cce5eafd8a4ec571955285dade0acd02f128eca01f867a30c5c6264ee7e91d32a333eba6e4d275fe8f
+DIST fcitx-configtool-5.1.2.tar.xz 114064 BLAKE2B 856ae67ab5d2b4c40e83d7bac57e3c92b6525259931bdaf63328a88f5c3dc36b52ec116502d01b02dd10a779330f81e779ba732f0cd9df85c77634ba3b3d4e82 SHA512 66271146d0867f629d9dfe193c4b9a0aa5e3f81ecd94fc3e8e6273a7332bcddb321f4993e7fc3794bd1172aceaaa21f9bab7449b45b1a23b6523ecd67712ad84
 EBUILD fcitx-configtool-0.4.10.ebuild 851 BLAKE2B 97d7acbf9f2984de63df3c6e603fb7d5c4bb8d5828d70d3840b8bc8fb8381388112978c2967f404f485ddc441daaa14b8ea972cad92068dba17cc6758063f7b0 SHA512 e7de180936ec303bfc23e02b77f0d367e94c30253b55dae9bd47ea2a0eb60df7da2360eb25b0c5b6930d08239109629e75179d502e930140b46385bc1a262c7a
 EBUILD fcitx-configtool-4.9999.ebuild 818 BLAKE2B d034a75bf15f37b71243d5d1c15a8ec6114ca559d715101f031d434b1a9478c39298f95b022c7c4f8cd08ad2701eeefb4cef628a4795f5fd15567723b0c71362 SHA512 42b150975f7293dfdb67c6d6479803526438adc80032adbaadf6f03927f6adaafd4469d145d07a21f8b929cba6eddf20e21d2374085c8791d77046ed0f496659
-MISC metadata.xml 470 BLAKE2B 0209cf8225588df5e3c412c3e1fadcc34221cddf910dc7ca2af19b1332792d96a152d992d3386270a088d179d23073925c4259736107fdf41ad08ddc300dd9b1 SHA512 7addbbbce24ba4a02bb313a8d4be91b811337b6add5b98cd79eb242c2144b703f8e4b3da9d08b128cd08bc71b7d34ec3feacd99e0642bef697da3023b6a4e511
+EBUILD fcitx-configtool-5.1.2.ebuild 1470 BLAKE2B 968fa8a05ae9df556004f4da8042351121d481f63d98ed58a77e41283926673d051077fd7a90cf1201bbad37115311972689ff6ec2259b48332800719df2ceac SHA512 e2a60e9852470667fc5279ed6e6450a36169eabfff17ba1967566e6c951a2413519c427c83509813a297f75285320e9d089575ae5bdaf882a7ccd357ec10f32b
+MISC metadata.xml 951 BLAKE2B f3f59dbca74fc02c4deeb07675ade6a56ccafb8b0ed4388ee0afc7cecc1a0f470a350e95a2c6be6e32dd7a85f763daac6d31e8c876107c32a7d2438db212ddaa SHA512 3cd5ce6c71a2d386c5927f8e0289b470bbb16559fb8a0deeffdba8c50bbe7cfa642dfaa1d0d35ea931c3a774bc20f97b1e8f8c3e5d01fb926d9f9104837afaa3
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-5.1.2.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-5.1.2.ebuild
new file mode 100644
index 000000000000..52c58f63ba0c
--- /dev/null
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-5.1.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="fcitx5-configtool"
+
+inherit cmake
+
+DESCRIPTION="Configuration module for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx5-configtool"
+SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="kcm +config-qt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-i18n/fcitx-5.1.5:5
+	>=app-i18n/fcitx-qt-5.1.3:5[qt5,-onlyplugin]
+	app-text/iso-codes
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	kde-frameworks/kwidgetsaddons:5
+	sys-devel/gettext
+	virtual/libintl
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	config-qt? (
+		kde-frameworks/kitemviews:5
+	)
+	kcm? (
+		x11-libs/libxkbcommon
+		dev-qt/qtquickcontrols2:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kdeclarative:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kiconthemes:5
+		kde-frameworks/kirigami:5
+		kde-frameworks/kpackage:5
+		kde-plasma/libplasma:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	kde-frameworks/extra-cmake-modules:0
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDE_INSTALL_USE_QT_SYS_PATHS=yes
+		-DENABLE_KCM=$(usex kcm)
+		-DENABLE_CONFIG_QT=$(usex config-qt)
+		-DENABLE_TEST=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/app-i18n/fcitx-configtool/metadata.xml b/app-i18n/fcitx-configtool/metadata.xml
index e2e7b8d6f49a..4ca0ab7fbf64 100644
--- a/app-i18n/fcitx-configtool/metadata.xml
+++ b/app-i18n/fcitx-configtool/metadata.xml
@@ -2,14 +2,28 @@
 <!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="config-qt">Enable fcitx5-config-qt</flag>
+		<flag name="kcm">Enable KDE KCM support</flag>
+		<flag name="test">Enable Test</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">fcitx/fcitx-configtool</remote-id>
+		<remote-id type="github">fcitx/fcitx5-configtool</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/fcitx-gtk/Manifest b/app-i18n/fcitx-gtk/Manifest
new file mode 100644
index 000000000000..5a5f11172316
--- /dev/null
+++ b/app-i18n/fcitx-gtk/Manifest
@@ -0,0 +1,3 @@
+DIST fcitx-gtk-5.1.0.tar.xz 54128 BLAKE2B d6c4f6607067955b260a3a53b29bad210b6358151ae0542ff5d414e8fd75aebc51c9d616f845e4c47e28bd7f18874e0bfb62a8a288a7ae66d0bab9d2c54ba9d6 SHA512 6b042714a4facb253d0e5cce119239e923511b809681909b63a2c1d47ecfc403672522c24f9ac91c12ed3e0b61c5023ec9e340d51f6aefc3f61fa1a1fbe39dfc
+EBUILD fcitx-gtk-5.1.0.ebuild 1443 BLAKE2B 617b6e79885a6bbd50f1ff79e0f0bb4fec18030e028b463c8b59865c0f2fdece8bfa14d09d00ad8c8529a3145eb3bdb1baf026792da670a5fea521c1065a35ef SHA512 e5ebe0273c753dbdc3c69a3aab28294c8dfd130c947ed4e812833c14133460d2d6fb5b445681c250ffcd6f7d174664f486d6b5723a89454cd692169498f6545b
+MISC metadata.xml 872 BLAKE2B 88c8dd56d42438578ce739932b66b9b04e7ee647ea859187387b6d58825973e1b147d60429632caf1af61afdcaba793071d7d0c8222128c5b54647b1b754b593 SHA512 0048fa62e7228efd07624db98aea00d5e809f3b553c7f1fdded8a7ed906afc6feb60004842da882f45dda844c00c58b85cec9f31fac646085e9469010bb352c2
diff --git a/app-i18n/fcitx-gtk/fcitx-gtk-5.1.0.ebuild b/app-i18n/fcitx-gtk/fcitx-gtk-5.1.0.ebuild
new file mode 100644
index 000000000000..1ff0c65b1539
--- /dev/null
+++ b/app-i18n/fcitx-gtk/fcitx-gtk-5.1.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="fcitx5-gtk"
+
+inherit cmake gnome2-utils xdg
+
+DESCRIPTION="Gtk im module for fcitx5 and glib based dbus client library"
+HOMEPAGE="https://github.com/fcitx/fcitx5-gtk"
+SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk2 +gtk3 +gtk4 +introspection +snooper onlyplugin wayland +X"
+REQUIRED_USE="|| ( gtk2 gtk3 gtk4 )"
+
+RDEPEND="
+	app-i18n/fcitx:5
+	>=dev-libs/glib-2.56
+	x11-libs/libxkbcommon
+	gtk2? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3[wayland?,X?] )
+	gtk4? ( gui-libs/gtk:4[wayland?,X?] )
+	introspection? ( dev-libs/gobject-introspection )
+	X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	kde-frameworks/extra-cmake-modules:0
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_GTK2_IM_MODULE=$(usex gtk2)
+		-DENABLE_GTK3_IM_MODULE=$(usex gtk3)
+		-DENABLE_GTK4_IM_MODULE=$(usex gtk4)
+		-DENABLE_SNOOPER=$(usex snooper)
+		-DENABLE_GIR=$(usex introspection)
+		-DBUILD_ONLY_PLUGIN=$(usex onlyplugin)
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+}
diff --git a/app-i18n/fcitx-gtk/metadata.xml b/app-i18n/fcitx-gtk/metadata.xml
new file mode 100644
index 000000000000..f92aad4b3725
--- /dev/null
+++ b/app-i18n/fcitx-gtk/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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="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="gtk2">Install input method module for GTK+ 2</flag>
+		<flag name="gtk3">Enable support for GTK+3</flag>
+		<flag name="gtk4">Enable support for GTK 4</flag>
+		<flag name="onlyplugin">Build only plugin</flag>
+		<flag name="snooper">Enable key snooper for gtk app</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">fcitx/fcitx5-gtk</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/fcitx-qt/Manifest b/app-i18n/fcitx-qt/Manifest
new file mode 100644
index 000000000000..93985a203a64
--- /dev/null
+++ b/app-i18n/fcitx-qt/Manifest
@@ -0,0 +1,4 @@
+AUX fcitx-qt-5.1.3-make-qwayland-workaround-optional.patch 6573 BLAKE2B 86d44e52b496d5d2ec737282e769069851f328005f0f596de063737312055d83cc400026bc7d7829ea502e3ccf8713e84ff46d6bd6505f9f4fc281dec7997657 SHA512 71eaf7f6ad98a5cbcf9fc3c624b00abba2c42d7551138c24e5f2d032a262567421585b88c443ff14b6d59430205d0a12ae0ff18dc13e0ac47645c25263066984
+DIST fcitx-qt-5.1.3.tar.xz 92312 BLAKE2B 84dda11e955ab1317379e0f5a0e95efb1b3108844b52c0e8fd08a02f0d5d6d16094c8729820ad7dce51e3d77994c217710f69edff4d566251f9272a125ffc936 SHA512 7d02409ac8359cea5e199f16b3b06ecfe47886edb00bb2163f9fbe1c319bbef425387e58db25fdfcd2b35261eada35f2acfb93ff0b65ed497da62d35363e8947
+EBUILD fcitx-qt-5.1.3.ebuild 1322 BLAKE2B e76b69aee1d85494f2ccec2d58c2ec306811580243e1eb6bdf9f8844d4260f16313847ef80f519bcbb4d57b1ec22856d58de3c1305089dd773677fddd6c365b8 SHA512 e2859f3f7fd9eaca43d6ac89770fa9078e00b194f7bd2fe8e32bdb7f2254f3f0d2166a823ae4e4cda68d20d0872a353ab8cf32382323f81c5b7f87ed6028cbc7
+MISC metadata.xml 746 BLAKE2B e08a44b85b899bb04c0683bea836d0c79cdba1b82e0e6a2ecd85e32f258bd8b2e305cc9a95465b34fb73707c718e1e27a2835d8b3afb98c9aa184a7efc0f55da SHA512 81b171a9e601eba0ee1df96f7662f3486a30236a9faed67c274446f75d998529eb37233c928307db3875349afec1db704e25149d67ff45055bd7d0bd09047c45
diff --git a/app-i18n/fcitx-qt/fcitx-qt-5.1.3.ebuild b/app-i18n/fcitx-qt/fcitx-qt-5.1.3.ebuild
new file mode 100644
index 000000000000..e231ad2105f7
--- /dev/null
+++ b/app-i18n/fcitx-qt/fcitx-qt-5.1.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="fcitx5-qt"
+
+inherit cmake
+
+DESCRIPTION="Qt library and IM module for fcitx5"
+HOMEPAGE="https://github.com/fcitx/fcitx5-qt"
+SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="BSD LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="+qt5 onlyplugin staticplugin qt6 wayland"
+REQUIRED_USE="
+	|| ( qt5 qt6 )
+	staticplugin? ( onlyplugin )
+"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	!onlyplugin? (
+		>=app-i18n/fcitx-5.1.5:5
+		qt5? ( dev-qt/qtconcurrent:5 )
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5=
+		dev-qt/qtwidgets:5
+	)
+	qt6? (
+		dev-qt/qtbase:6[dbus,gui,widgets,wayland?]
+		wayland? ( dev-qt/qtwayland:6 )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	kde-frameworks/extra-cmake-modules:0
+	virtual/pkgconfig
+	!onlyplugin? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES="${FILESDIR}/${P}-make-qwayland-workaround-optional.patch"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_QT4=no
+		-DENABLE_QT5=$(usex qt5)
+		-DENABLE_QT6=$(usex qt6)
+		-DENABLE_QT6_WAYLAND_WORKAROUND=$(usex wayland)
+		-DBUILD_ONLY_PLUGIN=$(usex onlyplugin)
+		-DBUILD_STATIC_PLUGIN=$(usex staticplugin)
+	)
+	cmake_src_configure
+}
diff --git a/app-i18n/fcitx-qt/files/fcitx-qt-5.1.3-make-qwayland-workaround-optional.patch b/app-i18n/fcitx-qt/files/fcitx-qt-5.1.3-make-qwayland-workaround-optional.patch
new file mode 100644
index 000000000000..0ef5fc8652a7
--- /dev/null
+++ b/app-i18n/fcitx-qt/files/fcitx-qt-5.1.3-make-qwayland-workaround-optional.patch
@@ -0,0 +1,158 @@
+Backport of https://github.com/fcitx/fcitx5-qt/commit/af535e7e106f69e7dc6dc28db3653601d1e6156a
+
+Backport upstream commit af535e7e making QtWayland optional.
+All QtWayland-related code is guarded behind `isWayland` checks anyways.
+This benefits users of pure X11 setups.
+
+Author: Lucio Sauer <watermanpaint@posteo.net>
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,6 +16,7 @@ option(ENABLE_QT6 "Enable Qt 6" Off)
+ option(BUILD_ONLY_PLUGIN "Build only plugin" Off)
+ option(BUILD_STATIC_PLUGIN "Build plugin as static" Off)
+ option(WITH_FCITX_PLUGIN_NAME "Enable plugin name with fcitx" On)
++option(ENABLE_QT6_WAYLAND_WORKAROUND "Enable Qt6 Wayland workaround" On)
+ 
+ if (BUILD_ONLY_PLUGIN)
+   set(LIBRARY_TYPE OBJECT)
+--- a/qt5/platforminputcontext/fcitxcandidatewindow.cpp
++++ b/qt5/platforminputcontext/fcitxcandidatewindow.cpp
+@@ -21,7 +21,7 @@
+ #include <QtMath>
+ #include <utility>
+ 
+-#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
++#if defined(FCITX_ENABLE_QT6_WAYLAND_WORKAROUND) && QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
+ #include <QtWaylandClient/private/qwayland-xdg-shell.h>
+ #include <QtWaylandClient/private/qwaylanddisplay_p.h>
+ #include <QtWaylandClient/private/qwaylandintegration_p.h>
+@@ -34,7 +34,7 @@ namespace fcitx {
+ 
+ namespace {
+ 
+-#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
++#if defined(FCITX_ENABLE_QT6_WAYLAND_WORKAROUND) && QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
+ class XdgWmBase : public QtWayland::xdg_wm_base {
+ public:
+     using xdg_wm_base::xdg_wm_base;
+@@ -120,7 +120,7 @@ FcitxCandidateWindow::FcitxCandidateWindow(QWindow *window,
+         // Not using Qt::BypassWindowManagerHint ensures wayland handle
+         // fractional scale.
+         setFlags(Qt::ToolTip | commonFlags);
+-#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
++#if defined(FCITX_ENABLE_QT6_WAYLAND_WORKAROUND) && QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
+         if (auto instance = QtWaylandClient::QWaylandIntegration::instance()) {
+             for (QtWaylandClient::QWaylandDisplay::RegistryGlobal global :
+                  instance->display()->globals()) {
+@@ -132,7 +132,6 @@ FcitxCandidateWindow::FcitxCandidateWindow(QWindow *window,
+                 }
+             }
+         }
+-#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
+         setProperty("_q_waylandPopupAnchor",
+                     QVariant::fromValue(Qt::BottomEdge | Qt::LeftEdge));
+         setProperty("_q_waylandPopupGravity",
+@@ -142,7 +141,6 @@ FcitxCandidateWindow::FcitxCandidateWindow(QWindow *window,
+             static_cast<unsigned int>(
+                 QtWayland::xdg_positioner::constraint_adjustment_slide_x |
+                 QtWayland::xdg_positioner::constraint_adjustment_flip_y));
+-#endif
+ #endif
+     } else {
+         // Qt::Popup ensures X11 doesn't apply tooltip animation under kwin.
+@@ -484,7 +482,7 @@ void FcitxCandidateWindow::updateClientSideUI(
+     QRect cursorRect = context_->cursorRectangleWrapper();
+     QRect screenGeometry;
+ 
+-#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
++#if defined(FCITX_ENABLE_QT6_WAYLAND_WORKAROUND) && QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
+     if (isWayland_) {
+         auto waylandWindow =
+             static_cast<QtWaylandClient::QWaylandWindow *>(window->handle());
+@@ -520,12 +518,10 @@ void FcitxCandidateWindow::updateClientSideUI(
+         }
+         bool wasVisible = isVisible();
+         bool cursorRectChanged = false;
+-#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
+         if (property("_q_waylandPopupAnchorRect") != cursorRect) {
+             cursorRectChanged = true;
+             setProperty("_q_waylandPopupAnchorRect", cursorRect);
+         }
+-#endif
+         // This try to ensure xdg_popup is available.
+         show();
+         xdg_popup *xdgPopup = static_cast<xdg_popup *>(
+@@ -553,7 +549,6 @@ void FcitxCandidateWindow::updateClientSideUI(
+             positioner->destroy();
+             return;
+         }
+-#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
+         // Check if we need remap.
+         // If it was invisible, nothing need to be done.
+         // If cursor rect changed, the window must be remapped.
+@@ -570,7 +565,6 @@ void FcitxCandidateWindow::updateClientSideUI(
+             show();
+         }
+         return;
+-#endif
+     }
+ #endif
+     // Try to apply the screen edge detection over the window, because if we
+--- a/qt5/platforminputcontext/fcitxcandidatewindow.h
++++ b/qt5/platforminputcontext/fcitxcandidatewindow.h
+@@ -19,7 +19,7 @@
+ #include <qscopedpointer.h>
+ #include <vector>
+ 
+-#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
++#if defined(FCITX_ENABLE_QT6_WAYLAND_WORKAROUND) && QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
+ #include <QtWaylandClient/private/qwayland-xdg-shell.h>
+ #endif
+ 
+@@ -93,7 +93,7 @@ public Q_SLOTS:
+     std::vector<QRect> candidateRegions_;
+     QPointer<QWindow> parent_;
+ 
+-#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
++#if defined(FCITX_ENABLE_QT6_WAYLAND_WORKAROUND) && QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
+     QScopedPointer<QtWayland::xdg_wm_base> xdgWmBase_;
+ #endif
+ };
+--- a/qt6/CMakeLists.txt
++++ b/qt6/CMakeLists.txt
+@@ -1,8 +1,10 @@
+ 
+ find_package(Qt6 ${REQUIRED_QT6_VERSION} CONFIG REQUIRED Core DBus Widgets)
+ find_package(Qt6Gui ${REQUIRED_QT6_VERSION} REQUIRED Private)
+-find_package(Qt6WaylandClient ${REQUIRED_QT6_VERSION} REQUIRED Private)
+-find_package(Qt6WaylandGlobalPrivate ${REQUIRED_QT6_VERSION} REQUIRED)
++if (ENABLE_QT6_WAYLAND_WORKAROUND)
++  find_package(Qt6WaylandClient ${REQUIRED_QT6_VERSION} REQUIRED Private)
++  find_package(Qt6WaylandGlobalPrivate ${REQUIRED_QT6_VERSION} REQUIRED)
++endif()
+ 
+ add_subdirectory(dbusaddons)
+ add_subdirectory(platforminputcontext)
+--- a/qt6/platforminputcontext/CMakeLists.txt
++++ b/qt6/platforminputcontext/CMakeLists.txt
+@@ -49,11 +49,16 @@ target_link_libraries(fcitx5platforminputcontextplugin-qt6
+                           XCB::XCB
+                           Fcitx5Qt6::DBusAddons
+                           XKBCommon::XKBCommon
+-                          Qt6::WaylandGlobalPrivate
+-                          Qt6::WaylandClient
+-                          Qt6::WaylandClientPrivate
+                          )
+ 
++if (ENABLE_QT6_WAYLAND_WORKAROUND)
++    target_compile_definitions(fcitx5platforminputcontextplugin-qt6 PRIVATE "-DFCITX_ENABLE_QT6_WAYLAND_WORKAROUND")
++    target_link_libraries(fcitx5platforminputcontextplugin-qt6
++        Qt6::WaylandGlobalPrivate
++        Qt6::WaylandClient
++        Qt6::WaylandClientPrivate)
++endif()
++
+ get_target_property(_QT6_QMAKE_EXECUTABLE Qt6::qmake LOCATION)
+ execute_process(
+     COMMAND ${_QT6_QMAKE_EXECUTABLE} -query "QT_INSTALL_PLUGINS"
diff --git a/app-i18n/fcitx-qt/metadata.xml b/app-i18n/fcitx-qt/metadata.xml
new file mode 100644
index 000000000000..446ffdc2c7c1
--- /dev/null
+++ b/app-i18n/fcitx-qt/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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="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="onlyplugin">Build only plugin</flag>
+		<flag name="qt6">Build support for QT6</flag>
+		<flag name="staticplugin">Build plugin as static</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">fcitx/fcitx5-qt</remote-id>
+	</upstream>
+</pkgmetadata>
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>