summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-i18n')
-rw-r--r--app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild2
-rw-r--r--app-i18n/fcitx-libpinyin/Manifest1
-rw-r--r--app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.4.ebuild74
-rw-r--r--app-i18n/fcitx-qt5/files/fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch4
-rw-r--r--app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild2
-rw-r--r--app-i18n/fcitx-sunpinyin/Manifest1
-rw-r--r--app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild42
-rw-r--r--app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild42
-rw-r--r--app-i18n/fcitx-sunpinyin/metadata.xml15
-rw-r--r--app-i18n/fcitx/files/fcitx-4.2.9.8-enchant.patch4
-rw-r--r--app-i18n/fcitx/files/fcitx-4.2.9.8-xkb.patch4
-rw-r--r--app-i18n/ibus-anthy/ibus-anthy-1.5.14.ebuild4
-rw-r--r--app-i18n/ibus-cangjie/ibus-cangjie-2.4-r2.ebuild4
-rw-r--r--app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117-r1.ebuild (renamed from app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117.ebuild)7
-rw-r--r--app-i18n/ibus-chewing/metadata.xml3
-rw-r--r--app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild4
-rw-r--r--app-i18n/ibus-kkc/Manifest1
-rw-r--r--app-i18n/ibus-kkc/ibus-kkc-1.5.22_p20170607.ebuild38
-rw-r--r--app-i18n/ibus-kkc/metadata.xml11
-rw-r--r--app-i18n/ibus-libpinyin/Manifest1
-rw-r--r--app-i18n/ibus-libpinyin/ibus-libpinyin-1.12.1.ebuild4
-rw-r--r--app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.0.ebuild4
-rw-r--r--app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1.ebuild69
-rw-r--r--app-i18n/ibus-m17n/Manifest4
-rw-r--r--app-i18n/ibus-m17n/ibus-m17n-1.4.13.ebuild45
-rw-r--r--app-i18n/ibus-m17n/ibus-m17n-1.4.17.ebuild45
-rw-r--r--app-i18n/ibus-m17n/ibus-m17n-1.4.18.ebuild (renamed from app-i18n/ibus-m17n/ibus-m17n-1.4.10.ebuild)2
-rw-r--r--app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r5.ebuild4
-rw-r--r--app-i18n/ibus-sunpinyin/Manifest1
-rw-r--r--app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-2.0.4_pre20200306162733-python-3.patch85
-rw-r--r--app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild89
-rw-r--r--app-i18n/ibus-sunpinyin/metadata.xml14
-rw-r--r--app-i18n/ibus-table-others/Manifest2
-rw-r--r--app-i18n/ibus-table-others/ibus-table-others-1.3.14.ebuild (renamed from app-i18n/ibus-table-others/ibus-table-others-1.3.13.ebuild)2
-rw-r--r--app-i18n/ibus-table/Manifest3
-rw-r--r--app-i18n/ibus-table/ibus-table-1.16.12.ebuild55
-rw-r--r--app-i18n/ibus-table/ibus-table-1.16.14.ebuild (renamed from app-i18n/ibus-table/ibus-table-1.16.11.ebuild)4
-rw-r--r--app-i18n/ibus-typing-booster/Manifest5
-rw-r--r--app-i18n/ibus-typing-booster/ibus-typing-booster-2.19.10.ebuild (renamed from app-i18n/ibus-typing-booster/ibus-typing-booster-2.18.9.ebuild)4
-rw-r--r--app-i18n/ibus-typing-booster/ibus-typing-booster-2.19.13.ebuild (renamed from app-i18n/ibus-typing-booster/ibus-typing-booster-2.19.0.ebuild)4
-rw-r--r--app-i18n/ibus-typing-booster/ibus-typing-booster-2.20.0.ebuild54
-rw-r--r--app-i18n/ibus/ibus-1.5.26-r1.ebuild4
-rw-r--r--app-i18n/ibus/ibus-1.5.27.ebuild7
-rw-r--r--app-i18n/imsettings/imsettings-1.8.2-r1.ebuild (renamed from app-i18n/imsettings/imsettings-1.8.2.ebuild)5
-rw-r--r--app-i18n/imsettings/metadata.xml1
-rw-r--r--app-i18n/kcc/files/kcc-1.0-clang16.patch19
-rw-r--r--app-i18n/kcc/kcc-1.0.ebuild18
-rw-r--r--app-i18n/libkkc-data/Manifest1
-rw-r--r--app-i18n/libkkc-data/files/libkkc-data-python3.patch138
-rw-r--r--app-i18n/libkkc-data/libkkc-data-0.2.7.ebuild20
-rw-r--r--app-i18n/libkkc-data/metadata.xml11
-rw-r--r--app-i18n/libkkc/Manifest1
-rw-r--r--app-i18n/libkkc/files/libkkc-marisa-glib.patch23
-rw-r--r--app-i18n/libkkc/libkkc-0.3.5_p20210928.ebuild68
-rw-r--r--app-i18n/libkkc/libkkc-9999.ebuild68
-rw-r--r--app-i18n/libkkc/metadata.xml15
-rw-r--r--app-i18n/libpinyin/libpinyin-2.6.2.ebuild2
-rw-r--r--app-i18n/librime/files/librime-1.6.0-boost-1.76.patch8
-rw-r--r--app-i18n/librime/librime-1.7.3-r1.ebuild2
-rw-r--r--app-i18n/man-pages-l10n/Manifest2
-rw-r--r--app-i18n/man-pages-l10n/man-pages-l10n-4.12.1-r2.ebuild88
-rw-r--r--app-i18n/man-pages-l10n/man-pages-l10n-4.17.0.ebuild84
-rw-r--r--app-i18n/mozc/files/mozc-2.26.4220-environmental_variables.patch4
-rw-r--r--app-i18n/mozc/files/mozc-2.26.4220-server_path_check.patch4
-rw-r--r--app-i18n/mozc/files/mozc-2.26.4220-system_abseil-cpp.patch32
-rw-r--r--app-i18n/mozc/files/mozc-2.26.4220-system_gtest.patch8
-rw-r--r--app-i18n/mozc/files/mozc-2.26.4220-system_jsoncpp.patch12
-rw-r--r--app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild4
-rw-r--r--app-i18n/mozc/mozc-9999.ebuild380
-rw-r--r--app-i18n/nabi/Manifest1
-rw-r--r--app-i18n/nabi/nabi-1.0.1.ebuild62
-rw-r--r--app-i18n/nkf/files/nkf-2.1.5-python-ssize_t-deux.patch45
-rw-r--r--app-i18n/nkf/files/nkf-2.1.5-python-ssize_t.patch71
-rw-r--r--app-i18n/nkf/metadata.xml2
-rw-r--r--app-i18n/nkf/nkf-2.1.5-r1.ebuild115
-rw-r--r--app-i18n/nkf/nkf-2.1.5.ebuild4
-rw-r--r--app-i18n/opencc/opencc-1.1.4.ebuild4
-rw-r--r--app-i18n/opencc/opencc-9999.ebuild4
-rw-r--r--app-i18n/pyzy/pyzy-0.1.0-r3.ebuild4
-rw-r--r--app-i18n/rime-data/rime-data-0.38.20180515.ebuild2
-rw-r--r--app-i18n/scim-sunpinyin/Manifest1
-rw-r--r--app-i18n/scim-sunpinyin/metadata.xml14
-rw-r--r--app-i18n/scim-sunpinyin/scim-sunpinyin-3.0.0_rc1.ebuild41
-rw-r--r--app-i18n/scim/scim-1.4.18.ebuild4
-rw-r--r--app-i18n/skk-jisyo/skk-jisyo-202005.ebuild2
-rw-r--r--app-i18n/skk-jisyo/skk-jisyo-999999.ebuild2
-rw-r--r--app-i18n/skkfep/skkfep-0.87-r1.ebuild6
-rw-r--r--app-i18n/skktools/skktools-1.3.4-r1.ebuild (renamed from app-i18n/skktools/skktools-1.3.4.ebuild)14
-rw-r--r--app-i18n/sunpinyin-data/Manifest2
-rw-r--r--app-i18n/sunpinyin-data/metadata.xml11
-rw-r--r--app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild45
-rw-r--r--app-i18n/sunpinyin/Manifest1
-rw-r--r--app-i18n/sunpinyin/metadata.xml11
-rw-r--r--app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild64
-rw-r--r--app-i18n/transifex-client/Manifest8
-rw-r--r--app-i18n/transifex-client/transifex-client-1.4.1.ebuild (renamed from app-i18n/transifex-client/transifex-client-1.3.0.ebuild)0
-rw-r--r--app-i18n/transifex-client/transifex-client-1.6.4.ebuild (renamed from app-i18n/transifex-client/transifex-client-1.3.1.ebuild)0
-rw-r--r--app-i18n/uim/files/uim-clang-16-configure.patch42
-rw-r--r--app-i18n/uim/uim-1.8.9-r1.ebuild246
-rw-r--r--app-i18n/unicode-cldr/Manifest1
-rw-r--r--app-i18n/unicode-cldr/unicode-cldr-42.0.ebuild22
-rw-r--r--app-i18n/unicode-data/unicode-data-15.0.0.ebuild2
-rw-r--r--app-i18n/unicode-emoji/Manifest5
-rw-r--r--app-i18n/unicode-emoji/unicode-emoji-15.0.ebuild34
-rw-r--r--app-i18n/xsunpinyin/Manifest1
-rw-r--r--app-i18n/xsunpinyin/metadata.xml11
-rw-r--r--app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild76
-rw-r--r--app-i18n/xvnkb/xvnkb-0.2.11.ebuild4
-rw-r--r--app-i18n/yaskkserv2/Manifest7
-rw-r--r--app-i18n/yaskkserv2/yaskkserv2-0.1.3.ebuild220
-rw-r--r--app-i18n/yaskkserv2/yaskkserv2-0.1.5.ebuild2
111 files changed, 1073 insertions, 1932 deletions
diff --git a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild
index 23e8cb10360..4888a98e0b5 100644
--- a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild
+++ b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild
@@ -21,7 +21,7 @@ fi
LICENSE="GPL-2+"
SLOT="4"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
IUSE=""
BDEPEND="virtual/pkgconfig"
diff --git a/app-i18n/fcitx-libpinyin/Manifest b/app-i18n/fcitx-libpinyin/Manifest
index c20e8286086..6c2928452c7 100644
--- a/app-i18n/fcitx-libpinyin/Manifest
+++ b/app-i18n/fcitx-libpinyin/Manifest
@@ -1,2 +1,3 @@
DIST fcitx-data-model.text.20161206.tar.gz 15099931 BLAKE2B 80e6a6fe5109011d6ea8683658d3fa89fc00e9dacfd140da3e993afc7db088c445da636797fbdac416e70119d37d47bdb0cb18d3865cebb397dbaa8a3055d703 SHA512 26450e347b7a211e5abd94acbb9befc8cee7d8fc20e5161ef11b8b9b1ad47cde4f1add5c41484d9af04e4dde2aa748090e297e799ee7f6d2f9fcec3873eee429
DIST fcitx-libpinyin-0.5.3_dict.tar.xz 15149856 BLAKE2B 35297477b3a4df9152162b8ad57d536333c5007510f387323d03e862901f17bb337504f20e6edc8d48e338916a6c4543900974027b60f7e87b0005f836677d29 SHA512 d132e0c007bd62286cfa89f6605a5315b6f5ae94a75bdd389fff1061e1547ad64c615fb0b75189d8cf35fa289a53e5d485911e06e368b2bf3af7b5a996fcd08a
+DIST fcitx-libpinyin-0.5.4_dict.tar.xz 15148952 BLAKE2B 1f6d3d4d334eafd24799b2bd6df9ad42318b819b8989600f0b89992640e45cd660e3b2c4e5c857c5ddccd7893182c41d6f7599a48a70129807922812e6ee9d7d SHA512 e91dbcb42bbaa74320ad593918c3c86cc6f6bc209f3f0fee2f8870c4fb86ecbf3c9f17618b8c8b29db67771fe54ffcffc79c62545299037dc623146e6073b2e1
diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.4.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.4.ebuild
new file mode 100644
index 00000000000..0a95023976d
--- /dev/null
+++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2012-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake xdg-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx-libpinyin"
+fi
+
+DESCRIPTION="Chinese LibPinyin input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-libpinyin"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+ SRC_URI="https://download.fcitx-im.org/data/model.text.20161206.tar.gz -> fcitx-data-model.text.20161206.tar.gz"
+else
+ SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
+fi
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="dictionary-manager"
+
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
+ >=app-i18n/libpinyin-2.1.0
+ virtual/pkgconfig
+ dictionary-manager? (
+ >=dev-qt/qtcore-5.7:5
+ >=dev-qt/qtwidgets-5.7:5
+ )"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
+ >=app-i18n/libpinyin-2.1.0:=
+ dev-libs/glib:2
+ sys-apps/dbus
+ virtual/libintl
+ dictionary-manager? (
+ >=app-i18n/fcitx-qt5-1.1:4
+ >=dev-qt/qtcore-5.7:5
+ >=dev-qt/qtdbus-5.7:5
+ >=dev-qt/qtgui-5.7:5
+ >=dev-qt/qtnetwork-5.7:5
+ >=dev-qt/qtwebengine-5.7:5[widgets]
+ >=dev-qt/qtwidgets-5.7:5
+ )"
+RDEPEND="${DEPEND}"
+
+DOCS=(AUTHORS)
+
+src_prepare() {
+ if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+ ln -s "${DISTDIR}/fcitx-data-model.text.20161206.tar.gz" data/model.text.20161206.tar.gz || die
+ fi
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_QT=$(usex dictionary-manager)
+ )
+
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/app-i18n/fcitx-qt5/files/fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch b/app-i18n/fcitx-qt5/files/fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch
index f3e31991b53..385abd8495a 100644
--- a/app-i18n/fcitx-qt5/files/fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch
+++ b/app-i18n/fcitx-qt5/files/fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch
@@ -1,7 +1,7 @@
https://github.com/fcitx/fcitx-qt5/commit/6f2033c497fe0da1fd197bc3be35695b11eafd93
---- /platforminputcontext/qfcitxplatforminputcontext.cpp
-+++ /platforminputcontext/qfcitxplatforminputcontext.cpp
+--- a/platforminputcontext/qfcitxplatforminputcontext.cpp
++++ b/platforminputcontext/qfcitxplatforminputcontext.cpp
@@ -291,8 +291,21 @@
return;
}
diff --git a/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild b/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
index 18b40399bbf..06a5ed3da01 100644
--- a/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
+++ b/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
@@ -21,7 +21,7 @@ fi
LICENSE="GPL-2"
SLOT="4"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
IUSE=""
BDEPEND=">=app-i18n/fcitx-4.2.9:4
diff --git a/app-i18n/fcitx-sunpinyin/Manifest b/app-i18n/fcitx-sunpinyin/Manifest
deleted file mode 100644
index 1b6c4fb3a44..00000000000
--- a/app-i18n/fcitx-sunpinyin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fcitx-sunpinyin-0.4.2.tar.xz 42984 BLAKE2B 1f64d96d35c6f455be15a56eb065d97a988f671d40392a3ea3e96fc53b22cf048cff61f406d0e001cc7cfe531a8dc5508ef7862c17253b409330ac2d0af52f7c SHA512 8ade5d94e5227c0b72d2844c09c2699e4b8c66cecbd4107791168d27e15f68b28a4445bf42df7bd6fb44119ec42c5b574293bb417dcde8998578f0debd656a2a
diff --git a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild
deleted file mode 100644
index f42e0fcb150..00000000000
--- a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2010-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit cmake xdg-utils
-
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/fcitx/fcitx-sunpinyin"
-fi
-
-DESCRIPTION="Chinese SunPinyin input method for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-sunpinyin"
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
- SRC_URI=""
-else
- SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2+"
-SLOT="4"
-KEYWORDS="amd64 ppc ppc64 ~riscv x86"
-IUSE=""
-
-BDEPEND="virtual/pkgconfig"
-DEPEND=">=app-i18n/fcitx-4.2.9:4
- >=app-i18n/sunpinyin-2.0.4_alpha:=
- virtual/libintl"
-RDEPEND="${DEPEND}
- app-i18n/sunpinyin-data"
-
-DOCS=(AUTHORS)
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild
deleted file mode 100644
index 3a652f5a19c..00000000000
--- a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2010-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit cmake xdg-utils
-
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/fcitx/fcitx-sunpinyin"
-fi
-
-DESCRIPTION="Chinese SunPinyin input method for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-sunpinyin"
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
- SRC_URI=""
-else
- SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2+"
-SLOT="4"
-KEYWORDS=""
-IUSE=""
-
-BDEPEND="virtual/pkgconfig"
-DEPEND=">=app-i18n/fcitx-4.2.9:4
- >=app-i18n/sunpinyin-2.0.4_alpha:=
- virtual/libintl"
-RDEPEND="${DEPEND}
- app-i18n/sunpinyin-data"
-
-DOCS=(AUTHORS)
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/app-i18n/fcitx-sunpinyin/metadata.xml b/app-i18n/fcitx-sunpinyin/metadata.xml
deleted file mode 100644
index 374486963ca..00000000000
--- a/app-i18n/fcitx-sunpinyin/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>arfrever.fta@gmail.com</email>
- <name>Arfrever Frehtes Taifersar Arahesis</name>
- </maintainer>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <upstream>
- <remote-id type="github">fcitx/fcitx-sunpinyin</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-i18n/fcitx/files/fcitx-4.2.9.8-enchant.patch b/app-i18n/fcitx/files/fcitx-4.2.9.8-enchant.patch
index f152f1dc6e5..25b4fc1d12a 100644
--- a/app-i18n/fcitx/files/fcitx-4.2.9.8-enchant.patch
+++ b/app-i18n/fcitx/files/fcitx-4.2.9.8-enchant.patch
@@ -1,7 +1,7 @@
https://github.com/fcitx/fcitx/issues/475
---- /cmake/FindEnchant.cmake
-+++ /cmake/FindEnchant.cmake
+--- a/cmake/FindEnchant.cmake
++++ b/cmake/FindEnchant.cmake
@@ -16,15 +16,15 @@
endif(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
diff --git a/app-i18n/fcitx/files/fcitx-4.2.9.8-xkb.patch b/app-i18n/fcitx/files/fcitx-4.2.9.8-xkb.patch
index e21c3a1db7e..dbb82afa744 100644
--- a/app-i18n/fcitx/files/fcitx-4.2.9.8-xkb.patch
+++ b/app-i18n/fcitx/files/fcitx-4.2.9.8-xkb.patch
@@ -1,7 +1,7 @@
https://github.com/fcitx/fcitx/issues/250
---- /CMakeLists.txt
-+++ /CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
@@ -96,12 +96,15 @@
endif()
endif()
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.14.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.14.ebuild
index 1627d81dac2..f3ea48dfeb8 100644
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.14.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.14.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
inherit autotools gnome2-utils python-single-r1 xdg
diff --git a/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r2.ebuild b/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r2.ebuild
index a6331c5ecb4..24b29d6dec6 100644
--- a/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r2.ebuild
+++ b/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
inherit autotools gnome2-utils python-r1 xdg
DESCRIPTION="Chinese Cangjie and Quick engines for IBus"
diff --git a/app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117.ebuild b/app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117-r1.ebuild
index 85e9e8c0e86..08958e1c6e4 100644
--- a/app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117.ebuild
+++ b/app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117-r1.ebuild
@@ -16,14 +16,13 @@ SRC_URI="https://github.com/definite/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="gconf nls"
+IUSE="nls"
RDEPEND="app-i18n/ibus
app-i18n/libchewing
dev-libs/glib:2
x11-libs/gtk+:3
x11-libs/libX11
- gconf? ( gnome-base/gconf )
nls? ( virtual/libintl )"
DEPEND="${RDEPEND}"
BDEPEND="dev-util/cmake-fedora
@@ -38,6 +37,8 @@ DOCS=( AUTHORS ChangeLog README.md RELEASE-NOTES.txt USER-GUIDE )
src_configure() {
local mycmakeargs=(
+ -DGCONF2_SUPPORT=OFF
+ -DGSETTINGS_SUPPORT=ON
-DMANAGE_DEPENDENCY_PACKAGE_EXISTS_CMD=false
-DPRJ_DOC_DIR="${EPREFIX}"/usr/share/doc/${PF}
)
@@ -54,12 +55,10 @@ src_test() {
}
pkg_preinst() {
- use gconf && gnome2_gconf_savelist
gnome2_schemas_savelist
}
pkg_postinst() {
- use gconf && gnome2_gconf_install
gnome2_schemas_update
}
diff --git a/app-i18n/ibus-chewing/metadata.xml b/app-i18n/ibus-chewing/metadata.xml
index cf7f054fe39..2fc61b76269 100644
--- a/app-i18n/ibus-chewing/metadata.xml
+++ b/app-i18n/ibus-chewing/metadata.xml
@@ -5,9 +5,6 @@
<email>cjk@gentoo.org</email>
<name>Cjk</name>
</maintainer>
- <use>
- <flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag>
- </use>
<upstream>
<remote-id type="github">definite/ibus-chewing</remote-id>
</upstream>
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
index 57c4f12e5c6..3209f64fea7 100644
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
inherit gnome2-utils python-single-r1 xdg virtualx
diff --git a/app-i18n/ibus-kkc/Manifest b/app-i18n/ibus-kkc/Manifest
deleted file mode 100644
index 8462b3787af..00000000000
--- a/app-i18n/ibus-kkc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ibus-kkc-1.5.22_p20170607.tar.gz 55162 BLAKE2B 9d34a7da99a1792cad9ca1b82665b8008a2b11c7e09cdce7e0a5e9d0e9d482798a1facaf8d35e3daa296638383c267af70ae00d50b2c601b66895a0b1c8d2817 SHA512 519be83e17d9556c6839ecad2af4a46665a6aafd0f8072f4c1d2c8af33eb3ac814517b5b42513b898afe86ededf35b9082b9a1fb2a699dcb88757b159d5b74cf
diff --git a/app-i18n/ibus-kkc/ibus-kkc-1.5.22_p20170607.ebuild b/app-i18n/ibus-kkc/ibus-kkc-1.5.22_p20170607.ebuild
deleted file mode 100644
index a7cb005d4f3..00000000000
--- a/app-i18n/ibus-kkc/ibus-kkc-1.5.22_p20170607.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools vala vcs-snapshot
-
-EGIT_COMMIT="f7516ae20cb648cd8b0904aec5853d3a3d2611c4"
-
-DESCRIPTION="Japanese Kana Kanji conversion engine for IBus"
-HOMEPAGE="https://github.com/ueno/ibus-kkc"
-SRC_URI="https://github.com/ueno/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-DEPEND="app-i18n/ibus
- app-i18n/libkkc
- x11-libs/gtk+:3
- nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
- app-i18n/skk-jisyo"
-BDEPEND="$(vala_depend)
- dev-util/intltool
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-src_prepare() {
- vala_src_prepare
- default
- eautoreconf
-}
-
-src_configure() {
- econf $(use_enable nls)
-}
diff --git a/app-i18n/ibus-kkc/metadata.xml b/app-i18n/ibus-kkc/metadata.xml
deleted file mode 100644
index 74de0fde210..00000000000
--- a/app-i18n/ibus-kkc/metadata.xml
+++ /dev/null
@@ -1,11 +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>
- <upstream>
- <remote-id type="github">ueno/ibus-kkc</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-i18n/ibus-libpinyin/Manifest b/app-i18n/ibus-libpinyin/Manifest
index 3d6a1194140..31d4ac917bb 100644
--- a/app-i18n/ibus-libpinyin/Manifest
+++ b/app-i18n/ibus-libpinyin/Manifest
@@ -1,2 +1,3 @@
DIST ibus-libpinyin-1.12.1.tar.gz 1766803 BLAKE2B 1de8a51b52688dede32c572b39bd379296480ab2b0f909357465370e346bdf50f4cade5ab3f105f62a74e59cf2dc5e8d5235aedde7571b70d3c5dcee86d2e36b SHA512 ad6e7507bdb468d506071135449383e5bd4fc878bcffda4be6e4e7915b79dbaf919d2fa941b92b177dc7790bd895eaa9a6d04a2610f85e1e80e8eb50f188211d
DIST ibus-libpinyin-1.13.0.tar.gz 1726869 BLAKE2B f18ae81edb4ebf18f569fc13f3088f32e57c6a4512f7cafb33a18fdb08d5fdcdb17ff1861c3419db3063808f655510f6f4de63c274d798c48731ac4632203ba6 SHA512 8eca89c3c71ada37ec93307556fc476ad8719e58ca828f684dff6e74e1cb91df3e8c8ce03c87dbb72d5b7213e7c7ca367da8cf6b1dddb47d63afdf23d53bc54c
+DIST ibus-libpinyin-1.13.1.tar.gz 1726900 BLAKE2B 2540b5ca6657fe421f6f2986f32fba1b8840cafcc37b3ec5402705cb0edc0aac6b12d972b5da0326339a04c875dbd8f8cce902f613558f3f9d21b4a0cace31a3 SHA512 ee3a8c95e091992acb0558ff297743eb49bd8c73fbb9cd1f2b56db75137573dda2c677b1b25eb213fbd8779be004b06f95cded04273d7a469cf49f45cc27813a
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.12.1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.12.1.ebuild
index bab2264047a..b7af5906e50 100644
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.12.1.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.12.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2015-2022 Gentoo Authors
+# Copyright 2015-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
inherit autotools gnome2-utils lua-single python-single-r1
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.0.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.0.ebuild
index 7f8fdf0ab76..f2661fb0843 100644
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.0.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2015-2022 Gentoo Authors
+# Copyright 2015-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
inherit autotools gnome2-utils lua-single python-single-r1
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1.ebuild
new file mode 100644
index 00000000000..f2661fb0843
--- /dev/null
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2015-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+LUA_COMPAT=( lua5-{1..3} )
+PYTHON_COMPAT=( python3_{9..10} )
+
+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
+ virtual/pkgconfig"
+
+DEPEND="${PYTHON_DEPS}
+ >=app-i18n/libpinyin-2.2.1:=
+ 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-m17n/Manifest b/app-i18n/ibus-m17n/Manifest
index 293f417eaed..81899115b72 100644
--- a/app-i18n/ibus-m17n/Manifest
+++ b/app-i18n/ibus-m17n/Manifest
@@ -1,3 +1 @@
-DIST ibus-m17n-1.4.10.tar.gz 642940 BLAKE2B f00b4392925a6ad24e5cbfc266d13a68e4b7641a4f70c93bb381d4bea13d03b40af659e2ba27533ce7514477aed2744eaac0b1aa25d7c4280fda8adf1ee5dde7 SHA512 7e8ab477de7fb75fbbcdd25d6f13b0dc1fdaae6ab23a2c5c18de7eadcd88c3ff4d441a32f58d4b4bde0d20685d45dd57fa24c5e61361ad5b6bbb29075949d396
-DIST ibus-m17n-1.4.13.tar.gz 646334 BLAKE2B 1fac0920adde05977e9f3f3993a17a8257992f493272c71a56f6b946d89245cc9353e20275a2bda94d6a627d0afc9a71aff0d1edba42c2ee8bbe4ce6ea962852 SHA512 5753a8c1888a2fefa87986d7396d3ad56e3e1109c0dd01fadcaf1e7a7a056dc45323d204f9b5a548900752e1bfc69d638076f51884a8948fa5ba16c7a17d5640
-DIST ibus-m17n-1.4.17.tar.gz 646856 BLAKE2B e2a1c93afa5adf76689a6883b5b2a08a8ebc4f122ae484797df9ae9fd220023c188a894789069f83ba598a321e3d6c89045f278f1b1f51988c34728e005ba5cd SHA512 794dfce969f447354a092758d20999637e3d0a1006f8e078845ae3e79b63b7a467f9f28a7bdeeac4f4709d6750e7156efbc3d341bfa574ac7002266d0dce2b95
+DIST ibus-m17n-1.4.18.tar.gz 639501 BLAKE2B 73881d77f08433052ef1c9dd6706febae6f351287ab0ea9beb47078292224ccaab51d930ca178db245870d0a3639a54cca0dc15bf59fd320f3ac9c39d433f2a5 SHA512 4960301ee2a4b10a8ca3c618df1a9f5acabce89da662c80bc39520d1b4b2a6e0b487f85c6e513ba174addc7b8ae349b3cb799f4925abfc20c8ac1ef1b8678540
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.13.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.13.ebuild
deleted file mode 100644
index 1466a2deebf..00000000000
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.13.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="M17N engine for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk nls"
-
-DEPEND="app-i18n/ibus
- dev-libs/m17n-lib
- gtk? ( x11-libs/gtk+:3 )
- nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
- >=dev-db/m17n-db-1.7"
-BDEPEND="sys-devel/gettext
- virtual/pkgconfig"
-
-src_configure() {
- econf \
- $(use_enable nls) \
- $(use_with gtk gtk 3.0)
-}
-
-pkg_preinst() {
- xdg_pkg_preinst
- gnome2_schemas_savelist
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.17.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.17.ebuild
deleted file mode 100644
index 1466a2deebf..00000000000
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.17.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="M17N engine for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk nls"
-
-DEPEND="app-i18n/ibus
- dev-libs/m17n-lib
- gtk? ( x11-libs/gtk+:3 )
- nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
- >=dev-db/m17n-db-1.7"
-BDEPEND="sys-devel/gettext
- virtual/pkgconfig"
-
-src_configure() {
- econf \
- $(use_enable nls) \
- $(use_with gtk gtk 3.0)
-}
-
-pkg_preinst() {
- xdg_pkg_preinst
- gnome2_schemas_savelist
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.10.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.18.ebuild
index da3b9ae13bd..c9a42f2614c 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.10.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r5.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r5.ebuild
index 2d62a9d3d17..3524ba6ebed 100644
--- a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r5.ebuild
+++ b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2008-2022 Gentoo Authors
+# Copyright 2008-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
inherit autotools lua-single python-single-r1
diff --git a/app-i18n/ibus-sunpinyin/Manifest b/app-i18n/ibus-sunpinyin/Manifest
deleted file mode 100644
index ab2a2125633..00000000000
--- a/app-i18n/ibus-sunpinyin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sunpinyin-2.0.4_pre20200306162733.tar.gz 547519 BLAKE2B 6e0e4457217d7b85221cab15173f588a5c7c039208a8f6cd48ed5fb21c5b5eae2f4616d6fddbf6eff8a006193097de26c866d5385d4602f41059ee8d7e52a2d5 SHA512 e8cf73aeca8dcbc7dd6f51f034a9a0363201bc14a814800e071c987933935b0e8039aa84178a6bd1cba1c7dee4b25b2d5546e78ea683e68e8981afea48fdab33
diff --git a/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-2.0.4_pre20200306162733-python-3.patch b/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-2.0.4_pre20200306162733-python-3.patch
deleted file mode 100644
index 25b11f0a800..00000000000
--- a/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-2.0.4_pre20200306162733-python-3.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-https://github.com/sunpinyin/sunpinyin/issues/111
-
---- /wrapper/ibus/setup/main.py
-+++ /wrapper/ibus/setup/main.py
-@@ -63,7 +63,7 @@
- class Logger:
- @staticmethod
- def pr(message):
-- print >> sys.stderr, message
-+ print(message, file=sys.stderr)
-
-
- class Option(object):
-@@ -73,10 +73,10 @@
- """
- config = ibus.Bus().get_config()
- __wrappers = {
-- type(True): glib.Variant.new_boolean,
-- type(1): glib.Variant.new_int32,
-- type('str'): glib.Variant.new_string,
-- type([]): glib.Variant.new_strv,
-+ bool: glib.Variant.new_boolean,
-+ int: glib.Variant.new_int32,
-+ str: glib.Variant.new_string,
-+ list: glib.Variant.new_strv,
- }
-
- def __init__(self, name, default):
-@@ -258,7 +258,7 @@
- def read_config(self):
- if not self.saved_pairs:
- self.saved_pairs = self.read()
-- keys = set([pair.split(':')[0] for pair in self.saved_pairs])
-+ keys = {pair.split(':')[0] for pair in self.saved_pairs}
- for opt in self.options:
- opt.is_enabled = (opt.key() in keys)
- # throw away unknown pair
-@@ -445,28 +445,28 @@
- # TODO: the UI should looks like a virtual keyboard,
- # user are allowed to choose the mappings to all punctuation keys.
- def __init__(self):
-- mappings = [MappingInfo('togglebutton1', [('`',None), ('~',u'~')]),
-+ mappings = [MappingInfo('togglebutton1', [('`', None), ('~', '~')]),
- MappingInfo('togglebutton2', []),
-- MappingInfo('togglebutton3', [('2',None), ('@',u'@')]),
-- MappingInfo('togglebutton4', [('3',None), ('#',u'#')]),
-- MappingInfo('togglebutton5', [('4',None), ('$',u'¥' )]),
-- MappingInfo('togglebutton6', [('5',None), ('%',u'%')]),
-- MappingInfo('togglebutton7', [('6',None), ('^',u'…')]),
-- MappingInfo('togglebutton8', [('7',None), ('&',u'&')]),
-- MappingInfo('togglebutton9', [('8',None), ('*',u'*')]),
-- MappingInfo('togglebutton10', [('9',None), ('*',u'(')]),
-- MappingInfo('togglebutton11', [('0',None), ('*',u')')]),
-- MappingInfo('togglebutton12', [('-',u'-'), ('_',u'——')]),
-- MappingInfo('togglebutton13', [('=',u'='), ('+',u'+')]),
-- MappingInfo('togglebutton14', [('\\',None), ('|',u'‖')]),
-- MappingInfo('togglebutton27', [('[',u'〔'), ('{',u'{')]),
-- MappingInfo('togglebutton28', [(']',u'〕'), ('}',u'}')]),
-+ MappingInfo('togglebutton3', [('2', None), ('@', '@')]),
-+ MappingInfo('togglebutton4', [('3', None), ('#', '#')]),
-+ MappingInfo('togglebutton5', [('4', None), ('$', '¥' )]),
-+ MappingInfo('togglebutton6', [('5', None), ('%', '%')]),
-+ MappingInfo('togglebutton7', [('6', None), ('^', '…')]),
-+ MappingInfo('togglebutton8', [('7', None), ('&', '&')]),
-+ MappingInfo('togglebutton9', [('8', None), ('*', '*')]),
-+ MappingInfo('togglebutton10', [('9', None), ('*', '(')]),
-+ MappingInfo('togglebutton11', [('0', None), ('*', ')')]),
-+ MappingInfo('togglebutton12', [('-', '-'), ('_', '——')]),
-+ MappingInfo('togglebutton13', [('=', '='), ('+', '+')]),
-+ MappingInfo('togglebutton14', [('\\', None), ('|', '‖')]),
-+ MappingInfo('togglebutton27', [('[', '〔'), ('{', '{')]),
-+ MappingInfo('togglebutton28', [(']', '〕'), ('}', '}')]),
- MappingInfo('togglebutton39', []),
- MappingInfo('togglebutton40', []),
-- MappingInfo('togglebutton50', [(',',None), ('<',u'〈')]),
-- MappingInfo('togglebutton51', [('.',u'·'), ('>',u'〉')]),
-- MappingInfo('togglebutton52', [('/',u'/'), ('?',None)])]
-- #'\'',(u'‘',u'’'),
-+ MappingInfo('togglebutton50', [(',', None), ('<', '〈')]),
-+ MappingInfo('togglebutton51', [('.', '·'), ('>', '〉')]),
-+ MappingInfo('togglebutton52', [('/', '/'), ('?', None)])]
-+ #'\'', ('‘', '’'),
- MultiCheckDialog.__init__(self, ui_name="punctmapping",
- config_name="General/PunctMapping/Mappings",
- mappings=mappings,
diff --git a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild
deleted file mode 100644
index 3a4dfec5de4..00000000000
--- a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 2009-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit python-single-r1 scons-utils toolchain-funcs
-
-MY_PN="sunpinyin"
-MY_P="${MY_PN}-${PV}"
-
-if [[ "${PV}" == "9999" ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/sunpinyin/sunpinyin"
-elif [[ "${PV}" == *_pre* ]]; then
- SUNPINYIN_GIT_REVISION="f39c195db08661e894017507842991a1ef70bedf"
-fi
-
-DESCRIPTION="Chinese SunPinyin engine for IBus"
-HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
-if [[ "${PV}" == "9999" ]]; then
- SRC_URI=""
-elif [[ "${PV}" == *_pre* ]]; then
- SRC_URI="https://github.com/sunpinyin/${MY_PN}/archive/${SUNPINYIN_GIT_REVISION}.tar.gz -> ${MY_P}.tar.gz"
-else
- SRC_URI="https://github.com/sunpinyin/${MY_PN}/archive/v${PV/_/-}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-LICENSE="|| ( CDDL LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+gui"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="sys-devel/gettext
- virtual/pkgconfig"
-DEPEND="app-i18n/ibus
- ~app-i18n/sunpinyin-${PV}
- dev-libs/glib:2
- virtual/libintl"
-RDEPEND="${DEPEND}
- app-i18n/sunpinyin-data
- gui? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- app-i18n/ibus[introspection,python,${PYTHON_USEDEP}]
- dev-python/pygobject[${PYTHON_USEDEP}]
- ')
- x11-libs/gtk+:3[introspection]
- )"
-
-if [[ "${PV}" == *_pre* ]]; then
- S="${WORKDIR}/${MY_PN}-${SUNPINYIN_GIT_REVISION}"
-elif [[ "${PV}" != "9999" ]]; then
- S="${WORKDIR}/${MY_PN}-${PV/_/-}"
-fi
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.0.4_pre20200306162733-python-3.patch"
-)
-
-src_prepare() {
- default
- sed -e "/^exec python /s/python/${EPYTHON}/" -i wrapper/ibus/setup/ibus-setup-sunpinyin.in || die
-
- if ! use gui; then
- sed \
- -e "s:'setup/ibus-setup-sunpinyin'::" \
- -e "/env\.Alias('install-libexec'/s:, setup_target::" \
- -i wrapper/ibus/SConstruct || die
- fi
-}
-
-src_configure() {
- tc-export CXX
-}
-
-src_compile() {
- escons -C wrapper/ibus \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- --libexecdir="${EPREFIX}/usr/libexec" \
- --datadir="${EPREFIX}/usr/share"
-}
-
-src_install() {
- escons -C wrapper/ibus --install-sandbox="${D}" install
-}
diff --git a/app-i18n/ibus-sunpinyin/metadata.xml b/app-i18n/ibus-sunpinyin/metadata.xml
deleted file mode 100644
index d07fba105be..00000000000
--- a/app-i18n/ibus-sunpinyin/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="gui">Install graphical user interface tool (ibus-setup-sunpinyin)</flag>
- </use>
- <upstream>
- <remote-id type="github">sunpinyin/sunpinyin</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-i18n/ibus-table-others/Manifest b/app-i18n/ibus-table-others/Manifest
index fec44135114..1958b594a0b 100644
--- a/app-i18n/ibus-table-others/Manifest
+++ b/app-i18n/ibus-table-others/Manifest
@@ -1 +1 @@
-DIST ibus-table-others-1.3.13.tar.gz 676883 BLAKE2B 2486565f51781fc4d0a270f84c97d2525478392f165e4ebeda8c4b0d64405aa91e4568ebea1ec946fe57bcd9e1ddf08178ce1d46c3bf20571c71f94035df2f9c SHA512 1276139f3ce9e1d7a8e117be804e5ff0f4fba3f1d80600a10fb0fa25327a5c368e315bc87b68219091cdaa5927e536306111df0a4819503b2ec7002374cb2534
+DIST ibus-table-others-1.3.14.tar.gz 674955 BLAKE2B 77f94ae3f83e95eb53aaf3d78a28682261bfa63031dc74b1399b57194d68e2405df070f41af6a00d69dd9f9c9a106ffa730302847e01b2fc97988fe9bd42a1e2 SHA512 9c91db95ebbee3b6951cc179a46bbc3ee29409afa1e3229a6213447b90ebff288dc738046b0ea4f979c2241cf9563ca77a8b97b651a56e940563e9f25e0e238b
diff --git a/app-i18n/ibus-table-others/ibus-table-others-1.3.13.ebuild b/app-i18n/ibus-table-others/ibus-table-others-1.3.14.ebuild
index 8b5a0039b62..01282c650fb 100644
--- a/app-i18n/ibus-table-others/ibus-table-others-1.3.13.ebuild
+++ b/app-i18n/ibus-table-others/ibus-table-others-1.3.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
diff --git a/app-i18n/ibus-table/Manifest b/app-i18n/ibus-table/Manifest
index 2bc569e19b8..5a7689fb26f 100644
--- a/app-i18n/ibus-table/Manifest
+++ b/app-i18n/ibus-table/Manifest
@@ -1,2 +1 @@
-DIST ibus-table-1.16.11.tar.gz 1518653 BLAKE2B fec1deed7b96492bc9cead734b5063e47d553f690f9c71362a213a81f905f176811d9f397ae72c4a40815611d47df90b5a2bb56851ac28d5ca2dc2efc405716b SHA512 f5da239a05337f368769e7679a0639e73812021579467a195795678d68cf8d70b1f9bd4d31739c60298d60c9da6291c704e592750677ecc59734dd8c4292bf43
-DIST ibus-table-1.16.12.tar.gz 1519559 BLAKE2B c0e236ae58cbcc7c52bc29f30f2be5ed02590bab96fb9866bb829986fef9e01964b3f4b55caa1d417840372b0c3c230a93713aa774272375b5cd21a2a851bba8 SHA512 edbbb4842a6b49cdf8a830187422b7042c47b9ddf4876eb114acdb1e449024a6f4f48d46cb97d4420d65dffc14b3e3e9400d31b92ac68ccd2e9a327151dcaa3f
+DIST ibus-table-1.16.14.tar.gz 1534056 BLAKE2B 512c1610e4e7096d25c5ff8678e0e91a4cae96ca7036dae0b33ef8f3461e0e6c89cddb35bcd0bf50c48d308d1b0831c02957863419ccbfba64182290a9567acb SHA512 a865c8913bee5e462ed8f3ba74a720b3eb37062ae762e3909827b660dc62d3055e6b90fd3c583487fb23edd2d9572d9eae201d7fbde889ec5cd8e5848b83291f
diff --git a/app-i18n/ibus-table/ibus-table-1.16.12.ebuild b/app-i18n/ibus-table/ibus-table-1.16.12.ebuild
deleted file mode 100644
index 7314f41b054..00000000000
--- a/app-i18n/ibus-table/ibus-table-1.16.12.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit gnome2-utils python-single-r1 xdg
-
-DESCRIPTION="Tables engines for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/kaio/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-RESTRICT="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- $(python_gen_cond_dep '
- app-i18n/ibus[python(+),${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- ')
- virtual/libiconv
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-src_prepare() {
- python_fix_shebang .
-
- default
-}
-
-src_configure() {
- econf $(use_enable nls)
-}
-
-pkg_preinst() {
- xdg_pkg_preinst
- gnome2_schemas_savelist
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-table/ibus-table-1.16.11.ebuild b/app-i18n/ibus-table/ibus-table-1.16.14.ebuild
index dcbbc265378..e7f61522cd9 100644
--- a/app-i18n/ibus-table/ibus-table-1.16.11.ebuild
+++ b/app-i18n/ibus-table/ibus-table-1.16.14.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
PYTHON_REQ_USE="sqlite(+)"
inherit gnome2-utils python-single-r1 xdg
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index 47e21ae20e2..5d453a3452a 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,2 +1,3 @@
-DIST ibus-typing-booster-2.18.9.tar.gz 11060426 BLAKE2B 5a2e302bb93002c68e5a61001e013a26043e0b20922b6e79bfc96ebb0b4dbdd920df96d13545619e0b50684c7bf678b1c3df2556a40b0d4660439fc6984acd80 SHA512 1fe9dd28a042be7d946dc0a800363cd7870e8357fa75e4f57acd201b3cca96cfaab4ffbff1a53146713204e8c246ab1cf33ea379e9e1a3aa9b848306567cb7b3
-DIST ibus-typing-booster-2.19.0.tar.gz 11127967 BLAKE2B 0efc148c55ca329b69db280fee9606d4773c48258ec0c5249992e802a1a6baa67577b884865f27a4145c044929a80b1d1e0d1cbffddc548539ba52f6d83b51c4 SHA512 e5852ff30fd5c7ebde5909a8f0af0292fc20e73eaf737bbb3b34af5c24144eb7c58fdb77bfbd3cc7f08110d0fb7ad9fe0a353eb52619da7f8e72d7a901e9004b
+DIST ibus-typing-booster-2.19.10.tar.gz 11174125 BLAKE2B e180a72dc59d89838696291e767e994a17794a7565cf08cbe547aafa75dc73c5e58b046b2312fe70cc682bd9fcc93db23679e62af5ecfe3bd391dee38b73a697 SHA512 af9952aac45906400fdbb8421165c91cc8ade898a20331cb7ba6f85d18a73a8a872f38c00e6ec35c4c6048541f56d4d3f43e8c222fda975efa28c1d6b86d99ee
+DIST ibus-typing-booster-2.19.13.tar.gz 11175082 BLAKE2B 4f0925c38a272b056ec3e542059416d65d6bcdd26a1e5810ea8a6febbd9a3c7c0d8cd74b75826622e70fd04aeeb2282e166c3433f86233be0bf6929fac58dece SHA512 78a29efd5df8380db274b0e8f14aea83bb2841bae78b6c49cb28151b6dc011a5856bfc4f2347c4295dc2fbe058df150e06346fe4eee7ca331edf73e5fedebd2e
+DIST ibus-typing-booster-2.20.0.tar.gz 11175896 BLAKE2B 399b48617cd3d256e682b2d23d63c8931faecc4e83015d0be30040d516d3cd3a50e9366c460ebfe1f1ef2b2aa1363f4d2e2d2ac0ef9ad7016f6f2ecd6ee4f36b SHA512 8c7271d3029a28b045c9e9ffae9c9ac07adac3ac98749f30cd0959cfb91a50953372758c77c9820d713f2027d535d0752d1817281ce16be7e3594877b64177a5
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.18.9.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.19.10.ebuild
index 23bfd6ae580..93214960c8a 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.18.9.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.19.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
PYTHON_REQ_USE="sqlite(+)"
inherit gnome2-utils python-single-r1 xdg
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.19.0.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.19.13.ebuild
index 58166b805e3..3a255c68af9 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.19.0.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.19.13.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
PYTHON_REQ_USE="sqlite(+)"
inherit gnome2-utils python-single-r1 xdg
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.20.0.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.20.0.ebuild
new file mode 100644
index 00000000000..3a255c68af9
--- /dev/null
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.20.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit gnome2-utils python-single-r1 xdg
+
+DESCRIPTION="Completion input method for IBus"
+HOMEPAGE="https://mike-fabian.github.io/ibus-typing-booster"
+SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+ dev-libs/m17n-lib
+ $(python_gen_cond_dep '
+ app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/pyenchant[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/pyxdg[${PYTHON_USEDEP}]
+ ')"
+RDEPEND="${DEPEND}
+ >=dev-db/m17n-db-1.7"
+BDEPEND="sys-devel/gettext
+ virtual/pkgconfig"
+
+src_prepare() {
+ default
+
+ sed -i "s|/usr\(/bin/sh\)|\1|" {engine,setup}/*.in
+}
+
+pkg_preinst() {
+ xdg_pkg_preinst
+ gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/app-i18n/ibus/ibus-1.5.26-r1.ebuild b/app-i18n/ibus/ibus-1.5.26-r1.ebuild
index 5d02fd8f921..03751566910 100644
--- a/app-i18n/ibus/ibus-1.5.26-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.26-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
inherit autotools bash-completion-r1 gnome2-utils python-r1 toolchain-funcs vala virtualx xdg-utils
diff --git a/app-i18n/ibus/ibus-1.5.27.ebuild b/app-i18n/ibus/ibus-1.5.27.ebuild
index 2118ad5f14c..6a87963783c 100644
--- a/app-i18n/ibus/ibus-1.5.27.ebuild
+++ b/app-i18n/ibus/ibus-1.5.27.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
inherit autotools bash-completion-r1 gnome2-utils python-r1 toolchain-funcs vala virtualx xdg-utils
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong 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="
@@ -83,6 +83,7 @@ src_prepare() {
sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
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
diff --git a/app-i18n/imsettings/imsettings-1.8.2.ebuild b/app-i18n/imsettings/imsettings-1.8.2-r1.ebuild
index 9fad1e854c6..ed1257e0f01 100644
--- a/app-i18n/imsettings/imsettings-1.8.2.ebuild
+++ b/app-i18n/imsettings/imsettings-1.8.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="amd64 ~x86"
-IUSE="gconf qt5 +introspection xfconf"
+IUSE="qt5 +introspection xfconf"
RESTRICT="test"
RDEPEND="dev-libs/glib:2
@@ -22,7 +22,6 @@ RDEPEND="dev-libs/glib:2
x11-libs/libX11
x11-libs/libgxim
x11-libs/libnotify
- gconf? ( gnome-base/gconf )
introspection? ( dev-libs/gobject-introspection )
xfconf? ( xfce-base/xfconf )"
DEPEND="${RDEPEND}"
@@ -37,7 +36,7 @@ MY_XINPUTSH="90-xinput"
src_prepare() {
sed -i \
- -e "/PKG_CHECK_MODULES/s/\(gconf-2\.0\)/$(usex gconf '\1' _)/" \
+ -e "/PKG_CHECK_MODULES/s/\(gconf-2\.0\)/_/" \
-e "/PKG_CHECK_MODULES/s/\(gtk+-2\.0\)/_/" \
-e "/PKG_CHECK_MODULES/s/\(check\)/_/" \
-e "/PKG_CHECK_MODULES/s/\(libxfconf-0\)/$(usex xfconf '\1' _)/" \
diff --git a/app-i18n/imsettings/metadata.xml b/app-i18n/imsettings/metadata.xml
index 25862f59a7e..7593ee8f578 100644
--- a/app-i18n/imsettings/metadata.xml
+++ b/app-i18n/imsettings/metadata.xml
@@ -6,7 +6,6 @@
<name>Cjk</name>
</maintainer>
<use>
- <flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag>
<flag name="xfconf">Enable support for <pkg>xfce-base/xfconf</pkg></flag>
</use>
<upstream>
diff --git a/app-i18n/kcc/files/kcc-1.0-clang16.patch b/app-i18n/kcc/files/kcc-1.0-clang16.patch
new file mode 100644
index 00000000000..a813a9ceb75
--- /dev/null
+++ b/app-i18n/kcc/files/kcc-1.0-clang16.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/871399
+--- a/kcc.c
++++ b/kcc.c
+@@ -33,2 +33,3 @@
+ #include <sys/stat.h>
++#include <unistd.h>
+
+@@ -138,4 +139,6 @@
+ #ifdef __STDC__
++int getstr(char *str, register int n, FILE *fp);
+ void error(char *format, ...);
+ #else
++int getstr();
+ void error();
+@@ -152,3 +155,3 @@
+ ---------------------------------------------------------------------*/
+-main(c, v)
++int main(c, v)
+ register int c;
diff --git a/app-i18n/kcc/kcc-1.0.ebuild b/app-i18n/kcc/kcc-1.0.ebuild
index 79b890dd7eb..0aa425112c8 100644
--- a/app-i18n/kcc/kcc-1.0.ebuild
+++ b/app-i18n/kcc/kcc-1.0.ebuild
@@ -1,33 +1,35 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
-DESCRIPTION="A Kanji code converter"
+DESCRIPTION="Kanji code converter"
HOMEPAGE="http://www2s.biglobe.ne.jp/~Nori/ruby/"
SRC_URI="mirror://gentoo/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 x86"
-S="${WORKDIR}/${PN}"
PATCHES=(
"${FILESDIR}"/${PN}-gcc3-gentoo.diff
"${FILESDIR}"/${PN}-exit.diff
- "${FILESDIR}"/${PN}-1.0-fix-build-system.patch
+ "${FILESDIR}"/${P}-fix-build-system.patch
+ "${FILESDIR}"/${P}-clang16.patch
)
src_configure() {
tc-export CC
+ append-cflags -std=gnu89 # old codebase, incompatible with c2x
}
src_install() {
dobin kcc
einstalldocs
- cp -f kcc.jman kcc.1 || die
+ cp kcc.jman kcc.1 || die
doman -i18n=ja kcc.1
}
diff --git a/app-i18n/libkkc-data/Manifest b/app-i18n/libkkc-data/Manifest
deleted file mode 100644
index c0fc91c8c73..00000000000
--- a/app-i18n/libkkc-data/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libkkc-data-0.2.7.tar.xz 22262552 BLAKE2B 2c735ee9fabf8f8f201591c9ed584cece22ddcd15da5f36b39bb422b1bce1dbcbcd66f71b5713e2dd4c5e2862b06b014c24a4a3db63c86ecee20519434da9261 SHA512 61c0cd8c0fa41ed8df49cac6709eebb245cc965d7e192b1ba945e95f2fc46aca8aa48c16e1977a12c157c55dab6b9f4c30f4905806725eca6e697b762eb7cbd7
diff --git a/app-i18n/libkkc-data/files/libkkc-data-python3.patch b/app-i18n/libkkc-data/files/libkkc-data-python3.patch
deleted file mode 100644
index 46109a92dff..00000000000
--- a/app-i18n/libkkc-data/files/libkkc-data-python3.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From ba1c1bd3eb86d887fc3689c3142732658071b5f7 Mon Sep 17 00:00:00 2001
-From: Takao Fujiwara <tfujiwar@redhat.com>
-Date: Mon, 30 Jul 2018 15:26:37 +0900
-Subject: [PATCH] build: Enable python3
-
----
- tools/genfilter.py | 18 +++++++--------
- tools/sortlm.py | 23 ++++++++-----------
- 2 files changed, 19 insertions(+), 22 deletions(-)
-
-diff --git a/tools/genfilter.py b/tools/genfilter.py
-index 5ffab32..0c5f75a 100644
---- a/tools/genfilter.py
-+++ b/tools/genfilter.py
-@@ -84,24 +84,24 @@ def __init__(self, infile, outfile, record_size):
-
- def generate(self):
- size = os.fstat(self.infile.fileno()).st_size
-- n = size / self.record_size
-+ n = size // self.record_size
- m = int(math.ceil(-n*math.log10(ERROR_RATE) /
- math.pow(math.log10(2), 2)))
-- m = (m/8 + 1)*8
-+ m = (m//8 + 1)*8
- inmem = mmap.mmap(self.infile.fileno(),
- size,
- access=mmap.ACCESS_READ)
-- outmem = bytearray(m/8)
-- for i in xrange(0, n):
-+ outmem = bytearray(m//8)
-+ for i in range(0, n):
- offset = i*self.record_size
- b0, b1 = struct.unpack("=LL", inmem[offset:offset+8])
-- for k in xrange(0, 4):
-+ for k in range(0, 4):
- h = murmur_hash3_32(b0, b1, k)
- h = int(h * (m / float(0xFFFFFFFF)))
-- outmem[h/8] |= (1 << (h%8))
-+ outmem[h//8] |= (1 << (h%8))
- inmem.close()
-- # Convert bytearray to str, for Python 2.6 compatibility.
-- self.outfile.write(str(outmem))
-+ # Convert bytearray to bytes, for Python 3 compatibility.
-+ self.outfile.write(bytes(outmem))
-
- if __name__ == '__main__':
- import sys
-@@ -110,7 +110,7 @@ def generate(self):
- parser = argparse.ArgumentParser(description='filter')
- parser.add_argument('infile', type=argparse.FileType('r'),
- help='input file')
-- parser.add_argument('outfile', type=argparse.FileType('w'),
-+ parser.add_argument('outfile', type=argparse.FileType('wb'),
- help='output file')
- parser.add_argument('record_size', type=int,
- help='record size')
-diff --git a/tools/sortlm.py b/tools/sortlm.py
-index a0dd8fe..40f0837 100644
---- a/tools/sortlm.py
-+++ b/tools/sortlm.py
-@@ -40,10 +40,10 @@ def __init__(self, infile, output_prefix):
- self.__min_cost = 0.0
-
- def read(self):
-- print "reading N-grams"
-+ print("reading N-grams")
- self.__read_tries()
- self.__read_ngrams()
-- print "min cost = %lf" % self.__min_cost
-+ print("min cost = %lf" % self.__min_cost)
-
- def __read_tries(self):
- while True:
-@@ -58,7 +58,7 @@ def __read_tries(self):
- line = self.__infile.readline()
- if line == "":
- break
-- line = line.strip()
-+ line = line.strip('\n')
- if line == "":
- break
- match = self.__ngram_line_regex.match(line)
-@@ -89,7 +89,7 @@ def __read_ngrams(self):
- line = self.__infile.readline()
- if line == "":
- break
-- line = line.strip()
-+ line = line.strip('\n')
- if line == "":
- break
- match = self.__ngram_line_regex.match(line)
-@@ -125,14 +125,11 @@ def __write_ngrams(self):
- def quantize(cost, min_cost):
- return max(0, min(65535, int(cost * 65535 / min_cost)))
-
-- def cmp_header(a, b):
-- return cmp(a[0], b[0])
--
-- print "writing 1-gram file"
-+ print("writing 1-gram file")
- unigram_offsets = {}
- unigram_file = open("%s.1gram" % self.__output_prefix, "wb")
- offset = 0
-- for ids, value in sorted(self.__ngram_entries[0].iteritems()):
-+ for ids, value in sorted(self.__ngram_entries[0].items()):
- unigram_offsets[ids[0]] = offset
- s = struct.pack("=HHH",
- quantize(value[0], self.__min_cost),
-@@ -143,13 +140,13 @@ def cmp_header(a, b):
- offset += 1
- unigram_file.close()
-
-- print "writing 2-gram file"
-+ print("writing 2-gram file")
- bigram_offsets = {}
- bigram_file = open("%s.2gram" % self.__output_prefix, "wb")
- keys = self.__ngram_entries[1].keys()
- items = [(struct.pack("=LL", ids[1], unigram_offsets[ids[0]]), ids) for ids in keys]
- offset = 0
-- for header, ids in sorted(items, cmp=cmp_header):
-+ for header, ids in sorted(items, key=lambda x: x[0]):
- value = self.__ngram_entries[1][ids]
- bigram_offsets[ids] = offset
- s = struct.pack("=HH",
-@@ -160,11 +157,11 @@ def cmp_header(a, b):
- bigram_file.close()
-
- if len(self.__ngram_entries[2]) > 0:
-- print "writing 3-gram file"
-+ print("writing 3-gram file")
- trigram_file = open("%s.3gram" % self.__output_prefix, "wb")
- keys = self.__ngram_entries[2].keys()
- items = [(struct.pack("=LL", ids[2], bigram_offsets[(ids[0], ids[1])]), ids) for ids in keys]
-- for header, ids in sorted(items, cmp=cmp_header):
-+ for header, ids in sorted(items, key=lambda x: x[0]):
- value = self.__ngram_entries[2][ids]
- s = struct.pack("=H",
- quantize(value[0], self.__min_cost))
diff --git a/app-i18n/libkkc-data/libkkc-data-0.2.7.ebuild b/app-i18n/libkkc-data/libkkc-data-0.2.7.ebuild
deleted file mode 100644
index cde6550d244..00000000000
--- a/app-i18n/libkkc-data/libkkc-data-0.2.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit python-any-r1
-
-DESCRIPTION="Language model data for libkkc"
-HOMEPAGE="https://github.com/ueno/libkkc"
-SRC_URI="https://github.com/ueno/${PN%-*}/releases/download/v0.3.5/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=""
-BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]')"
-
-PATCHES=( "${FILESDIR}"/${PN}-python3.patch )
diff --git a/app-i18n/libkkc-data/metadata.xml b/app-i18n/libkkc-data/metadata.xml
deleted file mode 100644
index 6853c12be89..00000000000
--- a/app-i18n/libkkc-data/metadata.xml
+++ /dev/null
@@ -1,11 +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>
- <upstream>
- <remote-id type="github">ueno/libkkc</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-i18n/libkkc/Manifest b/app-i18n/libkkc/Manifest
deleted file mode 100644
index 226b9d7a94f..00000000000
--- a/app-i18n/libkkc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libkkc-0.3.5_p20210928.tar.gz 390022 BLAKE2B d4b44861f4526f4f9581cd9343fb4d8dd361967cce153ab92fb9a3334502bd583081d4ae3c01879c94aee710d347c23d3372c0deb20d711b9792eb73a28b3beb SHA512 9c46ef09242ecf3d4864fff0e7df7ff362d71c382bb92fe1e784bd20bdf737dc6a528b57342093ab4415926b15f09db44a10b8088d1c9f8b9cebcb428aaee8c6
diff --git a/app-i18n/libkkc/files/libkkc-marisa-glib.patch b/app-i18n/libkkc/files/libkkc-marisa-glib.patch
deleted file mode 100644
index 2b013d4f577..00000000000
--- a/app-i18n/libkkc/files/libkkc-marisa-glib.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/libkkc/Makefile.am
-+++ b/libkkc/Makefile.am
-@@ -49,7 +49,11 @@
- -DLOCALEDIR=\"$(datadir)/locale\" \
- -I $(top_srcdir) \
- $(NULL)
--libkkc_la_LIBADD = $(LIBKKC_LIBS) $(top_builddir)/marisa-glib/libmarisa-glib.la
-+libkkc_la_LIBADD = \
-+ $(LIBKKC_LIBS) \
-+ $(top_builddir)/marisa-glib/libmarisa-glib.la \
-+ $(MARISA_GLIB_STATIC_DEPENDENCIES) \
-+ $(NULL)
- libkkc_la_LDFLAGS = \
- $(CODE_COVERAGE_LDFLAGS) \
- -version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)" \
-@@ -66,7 +70,6 @@
- libkkc_internals_la_LIBADD = \
- $(libkkc_la_LIBADD) \
- $(libkkc_la_OBJECTS) \
-- $(MARISA_GLIB_STATIC_DEPENDENCIES) \
- $(NULL)
- libkkc_internals_la_LDFLAGS = \
- $(CODE_COVERAGE_LDFLAGS) \
diff --git a/app-i18n/libkkc/libkkc-0.3.5_p20210928.ebuild b/app-i18n/libkkc/libkkc-0.3.5_p20210928.ebuild
deleted file mode 100644
index fec5bceb750..00000000000
--- a/app-i18n/libkkc/libkkc-0.3.5_p20210928.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit autotools python-any-r1 vala
-
-if [[ "${PV}" == "9999" ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/ueno/libkkc"
-elif [[ "${PV}" == *_p* ]]; then
- inherit vcs-snapshot
-
- EGIT_COMMIT="cdcaf4dceaf273bfe7b018a4a651a92f786c6ec6"
-fi
-
-DESCRIPTION="Japanese Kana Kanji conversion input method library"
-HOMEPAGE="https://github.com/ueno/libkkc"
-if [[ "${PV}" == "9999" ]]; then
- SRC_URI=""
-elif [[ "${PV}" == *_p* ]]; then
- SRC_URI="https://github.com/ueno/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-else
- SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls static-libs"
-
-RDEPEND="app-i18n/libkkc-data
- dev-libs/glib:2
- dev-libs/json-glib
- dev-libs/libgee:0.8
- dev-libs/marisa
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]')
- $(vala_depend)
- dev-libs/gobject-introspection
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}"/${PN}-marisa-glib.patch )
-
-python_check_deps() {
- has_version -b "dev-libs/marisa[python,${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- vala_src_prepare
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable nls) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
- find "${ED}" -name "*.la" -delete || die
-}
diff --git a/app-i18n/libkkc/libkkc-9999.ebuild b/app-i18n/libkkc/libkkc-9999.ebuild
deleted file mode 100644
index cbad641cc79..00000000000
--- a/app-i18n/libkkc/libkkc-9999.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit autotools python-any-r1 vala
-
-if [[ "${PV}" == "9999" ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/ueno/libkkc"
-elif [[ "${PV}" == *_p* ]]; then
- inherit vcs-snapshot
-
- EGIT_COMMIT=""
-fi
-
-DESCRIPTION="Japanese Kana Kanji conversion input method library"
-HOMEPAGE="https://github.com/ueno/libkkc"
-if [[ "${PV}" == "9999" ]]; then
- SRC_URI=""
-elif [[ "${PV}" == *_p* ]]; then
- SRC_URI="https://github.com/ueno/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-else
- SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS=""
-IUSE="nls static-libs"
-
-RDEPEND="app-i18n/linkkc-data
- dev-libs/glib:2
- dev-libs/json-glib
- dev-libs/libgee:0.8
- dev-libs/marisa
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]')
- $(vala_depend)
- dev-libs/gobject-introspection
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}"/${PN}-marisa-glib.patch )
-
-python_check_deps() {
- has_version -b "dev-libs/marisa[python,${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- vala_src_prepare
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable nls) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
- find "${ED}" -name "*.la" -delete || die
-}
diff --git a/app-i18n/libkkc/metadata.xml b/app-i18n/libkkc/metadata.xml
deleted file mode 100644
index 6686fae672e..00000000000
--- a/app-i18n/libkkc/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>arfrever.fta@gmail.com</email>
- <name>Arfrever Frehtes Taifersar Arahesis</name>
- </maintainer>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <upstream>
- <remote-id type="github">ueno/libkkc</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-i18n/libpinyin/libpinyin-2.6.2.ebuild b/app-i18n/libpinyin/libpinyin-2.6.2.ebuild
index d58313fa9ec..e1119ca80bf 100644
--- a/app-i18n/libpinyin/libpinyin-2.6.2.ebuild
+++ b/app-i18n/libpinyin/libpinyin-2.6.2.ebuild
@@ -24,7 +24,7 @@ SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.tex
LICENSE="GPL-3+"
SLOT="0/13"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv x86"
IUSE=""
BDEPEND="virtual/pkgconfig"
diff --git a/app-i18n/librime/files/librime-1.6.0-boost-1.76.patch b/app-i18n/librime/files/librime-1.6.0-boost-1.76.patch
index 5ed1447359d..31eff9268bf 100644
--- a/app-i18n/librime/files/librime-1.6.0-boost-1.76.patch
+++ b/app-i18n/librime/files/librime-1.6.0-boost-1.76.patch
@@ -2,8 +2,8 @@ https://github.com/rime/librime/issues/462
https://github.com/rime/librime/pull/463
https://github.com/rime/librime/commit/57cffcd02ac70148e21ce982be834876b3df87db
---- /src/rime/gear/script_translator.cc
-+++ /src/rime/gear/script_translator.cc
+--- a/src/rime/gear/script_translator.cc
++++ b/src/rime/gear/script_translator.cc
@@ -8,6 +8,7 @@
//
#include <algorithm>
@@ -12,8 +12,8 @@ https://github.com/rime/librime/commit/57cffcd02ac70148e21ce982be834876b3df87db
#include <boost/algorithm/string/join.hpp>
#include <boost/range/adaptor/reversed.hpp>
#include <rime/composition.h>
---- /src/rime/gear/table_translator.cc
-+++ /src/rime/gear/table_translator.cc
+--- a/src/rime/gear/table_translator.cc
++++ b/src/rime/gear/table_translator.cc
@@ -6,6 +6,7 @@
//
#include <boost/algorithm/string.hpp>
diff --git a/app-i18n/librime/librime-1.7.3-r1.ebuild b/app-i18n/librime/librime-1.7.3-r1.ebuild
index 7505a76d656..92b24caf312 100644
--- a/app-i18n/librime/librime-1.7.3-r1.ebuild
+++ b/app-i18n/librime/librime-1.7.3-r1.ebuild
@@ -22,7 +22,7 @@ fi
LICENSE="BSD"
SLOT="0/1-${PV}"
-KEYWORDS="amd64 arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm64 ppc ppc64 ~riscv x86"
IUSE="debug test"
RESTRICT="!test? ( test )"
diff --git a/app-i18n/man-pages-l10n/Manifest b/app-i18n/man-pages-l10n/Manifest
index 7479278e047..5654725d17f 100644
--- a/app-i18n/man-pages-l10n/Manifest
+++ b/app-i18n/man-pages-l10n/Manifest
@@ -1,2 +1,2 @@
DIST manpages-l10n-4.14.0.tar.bz2 102563001 BLAKE2B 500744ab21482e83e076543539dac58b16e2dfb1f4a0f38b9adfe933cc69a0d68534663e3bc07f053ad3580021b34150fe8a40e9ecd0d01b968f8570ca74b051 SHA512 335b7b34ed6135b5ceb53a75cee2f71198733df02ba8727d55863f2ceb4ae37c44636d78feca123f5d53ba07018af2ce51567c0605b242dcb441a0a56dcf9106
-DIST manpages-l10n-v4.12.1.tar.bz2 90676890 BLAKE2B 7f261407007971063abc34f1154f5ab7d5a268dd21c76185f47cfbd73a1091950a3dc7bf0d4ad6bac56259fecbc1524b35b42316a1c2103f426ed936e203607d SHA512 42f5c61591959a0d804c215a9baddd6a182b30aedf5f6d6899f621cc8da9936fc10a1353aad5027eb4177f391f9708cc3018333256444433e937d37d8cdd3067
+DIST manpages-l10n-4.17.0.tar.bz2 108073280 BLAKE2B 4604b0c406cf16bb87ef5b7d1f43868b0ecfa085cfdfd6717e2156bd953ead0fa33d6960b78cd9e98a8e8c448c7c01bc669b91b04b3a11cc58c52c2963812f86 SHA512 e53fb8198bdf9ca2380c5cc487b2864b361011d3293202245fed4af1644563e478428547cd7c307be2556d0aeb88f7fad8ecaa34e837326319d4adb554473372
diff --git a/app-i18n/man-pages-l10n/man-pages-l10n-4.12.1-r2.ebuild b/app-i18n/man-pages-l10n/man-pages-l10n-4.12.1-r2.ebuild
deleted file mode 100644
index ac1e949bfd3..00000000000
--- a/app-i18n/man-pages-l10n/man-pages-l10n-4.12.1-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN/-}-v${PV}"
-DESCRIPTION="A somewhat comprehensive collection of man page translations"
-HOMEPAGE="https://manpages-l10n-team.pages.debian.net/manpages-l10n/"
-SRC_URI="https://salsa.debian.org/manpages-l10n-team/manpages-l10n/-/archive/v${PV}/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-MY_L10N=(cs da de el es fi fr hu id it mk nb nl pl pt-BR ro sr sv)
-IUSE="${MY_L10N[@]/#/l10n_}"
-REQUIRED_USE="|| ( ${MY_L10N[@]/#/l10n_} )"
-
-RDEPEND="virtual/man
- l10n_de? ( !app-i18n/man-pages-de )
- l10n_fr? ( !app-i18n/man-pages-fr )
- l10n_it? ( !app-i18n/man-pages-it )
- l10n_nl? ( !app-i18n/man-pages-nl )
- l10n_pl? ( !app-i18n/man-pages-pl )"
-
-BDEPEND="app-text/po4a
- dev-lang/perl"
-
-DOCS=(AUTHORS.md CHANGES.md CONTRIBUTING.md README.md)
-
-src_prepare() {
- default
- sed -i -e "/^SUBDIRS/s/=.*/= ${L10N//-/_}/" po/Makefile.{am,in} || die
-
- # some packages have their own translations
- local noinst_manpages=(
- # app-arch/xz-utils
- de/xz.1
- de/xzdec.1
- de/xzdiff.1
- de/xzgrep.1
- de/xzless.1
- de/xzmore.1
- # sys-apps/shadow
- {cs,de,es,hu,nl,pl}/groups.1
- de/su.1
- # sys-apps/sysvinit
- de/last.1
- de/mesg.1
- de/mountpoint.1
- de/utmpdump.1
- de/wall.1
- {de,es,fr,pl}/initscript.5
- {de,es,fr,pl}/inittab.5
- fr/bootlogd.8
- de/halt.8
- {de,es,fr,pl}/init.8
- {fr,pl}/killall5.8
- {fr,pl}/pidof.8
- de/runlevel.8
- de/sulogin.8
- # sys-process/procps
- {de,fr,pl}/free.1
- {de,fr}/pgrep.1
- {de,fr}/pmap.1
- {de,fr,pl}/ps.1
- {de,fr}/pwdx.1
- {de,fr}/tload.1
- {de,fr,pl}/uptime.1
- {de,fr}/sysctl.conf.5
- {de,fr}/sysctl.8
- {de,fr}/vmstat.8
- # sys-process/psmisc
- {de,nl,pl}/fuser.1
- {de,pl}/killall.1
- de/peekfd.1
- de/prtstat.1
- de/pslog.1
- {de,pl}/pstree.1
- )
- printf '%s\n' "${noinst_manpages[@]}" \
- | sed 's%^\(.*\)/\(.*\)\.\(.*\)$%po/\1/man\3/\2.\3.po%' | xargs rm
- assert
-}
-
-src_configure() {
- econf --enable-compression=none
-}
diff --git a/app-i18n/man-pages-l10n/man-pages-l10n-4.17.0.ebuild b/app-i18n/man-pages-l10n/man-pages-l10n-4.17.0.ebuild
new file mode 100644
index 00000000000..26437923cc4
--- /dev/null
+++ b/app-i18n/man-pages-l10n/man-pages-l10n-4.17.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A somewhat comprehensive collection of man page translations"
+HOMEPAGE="https://manpages-l10n-team.pages.debian.net/manpages-l10n/"
+SRC_URI="https://salsa.debian.org/manpages-l10n-team/${PN/-}/-/archive/${PV}/${P/-}.tar.bz2"
+S="${WORKDIR}/${P/-}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+MY_L10N=(cs da de el es fi fr hu id it mk nb nl pl pt-BR ro ru sr sv uk vi)
+IUSE="${MY_L10N[@]/#/l10n_}"
+REQUIRED_USE="|| ( ${MY_L10N[@]/#/l10n_} )"
+
+RDEPEND="virtual/man
+ l10n_de? ( !app-i18n/man-pages-de )
+ l10n_fr? ( !app-i18n/man-pages-fr )
+ l10n_it? ( !app-i18n/man-pages-it )
+ l10n_nl? ( !app-i18n/man-pages-nl )
+ l10n_pl? ( !app-i18n/man-pages-pl )
+ l10n_ru? ( !app-i18n/man-pages-ru )"
+
+BDEPEND="app-text/po4a
+ dev-lang/perl"
+
+DOCS=(AUTHORS.md CHANGES.md CONTRIBUTING.md COPYRIGHT.md README.md)
+
+src_prepare() {
+ default
+ sed -i -e "/^SUBDIRS/s/=.*/= ${L10N//-/_}/" po/Makefile.{am,in} || die
+
+ # some packages have their own translations
+ local f noinst_manpages=(
+ # app-arch/xz-utils
+ xz.1
+ xzdec.1
+ xzdiff.1
+ xzgrep.1
+ xzless.1
+ xzmore.1
+ # sys-apps/shadow
+ groups.1
+ su.1
+ # sys-apps/sysvinit
+ last.1
+ mesg.1
+ mountpoint.1
+ utmpdump.1
+ wall.1
+ halt.8
+ killall5.8
+ runlevel.8
+ sulogin.8
+ # sys-process/procps
+ free.1
+ pgrep.1
+ pmap.1
+ ps.1
+ pwdx.1
+ tload.1
+ uptime.1
+ sysctl.conf.5
+ sysctl.8
+ vmstat.8
+ # sys-process/psmisc
+ fuser.1
+ killall.1
+ peekfd.1
+ prtstat.1
+ pslog.1
+ pstree.1
+ )
+
+ for f in "${noinst_manpages[@]}"; do
+ rm po/*/"man${f##*.}/${f}.po" || die
+ done
+}
+
+src_configure() {
+ econf --enable-compression=none
+}
diff --git a/app-i18n/mozc/files/mozc-2.26.4220-environmental_variables.patch b/app-i18n/mozc/files/mozc-2.26.4220-environmental_variables.patch
index dccdff76f15..44a60ed4fc9 100644
--- a/app-i18n/mozc/files/mozc-2.26.4220-environmental_variables.patch
+++ b/app-i18n/mozc/files/mozc-2.26.4220-environmental_variables.patch
@@ -1,7 +1,7 @@
https://github.com/google/mozc/issues/470
---- /src/base/system_util.cc
-+++ /src/base/system_util.cc
+--- a/src/base/system_util.cc
++++ b/src/base/system_util.cc
@@ -226,6 +226,11 @@
std::string UserProfileDirectoryImpl::GetUserProfileDirectory() const {
diff --git a/app-i18n/mozc/files/mozc-2.26.4220-server_path_check.patch b/app-i18n/mozc/files/mozc-2.26.4220-server_path_check.patch
index 8dbabeac003..b12c3d370e3 100644
--- a/app-i18n/mozc/files/mozc-2.26.4220-server_path_check.patch
+++ b/app-i18n/mozc/files/mozc-2.26.4220-server_path_check.patch
@@ -1,7 +1,7 @@
https://github.com/google/mozc/issues/471
---- /src/ipc/ipc_path_manager.cc
-+++ /src/ipc/ipc_path_manager.cc
+--- a/src/ipc/ipc_path_manager.cc
++++ b/src/ipc/ipc_path_manager.cc
@@ -340,9 +340,21 @@
return false;
}
diff --git a/app-i18n/mozc/files/mozc-2.26.4220-system_abseil-cpp.patch b/app-i18n/mozc/files/mozc-2.26.4220-system_abseil-cpp.patch
index 33f72b8f7a6..da6b4026580 100644
--- a/app-i18n/mozc/files/mozc-2.26.4220-system_abseil-cpp.patch
+++ b/app-i18n/mozc/files/mozc-2.26.4220-system_abseil-cpp.patch
@@ -1,7 +1,7 @@
https://github.com/google/mozc/issues/490
---- /src/base/absl.gyp
-+++ /src/base/absl.gyp
+--- a/src/base/absl.gyp
++++ b/src/base/absl.gyp
@@ -28,119 +28,209 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -301,8 +301,8 @@ https://github.com/google/mozc/issues/490
],
},
],
---- /src/config/config_test.gyp
-+++ /src/config/config_test.gyp
+--- a/src/config/config_test.gyp
++++ b/src/config/config_test.gyp
@@ -36,6 +36,7 @@
'config_handler_test.cc',
],
@@ -319,8 +319,8 @@ https://github.com/google/mozc/issues/490
'../testing/testing.gyp:gtest_main',
'config.gyp:character_form_manager',
],
---- /src/gyp/common.gypi
-+++ /src/gyp/common.gypi
+--- a/src/gyp/common.gypi
++++ b/src/gyp/common.gypi
@@ -194,7 +194,13 @@
'include_dirs': [
'<(abs_depth)',
@@ -336,8 +336,8 @@ https://github.com/google/mozc/issues/490
],
'mac_framework_headers': [],
'target_conditions': [
---- /src/gyp/common_win.gypi
-+++ /src/gyp/common_win.gypi
+--- a/src/gyp/common_win.gypi
++++ b/src/gyp/common_win.gypi
@@ -307,10 +307,16 @@
'include_dirs': [
'<(abs_depth)',
@@ -356,8 +356,8 @@ https://github.com/google/mozc/issues/490
'msvs_configuration_attributes': {
'CharacterSet': '<(win_char_set_unicode)',
},
---- /src/gyp/defines.gypi
-+++ /src/gyp/defines.gypi
+--- a/src/gyp/defines.gypi
++++ b/src/gyp/defines.gypi
@@ -63,6 +63,10 @@
# use_libibus represents if ibus library is used or not.
# This option is only for Linux.
@@ -369,8 +369,8 @@ https://github.com/google/mozc/issues/490
},
'target_defaults': {
'defines': [
---- /src/gyp/directories.gypi
-+++ /src/gyp/directories.gypi
+--- a/src/gyp/directories.gypi
++++ b/src/gyp/directories.gypi
@@ -31,7 +31,12 @@
'variables': {
# Top directory of third party libraries.
@@ -385,8 +385,8 @@ https://github.com/google/mozc/issues/490
# Top directory of additional third party libraries.
'ext_third_party_dir%': '<(abs_depth)/third_party',
---- /src/session/session_test.gyp
-+++ /src/session/session_test.gyp
+--- a/src/session/session_test.gyp
++++ b/src/session/session_test.gyp
@@ -221,6 +221,7 @@
'internal/key_event_transformer_test.cc',
],
@@ -395,8 +395,8 @@ https://github.com/google/mozc/issues/490
'../base/base.gyp:base',
'../converter/converter_base.gyp:converter_mock',
'../engine/engine.gyp:mock_converter_engine',
---- /src/storage/storage_test.gyp
-+++ /src/storage/storage_test.gyp
+--- a/src/storage/storage_test.gyp
++++ b/src/storage/storage_test.gyp
@@ -41,6 +41,7 @@
'tiny_storage_test.cc',
],
diff --git a/app-i18n/mozc/files/mozc-2.26.4220-system_gtest.patch b/app-i18n/mozc/files/mozc-2.26.4220-system_gtest.patch
index 47891fab9b4..0d52bcab9e1 100644
--- a/app-i18n/mozc/files/mozc-2.26.4220-system_gtest.patch
+++ b/app-i18n/mozc/files/mozc-2.26.4220-system_gtest.patch
@@ -1,7 +1,7 @@
https://github.com/google/mozc/issues/490
---- /src/gyp/defines.gypi
-+++ /src/gyp/defines.gypi
+--- a/src/gyp/defines.gypi
++++ b/src/gyp/defines.gypi
@@ -67,6 +67,10 @@
# use_system_abseil_cpp represents if system version or bundled version
# of abseil-cpp library is used.
@@ -13,8 +13,8 @@ https://github.com/google/mozc/issues/490
},
'target_defaults': {
'defines': [
---- /src/testing/testing.gyp
-+++ /src/testing/testing.gyp
+--- a/src/testing/testing.gyp
++++ b/src/testing/testing.gyp
@@ -59,54 +59,76 @@
'targets': [
{
diff --git a/app-i18n/mozc/files/mozc-2.26.4220-system_jsoncpp.patch b/app-i18n/mozc/files/mozc-2.26.4220-system_jsoncpp.patch
index 7ff132eaa59..479759ba6e4 100644
--- a/app-i18n/mozc/files/mozc-2.26.4220-system_jsoncpp.patch
+++ b/app-i18n/mozc/files/mozc-2.26.4220-system_jsoncpp.patch
@@ -1,7 +1,7 @@
https://github.com/google/mozc/issues/490
---- /src/gyp/defines.gypi
-+++ /src/gyp/defines.gypi
+--- a/src/gyp/defines.gypi
++++ b/src/gyp/defines.gypi
@@ -71,6 +71,10 @@
# use_system_gtest represents if system version or bundled version
# of gtest library is used.
@@ -13,8 +13,8 @@ https://github.com/google/mozc/issues/490
},
'target_defaults': {
'defines': [
---- /src/net/jsoncpp.gyp
-+++ /src/net/jsoncpp.gyp
+--- a/src/net/jsoncpp.gyp
++++ b/src/net/jsoncpp.gyp
@@ -31,32 +31,60 @@
'targets': [
{
@@ -101,8 +101,8 @@ https://github.com/google/mozc/issues/490
},
],
}
---- /src/net/jsoncpp.h
-+++ /src/net/jsoncpp.h
+--- a/src/net/jsoncpp.h
++++ b/src/net/jsoncpp.h
@@ -35,7 +35,11 @@
// Mozc basically disables C++ exception.
#define JSON_USE_EXCEPTION 0
diff --git a/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild b/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
index 7d999af9f7b..263f8861cfa 100644
--- a/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
+++ b/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2010-2022 Gentoo Authors
+# Copyright 2010-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
inherit elisp-common multiprocessing python-any-r1 toolchain-funcs
diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild
deleted file mode 100644
index 5dfce42e191..00000000000
--- a/app-i18n/mozc/mozc-9999.ebuild
+++ /dev/null
@@ -1,380 +0,0 @@
-# Copyright 2010-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit elisp-common multiprocessing python-any-r1 toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/google/mozc"
- EGIT_SUBMODULES=(src/third_party/japanese_usage_dictionary)
-else
- MOZC_GIT_REVISION=""
- MOZC_DATE="${PV#*_p}"
- MOZC_DATE="${MOZC_DATE%%_p*}"
-
- FCITX_MOZC_GIT_REVISION=""
- FCITX_MOZC_DATE="${PV#*_p}"
- FCITX_MOZC_DATE="${FCITX_MOZC_DATE#*_p}"
- FCITX_MOZC_DATE="${FCITX_MOZC_DATE%%_p*}"
-
- JAPANESE_USAGE_DICTIONARY_GIT_REVISION=""
- JAPANESE_USAGE_DICTIONARY_DATE=""
-fi
-
-DESCRIPTION="Mozc - Japanese input method editor"
-HOMEPAGE="https://github.com/google/mozc"
-if [[ "${PV}" == "9999" ]]; then
- SRC_URI=""
-else
- SRC_URI="https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${PN}-${PV%%_p*}-${MOZC_DATE}.tar.gz
- https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
- fcitx4? ( https://github.com/fcitx/${PN}/archive/${FCITX_MOZC_GIT_REVISION}.tar.gz -> fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz )"
-fi
-
-# Mozc: BSD
-# src/data/dictionary_oss: ipadic, public-domain
-# src/data/unicode: unicode
-# japanese-usage-dictionary: BSD-2
-LICENSE="BSD BSD-2 ipadic public-domain unicode"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug emacs fcitx4 +gui ibus renderer test"
-REQUIRED_USE="|| ( emacs fcitx4 ibus )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
- >=dev-libs/protobuf-3.0.0
- dev-util/gyp
- dev-util/ninja
- virtual/pkgconfig
- emacs? ( app-editors/emacs:* )
- fcitx4? ( sys-devel/gettext )"
-DEPEND=">=dev-cpp/abseil-cpp-20200923[cxx17(+)]
- >=dev-libs/protobuf-3.0.0:=
- fcitx4? (
- app-i18n/fcitx:4
- virtual/libintl
- )
- gui? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
- ibus? (
- >=app-i18n/ibus-1.4.1
- dev-libs/glib:2
- x11-libs/libxcb
- )
- renderer? (
- dev-libs/glib:2
- x11-libs/cairo
- x11-libs/gtk+:2
- x11-libs/pango
- )
- test? (
- >=dev-cpp/gtest-1.8.0
- dev-libs/jsoncpp
- )"
-RDEPEND=">=dev-cpp/abseil-cpp-20200923[cxx17(+)]
- >=dev-libs/protobuf-3.0.0:=
- emacs? ( app-editors/emacs:* )
- fcitx4? (
- app-i18n/fcitx:4
- virtual/libintl
- )
- gui? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
- ibus? (
- >=app-i18n/ibus-1.4.1
- dev-libs/glib:2
- x11-libs/libxcb
- )
- renderer? (
- dev-libs/glib:2
- x11-libs/cairo
- x11-libs/gtk+:2
- x11-libs/pango
- )"
-
-S="${WORKDIR}/${P}/src"
-
-SITEFILE="50${PN}-gentoo.el"
-
-execute() {
- einfo "$@"
- "$@"
-}
-
-python_check_deps() {
- has_version -b "dev-python/six[${PYTHON_USEDEP}]"
-}
-
-src_unpack() {
- if [[ "${PV}" == "9999" ]]; then
- git-r3_src_unpack
-
- if use fcitx4; then
- local EGIT_SUBMODULES=()
- git-r3_fetch https://github.com/fcitx/mozc refs/heads/fcitx
- git-r3_checkout https://github.com/fcitx/mozc "${WORKDIR}/fcitx-mozc"
- fi
- else
- unpack ${PN}-${PV%%_p*}-${MOZC_DATE}.tar.gz
- mv mozc-${MOZC_GIT_REVISION} ${P} || die
-
- unpack japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
- cp -p japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}/usage_dict.txt ${P}/src/third_party/japanese_usage_dictionary || die
-
- if use fcitx4; then
- unpack fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz
- mv mozc-${FCITX_MOZC_GIT_REVISION} fcitx-${PN}
- fi
- fi
-}
-
-src_prepare() {
- if use fcitx4; then
- cp -pr "${WORKDIR}/fcitx-mozc/src/unix/fcitx" unix || die
- fi
-
- pushd "${WORKDIR}/${P}" > /dev/null || die
-
- eapply "${FILESDIR}/${PN}-2.26.4220-system_abseil-cpp.patch"
- eapply "${FILESDIR}/${PN}-2.26.4220-system_gtest.patch"
- eapply "${FILESDIR}/${PN}-2.26.4220-system_jsoncpp.patch"
- eapply "${FILESDIR}/${PN}-2.26.4220-environmental_variables.patch"
- eapply "${FILESDIR}/${PN}-2.26.4220-server_path_check.patch"
-
- eapply_user
-
- popd > /dev/null || die
-
- sed \
- -e "s/def GypMain(options, unused_args):/def GypMain(options, gyp_args):/" \
- -e "s/RunOrDie(gyp_command + gyp_options)/RunOrDie(gyp_command + gyp_options + gyp_args)/" \
- -e "s/RunOrDie(\[ninja/&, '-j$(makeopts_jobs "${MAKEOPTS}" 999)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
- -i build_mozc.py || die
-
- local ar=($(tc-getAR))
- local cc=($(tc-getCC))
- local cxx=($(tc-getCXX))
- local ld=($(tc-getLD))
- local nm=($(tc-getNM))
- local readelf=($(tc-getREADELF))
-
- # Use absolute paths. Non-absolute paths are mishandled by GYP.
- ar[0]=$(type -P ${ar[0]})
- cc[0]=$(type -P ${cc[0]})
- cxx[0]=$(type -P ${cxx[0]})
- ld[0]=$(type -P ${ld[0]})
- nm[0]=$(type -P ${nm[0]})
- readelf[0]=$(type -P ${readelf[0]})
-
- sed \
- -e "s:<!(which ar):${ar[@]}:" \
- -e "s:<!(which clang):${cc[@]}:" \
- -e "s:<!(which clang++):${cxx[@]}:" \
- -e "s:<!(which ld):${ld[@]}:" \
- -e "s:<!(which nm):${nm[@]}:" \
- -e "s:<!(which readelf):${readelf[@]}:" \
- -i gyp/common.gypi || die
-
- # https://github.com/google/mozc/issues/489
- sed \
- -e "/'-lc++'/d" \
- -e "/'-stdlib=libc++'/d" \
- -i gyp/common.gypi || die
-}
-
-src_configure() {
- if use debug; then
- BUILD_TYPE="Debug"
- else
- BUILD_TYPE="Release"
- fi
-
- local gyp_arguments=()
-
- if tc-is-gcc; then
- gyp_arguments+=(-D compiler_host=gcc -D compiler_target=gcc)
- elif tc-is-clang; then
- gyp_arguments+=(-D compiler_host=clang -D compiler_target=clang)
- else
- gyp_arguments+=(-D compiler_host=unknown -D compiler_target=unknown)
- fi
-
- gyp_arguments+=(-D debug_extra_cflags=)
- gyp_arguments+=(-D release_extra_cflags=)
-
- gyp_arguments+=(-D use_fcitx=$(usex fcitx4 YES NO))
- gyp_arguments+=(-D use_libibus=$(usex ibus 1 0))
- gyp_arguments+=(-D use_libprotobuf=1)
- gyp_arguments+=(-D use_system_abseil_cpp=1)
- gyp_arguments+=(-D use_system_gtest=$(usex test 1 0))
- gyp_arguments+=(-D use_system_jsoncpp=$(usex test 1 0))
- gyp_arguments+=(-D enable_gtk_renderer=$(usex renderer 1 0))
-
- gyp_arguments+=(-D server_dir="${EPREFIX}/usr/libexec/mozc")
- gyp_arguments+=(-D document_dir="${EPREFIX}/usr/libexec/mozc/documents")
-
- if use ibus; then
- gyp_arguments+=(-D ibus_mozc_path="${EPREFIX}/usr/libexec/ibus-engine-mozc")
- gyp_arguments+=(-D ibus_mozc_icon_path="${EPREFIX}/usr/share/ibus-mozc/product_icon.png")
- fi
-
- unset AR CC CXX LD NM READELF
-
- execute "${PYTHON}" build_mozc.py gyp \
- --gypdir="${EPREFIX}/usr/bin" \
- --server_dir="${EPREFIX}/usr/libexec/mozc" \
- --verbose \
- $(usex gui "" --noqt) \
- -- "${gyp_arguments[@]}" || die "Configuration failed"
-}
-
-src_compile() {
- local targets=(server/server.gyp:mozc_server)
- if use emacs; then
- targets+=(unix/emacs/emacs.gyp:mozc_emacs_helper)
- fi
- if use fcitx4; then
- targets+=(unix/fcitx/fcitx.gyp:fcitx-mozc)
- fi
- if use gui; then
- targets+=(gui/gui.gyp:mozc_tool)
- fi
- if use ibus; then
- targets+=(unix/ibus/ibus.gyp:ibus_mozc)
- fi
- if use renderer; then
- targets+=(renderer/renderer.gyp:mozc_renderer)
- fi
- if use test; then
- targets+=(gyp/tests.gyp:unittests)
- fi
-
- execute "${PYTHON}" build_mozc.py build -c ${BUILD_TYPE} -v "${targets[@]}" || die "Building failed"
-
- if use emacs; then
- elisp-compile unix/emacs/*.el
- fi
-}
-
-src_test() {
- execute "${PYTHON}" build_mozc.py runtests -c ${BUILD_TYPE} --test_jobs 1 || die "Testing failed"
-}
-
-src_install() {
- exeinto /usr/libexec/mozc
- doexe out_linux/${BUILD_TYPE}/mozc_server
-
- if use gui; then
- doexe out_linux/${BUILD_TYPE}/mozc_tool
- fi
-
- if use renderer; then
- doexe out_linux/${BUILD_TYPE}/mozc_renderer
- fi
-
- insinto /usr/libexec/mozc/documents
- doins data/installer/credits_en.html
-
- if use emacs; then
- dobin out_linux/${BUILD_TYPE}/mozc_emacs_helper
- elisp-install ${PN} unix/emacs/*.{el,elc}
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN}
- fi
-
- if use fcitx4; then
- exeinto /usr/$(get_libdir)/fcitx
- doexe out_linux/${BUILD_TYPE}/fcitx-mozc.so
-
- insinto /usr/share/fcitx/addon
- doins unix/fcitx/fcitx-mozc.conf
-
- insinto /usr/share/fcitx/inputmethod
- doins unix/fcitx/mozc.conf
-
- insinto /usr/share/fcitx/mozc/icon
- newins data/images/product_icon_32bpp-128.png mozc.png
- local image
- for image in ../../fcitx-${PN}/src/data/images/unix/ui-*.png; do
- newins "${image}" "mozc-${image#../../fcitx-${PN}/src/data/images/unix/ui-}"
- done
-
- local locale mo_file
- for mo_file in out_linux/${BUILD_TYPE}/gen/unix/fcitx/po/*.mo; do
- locale="${mo_file##*/}"
- locale="${locale%.mo}"
- insinto /usr/share/locale/${locale}/LC_MESSAGES
- newins "${mo_file}" fcitx-mozc.mo
- done
- fi
-
- if use ibus; then
- exeinto /usr/libexec
- newexe out_linux/${BUILD_TYPE}/ibus_mozc ibus-engine-mozc
-
- insinto /usr/share/ibus/component
- doins out_linux/${BUILD_TYPE}/gen/unix/ibus/mozc.xml
-
- insinto /usr/share/ibus-mozc
- newins data/images/unix/ime_product_icon_opensource-32.png product_icon.png
- local image
- for image in data/images/unix/ui-*.png; do
- newins "${image}" "${image#data/images/unix/ui-}"
- done
- fi
-}
-
-pkg_postinst() {
- elog
- elog "ENVIRONMENTAL VARIABLES"
- elog
- elog "MOZC_SERVER_DIRECTORY"
- elog " Mozc server directory"
- elog " Value used by default: \"${EPREFIX}/usr/libexec/mozc\""
- elog "MOZC_DOCUMENTS_DIRECTORY"
- elog " Mozc documents directory"
- elog " Value used by default: \"${EPREFIX}/usr/libexec/mozc/documents\""
- elog "MOZC_CONFIGURATION_DIRECTORY"
- elog " Mozc configuration directory"
- elog " Value used by default: \"~/.mozc\""
- elog
- if use emacs; then
- elog
- elog "USAGE IN EMACS"
- elog
- elog "mozc-mode is minor mode to input Japanese text using Mozc server."
- elog "mozc-mode can be used via LEIM (Library of Emacs Input Method)."
- elog
- elog "In order to use mozc-mode by default, the following settings should be added to"
- elog "Emacs init file (~/.emacs.d/init.el or ~/.emacs):"
- elog
- elog " (require 'mozc)"
- elog " (set-language-environment \"Japanese\")"
- elog " (setq default-input-method \"japanese-mozc\")"
- elog
- elog "With the above settings, typing C-\\ (which is bound to \"toggle-input-method\""
- elog "by default) will enable mozc-mode."
- elog
- elog "Alternatively, at run time, after loading mozc.el, mozc-mode can be activated by"
- elog "calling \"set-input-method\" and entering \"japanese-mozc\"."
- elog
-
- elisp-site-regen
- fi
-}
-
-pkg_postrm() {
- if use emacs; then
- elisp-site-regen
- fi
-}
diff --git a/app-i18n/nabi/Manifest b/app-i18n/nabi/Manifest
index e8804ae80f7..7275f9d7c97 100644
--- a/app-i18n/nabi/Manifest
+++ b/app-i18n/nabi/Manifest
@@ -1 +1,2 @@
DIST nabi-1.0.0.tar.gz 868761 BLAKE2B 125028a4a3a6c51edfeee45de42868c5c0397d8545fdaaffc8a305282ea7d8af102487ad86016e1d6e7275cf7e8a5cd0111bd7f8b9c38470021b94585c1cbf1d SHA512 cd093fc54fc4a40eaa85f9973999b9fe2e37344c1004b56fe9a2102bb0747294ba2af76aca2be234ce4fe07a5e8175d1bab7423dd2cee92ab88af865cd856005
+DIST nabi-1.0.1.tar.gz 927009 BLAKE2B b53e3131e2998499f4004c07272bd1715905fbf26c8e524299bc1a4a80d8cada6d6368f372619893f5edec3b5c1595afe4c25756f171df88a2b805644c9d115b SHA512 8113b31df792ff1b31b1e063671a30e21c312e27627c0e15d9de872bb644eeaea4ebb65ef399dea2d75563d81941990f59adbe1e4c584026e02dcdafe389e9c1
diff --git a/app-i18n/nabi/nabi-1.0.1.ebuild b/app-i18n/nabi/nabi-1.0.1.ebuild
new file mode 100644
index 00000000000..d7bfd2dc3d9
--- /dev/null
+++ b/app-i18n/nabi/nabi-1.0.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Simple Hanguk X Input Method"
+HOMEPAGE="https://github.com/libhangul/nabi"
+SRC_URI="https://github.com/libhangul/nabi/archive/refs/tags/${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${P}
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug nls"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+ >=app-i18n/libhangul-0.1
+ dev-libs/glib:2
+ x11-libs/gtk+:2
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ virtual/libintl
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog.0 NEWS README TODO )
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=()
+
+ # Broken configure: --disable-debug also enables debug
+ use debug && myconf+=( --enable-debug )
+
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+
+ insinto /etc/X11/xinit/xinput.d
+ sed -e "s:@EPREFIX@:${EPREFIX}:g" "${FILESDIR}"/xinput-${PN} | newins - ${PN}.conf
+}
+
+pkg_postinst() {
+ elog "You MUST add environment variable..."
+ elog
+ elog "export XMODIFIERS=\"@im=nabi\""
+ elog
+}
diff --git a/app-i18n/nkf/files/nkf-2.1.5-python-ssize_t-deux.patch b/app-i18n/nkf/files/nkf-2.1.5-python-ssize_t-deux.patch
new file mode 100644
index 00000000000..355951cab31
--- /dev/null
+++ b/app-i18n/nkf/files/nkf-2.1.5-python-ssize_t-deux.patch
@@ -0,0 +1,45 @@
+https://github.com/fumiyas/python-nkf/pull/7
+
+From abdebb9d49619d9b9cafa172d2ad7c171f3977d4 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 4 Oct 2022 05:56:12 +0100
+Subject: [PATCH] Use designated initialiser syntax for PyModuleDef
+
+Fixes build with Clang. Switch to the more readable designated
+initialiser syntax to avoid having to lookup member order.
+
+Before, Clang would complain:
+```
+nkf.c:205:3: error: incompatible pointer to integer conversion initializing 'Py_ssize_t' (aka 'long') with an expression of type 'void *' [-Wint-conversion]
+ NULL,
+ ^~~~
+/usr/lib/llvm/16/bin/../../../../lib/clang/16.0.0/include/stddef.h:89:16: note: expanded from macro 'NULL'
+ ^~~~~~~~~~
+2 warnings and 1 error generated.
+```
+
+This is because some of PyModuleDef's members are actually
+Py_ssize_t so chucking a NULL in looks like a codesmell to Clang.
+
+Bug: https://bugs.gentoo.org/874303
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/NKF.python/nkf.c
++++ b/NKF.python/nkf.c
+@@ -200,14 +200,8 @@ nkfmethods[] = {
+ static struct PyModuleDef
+ moduledef = {
+ PyModuleDef_HEAD_INIT,
+- "nkf",
+- NULL,
+- NULL,
+- nkfmethods,
+- NULL,
+- NULL,
+- NULL,
+- NULL
++ .m_name = "nkf",
++ .m_methods = nkfmethods
+ };
+
+ /* Module initialization function */
+
diff --git a/app-i18n/nkf/files/nkf-2.1.5-python-ssize_t.patch b/app-i18n/nkf/files/nkf-2.1.5-python-ssize_t.patch
new file mode 100644
index 00000000000..6aa986866e0
--- /dev/null
+++ b/app-i18n/nkf/files/nkf-2.1.5-python-ssize_t.patch
@@ -0,0 +1,71 @@
+https://github.com/nurse/nkf/commit/8246108073f739d45a21ef42ad2d9342fa3c6c28
+
+From 8246108073f739d45a21ef42ad2d9342fa3c6c28 Mon Sep 17 00:00:00 2001
+From: slic <slic-io@users.noreply.github.com>
+Date: Sun, 6 Mar 2022 18:05:54 +0900
+Subject: [PATCH] fix: python3 extention ABI # variant when parsing warning
+
+--- a/NKF.python3/NKF_python.c
++++ b/NKF.python3/NKF_python.c
+@@ -20,6 +20,8 @@ Changes.
+ ** THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE.
+ ***************************************************************************/
+
++#define PY_SSIZE_T_CLEAN
++
+ #include "Python.h"
+ #include <setjmp.h>
+
+@@ -33,7 +35,7 @@ Changes.
+ #undef FALSE
+ #define putchar(c) pynkf_putchar(c)
+
+-static int pynkf_ibufsize, pynkf_obufsize;
++static Py_ssize_t pynkf_ibufsize, pynkf_obufsize;
+ static unsigned char *pynkf_inbuf, *pynkf_outbuf;
+ static int pynkf_icount,pynkf_ocount;
+ static unsigned char *pynkf_iptr, *pynkf_optr;
+@@ -62,7 +64,7 @@ pynkf_ungetc(int c, FILE *f)
+ static void
+ pynkf_putchar(int c)
+ {
+- size_t size;
++ Py_ssize_t size;
+ unsigned char *p;
+
+ if (pynkf_guess_flag) {
+@@ -89,7 +91,7 @@ pynkf_putchar(int c)
+ #include "../nkf.c"
+
+ static PyObject *
+-pynkf_convert(unsigned char* str, int strlen, char* opts, int optslen)
++pynkf_convert(unsigned char* str, Py_ssize_t strlen, char* opts, Py_ssize_t optslen)
+ {
+ PyObject * res;
+
+@@ -157,12 +159,12 @@ static
+ PyObject *pynkf_nkf(PyObject *self, PyObject *args)
+ {
+ unsigned char *str;
+- int strlen;
++ Py_ssize_t strlen;
+ char *opts;
+- int optslen;
++ Py_ssize_t optslen;
+ PyObject* res;
+
+- if (!PyArg_ParseTuple(args, "s#y#", &opts, &optslen, &str, &strlen)) {
++ if (!PyArg_ParseTuple(args, "s#s#", &opts, &optslen, &str, &strlen)) {
+ return NULL;
+ }
+ res = pynkf_convert(str, strlen, opts, optslen);
+@@ -178,7 +180,7 @@ PyObject *pynkf_guess(PyObject *self, PyObject *args)
+ int strlen;
+ PyObject* res;
+
+- if (!PyArg_ParseTuple(args, "y#", &str, &strlen)) {
++ if (!PyArg_ParseTuple(args, "s#", &str, &strlen)) {
+ return NULL;
+ }
+ res = pynkf_convert_guess(str, strlen);
+
diff --git a/app-i18n/nkf/metadata.xml b/app-i18n/nkf/metadata.xml
index 7eb84b5ec91..414beff9a71 100644
--- a/app-i18n/nkf/metadata.xml
+++ b/app-i18n/nkf/metadata.xml
@@ -7,5 +7,7 @@
</maintainer>
<upstream>
<remote-id type="osdn">nkf</remote-id>
+ <remote-id type="github">nurse/nkf</remote-id>
+ <remote-id type="github">fumiyas/python-nkf</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-i18n/nkf/nkf-2.1.5-r1.ebuild b/app-i18n/nkf/nkf-2.1.5-r1.ebuild
new file mode 100644
index 00000000000..c527d640989
--- /dev/null
+++ b/app-i18n/nkf/nkf-2.1.5-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..10} )
+DISTUTILS_OPTIONAL="1"
+
+inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot
+
+PY_P="python-${PN}-0.2.0_p20191121"
+PY_COMMIT="c2c6724714b66f295137c8818dae4c09fc09e0a3"
+
+DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support"
+HOMEPAGE="https://osdn.net/projects/nkf/"
+SRC_URI="mirror://sourceforge.jp/${PN}/70406/${P}.tar.gz
+ python? ( https://github.com/fumiyas/python-${PN}/archive/${PY_COMMIT}.tar.gz -> ${PY_P}.tar.gz )"
+
+LICENSE="ZLIB python? ( BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="perl python l10n_ja"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="python? (
+ ${PYTHON_DEPS}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ )"
+
+src_unpack() {
+ use python && vcs-snapshot_src_unpack || default
+}
+
+src_prepare() {
+ sed -i \
+ -e "/^CFLAGS/{ s/-g -O2//; s/=/+=/; }" \
+ -e "/ -o ${PN}/s/\(-o \)/\$(LDFLAGS) \1/" \
+ Makefile
+ if use python; then
+ mv "${WORKDIR}"/${PY_P} NKF.python || die
+ eapply "${FILESDIR}"/${PN}-python.patch
+ eapply "${FILESDIR}"/${P}-python-ssize_t.patch
+ eapply "${FILESDIR}"/${PN}-2.1.5-python-ssize_t-deux.patch
+
+ cd NKF.python || die
+ distutils-r1_src_prepare
+ cd - >/dev/null || die
+ fi
+
+ default
+}
+
+src_configure() {
+ default
+ if use perl; then
+ cd NKF.mod || die
+ perl-module_src_configure
+ cd - >/dev/null || die
+ fi
+ if use python; then
+ cd NKF.python || die
+ distutils-r1_src_configure
+ cd - >/dev/null || die
+ fi
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+ if use perl; then
+ cd NKF.mod || die
+ perl-module_src_compile
+ cd - >/dev/null || die
+ fi
+ if use python; then
+ cd NKF.python || die
+ distutils-r1_src_compile
+ cd - >/dev/null || die
+ fi
+}
+
+src_test() {
+ default
+ if use perl; then
+ cd NKF.mod || die
+ perl-module_src_test
+ cd - >/dev/null || die
+ fi
+}
+
+src_install() {
+ dobin ${PN}
+ doman ${PN}.1
+
+ if use l10n_ja; then
+ iconv -f ISO-2022-JP-3 -t UTF-8 ${PN}.1j > ${PN}.ja.1 || die
+ doman ${PN}.ja.1
+ fi
+ dodoc ${PN}.doc
+
+ if use perl; then
+ cd NKF.mod || die
+ docinto perl
+ perl-module_src_install
+ cd - >/dev/null || die
+ fi
+ if use python; then
+ cd NKF.python || die
+ docinto python
+ DOCS= distutils-r1_src_install
+ dodoc CHANGES README.md
+ cd - >/dev/null || die
+ fi
+}
diff --git a/app-i18n/nkf/nkf-2.1.5.ebuild b/app-i18n/nkf/nkf-2.1.5.ebuild
index fe8b98b53eb..f99a5da18d0 100644
--- a/app-i18n/nkf/nkf-2.1.5.ebuild
+++ b/app-i18n/nkf/nkf-2.1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
DISTUTILS_OPTIONAL="1"
inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot
diff --git a/app-i18n/opencc/opencc-1.1.4.ebuild b/app-i18n/opencc/opencc-1.1.4.ebuild
index ccdabe3b3bb..b8a6652fc9d 100644
--- a/app-i18n/opencc/opencc-1.1.4.ebuild
+++ b/app-i18n/opencc/opencc-1.1.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2010-2022 Gentoo Authors
+# Copyright 2010-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
inherit cmake python-any-r1
diff --git a/app-i18n/opencc/opencc-9999.ebuild b/app-i18n/opencc/opencc-9999.ebuild
index 984d6385706..589730579a7 100644
--- a/app-i18n/opencc/opencc-9999.ebuild
+++ b/app-i18n/opencc/opencc-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2010-2022 Gentoo Authors
+# Copyright 2010-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
inherit cmake python-any-r1
diff --git a/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild b/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild
index 4944ecf856d..bdcf77c9e23 100644
--- a/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild
+++ b/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
inherit autotools python-any-r1
diff --git a/app-i18n/rime-data/rime-data-0.38.20180515.ebuild b/app-i18n/rime-data/rime-data-0.38.20180515.ebuild
index 3fae7368012..85dc641ecda 100644
--- a/app-i18n/rime-data/rime-data-0.38.20180515.ebuild
+++ b/app-i18n/rime-data/rime-data-0.38.20180515.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rime/${MY_PN}/releases/download/${MY_P%.*}/${MY_P}.t
LICENSE="GPL-3 LGPL-3 extra? ( Apache-2.0 )"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm64 ppc ppc64 ~riscv x86"
IUSE="extra"
DEPEND="app-i18n/librime"
diff --git a/app-i18n/scim-sunpinyin/Manifest b/app-i18n/scim-sunpinyin/Manifest
deleted file mode 100644
index 016fef2a715..00000000000
--- a/app-i18n/scim-sunpinyin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e
diff --git a/app-i18n/scim-sunpinyin/metadata.xml b/app-i18n/scim-sunpinyin/metadata.xml
deleted file mode 100644
index 1c401324a2f..00000000000
--- a/app-i18n/scim-sunpinyin/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="gtk3">Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag>
- </use>
- <upstream>
- <remote-id type="github">sunpinyin/sunpinyin</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-i18n/scim-sunpinyin/scim-sunpinyin-3.0.0_rc1.ebuild b/app-i18n/scim-sunpinyin/scim-sunpinyin-3.0.0_rc1.ebuild
deleted file mode 100644
index ed668fa02f7..00000000000
--- a/app-i18n/scim-sunpinyin/scim-sunpinyin-3.0.0_rc1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 scons-utils toolchain-funcs vcs-snapshot
-
-MY_P="${P#*-}"
-
-DESCRIPTION="SunPinyin IMEngine for SCIM"
-HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
-SRC_URI="https://github.com/${PN#*-}/${PN#*-}/archive/v${PV/_rc/-rc}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1 CDDL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk3"
-
-RDEPEND="app-i18n/scim[gtk3=]
- ~app-i18n/sunpinyin-${PV}:="
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- tc-export CXX
-}
-
-src_compile() {
- escons -C wrapper/scim \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --libexecdir="${EPREFIX}"/usr/libexec
-}
-
-src_install() {
- escons -C wrapper/scim --install-sandbox="${D}" install
- dodoc wrapper/scim/README
-}
diff --git a/app-i18n/scim/scim-1.4.18.ebuild b/app-i18n/scim/scim-1.4.18.ebuild
index a072ff8c3e0..da96c9ba442 100644
--- a/app-i18n/scim/scim-1.4.18.ebuild
+++ b/app-i18n/scim/scim-1.4.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/scim-im/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86"
IUSE="doc gtk3"
RDEPEND="x11-libs/libX11
diff --git a/app-i18n/skk-jisyo/skk-jisyo-202005.ebuild b/app-i18n/skk-jisyo/skk-jisyo-202005.ebuild
index 5656df1d6f5..3a8cd33b75b 100644
--- a/app-i18n/skk-jisyo/skk-jisyo-202005.ebuild
+++ b/app-i18n/skk-jisyo/skk-jisyo-202005.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
KEYWORDS="amd64 arm ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
IUSE="cdb"
-DEPEND="virtual/awk
+DEPEND="app-alternatives/awk
cdb? (
|| (
dev-db/tinycdb
diff --git a/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild b/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild
index 4afa4781d97..f680501ee5c 100644
--- a/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild
+++ b/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild
@@ -19,7 +19,7 @@ IUSE="cdb ${USE_RUBY//ruby/ruby_targets_ruby}"
DEPEND="${RUBY_DEPS}
app-i18n/skktools
- virtual/awk
+ app-alternatives/awk
cdb? (
|| (
dev-db/tinycdb
diff --git a/app-i18n/skkfep/skkfep-0.87-r1.ebuild b/app-i18n/skkfep/skkfep-0.87-r1.ebuild
index dd987045396..c852c315a65 100644
--- a/app-i18n/skkfep/skkfep-0.87-r1.ebuild
+++ b/app-i18n/skkfep/skkfep-0.87-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -17,8 +17,8 @@ IUSE=""
DEPEND="sys-libs/ncurses:="
RDEPEND="${DEPEND}
app-i18n/skk-jisyo"
-BDEPEND="sys-apps/sed
- virtual/awk
+BDEPEND="
+ app-alternatives/awk
virtual/pkgconfig"
PATCHES=(
diff --git a/app-i18n/skktools/skktools-1.3.4.ebuild b/app-i18n/skktools/skktools-1.3.4-r1.ebuild
index 9c127e93c7c..bc195d8c1cf 100644
--- a/app-i18n/skktools/skktools-1.3.4.ebuild
+++ b/app-i18n/skktools/skktools-1.3.4-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=8
inherit elisp-common vcs-snapshot
@@ -9,7 +9,7 @@ DESCRIPTION="SKK utilities to manage dictionaries"
HOMEPAGE="http://openlab.jp/skk/"
SRC_URI="https://github.com/skk-dev/skktools/archive/${P//./_}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 ~arm ~riscv x86"
IUSE="emacs"
@@ -17,8 +17,8 @@ IUSE="emacs"
RDEPEND="dev-libs/glib:2
sys-libs/gdbm
emacs? ( >=app-editors/emacs-23.1:* )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
SITEFILE="50${PN}-gentoo.el"
@@ -41,12 +41,12 @@ src_install() {
local d
for d in convert2skk filters; do
newdoc ${d}/README.md README.${d}
- rm -f ${d}/README.md
+ rm -f ${d}/README.md || die
done
insinto /usr/share/${PN}
doins *.{awk,scm}
- rm -rf convert2skk/obsolete
+ rm -rf convert2skk/obsolete || die
doins -r convert2skk filters
if use emacs; then
diff --git a/app-i18n/sunpinyin-data/Manifest b/app-i18n/sunpinyin-data/Manifest
deleted file mode 100644
index 4b60e3da416..00000000000
--- a/app-i18n/sunpinyin-data/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST dict.utf8-20131214.tar.bz2 674512 BLAKE2B b5e1756b52e8b4fd7839d4a72004b7ddc789986899cc626341f13b702ee1e0b54780c992b2988289bdbe7ff979f3243efc1b5a5e04a0529b9a3f6b327a49faef SHA512 adaf52a27c6afdeb950912845f3fcb7a6799f997d50a2892ceecf76ed13e3644407338d734832c2ce4b09bce11fec4731774f1eb2dd4c30bea5490555915bd5b
-DIST lm_sc.3gm.arpa-20140820.tar.bz2 36623028 BLAKE2B 9456c51dbba59e5d20a1bdd9b06f0ef863c77eb7651287b45f143e6919aedf46ea81ca4da5c037c4b9775c19e68849720cb0e1b3db4cc9dd8df84832ac2eba6a SHA512 ea3ede62eb993c4d21ca7cf339635f4686493a0cefd57df4a31f00a001e67502a13ff9612ff667b941b82b47de00be9f3c9689677d04195a7ef8716bac087519
diff --git a/app-i18n/sunpinyin-data/metadata.xml b/app-i18n/sunpinyin-data/metadata.xml
deleted file mode 100644
index c458036026f..00000000000
--- a/app-i18n/sunpinyin-data/metadata.xml
+++ /dev/null
@@ -1,11 +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>
- <upstream>
- <remote-id type="github">sunpinyin/open-gram</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild b/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild
deleted file mode 100644
index c2bcae4866a..00000000000
--- a/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2013-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit edo
-
-DICT_VERSION="20131214"
-LM_VERSION="${PV}"
-
-DESCRIPTION="Data sets for SunPinyin"
-HOMEPAGE="https://github.com/sunpinyin/open-gram"
-SRC_URI="mirror://sourceforge/open-gram/dict.utf8-${DICT_VERSION}.tar.bz2
- mirror://sourceforge/open-gram/lm_sc.3gm.arpa-${LM_VERSION}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~riscv x86"
-IUSE=""
-
-# https://github.com/sunpinyin/sunpinyin/commit/0fff1e78d9a409205e025736286838721a2ccbf8
-BDEPEND=">=app-i18n/sunpinyin-2.0.4_pre20140819192400"
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
- default
- mkdir "${S}" || die
- mv "${WORKDIR}"/dict.utf8 "${S}" || die
- mv "${WORKDIR}"/lm_sc.3gm.arpa "${S}" || die
-}
-
-src_compile() {
- # lm_sc.t3g
- edo slmpack lm_sc.3gm.arpa dict.utf8 lm_sc.3gm
- edo slmthread lm_sc.3gm lm_sc.t3g.orig
- edo tslmendian -i lm_sc.t3g.orig -o lm_sc.t3g
- # lexicon3
- edo genpyt -i dict.utf8 -s lm_sc.t3g.orig -l pydict_sc.log -o pydict_sc.bin
-}
-
-src_install() {
- insinto /usr/share/${PN/-data}
- doins lm_sc.t3g pydict_sc.bin
-}
diff --git a/app-i18n/sunpinyin/Manifest b/app-i18n/sunpinyin/Manifest
deleted file mode 100644
index ab2a2125633..00000000000
--- a/app-i18n/sunpinyin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sunpinyin-2.0.4_pre20200306162733.tar.gz 547519 BLAKE2B 6e0e4457217d7b85221cab15173f588a5c7c039208a8f6cd48ed5fb21c5b5eae2f4616d6fddbf6eff8a006193097de26c866d5385d4602f41059ee8d7e52a2d5 SHA512 e8cf73aeca8dcbc7dd6f51f034a9a0363201bc14a814800e071c987933935b0e8039aa84178a6bd1cba1c7dee4b25b2d5546e78ea683e68e8981afea48fdab33
diff --git a/app-i18n/sunpinyin/metadata.xml b/app-i18n/sunpinyin/metadata.xml
deleted file mode 100644
index de8f4d24515..00000000000
--- a/app-i18n/sunpinyin/metadata.xml
+++ /dev/null
@@ -1,11 +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>
- <upstream>
- <remote-id type="github">sunpinyin/sunpinyin</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
deleted file mode 100644
index ada55c754c6..00000000000
--- a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2009-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit python-any-r1 scons-utils toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/sunpinyin/sunpinyin"
-elif [[ "${PV}" == *_pre* ]]; then
- SUNPINYIN_GIT_REVISION="f39c195db08661e894017507842991a1ef70bedf"
-fi
-
-DESCRIPTION="Statistical Language Model (SLM) based Chinese input method library"
-HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
-if [[ "${PV}" == "9999" ]]; then
- SRC_URI=""
-elif [[ "${PV}" == *_pre* ]]; then
- SRC_URI="https://github.com/sunpinyin/${PN}/archive/${SUNPINYIN_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
-else
- SRC_URI="https://github.com/sunpinyin/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="|| ( CDDL LGPL-2.1 )"
-SLOT="0/3"
-KEYWORDS="amd64 ppc ppc64 ~riscv x86"
-IUSE=""
-
-BDEPEND="dev-lang/perl
- virtual/pkgconfig"
-DEPEND="dev-db/sqlite:3
- virtual/libiconv"
-RDEPEND="${DEPEND}"
-
-if [[ "${PV}" == *_pre* ]]; then
- S="${WORKDIR}/${PN}-${SUNPINYIN_GIT_REVISION}"
-elif [[ "${PV}" != "9999" ]]; then
- S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-src_prepare() {
- default
- sed -e "/^docdir =/s:/sunpinyin:/${PF}:" -i SConstruct || die
-
- # https://github.com/sunpinyin/sunpinyin/issues/109
- sed -e "/^Requires: sqlite3$/s/^Requires:/Requires.private:/" -i sunpinyin-2.0.pc.in || die
-}
-
-src_configure() {
- tc-export CXX
-}
-
-src_compile() {
- escons \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_install() {
- escons --install-sandbox="${D}" install
-}
diff --git a/app-i18n/transifex-client/Manifest b/app-i18n/transifex-client/Manifest
index 9c352452785..652e2e25f4b 100644
--- a/app-i18n/transifex-client/Manifest
+++ b/app-i18n/transifex-client/Manifest
@@ -1,4 +1,4 @@
-DIST transifex-client-1.3.0-deps.tar.bz 241930614 BLAKE2B 7855172504f3fe1208556e0030bcaec7dac4b21ed948926368b0b91c1984cb73e6d0bda0110bdd592cf3be7835f847fe54009f2c5c41fd14899b7b5d37932937 SHA512 5eb88614b354aeac0acd02cfe416c884adb8070614946dd71de512030e410a20ca7eb6b426876c218ef9b6ec1d4faf9eb557e2daf84cf9895cce04c33a937655
-DIST transifex-client-1.3.0.tar.gz 87395 BLAKE2B 90da67d49e1b2e09d509b0ff373f0403eddc5c29a63ca64f747006ed3cb95c51add58e442a139e7e17d28b44e700aed249d0e5ca563f6af832578640f8f7164d SHA512 6e81d94e95157322d0fc74386d7e6f218f589bb81ce36b0967c09ca9199d641b13953f491373d9e7ec9f6ddc50c243801a24da985a2e577b733bf364623e3d75
-DIST transifex-client-1.3.1-deps.tar.bz 241386467 BLAKE2B fb0e2c6c3f722afee5b6ce0eb8536b53139ec816411eba9bfa6fdf17d850c3cce0bce5f662e770da582001b7f34709d362d2ac3cfc8149f4affa5878a9f475f9 SHA512 f2d77065a31c2aa8c6518b5ce382ed82ee6eb34d03c2981daf9563ab09367d8f2a8b0be37947a23dfca56d59c987e555b89b6728fffba190b56b54871b161895
-DIST transifex-client-1.3.1.tar.gz 87320 BLAKE2B 5fa402f8b9dbcde3030335b544ff5b7982f3477d7f3484d324709467dd694e2d4368e2e78c8ac7203eff92c079814594d7251372cc023bc22c21d966a5ef6a7a SHA512 8692c8d98511240672e1252e309c714eda89c83e34b53826cc8fb0d24059a3fc46ad3f5159c57ce974d63f26c35281cf7100207d3d5932f26c87692f80dac7d2
+DIST transifex-client-1.4.1-deps.tar.bz 241665608 BLAKE2B 88fcdf188c0086c3a8438cee0408e1df8ea17fa7c5724347d8af9b3f94fd843e8a3d68e988c33ceb55f6f8723d6a97fb189027d36fe9f443cbfd39d6f6ddf257 SHA512 a7f6a8e04211756761b2b1295c3cc1ae0c2a3b6486607f0514c38f9314678f48d2f743f681bf1f990310ef89345f02cc06f15908db3df5c4a1c0c7d0fa7601a3
+DIST transifex-client-1.4.1.tar.gz 91054 BLAKE2B 55bde1faf526a633923691cd3dc14d9d481cd4eec040e95eae385c63593545dc2158e0d3518c53a08db70661abf4fb864157d5e7e1fdab403ef02e47d83665fe SHA512 66ad08c9a22e09dbb5690c4da830924e0bd76c9ecf73dbeadc849c7b1911b4439a456c478a5688883278e90903015b0968220f36f7cd951650f364857ac0e08e
+DIST transifex-client-1.6.4-deps.tar.bz 241683180 BLAKE2B 395caf5b5db1ea93363a7f6efc4d2b8ff9e5e8040b04fd8e78ccfbc4b6239c809e348de9d4f8e494d34a2fc6564a70df448961d62a2949c9e2a326cb5f873fcf SHA512 0463cc7ead2c111f4d3889f3f29aa1c729554af0d0934a51aebd691e1f621f9bc61b5b3a90166ee0c947187aa5b489dc6b1bbd438193d6009afdc1a040db1270
+DIST transifex-client-1.6.4.tar.gz 94703 BLAKE2B b51e29aadab41c23b95efc86c334876094772e9d4f4f0cdaa41a5d016e710597da631953446d20689b0028e34bb4cc31ab0bdc1d3107dbc3a4abd6ba9279698e SHA512 d8e6b18d30b9d225c6ed84c9cc699743c289ccfc151c1aa74411989f965f554e651ece3e36a033dc8fc77bc3bb5502b02b2d04b1affe96811195b74edadf128c
diff --git a/app-i18n/transifex-client/transifex-client-1.3.0.ebuild b/app-i18n/transifex-client/transifex-client-1.4.1.ebuild
index f6cb75a144c..f6cb75a144c 100644
--- a/app-i18n/transifex-client/transifex-client-1.3.0.ebuild
+++ b/app-i18n/transifex-client/transifex-client-1.4.1.ebuild
diff --git a/app-i18n/transifex-client/transifex-client-1.3.1.ebuild b/app-i18n/transifex-client/transifex-client-1.6.4.ebuild
index 9a033bd1775..9a033bd1775 100644
--- a/app-i18n/transifex-client/transifex-client-1.3.1.ebuild
+++ b/app-i18n/transifex-client/transifex-client-1.6.4.ebuild
diff --git a/app-i18n/uim/files/uim-clang-16-configure.patch b/app-i18n/uim/files/uim-clang-16-configure.patch
new file mode 100644
index 00000000000..9a1a4726eb1
--- /dev/null
+++ b/app-i18n/uim/files/uim-clang-16-configure.patch
@@ -0,0 +1,42 @@
+Part of this went upstream as https://github.com/uim/uim/commit/99fd890fa601b81ff99e5e0f1977fe309f56b90e.
+--- a/configure.ac
++++ b/configure.ac
+@@ -601,6 +601,7 @@ if test "x$ac_cv_func_snprintf" = xyes; then
+ AC_RUN_IFELSE(
+ [AC_LANG_SOURCE([[
+ #include <stdio.h>
++#include <stdlib.h>
+ int main(void){char b[5];snprintf(b,5,"123456789");exit(b[4]!='\0');}
+ ]])],
+ [AC_MSG_RESULT(yes)],
+--- a/m4/openssl.m4
++++ b/m4/openssl.m4
+@@ -76,6 +76,7 @@ AC_MSG_CHECKING([OpenSSL header version])
+ AC_RUN_IFELSE(
+ [AC_LANG_SOURCE([[
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <openssl/opensslv.h>
+ #define DATA "conftest.sslincver"
+@@ -156,7 +157,9 @@ AC_ARG_WITH(openssl-header-check,
+ AC_MSG_CHECKING([whether OpenSSL's headers match the library])
+ AC_RUN_IFELSE(
+ [AC_LANG_SOURCE([[
++#include <stdlib.h>
+ #include <string.h>
++#include <openssl/crypto.h>
+ #include <openssl/opensslv.h>
+ int main(void) { exit(SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1); }
+ ]])],
+@@ -220,8 +223,8 @@ int main(void) { DTLSv1_method(); }
+ AC_MSG_CHECKING([if programs using OpenSSL functions will link])
+ AC_LINK_IFELSE(
+ [AC_LANG_SOURCE([[
+-#include <openssl/evp.h>
+-int main(void) { SSLeay_add_all_algorithms(); }
++#include <openssl/crypto.h>
++int main(void) { OpenSSL_version_num(); }
+ ]])],
+ [
+ AC_MSG_RESULT(yes)
diff --git a/app-i18n/uim/uim-1.8.9-r1.ebuild b/app-i18n/uim/uim-1.8.9-r1.ebuild
new file mode 100644
index 00000000000..5bc58c15871
--- /dev/null
+++ b/app-i18n/uim/uim-1.8.9-r1.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools elisp-common flag-o-matic gnome2-utils qmake-utils
+
+EGIT_COMMIT="d1ac9d9315ff8c57c713b502544fef9b3a83b3e5"
+
+DESCRIPTION="A multilingual input method framework"
+HOMEPAGE="https://github.com/uim/uim"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="X +anthy curl eb emacs expat libffi gtk gtk2 kde l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft"
+RESTRICT="test"
+REQUIRED_USE="gtk? ( X )
+ gtk2? ( X )
+ qt5? ( X )
+ xft? ( X )"
+
+CDEPEND="X? (
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXft
+ x11-libs/libXrender
+ x11-libs/libXt
+ )
+ anthy? ( app-i18n/anthy )
+ curl? ( net-misc/curl )
+ eb? ( dev-libs/eb )
+ emacs? ( >=app-editors/emacs-23.1:* )
+ expat? ( dev-libs/expat )
+ gtk? ( x11-libs/gtk+:3 )
+ gtk2? ( x11-libs/gtk+:2 )
+ kde? ( kde-frameworks/plasma:5 )
+ libedit? ( dev-libs/libedit )
+ libffi? ( dev-libs/libffi:= )
+ libnotify? ( x11-libs/libnotify )
+ m17n-lib? ( dev-libs/m17n-lib )
+ ncurses? ( sys-libs/ncurses:0= )
+ nls? ( virtual/libintl )
+ qt5? (
+ dev-qt/qtx11extras:5
+ dev-qt/qtwidgets:5
+ )
+ skk? ( app-i18n/skk-jisyo )
+ sqlite? ( dev-db/sqlite:3 )
+ ssl? ( dev-libs/openssl:0= )"
+DEPEND="${CDEPEND}
+ X? ( x11-base/xorg-proto )"
+RDEPEND="${CDEPEND}
+ !dev-scheme/sigscheme
+ X? (
+ media-fonts/font-sony-misc
+ l10n_ja? (
+ || (
+ media-fonts/font-jis-misc
+ media-fonts/intlfonts
+ )
+ )
+ l10n_ko? (
+ || (
+ media-fonts/font-daewoo-misc
+ media-fonts/intlfonts
+ )
+ )
+ l10n_zh-CN? (
+ || (
+ media-fonts/font-isas-misc
+ media-fonts/intlfonts
+ )
+ )
+ l10n_zh-TW? ( media-fonts/intlfonts )
+ )"
+BDEPEND="gnome-base/librsvg
+ sys-devel/gettext
+ virtual/pkgconfig
+ kde? ( dev-util/cmake )
+ nls? ( dev-util/intltool )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-gentoo.patch
+ "${FILESDIR}"/${PN}-kde.patch
+ "${FILESDIR}"/${PN}-slibtool.patch
+ "${FILESDIR}"/${PN}-tinfo.patch
+ "${FILESDIR}"/${PN}-Wconversion.patch
+ "${FILESDIR}"/${PN}-xkb.patch
+ "${FILESDIR}"/${PN}-zh-TW.patch
+ "${FILESDIR}"/${PN}-clang-16-configure.patch
+)
+
+DOCS=( AUTHORS NEWS README RELNOTE doc )
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ default
+ sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
+ use nls || sed -i "/^if .*USE_NLS/,/^fi/d" configure.ac
+ # fix build with "-march=pentium4 -O2", bug #661806
+ use x86 && append-cflags $(test-flags-CC -fno-inline-small-functions)
+
+ # Fix build w/ Clang 16+ and >= openssl 1.1.x, tries to use
+ # SSLv2_method otherwise.
+ append-cppflags -DOPENSSL_NO_SSL2
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ $(use_with X x)
+ $(use_with anthy anthy-utf8)
+ $(use_with curl)
+ $(use_with eb)
+ $(use_enable emacs)
+ $(use_with emacs lispdir "${SITELISP}")
+ $(use_with expat)
+ $(use_enable kde kde5-applet)
+ $(use_with libedit)
+ $(use_with libffi ffi)
+ $(use_with gtk gtk3)
+ $(use_with gtk2)
+ $(use_with m17n-lib m17nlib)
+ $(use_enable ncurses fep)
+ $(use_enable nls)
+ $(use_with qt5)
+ $(use_with qt5 qt5-immodule)
+ _QMAKE5=$(qt5_get_bindir)/qmake
+ $(use_with skk)
+ $(use_with sqlite sqlite3)
+ $(use_enable ssl openssl)
+ $(use_enable static-libs static)
+ $(use_with xft)
+ --without-anthy
+ --without-canna
+ --enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk $(usex qt5 qt5)))
+ --disable-gnome-applet
+ --disable-gnome3-applet
+ --disable-kde-applet
+ --disable-kde4-applet
+ --without-mana
+ --enable-maintainer-mode
+ --without-prime
+ --disable-qt4-qt3support
+ )
+
+ if (use gtk || use gtk2) && use anthy; then
+ myconf+=( --enable-dict )
+ else
+ myconf+=( --disable-dict )
+ fi
+
+ if use libnotify; then
+ myconf+=( --enable-notify=libnotify )
+ fi
+
+ if use gtk || use gtk2 || use qt5; then
+ myconf+=( --enable-pref )
+ else
+ myconf+=( --disable-pref )
+ fi
+
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ default
+
+ if use emacs; then
+ cd emacs || die
+ elisp-compile *.el || die
+ cd - >/dev/null || die
+ fi
+}
+
+src_install() {
+ # bug #222677
+ emake -j1 DESTDIR="${D}" install
+ rm -f doc/Makefile*
+ einstalldocs
+
+ find "${ED}"/usr/$(get_libdir)/${PN} -name '*.la' -delete || die
+ use static-libs || find "${ED}" -name '*.la' -delete || die
+
+ insinto /etc/X11/xinit/xinput.d
+ sed \
+ -e "s:@EPREFIX@:${EPREFIX}:g" \
+ "${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
+ doins "${T}"/${PN}.conf
+
+ if use X; then
+ docinto xim
+ dodoc xim/README*
+ fi
+
+ if use emacs; then
+ elisp-install ${PN}-el emacs/*.el{,c}
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
+ docinto emacs
+ dodoc emacs/README*
+ fi
+
+ if use ncurses; then
+ docinto fep
+ dodoc fep/README*
+ fi
+}
+
+pkg_postinst() {
+ elog "New input method switcher has been introduced. You need to set"
+ elog
+ elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
+ elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
+ elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
+ elog
+ elog "If you would like to use uim-anthy as default input method, put"
+ elog "(define default-im-name 'anthy)"
+ elog "to your ~/.uim."
+ elog
+ elog "All input methods can be found by running uim-im-switcher-gtk, "
+ elog "uim-im-switcher-gtk3 or uim-im-switcher-qt5."
+
+ if use emacs; then
+ elisp-site-regen
+ elog
+ elog "uim is autoloaded with Emacs with a minimal set of features:"
+ elog "There is no keybinding defined to call it directly, so please"
+ elog "create one yourself and choose an input method."
+ elog "Integration with LEIM is not done with this ebuild, please have"
+ elog "a look at the documentation how to achieve this."
+ fi
+ use gtk && gnome2_query_immodules_gtk3
+ use gtk2 && gnome2_query_immodules_gtk2
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+ use gtk && gnome2_query_immodules_gtk3
+ use gtk2 && gnome2_query_immodules_gtk2
+}
diff --git a/app-i18n/unicode-cldr/Manifest b/app-i18n/unicode-cldr/Manifest
index bd86d47d744..15e480b7758 100644
--- a/app-i18n/unicode-cldr/Manifest
+++ b/app-i18n/unicode-cldr/Manifest
@@ -1 +1,2 @@
DIST unicode-cldr-common-40.0.zip 28558521 BLAKE2B cc49a6471c9cb80abd7c2cf203547c14cea08fa2ac18a5f2b0cd4e7b3cfc48fcdb4491c1e9eb37ae398caed554661ad6957ef8e3b9c41b6a68b8afccd6e7a7a8 SHA512 b45ea381002210cf5963a2ba52fa45ee4e9b1e80ae1180bcecf61f431d64e4e0faba700b3d56a96a33355deab3abdb8bcbae9222b60a8ca85536476718175645
+DIST unicode-cldr-common-42.0.zip 30178050 BLAKE2B 076e3eca12534feff8e0e54bdc1fa38fc0db0f78cac8b4e35b343763a8ac6787745aa36be165684f4d6dda423409c4431a8e4941c53ae7d340ead0b35edbca30 SHA512 315448fe6a9ac2d5a6a7fd1a27b38c5db30fed053654a803d50e3a8d06aa08ad153e8e57089fa094c561f41a54f37eecda0701b47a1813879902be71945aa38a
diff --git a/app-i18n/unicode-cldr/unicode-cldr-42.0.ebuild b/app-i18n/unicode-cldr/unicode-cldr-42.0.ebuild
new file mode 100644
index 00000000000..4941f9ced04
--- /dev/null
+++ b/app-i18n/unicode-cldr/unicode-cldr-42.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="Unicode Common Locale Data Repository"
+HOMEPAGE="https://cldr.unicode.org/"
+SRC_URI="https://unicode.org/Public/${PN#*-}/${PV%.0}/${PN#*-}-common-${PV}.zip -> ${PN}-common-${PV}.zip"
+
+LICENSE="unicode"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RDEPEND=""
+BDEPEND="app-arch/unzip"
+S="${WORKDIR}"
+
+src_install() {
+ insinto /usr/share/${PN/-//}
+ doins -r common
+}
diff --git a/app-i18n/unicode-data/unicode-data-15.0.0.ebuild b/app-i18n/unicode-data/unicode-data-15.0.0.ebuild
index ec27827c571..ab72b57ae6b 100644
--- a/app-i18n/unicode-data/unicode-data-15.0.0.ebuild
+++ b/app-i18n/unicode-data/unicode-data-15.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip
LICENSE="unicode"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
DEPEND="app-arch/unzip"
S="${WORKDIR}"
diff --git a/app-i18n/unicode-emoji/Manifest b/app-i18n/unicode-emoji/Manifest
index 713a1db0283..b6ee19ae19a 100644
--- a/app-i18n/unicode-emoji/Manifest
+++ b/app-i18n/unicode-emoji/Manifest
@@ -1,5 +1,10 @@
DIST unicode-emoji-data-14.0.txt 109396 BLAKE2B f4268938ef60de5200f78856c6a0886a463d6c3c0de9bb3220f58328aa53c709dc4fd79f5d2f607bd5b07f46100026fb08f4a413803d5d3720fd61dc75d708fb SHA512 364dc7413a1ab959e886f787450071dd8d139ec3d2dc8ca382c700661d93002a4406511e74de27f3cf7b9db793e8a3b48649128e786b20c02cd710350e07c8ca
+DIST unicode-emoji-data-15.0.txt 111505 BLAKE2B fd4e4b590956b6e496b30f7dd2b7d49c5810f1c9432fe4388e537df4efbcae495568806a10dd7284244bc31f29085ec1d03f3ad7635a85a9887b0156478eaf15 SHA512 115ad36f0f94eda11065f4a44b12e4ae9ccf9c14cc7d9d2075c2572cd678aae89a3ab0efeb3b65ec23ab43ee010c4d29008bad7b9f72f591d69acec838250feb
DIST unicode-emoji-sequences-14.0.txt 188859 BLAKE2B 40dd76c52c329b5c0296a72d3f92bf41a55d63a57f094b49d449ee3624b7275562575e76fd5cc877c17ccab9923cd07538e4370615b8f05324706d3c861285e8 SHA512 527a763fe43e4679b7a689c2b736a4cba9a76ebdd601a0550992391d98431a5248ebec3ba35b20e8bd34cfb3075bad399825371c8f11ffe78e12e0fe09bbc181
+DIST unicode-emoji-sequences-15.0.txt 191560 BLAKE2B 130991e733699da2eafe69ec5352d15e862c77f46b8ab71d813a0ae3a801d8970cdf7ecbd10e819e28c8fb4017d6bd24abaf09ec4835be04a2b98c562206153c SHA512 8081b75cee79bbeea6c01f6bfba207ea03fbc72226a093057813c65ccfbcbf5276bbbca6385527ab39ea2fa8c39f4d4c3e086889caf2eb4d49805ebee531f632
DIST unicode-emoji-test-14.0.txt 589717 BLAKE2B 2413d55c386607a88114cfeab5805476ba676a480a7d4de99eaecc7c6e825d883ab6e1217a2e0cd33ab951ae2f39a6b3547fdaace31bcf6985113d42b4e5f9b7 SHA512 693fe5c225e28a694d7aa436d3c6546c3376854878bb92d15f1c88b2d6ce3e9f67ddf66bd08e6aa99930d2965a28f8ed4dd3a895fdf5311abb0a323de27e1a12
+DIST unicode-emoji-test-15.0.txt 593240 BLAKE2B 4a57ccac493dd759d29dcfff512a613051a843dfd83d182bfc041605171fc41d73456692cc8e139a9115fa56633a20eb21c41628a35f186efa84b153e6985bb9 SHA512 894d2036867f2a117b8e5fd59b33148b3bb88d09b022d4a09f57df7e6135c3468b9c3d0fa8c80010ace3b916190b8039ad622f04b790abb1db8697c3f2050015
DIST unicode-emoji-variation-sequences-14.0.txt 36547 BLAKE2B fa63c1924a00026489465f6a949b1124661fbd1877baaf10560424f8fdd59289947f2759e7873632f644b14213e1309601e764c1545e25ee9b94aea2ea813848 SHA512 d54dc787796609546140d1d730ce3574afe15a6dc4c947d171929df96a1189f5e65c8335d2c7429c06d8a9abe20a3f6332e551629e9808fd1e7f5b2ed6cbc24e
+DIST unicode-emoji-variation-sequences-15.0.txt 36542 BLAKE2B ddc6051c8a0dfa8d169712811406ef1331abe112a08121078a222b4b4ed90bf9d72ea6d0df583b80520cf2fe315759157b47a291f4bb02bdb81ac1095a1b279e SHA512 ac258b1cc1b241f686552c29ff4d2f514b9140c759567fcb9559fec521db91a1a9cd6579c119216956e55ac302ab5866c91cbd6518b16eea00351e03ba97020c
DIST unicode-emoji-zwj-sequences-14.0.txt 231001 BLAKE2B faf8389549d9977ac87605af8c209d340261c4a14adec9932bdf41690997730c8dfb3a3261fcbca8b4c24f5f20ed8e3355330049c850680b4159afa73e935b01 SHA512 f1098393fbea76ece6838b509b985f06d92ac3f3ee0a0faf14cc92dc1dce73c3d3b7517fb940d48de27243141568acac88bb5b4438ead445cec9434826932e59
+DIST unicode-emoji-zwj-sequences-15.0.txt 231164 BLAKE2B 95718b16488f1bb4b2b432067ea913b053c2ed80fb5ca05fbaad4280bc7feaa1264efe06a4351b12d293a6e274ab2df2362ac4df048567e3184b6bbd2249aafa SHA512 84cd29d74d5e10a364e5ca495f63aa310b0741d54ae483d6dbb8d31b8397f5d55a69e66ab95e655af6bb5f9693164de6b909172ee8e96b4d276aff59977c85a4
diff --git a/app-i18n/unicode-emoji/unicode-emoji-15.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-15.0.ebuild
new file mode 100644
index 00000000000..8a5c06c31ff
--- /dev/null
+++ b/app-i18n/unicode-emoji/unicode-emoji-15.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="UTS #51 Unicode Emoji"
+HOMEPAGE="https://unicode.org/emoji/techindex.html"
+DATA_URI="https://unicode.org/Public/${PN#*-}/${PV}"
+UCD_URI="https://unicode.org/Public/${PV}.0/ucd/${PN#*-}"
+SRC_URI="${DATA_URI}/${PN#*-}-sequences.txt -> ${PN}-sequences-${PV}.txt
+ ${DATA_URI}/${PN#*-}-test.txt -> ${PN}-test-${PV}.txt
+ ${DATA_URI}/${PN#*-}-zwj-sequences.txt -> ${PN}-zwj-sequences-${PV}.txt
+ ${UCD_URI}/${PN#*-}-data.txt -> ${PN}-data-${PV}.txt
+ ${UCD_URI}/${PN#*-}-variation-sequences.txt -> ${PN}-variation-sequences-${PV}.txt"
+
+LICENSE="unicode"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RDEPEND=""
+S="${WORKDIR}"
+
+src_unpack() {
+ :
+}
+
+src_install() {
+ local a
+ insinto /usr/share/${PN/-//}
+ for a in ${A}; do
+ newins "${DISTDIR}"/${a} $(echo ${a} | sed "s/${PN%-*}-\(.*\)-${PV}/\1/")
+ done
+}
diff --git a/app-i18n/xsunpinyin/Manifest b/app-i18n/xsunpinyin/Manifest
deleted file mode 100644
index ab2a2125633..00000000000
--- a/app-i18n/xsunpinyin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sunpinyin-2.0.4_pre20200306162733.tar.gz 547519 BLAKE2B 6e0e4457217d7b85221cab15173f588a5c7c039208a8f6cd48ed5fb21c5b5eae2f4616d6fddbf6eff8a006193097de26c866d5385d4602f41059ee8d7e52a2d5 SHA512 e8cf73aeca8dcbc7dd6f51f034a9a0363201bc14a814800e071c987933935b0e8039aa84178a6bd1cba1c7dee4b25b2d5546e78ea683e68e8981afea48fdab33
diff --git a/app-i18n/xsunpinyin/metadata.xml b/app-i18n/xsunpinyin/metadata.xml
deleted file mode 100644
index e9f122857cf..00000000000
--- a/app-i18n/xsunpinyin/metadata.xml
+++ /dev/null
@@ -1,11 +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>
- <upstream>
- <remote-id type="github">sunpinyin/sunpinyin</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild b/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild
deleted file mode 100644
index 3a4878507e3..00000000000
--- a/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2011-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit python-any-r1 scons-utils toolchain-funcs
-
-MY_PN="sunpinyin"
-MY_P="${MY_PN}-${PV}"
-
-if [[ "${PV}" == "9999" ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/sunpinyin/sunpinyin"
-elif [[ "${PV}" == *_pre* ]]; then
- SUNPINYIN_GIT_REVISION="f39c195db08661e894017507842991a1ef70bedf"
-fi
-
-DESCRIPTION="Standalone XIM server for SunPinyin"
-HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
-if [[ "${PV}" == "9999" ]]; then
- SRC_URI=""
-elif [[ "${PV}" == *_pre* ]]; then
- SRC_URI="https://github.com/sunpinyin/${MY_PN}/archive/${SUNPINYIN_GIT_REVISION}.tar.gz -> ${MY_P}.tar.gz"
-else
- SRC_URI="https://github.com/sunpinyin/${MY_PN}/archive/v${PV/_/-}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-LICENSE="|| ( CDDL LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="~app-i18n/sunpinyin-${PV}
- dev-libs/glib:2
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/pango"
-RDEPEND="${DEPEND}
- app-i18n/sunpinyin-data"
-
-if [[ "${PV}" == *_pre* ]]; then
- S="${WORKDIR}/${MY_PN}-${SUNPINYIN_GIT_REVISION}"
-elif [[ "${PV}" != "9999" ]]; then
- S="${WORKDIR}/${MY_PN}-${PV/_/-}"
-fi
-
-src_prepare() {
- default
-
- # https://github.com/sunpinyin/sunpinyin/pull/101
- sed -e "/^[[:space:]]*print /s/print \(.*\)/print(\1)/" -i wrapper/xim/SConstruct || die
-
- # https://github.com/sunpinyin/sunpinyin/issues/110
- sed -e "s/^\( *\)('CXX', 'CXX'),/&\n\1('AR', 'AR'),\n\1('RANLIB', 'RANLIB'),/" -i wrapper/xim/SConstruct || die
-
- # https://github.com/sunpinyin/sunpinyin/issues/114
- sed -e "/^#include <iconv\.h>$/d" -i wrapper/xim/xim.c || die
-}
-
-src_configure() {
- tc-export AR CC CXX RANLIB
-}
-
-src_compile() {
- escons -C wrapper/xim \
- --prefix="${EPREFIX}/usr"
-}
-
-src_install() {
- escons -C wrapper/xim --install-sandbox="${D}" install
-}
diff --git a/app-i18n/xvnkb/xvnkb-0.2.11.ebuild b/app-i18n/xvnkb/xvnkb-0.2.11.ebuild
index 5493f9d719b..98e4e14b988 100644
--- a/app-i18n/xvnkb/xvnkb-0.2.11.ebuild
+++ b/app-i18n/xvnkb/xvnkb-0.2.11.ebuild
@@ -6,8 +6,8 @@ EAPI="8"
inherit toolchain-funcs
DESCRIPTION="Vietnamese input keyboard for X"
-HOMEPAGE="http://xvnkb.sourceforge.net/"
-SRC_URI="http://${PN}.sourceforge.net/${P}.tar.bz2"
+HOMEPAGE="https://xvnkb.sourceforge.net/"
+SRC_URI="https://${PN}.sourceforge.net/${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0"
diff --git a/app-i18n/yaskkserv2/Manifest b/app-i18n/yaskkserv2/Manifest
index 19ecc7b2495..4e88ac5bbaf 100644
--- a/app-i18n/yaskkserv2/Manifest
+++ b/app-i18n/yaskkserv2/Manifest
@@ -29,7 +29,6 @@ DIST fastrand-1.7.0.crate 11265 BLAKE2B 318f6c903a0ad0d0eac39638aceb162739868efd
DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
-DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
DIST form_urlencoded-1.1.0.crate 8734 BLAKE2B eaca73d73d16242f3fa3e38e23531c67c01404697bc7b7eb7c64fa04167dcb403a41818487fc46c5d9118842818472d549a2f5fcef5e4d962461e1c103d895d1 SHA512 9e245495dbf235b147e4216b313f2e6a96357d2782a66d71c08c2902c6a065701ca8ecdbb6b2035983a83c44cf36c921b5c71d63af0e02dd39bf5f8347117e11
DIST futures-channel-0.3.21.crate 31961 BLAKE2B e99f37cdeac080c8bad2203fd24b48eb62918166104ad6cc531c8f69d3e0c3a5898ca27f19693e2c143c9049a7d244f9af49c16fecba12233f9ff3f1d01e35b0 SHA512 1c10398657949b53b6df196cc44d8e4b3acf53b4d216be6f5f631d8d4b500f5c344e2cc7d5a5642ced6c5480511884611be6d429f56a0ede4a716b9c5770cb76
DIST futures-core-0.3.21.crate 14601 BLAKE2B 73cf4c422202a34cc9916509939fab35c79093a6c1aeb99e35763727ebf7d3a06ae203684d75cc74183126f0cd95dec1530f136ffa2a0e69354c554883e3af1f SHA512 b60e7892436ae28fd2240f17816f934f6caeac663d67b8efc7d519ebb4b0bd921f0b732b6176bd4b472d2fbe346d39a37ba394401e15afa93af8294ceea90976
@@ -49,7 +48,6 @@ DIST httpdate-1.0.2.crate 10673 BLAKE2B fbe2230262cd041e1ea8d6f9782376c25b0e841d
DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
DIST hyper-0.14.19.crate 182288 BLAKE2B 6b5a400fb60177ff911093507f0194e169e73ad33071bff90a7e3b69d7fb1a731cc5e7b45ce5b9ece216e7891c4682c9fec488630160f6ae162a3d6240594f21 SHA512 a900cb046b27c43963f558a7bbb509f3aab01daaa4845aecabcbdc7344ac7a2231a225012a81747bfd0a74a993df8caa7191b00530916be9e1d7362ce2dea269
DIST hyper-tls-0.5.0.crate 13257 BLAKE2B 50cbe4ca7c1862fd3fff192de070341dd32bfb9f108b516e1e261ec8da7c4f7972b7b66e3d45c1497733a913b0281bef706994270ec8bd03eba7368612127aa4 SHA512 45dc16cc9ce48706e0b3575dca35ba1b6b3084dda8c2cc489d126e1c4f0bb96a9b2baa860d09f68c5e0a48c2a69e3eaf62f4f0406fffc4efefcd79d26c82896e
-DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
DIST idna-0.3.0.crate 271128 BLAKE2B cf8a2c43760f03e94953c6692423a12f28fe763aabea8785b93cd247b3aedd2aeef2cd99978a027186290016ed924db39d19fe7d397da1ab570be9646bbb630a SHA512 9b7cee27811ee52ed9bb39fe82f724742eef2e5370642b6c756bd134c8cbc20bb6faa9f296053672dba8a66f7356a08b2ca99f176407b173e2d566d85d066441
DIST indexmap-1.8.2.crate 53219 BLAKE2B 6af0e386dcb4306505d93cae23fd47601c3e1c7159058f02ac435b312697da40538b1cbb0d17c3f2c4be579a4b0a9e8b59c2e145677a69c2f885d3d24afd5229 SHA512 f7780b2a478e2b95568bfa1d10167a02bd174fb9bbbf8ea84e6ff185a03d43be0ef403c2106df8289d399657584abfac6039d7cdb96b52300d7016452808c0f0
DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
@@ -73,7 +71,6 @@ DIST openssl-macros-0.1.0.crate 5566 BLAKE2B 51116df0f86274435f41b8bfd2b385d5a64
DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c
DIST openssl-sys-0.9.74.crate 59808 BLAKE2B e616a0194828afe67d617e4032ed354385935ff7aa40eb495781b38b134226d5c5cfc5f9405e6273c96622245b6d4771a71b7b9512e3be7feba9a2ce88b66ecd SHA512 18015ce4dc8f15f3c371d393f4654db11b6e5ecaadbdf6cd9f020ee9aee29f3fa12a8dd74d432d8e8b5889162491b722f855b02fbf0892c8f2003bc4e692254e
DIST os_str_bytes-6.1.0.crate 21150 BLAKE2B a3bea67d5dfdc3bdf535b8576a49b3b76aac6fb5e0c9b672910756cf2d8062694b973f4d38365e7e17237efe0429ef942adb0416f8a9fbeb18bac68e1ec250a4 SHA512 b15a901533380be745e3d3ee34d36e192bcf32c8ca66b0aeb77da66b931773b9bd818bd5485c142f8733e7af7d41958957d9ed8f8c6e405b89be69df625364f5
-DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
DIST percent-encoding-2.2.0.crate 10075 BLAKE2B 397e59acc3953868c709244b89a2e0db3304c0b574ecba761026b570a485f2cb5b0b2a0159586d1f342ec395ef02ace536da3bc1c72093e1cf93f8b37b26b0ec SHA512 890a5256d2b4290e12e04a02c3529f3a017faa2b6016a4dd0f08b36509f0b1107eacfcb4702024d6a21ff8852a11f263c1adc096b16ef8d12c45a734c087fe68
DIST pin-project-lite-0.2.9.crate 27713 BLAKE2B d6985b5add432fb6287d1b0c9fb0cc91a195f82c5a748a9ea430e4ba884717ec7b16d730b5ea62de5b2bfead1771da2d115b3776e12e605f70f2538f374a28fa SHA512 cef0b77233adca712db1183f780732ea577cf1b27c2643de221d54c837c75ce749f907e24a967be7474812c7682cba613a3fc5d553a9578a1b80569da0e562e4
DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
@@ -104,7 +101,6 @@ DIST serde_json-1.0.40.crate 69695 BLAKE2B ad156577b557ffffac9a7f75e6e0f6f6b86c8
DIST serde_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60
DIST sha1-0.10.1.crate 11785 BLAKE2B faef32bb5503f712d0eacd65b07cf793010a462f5fb7beb23e3768097ae5cff3537709b500e822d67bd95d70fe33163aa74fd791dfcc8ffb5bea0d4b39a1b9c7 SHA512 5f32cfff707d08dfcf0c826ddd723fbdb7e1e29614f6b303c2707dd75ef3b599a5e2b48ebdd570e2e731b02dbcbe2557e91f2d1c5cb44d0afb3d8a46c38c89a4
DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
-DIST smallvec-0.6.10.crate 22064 BLAKE2B 41a7ccd12c9b7e1dfaf43a9cee22c60d160b35a08024554cf8d68b59498a6e3fcd0e8146815bb61a6e1727b209ec85813127ab8520f8ef47716913a6ce6cd952 SHA512 802b96283ac27ffa71ba17e8676c23f721cc1bd3b61df6f78a1c8ca9150d07e6d5db55651ba070f9202460019f59636871c1160e31038c6bf7ee21cdba8c5be4
DIST socket2-0.4.4.crate 44048 BLAKE2B b2b1aad2995e44944b98ff3291479fb74e8cc965f866e692821427e488c68282290773dcd77da0542c45daf231a5e676d20e59a1d4568b8dde2da2f16425feb2 SHA512 6624fb9b933763c22e6114a8f72c6af0969912717017dd5b13f1b5df19faa1b160376c12e8c8023c435281f6a7864e802f3c4c535de8a345fe206652104f2cd5
DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
DIST syn-1.0.96.crate 236896 BLAKE2B 57445f4925169212c3b794312f388c2829bc343fd60f37f60d46bc944c946c02476b1ec64f17ec8b91e84c112dbbf04bf64feba9a3fd3512dad0d4b3376f4869 SHA512 f53b9e97b6b19d18a35d13aaa9c58b8fdd0da96443aaad76ed027e9ac7d438b574ae052b02b9bef410f25fbab851a5af3cc64fafaefffe47932827e6ca02209c
@@ -130,8 +126,6 @@ DIST unchecked-index-0.2.2.crate 8325 BLAKE2B 25c7bbee1d3b90bad05a91131ce1647a48
DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
DIST unicode-ident-1.0.1.crate 33770 BLAKE2B e028e9f1d6c01a7a37c8f9ecd6b1d99041b45674bc7699066bb7479822cb8d5a1b4083db1117d9d44ab05096d8a37a9bd5d93dfe8cc5db6bb58950b4f5d5c8e8 SHA512 505650712a51c6f309c97bf72029de1eede33c71b84de9733f5f987859a61225e3d07d369b85a89797d870ea436f30b5b5046306f3d5fd672551a4b30c43e428
DIST unicode-normalization-0.1.22.crate 122604 BLAKE2B 3f3430b279cc0ce1595392c869442ce676ab097154c688779ebcf726e10c497df59be2cd7bb2f84f99499a9df0654760a10ac92224c17d74775aeebe291241e1 SHA512 a5810d5e9cd93dbb80e013997aa9d38e60834619483a6623eb2859ec5d59a5aec3fc4db123dc7f4e2fe9f2b8799cf6af48bdff22d69a00a23707240e8bf3bb3c
-DIST unicode-normalization-0.1.8.crate 71158 BLAKE2B c548a2bc537abc6d86bffb0828a366ff82b143dcb0ee01e2c21b3b7134fd5f818f3775db391d358f4ebcb906ff256e3d2228ab042066a3de9a6747be05b8effa SHA512 4e3245689d6162a21cedb42e07b179e3aad03728a37b005c2e6bff644a6efd06b6bd26a20a255861a01441a9d15c4318575db3016248b96a03436212aa414547
-DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0866b5aa98e5bf4686cf1b1aac9b1f0a0ea3b89a01e044a2ca37830416f42d147158ea8e88f23fd28ac2 SHA512 f9b6ad99d69ff303283b3fd9e98945fbd6cb411a3d141badcbb3a0566723a451375e6dd5d5357e3eb7a1b5b1ee5756a2347c43817db2de6fe35b9004b090e077
DIST url-2.3.1.crate 72777 BLAKE2B 6ca0e537baf373b92269b2531945c1cdf360f1566cae4734dfb96f05a605e5c6c82e3192a1b9dde0ff22b92b87aba2d56e32a1bf17882b4de15efd7cdf52bc76 SHA512 8224010bef067574481e5d84100d944782d52b49db7c396ae2b4dfc145ed58769c15440d97a0fed4d2f9857592a8601417cc5b1bdea959c47a3e7a1f7182ed0d
DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
@@ -156,6 +150,5 @@ DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f8
DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865
DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
DIST winreg-0.10.1.crate 25725 BLAKE2B db536f2a098e4ff6ae4ff80a19bd2029030d68007c3d6100f5135da1a7c223463fc17640f533bc1d4e8c53e9becb186d98351719b3b6276802c68cc755b9ba4e SHA512 09f2d18f62c3c427ebed40d667b672bb778629502ad3c39541f324b2d5ac41f0822c98b7e5320314144130580da46f1e8e51928941850e7d4af28455a564360c
-DIST yaskkserv2-0.1.3.tar.gz 179293 BLAKE2B 4beaf1389b1126f66d9d6c8eb9da0bce97f00ac2fc738bda2c00c77a4171ef67773402f2ffdd60373a59bae248ed889d206cb6dcf32e73e1ae90559071f59b3e SHA512 57d3675fae72d3d5c81a527b5deb156164faf3e38224daaec1be98c471ddf2e605771eeeff2f91c79e6c464b185dc838026bb16514beb5c92049bece06a52ac2
DIST yaskkserv2-0.1.5.tar.gz 178515 BLAKE2B 7f7eeea27b6de1740c56c3cd3383b0e8779e3b40728cbfbb4dc9a967ce3fee043fb339e51814b776d9e633a9c8fcde0bc05b14f0f471031b0e849239381eca56 SHA512 25d93736f3c86d5c3d3ba7b4a6c263a5cb6f00397416c4e7e3bd0a1e361d62dbfbc5e20af529da143dcde72e9540c39b4f8eaebe63585357037e6bd50d4a42ce
DIST yaskkserv2-testdata-202110.tar.xz 6789332 BLAKE2B fc7c44ca9899972095f37f01e9c08c95c763ff3fa027a785f8d979e4a8c6f0ad2defc965e1d3263d9fbc595368ab83022a2b615712b0795854538a68c138fc93 SHA512 351a5a67014bfcf0f8ed16ba171c59936e26c3aad960a44484304a0df86d26b2a6f75a3c4762149c5dbcc7c7717cc29559e7ce1b2f0e79f913c33501ee63e3c2
diff --git a/app-i18n/yaskkserv2/yaskkserv2-0.1.3.ebuild b/app-i18n/yaskkserv2/yaskkserv2-0.1.3.ebuild
deleted file mode 100644
index d0f9ffbcbe0..00000000000
--- a/app-i18n/yaskkserv2/yaskkserv2-0.1.3.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-CRATES="
-aho-corasick-0.7.18
-atty-0.2.13
-autocfg-1.1.0
-backtrace-0.3.37
-backtrace-sys-0.1.31
-base64-0.13.0
-bincode-1.3.3
-bitflags-1.3.2
-block-buffer-0.10.2
-boxfnonce-0.1.1
-bumpalo-3.10.0
-bytes-1.1.0
-c2-chacha-0.2.2
-cc-1.0.45
-cfg-if-0.1.9
-cfg-if-1.0.0
-clap-3.2.4
-clap_lex-0.2.2
-core-foundation-0.9.3
-core-foundation-sys-0.8.3
-cpufeatures-0.2.2
-crypto-common-0.1.3
-daemonize-0.4.1
-digest-0.10.3
-encoding_rs-0.8.20
-env_logger-0.7.1
-error-chain-0.11.0
-fastrand-1.7.0
-fnv-1.0.6
-foreign-types-0.3.2
-foreign-types-shared-0.1.1
-form_urlencoded-1.0.1
-futures-channel-0.3.21
-futures-core-0.3.21
-futures-io-0.3.21
-futures-sink-0.3.21
-futures-task-0.3.21
-futures-util-0.3.21
-generic-array-0.14.5
-getrandom-0.1.12
-h2-0.3.13
-hashbrown-0.11.2
-hermit-abi-0.1.19
-http-0.2.8
-http-body-0.4.5
-httparse-1.7.1
-httpdate-1.0.2
-humantime-1.3.0
-hyper-0.14.19
-hyper-tls-0.5.0
-idna-0.2.0
-indexmap-1.8.2
-instant-0.1.12
-ipnet-2.5.0
-itoa-0.4.4
-itoa-1.0.2
-js-sys-0.3.58
-json-0.12.4
-lazy_static-1.4.0
-libc-0.2.126
-log-0.4.11
-matches-0.1.8
-memchr-2.5.0
-mime-0.3.16
-mio-0.8.3
-native-tls-0.2.10
-num_cpus-1.13.1
-once_cell-1.12.0
-openssl-0.10.40
-openssl-macros-0.1.0
-openssl-probe-0.1.5
-openssl-sys-0.9.74
-os_str_bytes-6.1.0
-percent-encoding-2.1.0
-pin-project-lite-0.2.9
-pin-utils-0.1.0
-pkg-config-0.3.25
-ppv-lite86-0.2.5
-proc-macro2-1.0.39
-quick-error-1.2.3
-quote-1.0.2
-rand-0.7.2
-rand_chacha-0.2.1
-rand_core-0.5.1
-rand_hc-0.2.0
-redox_syscall-0.1.56
-redox_syscall-0.2.13
-regex-1.5.6
-regex-syntax-0.6.26
-remove_dir_all-0.5.2
-reqwest-0.11.11
-rustc-demangle-0.1.16
-rustc-hash-1.1.0
-ryu-1.0.0
-schannel-0.1.20
-security-framework-2.6.1
-security-framework-sys-2.6.1
-serde-1.0.137
-serde_derive-1.0.137
-serde_json-1.0.40
-serde_urlencoded-0.7.1
-sha1-0.10.1
-slab-0.4.2
-smallvec-0.6.10
-socket2-0.4.4
-strsim-0.10.0
-syn-1.0.96
-syslog-4.0.1
-tempfile-3.3.0
-termcolor-1.1.3
-textwrap-0.15.0
-thiserror-1.0.31
-thiserror-impl-1.0.31
-time-0.1.42
-tokio-1.19.2
-tokio-native-tls-0.3.0
-tokio-util-0.7.3
-tower-service-0.3.1
-tracing-0.1.35
-tracing-core-0.1.27
-try-lock-0.2.2
-twoway-0.2.2
-typenum-1.15.0
-unchecked-index-0.2.2
-unicode-bidi-0.3.4
-unicode-ident-1.0.1
-unicode-normalization-0.1.8
-url-2.2.2
-vcpkg-0.2.15
-version_check-0.9.4
-want-0.3.0
-wasi-0.11.0+wasi-snapshot-preview1
-wasi-0.7.0
-wasm-bindgen-0.2.81
-wasm-bindgen-backend-0.2.81
-wasm-bindgen-futures-0.4.31
-wasm-bindgen-macro-0.2.81
-wasm-bindgen-macro-support-0.2.81
-wasm-bindgen-shared-0.2.81
-web-sys-0.3.58
-winapi-0.3.9
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.5
-winapi-x86_64-pc-windows-gnu-0.4.0
-windows-sys-0.36.1
-windows_aarch64_msvc-0.36.1
-windows_i686_gnu-0.36.1
-windows_i686_msvc-0.36.1
-windows_x86_64_gnu-0.36.1
-windows_x86_64_msvc-0.36.1
-winreg-0.10.1
-"
-TESTDATA="${PN}-testdata-202110"
-
-inherit cargo systemd
-
-DESCRIPTION="Yet Another SKK server"
-HOMEPAGE="https://github.com/wachikun/yaskkserv2"
-SRC_URI="https://github.com/wachikun/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- $(cargo_crate_uris ${CRATES})
- test? ( https://dev.gentoo.org/~hattya/distfiles/${TESTDATA}.tar.xz )"
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-DEPEND="dev-libs/openssl:0="
-RDEPEND="${DEPEND}
- app-i18n/skk-jisyo"
-BDEPEND="test? (
- app-emacs/ddskk
- app-i18n/yaskkserv
-)"
-
-QA_FLAGS_IGNORED=".*"
-
-src_prepare() {
- default
-
- sed -i "/^dictionary =/s|= .*|= ${EPREFIX}/usr/lib/${PN}/default.euc|" etc/${PN}.conf
- export OPENSSL_NO_VENDOR=true
- # skip network tests
- sed -i "s/^fn ${PN}.*_google_/#[ignore]\n&/" src/skk/test_unix/${PN}.rs
-}
-
-src_test() {
- export YASKKSERV2_TEST_DIRECTORY="${T}"/${PN}
- mkdir -p "${YASKKSERV2_TEST_DIRECTORY}" || die
- cp -r "${WORKDIR}"/${TESTDATA}/* "${YASKKSERV2_TEST_DIRECTORY}" || die
- cargo_src_test
-}
-
-src_install() {
- dosbin target/release/${PN}
- dobin target/release/${PN}_make_dictionary
- einstalldocs
-
- keepdir /usr/lib/${PN}
-
- insinto /etc
- doins etc/${PN}.conf
-
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
- systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_preinst() {
- "${ED}"/usr/bin/${PN}_make_dictionary --dictionary-filename "${ED}"/usr/lib/${PN}/default.euc "${EPREFIX}"/usr/share/skk/SKK-JISYO.L || die
- "${ED}"/usr/bin/${PN}_make_dictionary --dictionary-filename "${ED}"/usr/lib/${PN}/default.utf8 --utf8 "${EPREFIX}"/usr/share/skk/SKK-JISYO.L || die
-}
diff --git a/app-i18n/yaskkserv2/yaskkserv2-0.1.5.ebuild b/app-i18n/yaskkserv2/yaskkserv2-0.1.5.ebuild
index a7168310a61..c2d45d4ab4e 100644
--- a/app-i18n/yaskkserv2/yaskkserv2-0.1.5.ebuild
+++ b/app-i18n/yaskkserv2/yaskkserv2-0.1.5.ebuild
@@ -170,7 +170,7 @@ RESTRICT="!test? ( test )"
LICENSE="|| ( Apache-2.0 MIT )"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
DEPEND="dev-libs/openssl:0="