Fixed work with uim-1.5.1.

(Portage version: 2.1.5_rc6)

3 files changed, 95 insertions, 2 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/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/*
+}