Fixed emacs support, bug 194804.

Package-Manager: portage-2.1.3.9

5 files changed, 186 insertions, 5 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index fc35b036607d..5701b5450a3c 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/uim
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.169 2007/08/10 22:27:21 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.170 2007/10/14 23:02:54 matsuu Exp $
+
+*uim-1.4.1-r1 (14 Oct 2007)
+
+  14 Oct 2007; <matsuu@gentoo.org> +files/50uim-gentoo.el,
+  +uim-1.4.1-r1.ebuild:
+  Fixed emacs support, bug #194804.
 
   10 Aug 2007; MATSUU Takuto <matsuu@gentoo.org> -files/uim-1.2.1-nls.patch,
   -files/uim-1.4.0-gentoo.patch, -uim-1.2.1.ebuild, -uim-1.3.1.ebuild,
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index bc018be8c82c..d0b2ecd2e269 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -2,15 +2,23 @@ AUX 50uim-el-gentoo.el 296 RMD160 0a966341d3f19dee46a855257ed7636a58e4418b SHA1
 MD5 f2d1f1632eaf89b416b29ee2001c7987 files/50uim-el-gentoo.el 296
 RMD160 0a966341d3f19dee46a855257ed7636a58e4418b files/50uim-el-gentoo.el 296
 SHA256 e572b2c766fcf5534dc687ec9a7e4384e3a5747431f91695c977a925392baeb4 files/50uim-el-gentoo.el 296
+AUX 50uim-gentoo.el 113 RMD160 4830acc8f32525aaae156cf0252d9e93cd41cc2c SHA1 64b0c88335dbfdab07938a8d92218407ebec2db1 SHA256 58a536e5b7d0ffac6802e60d348b092623601d25c8917d64a51347efab9e4cb7
+MD5 c64ee42c214e774aeaeb5206b03a1077 files/50uim-gentoo.el 113
+RMD160 4830acc8f32525aaae156cf0252d9e93cd41cc2c files/50uim-gentoo.el 113
+SHA256 58a536e5b7d0ffac6802e60d348b092623601d25c8917d64a51347efab9e4cb7 files/50uim-gentoo.el 113
 DIST uim-1.4.1.tar.bz2 2634265 RMD160 84d95720af62990e0fca1bd3d1a53eeca25d5deb SHA1 5de27af0f59d2e9775c1688dcd6d3848a434fb26 SHA256 145e77ea713b0ebc7afd4be4e8775029b764c4cdd2d54b96594f00b999117771
+EBUILD uim-1.4.1-r1.ebuild 4591 RMD160 1d13e69f0a96f3fe84668c834108e1c545905eb4 SHA1 38f2451f33d2e93fb61db8e88ff33223afa25351 SHA256 465c1aa8a93fa174e06d2735836d5d749d13691e9cd8ba7bad114c6789f86351
+MD5 4cbf377ec1c968bf57e018526fe9463f uim-1.4.1-r1.ebuild 4591
+RMD160 1d13e69f0a96f3fe84668c834108e1c545905eb4 uim-1.4.1-r1.ebuild 4591
+SHA256 465c1aa8a93fa174e06d2735836d5d749d13691e9cd8ba7bad114c6789f86351 uim-1.4.1-r1.ebuild 4591
 EBUILD uim-1.4.1.ebuild 3959 RMD160 3be8d686ea0ecec61891e787c8d98c4d53c1f596 SHA1 d3843bab7a8df1d4371378a9f980dfe08e8f4129 SHA256 4e87f1bc1727e52c57a274895ec8aa7ff4c545652ee800ed5025faace4540d00
 MD5 f18eba0d9ce2fe2f8ac31da85c65cc09 uim-1.4.1.ebuild 3959
 RMD160 3be8d686ea0ecec61891e787c8d98c4d53c1f596 uim-1.4.1.ebuild 3959
 SHA256 4e87f1bc1727e52c57a274895ec8aa7ff4c545652ee800ed5025faace4540d00 uim-1.4.1.ebuild 3959
-MISC ChangeLog 23721 RMD160 a8047fd15dc16e2828c53389c301d0ced04845e9 SHA1 0b6ba313224f04af3bd00075dcb9a507e213d143 SHA256 31c9d20c406554a870cde7673cecf83afcfe1afbd303dfc6ba08c8b397ec520b
-MD5 30fe5d625df0f7264e73fb3a84b0a5ed ChangeLog 23721
-RMD160 a8047fd15dc16e2828c53389c301d0ced04845e9 ChangeLog 23721
-SHA256 31c9d20c406554a870cde7673cecf83afcfe1afbd303dfc6ba08c8b397ec520b ChangeLog 23721
+MISC ChangeLog 23870 RMD160 0a11b18044c8150da64ae97b455ddbb7905e72f2 SHA1 40fc0e32c40bd3785e95ddea20cf80b9d177411f SHA256 38f31e1a1ba989f0fe799651224fa1ccf18822ecd0011dd9ad542038081c3914
+MD5 6aeac3fc1f2069bb931902166b246f5c ChangeLog 23870
+RMD160 0a11b18044c8150da64ae97b455ddbb7905e72f2 ChangeLog 23870
+SHA256 38f31e1a1ba989f0fe799651224fa1ccf18822ecd0011dd9ad542038081c3914 ChangeLog 23870
 MISC metadata.xml 642 RMD160 4e733f159a595e48d0d02c410145909944b09554 SHA1 8187a74132d09878946f84871a8a33462481d6cb SHA256 6108d3c7a6aaf3b5d0a74575e5e725578e5a4c01128fb22ce746ebf41bc8a8e5
 MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
 RMD160 4e733f159a595e48d0d02c410145909944b09554 metadata.xml 642
@@ -18,3 +26,6 @@ SHA256 6108d3c7a6aaf3b5d0a74575e5e725578e5a4c01128fb22ce746ebf41bc8a8e5 metadata
 MD5 d152f26c71ea00b72c2fe3f97111fd14 files/digest-uim-1.4.1 235
 RMD160 151fc716376cda004d69960cd01c5febbaa15232 files/digest-uim-1.4.1 235
 SHA256 039a5d4ace6c8645d94dd829e91aa326d7a50b859a9a28c84d6dbf9a7e5d9518 files/digest-uim-1.4.1 235
+MD5 d152f26c71ea00b72c2fe3f97111fd14 files/digest-uim-1.4.1-r1 235
+RMD160 151fc716376cda004d69960cd01c5febbaa15232 files/digest-uim-1.4.1-r1 235
+SHA256 039a5d4ace6c8645d94dd829e91aa326d7a50b859a9a28c84d6dbf9a7e5d9518 files/digest-uim-1.4.1-r1 235
diff --git a/app-i18n/uim/files/50uim-gentoo.el b/app-i18n/uim/files/50uim-gentoo.el
new file mode 100644
index 000000000000..350f6216139f
--- /dev/null
+++ b/app-i18n/uim/files/50uim-gentoo.el
@@ -0,0 +1,4 @@
+;;; app-i18n/uim site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'uim-mode "uim" nil t)
diff --git a/app-i18n/uim/files/digest-uim-1.4.1-r1 b/app-i18n/uim/files/digest-uim-1.4.1-r1
new file mode 100644
index 000000000000..9c6214fd4f16
--- /dev/null
+++ b/app-i18n/uim/files/digest-uim-1.4.1-r1
@@ -0,0 +1,3 @@
+MD5 f2d0da38626e0d96116e7bd72a0bc596 uim-1.4.1.tar.bz2 2634265
+RMD160 84d95720af62990e0fca1bd3d1a53eeca25d5deb uim-1.4.1.tar.bz2 2634265
+SHA256 145e77ea713b0ebc7afd4be4e8775029b764c4cdd2d54b96594f00b999117771 uim-1.4.1.tar.bz2 2634265
diff --git a/app-i18n/uim/uim-1.4.1-r1.ebuild b/app-i18n/uim/uim-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..fbfcb6914c12
--- /dev/null
+++ b/app-i18n/uim/uim-1.4.1-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.4.1-r1.ebuild,v 1.1 2007/10/14 23:02:54 matsuu Exp $
+
+inherit eutils qt3 multilib elisp-common flag-o-matic
+
+DESCRIPTION="Simple, secure and flexible input method library"
+HOMEPAGE="http://code.google.com/p/uim/"
+SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="anthy canna eb emacs gnome gtk kde libedit m17n-lib ncurses nls prime qt3 X linguas_zh_CN linguas_ja linguas_ko"
+
+RDEPEND="X? ( x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXrender )
+	anthy? ( || ( app-i18n/anthy app-i18n/anthy-ss ) )
+	canna? ( app-i18n/canna )
+	eb? ( dev-libs/eb )
+	emacs? ( virtual/emacs )
+	gnome? ( >=gnome-base/gnome-panel-2.14 )
+	gtk? ( >=x11-libs/gtk+-2.4 )
+	kde? ( kde-base/kdelibs )
+	libedit? ( dev-libs/libedit )
+	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
+	ncurses? ( sys-libs/ncurses )
+	nls? ( virtual/libintl )
+	prime? ( app-i18n/prime )
+	qt3? ( $(qt_min_version 3.3.4) )
+	!app-i18n/uim-svn
+	!<app-i18n/prime-0.9.4"
+
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xextproto
+		x11-proto/xproto )"
+
+RDEPEND="${RDEPEND}
+	X? (
+		media-fonts/font-sony-misc
+		linguas_zh_CN? ( media-fonts/font-isas-misc )
+		linguas_ja? ( media-fonts/font-jis-misc )
+		linguas_ko? ( media-fonts/font-daewoo-misc )
+	)"
+#		linguas_zh_TW? ( media-fonts/taipeifonts )
+
+SITEFILE=50${PN}-gentoo.el
+
+pkg_setup() {
+	if use qt3 && ! built_with_use =x11-libs/qt-3* immqt-bc && ! built_with_use =x11-libs/qt-3* immqt; then
+		eerror "To support qt3 in this package is required to have"
+		eerror "=x11-libs/qt-3* compiled with immqt-bc(recommended) or immqt USE flag."
+		die "Please reemerge =x11-libs/qt-3* with USE=\"immqt-bc\" or USE=\"immqt\"."
+
+	fi
+	# An arch specific config directory is used on multilib systems
+	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
+}
+
+src_compile() {
+	local myconf
+
+	if use gtk && (use anthy || use canna); then
+		myconf="${myconf} --enable-dict"
+	else
+		myconf="${myconf} --disable-dict"
+	fi
+
+	if use qt3 ; then
+		append-flags -DQT_THREAD_SUPPORT
+	fi
+
+	if use gtk || use qt3 ; then
+		myconf="${myconf} --enable-pref"
+	else
+		myconf="${myconf} --disable-pref"
+	fi
+
+	econf $(use_with X x) \
+		$(use_with anthy) \
+		$(use_with canna) \
+		$(use_with eb) \
+		$(use_enable emacs) \
+		$(use_with emacs lispdir "${SITELISP}") \
+		$(use_enable gnome gnome-applet) \
+		$(use_with gtk gtk2) \
+		$(use_with libedit) \
+		$(use_enable kde kde-applet) \
+		$(use_with m17n-lib m17nlib) \
+		$(use_enable ncurses fep) \
+		$(use_enable nls) \
+		$(use_with qt3 qt) \
+		$(use_with qt3 qt-immodule) \
+		${myconf} || die "econf failed"
+	emake -j1 || die "emake failed"
+
+	if use emacs; then
+		cd emacs
+		elisp-comp *.el || die "elisp-comp failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	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
+}
+
+pkg_postinst() {
+	elog
+	elog "To use uim-skk you should emerge app-i18n/skk-jisyo."
+	elog
+
+	elog
+	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 "or uim-im-switcher-qt."
+	elog
+	elog "If you upgrade from a version of uim older than 1.4.0,"
+	elog "you should run revdep-rebuild."
+
+	use gtk && gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
+	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
+}
+
+pkg_postrm() {
+	use gtk && gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
+	use emacs && elisp-site-regen
+}