gentoo auto-resync : 06:09:2022 - 22:33:57

7 files changed, 271 insertions, 16 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 3e2bc512279d..10aae316f8c5 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index cfef5cb21f88..fa4377c9c1e5 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,13 +1,16 @@
 AUX 50uim-gentoo.el 71 BLAKE2B 94142633d1a13a0d4ea71e4325883be1e407e154277a4a361701bf694b62e3e8855d4627a72015fb04b1470e128df80fefcdb999e2f1090fa03a454287af52f2 SHA512 e2b6d74d14cdf7d81ab128b2e4ffe1d7dcc0013d61685687ca92619704fd38ec1da6a12fabc3878aa7a9ddd9bf0194c499d3100f176f0a96920322a451c04831
-AUX uim-1.8.9_pre20210103-remove-Wconversion-replace.patch 567 BLAKE2B 7241f18b4efa84f3eecae63027aef169eb7ce3ab068bf3f1b225ab5ff597008c017c6da54817bc4db18578c8654031b56afd149936f2825f803db959dad28636 SHA512 b193a7e689b955b966cb5f402336de0b96f23a9d9f831907863ddc4cbaf63080509f514ddc35a67f75d19c65bbfadbf4883b65ae83faa7c741cf7ec80ddf3f50
+AUX uim-1.8.8-zh-TW.patch 871 BLAKE2B 091efbed0182f05c87e5a5c789ca7ea3862e61566dad5411a5158b348e73123a60efe869b7aa8d43af603ba01e908eb5d135762069abb3c01951a144739b6126 SHA512 0cf0955cded7870b5012f283adb30dbbab6fee9d468178248987036cd3e78fc21e1279481289f9400784fb1e59fda91d1cc8ac1cc8b3d57f0f24258b8b9f40f4
+AUX uim-Wconversion.patch 567 BLAKE2B 7241f18b4efa84f3eecae63027aef169eb7ce3ab068bf3f1b225ab5ff597008c017c6da54817bc4db18578c8654031b56afd149936f2825f803db959dad28636 SHA512 b193a7e689b955b966cb5f402336de0b96f23a9d9f831907863ddc4cbaf63080509f514ddc35a67f75d19c65bbfadbf4883b65ae83faa7c741cf7ec80ddf3f50
 AUX uim-gentoo.patch 601 BLAKE2B fba57214c7e222e9f042cda4194738ffd170787d3d5431415a9a26632b25bdd9566489352ee4e64f396add88f270931320faed73652002fe67a379f1d644ff65 SHA512 002538e809f174f026df354ebcd4b487d42c0e9f7e409b8c97240969ec3be55f22b754ea34d707fb8eadab1321dd8a3c4b7861b51a606eb741f314f20e473f4a
 AUX uim-kde.patch 2193 BLAKE2B 38e049b372cf2854879627186a2f014265e410ace9657cfd6afaf9c08bbfc5b4df208a8207861a9edab32c058847b01b3a8ba1b5cf4f88ab6d2d213c494c64d4 SHA512 4ff8306ea451233836f78096eaafd739e1d9c19d9c48230963c7d98c23860ecc649e1e94eb1569e959a2932eae3fb74641e274cb72212a962d149dcde09a0537
 AUX uim-slibtool.patch 573 BLAKE2B 97b6b1130ff7bb0aeb6d58d731cae387e7a2fa96fbbc260ee7482fd595cfd8754440a0db2903dd4e82429d5409e2639545af247e9b761d4119329a9f6bd01030 SHA512 9f8637ee7f7c43af72c1f85e71ad087850972d410c5d9e235f87c7a3dba97cc9970aba0466b897cb8383553185615dd29569c471362f3f90b9ba5e039c679cd6
 AUX uim-tinfo.patch 1594 BLAKE2B 9c52b5603f5d6ebe229e15597ef75ae7049744dee0b2977a9bcd0f7ba59fb8cf111dc8fcc1c25b4ce4363b8f969d76d50a3892ebfe9808afa517bafdde623658 SHA512 13c074b9b33ceb169dcb3cb879f9dfced36dc29da5f45aacaf3dbcd62f3d9a5d565a05b6c3353dc30a33f33f1740032f233e731dc6f430a92c4d133614e57cdc
 AUX uim-xkb.patch 400 BLAKE2B 54992f9ef87e4ede3e2beaadf4bd55c018b0aec3eb645b7716e1c27200a9b4d29a649beb333fe61c30cd36718494b05cb5217d486fb929cd617fe7038bf168d7 SHA512 4e86e051dd05ec0b56d423a079b0b285fdd9b256ae66528781a68ee0bfcf1be15530346facb28eab0a1401f2f27f9dce8cc8e215fe3195879f66e7e4241d80fc
-AUX uim-zh-TW.patch 871 BLAKE2B 091efbed0182f05c87e5a5c789ca7ea3862e61566dad5411a5158b348e73123a60efe869b7aa8d43af603ba01e908eb5d135762069abb3c01951a144739b6126 SHA512 0cf0955cded7870b5012f283adb30dbbab6fee9d468178248987036cd3e78fc21e1279481289f9400784fb1e59fda91d1cc8ac1cc8b3d57f0f24258b8b9f40f4
+AUX uim-zh-TW.patch 369 BLAKE2B a0d536721c67e3acbdc8d9efd060408eb23f0ae3b6eb06cf54ce1fdaf214a7b6e0aef615ad8d27471fa349c94cccefeb97a8f60fcfe0e920ac6ca7451cf325dc SHA512 3dc2a7a5af1562f4972044feccdd3723f5264a6fe22d0bc8a742b8d358f8103b4fe9d2e767e0220fa93eaeb2ff675f162bca4d863f182dbcdf47ea1f8400b652
 AUX xinput-uim 108 BLAKE2B f66525e52af923170224ca9953e82489d7f6f92c3e83d96452663ebd538723d1dbaaaa4233bf2bebe1ad6f783fffd4e3e4e82bba5f6fd92d0ef88e3cbaaff6eb SHA512 b3ba31a87e19f589ac8051ece45b6b6c44b295dde76a5ce6164d1e435d791c4e7cafc7192177384f4052fd928caabb8574a9192cf783f4cb22e4ee16741343fc
 DIST sigscheme-0.9.1.tar.bz2 1140162 BLAKE2B a649ec1a5ff0899af14fa686ea7cf43140c226b1df68d4c9415c3b95c7f7ae32c539df820f0e9da7d7a809c88fa388e563549728c345017dfd62d418748be7e1 SHA512 b66b901e8a6bc6d9188112f78d3ba21a2a0776e1236aa9d2d83df27cf8111b8491f665062b493d14c2a9a1b4eb47ce2789b3ca7180225a085e94623329281e09
+DIST uim-1.8.9.tar.bz2 6233465 BLAKE2B 5fc57ffd43557cc685ca766d13e871a7b3ad3829fe3b3fcaa3ab76cba15350e82747952bcc77eda0093df0681ad5d3580cb30c96e2a707f0f3e2687a5bf96e19 SHA512 342bda32f27b9875bf1458adbfb3d3cdd92d98daf8068647e3cb01f9757fda6befbb44a7b9ba2b25b03e14b1de68c7e2d6b57362e84d6aae8bcff3959aaa12df
 DIST uim-1.8.9_pre20210103.tar.gz 4054622 BLAKE2B b50bafe9b0edbac1ab7e56afd5b654bdef793b606df3550ba7b8be467076005925bf2c5d221bbf3b3dbcdc5079bbb0e014ed29bef9b6a55c23384cb281411104 SHA512 39e046a8ee3bbc06ff0bab685e0ded8f63e9c474661ffecf7ed12e25cad3151498b2fecc7f14ca6f0c78974e55265df47d656a55bf158b41fe21a69071d02fe8
-EBUILD uim-1.8.9_pre20210103-r1.ebuild 6062 BLAKE2B 75626aa3aa3f832825bbb8da37064225ff85338cdae260bd6a121396e4b27c5311addefc037abeb58b9069efa4fcaa3eede9f9f8a6cb57b0d8b1755e9c43f9a2 SHA512 b306c17fbf4db915399c7a2efa35bbf1342fe205ef35bc1b030f2210d4b13ccd8e401901f56a851470691433ddce8933623b9a8ea57500d853bd083dcdaead8d
+EBUILD uim-1.8.9.ebuild 5765 BLAKE2B ffaa1d41c47d7cbbfe41bac4869a9823c59fbc93a4af7c0cd6d1ee94f5b8ae29f00b79e73f641e0d2e0bb542f85980a086f12bb17058a33bd5511bbc0a8c846c SHA512 1a24516e54218b294c618234e807a3ccb9443faa7e18eb30a8ce87780b003c4afd4ef5bf68ca69142f2012b3f1f694f5afddbf72a8e3403c448a7b6888d31c10
+EBUILD uim-1.8.9_pre20210103-r1.ebuild 6054 BLAKE2B 2c22283993a35d34a0be42e0dc68f0594c53312b88386790b8013e2a32e64c99c64ee476dfd2d108442a00eaee61ba1792cc7ae346416cb0acb9deaa8198670b SHA512 0e7b544bd617f2803f3c0201771f759d735385ad2a3d6a38a04227725a0ebef48283209d0ab36211872fab9393c585cfc329c34460a0ae24f7b80bf7427d722a
 MISC metadata.xml 1059 BLAKE2B 7ddf7ebb4c6fa262fb369edabe5bc106023d8b4960ea067fab673c6ca9a489190e591e92e4c14df617318e5feb08d3c064fbdaa5f1ea66a6ebf983a8154a3828 SHA512 c412582600c38a9c171e3e45cf2bfbac0ac3682d5ab1f367ef3e988a4702e8d36cba58ea4f9c34b28493150f34c863c6071b8c02eb3b68bfe5f3b8f98a195c79
diff --git a/app-i18n/uim/files/uim-1.8.8-zh-TW.patch b/app-i18n/uim/files/uim-1.8.8-zh-TW.patch
new file mode 100644
index 000000000000..f73850013178
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.8.8-zh-TW.patch
@@ -0,0 +1,11 @@
+--- a/xim/convdisp.cpp
++++ b/xim/convdisp.cpp
+@@ -69,7 +69,7 @@
+ #endif
+ 
+ const char *fontset_zhCN = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -isas-fangsong ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0";
+-const char *fontset_zhTW = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -taipei-fixed-medium-r-normal--16-150-75-75-c-160-big5-0";
++const char *fontset_zhTW = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -eten-fixed-medium-r-normal--16-150-75-75-c-160-big5.eten-0";
+ const char *fontset_ja = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -jis-fixed-medium-r-normal--16-*-75-75-c-160-jisx0208.1983-0, -sony-fixed-medium-r-normal--16-*-*-*-c-80-jisx0201.1976-0";
+ const char *fontset_ko = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -daewoo-gothic-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0";
+ 
diff --git a/app-i18n/uim/files/uim-1.8.9_pre20210103-remove-Wconversion-replace.patch b/app-i18n/uim/files/uim-Wconversion.patch
index d90433b414bf..d90433b414bf 100644
--- a/app-i18n/uim/files/uim-1.8.9_pre20210103-remove-Wconversion-replace.patch
+++ b/app-i18n/uim/files/uim-Wconversion.patch
diff --git a/app-i18n/uim/files/uim-zh-TW.patch b/app-i18n/uim/files/uim-zh-TW.patch
index f73850013178..dce86724a27a 100644
--- a/app-i18n/uim/files/uim-zh-TW.patch
+++ b/app-i18n/uim/files/uim-zh-TW.patch
@@ -1,11 +1,11 @@
---- a/xim/convdisp.cpp
-+++ b/xim/convdisp.cpp
-@@ -69,7 +69,7 @@
- #endif
- 
- const char *fontset_zhCN = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -isas-fangsong ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0";
--const char *fontset_zhTW = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -taipei-fixed-medium-r-normal--16-150-75-75-c-160-big5-0";
-+const char *fontset_zhTW = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -eten-fixed-medium-r-normal--16-150-75-75-c-160-big5.eten-0";
- const char *fontset_ja = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -jis-fixed-medium-r-normal--16-*-75-75-c-160-jisx0208.1983-0, -sony-fixed-medium-r-normal--16-*-*-*-c-80-jisx0201.1976-0";
- const char *fontset_ko = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -daewoo-gothic-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0";
- 
+--- a/scm/im-custom.scm
++++ b/scm/im-custom.scm
+@@ -679,7 +679,7 @@
+ (define-custom 'uim-xim-fontset-zh-tw
+   (string-join '(
+     "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1"
+-    "-taipei-fixed-medium-r-normal--16-150-75-75-c-160-big5-0"
++    "-eten-fixed-medium-r-normal--16-150-75-75-c-160-big5.eten-0"
+     ) ",")
+   '(xim xim-preedit)
+   '(string ".*")
diff --git a/app-i18n/uim/uim-1.8.9.ebuild b/app-i18n/uim/uim-1.8.9.ebuild
new file mode 100644
index 000000000000..0fc2663179b2
--- /dev/null
+++ b/app-i18n/uim/uim-1.8.9.ebuild
@@ -0,0 +1,241 @@
+# 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
+)
+DOCS=( AUTHORS NEWS README RELNOTE doc )
+
+AT_NO_RECURSIVE="yes"
+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)
+
+	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/uim/uim-1.8.9_pre20210103-r1.ebuild b/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild
index 8bafde17b650..0b0228923d41 100644
--- a/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild
@@ -90,9 +90,9 @@ PATCHES=(
 	"${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}"/${P}-remove-Wconversion-replace.patch
+	"${FILESDIR}"/${PN}-1.8.8-zh-TW.patch
 )
 DOCS=( AUTHORS NEWS README RELNOTE doc )