public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/, app-i18n/uim/files/
@ 2018-05-28 14:56 Akinori Hattori
  0 siblings, 0 replies; 9+ messages in thread
From: Akinori Hattori @ 2018-05-28 14:56 UTC (permalink / raw
  To: gentoo-commits

commit:     c5b8f5e415ced45eafe9a204b1eb930fb032cdbd
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Mon May 28 13:50:13 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Mon May 28 14:55:56 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5b8f5e4

app-i18n/uim: update to EAPI 6

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-i18n/uim/files/50uim-gentoo.el |   2 -
 app-i18n/uim/metadata.xml          |  15 ++-
 app-i18n/uim/uim-1.8.6-r1.ebuild   | 229 ++++++++++++++++++------------------
 app-i18n/uim/uim-1.8.6-r2.ebuild   | 231 +++++++++++++++++++------------------
 4 files changed, 238 insertions(+), 239 deletions(-)

diff --git a/app-i18n/uim/files/50uim-gentoo.el b/app-i18n/uim/files/50uim-gentoo.el
index 350f6216139..101505c4bd5 100644
--- a/app-i18n/uim/files/50uim-gentoo.el
+++ b/app-i18n/uim/files/50uim-gentoo.el
@@ -1,4 +1,2 @@
-;;; app-i18n/uim site-lisp configuration
-
 (add-to-list 'load-path "@SITELISP@")
 (autoload 'uim-mode "uim" nil t)

diff --git a/app-i18n/uim/metadata.xml b/app-i18n/uim/metadata.xml
index 0e2214531e4..a509c6471ec 100644
--- a/app-i18n/uim/metadata.xml
+++ b/app-i18n/uim/metadata.xml
@@ -6,15 +6,14 @@
     <name>Cjk</name>
   </maintainer>
   <longdescription lang="en">
-  uim is a simple, secure and flexible input method library.  At the moment
-  Anthy, SKK, Prime, T-code, TUT-code (these are Japanese input method),
-  Pinyin (Chinese input method), Hangul (Korean input method), IPA
-  (International Phonetic Alphabet) are implemented.  You can extend the
-  library with Scheme thus easily, or with C if it becomes rather complicated.
-</longdescription>
+    uim is a simple, secure and flexible input method library.  At the moment
+    Anthy, SKK, Prime, T-code, TUT-code (these are Japanese input method),
+    Pinyin (Chinese input method), Hangul (Korean input method), IPA
+    (International Phonetic Alphabet) are implemented.  You can extend the
+    library with Scheme thus easily, or with C if it becomes rather complicated.
+  </longdescription>
   <use>
-    <flag name="anthy">Enable support for <pkg>app-i18n/anthy</pkg> input method
-    </flag>
+    <flag name="anthy">Enable support for <pkg>app-i18n/anthy</pkg></flag>
     <flag name="eb">Enable support for <pkg>dev-libs/eb</pkg></flag>
     <flag name="gtk3">Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag>
     <flag name="skk">Enable support for <pkg>app-i18n/skk-jisyo</pkg></flag>

diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild
index f72b7d26bba..a976c85b750 100644
--- a/app-i18n/uim/uim-1.8.6-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r1.ebuild
@@ -1,150 +1,159 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-inherit autotools eutils multilib elisp-common gnome2-utils
+EAPI="6"
 
-DESCRIPTION="Simple, secure and flexible input method library"
-HOMEPAGE="https://github.com/uim/uim/"
+inherit autotools elisp-common gnome2-utils
+
+DESCRIPTION="A multilingual input method framework"
+HOMEPAGE="https://github.com/uim/uim"
 SRC_URI="https://uim.googlecode.com/files/${P}.tar.bz2"
 
 LICENSE="BSD GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm hppa ppc ppc64 x86"
-IUSE="+anthy canna curl eb emacs expat libffi gtk gtk3 libedit libnotify m17n-lib ncurses nls qt4 skk sqlite ssl static-libs test unicode X xft l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW"
-
+IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk3 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt4 skk sqlite ssl static-libs test unicode xft"
 RESTRICT="test"
+REQUIRED_USE="gtk? ( X )
+	gtk3? ( X )
+	qt4? ( X )
+	xft? ( X )"
 
-REQUIRED_USE="gtk? ( X ) qt4? ( X )"
-
-RDEPEND="X? (
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXt
+CDEPEND="!dev-scheme/sigscheme
+	X? (
 		x11-libs/libICE
 		x11-libs/libSM
+		x11-libs/libX11
 		x11-libs/libXext
+		x11-libs/libXft
 		x11-libs/libXrender
+		x11-libs/libXt
 	)
 	anthy? (
 		unicode? ( >=app-i18n/anthy-8622 )
 		!unicode? ( app-i18n/anthy )
 	)
 	canna? ( app-i18n/canna )
-	curl? ( >=net-misc/curl-7.16.4 )
+	curl? ( net-misc/curl )
 	eb? ( dev-libs/eb )
 	emacs? ( virtual/emacs )
 	expat? ( dev-libs/expat )
 	libffi? ( virtual/libffi )
-	gtk? ( >=x11-libs/gtk+-2.4:2 )
+	gtk? ( x11-libs/gtk+:2 )
 	gtk3? ( x11-libs/gtk+:3 )
 	libedit? ( dev-libs/libedit )
-	libnotify? ( >=x11-libs/libnotify-0.4 )
-	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
+	libnotify? ( x11-libs/libnotify )
+	m17n-lib? ( dev-libs/m17n-lib )
 	ncurses? ( sys-libs/ncurses:0= )
 	nls? ( virtual/libintl )
 	qt4? ( dev-qt/qtgui:4[qt3support] )
 	skk? ( app-i18n/skk-jisyo )
 	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl:0 )
-	!dev-scheme/sigscheme"
-#	scim? ( >=app-i18n/scim-1.3.0 ) # broken
-#	wnn? ( app-i18n/wnn )
-
-DEPEND="${RDEPEND}
+	ssl? ( dev-libs/openssl:0 )"
+DEPEND="${CDEPEND}
 	dev-util/intltool
+	sys-devel/gettext
 	virtual/pkgconfig
-	>=sys-devel/gettext-0.15
 	X? ( x11-base/xorg-proto )"
-
-RDEPEND="${RDEPEND}
+RDEPEND="${CDEPEND}
 	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_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 )
 	)"
-#	test? ( dev-scheme/gauche )
 
-SITEFILE=50${PN}-gentoo.el
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-gentoo.patch
+	"${FILESDIR}"/${PN}-1.5.4-zhTW.patch
+)
+DOCS=( AUTHORS NEWS README RELNOTE )
 
-pkg_setup() {
-	strip-linguas fr ja ko
-	if [[ -z "${LINGUAS}" ]]; then
-		# no linguas set, using the default one
-		LINGUAS=" "
-	fi
-}
+AT_NO_RECURSIVE="yes"
+SITEFILE="50${PN}-gentoo.el"
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
-		"${FILESDIR}"/${PN}-1.5.4-zhTW.patch
-
-	# bug 275420
-	sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die "sed failed!"
+	default
+	sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
 
-	AT_NO_RECURSIVE=1 eautoreconf
+	eautoreconf
 }
 
 src_configure() {
-	local myconf
+	local myconf=(
+		$(use_with X x)
+		$(use_with canna)
+		$(use_with curl)
+		$(use_with eb)
+		$(use_enable emacs)
+		$(use_with emacs lispdir "${SITELISP}")
+		$(use_with expat)
+		$(use_with libedit)
+		$(use_with libffi ffi)
+		$(use_with gtk gtk2)
+		$(use_with gtk3)
+		$(use_with m17n-lib m17nlib)
+		$(use_enable ncurses fep)
+		$(use_enable nls)
+		$(use_with qt4 qt4)
+		$(use_with qt4 qt4-immodule)
+		$(use_enable qt4 qt4-qt3support)
+		$(use_with skk)
+		$(use_with sqlite sqlite3)
+		$(use_enable ssl openssl)
+		$(use_enable static-libs static)
+		$(use_with xft)
+		--disable-gnome-applet
+		--disable-gnome3-applet
+		--disable-kde-applet
+		--disable-kde4-applet
+		--without-mana
+		--without-prime
+	)
 
-	if (use gtk || use gtk3) && (use anthy || use canna) ; then
-		myconf="${myconf} --enable-dict"
+	if use anthy; then
+		if use unicode; then
+			myconf+=( --with-anthy-utf8 )
+		else
+			myconf+=( --with-anthy )
+		fi
 	else
-		myconf="${myconf} --disable-dict"
+		myconf+=( --without-anthy )
 	fi
 
-	if use gtk || use gtk3 || use qt4 ; then
-		myconf="${myconf} --enable-pref"
+	if (use gtk || use gtk3) && (use anthy || use canna); then
+		myconf+=( --enable-dict )
 	else
-		myconf="${myconf} --disable-pref"
+		myconf+=( --disable-dict )
 	fi
 
-	if use anthy ; then
-		if use unicode ; then
-			myconf="${myconf} --with-anthy-utf8"
-		else
-			myconf="${myconf} --with-anthy"
-		fi
-	else
-		myconf="${myconf} --without-anthy"
+	if use libnotify; then
+		myconf+=( --enable-notify=libnotify )
 	fi
 
-	if use libnotify ; then
-		myconf="${myconf} --enable-notify=libnotify"
+	if use gtk || use gtk3 || use qt4; then
+		myconf+=( --enable-pref )
+	else
+		myconf+=( --disable-pref )
 	fi
 
-	econf $(use_with X x) \
-		$(use_with canna) \
-		$(use_with curl) \
-		$(use_with eb) \
-		$(use_enable emacs) \
-		$(use_with emacs lispdir "${SITELISP}") \
-		$(use_with expat) \
-		$(use_with libffi ffi) \
-		--disable-gnome-applet \
-		$(use_with gtk gtk2) \
-		$(use_with gtk3) \
-		$(use_with libedit) \
-		--disable-kde-applet \
-		--disable-kde4-applet \
-		$(use_with m17n-lib m17nlib) \
-		$(use_enable ncurses fep) \
-		$(use_enable nls) \
-		--without-qt \
-		--without-qt-immodule \
-		$(use_with qt4 qt4) \
-		$(use_with qt4 qt4-immodule) \
-		$(use_enable qt4 qt4-qt3support) \
-		$(use_with skk) \
-		$(use_with sqlite sqlite3) \
-		$(use_enable ssl openssl) \
-		$(use_enable static-libs static) \
-		$(use_with xft) \
-		${myconf}
+	econf "${myconf[@]}"
 }
 
 src_compile() {
@@ -152,36 +161,31 @@ src_compile() {
 
 	if use emacs; then
 		cd emacs
-		elisp-compile *.el || die "elisp-compile failed!"
+		elisp-compile *.el || die
 	fi
 }
 
 src_install() {
-	# parallel make install b0rked, bug #222677
-	emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install
+	# bug #222677
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
 
-	dodoc AUTHORS ChangeLog* NEWS README RELNOTE
-	if use emacs; then
-		elisp-install uim-el emacs/*.elc || die "elisp-install failed!"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \
-			|| die "elisp-site-file-install failed!"
-	fi
-
-	find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} +
-	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
+	find "${ED}"/usr/$(get_libdir)/${PN} -name '*.la' -delete || die
+	use static-libs || find "${ED}" -name '*.la' -delete || die
 
-	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die "sed failed!"
 	insinto /etc/X11/xinit/xinput.d
-	doins "${T}/uim.conf"
+	sed \
+		-e "s:@EPREFIX@:${EPREFIX}:g" \
+		"${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
+	doins "${T}"/${PN}.conf
 
-	# collision with dev-scheme/sigscheme, bug #330975
-	# find "${ED}" -name '*gcroots*' -delete || die
-
-	#rmdir "${ED}"/usr/share/doc/sigscheme || die
+	if use emacs; then
+		elisp-install ${PN}-el emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
+	fi
 }
 
 pkg_postinst() {
-	elog
 	elog "New input method switcher has been introduced. You need to set"
 	elog
 	elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
@@ -194,12 +198,7 @@ pkg_postinst() {
 	elog
 	elog "All input methods can be found by running uim-im-switcher-gtk, "
 	elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4."
-	elog
-	elog "If you upgrade from a version of uim older than 1.4.0,"
-	elog "you should run revdep-rebuild."
 
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
 	if use emacs; then
 		elisp-site-regen
 		echo
@@ -209,10 +208,12 @@ pkg_postinst() {
 		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_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 }
 
 pkg_postrm() {
+	use emacs && elisp-site-regen
 	use gtk && gnome2_query_immodules_gtk2
 	use gtk3 && gnome2_query_immodules_gtk3
-	use emacs && elisp-site-regen
 }

diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild
index cac96b004b7..35e99a234b8 100644
--- a/app-i18n/uim/uim-1.8.6-r2.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r2.ebuild
@@ -1,46 +1,49 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-inherit autotools eutils multilib elisp-common gnome2-utils
+EAPI="6"
 
-DESCRIPTION="Simple, secure and flexible input method library"
-HOMEPAGE="https://github.com/uim/uim/"
+inherit autotools elisp-common gnome2-utils
+
+DESCRIPTION="A multilingual input method framework"
+HOMEPAGE="https://github.com/uim/uim"
 SRC_URI="https://uim.googlecode.com/files/${P}.tar.bz2"
 
 LICENSE="BSD GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+anthy canna curl eb emacs expat libffi gtk gtk3 libedit libnotify libressl m17n-lib ncurses nls qt4 skk sqlite ssl static-libs test unicode X xft l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW"
-
+IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk3 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls qt4 skk sqlite ssl static-libs test unicode xft"
 RESTRICT="test"
+REQUIRED_USE="gtk? ( X )
+	gtk3? ( X )
+	qt4? ( X )
+	xft? ( X )"
 
-REQUIRED_USE="gtk? ( X ) qt4? ( X )"
-
-RDEPEND="X? (
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXt
+CDEPEND="!dev-scheme/sigscheme
+	X? (
 		x11-libs/libICE
 		x11-libs/libSM
+		x11-libs/libX11
 		x11-libs/libXext
+		x11-libs/libXft
 		x11-libs/libXrender
+		x11-libs/libXt
 	)
 	anthy? (
 		unicode? ( >=app-i18n/anthy-8622 )
 		!unicode? ( app-i18n/anthy )
 	)
 	canna? ( app-i18n/canna )
-	curl? ( >=net-misc/curl-7.16.4 )
+	curl? ( net-misc/curl )
 	eb? ( dev-libs/eb )
 	emacs? ( virtual/emacs )
 	expat? ( dev-libs/expat )
 	libffi? ( virtual/libffi )
-	gtk? ( >=x11-libs/gtk+-2.4:2 )
+	gtk? ( x11-libs/gtk+:2 )
 	gtk3? ( x11-libs/gtk+:3 )
 	libedit? ( dev-libs/libedit )
-	libnotify? ( >=x11-libs/libnotify-0.4 )
-	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
+	libnotify? ( x11-libs/libnotify )
+	m17n-lib? ( dev-libs/m17n-lib )
 	ncurses? ( sys-libs/ncurses:0= )
 	nls? ( virtual/libintl )
 	qt4? ( dev-qt/qtgui:4[qt3support] )
@@ -49,106 +52,112 @@ RDEPEND="X? (
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
-	)
-	!dev-scheme/sigscheme"
-#	scim? ( >=app-i18n/scim-1.3.0 ) # broken
-#	wnn? ( app-i18n/wnn )
-
-DEPEND="${RDEPEND}
+	)"
+DEPEND="${CDEPEND}
 	dev-util/intltool
+	sys-devel/gettext
 	virtual/pkgconfig
-	>=sys-devel/gettext-0.15
 	X? ( x11-base/xorg-proto )"
-
-RDEPEND="${RDEPEND}
+RDEPEND="${CDEPEND}
 	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_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 )
 	)"
-#	test? ( dev-scheme/gauche )
 
-SITEFILE=50${PN}-gentoo.el
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-gentoo.patch
+	"${FILESDIR}"/${PN}-1.5.4-zhTW.patch
+	"${FILESDIR}"/${P}-libressl.patch
+)
+DOCS=( AUTHORS NEWS README RELNOTE )
 
-pkg_setup() {
-	strip-linguas fr ja ko
-	if [[ -z "${LINGUAS}" ]]; then
-		# no linguas set, using the default one
-		LINGUAS=" "
-	fi
-}
+AT_NO_RECURSIVE="yes"
+SITEFILE="50${PN}-gentoo.el"
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
-		"${FILESDIR}"/${PN}-1.5.4-zhTW.patch \
-		"${FILESDIR}"/${P}-libressl.patch
-
-	# bug 275420
-	sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die "sed failed!"
+	default
+	sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
 
-	AT_NO_RECURSIVE=1 eautoreconf
+	eautoreconf
 }
 
 src_configure() {
-	local myconf
+	local myconf=(
+		$(use_with X x)
+		$(use_with canna)
+		$(use_with curl)
+		$(use_with eb)
+		$(use_enable emacs)
+		$(use_with emacs lispdir "${SITELISP}")
+		$(use_with expat)
+		$(use_with libedit)
+		$(use_with libffi ffi)
+		$(use_with gtk gtk2)
+		$(use_with gtk3)
+		$(use_with m17n-lib m17nlib)
+		$(use_enable ncurses fep)
+		$(use_enable nls)
+		$(use_with qt4 qt4)
+		$(use_with qt4 qt4-immodule)
+		$(use_enable qt4 qt4-qt3support)
+		$(use_with skk)
+		$(use_with sqlite sqlite3)
+		$(use_enable ssl openssl)
+		$(use_enable static-libs static)
+		$(use_with xft)
+		--disable-gnome-applet
+		--disable-gnome3-applet
+		--disable-kde-applet
+		--disable-kde4-applet
+		--without-mana
+		--without-prime
+	)
 
-	if (use gtk || use gtk3) && (use anthy || use canna) ; then
-		myconf="${myconf} --enable-dict"
+	if use anthy; then
+		if use unicode; then
+			myconf+=( --with-anthy-utf8 )
+		else
+			myconf+=( --with-anthy )
+		fi
 	else
-		myconf="${myconf} --disable-dict"
+		myconf+=( --without-anthy )
 	fi
 
-	if use gtk || use gtk3 || use qt4 ; then
-		myconf="${myconf} --enable-pref"
+	if (use gtk || use gtk3) && (use anthy || use canna); then
+		myconf+=( --enable-dict )
 	else
-		myconf="${myconf} --disable-pref"
+		myconf+=( --disable-dict )
 	fi
 
-	if use anthy ; then
-		if use unicode ; then
-			myconf="${myconf} --with-anthy-utf8"
-		else
-			myconf="${myconf} --with-anthy"
-		fi
-	else
-		myconf="${myconf} --without-anthy"
+	if use libnotify; then
+		myconf+=( --enable-notify=libnotify )
 	fi
 
-	if use libnotify ; then
-		myconf="${myconf} --enable-notify=libnotify"
+	if use gtk || use gtk3 || use qt4; then
+		myconf+=( --enable-pref )
+	else
+		myconf+=( --disable-pref )
 	fi
 
-	econf $(use_with X x) \
-		$(use_with canna) \
-		$(use_with curl) \
-		$(use_with eb) \
-		$(use_enable emacs) \
-		$(use_with emacs lispdir "${SITELISP}") \
-		$(use_with expat) \
-		$(use_with libffi ffi) \
-		--disable-gnome-applet \
-		$(use_with gtk gtk2) \
-		$(use_with gtk3) \
-		$(use_with libedit) \
-		--disable-kde-applet \
-		--disable-kde4-applet \
-		$(use_with m17n-lib m17nlib) \
-		$(use_enable ncurses fep) \
-		$(use_enable nls) \
-		--without-qt \
-		--without-qt-immodule \
-		$(use_with qt4 qt4) \
-		$(use_with qt4 qt4-immodule) \
-		$(use_enable qt4 qt4-qt3support) \
-		$(use_with skk) \
-		$(use_with sqlite sqlite3) \
-		$(use_enable ssl openssl) \
-		$(use_enable static-libs static) \
-		$(use_with xft) \
-		${myconf}
+	econf "${myconf[@]}"
 }
 
 src_compile() {
@@ -156,36 +165,31 @@ src_compile() {
 
 	if use emacs; then
 		cd emacs
-		elisp-compile *.el || die "elisp-compile failed!"
+		elisp-compile *.el || die
 	fi
 }
 
 src_install() {
-	# parallel make install b0rked, bug #222677
-	emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install
+	# bug #222677
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
 
-	dodoc AUTHORS ChangeLog* NEWS README RELNOTE
-	if use emacs; then
-		elisp-install uim-el emacs/*.elc || die "elisp-install failed!"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \
-			|| die "elisp-site-file-install failed!"
-	fi
-
-	find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} +
-	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
+	find "${ED}"/usr/$(get_libdir)/${PN} -name '*.la' -delete || die
+	use static-libs || find "${ED}" -name '*.la' -delete || die
 
-	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die "sed failed!"
 	insinto /etc/X11/xinit/xinput.d
-	doins "${T}/uim.conf"
+	sed \
+		-e "s:@EPREFIX@:${EPREFIX}:g" \
+		"${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
+	doins "${T}"/${PN}.conf
 
-	# collision with dev-scheme/sigscheme, bug #330975
-	# find "${ED}" -name '*gcroots*' -delete || die
-
-	#rmdir "${ED}"/usr/share/doc/sigscheme || die
+	if use emacs; then
+		elisp-install ${PN}-el emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
+	fi
 }
 
 pkg_postinst() {
-	elog
 	elog "New input method switcher has been introduced. You need to set"
 	elog
 	elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
@@ -198,12 +202,7 @@ pkg_postinst() {
 	elog
 	elog "All input methods can be found by running uim-im-switcher-gtk, "
 	elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4."
-	elog
-	elog "If you upgrade from a version of uim older than 1.4.0,"
-	elog "you should run revdep-rebuild."
 
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
 	if use emacs; then
 		elisp-site-regen
 		echo
@@ -213,10 +212,12 @@ pkg_postinst() {
 		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_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 }
 
 pkg_postrm() {
+	use emacs && elisp-site-regen
 	use gtk && gnome2_query_immodules_gtk2
 	use gtk3 && gnome2_query_immodules_gtk3
-	use emacs && elisp-site-regen
 }


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/, app-i18n/uim/files/
@ 2020-05-23  8:27 Andreas Sturmlechner
  0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2020-05-23  8:27 UTC (permalink / raw
  To: gentoo-commits

commit:     5a0fe893c03264f1b77b02bd6c5113d1dba9e525
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 22 21:20:23 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 23 08:26:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a0fe893

app-i18n/uim: Drop 1.8.6-r1 and 1.8.6-r2

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-i18n/uim/Manifest                       |   1 -
 app-i18n/uim/files/uim-1.8.6-gentoo.patch   |  28 ----
 app-i18n/uim/files/uim-1.8.6-libressl.patch |  79 -----------
 app-i18n/uim/files/uim-1.8.6-qt.patch       |  16 ---
 app-i18n/uim/files/uim-1.8.6-tinfo.patch    |  65 ---------
 app-i18n/uim/uim-1.8.6-r1.ebuild            | 209 ---------------------------
 app-i18n/uim/uim-1.8.6-r2.ebuild            | 213 ----------------------------
 7 files changed, 611 deletions(-)

diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 0e626d08dac..593def9c836 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,2 +1 @@
-DIST uim-1.8.6.tar.bz2 6500739 BLAKE2B 78623c015cafafa1fbaf32542535de1f0207f8452a422d929a15f4421e4c9926192d0d3b761a7865a38affdf616dc5477e083c0fd8655261ff80ca817fd37029 SHA512 26a95d3b51ef7a99108234b9af30ee7b74141cb3af13d092d4cdbf0749f630934cfd67f74b09dacc3adcdce4a390104489d68a4e2419ec07418645a9b4e5715b
 DIST uim-1.8.8.tar.bz2 6228743 BLAKE2B 8fc44b61239f766ba3d9ebf3201c11471b3a844e082237f5ec97dd0fa6fbb04a0a588df5c0479a0aa4bcb4d9c4edcc93c36ec68618701c8aa88fa30732fdce28 SHA512 2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3

diff --git a/app-i18n/uim/files/uim-1.8.6-gentoo.patch b/app-i18n/uim/files/uim-1.8.6-gentoo.patch
deleted file mode 100644
index 0feee5a7099..00000000000
--- a/app-i18n/uim/files/uim-1.8.6-gentoo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -36,6 +36,7 @@
- AC_PATH_PROGS(SHA1, sha1 sha1sum)
- AC_PATH_PROGS(SED, sed gsed)
- AX_PATH_QMAKE4
-+PKG_PROG_PKG_CONFIG
- 
- AM_MAINTAINER_MODE
- 
-@@ -1792,7 +1793,7 @@
-   fi
-   AX_LANG_WNOERROR  # end AC_LANG_WERROR
- 
--  QT_CONFIG_OPTS="debug"
-+  QT_CONFIG_OPTS="debug nostrip"
- else
-   CFLAGS="$CFLAGS -DNDEBUG"
-   CXXFLAGS="$CXXFLAGS -DNDEBUG"
-@@ -1810,7 +1811,7 @@
-   AX_CFLAGS_GCC_OPTION([-Wno-unused-variable],  [SCIM_CFLAGS])
-   AX_LANG_WNOERROR  # end AC_LANG_WERROR
- 
--  QT_CONFIG_OPTS="release"
-+  QT_CONFIG_OPTS="release nostrip"
- fi
- 
- AC_ARG_ENABLE(warnings-into-error,

diff --git a/app-i18n/uim/files/uim-1.8.6-libressl.patch b/app-i18n/uim/files/uim-1.8.6-libressl.patch
deleted file mode 100644
index b14de58433a..00000000000
--- a/app-i18n/uim/files/uim-1.8.6-libressl.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 7a281b1131399f04627986e6f9a54499b08e239d Mon Sep 17 00:00:00 2001
-From: Felix Janda <felix.janda@posteo.de>
-Date: Thu, 21 Apr 2016 23:12:10 +0200
-Subject: [PATCH] Make openssl SSLv2 and SSLv3 support optional
-
-Fixes compilation with libressl
----
- uim/openssl.c | 30 ++++++++++++++++++++++++++++++
- 1 file changed, 30 insertions(+)
-
-diff --git a/uim/openssl.c b/uim/openssl.c
-index ba1b238..35ca1ca 100644
---- a/uim/openssl.c
-+++ b/uim/openssl.c
-@@ -208,34 +208,64 @@ c_SSL_write(uim_lisp s_, uim_lisp buf_)
- static uim_lisp
- c_SSLv2_method(void)
- {
-+#ifndef OPENSSL_NO_SSL2
-   return MAKE_PTR(SSLv2_method());
-+#else
-+  uim_notify_fatal(N_("uim-openssl: SSLv2_method() is not supported on this system"));
-+  return uim_scm_f();
-+#endif
- }
- static uim_lisp
- c_SSLv2_server_method(void)
- {
-+#ifndef OPENSSL_NO_SSL2
-   return MAKE_PTR(SSLv2_server_method());
-+#else
-+  uim_notify_fatal(N_("uim-openssl: SSLv2_server_method() is not supported on this system"));
-+  return uim_scm_f();
-+#endif
- }
- static uim_lisp
- c_SSLv2_client_method(void)
- {
-+#ifndef OPENSSL_NO_SSL2
-   return MAKE_PTR(SSLv2_client_method());
-+#else
-+  uim_notify_fatal(N_("uim-openssl: SSLv2_client_method() is not supported on this system"));
-+  return uim_scm_f();
-+#endif
- }
- 
- /* SSLv3 */
- static uim_lisp
- c_SSLv3_method(void)
- {
-+#ifndef OPENSSL_NO_SSL3
-   return MAKE_PTR(SSLv3_method());
-+#else
-+  uim_notify_fatal(N_("uim-openssl: SSLv3_method() is not supported on this system"));
-+  return uim_scm_f();
-+#endif
- }
- static uim_lisp
- c_SSLv3_server_method(void)
- {
-+#ifndef OPENSSL_NO_SSL3
-   return MAKE_PTR(SSLv3_server_method());
-+#else
-+  uim_notify_fatal(N_("uim-openssl: SSLv3_server_method() is not supported on this system"));
-+  return uim_scm_f();
-+#endif
- }
- static uim_lisp
- c_SSLv3_client_method(void)
- {
-+#ifndef OPENSSL_NO_SSL3
-   return MAKE_PTR(SSLv3_client_method());
-+#else
-+  uim_notify_fatal(N_("uim-openssl: SSLv3_client_method() is not supported on this system"));
-+  return uim_scm_f();
-+#endif
- }
- 
- /* SSLv3 but can rollback to v2 */

diff --git a/app-i18n/uim/files/uim-1.8.6-qt.patch b/app-i18n/uim/files/uim-1.8.6-qt.patch
deleted file mode 100644
index 6c0cb7eee66..00000000000
--- a/app-i18n/uim/files/uim-1.8.6-qt.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/m4/ax_path_qmake4.m4
-+++ b/m4/ax_path_qmake4.m4
-@@ -23,10 +23,10 @@
- #   the copyright notice and this notice are preserved.
- 
- AC_DEFUN([AX_PATH_QMAKE4], [
--  ax_guessed_qt4_dirs="/usr/lib/qt4/bin:/usr/local/lib/qt4/bin:/usr/qt4/bin:/usr/local/qt4/bin:${QT4DIR}/bin:${QTDIR}/bin"
-+  ax_guessed_qt4_dirs="${QT4DIR}/bin:${QTDIR}/bin"
-   AC_PROG_EGREP
--  AC_PATH_PROGS(_QMAKE4, [qmake-qt4 qmake4], [], ["$PATH:$ax_guessed_qt4_dirs"])
--  AC_PATH_PROGS(_QMAKE, [qmake], [], ["$PATH:$ax_guessed_qt4_dirs"])
-+  AC_PATH_PROGS(_QMAKE4, [qmake-qt4 qmake4], [], ["$ax_guessed_qt4_dirs:$PATH"])
-+  AC_PATH_PROGS(_QMAKE, [qmake], [], ["$ax_guessed_qt4_dirs:$PATH"])
- 
-   AC_CACHE_CHECK([for Qt4 version of qmake], ax_cv_path_QMAKE4, [
-     ax_cv_path_QMAKE4=no

diff --git a/app-i18n/uim/files/uim-1.8.6-tinfo.patch b/app-i18n/uim/files/uim-1.8.6-tinfo.patch
deleted file mode 100644
index 51105c909f5..00000000000
--- a/app-i18n/uim/files/uim-1.8.6-tinfo.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1058,27 +1058,25 @@
-       ;;
-       yes|*)
-         use_uim_fep="yes"
--	AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
--	  [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
--	    AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
--	AC_CHECK_FUNCS(forkpty)
--	if test $ac_cv_func_forkpty = no; then
--	  AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
--	fi
--	AC_SUBST(FEP_LIBADD)
-       ;;
-     esac
-   ],
--  [ use_uim_fep="yes"
--    AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
--      [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
--        AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
--    AC_CHECK_FUNCS(forkpty)
--    if test $ac_cv_func_forkpty = no; then
--      AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
--    fi
--    AC_SUBST(FEP_LIBADD)
--  ])
-+  [use_uim_fep="yes"])
-+
-+if test "x$use_uim_fep" != "xno"; then
-+  PKG_CHECK_MODULES(CURSES, ncurses,
-+    [FEP_LIBADD="$CURSES_LIBS $FEP_LIBADD"],
-+    [
-+      AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
-+        [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
-+          AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
-+    ])
-+  AC_CHECK_FUNCS(forkpty)
-+  if test $ac_cv_func_forkpty = no; then
-+    AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
-+  fi
-+  AC_SUBST(FEP_LIBADD)
-+fi
- 
- AC_ARG_ENABLE(emacs,
-   AC_HELP_STRING([--disable-emacs],
-@@ -1210,10 +1208,14 @@
-     saved_LDFLAGS=$LDFLAGS
-     CPPFLAGS="${CPPFLAGS} -I$libedit_path/include"
-     LDFLAGS="${LDFLAGS} -L$libedit_path/lib"
--    AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses",
--        [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses",
--            AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...")
--            use_libedit="no")])
-+    PKG_CHECK_MODULES(CURSES, ncurses,
-+        [LIBEDIT_LIBS="$CURSES_LIBS"],
-+        [
-+            AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses",
-+                [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses",
-+                    AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...")
-+                    use_libedit="no")])
-+        ])
-     if test "x$use_libedit" != "xno"; then
-         AC_CHECK_LIB(edit, el_init,
-             [LIBEDIT_LIBS="-ledit $LIBEDIT_LIBS -L$libedit_path/lib"

diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild
deleted file mode 100644
index 5b032d6a9ea..00000000000
--- a/app-i18n/uim/uim-1.8.6-r1.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools elisp-common gnome2-utils qmake-utils
-
-DESCRIPTION="A multilingual input method framework"
-HOMEPAGE="https://github.com/uim/uim"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
-IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls skk sqlite ssl static-libs xft"
-RESTRICT="test"
-REQUIRED_USE="gtk? ( X )
-	gtk2? ( X )
-	xft? ( X )"
-
-CDEPEND="!dev-scheme/sigscheme
-	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 )
-	canna? ( app-i18n/canna )
-	curl? ( net-misc/curl )
-	eb? ( dev-libs/eb )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	expat? ( dev-libs/expat )
-	libffi? ( virtual/libffi )
-	gtk? ( x11-libs/gtk+:3 )
-	gtk2? ( x11-libs/gtk+:2 )
-	libedit? ( dev-libs/libedit )
-	libnotify? ( x11-libs/libnotify )
-	m17n-lib? ( dev-libs/m17n-lib )
-	ncurses? ( sys-libs/ncurses:0= )
-	nls? ( virtual/libintl )
-	skk? ( app-i18n/skk-jisyo )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl:0 )"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-RDEPEND="${CDEPEND}
-	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 )
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-qt.patch
-	"${FILESDIR}"/${P}-tinfo.patch
-	"${FILESDIR}"/${PN}-zh-TW.patch
-)
-DOCS=( AUTHORS NEWS README RELNOTE )
-
-AT_NO_RECURSIVE="yes"
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	default
-	sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with X x)
-		$(use_with anthy anthy-utf8)
-		$(use_with canna)
-		$(use_with curl)
-		$(use_with eb)
-		$(use_enable emacs)
-		$(use_with emacs lispdir "${SITELISP}")
-		$(use_with expat)
-		$(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)
-		--without-qt4
-		--without-qt4-immodule
-		--disable-qt4-qt3support
-		$(use_with skk)
-		$(use_with sqlite sqlite3)
-		$(use_enable ssl openssl)
-		$(use_enable static-libs static)
-		$(use_with xft)
-		--without-anthy
-		--enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk))
-		--disable-gnome-applet
-		--disable-gnome3-applet
-		--disable-kde-applet
-		--disable-kde4-applet
-		--without-mana
-		--without-prime
-	)
-
-	if (use gtk || use gtk2) && (use anthy || use canna); then
-		myconf+=( --enable-dict )
-	else
-		myconf+=( --disable-dict )
-	fi
-
-	if use libnotify; then
-		myconf+=( --enable-notify=libnotify )
-	fi
-
-	if use gtk || use gtk2; then
-		myconf+=( --enable-pref )
-	else
-		myconf+=( --disable-pref )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	if use emacs; then
-		cd emacs
-		elisp-compile *.el || die
-	fi
-}
-
-src_install() {
-	# bug #222677
-	emake -j1 DESTDIR="${D}" install
-	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 emacs; then
-		elisp-install ${PN}-el emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
-	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."
-
-	if use emacs; then
-		elisp-site-regen
-		echo
-		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.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild
deleted file mode 100644
index 153a4f27242..00000000000
--- a/app-i18n/uim/uim-1.8.6-r2.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools elisp-common gnome2-utils qmake-utils
-
-DESCRIPTION="A multilingual input method framework"
-HOMEPAGE="https://github.com/uim/uim"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls skk sqlite ssl static-libs xft"
-RESTRICT="test"
-REQUIRED_USE="gtk? ( X )
-	gtk2? ( X )
-	xft? ( X )"
-
-CDEPEND="!dev-scheme/sigscheme
-	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 )
-	canna? ( app-i18n/canna )
-	curl? ( net-misc/curl )
-	eb? ( dev-libs/eb )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	expat? ( dev-libs/expat )
-	libffi? ( virtual/libffi )
-	gtk? ( x11-libs/gtk+:3 )
-	gtk2? ( x11-libs/gtk+:2 )
-	libedit? ( dev-libs/libedit )
-	libnotify? ( x11-libs/libnotify )
-	m17n-lib? ( dev-libs/m17n-lib )
-	ncurses? ( sys-libs/ncurses:0= )
-	nls? ( virtual/libintl )
-	skk? ( app-i18n/skk-jisyo )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-RDEPEND="${CDEPEND}
-	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 )
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-libressl.patch
-	"${FILESDIR}"/${P}-qt.patch
-	"${FILESDIR}"/${P}-tinfo.patch
-	"${FILESDIR}"/${PN}-zh-TW.patch
-)
-DOCS=( AUTHORS NEWS README RELNOTE )
-
-AT_NO_RECURSIVE="yes"
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	default
-	sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with X x)
-		$(use_with anthy anthy-utf8)
-		$(use_with canna)
-		$(use_with curl)
-		$(use_with eb)
-		$(use_enable emacs)
-		$(use_with emacs lispdir "${SITELISP}")
-		$(use_with expat)
-		$(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)
-		--without-qt4
-		--without-qt4-immodule
-		--disable-qt4-qt3support
-		$(use_with skk)
-		$(use_with sqlite sqlite3)
-		$(use_enable ssl openssl)
-		$(use_enable static-libs static)
-		$(use_with xft)
-		--without-anthy
-		--enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk))
-		--disable-gnome-applet
-		--disable-gnome3-applet
-		--disable-kde-applet
-		--disable-kde4-applet
-		--without-mana
-		--without-prime
-	)
-
-	if (use gtk || use gtk2) && (use anthy || use canna); then
-		myconf+=( --enable-dict )
-	else
-		myconf+=( --disable-dict )
-	fi
-
-	if use libnotify; then
-		myconf+=( --enable-notify=libnotify )
-	fi
-
-	if use gtk || use gtk2; then
-		myconf+=( --enable-pref )
-	else
-		myconf+=( --disable-pref )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	if use emacs; then
-		cd emacs
-		elisp-compile *.el || die
-	fi
-}
-
-src_install() {
-	# bug #222677
-	emake -j1 DESTDIR="${D}" install
-	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 emacs; then
-		elisp-install ${PN}-el emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
-	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."
-
-	if use emacs; then
-		elisp-site-regen
-		echo
-		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
-}


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/, app-i18n/uim/files/
@ 2021-10-23 14:32 Akinori Hattori
  0 siblings, 0 replies; 9+ messages in thread
From: Akinori Hattori @ 2021-10-23 14:32 UTC (permalink / raw
  To: gentoo-commits

commit:     cf290e857cb6559bd64bc79b4efbfc4a5215e36e
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 23 14:31:17 2021 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Oct 23 14:31:53 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf290e85

app-i18n/uim: new snapshot

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 app-i18n/uim/Manifest                     |   2 +
 app-i18n/uim/files/uim-kde.patch          |  72 +++++++++
 app-i18n/uim/uim-1.8.9_pre20210103.ebuild | 245 ++++++++++++++++++++++++++++++
 3 files changed, 319 insertions(+)

diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 593def9c836..67883695dc1 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1 +1,3 @@
+DIST sigscheme-0.9.1.tar.bz2 1140162 BLAKE2B a649ec1a5ff0899af14fa686ea7cf43140c226b1df68d4c9415c3b95c7f7ae32c539df820f0e9da7d7a809c88fa388e563549728c345017dfd62d418748be7e1 SHA512 b66b901e8a6bc6d9188112f78d3ba21a2a0776e1236aa9d2d83df27cf8111b8491f665062b493d14c2a9a1b4eb47ce2789b3ca7180225a085e94623329281e09
 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

diff --git a/app-i18n/uim/files/uim-kde.patch b/app-i18n/uim/files/uim-kde.patch
new file mode 100644
index 00000000000..8a291650ae3
--- /dev/null
+++ b/app-i18n/uim/files/uim-kde.patch
@@ -0,0 +1,72 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1449,6 +1449,28 @@
+ 
+ AM_CONDITIONAL(KDE4_APPLET, test "x$enable_kde4_applet" = xyes)
+ 
++dnl ****************************
++dnl *** test for KDE5 applet ***
++dnl ****************************
++AC_ARG_ENABLE(kde5-applet,
++  AC_HELP_STRING([--disable-kde5-applet],
++    [do not build uim KDE Plasma 5 widget]),
++  [],
++  [enable_kde5_applet=yes])
++
++if test "x$enable_kde5_applet" != xno; then
++  if test "x$with_qt5" != xyes; then
++    enable_kde5_applet=no
++  fi
++fi
++
++if test "x$enable_kde5_applet" = xyes && test "x$CMAKE" = xno; then
++  AC_MSG_WARN([no CMake found])
++  enable_kde5_applet=no
++fi
++
++AM_CONDITIONAL(KDE5_APPLET, test "x$enable_kde5_applet" = xyes)
++
+ AC_ARG_ENABLE(pref,
+   AC_HELP_STRING([--disable-pref],
+     [do not build graphical utility to edit user settings]),
+@@ -1948,12 +1970,15 @@
+     qt5_immodule_option="DEFINES+=QT5_IMMODULE"
+   fi
+   set -e
+-  # FIXME: move CMAKE_CXX_FLAGS into cmake_option
+-  ${CMAKE} \
+-    -B ${ac_abs_top_builddir}/qt5/applet.cmake \
+-    -S ${ac_abs_top_srcdir}/qt5/applet \
+-    -DCMAKE_CXX_FLAGS="${CXXFLAGS} ${X_CFLAGS}" \
+-    ${cmake_option}
++  # Generate a Makefile for KDE5 applet by cmake
++  if test "x$enable_kde5_applet" = xyes; then
++    # FIXME: move CMAKE_CXX_FLAGS into cmake_option
++    ${CMAKE} \
++      -B ${ac_abs_top_builddir}/qt5/applet.cmake \
++      -S ${ac_abs_top_srcdir}/qt5/applet \
++      -DCMAKE_CXX_FLAGS="${CXXFLAGS} ${X_CFLAGS}" \
++      ${cmake_option}
++  fi
+   ${QMAKE5} -o ${ac_abs_top_builddir}/qt5/candwin/Makefile.qmake \
+     ${ac_abs_top_builddir}/qt5/candwin/uim-candwin-qt5.pro
+   ${QMAKE5} -o ${ac_abs_top_builddir}/qt5/chardict/Makefile.qmake \
+@@ -2007,6 +2032,7 @@
+    Qt5 immodule    : ${with_qt5_immodule}
+    KDE3 Applet     : ${enable_kde_applet}
+    KDE4 Applet     : ${enable_kde4_applet}
++   KDE5 Applet     : ${enable_kde5_applet}
+    FEP             : ${enable_fep}
+    Emacs           : ${enable_emacs}
+    XIM             : ${use_xim}
+--- a/qt5/applet/Makefile.am
++++ b/qt5/applet/Makefile.am
+@@ -6,6 +6,8 @@
+ 	plasmoid
+ 
+ if QT5
++if KDE5_APPLET
+ all clean install uninstall:
+ 	$(MAKE) $(AM_MAKEFLAGS) -C ../applet.cmake $@
+ endif
++endif

diff --git a/app-i18n/uim/uim-1.8.9_pre20210103.ebuild b/app-i18n/uim/uim-1.8.9_pre20210103.ebuild
new file mode 100644
index 00000000000..d96338d66ab
--- /dev/null
+++ b/app-i18n/uim/uim-1.8.9_pre20210103.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2021 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 ~ppc64 ~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
+	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
+)
+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
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/, app-i18n/uim/files/
@ 2021-10-23 14:32 Akinori Hattori
  0 siblings, 0 replies; 9+ messages in thread
From: Akinori Hattori @ 2021-10-23 14:32 UTC (permalink / raw
  To: gentoo-commits

commit:     8f4f71bddbe323cc16c9580725a95ec1c2ec3eba
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 23 14:23:57 2021 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Oct 23 14:31:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f4f71bd

app-i18n/uim: fix build with sys-devel/slibtool

Closes: https://bugs.gentoo.org/792198
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 app-i18n/uim/files/uim-slibtool.patch | 14 ++++++++++++++
 app-i18n/uim/uim-1.8.8-r2.ebuild      |  1 +
 2 files changed, 15 insertions(+)

diff --git a/app-i18n/uim/files/uim-slibtool.patch b/app-i18n/uim/files/uim-slibtool.patch
new file mode 100644
index 00000000000..51560d439e2
--- /dev/null
+++ b/app-i18n/uim/files/uim-slibtool.patch
@@ -0,0 +1,14 @@
+--- a/qt4/common.pro.in
++++ b/qt4/common.pro.in
+@@ -4,8 +4,9 @@
+                @abs_top_srcdir@ @abs_top_srcdir@/uim \
+                @abs_top_srcdir@/replace
+ QMAKE_LIBDIR += @abs_top_builddir@/uim @abs_top_builddir@/replace \
+-                @abs_top_builddir@/replace/.libs @abs_top_builddir@/uim/.libs
+-LIBS += -lreplace -luim -luim-scm
++                @abs_top_builddir@/replace/.libs @abs_top_builddir@/uim/.libs \
++		@abs_top_builddir@/sigscheme/libgcroots/.libs
++LIBS += -lreplace -luim -luim-scm -lgcroots
+ !win32:!embedded:!mac {
+     LIBS += -luim-x-util
+ }

diff --git a/app-i18n/uim/uim-1.8.8-r2.ebuild b/app-i18n/uim/uim-1.8.8-r2.ebuild
index 3e0f4c05b07..dd5bb5fe65e 100644
--- a/app-i18n/uim/uim-1.8.8-r2.ebuild
+++ b/app-i18n/uim/uim-1.8.8-r2.ebuild
@@ -77,6 +77,7 @@ BDEPEND="dev-util/intltool
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-slibtool.patch
 	"${FILESDIR}"/${PN}-tinfo.patch
 	"${FILESDIR}"/${PN}-xkb.patch
 	"${FILESDIR}"/${PN}-zh-TW.patch


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/, app-i18n/uim/files/
@ 2021-10-23 14:32 Akinori Hattori
  0 siblings, 0 replies; 9+ messages in thread
From: Akinori Hattori @ 2021-10-23 14:32 UTC (permalink / raw
  To: gentoo-commits

commit:     229ac4caeff2746ed7c89021d037900632e53a36
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 23 14:18:41 2021 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Oct 23 14:31:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=229ac4ca

app-i18n/uim: fix desktop file

Closes: https://bugs.gentoo.org/795867
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 app-i18n/uim/files/uim-1.8.8-desktop.patch         | 35 ++++++++++++++++++++++
 .../{uim-1.8.8-r1.ebuild => uim-1.8.8-r2.ebuild}   |  1 +
 2 files changed, 36 insertions(+)

diff --git a/app-i18n/uim/files/uim-1.8.8-desktop.patch b/app-i18n/uim/files/uim-1.8.8-desktop.patch
new file mode 100644
index 00000000000..5e068754791
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.8.8-desktop.patch
@@ -0,0 +1,35 @@
+From 63cda66c1665b8ccc9ae11a5a4fb341afb8c5ac0 Mon Sep 17 00:00:00 2001
+From: OBATA Akio <obache@users.noreply.github.com>
+Date: Mon, 30 Dec 2019 22:26:11 +0900
+Subject: [PATCH] Fix to use pref tool with default toolkit (#151)
+
+---
+ configure.ac      | 1 +
+ uim.desktop.in.in | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 472c67f02..d530bc081 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1188,6 +1188,7 @@ AM_CONDITIONAL(DEFAULT_TOOLKIT_GTK3, test "x$default_toolkit" = xgtk3)
+ AM_CONDITIONAL(DEFAULT_TOOLKIT_QT,  test "x$default_toolkit" = xqt)
+ AM_CONDITIONAL(DEFAULT_TOOLKIT_QT4, test "x$default_toolkit" = xqt4)
+ AM_CONDITIONAL(DEFAULT_TOOLKIT_QT5, test "x$default_toolkit" = xqt5)
++AC_SUBST(default_toolkit)
+ 
+ AC_ARG_ENABLE(fep,
+   AC_HELP_STRING([--disable-fep],
+diff --git a/uim.desktop.in.in b/uim.desktop.in.in
+index b4a4d4f50..38c5c6d5e 100644
+--- a/uim.desktop.in.in
++++ b/uim.desktop.in.in
+@@ -3,7 +3,7 @@ Type=Application
+ _Name=Input Method
+ _Comment=Customize uim input method environment
+ _Keywords=input;method;
+-Exec=uim-pref-gtk
++Exec=uim-pref-@default_toolkit@
+ Icon=@uim_pixmapsdir@/uim-icon.png
+ Terminal=false
+ Categories=Settings;X-GNOME-PersonalSettings;

diff --git a/app-i18n/uim/uim-1.8.8-r1.ebuild b/app-i18n/uim/uim-1.8.8-r2.ebuild
similarity index 99%
rename from app-i18n/uim/uim-1.8.8-r1.ebuild
rename to app-i18n/uim/uim-1.8.8-r2.ebuild
index 4b72e29cd38..99ed8908464 100644
--- a/app-i18n/uim/uim-1.8.8-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.8-r2.ebuild
@@ -80,6 +80,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-tinfo.patch
 	"${FILESDIR}"/${PN}-xkb.patch
 	"${FILESDIR}"/${PN}-zh-TW.patch
+	"${FILESDIR}"/${P}-desktop.patch
 	"${FILESDIR}"/${P}-fno-common.patch
 )
 DOCS=( AUTHORS NEWS README RELNOTE doc )


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/, app-i18n/uim/files/
@ 2022-05-14  2:32 Sam James
  0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2022-05-14  2:32 UTC (permalink / raw
  To: gentoo-commits

commit:     d5901bd14f66b550782cfa755da29d2755369f70
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sat Apr  2 07:33:21 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 14 02:32:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5901bd1

app-i18n/uim: remove wrong Wconversion substitution

Closes: https://bugs.gentoo.org/836623
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24859
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ....9_pre20210103-remove-Wconversion-replace.patch |  13 ++
 app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild       | 247 +++++++++++++++++++++
 2 files changed, 260 insertions(+)

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
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/, app-i18n/uim/files/
@ 2022-09-06 15:29 Akinori Hattori
  0 siblings, 0 replies; 9+ messages in thread
From: Akinori Hattori @ 2022-09-06 15:29 UTC (permalink / raw
  To: gentoo-commits

commit:     ce9226921522391615407350818b090fdf7b8732
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  6 15:29:08 2022 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Sep  6 15:29:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce922692

app-i18n/uim: new upstream release

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 app-i18n/uim/Manifest              |   1 +
 app-i18n/uim/files/uim-zh-TW.patch |  11 ++
 app-i18n/uim/uim-1.8.9.ebuild      | 241 +++++++++++++++++++++++++++++++++++++
 3 files changed, 253 insertions(+)

diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index b53e2ce400b5..372e31815111 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/app-i18n/uim/files/uim-zh-TW.patch b/app-i18n/uim/files/uim-zh-TW.patch
new file mode 100644
index 000000000000..dce86724a27a
--- /dev/null
+++ b/app-i18n/uim/files/uim-zh-TW.patch
@@ -0,0 +1,11 @@
+--- 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
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/, app-i18n/uim/files/
@ 2023-10-23 13:28 Akinori Hattori
  0 siblings, 0 replies; 9+ messages in thread
From: Akinori Hattori @ 2023-10-23 13:28 UTC (permalink / raw
  To: gentoo-commits

commit:     d59b4a228a10f1f7f9941a2f587baed476be8cfa
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 23 13:26:55 2023 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Mon Oct 23 13:28:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d59b4a22

app-i18n/uim: rename patch

Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 app-i18n/uim/files/{uim-clang-16-configure.patch => uim-clang-16.patch} | 0
 app-i18n/uim/uim-1.8.9-r1.ebuild                                        | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/uim/files/uim-clang-16-configure.patch b/app-i18n/uim/files/uim-clang-16.patch
similarity index 100%
rename from app-i18n/uim/files/uim-clang-16-configure.patch
rename to app-i18n/uim/files/uim-clang-16.patch

diff --git a/app-i18n/uim/uim-1.8.9-r1.ebuild b/app-i18n/uim/uim-1.8.9-r1.ebuild
index ec51cd6da6de..3b78acf0a953 100644
--- a/app-i18n/uim/uim-1.8.9-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.9-r1.ebuild
@@ -84,6 +84,7 @@ BDEPEND="gnome-base/librsvg
 	nls? ( dev-util/intltool )"
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-clang-16.patch
 	"${FILESDIR}"/${PN}-gentoo.patch
 	"${FILESDIR}"/${PN}-kde.patch
 	"${FILESDIR}"/${PN}-slibtool.patch
@@ -91,7 +92,6 @@ PATCHES=(
 	"${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 )


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/, app-i18n/uim/files/
@ 2024-12-24  9:21 Sam James
  0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2024-12-24  9:21 UTC (permalink / raw
  To: gentoo-commits

commit:     c7a1da8d4b7f114f39af1a8cab5bfb7044729f37
Author:     Z. Liu <zhixu.liu <AT> gmail <DOT> com>
AuthorDate: Sat Dec 14 13:56:18 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 24 09:19:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7a1da8d

app-i18n/uim: use set-face-underline

apply patch from upstream which "s/set-face-underline-p/set-face-underline/g"

Closes: https://bugs.gentoo.org/912958
Signed-off-by: Z. Liu <zhixu.liu <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/39710
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-i18n/uim/files/uim-set-face-underline.patch | 32 +++++++++++++++++++++++++
 app-i18n/uim/uim-1.8.9-r2.ebuild                |  1 +
 2 files changed, 33 insertions(+)

diff --git a/app-i18n/uim/files/uim-set-face-underline.patch b/app-i18n/uim/files/uim-set-face-underline.patch
new file mode 100644
index 000000000000..bf0d3a9a64d6
--- /dev/null
+++ b/app-i18n/uim/files/uim-set-face-underline.patch
@@ -0,0 +1,32 @@
+https://github.com/uim/uim/commit/7b903ddf144344e49da12cc070f7c11f82ae61db
+
+commit 7b903ddf144344e49da12cc070f7c11f82ae61db
+Author: Sutou Kouhei <kou@clear-code.com>
+Date:   Fri Aug 11 10:44:26 2023 +0900
+
+    emacs: use set-face-underline
+    
+    set-face-underline-p is removed in Emacs 29.
+
+diff --git a/emacs/uim-var.el b/emacs/uim-var.el
+index 189f91c9..ce40b6db 100644
+--- a/emacs/uim-var.el
++++ b/emacs/uim-var.el
+@@ -435,7 +435,7 @@ keeps the size of it when showing the candidates.")
+ (make-face 'uim-preedit-face)
+ 
+ (copy-face 'uim-preedit-face 'uim-preedit-underline-face)
+-(set-face-underline-p        'uim-preedit-underline-face t)
++(set-face-underline          'uim-preedit-underline-face t)
+ 
+ ;; highlight
+ (make-face 'uim-preedit-highlight-face)
+@@ -443,7 +443,7 @@ keeps the size of it when showing the candidates.")
+ (set-face-background 'uim-preedit-highlight-face "Blue3")
+ 
+ (copy-face 'uim-preedit-highlight-face 'uim-preedit-highlight-underline-face)
+-(set-face-underline-p 'uim-preedit-highlight-underline-face t)
++(set-face-underline   'uim-preedit-highlight-underline-face t)
+ 
+ ;; separator
+ (make-face 'uim-separator-face)

diff --git a/app-i18n/uim/uim-1.8.9-r2.ebuild b/app-i18n/uim/uim-1.8.9-r2.ebuild
index 8e2c2252a1f1..679e1f61e788 100644
--- a/app-i18n/uim/uim-1.8.9-r2.ebuild
+++ b/app-i18n/uim/uim-1.8.9-r2.ebuild
@@ -90,6 +90,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-Wconversion.patch
 	"${FILESDIR}"/${PN}-xkb.patch
 	"${FILESDIR}"/${PN}-zh-TW.patch
+	"${FILESDIR}"/${PN}-set-face-underline.patch
 )
 
 DOCS=( AUTHORS NEWS README RELNOTE doc )


^ permalink raw reply related	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-12-24  9:21 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-28 14:56 [gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/, app-i18n/uim/files/ Akinori Hattori
  -- strict thread matches above, loose matches on Subject: below --
2020-05-23  8:27 Andreas Sturmlechner
2021-10-23 14:32 Akinori Hattori
2021-10-23 14:32 Akinori Hattori
2021-10-23 14:32 Akinori Hattori
2022-05-14  2:32 Sam James
2022-09-06 15:29 Akinori Hattori
2023-10-23 13:28 Akinori Hattori
2024-12-24  9:21 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox