Fixed work with uim-1.5.1.

Package-Manager: portage-2.1.5_rc6

4 files changed, 98 insertions, 3 deletions

diff --git a/x11-terms/mlterm/ChangeLog b/x11-terms/mlterm/ChangeLog
index 6469c9b6c3ff..221fde54eb1f 100644
--- a/x11-terms/mlterm/ChangeLog
+++ b/x11-terms/mlterm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-terms/mlterm
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/ChangeLog,v 1.60 2007/12/17 17:10:56 matsuu Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/ChangeLog,v 1.61 2008/05/25 15:43:25 matsuu Exp $
+
+*mlterm-2.9.4-r1 (25 May 2008)
+
+  25 May 2008; MATSUU Takuto <matsuu@gentoo.org>
+  +files/mlterm-2.9.4-uim15-fix.patch, +mlterm-2.9.4-r1.ebuild:
+  Fixed to compile with UIM=uim.
 
 *mlterm-2.9.4 (17 Dec 2007)
 
diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index ac677a73a789..fdb1e6ca8c8e 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -1,8 +1,10 @@
 AUX mlterm-2.9.1-gentoo.diff 346 RMD160 ac1c41ff99912955626daee5dbe38cf77600bace SHA1 b6c0f7514c024e9b8879dadb95fe5c69a70c706f SHA256 d3a79cead3359b0700329ae0df2bcd88e8c3d83911ddd948bc015f488309748c
 AUX mlterm-2.9.3-asneeded.diff 655 RMD160 f020bbc01a27f1a133b43b9a37bc2a28a87c6a81 SHA1 dae2d1107484e0eb11a33b4b385f7d071e223942 SHA256 41a134c9adfdfc6b7e4f7f1cd2eb7e45b67b10a1b525e2ad3c8bd6ed581f2d78
+AUX mlterm-2.9.4-uim15-fix.patch 404 RMD160 b4c5b192306c76e33497a180eac595368d0abcb5 SHA1 1f246fe65fb844d804b3ec125fa9a414abaa4c15 SHA256 6d1522e4afa3205a7dc7e0ce12dbd1eece9f11d753ac5ca771b2e2f0ece33856
 DIST mlterm-2.9.3.tar.gz 1984977 RMD160 27f4381a8b8b68b07e53bbeb422581beb7527b48 SHA1 65ba5a7bd83accf7f621f84b84debb35c8f215ef SHA256 565e2d3d391390450b953b13f4c1ebf6e67e188c1ec56583459842e592a08e4f
 DIST mlterm-2.9.4.tar.gz 1991879 RMD160 7267ab5f413571611c6b568b5bac5cea41123d92 SHA1 cb2ac8ea34609e387e87bac8198a3256c6cc215f SHA256 6b90e880cbb5dfc091aa0e2da9c75675a84b13bf0f628dc02250026bbbcebe4d
 EBUILD mlterm-2.9.3-r1.ebuild 1819 RMD160 3ceded7880f7aa4312c013727de7d490d6e97296 SHA1 e011856c87020d153fadffb846e97d57941c7595 SHA256 0ee2a7a7a89773e26e95d4cb59013726d39a2a0bdefb8a6733c538bdfa071db8
+EBUILD mlterm-2.9.4-r1.ebuild 1884 RMD160 15a617cd9c78ca8cf3e8c5c0e40271e62d722b65 SHA1 2bbd62236926eb95a7d7b06550c3a7406a560928 SHA256 49486b8a50a4e1c722bfa8377e1858538f5ebbf56f26ff15c11ce70c4a72183e
 EBUILD mlterm-2.9.4.ebuild 1835 RMD160 7e298228a49a6d2a976fdbc70bbdc67d14c1c513 SHA1 fa0d8afea9ee7009564d329a7787a02c2b7dd670 SHA256 2686f9f5221203ccdfbafe6563a57956ee0cdcb4d56733b8760de724985b7193
-MISC ChangeLog 7873 RMD160 2ac5c3bb5fdad49b91490a0d141996d13eeab38d SHA1 ece0233eb679f0e153df5f9112e8c69797fc0575 SHA256 7fcc125cd65a7dd263f0303ecdab0adc357f9b1de6922a73a014cf582c14f6f5
+MISC ChangeLog 8052 RMD160 9c96b7a17dc9d404aba2c443f683d2f515d9d601 SHA1 f4bee50d3a718887400768a2f19c1ac093b96e04 SHA256 f8082a9b00e4e4d0f2d02de618917983d8ed0eac09d01316f02d7a743f1ced3d
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
diff --git a/x11-terms/mlterm/files/mlterm-2.9.4-uim15-fix.patch b/x11-terms/mlterm/files/mlterm-2.9.4-uim15-fix.patch
new file mode 100644
index 000000000000..e69a2c93206b
--- /dev/null
+++ b/x11-terms/mlterm/files/mlterm-2.9.4-uim15-fix.patch
@@ -0,0 +1,10 @@
+--- a/inputmethod/uim/im_uim.c	2008-05-25 23:41:46.871924640 +0900
++++ b/inputmethod/uim/im_uim.c	2008-05-25 23:42:34.149923480 +0900
+@@ -35,6 +35,7 @@
+ #include  <uim-helper.h>
+ #include <uim-im-switcher.h>
+ 
++#include  <stdio.h>
+ #include  <X11/keysym.h>	/* XK_xxx */
+ #include  <kiklib/kik_mem.h>	/* malloc/alloca/free */
+ #include  <kiklib/kik_str.h>	/* kik_str_alloca_dup kik_str_sep kik_snprintf*/
diff --git a/x11-terms/mlterm/mlterm-2.9.4-r1.ebuild b/x11-terms/mlterm/mlterm-2.9.4-r1.ebuild
new file mode 100644
index 000000000000..5259ce011d42
--- /dev/null
+++ b/x11-terms/mlterm/mlterm-2.9.4-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-2.9.4-r1.ebuild,v 1.1 2008/05/25 15:43:25 matsuu Exp $
+
+inherit eutils flag-o-matic
+
+IUSE="truetype gtk imlib bidi nls uim scim"
+#IUSE="${IUSE} m17n-lib iiimf"
+
+DESCRIPTION="A multi-lingual terminal emulator"
+HOMEPAGE="http://mlterm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mlterm/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+LICENSE="BSD"
+
+RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
+	!gtk? ( imlib? ( >=media-libs/imlib-1.9.14 ) )
+	truetype? ( =media-libs/freetype-2* )
+	bidi? ( >=dev-libs/fribidi-0.10.4 )
+	nls? ( sys-devel/gettext )
+	uim? ( >=app-i18n/uim-0.3.4.2 )
+	scim? ( || ( >=app-i18n/scim-1.4 app-i18n/scim-cvs ) )
+	virtual/utempter
+	x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libSM"
+DEPEND="${RDEPEND}"
+#	m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 )
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-uim15-fix.patch
+	cd "${S}"/xwindow
+	epatch "${FILESDIR}"/${PN}-2.9.1-gentoo.diff
+	epatch "${FILESDIR}"/${PN}-2.9.3-asneeded.diff
+}
+
+src_compile() {
+	local myconf imagelib
+
+	if use gtk ; then
+		imagelib="gdk-pixbuf"
+	elif use imlib ; then
+		imagelib="imlib"
+	fi
+
+	use gtk || myconf="${myconf} --with-tools=mlclient,mlcc"
+
+	# m17n-lib, and iiimf aren't stable enough
+	#myconf="${myconf} $(use_enable iiimf) $(use_enable m17n-lib m17nlib)"
+
+	append-ldflags $(bindnow-flags)
+
+	econf --enable-utmp \
+		$(use_enable truetype anti-alias) \
+		$(use_enable bidi fribidi) \
+		$(use_enable nls) \
+		$(use_enable uim) \
+		$(use_enable scim) \
+		--with-imagelib="${imagelib}" \
+		${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die
+
+	dodoc ChangeLog README
+
+	docinto ja
+	dodoc doc/ja/*
+	docinto en
+	dodoc doc/en/*
+}