gentoo auto-resync : 04:10:2022 - 13:17:38

3 files changed, 289 insertions, 0 deletions

diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 5d3a539d7553..8246a67efeb2 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,6 +1,7 @@
 AUX 50uim-gentoo.el 71 BLAKE2B 94142633d1a13a0d4ea71e4325883be1e407e154277a4a361701bf694b62e3e8855d4627a72015fb04b1470e128df80fefcdb999e2f1090fa03a454287af52f2 SHA512 e2b6d74d14cdf7d81ab128b2e4ffe1d7dcc0013d61685687ca92619704fd38ec1da6a12fabc3878aa7a9ddd9bf0194c499d3100f176f0a96920322a451c04831
 AUX uim-1.8.8-zh-TW.patch 871 BLAKE2B 091efbed0182f05c87e5a5c789ca7ea3862e61566dad5411a5158b348e73123a60efe869b7aa8d43af603ba01e908eb5d135762069abb3c01951a144739b6126 SHA512 0cf0955cded7870b5012f283adb30dbbab6fee9d468178248987036cd3e78fc21e1279481289f9400784fb1e59fda91d1cc8ac1cc8b3d57f0f24258b8b9f40f4
 AUX uim-Wconversion.patch 567 BLAKE2B 7241f18b4efa84f3eecae63027aef169eb7ce3ab068bf3f1b225ab5ff597008c017c6da54817bc4db18578c8654031b56afd149936f2825f803db959dad28636 SHA512 b193a7e689b955b966cb5f402336de0b96f23a9d9f831907863ddc4cbaf63080509f514ddc35a67f75d19c65bbfadbf4883b65ae83faa7c741cf7ec80ddf3f50
+AUX uim-clang-16-configure.patch 1229 BLAKE2B a1486cc71ae374646771f86a418c82ede7ac0d8143cdacb1982e264d7905bb7f3d467475308a2d75a78adeb338da2c4bd42f2010fab49b2167429e815b6dbcc2 SHA512 0475dc1d62234cf5fd539bcc331f0456ad11c904ce1444bbb47e5b0e5e37fae30a7a6d7abbebfbee1a4b433e3af419f878d23cb33df96190f0830161d1acaee1
 AUX uim-gentoo.patch 1310 BLAKE2B e0f4b85a210f8e041a98e8fddc55ea6e3a06d568ad357a1110b6191ee8ac2d0bcbda191c5702f8f24d82f1b878228bd046ee01c07e6211cc3ccb6dec3c21d7b5 SHA512 88f24a9d816f5e610412200dcabd5a9c51a74d5d3139c0afe9f8d3cddc8815d3dcaad0147acf76536c9180f0041fb1b288e391e17389a31c6b3eabaea6c0f314
 AUX uim-kde.patch 2507 BLAKE2B 81287532295af0e5f1235cc3fcea9b4b06c07d1c4377155f19a6e71622da6e398c133fdfb0a6fc3817bfbb9b61b047eabbea6fed8f01a68115a1050d81c9bc7b SHA512 562a09eb15617133dc9fb4ca8b6a855dd28af04f4c27de8c292a32849360f898de5252ef52ad9f1363e238d811346a9c3d19750b33d243bfb48f0c7dd606434d
 AUX uim-slibtool.patch 587 BLAKE2B b596fc54798b5366fa6b84370bf614551b82c74cac8adce7c5d5bbd755e83dd3d2e4f9b9ce5824811240946268467e7698acd04cdb7a2df078d617740766f880 SHA512 c02fde5c30a3f11a24cce1bc00f855b8a3ae3dcd09d2c6738ddf0f32795938cf359c04f275809d00f4439a96499a32d7c026b1c531df3656cbabad9a990529c5
@@ -11,6 +12,7 @@ AUX xinput-uim 108 BLAKE2B f66525e52af923170224ca9953e82489d7f6f92c3e83d96452663
 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-r1.ebuild 5914 BLAKE2B db3de815279e93d8229444bceb275f573e3c80e188dc08cd183cf7b7744672d0d11a6efac90c017c87dd4b5d4f7fb5e4c2c701a4bfc9a695389941bb7659d546 SHA512 912f29ce92f412664e99658f3d3e6bf870f7aa75e3b859a27f2946c62120fdb21305d18f14dcf5569c59aaee4a1f7784af4cbb0e6da9e97d2a9aa1fb08f7570f
 EBUILD uim-1.8.9.ebuild 5743 BLAKE2B 5e30bdb0715225944b347c7b352d8e811c9f4f78d8adae88ed279626780878853ad2a4d407981b0410e3f1848167c1a39d2241fff60b1ff3bfa4aa2ca337c0ea SHA512 d01fac3d2005461410d349e9c907e84dd775c15692a37426409351746bf834640db9bb16693da0365cb6bf5a2cf486de5a6e120b5a17b67f104133386ccae0f5
 EBUILD uim-1.8.9_pre20210103-r1.ebuild 6032 BLAKE2B f91321fe42c453c628b48212545e05c63ebf0a96c9dcdb42c1cab630a66d0bdb0d22b7e88775c0a7a327135245ddb7b360ae4058b5fea6c2878ff570b431a1a9 SHA512 73f950c16d9d399ed6fb3c205102feb0b01c768c54e4519d3daabfab1d1c1246d580316c217375b65dbfae35bf6cc2eec3d1fa18709c9630c5c2e9f05a43ddf9
 MISC metadata.xml 1059 BLAKE2B 7ddf7ebb4c6fa262fb369edabe5bc106023d8b4960ea067fab673c6ca9a489190e591e92e4c14df617318e5feb08d3c064fbdaa5f1ea66a6ebf983a8154a3828 SHA512 c412582600c38a9c171e3e45cf2bfbac0ac3682d5ab1f367ef3e988a4702e8d36cba58ea4f9c34b28493150f34c863c6071b8c02eb3b68bfe5f3b8f98a195c79
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 000000000000..46e3bac01534
--- /dev/null
+++ b/app-i18n/uim/files/uim-clang-16-configure.patch
@@ -0,0 +1,41 @@
+--- 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 000000000000..5bc58c158713
--- /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
+}