gentoo resync : 29.12.2022

3 files changed, 262 insertions, 0 deletions

diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index b91ce3bdf4e4..1980fd630743 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -2,6 +2,7 @@ AUX 50uim-gentoo.el 71 BLAKE2B 94142633d1a13a0d4ea71e4325883be1e407e154277a4a361
 AUX uim-1.8.8-c++11.patch 861 BLAKE2B b9072af1065cd9103847a076f6327684c5c014d9e19252cd3f5ff0cf3d1821e67dba2603baccc55709178f6be532e3ad6dacca5e121c96d5da4f210b6094f943 SHA512 8b15b6c7100646ca5b86f93dbfae139837cee0fbb19ae6c5164e249ea827376cb51be52b2a0837533bb1c394f129baafb52cefa2c42f43dd9ec9e502678e26b1
 AUX uim-1.8.8-desktop.patch 1242 BLAKE2B 40b51a7e2c94f02bce09c9baa7059af76f7faa3458cd65491f06b08fc1a11debd281196d190b7e80ffd70e763e9e8816b07287871c86c7eb9540732fbeaf2f30 SHA512 bee999b906958c72e149ad07eb86a8f46163b7dbbb0236e37f26f30cb41e7fc871b979790435a0306039f2533c9e60ff990a2b37bd80f2585e3d9014c6bc8075
 AUX uim-1.8.8-fno-common.patch 375 BLAKE2B 88cf3f86fd23e3d9735c3c12df299c678fb332a39937cad0408fcbfdb653eb6084d3b693ceec42e047c7cfe37a78ea8982d49bd9260135169e4af2d2af64be31 SHA512 898ce37332bd02ccc063facb922a965928962f7ecccbb5e74a57d64069eda235f33f7e899e94f8d48e17a58b32a1e98d9eed2dcd9c73eafd012fc0150eba13b4
+AUX uim-1.8.9_pre20210103-remove-Wconversion-replace.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
@@ -13,5 +14,6 @@ DIST sigscheme-0.9.1.tar.bz2 1140162 BLAKE2B a649ec1a5ff0899af14fa686ea7cf43140c
 DIST uim-1.8.8.tar.bz2 6228743 BLAKE2B 8fc44b61239f766ba3d9ebf3201c11471b3a844e082237f5ec97dd0fa6fbb04a0a588df5c0479a0aa4bcb4d9c4edcc93c36ec68618701c8aa88fa30732fdce28 SHA512 2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3
 DIST uim-1.8.9_pre20210103.tar.gz 4054622 BLAKE2B b50bafe9b0edbac1ab7e56afd5b654bdef793b606df3550ba7b8be467076005925bf2c5d221bbf3b3dbcdc5079bbb0e014ed29bef9b6a55c23384cb281411104 SHA512 39e046a8ee3bbc06ff0bab685e0ded8f63e9c474661ffecf7ed12e25cad3151498b2fecc7f14ca6f0c78974e55265df47d656a55bf158b41fe21a69071d02fe8
 EBUILD uim-1.8.8-r2.ebuild 5589 BLAKE2B b4f750239c437aa66b25088da122675e7426d4f3d1c12d1a03b51a012e2cfe1f6a31314d5f7f764ffb04936991d01a6de804096a1ea7397e611b9c2cf3903d2a SHA512 fe8b7b59138c2631bf047e917214c5e616617bcccd3643ae6ba1517b399378fe0c414922e6c6bb249c8a2499d93ac1d94d8c22538a8770814148a9787f126724
+EBUILD uim-1.8.9_pre20210103-r1.ebuild 6042 BLAKE2B efd7e7f6be178ea5bba5a8148de1eb268165b6a4e3920a6ea105f4e651a04639ba656909e52bfe9cb04ef762c44bd144796ee10be416f92129157a4f798a5d4e SHA512 9aa4ef5b95a6e33e21adcdb924b731c2f05e2fab1a8670c0efe8ca41c37746f432655e3749182229672046c475f2e006ea515a4ee37e7ba81a8687253f1c1fde
 EBUILD uim-1.8.9_pre20210103.ebuild 5989 BLAKE2B 31a26cec7657cc27a9371f7e3407e709f06c7b404364d587f355a3b68e66da176848e6273df03a81f2d2430c7fb8bb410ee6a8814ab3ae4dabbdd83e30a5ac9f SHA512 7b00bd839a4251a8be74bf4cfb150308c52236572d4299838d16701b42f787744facd95b4873bbcece5e680004b33d5e06265dc194b200a3dcf513a48d9bd318
 MISC metadata.xml 1059 BLAKE2B 7ddf7ebb4c6fa262fb369edabe5bc106023d8b4960ea067fab673c6ca9a489190e591e92e4c14df617318e5feb08d3c064fbdaa5f1ea66a6ebf983a8154a3828 SHA512 c412582600c38a9c171e3e45cf2bfbac0ac3682d5ab1f367ef3e988a4702e8d36cba58ea4f9c34b28493150f34c863c6071b8c02eb3b68bfe5f3b8f98a195c79
diff --git a/app-i18n/uim/files/uim-1.8.9_pre20210103-remove-Wconversion-replace.patch b/app-i18n/uim/files/uim-1.8.9_pre20210103-remove-Wconversion-replace.patch
new file mode 100644
index 000000000000..d90433b414bf
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.8.9_pre20210103-remove-Wconversion-replace.patch
@@ -0,0 +1,13 @@
+--- a/qt4/common.pro.in
++++ b/qt4/common.pro.in
+@@ -20,10 +20,6 @@
+ QMAKE_CXX               = @CXX@
+ QMAKE_CXXFLAGS_DEBUG   += @CXXFLAGS@ @CPPFLAGS@ @X_CFLAGS@
+ QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @CPPFLAGS@ @X_CFLAGS@
+-# Remove "-Wconversion" from CXXFLAGS to avoid lots of warnings
+-# from Qt4 header files
+-QMAKE_CXXFLAGS_DEBUG    = $$replace(QMAKE_CXXFLAGS_DEBUG, "-Wconversion", "")
+-QMAKE_CXXFLAGS_RELEASE  = $$replace(QMAKE_CXXFLAGS_RELEASE, "-Wconversion", "")
+ QMAKE_LINK              = @CXX@
+ QMAKE_LFLAGS            = @LDFLAGS@
+ QMAKE_STRIP             =
diff --git a/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild b/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild
new file mode 100644
index 000000000000..1b0b34a88f5b
--- /dev/null
+++ b/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools elisp-common flag-o-matic gnome2-utils qmake-utils vcs-snapshot
+
+EGIT_COMMIT="d1ac9d9315ff8c57c713b502544fef9b3a83b3e5"
+SIG_PV="0.9.1"
+
+DESCRIPTION="A multilingual input method framework"
+HOMEPAGE="https://github.com/uim/uim"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	https://github.com/${PN}/sigscheme/releases/download/${SIG_PV}/sigscheme-${SIG_PV}.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 )
+	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="dev-util/intltool
+	gnome-base/librsvg
+	sys-devel/gettext
+	virtual/pkgconfig
+	kde? ( dev-util/cmake )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-kde.patch
+	"${FILESDIR}"/${PN}-slibtool.patch
+	"${FILESDIR}"/${PN}-tinfo.patch
+	"${FILESDIR}"/${PN}-xkb.patch
+	"${FILESDIR}"/${PN}-zh-TW.patch
+	"${FILESDIR}"/${P}-remove-Wconversion-replace.patch
+)
+DOCS=( AUTHORS NEWS README RELNOTE doc )
+
+AT_NO_RECURSIVE="yes"
+SITEFILE="50${PN}-gentoo.el"
+
+src_unpack() {
+	vcs-snapshot_src_unpack
+	rmdir "${S}"/sigscheme || die
+	mv "${WORKDIR}"/sigscheme-${SIG_PV} "${S}"/sigscheme || die
+}
+
+src_prepare() {
+	default
+	sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
+	# fix build with >=dev-scheme/chicken-4, bug #656852
+	touch scm/json-parser-expanded.scm
+	# 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
+}