gentoo auto-resync : 25:11:2024 - 03:02:44

13 files changed, 316 insertions, 8 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index ca21541b129f..4d4d3994c2c6 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/fcitx-chinese-addons/Manifest b/app-i18n/fcitx-chinese-addons/Manifest
index 555172292d03..efea7c75c3ad 100644
--- a/app-i18n/fcitx-chinese-addons/Manifest
+++ b/app-i18n/fcitx-chinese-addons/Manifest
@@ -1,5 +1,5 @@
 DIST fcitx5-chinese-addons-5.1.6_dict.tar.zst 1005756 BLAKE2B c3b3c12c3b269c71c7136ba140fa833fb28d4ff2698213aa47bdb3fe50ee65830a99c9591180ae0bfd2873c7d84013f26df895f2574372a64cdea9ea887cb052 SHA512 f130f4492977662916a1591048832a37ec306f3664a2c5bc5225ba220ea5ffebc3ef78022b2b6d2d8475b556285a0d45508eaf00473f5b636d2e56a7c73d2f38
 DIST fcitx5-chinese-addons-5.1.7_dict.tar.zst 1014942 BLAKE2B fb386dad971b2a8751202733ef593b72d35f9ab8a266f13e6839ea25010cf54e45c287e10d285a02d268f16b5b8f7a3dc6f6f20ffcc79759d8c1ef1136a29cb5 SHA512 fe04699672f034bde328049a19f23b9dbea75a980e706fcaf95138294b8aaaee54eb9ec5c696c343d5e4ce4788216821ad3eb45cd669d94d2f3b67551ae7360f
 EBUILD fcitx-chinese-addons-5.1.6.ebuild 1495 BLAKE2B f94692ab04cdc2708e43dae50e9147aa5e44b271d44c352eaa7a367565b6b5bd6fef8a019c0f836d733fa678c1132c5c0fae60ca235ccd2064ae6e1026cb7c0a SHA512 93dde8f1f7acf8b0fcf89d235ce6022d1cc5d65aff2dd9b242a14e0aa4179ed06523150c93e536c6b867614859ab91317b08bb62721549524bd070e852ac571a
-EBUILD fcitx-chinese-addons-5.1.7.ebuild 1498 BLAKE2B a5b3d3d15e256df339b99719e0fb88cd3d670058af06adc9b8959d60bfeba8dd7dc9ed6da4c9f75a955d07002c449c1c4af369f4be4a0637117e038e4fb36752 SHA512 596360761de30e3b9a994f97d6d40a2c1007aad9cae9be19a198038e75b401fb1246b4f97497771f342235b631c2d3bbbcb83266901478a2a964e23063095455
+EBUILD fcitx-chinese-addons-5.1.7.ebuild 1496 BLAKE2B ea2a720010ed485dc05903eb5931c6dc66b1ba99f1fa8631c5854cffa95803bd706978c60476df3e541d8a1c1698fb0ed35e9e40f719aaef065709a1be238c2e SHA512 f7dfc7d887c2b9330590ead67adaa6aad746ee49192cf7559a1096047fb38164427d29f7f38ed4f6b01c4db3394791557f4ec30192089ee172830a8ad917f1fe
 MISC metadata.xml 993 BLAKE2B 034a9f1ca3966a67fb884f3e0ce6baeb83c3ccfb2b7d7d99d41e54ef30087c94d5a0c9729902e08eb8b781deeb71daf57b27f3d238beebf6e356e690aae7723b SHA512 05140cdf9695922cf2ddad40744d51d197fc3beab99ca7ba5d19b38a7c22762195f2e3a3c2e2ded46f253e1efeab06259429725830328c5f2001fe0752cd2b26
diff --git a/app-i18n/fcitx-chinese-addons/fcitx-chinese-addons-5.1.7.ebuild b/app-i18n/fcitx-chinese-addons/fcitx-chinese-addons-5.1.7.ebuild
index 35568fd1a173..615c389e8f57 100644
--- a/app-i18n/fcitx-chinese-addons/fcitx-chinese-addons-5.1.7.ebuild
+++ b/app-i18n/fcitx-chinese-addons/fcitx-chinese-addons-5.1.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}_dict.tar.z
 S="${WORKDIR}/${MY_PN}-${PV}"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv x86"
 IUSE="+data +gui webengine +cloudpinyin +qt5 qt6 lua +opencc test"
 REQUIRED_USE="
 	webengine? ( gui )
diff --git a/app-i18n/fcitx-qt/Manifest b/app-i18n/fcitx-qt/Manifest
index 737040bf7367..825abb931f76 100644
--- a/app-i18n/fcitx-qt/Manifest
+++ b/app-i18n/fcitx-qt/Manifest
@@ -3,5 +3,5 @@ DIST fcitx-qt-5.1.7.tar.zst 128686 BLAKE2B f1f86282e10313b63b2c36f168043dd9a6e09
 DIST fcitx-qt-5.1.8.tar.zst 128800 BLAKE2B f8fd49f7cb6d152fd99d036494274f6a1883159140edbd73f525ca4caeb0a8f626671e182ba988b57b85e3f840c900353907eb0a941189b1d5a0b21430df8656 SHA512 ecd9131b2266888345363c39bf4446f6d6d127662d0e67a9837a106f6124d189fa0c74e0cac3f3a6680a3d533316fb6333a83fca1cf9c90561e0b84174abbabd
 EBUILD fcitx-qt-5.1.5-r2.ebuild 1376 BLAKE2B 7968d3b50c3c9dcb132a1e9fa784c74baebe0662850bae2f104c4eead3a053b3970d884b6753c270a25084ec77a704967d20b3dc38e955707a913a8626f9a052 SHA512 8c83901a2ebedb310cb43275b1e870002fbbb3a2fc6b18200072b36f2bdd8f01b47ef72895e67b654c2cc09eb10b91d5674130c4ec76095013d5be15fbf6bf55
 EBUILD fcitx-qt-5.1.7.ebuild 1389 BLAKE2B 69f3a52e5356a89a7b1bd4369b0bae4ac572e7d6ea505881eda4c74ae6942ca2be0a4328ca93dfcee795c76767e52d75e339b48578cfe85c8604aed293f5c623 SHA512 e77b687dfd72260e490691abaaddf384414aea0026b16aa7e3492082879b4e439ccf304f9d341b0e36c5e113ebcb2d13795039fe965aaaa2ee424b52c265c1bd
-EBUILD fcitx-qt-5.1.8.ebuild 1389 BLAKE2B 69f3a52e5356a89a7b1bd4369b0bae4ac572e7d6ea505881eda4c74ae6942ca2be0a4328ca93dfcee795c76767e52d75e339b48578cfe85c8604aed293f5c623 SHA512 e77b687dfd72260e490691abaaddf384414aea0026b16aa7e3492082879b4e439ccf304f9d341b0e36c5e113ebcb2d13795039fe965aaaa2ee424b52c265c1bd
+EBUILD fcitx-qt-5.1.8.ebuild 1387 BLAKE2B 5ceb1d1d1b4f24a037c47ddd448816d84ab6ba485b72444f4a017178e630416fba18f90a7999ec505bd5fd7e51518e4da1c3f2fe8f4f78dbc3f0a114f9b43ac0 SHA512 6ff4d22fdcf3aa2dcb4cfe13269bcdda2b4b7128ad6fee804683209cb0b70ecca14abd23efdfe7a58b552f291e17b2f07061f9a44bcbc91c8ef00339ac70e0b7
 MISC metadata.xml 746 BLAKE2B e08a44b85b899bb04c0683bea836d0c79cdba1b82e0e6a2ecd85e32f258bd8b2e305cc9a95465b34fb73707c718e1e27a2835d8b3afb98c9aa184a7efc0f55da SHA512 81b171a9e601eba0ee1df96f7662f3486a30236a9faed67c274446f75d998529eb37233c928307db3875349afec1db704e25149d67ff45055bd7d0bd09047c45
diff --git a/app-i18n/fcitx-qt/fcitx-qt-5.1.8.ebuild b/app-i18n/fcitx-qt/fcitx-qt-5.1.8.ebuild
index 1d82d83511b2..86606d541afe 100644
--- a/app-i18n/fcitx-qt/fcitx-qt-5.1.8.ebuild
+++ b/app-i18n/fcitx-qt/fcitx-qt-5.1.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.zst ->
 S="${WORKDIR}/${MY_PN}-${PV}"
 LICENSE="BSD LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv x86"
 IUSE="qt5 onlyplugin staticplugin +qt6 +X wayland"
 REQUIRED_USE="
 	|| ( qt5 qt6 )
diff --git a/app-i18n/ibus-libpinyin/Manifest b/app-i18n/ibus-libpinyin/Manifest
index d6c6e496c57b..ef79c4dd3826 100644
--- a/app-i18n/ibus-libpinyin/Manifest
+++ b/app-i18n/ibus-libpinyin/Manifest
@@ -1,3 +1,5 @@
 DIST ibus-libpinyin-1.15.2.tar.gz 1728300 BLAKE2B a7699fe7f4d7360d09b8c311919630c87fcf2250929f42be2adf1b29a16e60bef2df46539e0fb75ee27700ec7262eb175e6a4d56bedeb895a6272e097a636d00 SHA512 be7525221c4a95df885d1c8c60716c32ad0cfa0a13ca5f9034d06efebf18ab1c207383b30c017da28c1078724b4d9943fc82def68c94bb4e2a0a1e6273c7ad7f
+DIST ibus-libpinyin-1.15.8.tar.gz 1732564 BLAKE2B 94c2729ce0135fbc9ba9f4baad81e97b8589d1bbd048cae840de3565a01513a0d23e3152ddad6aefaf57915f67ca8d2c6592627ab622f2cefb451aab7ee3325c SHA512 525529b1d53a7c40d72097c48f6bfb912810049d46759d8c3c4408b88196edb1d2914d8804d3e83b7f3b5d90a3134697aa8032ecf333ebfd1eb1e6fe741dc025
 EBUILD ibus-libpinyin-1.15.2-r1.ebuild 1475 BLAKE2B adb3ea97bc34073cf71c748b1838fc5cb4dcb0d483453da5d43fbb9f1503a3e149f444dd2cde8f3d2b52b9a7dbcec9ab26595b3a9249cf2427bc7e399ae7a5b2 SHA512 49ad8786ec4020e45b46574ff594e4c4e18e7da1fca44752d0ce397d24eae6fe57202bfa1b7f992f52c618e4ff47ff5fcbcd48eccf0c75fa877cdcdaa44612f3
+EBUILD ibus-libpinyin-1.15.8.ebuild 1477 BLAKE2B e43f0c36e0e5acc3a2d003939fa392bb57928d9c4f685aca0ecd7e562583cf6c5b5fd71707664b2a7fe46f5685c740ec1df6cc8245fd12b0a0af9a4525fc3223 SHA512 9f4314210aa86a3361d02c62edf0048bda8b3de0b49d19a04af22a8bb3dffc81d437c5a781eef4dd9d132661e3e3a53343a2b359d4c4fff0658316673009d347
 MISC metadata.xml 834 BLAKE2B ac644e5ceced4364c282f0766cfc5d85dfc14fc19fff46e96dee2aa8ff48c1c5d84dd496e3f83951983f311cbab0ea84652fab3e3a87e870dab999cf46821452 SHA512 dd1629baeddeb1ee4ab1670a4e29af865a75e40b7c6b58e9029af5900d5de9bfb98f71ccaf7eae508f0849ac85f4530d8770cc392d9bb8c31a881f8154ac5761
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.15.8.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.15.8.ebuild
new file mode 100644
index 000000000000..58b6b8f884c0
--- /dev/null
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.15.8.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2015-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+LUA_COMPAT=( lua5-{1..3} )
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit autotools gnome2-utils lua-single python-single-r1
+
+DESCRIPTION="Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus"
+HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/"
+SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boost lua opencc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	lua? ( ${LUA_REQUIRED_USE} )"
+
+BDEPEND="dev-db/sqlite:3
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DEPEND="${PYTHON_DEPS}
+	>=app-i18n/libpinyin-2.7.91:=
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	virtual/libintl
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	boost? ( dev-libs/boost:= )
+	lua? ( ${LUA_DEPS} )
+	opencc? ( app-i18n/opencc:= )"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+	if use lua; then
+		lua-single_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -i \
+		-e "/^appdatadir/s:/appdata:/metainfo:" \
+		data/Makefile.am || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-english-input-mode \
+		$(use_enable boost) \
+		$(use_enable lua lua-extension) \
+		$(use_enable opencc)
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index fa48ad615b4f..31c1a9076bac 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,5 +1,7 @@
 DIST ibus-1.5.29-rc2.tar.gz 3991416 BLAKE2B c185c0cf8af79a80ee04f414e13c4b58bd2f18891851d2f018713848b3bc0fe0516c8c0cf8f64204040f10b6b4a5304c8be6305449d7290b5d08412246d3af40 SHA512 47dd39c9615783b6c157a25e8a2506dc2e1f440d56aa649ee8cb95a390cb4efab9c95e72ac84b5d042c25e350599b4d352ddc66f1385af6660d4a7a296e44ca7
 DIST ibus-1.5.30.tar.gz 4124084 BLAKE2B 47dbcfec309bda14273463bff875e283148c7aba872d8e9f7673dd18e703f7b2a0eab5d538bd29a36525ab667b57488f4dc046bc955c1cd34edaec5b538e2bdd SHA512 cbed37bf62e8d8593c838f8ef7fe0b22bf8f4a661b887fc7be2f2768dda912075abdf3070c22b9699def90e7002aaaf7394f5fc590e12ef6ebb2bb5161cc29a0
+DIST ibus-1.5.31.tar.gz 4108303 BLAKE2B 2fa895369f5326339b50da34777e2f34124000cff40a4bc871bb0c1cdac4a22cc327240b8338bc6c4fc85267a83ccc0bd5963abcf4763a373b1227bdb5753b76 SHA512 adfad740002662262981ddfcc3f6eb1e898433d3bd90b07535ceef367d496d3da3e0836e59133d0063caf2d3d55d0deb6cf18ae2807fdd1ce4afab84a7725ca5
 EBUILD ibus-1.5.29.ebuild 5855 BLAKE2B 04b8db8acd96827d40027c042cd9ec5f6a5bcbedc6b1b2fd4ca7e9b72e4cbc56353df7a594dda57aca74f77d43742b172cf4489b4edb0d7dad83796f60fccf0c SHA512 bc8372224eb495498c1dc2b6be5903d5ffd00ad0153cfed36f24b21dd6f0997cf77a340c0f88cd39c7037354a3a774853502b1df44d68b9163de8ecc42a897df
 EBUILD ibus-1.5.30.ebuild 5752 BLAKE2B 9ef8d0168a9b34936b715391da6c4dbc1e9d0a8d9c2d63181a59e29f56b18b9de2910f18a3f51199c5b5aaaaf583ceaf9cc2509a47a0a37741adbe32e2de8ed9 SHA512 2d0841ae658bf79398d5eb16fc13c163703c79b9526fa88a76da908b748eb7cdbb982fd2c002f6bf4d1b124c1b8285b891bf9854e866024e866e7635e21fb1ab
+EBUILD ibus-1.5.31.ebuild 5806 BLAKE2B a434534652469fb59e0ec273550bc1d6d2213ae27c71106dddb47e8f0d72a97bdf1138a91ab3e05946c85d44c45ad4121978fc7b47890f9f225543a6e7c0431d SHA512 fec656604ef807d8e352336e1f7767946c3d4af3c430214db3d4a2c52c41d6b4b3ac2176ff07558bf40c69ade2c281c4ea147a102d972c7a707e82d6a49ab1db
 MISC metadata.xml 989 BLAKE2B 9103c61af6f3766fa483864877a674455d0a47a2e7fc1e7ef0f62d835e1f57d6c71816737c64938babd5f29a7228d67f64c1d7aaaae0e9b10cc793ed373a698c SHA512 1552ed06ec527f6c9868b2b006b1d5d7bdc7101d34d4c4438eba6de74f398744a2720e31f73dc203f034631aa900db0a2ad8d429a67e577b69005cda1440f1ef
diff --git a/app-i18n/ibus/ibus-1.5.31.ebuild b/app-i18n/ibus/ibus-1.5.31.ebuild
new file mode 100644
index 000000000000..0b57f53f19ea
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.31.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit autotools bash-completion-r1 gnome2-utils flag-o-matic python-r1 toolchain-funcs vala virtualx
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+
+MY_PV=$(ver_rs 3 '-')
+GENTOO_VER=
+[[ -n ${GENTOO_VER} ]] && \
+	GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.gz
+	${GENTOO_PATCHSET_URI}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	appindicator? ( gtk3 )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		introspection
+	)
+	test? ( gtk3 )
+	vala? ( introspection )
+	X? ( gtk3 )
+"
+REQUIRED_USE+=" gtk3? ( wayland? ( introspection ) )" # bug 915359
+DEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.65.0:2
+	gnome-base/dconf
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		>=x11-libs/libXfixes-6.0.0
+	)
+	appindicator? ( dev-libs/libdbusmenu[gtk3?] )
+	gtk2? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	gtk4? ( gui-libs/gtk:4 )
+	gui? (
+		x11-libs/libX11
+		x11-libs/libXi
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	libnotify? ( x11-libs/libnotify )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)"
+RDEPEND="${DEPEND}
+	python? (
+		gui? (
+			x11-libs/gtk+:3[introspection]
+		)
+	)"
+BDEPEND="
+	$(vala_depend)
+	dev-libs/glib:2
+	dev-util/glib-utils
+	virtual/pkgconfig
+	x11-misc/xkeyboard-config
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )
+	test? ( x11-apps/setxkbmap )
+	unicode? ( app-i18n/unicode-data )"
+
+src_prepare() {
+	vala_setup --ignore-use
+	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
+		touch ui/gtk3/panelbinding.vala \
+			ui/gtk3/panel.vala \
+			ui/gtk3/emojierapp.vala || die
+	fi
+	if ! use emoji; then
+		touch \
+			tools/main.vala \
+			ui/gtk3/panel.vala || die
+	fi
+	if ! use appindicator; then
+		touch ui/gtk3/panel.vala || die
+	fi
+	if [[ -n ${GENTOO_VER} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		eapply "${WORKDIR}"/patches-gentoo/*.patch
+	fi
+
+	# for multiple Python implementations
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am || die
+	# fix for parallel install
+	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am || die
+	# require user interaction
+	sed -i "/^TESTS_C += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am || die
+
+	sed -i "/^bash_completion/d" tools/Makefile.am || die
+
+	default
+	eautoreconf
+	xdg_environment_reset
+}
+
+src_configure() {
+	# bug #944071
+	append-flags -std=gnu17
+
+	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local python_conf=()
+	if use python; then
+		python_setup
+		python_conf+=(
+			$(use_enable gui setup)
+			--with-python=${EPYTHON}
+		)
+	else
+		python_conf+=( --disable-setup )
+	fi
+
+	if tc-is-cross-compiler && { use emoji || use unicode; }; then
+		mkdir -p "${S}-build"
+		pushd "${S}-build" >/dev/null 2>&1 || die
+		ECONF_SOURCE=${S} econf_build --enable-static \
+			--disable-{dconf,gtk{2,3},python-library,shared,xim} \
+			ISOCODES_{CFLAG,LIB}S=-DSKIP \
+			$(use_enable emoji emoji-dict) \
+			$(use_enable unicode unicode-dict) \
+			$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data")
+		popd >/dev/null 2>&1 || die
+	fi
+
+	local myconf=(
+		$(use_enable X xim)
+		$(use_enable appindicator)
+		$(use_enable emoji emoji-dict)
+		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji)
+		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations)
+		$(use_enable gtk2)
+		$(use_enable gtk3)
+		$(use_enable gtk4)
+		$(use_enable gui ui)
+		$(use_enable introspection)
+		$(use_enable libnotify)
+		$(use_enable nls)
+		$(use_enable systemd systemd-services)
+		$(use_enable test tests)
+		$(use_enable unicode unicode-dict)
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data")
+		$(use_enable vala)
+		$(use_enable wayland)
+		"${python_conf[@]}"
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if tc-is-cross-compiler && { use emoji || use unicode; }; then
+		emake -C "${S}-build/src" \
+			$(usex emoji emoji-parser '') \
+			$(usex unicode unicode-parser '')
+		emake -C src \
+			$(usex emoji emoji-parser '') \
+			$(usex unicode unicode-parser '')
+		cp \
+			$(usex emoji "${S}-build/src/emoji-parser" '') \
+			$(usex unicode "${S}-build/src/unicode-parser" '') \
+			src || die
+	fi
+	emake
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	virtx dbus-run-session emake check
+}
+
+src_install() {
+	default
+	# Remove la files
+	find "${ED}" -name '*.la' -delete || die
+
+	# Remove stray python files generated by the build system
+	find "${ED}" -name '*.pyc' -exec rm -f {} \; || die
+	find "${ED}" -name '*.pyo' -exec rm -f {} \; || die
+
+	if use python; then
+		python_install() {
+			emake -C bindings/pygobject \
+				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
+				DESTDIR="${D}" \
+				install
+
+			python_optimize
+		}
+		python_foreach_impl python_install
+	fi
+
+	keepdir /usr/share/ibus/engine
+
+	newbashcomp tools/${PN}.bash ${PN}
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
+}
+
+pkg_postinst() {
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	xdg_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/app-i18n/libime/Manifest b/app-i18n/libime/Manifest
index 911110992f70..89b94df7e0b3 100644
--- a/app-i18n/libime/Manifest
+++ b/app-i18n/libime/Manifest
@@ -3,5 +3,5 @@ DIST libime-1.1.8_dict.tar.zst 37061630 BLAKE2B e76ee4d403bdc2ef9c9eab663f6da3f1
 DIST libime-1.1.9_dict.tar.zst 49564053 BLAKE2B f10efc9ad091b3559cf38a17ba5c6ca60e74c4bac2cb0484a7c3e849cd9cd0c4f22dbba08b3a9e1824eca917812ba5f3c24682259c986b2851333a631d80c53d SHA512 07b687c98cf0c4e8fc4852fd633ad05de58e32a3c70e58d1c0a84c8862f1843a0421c9a11a9c5653bbb8b1da37d3aee91f2207dbeed12aa49e041e9b08b8dca9
 EBUILD libime-1.1.8-r1.ebuild 1011 BLAKE2B eba700b20b0bdfb71392d9989ced642d64beffc6bf8815abb7756d2ec055f6b3d48cb31a96a89dc45b0400ffdfc05f25fb6bd327a5144d32e9a7a4e32c86b67f SHA512 6e4464d31eda5b018464fdc0af5f1e9e53043b58397abda179cf5a822d691b1ac70261889cc03de60eac9ac3ac5abb79a4aeb07aa89cf57079b797e8d01f9f28
 EBUILD libime-1.1.8.ebuild 943 BLAKE2B 6b5b320b5d6f27c5eefa75f464a2c23bd5c130f931d7aaee3d0caf305f7611e19547745a9ccfef06ac4a10f4bce2779698a7ab84d09fd6300538f0aaf780ccb8 SHA512 2ac7ac44333f9a3ba6ce08ac9c3e1f73f4d33b5672daf7e37dfe71e0969a2bcc5bf138ef25a1bddb691fc9de3c6934fe8aa20da0ffe6f41b488bfe1813ae86b6
-EBUILD libime-1.1.9.ebuild 945 BLAKE2B 96ba2b48ad2f5851edebe9fc014af889148968057cfae26cb6eaea948c8cd65b7f2fb694e637b52dc12a067ac86d73e2f54e3b75aae00699240f2ea59cd7b828 SHA512 c8c0d9154bc059ef3d27c0ec125ae1eb069efaa6d46b8889767e8fe09570ae56b107aacad42b06c2e2a74ae88b9823bb97060931af83e079b36254cc6008435c
+EBUILD libime-1.1.9.ebuild 943 BLAKE2B 6b5b320b5d6f27c5eefa75f464a2c23bd5c130f931d7aaee3d0caf305f7611e19547745a9ccfef06ac4a10f4bce2779698a7ab84d09fd6300538f0aaf780ccb8 SHA512 2ac7ac44333f9a3ba6ce08ac9c3e1f73f4d33b5672daf7e37dfe71e0969a2bcc5bf138ef25a1bddb691fc9de3c6934fe8aa20da0ffe6f41b488bfe1813ae86b6
 MISC metadata.xml 624 BLAKE2B 7c0e1d29bf86d256ac8ace1404f3ef8e017171cf461f861b2b681c9bb6c7c3bb639b13cbdccc506a07805ea9e23f449e22bba1ac16d3f40ecdd10b894ea0632d SHA512 8449b74e190a0acf83f4e5b0c0ed023e5a37e203a4e514074b9e8165616c43659d993e165bb170aa8902865166a7ceaf65bec04645be7b1390ddc80c2e43066a
diff --git a/app-i18n/libime/libime-1.1.9.ebuild b/app-i18n/libime/libime-1.1.9.ebuild
index a1ed203b8f03..7fb6da2943a7 100644
--- a/app-i18n/libime/libime-1.1.9.ebuild
+++ b/app-i18n/libime/libime-1.1.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.fcitx-im.org/fcitx5/libime/libime-${PV}_dict.tar.zst"
 
 LICENSE="LGPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv x86"
 IUSE="+data doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-i18n/poedit/Manifest b/app-i18n/poedit/Manifest
index 66a1ae4c1c3d..0dbcd566f636 100644
--- a/app-i18n/poedit/Manifest
+++ b/app-i18n/poedit/Manifest
@@ -3,5 +3,5 @@ DIST poedit-2.3.1.tar.gz 2891956 BLAKE2B 11fb8c19f439edc2c9df08529e815d47f5bdfe3
 DIST poedit-3.5.2.tar.gz 3173111 BLAKE2B 8e7ae9fc06af173107fa46fa4f07cab3637d75cd60bc8bc0d48df23cdc97434e05a55b2eb4e28295de4e0072ba43bb2078e51768294510946c0b400a028ccd5d SHA512 5728b23ae64751754f8d23e24ba12311bf55f6a0fee3ef44d74b78ed74ed5397e198353388dadb3ce217996ee5b09d9a8e963614ce78a62ce108d4fa22c1cdf1
 EBUILD poedit-2.2.4.ebuild 1284 BLAKE2B 506f653e4cfe8b30a8e23e8fc8b0a13b057552bdb8c519c13cadd1bb169085952c82aae86fc1159c58537f7ad7c620a92a6c2057461ed2d4d2e4ffe42b1a1fc8 SHA512 1b24d8a62ca504e69f36e5a2967ca64ed042b898c31aabd855cc79eb2d8dccc37bae4db831371efc6593f365e6ab85597c27e1c38d861f4acc31b011dc672417
 EBUILD poedit-2.3.1.ebuild 1284 BLAKE2B cc248a1c5363e3800800d6d8cac6807d73165d88a033fc9647cd587afc5bfec96614cfbb2a5f511efaf28a5d3acd017028a0a9bbacd0e79db5854cd069e322b8 SHA512 d8af985e73a0e3600e5b64108e78dcefa1928f932709b364ee629c0e7567aa4b79b45d30bebbaa5a1913e43706c429ed0d9eb4ac4b5ac02d838e80edb7cd8420
-EBUILD poedit-3.5.2.ebuild 1246 BLAKE2B 257cf0ea568267fce3852fbaa759b1f4c2e2f2a7a92266abd68c9c6855e710cbc9c6cd8e61f72d4186d72d1d17c55a5b12dfc85cc87a05767b8a71a71b5fed43 SHA512 d75b45b205dbbe6706aea5a438ec87a21820ad52b100b1b2a9f44a6c5dd4d1aa4955ada336da2f648f6994bfcac19ff4fbdf6b58317e44dea6c6c7b375023972
+EBUILD poedit-3.5.2.ebuild 1244 BLAKE2B 4388dbddc9ebfc663b92633964744b3720c685dbf4237d4edd2a19af679b2c11830e30196c74793859da6ecfcf82a563c3389938c56adeed6796d4b495559fc8 SHA512 00301e092ff6dd9dfe818dae3b560cf4940a71a72205cf45cab1b211eb84d859d23e4af898f45c93bf31f7e778fa571c03912229a97edf17f948e945a00f8668
 MISC metadata.xml 612 BLAKE2B 03b3aa92624d54212575123e2d00701c2e6b8bd64861a1af3c923c5ee13137bc5675a0de909b99becec85585b50a510d3e8403fe49d886d72b4031ad2b61d39b SHA512 38acddb652f5010d92a4018c6e96122bbfe7955db1cf26eeb1db5ef46d0cbb0c309a41d5201a8646a9af252b19022dda189f59c0596327440f5a86b43ddf7002
diff --git a/app-i18n/poedit/poedit-3.5.2.ebuild b/app-i18n/poedit/poedit-3.5.2.ebuild
index 6cd15cd09a31..0d78f2e6146e 100644
--- a/app-i18n/poedit/poedit-3.5.2.ebuild
+++ b/app-i18n/poedit/poedit-3.5.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.
 LICENSE="MIT"
 SLOT="0"
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 RDEPEND="
 	app-text/gtkspell:3