gentoo auto-resync : 16:08:2024 - 12:22:56

31 files changed, 209 insertions, 912 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index f8c0887be080..6ab331b72116 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index 2fecaed2f5d7..7df68a9991f3 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1,5 +1,6 @@
 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
+AUX fcitx-5.1.10-include-cstdint-for-gcc-15.patch 293 BLAKE2B dc9e83510fec08eddb094efd0552938e575ae397b47bc89240e67ccf1d3e4c433f009314b806e847221b3c2aa634e548868d0028ab832f2944eecd6972f0c0cd SHA512 4f7fdc907aa5d1ed4427e4c67b5a2ee79bebbf96120fd64f5f83a3e3505a9e11ad086aeff2311f4ac58d66aae21054560d648c3cb541f76dd75e18a90d857c2b
 DIST fcitx-4.2.9.8_dict.tar.xz 8737888 BLAKE2B 2de3ccbf1b37a9bcf1a3cb257d7837669e946765722c3d6f442ad071d7d81a6e8178e47051fc3aa53b9b4771d3aca602c2e22fa7a3d117a9e1f2779497e02c52 SHA512 50a954c3178f53fd2d441cdaf81fb44a7fe8dfb263fa6d8dd4ee4884fc7ae8321880c726c9366d11e2a4ac8da2233268d06e5d0800d4527ba0bdb1a1430248ed
 DIST fcitx-5.1.10.tar.zst 8309913 BLAKE2B a63f5c747dd1d7a519873f00f234ae43d1ab5458e57b809f01e2b6cefc3e3921ecd7fff27cf4b21d59842f11e8d397760d90cf6572b42f65d226b21acc18fefc SHA512 196bc26f7dd50596da90e6b4b0a8b4886b57ec928c182427fb8763507f1f4cb39a252bfddcbd6eccaa0cc920070b7b9fda03f18fd444f84154ddd925678ad7d4
 DIST fcitx-data-en_dict-20121020.tar.gz 630491 BLAKE2B 2df897b1c9fb3a2ce186ee590e5f3ccbc7930f047218bf0fefa317f74b3287fc0be9c393d3310fe07208379118ec4c46608a1c703ef37b3aee65b2d790cb7f0d SHA512 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2
@@ -9,5 +10,6 @@ DIST fcitx-data-py_table-20121124.tar.gz 186822 BLAKE2B d696413f2e88f1ca87938d63
 DIST fcitx-data-table.tar.gz 4144686 BLAKE2B 696845bb234915a364d614d47cc3baf8421a12ca1778611b0843e52e651da98b5ed9f3e0c9895a829b67f1bcceb1f982a7f6606c8a2d383af8c4573a150c71ef SHA512 99e1d69c679355fcf3e117a1ef39b131cbd3af841387d2335757247d840b90ff6b7323e16fca98cf7a043033faf250d2e9c6d47b96845d18c278a0cf6f30fec9
 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.10-r1.ebuild 2570 BLAKE2B 267bc1a39331746d52b580f6f7016f3b015f25e7f96948edd3cfb2a4adcd27f9f227f39cbc0aae7ccfae03eca33ecc4522c7a6919e887d17e425c0232dcb0e4d SHA512 25b63867976f6ba8fca09cfcc56c284548290bd0cca03facffeb14cacde21dbf77862f5b1ae32984eebb0c71a5e59ac6b0afb6b9634acaaa94f7d3def03ab45c
 EBUILD fcitx-5.1.10.ebuild 2502 BLAKE2B 6f5025a3ff53e11f2416de3759cf00b31dc56bc8f11a7cc06b113047903ded8c6d5eaab98d3bb226872d98e98e388e97fb786853464466496ff00dea2e51aea6 SHA512 f662d1548a7dcd9c7231aaff555ede5b61f661fc95b125e4508e95496f50fe86dd0c282b1af7e91763d93c7b293738959ce5c990710e16505fef3b8dde0352a7
 MISC metadata.xml 1669 BLAKE2B 5ca435595db2a7facd3f2eade1bc5063ffa291377e2a6208a2472f6eb359aa6926442e3052ea3e7b343b9e9ca888a1c27dbb0fcf3b5621335d1c6594f0e8ccb9 SHA512 dd4a675e69cd49c963bf14fe2e08057f1923ea311d4a583a64939c1fe81a36f8b08a0faa47ca49b14d05105935e0b67c4cd64fa7d44137a80717af88e8b656d2
diff --git a/app-i18n/fcitx/fcitx-5.1.10-r1.ebuild b/app-i18n/fcitx/fcitx-5.1.10-r1.ebuild
new file mode 100644
index 000000000000..13e9dd85807e
--- /dev/null
+++ b/app-i18n/fcitx/fcitx-5.1.10-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="fcitx5"
+
+inherit cmake unpacker 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.zst -> ${P}.tar.zst"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+LICENSE="LGPL-2+ Unicode-DFS-2016"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~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-text/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/libuv
+		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
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-include-cstdint-for-gcc-15.patch"
+)
+
+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/files/fcitx-5.1.10-include-cstdint-for-gcc-15.patch b/app-i18n/fcitx/files/fcitx-5.1.10-include-cstdint-for-gcc-15.patch
new file mode 100644
index 000000000000..4dcf19d363de
--- /dev/null
+++ b/app-i18n/fcitx/files/fcitx-5.1.10-include-cstdint-for-gcc-15.patch
@@ -0,0 +1,12 @@
+https://github.com/fcitx/fcitx5/pull/1119
+
+--- a/src/lib/fcitx-utils/inputbuffer.h
++++ b/src/lib/fcitx-utils/inputbuffer.h
+@@ -7,6 +7,7 @@
+ #ifndef _FCITX_UTILS_INPUTBUFFER_H_
+ #define _FCITX_UTILS_INPUTBUFFER_H_
+ 
++#include <cstdint>
+ #include <cstring>
+ #include <memory>
+ #include <string>
diff --git a/app-i18n/freewnn/Manifest b/app-i18n/freewnn/Manifest
deleted file mode 100644
index b466bb385a4a..000000000000
--- a/app-i18n/freewnn/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX freewnn-1.1.1-implicit-configure.patch 595 BLAKE2B 7fddef1b42c3bb76e123997a3f3441994a509f9f8ca8c042501249409d55ceabab00765fbe5bc259ab28e58a355cdf2ca29b6fd59aef61c0aaaee32755901339 SHA512 2653079081b8ff7fa2f61e8f188146a0b8f8726d22c2f3c62cb2813e11888a30a01fde03c48d369d18671854f5a728b1703be8ee54eae462357c6a1d6b8bebc3
-AUX freewnn-Wformat-security.patch 3658 BLAKE2B 4bce67e8190ec4a6e6a4b8cee446b8beb492057cfedd49c06e631a5949e9ff20b35c4defe9ed0466dc2f0b5edb8a483f5886b8eda30a77435ee8614b0878d7f6 SHA512 7e01d516978eb024fe723a84c6c7cc8e138e7947ed3d4d5ec6e15b28783498e084cd2655ccd2ce7377c9837332ae1b0caec654c0f7f2bb9f78b9657f4cd00830
-AUX freewnn-uum-EUC-JP.patch 279 BLAKE2B a0fe740a49aabb72f8d9b0bcbae59e5841152c02ebb4bb27817c8621a4e6be2fd17b8a18c5104d94f8c7def90342682a015a98883856027901265a11d7d4aa4c SHA512 a065873fe70435a4364a111eed334ea574cd3178ffde947beabac5bb45e468a725f73c5b35c22b577127d03139a6386eebc815b85014048eaf59ca958687c96b
-AUX freewnn.confd-r1 16 BLAKE2B 2a2b2a93adf66e719f035900b0efa1f7ccf66912f8c5cddddb8e7b7c1e83c91136d4e747e1b96cad6a54fbbddc29a6b61fc37f7f01330909d27fc1f0cf978723 SHA512 3392644bb5404b83ee3bf3bceffaa769d1dce858fd2a8bd92b79101d0db863002a4f30205498a00777b25b7940fc8dbb41a0e0c4e20be0f6d61be50eb4ddf49e
-AUX freewnn.initd 283 BLAKE2B 363b8b99876aa0552f49a10bc973925d7d23900c24601e40ff2c99a3d6476c9b41c60465feb9e01e6fb17324957bb810d63eef52d97b49a61e0f48c96452db6e SHA512 81b5a6246d513f567710e2973bc8fffe86462e8afdee13e1a2aa9b6e5e8a852521a23fd5b20af536092b59f626a5e34be77409d63dcab005473dd11631b67111
-AUX freewnn.initd-r1 306 BLAKE2B 2c5eeede614062832ce9d799e228a7927793679aa129151b68c9f1392056c8faccda4ce3dff5b4dc0f9da5d1557c8799ca663c1b20d9c3b2208b72a26f78adc3 SHA512 306ad8dd6ae7060fc937f2ac2b266f385480961ed0c2074f1dcfc77fa82bb7a23042019672b47c32fc8d55079730ccda68c616c0f5411b0704db2c34d2caaf02
-DIST FreeWnn-1.1.1-a023.tar.bz2 3147378 BLAKE2B 63f3fbf37b53e5e6f32f83513d45aaf4915cbd33789ab8edfc93b22de1fbbe242e52e7bd40ce7ef22e24ae1f4ee151261c2041af9c78720875303b5d2b6c18a8 SHA512 f0b8c657f0441463c752314b7d2fd603b4df056b049d247ecd77ff8b2f2f837fed7e75ce89deabca7061d3126afd51bf301bcdd3ac429056f43bfc8e0c7c8385
-EBUILD freewnn-1.1.1_alpha23-r2.ebuild 1975 BLAKE2B 87aad540d0e160730b28b51470a6d6e82acebb1cbfbb003d54c3d9300593fee5508575e8fc30ab3a547f1ba6b2c8f3bb4fb3e61b46e8a5f4f87ff866189de10f SHA512 f17ff838ff9ef56449ed8d82c62f7cdce95cc48080d01529705aca31bf02cd9c21ff30cfdcdaadeaa920022342aa94b259b16b35abc19a21de8713041ffc5e19
-MISC metadata.xml 370 BLAKE2B 4af1f1ad79d90077709e87ce1e65cca7ba4953d067ddee1dfbe6e6e605ebf80f63927012276c5c11e98c1a06717fcec433f0dca9c722f6a6cc88bf6208f07de8 SHA512 42405726236b8a4c7f95479583edafd1b78d0537930f668126c6d429d9fe8af141fe76c8dc2d506ed16614d02f920f81bee1f47cd7274aaf297b2e7255e10f19
diff --git a/app-i18n/freewnn/files/freewnn-1.1.1-implicit-configure.patch b/app-i18n/freewnn/files/freewnn-1.1.1-implicit-configure.patch
deleted file mode 100644
index a46f2f405e5d..000000000000
--- a/app-i18n/freewnn/files/freewnn-1.1.1-implicit-configure.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/configure.in	2024-06-19 23:14:54.243999953 +0300
-+++ b/configure.in	2024-06-19 23:15:21.253961581 +0300
-@@ -549,6 +549,7 @@
- #ifdef HAVE_TERMCAP_H
- # include <termcap.h>
- #endif
-+#include <stdlib.h>
- main() {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(0); }],
- 	res="OK", res="FAIL", res="FAIL")
-       if test "$res" = "OK"; then
-@@ -571,6 +572,8 @@
- #ifdef HAVE_TERMCAP_H
- # include <termcap.h>
- #endif
-+#include <stdlib.h>
-+#include <string.h>
- main()
- {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(!strcmp(s==0 ? "" : s, "1")); }],
- 	[ AC_MSG_RESULT([no -- we are in termcap land])
diff --git a/app-i18n/freewnn/files/freewnn-Wformat-security.patch b/app-i18n/freewnn/files/freewnn-Wformat-security.patch
deleted file mode 100644
index b5b68314060d..000000000000
--- a/app-i18n/freewnn/files/freewnn-Wformat-security.patch
+++ /dev/null
@@ -1,143 +0,0 @@
---- a/Wnn/uum/jhlp.c
-+++ b/Wnn/uum/jhlp.c
-@@ -1135,7 +1135,7 @@
-       else
-         {
-           signal (SIGCHLD, SIG_IGN);
--          printf (MSG_GET (3));
-+          printf ("%s", MSG_GET (3));
-           /*
-              printf("\r\nｕｕｍを終わります。\r\n");
-            */
-@@ -1212,8 +1212,8 @@
- 
-   if ((buf = (unsigned char *) malloc (maxchg * 4)) == NULL)
-     {
--      printf (MSG_GET (2));
--      printf (MSG_GET (3));
-+      printf ("%s", MSG_GET (2));
-+      printf ("%s", MSG_GET (3));
-       /*
-          printf("malloc に失敗しました。ｕｕｍを終わります。\r\n");
-        */
---- a/Wnn/uum/jis_in.c
-+++ b/Wnn/uum/jis_in.c
-@@ -64,7 +64,7 @@
- 
- completely_start:
-   throw_c (0);                  /* モード表示の後に出す */
--  printf (MSG_GET (6));
-+  printf ("%s", MSG_GET (6));
-   /*
-      printf("JISコード: ");
-    */
---- a/Wnn/uum/jutil.c
-+++ b/Wnn/uum/jutil.c
-@@ -489,7 +489,7 @@
-   /*
-      printf("只今、辞書を読み込んでいます。");
-    */
--  printf (MSG_GET (60));
-+  printf ("%s", MSG_GET (60));
-   flush ();
- 
-   if ((id = jl_dic_add (bun_data_, fname, hfname, 0, prio, rdonly, hrdonly, NULL, NULL, yes_or_no_or_newline, print_msg1)) == -1 && wnn_errorno != -1)
-@@ -571,7 +571,7 @@
-   int x;
-   throw_c (0);
-   clr_line ();
--  printf (string);
-+  printf ("%s", string);
-   flush ();
-   for (;;)
-     {
---- a/Wnn/uum/kensaku.c
-+++ b/Wnn/uum/kensaku.c
-@@ -112,7 +112,7 @@
-       u_s_on ();
-       w_printf (kana_buf, maxlength - strlen (MSG_GET (27)) - 2);
-       u_s_off ();
--      printf (MSG_GET (27));
-+      printf ("%s", MSG_GET (27));
-       flush ();
-       keyin ();
-       return (NULL);
---- a/Wnn/uum/kuten.c
-+++ b/Wnn/uum/kuten.c
-@@ -63,7 +63,7 @@
- 
- completely_start:
-   throw_c (0);                  /* モード表示の後に出す */
--  printf (MSG_GET (7));
-+  printf ("%s", MSG_GET (7));
-   /*
-      printf("区点 : ");
-    */
---- a/Wnn/uum/prologue.c
-+++ b/Wnn/uum/prologue.c
-@@ -144,7 +144,7 @@
-       /*
-          fprintf(stderr,"初期化でmalloc不能。\n");
-        */
--      fprintf (stderr, MSG_GET (2));
-+      fprintf (stderr, "%s", MSG_GET (2));
-       return (-1);
-     }
- 
---- a/Wnn/uum/screen.c
-+++ b/Wnn/uum/screen.c
-@@ -547,7 +547,7 @@
- {
-   push_cursor ();
-   throw_c (0);
--  printf (msg);
-+  printf ("%s", msg);
-   pop_cursor ();
-   flush ();
- }
---- a/Wnn/uum/sdefine.h
-+++ b/Wnn/uum/sdefine.h
-@@ -191,8 +191,8 @@
- 
- 
- #define flush() fflush(stdout)
--#define print_msg(X) {push_cursor();throw_c(0); clr_line();printf(X);flush();pop_cursor();}
--#define print_msg_getc(X) {push_cursor();throw_c(0); clr_line();printf(X);flush();keyin();pop_cursor();}
-+#define print_msg(X) {push_cursor();throw_c(0); clr_line();printf("%s", X);flush();pop_cursor();}
-+#define print_msg_getc(X) {push_cursor();throw_c(0); clr_line();printf("%s", X);flush();keyin();pop_cursor();}
- 
- 
- #define UNDER_LINE_MODE (0x02 | 0x08 | 0x20)
---- a/Wnn/uum/select_ele.c
-+++ b/Wnn/uum/select_ele.c
-@@ -224,7 +224,7 @@
- 
-   throw_c (0);
-   clr_line ();
--  printf (msg);
-+  printf ("%s", msg);
-   for (k = dd[cc]; k < dd[cc + 1]; k++)
-     {
-       cp = findcp (k, cc);
---- a/Wnn/uum/termio.c
-+++ b/Wnn/uum/termio.c
-@@ -100,7 +100,7 @@
- 
-   if ((strlen (Term_Name) > 2) && (strcmp (Term_Name + (strlen (Term_Name) - 2), "-j") == 0))
-     {
--      fprintf (stderr, MSG_GET (4));
-+      fprintf (stderr, "%s", MSG_GET (4));
-       /*
-          fprintf(stderr,"Uum:ｕｕｍからｕｕｍはおこせません。\n");
-        */
---- a/Wnn/uum/wnnrc_op.c
-+++ b/Wnn/uum/wnnrc_op.c
-@@ -754,7 +754,7 @@
-       return fp;
-     }
- error:
--  fprintf (stderr, MSG_GET (14));
-+  fprintf (stderr, "%s", MSG_GET (14));
- /*
-     fprintf(stderr , "uumrc ファイルがありません。");
- */
diff --git a/app-i18n/freewnn/files/freewnn-uum-EUC-JP.patch b/app-i18n/freewnn/files/freewnn-uum-EUC-JP.patch
deleted file mode 100644
index 919492d912c6..000000000000
--- a/app-i18n/freewnn/files/freewnn-uum-EUC-JP.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Wnn/include/wnn_config.h
-+++ b/Wnn/include/wnn_config.h
-@@ -149,8 +149,8 @@
- #define TTY_KCODE J_EUJIS
- #define PTY_KCODE J_EUJIS
- # else /* !DGUX */
--#define TTY_KCODE J_JIS
--#define PTY_KCODE J_JIS
-+#define TTY_KCODE J_EUJIS
-+#define PTY_KCODE J_EUJIS
- # endif
- #endif
- 
diff --git a/app-i18n/freewnn/files/freewnn.confd-r1 b/app-i18n/freewnn/files/freewnn.confd-r1
deleted file mode 100644
index c64e27196d50..000000000000
--- a/app-i18n/freewnn/files/freewnn.confd-r1
+++ /dev/null
@@ -1 +0,0 @@
-FREEWNN_OPTS=""
diff --git a/app-i18n/freewnn/files/freewnn.initd b/app-i18n/freewnn/files/freewnn.initd
deleted file mode 100644
index ef4e20cf37c8..000000000000
--- a/app-i18n/freewnn/files/freewnn.initd
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/bin/Wnn4/jserver"
-
-depend() {
-	use logger
-	need net
-}
-
-stop() {
-	ebegin "Stopping ${name:-${RC_SVCNAME}}"
-	/usr/bin/Wnn4/wnnkill
-	eend ${?}
-}
diff --git a/app-i18n/freewnn/files/freewnn.initd-r1 b/app-i18n/freewnn/files/freewnn.initd-r1
deleted file mode 100644
index 57fd448f801c..000000000000
--- a/app-i18n/freewnn/files/freewnn.initd-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/sbin/jserver"
-command_args="${FREEWNN_OPTS}"
-
-depend() {
-	use logger
-	need net
-}
-
-stop() {
-	ebegin "Stopping ${name:-${RC_SVCNAME}}"
-	/usr/sbin/wnnkill
-	eend ${?}
-}
diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha23-r2.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha23-r2.ebuild
deleted file mode 100644
index 293df70e0050..000000000000
--- a/app-i18n/freewnn/freewnn-1.1.1_alpha23-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-MY_P="FreeWnn-${PV/_alpha/-a0}"
-
-DESCRIPTION="Network-Extensible Kana-to-Kanji Conversion System"
-HOMEPAGE="http://freewnn.sourceforge.jp/ http://www.freewnn.org/"
-SRC_URI="mirror://sourceforge.jp/${PN}/63271/${MY_P}.tar.bz2"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="+uum"
-
-RDEPEND="
-	sys-apps/tcp-wrappers
-	virtual/libcrypt:=
-	uum? ( sys-libs/ncurses:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-uum-EUC-JP.patch
-	"${FILESDIR}"/${PN}-Wformat-security.patch
-	"${FILESDIR}"/${PN}-1.1.1-implicit-configure.patch
-)
-
-# linked for tests which we skip
-QA_CONFIG_IMPL_DECL_SKIP=( hosts_access )
-
-src_prepare() {
-	sed -i \
-		-e "s/WNNOWNER = wnn/WNNOWNER = root/" \
-		-e "s|@mandir@/|@mandir@/ja/|" \
-		-e "s/@INSTPGMFLAGS@//" \
-		makerule.mk.in || die
-
-	# bug #542534
-	sed -i \
-		-e "s/egrep -v/grep -Eav/" \
-		PubdicPlus/Makefile.in \
-		Wnn/pubdicplus/Makefile.in \
-		cWnn/[ct]dic/Makefile.in \
-		kWnn/kdic/Makefile.in  || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable uum client)
-		--enable-ipv6
-		--disable-cWnn
-		--disable-kWnn
-		--disable-traditional-layout
-		--enable-static # needed for correct compilation
-		--with-term-libs="$( $(tc-getPKG_CONFIG) --libs ncurses )"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	local m
-	for m in $(find Wnn/man -name "*.man"); do
-		iconv --from-code=EUC-JP --to-code=UTF-8 --output="${m}".UTF-8 "${m}" || die
-		mv "${m}"{.UTF-8,} || die
-	done
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install install.man
-
-	find "${ED}" \( -name "*.la" -o -name "*.a" \) -delete || die
-
-	local DOCS=( ChangeLog* CONTRIBUTORS )
-	einstalldocs
-
-	newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-}
diff --git a/app-i18n/freewnn/metadata.xml b/app-i18n/freewnn/metadata.xml
deleted file mode 100644
index f51feef0fab6..000000000000
--- a/app-i18n/freewnn/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <use>
-    <flag name="uum">Build uum</flag>
-  </use>
-  <upstream>
-    <remote-id type="osdn">freewnn</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-i18n/im-freewnn/Manifest b/app-i18n/im-freewnn/Manifest
deleted file mode 100644
index d37a90e9e596..000000000000
--- a/app-i18n/im-freewnn/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX im-freewnn-gentoo.patch 2426 BLAKE2B cf395d08d18424e182645e06fc14e9c0cf9a2f676b5a9ee67c8d740eb9c7c89eb49e969d84a8c5215318735d6e5c8c34ac377a414dfcdb6db5279b3b81168f67 SHA512 aebad875ff118a7d9b4b3ba2facafcb369527621cfc9be82bb21d07b8eb0d390d46f598f83dc49eddf9de00a9c1d8cef2fe1f550f6c1bf06219ce6be56633655
-AUX im-freewnn-headers.patch 511 BLAKE2B 13ed6574b9a6aa29db8a20c9b2deff0b0374ad298d2a6ed433bc2ad45823e03de46817f64c57c6f1ba5eb7064611e777b11b11b39444b20b23618650a5535814 SHA512 ae209226010483d0b4a4ec10888d29d6b71002bb9457519b83a56cfb958da9e47740530e23baf2f35453f60902b359443f10e331e4a5b96eff386b78f80ad856
-AUX im-freewnn-wnnenvrc.patch 367 BLAKE2B 5225eceff814d61c2f864b5f8316bb0e902eca4c5d606f724a0bf3ad12b3ce0f0a54af28c4112378a47f2fac3028d9d2fca362f40a20d62d95f656130043dc67 SHA512 0a8e506944d537084a6cd6efe7c0e7583781220e38fb17f164ba7b01290bbe59a4db04a95d2d72299dbd5bc2d9ff2af036d00101c6ced1b593a0a20b98531df7
-DIST im-freewnn-0.0.2.tar.gz 322963 BLAKE2B c089688a52c86cc8c0050987a17d294365e29ef33e70258efaad719876d079e997a7255b86a8b23b6c3bb2c779702e6dd8d6eb9825943f9a7034757ac27e5e51 SHA512 c942d320433d0b1ff15fc1566eff183f5761ce14cb0575834f4ee80504be6d286068203c22ffea81345dab3db11a873f0a559b3d38ba8505f4966f9532a06358
-EBUILD im-freewnn-0.0.2-r4.ebuild 850 BLAKE2B 27b309a12bf21cd29b64991b66a8a0bf787b42b7518aedb876e171300b4b49cf5f5503022ed518608beb7d2b523e6446913c8750a03be2892672035ab6ee01ff SHA512 a368958364b989551813ce5ae9959807dfa91fad3557dce02e664f4fd7c98aaff377c9e2e3a27cc7f983040529bff4fdb443ef46c74d1ed73334642157b3f944
-MISC metadata.xml 241 BLAKE2B d06d8c9218cb9736ecc414504678e9bff30ba6bffbd2b357e9a2ea990df4e73a21b8ad4db267eddfdbf73e8501dabe5a748c4ea9d26906d39425ab744b320216 SHA512 cff6b46a252b531091d1ef597e3f714f98d2ef4aa621662d8c2ec15e4f990cd811300d3439e1be003bd307d0c8d12e78f34cf7fd49f6d006d9362f0e6ccf6252
diff --git a/app-i18n/im-freewnn/files/im-freewnn-gentoo.patch b/app-i18n/im-freewnn/files/im-freewnn-gentoo.patch
deleted file mode 100644
index 90e042fc4193..000000000000
--- a/app-i18n/im-freewnn/files/im-freewnn-gentoo.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,4 +1,4 @@
--moduledir = ${libdir}/gtk-2.0/2.4.0/immodules
-+moduledir = ${libdir}/gtk-2.0/${GTK_BINARY_VERSION}/immodules
- ## Makefile.am for gtk+/modules/input 
- if PLATFORM_WIN32
- no_undefined = -no-undefined
-@@ -6,11 +6,11 @@
- 
- SUBDIRS = po
- 
--INCLUDES = @GTK_DEP_CFLAGS@ -I/usr/include/wnn -DIM_LOCALEDIR=\"${datadir}/locale\"
-+INCLUDES = @GTK_DEP_CFLAGS@ -DIM_LOCALEDIR=\"${datadir}/locale\"
- 
- DEPS =
- 
--LDADDS = @GTK_DEP_LIBS@ -lcrypt
-+LDADDS = @GTK_DEP_LIBS@
- 
- EXTRA_DIST=	\
- 	im-freewnn.spec
-@@ -38,7 +38,7 @@
- 		candwin.h \
- 		candwin.c
- 
--im_freewnn_la_LIBADD = $(LDADDS) -lcrypt
-+im_freewnn_la_LIBADD = $(LDADDS)
- 
- module_LTLIBRARIES =				\
- 	im-freewnn.la
---- a/configure.in
-+++ b/configure.in
-@@ -21,8 +21,10 @@
- 
- GTK_DEP_CFLAGS=`pkg-config gtk+-2.0 --cflags`
- GTK_DEP_LIBS=`pkg-config gtk+-2.0 --libs`
-+GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version`
- AC_SUBST(GTK_DEP_CFLAGS)
- AC_SUBST(GTK_DEP_LIBS)
-+AC_SUBST(GTK_BINARY_VERSION)
- 
- LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION
- LT_CURRENT=2
-@@ -48,11 +50,9 @@
- AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
- 
- dnl FreeWnn check
--ldflags_backup="$LDFLAGS"
--LDFLAGS="$LDFLAGS -lcrypt"
- AC_CHECK_HEADER(wnn/jlib.h,,)
-+AC_CHECK_LIB(crypt, crypt,,)
- AC_CHECK_LIB(wnn, jl_open_lang,,)
--LDFLAGS="$ldflags_backup"
- 
- AC_OUTPUT([
- Makefile
---- a/freewnn-modewin.h
-+++ b/freewnn-modewin.h
-@@ -23,7 +23,7 @@
- 
- #include <gtk/gtk.h>
- 
--#include <jllib.h>
-+#include <wnn/jllib.h>
- 
- #include "freewnn-register-win.h"
- #include "freewnn-config.h"
---- a/freewnn-register-win.c
-+++ b/freewnn-register-win.c
-@@ -18,7 +18,7 @@
-  *
-  */
- 
--#include <jllib.h>
-+#include <wnn/jllib.h>
- #include <gtk/gtk.h>
- 
- #include <gdk/gdkkeysyms.h>
---- a/freewnn-register-win.h
-+++ b/freewnn-register-win.h
-@@ -22,7 +22,7 @@
- #define _FREEWNN_REGIST_WIN
- 
- #include <gtk/gtk.h>
--#include <jllib.h>
-+#include <wnn/jllib.h>
- 
- typedef struct _FreeWnnRegisterWin FreeWnnRegisterWin;
- 
---- a/freewnn-utils.h
-+++ b/freewnn-utils.h
-@@ -18,7 +18,7 @@
-  * Boston, MA 02111-1307, USA.
-  */
- 
--#include <jllib.h>
-+#include <wnn/jllib.h>
- #include <glib.h>
- 
- w_char* char2wchar(unsigned char* str);
---- a/im-freewnn.h
-+++ b/im-freewnn.h
-@@ -26,7 +26,7 @@
- 
- #include <gtk/gtk.h>
- #include <gtk/gtkimmodule.h>
--#include <jllib.h>
-+#include <wnn/jllib.h>
- 
- #include "freewnn-modewin.h"
- #include "freewnn-utils.h"
diff --git a/app-i18n/im-freewnn/files/im-freewnn-headers.patch b/app-i18n/im-freewnn/files/im-freewnn-headers.patch
deleted file mode 100644
index 290aee97bd89..000000000000
--- a/app-i18n/im-freewnn/files/im-freewnn-headers.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/freewnn-utils.c
-+++ b/freewnn-utils.c
-@@ -18,6 +18,9 @@
-  * Boston, MA 02111-1307, USA.
-  */
- 
-+#include <stdlib.h>
-+#include <string.h>
-+
- #include "freewnn-utils.h"
- #include "kata2hkata.h"
- 
---- a/im-freewnn.c
-+++ b/im-freewnn.c
-@@ -26,6 +26,7 @@
-  */
- 
- #include <stdio.h>
-+#include <stdlib.h>
- 
- #include <string.h>
- #include "keytable.h"
-@@ -33,6 +34,7 @@
- #include <gdk/gdkkeysyms.h>
- 
- #include "im-freewnn-intl.h"
-+#include "freewnn-utils-ui.h"
- #include "convtable.h"
- #include "im-freewnn.h"
- 
diff --git a/app-i18n/im-freewnn/files/im-freewnn-wnnenvrc.patch b/app-i18n/im-freewnn/files/im-freewnn-wnnenvrc.patch
deleted file mode 100644
index 6b3c70769907..000000000000
--- a/app-i18n/im-freewnn/files/im-freewnn-wnnenvrc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/im-freewnn.c
-+++ b/im-freewnn.c
-@@ -236,7 +236,7 @@
-     return;
-   }
- 
--  jl_set_env_wnnrc(wenv, "/etc/FreeWnn/ja/wnnenvrc", printConfirm, printError);
-+  jl_set_env_wnnrc(wenv, "@GENTOO_PORTAGE_EPREFIX@/usr/lib/wnn/ja_JP/wnnenvrc", printConfirm, printError);
- 
-   cf->modewin = freewnn_modewin_new(cf->wnnbuf, &cf->functable);
-   cf->candwin = candwin_new();
diff --git a/app-i18n/im-freewnn/im-freewnn-0.0.2-r4.ebuild b/app-i18n/im-freewnn/im-freewnn-0.0.2-r4.ebuild
deleted file mode 100644
index 75c8b2d07e01..000000000000
--- a/app-i18n/im-freewnn/im-freewnn-0.0.2-r4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools gnome2-utils prefix
-
-DESCRIPTION="Japanese FreeWnn input method module for GTK+2"
-HOMEPAGE="http://bonobo.gnome.gr.jp/~nakai/immodule/"
-SRC_URI="http://bonobo.gnome.gr.jp/~nakai/immodule/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-RDEPEND="
-	app-i18n/freewnn
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-gentoo.patch
-	"${FILESDIR}"/${PN}-headers.patch
-	"${FILESDIR}"/${PN}-wnnenvrc.patch
-)
-
-src_prepare() {
-	default
-	eprefixify ${PN}.c
-
-	eautoreconf
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_query_immodules_gtk2
-}
-
-pkg_postrm() {
-	gnome2_query_immodules_gtk2
-}
diff --git a/app-i18n/im-freewnn/metadata.xml b/app-i18n/im-freewnn/metadata.xml
deleted file mode 100644
index 491c88b3a31f..000000000000
--- a/app-i18n/im-freewnn/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/app-i18n/kinput2/Manifest b/app-i18n/kinput2/Manifest
deleted file mode 100644
index f612777a01b4..000000000000
--- a/app-i18n/kinput2/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX kinput2-gentoo.patch 2900 BLAKE2B ead35f38fe2aeacdfc9f3b04e72591b0143785b8be74d4be099ab59bc205c0914a15315ff18457dcecf371cbc503bdbfa85c357ddf02e06e2b1f9c543961617b SHA512 22c38c2b344b18f545501e5e351f0952d2b317d05e87ba0630a9fba235e5111e3e269c42388a7495153f6a36a0277798039a35c1968889697b8e97e4e4e5bd4e
-AUX kinput2-headers.patch 2090 BLAKE2B b8c4e443dbf2b6c34020ef93b197c67c7ef67035a9014f47b3ddb0b8736fa149363f1745b789f922c45b370eb1e757c3623255790ec73767d7d30ff5b9dbaa98 SHA512 5f4839155d7d11784716c4c786b09184b04d68deaebd99fa2f446258017a893ad52e23f3df91a8827bfc8d4c238494ffdef9135c0959e7a2377947b96e5b4f7c
-AUX kinput2-ppc.patch 181 BLAKE2B 422c35f38af1e497b2ad012d4b184d4d61bddcd880a6f77052b7cb8d55e32a2ed78e49e4c09abdca35b3477567efdf1224bcc35c769622ad685db4d5bf20c085 SHA512 e5b5e851792668a8f4f15e45dcbf24336310f36c2be5a565dfffd25b58fadef04b92124fc2955342ed05ab467e8bff8fbf9d561a3553d7059155007df877dcde
-AUX kinput2-segfault.patch 240 BLAKE2B e8815bf5a3ca6b19fac492e51dea7faa98d3acacbd02f13cb816355c5f69a65f5618cc59e69b41d39eb32bc52bcc80f0b280ccfa52402e2dc2c96111335071f4 SHA512 c3441925e867edcc5060e79e0f999c0cfe60930d87ad8d51cb4120253dd9ab6ccfac7de0c04e3d7043100026bc67962bba81a507b037901c115a7559916eb1c5
-AUX kinput2-wnn.patch 1726 BLAKE2B 034b74ce8de370d2088dbd77ac61f3268c5b28537619985ed1ad6896d011ddff31c1b9523f38681e8461b935b01239697606f3106cad521e5d1dc55922f1d760 SHA512 a8ea7756ca893b0bdd7d491c8e2a4187c5d34b084c567449597b8fa1d9fb9ae4437bedba9d771a7b88a3e621573ce6650243dfa5ff396bebb653cbf4b6f5712b
-AUX xinput-kinput2 121 BLAKE2B 34d40a7874ee79faff6f602bb32d705efdeac28a3d0a2bf89c68ba8f6e771eacc5878faf8347de171e813384e3bfdb113dcba7229ce1b5ecf6b1a293a6516b00 SHA512 09aaae3bebb062db82e8440977f58b9324e53262c6a9c95a276d305e87a2f9c0f9775077bd05c6ea069cceb6e45cb4efc4a6c412da7501b2b01825bc26799ec5
-DIST kinput2-v3.1.tar.gz 512177 BLAKE2B d67ca132fe3054d862c80b03b4665cdc5f4089745d848f6af9309b5896e0931182bdeefc621fad1cb8f1fd3686b07106cd6df5e703b3623f926cf83d637fa5df SHA512 5950f7294fa2bf915e6591290a3deb2c95f27706f3a180a084d14fbc008f3cf363b155b29c8103a8b999e44ae98182ff35bcfda85725b2c565f3e37f54788731
-EBUILD kinput2-3.1-r3.ebuild 1691 BLAKE2B 69ddeab096fa161a7c0c4eb2f0477db4f9790dd74203a71ea09fe7b6d343543e36678fe6eb896addfa8492e9f6715db3fd7bcd09083f0ee1a75f529f37833c10 SHA512 35bad3ef4cb7b3e3ab39463184630e2737ace8f7d6ac13fc9330ac351f5cdec89e9547de796b433ae061b04fc3ea4f95c414c0ceb65f71900926673c994b114c
-MISC metadata.xml 235 BLAKE2B a3e5a3109b59e3f97ef14f8d55ba13b16dc5371a1b7d6f238230aa4494db32dd4a42e3ee012ec8b18fae394feb2b1b56882bc70504aa7c6b969c1b20140f0ece SHA512 7c4e5f5dea465e45c662f5f53513626088aff514e1326593426af227d77e63d8a00d8af05aa208881a399f83dd41e73cd2ef81c8b7f275a2fa891f295231d67c
diff --git a/app-i18n/kinput2/files/kinput2-gentoo.patch b/app-i18n/kinput2/files/kinput2-gentoo.patch
deleted file mode 100644
index 2c22723b3851..000000000000
--- a/app-i18n/kinput2/files/kinput2-gentoo.patch
+++ /dev/null
@@ -1,99 +0,0 @@
---- a/Kinput2.conf
-+++ b/Kinput2.conf
-@@ -17,8 +17,8 @@
- 
- /* #define UseWnn */	/* define if you are going to use Wnn (v4, v6 or v7) */
- /* #define UseWnn6 */	/* define if you are going to use Wnn6 or above */
--#define UseCanna	/* define if you are going to use Canna */
--#define UseSj3		/* define if you are going to use Sj3 */
-+/* #define UseCanna */	/* define if you are going to use Canna */
-+/* #define UseSj3 */	/* define if you are going to use Sj3 */
- /* #define UseAtok */	/* define if you are going to use Atok */
- 
- 
-@@ -34,7 +34,7 @@
-  * You have to define WnnLibDir if Wnn4 configuration files
-  * are not installed in /usr/local/lib/wnn (which is the default).
-  */
--/* #define WnnLibDir /some/peculiar/directory/wnn */
-+#define WnnLibDir $(EPREFIX)/usr/lib/wnn 
- 
- /* for convenience.. */
- #if defined(UseWnn6) && !defined(UseWnn)
-@@ -52,17 +52,17 @@
-  * WnnLibDir above.
-  */
- XCOMM use installed header files
--XCOMM WNNINCDIR = /usr/X11R6/include/wnn
-+WNNINCDIR = $(EPREFIX)/usr/include/wnn
- XCOMM use installed library
--XCOMM WNNLIB = -lwnn
-+WNNLIB = -lwnn
- 
- /*
-  * Or, use library in the source tree..
-  */
- XCOMM use library in the source tree
--WNNSRC = $(CONTRIBSRC)/programs/Xsi/Wnn
--WNNINCDIR = $(WNNSRC)/include
--WNNLIB = $(WNNSRC)/jlib/libwnn.a
-+XCOMM WNNSRC = $(CONTRIBSRC)/programs/Xsi/Wnn
-+XCOMM WNNINCDIR = $(WNNSRC)/include
-+XCOMM WNNLIB = $(WNNSRC)/jlib/libwnn.a
- 
- 
- XCOMM Canna configuration
-@@ -78,17 +78,17 @@
-  * If you have already installed Canna header files and libraries..
-  */
- XCOMM use installed headers/libraries
--XCOMM CANNAINSTDIR = /usr/local/canna
--XCOMM CANNASRC = $(CANNAINSTDIR)/include
--XCOMM CANNALIB = -lcanna16
-+CANNAINSTDIR = $(EPREFIX)/usr
-+CANNASRC = $(CANNAINSTDIR)/include
-+CANNALIB = -lcanna16
- 
- /*
-  * If you have compiled Canna that came with X11R6 (contrib/programs/Canna),
-  * but not installed yet..
-  */
- XCOMM use headers/libraries in the source tree
--CANNASRC = $(CONTRIBSRC)/programs/Canna32
--CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
-+XCOMM CANNASRC = $(CONTRIBSRC)/programs/Canna32
-+XCOMM CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
- 
- 
- XCOMM SJ3 configuration
-@@ -100,7 +100,7 @@
-  *		   definition files are to be installed
-  */
- 
--SJ3DEF_DIR = $(LIBDIR)/sj3def
-+XCOMM SJ3DEF_DIR = $(LIBDIR)/sj3def
- 
- /*
-  * If you have installed SJ3 library and header file,
-@@ -117,8 +117,8 @@
-  * Use compiled library in the source tree..
-  */
- XCOMM use library in the source tree
--SJ3SRC = $(CONTRIBSRC)/programs/sj3
--SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a
-+XCOMM SJ3SRC = $(CONTRIBSRC)/programs/sj3
-+XCOMM SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a
- 
- 
- XCOMM Atok configuration
-@@ -133,8 +133,8 @@
-  */
- XCOMM use installed headers/libraries
- XCOMM ATOKINCDIR = /usr/include/atok
--XCOMM ATOKLIBDIR = /usr/jp/lib
--ATOKLIB = -latok12n -latok12util
-+XCOMM ATOKLIBDIR = /var/lib/atok
-+XCOMM ATOKLIB = -latok12n -latok12util
- 
- 
- /**
diff --git a/app-i18n/kinput2/files/kinput2-headers.patch b/app-i18n/kinput2/files/kinput2-headers.patch
deleted file mode 100644
index 0075f710e9b6..000000000000
--- a/app-i18n/kinput2/files/kinput2-headers.patch
+++ /dev/null
@@ -1,101 +0,0 @@
---- a/cmd/kinput2.c
-+++ b/cmd/kinput2.c
-@@ -25,6 +25,7 @@
- #endif
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <signal.h>
- #include <X11/Intrinsic.h>
- #include <X11/StringDefs.h>
---- a/lib/Canna.c
-+++ b/lib/Canna.c
-@@ -50,6 +50,7 @@
- static char *rcsid = "$Id: Canna.c,v 1.55 1999/05/25 08:13:03 ishisone Exp $";
- #endif
- 
-+#include <stdlib.h>
- #include <X11/IntrinsicP.h>
- #include <X11/StringDefs.h>
- #include <X11/Xmu/Atoms.h>
---- a/lib/CcWnn.c
-+++ b/lib/CcWnn.c
-@@ -2754,6 +2754,7 @@
-     wchar wbuf[1024];
-     int wlen;
-     int len;
-+    extern int convJWStoCT();
- 
-     TRACE(("CcWnn:saveYomiAndKanji()\n"));
- 
---- a/lib/ConvCtrl.c
-+++ b/lib/ConvCtrl.c
-@@ -18,6 +18,7 @@
-  * Author:  Makoto Ishisone, Software Research Associates, Inc., Japan
-  */
- 
-+#include <stdio.h>
- #include <X11/IntrinsicP.h>
- #include <X11/StringDefs.h>
- #include <X11/Xmu/CharSet.h>
---- a/lib/KIProto.c
-+++ b/lib/KIProto.c
-@@ -18,6 +18,7 @@
-  * Author:  Makoto Ishisone, Software Research Associates, Inc., Japan
-  */
- 
-+#include <stdio.h>
- #include <X11/IntrinsicP.h>
- #include <X11/StringDefs.h>
- #include <X11/Xatom.h>
---- a/lib/XimpProto.c
-+++ b/lib/XimpProto.c
-@@ -18,6 +18,7 @@
-  * Author:  Makoto Ishisone, Software Research Associates, Inc., Japan
-  */
- 
-+#include <stdio.h>
- #include <X11/Xos.h>
- #include <X11/IntrinsicP.h>
- 
---- a/lib/cconv.c
-+++ b/lib/cconv.c
-@@ -604,6 +604,7 @@
- #endif
- 
- #include	<stdio.h>
-+#include	<stdlib.h>
- #include	<X11/Xlib.h>
- #include	<X11/keysym.h>
- #include	<X11/Xutil.h>
---- a/lib/ctext.c
-+++ b/lib/ctext.c
-@@ -71,6 +71,8 @@
- static char *rcsid = "$Id: ctext.c,v 2.6 1999/03/10 08:55:15 ishisone Exp $";
- #endif
- 
-+#include <string.h>
-+
- typedef unsigned short	wchar;
- 
- #define NULL	0
---- a/lib/ioecall.c
-+++ b/lib/ioecall.c
-@@ -23,6 +23,7 @@
-  */
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <X11/Xlib.h>
- #include <X11/Xfuncproto.h>
- #include "IOECall.h"
---- a/lib/wnnlib.c
-+++ b/lib/wnnlib.c
-@@ -578,6 +578,7 @@
- #ifdef DEBUG_WNNLIB
- #include	<stdio.h>
- #endif
-+#include	<stdlib.h>
- #include	"wnnlib.h"
- #include	"WStr.h"
- #include	<string.h>
diff --git a/app-i18n/kinput2/files/kinput2-ppc.patch b/app-i18n/kinput2/files/kinput2-ppc.patch
deleted file mode 100644
index 897b154eb5ac..000000000000
--- a/app-i18n/kinput2/files/kinput2-ppc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmd/kinput2.c
-+++ b/cmd/kinput2.c
-@@ -644,3 +644,8 @@
-     return n;
- }
- #endif
-+
-+#if defined(linux) && defined(PPC)
-+/* avoid nusty gcc bug */
-+void _XtInherit() {}
-+#endif
diff --git a/app-i18n/kinput2/files/kinput2-segfault.patch b/app-i18n/kinput2/files/kinput2-segfault.patch
deleted file mode 100644
index 9b3a83163b4f..000000000000
--- a/app-i18n/kinput2/files/kinput2-segfault.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/lib/imlib/imconv.c
-+++ b/lib/imlib/imconv.c
-@@ -591,6 +591,9 @@
- 	}
-     }
-     IMFinishRequest(conn, offset);
-+    #ifdef STATUS_SYNC
-+	IMFlush(conn);
-+    #endif /* STATUS_SYNC */
- }
- 
- /*- preeditCaret: do actual preedit caret -*/
diff --git a/app-i18n/kinput2/files/kinput2-wnn.patch b/app-i18n/kinput2/files/kinput2-wnn.patch
deleted file mode 100644
index 4e7001938fb2..000000000000
--- a/app-i18n/kinput2/files/kinput2-wnn.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/lib/cconv.c
-+++ b/lib/cconv.c
-@@ -790,7 +790,7 @@
- static int parseLine(uchar *, uchar **, int);
- static FILE *openfile(char *);
- static int doinclude(uchar *, Files *, void (*)());
--static uchar *getline(uchar *, int, Files *, void (*)());
-+static uchar *getLine(uchar *, int, Files *, void (*)());
- static int readRuleFile(ccRule, char *);
- static int registMode(ccRule, int, uchar **);
- static int newMode(ccRule, Files *, _strbufRec *, _funcbufRec *,
-@@ -1035,8 +1035,8 @@
- 	return 0;
- }
- 
--/* getline -- 1$B9TFI$_9~$`(B ($B$=$N:](B include $B$N=hM}$r9T$J$&(B) */
--static uchar *getline(line, linesize, files, efunc)
-+/* getLine -- 1$B9TFI$_9~$`(B ($B$=$N:](B include $B$N=hM}$r9T$J$&(B) */
-+static uchar *getLine(line, linesize, files, efunc)
- uchar *line;
- int linesize;
- Files *files;
-@@ -1100,7 +1100,7 @@
- 	rule->nmode = 0;
- 	rule->initialmode = -1;
- 
--	while (getline(line, sizeof(line), &files, efunc)) {
-+	while (getLine(line, sizeof(line), &files, efunc)) {
- 		(void)Strcpy(tmp, line);
- 		if ((argc = parseLine(tmp, argv, 20)) == 0)
- 			continue;
-@@ -1269,7 +1269,7 @@
- 	cdbuf.cdbuf = NULL;
- 
- 	/* $B%k!<%k$rFI$s$G%9%H%"$9$k(B */
--	while (getline(line, sizeof(line), files, efunc)) {
-+	while (getLine(line, sizeof(line), files, efunc)) {
- 		/* '#' $B$G;O$^$k9T$O%3%a%s%H(B */
- 		if (*line == '\0' || *line == '\n' || *line == '#')
- 			continue;
---- a/lib/wnnlib.c
-+++ b/lib/wnnlib.c
-@@ -1367,7 +1367,7 @@
- 
- 	/* $BJQ49J8;zNs$ND9$5$N%A%'%C%/(B */
- 	clp = buf->clauseInfo + cl;
--	len = jl_kanji_len(buf->wnn, cl);
-+	len = jl_kanji_len(buf->wnn, cl, -1);
- 	diff = len - ((clp + 1)->dispp - clp->dispp);
- 	newlen = (buf->displayEnd - buf->displayBuf) + diff;
- 	if (newlen > buf->bufferSize) {
diff --git a/app-i18n/kinput2/files/xinput-kinput2 b/app-i18n/kinput2/files/xinput-kinput2
deleted file mode 100644
index dcb3b63330ac..000000000000
--- a/app-i18n/kinput2/files/xinput-kinput2
+++ /dev/null
@@ -1,5 +0,0 @@
-XIM=kinput2
-XIM_PROGRAM="@EPREFIX@/usr/bin/kinput2"
-XIM_ARGS="-@SERVER@ +kinput -xim"
-GTK_IM_MODULE=xim
-QT_IM_MODULE=xim
diff --git a/app-i18n/kinput2/kinput2-3.1-r3.ebuild b/app-i18n/kinput2/kinput2-3.1-r3.ebuild
deleted file mode 100644
index 2420751e6974..000000000000
--- a/app-i18n/kinput2/kinput2-3.1-r3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit toolchain-funcs
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="A Japanese input server which supports the XIM protocol"
-HOMEPAGE="http://www.nec.co.jp/canna"
-SRC_URI="ftp://ftp.sra.co.jp/pub/x11/${PN}/${MY_P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="app-i18n/freewnn
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/gcc
-	x11-misc/gccmakedep
-	>=x11-misc/imake-1.0.8-r1"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-gentoo.patch
-	"${FILESDIR}"/${PN}-headers.patch
-	"${FILESDIR}"/${PN}-ppc.patch
-	"${FILESDIR}"/${PN}-segfault.patch
-	"${FILESDIR}"/${PN}-wnn.patch
-)
-DOCS=( README NEWS doc/. )
-
-src_prepare() {
-	default
-	sed -i "s|^/\* \(#define UseWnn\) \*/|\1|" ${PN^k}.conf || die
-}
-
-src_configure() {
-	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
-		IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf -a || die
-}
-
-src_compile() {
-	emake \
-		AR="$(tc-getAR) cq" \
-		CC="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		CDEBUGFLAGS="${CFLAGS}" \
-		LOCAL_LDFLAGS="${LDFLAGS}" \
-		XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults"
-}
-
-src_install() {
-	emake \
-		XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults" \
-		DESTDIR="${D}" \
-		install
-	einstalldocs
-	newman cmd/${PN}.man ${PN}.1
-
-	rm -rf "${ED}"/usr/$(get_libdir)/X11
-
-	insinto /etc/X11/xinit/xinput.d
-	sed \
-		-e "s:@EPREFIX@:${EPREFIX}:g" \
-		-e "s:@SERVER@:wnn:g" \
-		"${FILESDIR}"/xinput-${PN} >"${T}"/${PN}.conf || die
-	doins "${T}"/${PN}.conf
-}
diff --git a/app-i18n/kinput2/metadata.xml b/app-i18n/kinput2/metadata.xml
deleted file mode 100644
index a94766977fa6..000000000000
--- a/app-i18n/kinput2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cjk@gentoo.org</email>
-		<name>Cjk</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-i18n/libime/Manifest b/app-i18n/libime/Manifest
index ccba8898992b..7e1227eea90e 100644
--- a/app-i18n/libime/Manifest
+++ b/app-i18n/libime/Manifest
@@ -1,3 +1,5 @@
+AUX libime-1.1.8-include-cstdint-for-gcc-15.patch 288 BLAKE2B 35d297ee4fab9c0490344bea7a24a18ecc23e7c96d8c9af875bcf9c1fc6edd87ccaf6e3ee1d681611b42c62b7a1d3525398a29122927ced58cd02aefce61fbdd SHA512 0d9dcd044ee6056c4759fb27e9c3f8958659ebc1611000fd23c80969477077944e82ff4691141ade0a7c05eec02887c7987aad12d588bc7940744e8fd9dd0338
 DIST libime-1.1.8_dict.tar.zst 37061630 BLAKE2B e76ee4d403bdc2ef9c9eab663f6da3f1421d5aeb7761a1ccca21acf07626f27a9f00c0a8d83cf121a782c03252bd5f0aeccb81af639ca93902bb28716a1a3afb SHA512 5fa6683dcaa92d754b87ed01989a7a98eee9d4ee642720b1ac1b0b58416a6202ca929e2593dfe59ae361afb7d311d8e238a188530ba99db7aaa3164713c95a4a
+EBUILD libime-1.1.8-r1.ebuild 1012 BLAKE2B 396b5904781a6312d26d5b7d6c57e6be811ffbf90f50bc97f49449519bc6f3cfc9086c29a20634e05dd08f38d148ae0c2ceb9a4272a1ed3c65d3e4ef6b5709d2 SHA512 7862b4cfdd019d8e9012204a9692e9b917dcdbc5df7accda1aa5cb04882bb2369f1cb4f30100ee8cd15a3c24e7d66dce402ac26177e8be1d3650ffc334933829
 EBUILD libime-1.1.8.ebuild 944 BLAKE2B cdc1d8a2f2c03cf04c6b297f0d1044eb0a4dceafbe6e5c7f9539d5aaf513b252bc746e3fbda75bae4790a4d6a4893cf106c55f0eee125b054f02c6d6da883865 SHA512 bed8b43adcf579ba70f54b713d55aef30530c776c8524662fda1661ab9a29970236a98f567c60e01ac0005fd171c86f7ba84e704b90e7e80540bef9e8374cb53
 MISC metadata.xml 624 BLAKE2B 7c0e1d29bf86d256ac8ace1404f3ef8e017171cf461f861b2b681c9bb6c7c3bb639b13cbdccc506a07805ea9e23f449e22bba1ac16d3f40ecdd10b894ea0632d SHA512 8449b74e190a0acf83f4e5b0c0ed023e5a37e203a4e514074b9e8165616c43659d993e165bb170aa8902865166a7ceaf65bec04645be7b1390ddc80c2e43066a
diff --git a/app-i18n/libime/files/libime-1.1.8-include-cstdint-for-gcc-15.patch b/app-i18n/libime/files/libime-1.1.8-include-cstdint-for-gcc-15.patch
new file mode 100644
index 000000000000..46221b19c5fc
--- /dev/null
+++ b/app-i18n/libime/files/libime-1.1.8-include-cstdint-for-gcc-15.patch
@@ -0,0 +1,12 @@
+https://github.com/fcitx/libime/pull/78
+
+--- a/src/libime/table/autophrasedict.h
++++ b/src/libime/table/autophrasedict.h
+@@ -8,6 +8,7 @@
+ 
+ #include "libimetable_export.h"
+ #include <cstddef>
++#include <cstdint>
+ #include <fcitx-utils/macros.h>
+ #include <functional>
+ #include <istream>
diff --git a/app-i18n/libime/libime-1.1.8-r1.ebuild b/app-i18n/libime/libime-1.1.8-r1.ebuild
new file mode 100644
index 000000000000..2b77704e6cb8
--- /dev/null
+++ b/app-i18n/libime/libime-1.1.8-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake unpacker
+
+DESCRIPTION="Fcitx5 Next generation of fcitx "
+HOMEPAGE="https://fcitx-im.org/"
+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"
+IUSE="+data doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-i18n/fcitx-5.1.5:5
+	app-arch/zstd:=
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	kde-frameworks/extra-cmake-modules:0
+	virtual/pkgconfig
+	doc? (
+		app-text/doxygen
+		dev-texlive/texlive-fontutils
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-include-cstdint-for-gcc-15.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DATA=$(usex data)
+		-DENABLE_DOC=$(usex doc)
+		-DENABLE_TEST=$(usex test)
+	)
+	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/*
+}