Version bumped. Added ibus local USE flag. Fixed imagelib issue, bug #327935. The patch is submitted by Kazunori Kojima. Dropped ~hppa KEYWORD because app-i18n/ibus has no ~hppa.

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

6 files changed, 349 insertions, 85 deletions

diff --git a/x11-terms/mlterm/ChangeLog b/x11-terms/mlterm/ChangeLog
index bf2f1de80c67..7ea40de61f3b 100644
--- a/x11-terms/mlterm/ChangeLog
+++ b/x11-terms/mlterm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-terms/mlterm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/ChangeLog,v 1.76 2011/04/05 11:31:59 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/ChangeLog,v 1.77 2011/05/11 23:13:31 matsuu Exp $
+
+*mlterm-3.0.3 (11 May 2011)
+
+  11 May 2011; MATSUU Takuto <matsuu@gentoo.org> -mlterm-2.9.3-r1.ebuild,
+  +mlterm-3.0.3.ebuild, +files/mlterm-3.0.3-gentoo.diff, metadata.xml:
+  Version bumped. Added ibus local USE flag. Fixed imagelib issue, bug #327935.
+  The patch is submitted by Kazunori Kojima. Dropped ~hppa KEYWORD because
+  app-i18n/ibus has no ~hppa.
 
   05 Apr 2011; Ulrich Mueller <ulm@gentoo.org> mlterm-2.9.3-r1.ebuild,
   mlterm-2.9.4-r4.ebuild, mlterm-3.0.1.ebuild:
diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index f2c43516cd31..415bc9816534 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -4,19 +4,30 @@ Hash: SHA1
 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
+AUX mlterm-3.0.3-gentoo.diff 11140 RMD160 08e54cd5a8df3b116fdbd577db6003eb818e2608 SHA1 ce19b0c69e947de2aac90c6adaa664760ae8c0a5 SHA256 a203784055e0c566393f6fe019a3db36d4a4293525b8b25947bfb85c5018a188
 DIST mlterm-2.9.4.tar.gz 1991879 RMD160 7267ab5f413571611c6b568b5bac5cea41123d92 SHA1 cb2ac8ea34609e387e87bac8198a3256c6cc215f SHA256 6b90e880cbb5dfc091aa0e2da9c75675a84b13bf0f628dc02250026bbbcebe4d
 DIST mlterm-2.9.4_256.patch 15238 RMD160 4c982835ae212cc54ba936166bb7afb9cbba78ef SHA1 f9f264d8b0c76016dd9c42e63526731dd59f1f9b SHA256 6bde3d3ebe3552d192853119c84c687ebe6b7c892e149c863e1a6c9534fd6347
 DIST mlterm-3.0.1.tar.gz 2645619 RMD160 987b82f48c8a4c8e1419a7563f77c4beb37b1f34 SHA1 fd2be79969fc094da81776ea9b5a12f08a2499d4 SHA256 ad52d19be474d07ae0237304af4caf899fb54448df32e0e7909a12f668b796dd
-EBUILD mlterm-2.9.3-r1.ebuild 1812 RMD160 c2e15c9dbed91f78cb6948b648e765b1212581b8 SHA1 a0bae0fd6ccd053cdfb92ce3cacf0ce4e65b72e8 SHA256 4a535d757445464610c1baeffc409150600a725575fb6b25e33694d7dca54afb
+DIST mlterm-3.0.3.tar.gz 2706811 RMD160 db4ff4c4d5f08a5055213debdbbdfd3d93773cc9 SHA1 bec5406a8d47eaa9e50afb2656ac876864f15228 SHA256 be3f440ef884e739cc0dfa5f805a1d560508746fd4c9895817e3d9169bbbbe6d
 EBUILD mlterm-2.9.4-r4.ebuild 2023 RMD160 64debdd338fa06cce9b5681434885b7f16205f74 SHA1 d4b0cf3ccc8c3f716f484e980230442908243185 SHA256 e2fb393a657dd301fb311279d9c9ecc61a72bfd127f74da29401f661c9a67f5b
 EBUILD mlterm-3.0.1.ebuild 1940 RMD160 4847fdc3b8103732c1a9b20fe3a8c267cd7fa484 SHA1 46f51c0d11bc759b909aaa5f7bd411719fe94b48 SHA256 d68a42e662b187fc69fa430351f2c47546887b813cb3431cf8dbf0453789e108
-MISC ChangeLog 10129 RMD160 e5e641d5a115de7e76e0c68aed52200a009496aa SHA1 a8301b47ba41937905d85ced17cc4009de7fd223 SHA256 c74fb7ef47181677b08c19cffbaf30a6240f7f765ef025d143f93ef548c372a7
-MISC metadata.xml 259 RMD160 b1ffae81fff999e947154f7cb18bc3784f50b664 SHA1 1f2677ec74f053ef6818258591bfe90d3c0a96cb SHA256 38114f44ef60c6b017b812f5e8b3414a6103d98b13451dc1bc1d1a6c417ed295
+EBUILD mlterm-3.0.3.ebuild 1921 RMD160 63ad6e396bdb4e3922e6582baa2c3986718bb486 SHA1 f47e2d9eb0f9495415e849bd22e8eb20d95a86aa SHA256 76c272a26acd60b9fecd20d7c54f4e8a9a54afa12501952a3afbbae8f56d07b8
+MISC ChangeLog 10492 RMD160 6255c063fa9418392bff79b9c7ea181e81c445d3 SHA1 380543adbc944c70e137f389050bbab514697707 SHA256 80827108f5adaa497c19380574fe9f5fd2adf20feace2ff28e7cd16c3a335631
+MISC metadata.xml 365 RMD160 e99f36f57c26120b8ab7f21f8853ee2b3c8381c6 SHA1 f6a6bde013dcf2a85dbaf4f82a63137e60732b4b SHA256 b568338367b351d6fceccf0e879860d5eaf4f773f2dacc0b7bb2ef5c3bcb3c86
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2a/e4ACgkQOeoy/oIi7uzbawCgpglY9Xe9V+nDJzE3X2MHMXcX
-zWkAnRLuoJIkGPQykH/F8UTWea19owj7
-=vPSA
+iQIcBAEBAgAGBQJNyxgiAAoJECaGw+YFKA1p+QkP/RS1Kpef35RQRByc/A5IGShX
+0QSKhlK+IBeEMgR7TXMQbfHQZzmZ0FK1UGJI7k8cjEWnrZzGHz55ArILOl14HAt7
+/hoPLgv0cYS5NRfjPf7/YQCntiN3DlVxt0QvZWvQcwguNev8EEebAKlveIhK3UGi
+MwevzBoPpgQjbprCXtbEsvZQJAazIgRxPK7eWFlqkeYV3Bo52qgqQDM2eWBRzr2R
+gc3UxTWtVl94LUDP0hJ1BOUgOGi8zNmi9X1VbmCiBieHZ/D1PibqP9rFZjX4dVUo
+Hg2G8LUeEZThqKopSpsRDV0JIkV6/jH54nIV1qewc+1ODCaG0PYQuN4rYdpNebe5
+g676H2fB+rUyfCnljn8LQ1T+P+1tHvIcuoxpDp0VvmUIy+/kzCXFA/bFDB9HQXoC
+pE/SAfGx/3s560JIGwO81i/zXl+V+Mt3JPMsDEpz28i184Yap5IQjBM4y/M7LY/W
+FxQl6XrzXSFqftGN7YsUxc7XpGZinY+DyZnAZm0892DmsPB6BLhc6blaGSQHRE0I
+H+Ik14pMg7WeI4UcLh6zJVDxPvf50ibpWm4PchLDrtKX7+UL+A76YcTmAOyi3W4Z
+y090A5c+m/rSjB0X0KiFbuN4kbMhqMuZ2Q1LY0ZYm4i6J5zE5xq74oJ1+nvPqyWF
+uXcVlo82fLCT9/wlADBm
+=rbnA
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/mlterm/files/mlterm-3.0.3-gentoo.diff b/x11-terms/mlterm/files/mlterm-3.0.3-gentoo.diff
new file mode 100644
index 000000000000..73dcd04e2549
--- /dev/null
+++ b/x11-terms/mlterm/files/mlterm-3.0.3-gentoo.diff
@@ -0,0 +1,240 @@
+diff -Naurb mlterm-3.0.3.orig/contrib/scrollbar/extra/Makefile.in mlterm-3.0.3/contrib/scrollbar/extra/Makefile.in
+--- mlterm-3.0.3.orig/contrib/scrollbar/extra/Makefile.in	2011-03-21 07:36:11.000000000 +0900
++++ mlterm-3.0.3/contrib/scrollbar/extra/Makefile.in	2011-05-12 01:34:08.930300204 +0900
+@@ -20,7 +20,7 @@
+ LIBTOOL = @LIBTOOL@
+ 
+ LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS)
+-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC)
++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS)
+ LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+ 
+ .SUFFIXES: .o .c
+diff -Naurb mlterm-3.0.3.orig/contrib/scrollbar/pixmap_engine/Makefile.in mlterm-3.0.3/contrib/scrollbar/pixmap_engine/Makefile.in
+--- mlterm-3.0.3.orig/contrib/scrollbar/pixmap_engine/Makefile.in	2011-03-21 07:36:11.000000000 +0900
++++ mlterm-3.0.3/contrib/scrollbar/pixmap_engine/Makefile.in	2011-05-12 01:34:08.930300204 +0900
+@@ -20,7 +20,7 @@
+ LIBTOOL = @LIBTOOL@
+ 
+ LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS)
+-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC)
++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS)
+ LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+ 
+ .SUFFIXES: .o .c
+diff -Naurb mlterm-3.0.3.orig/contrib/tool/mlterm-menu/Makefile.in mlterm-3.0.3/contrib/tool/mlterm-menu/Makefile.in
+--- mlterm-3.0.3.orig/contrib/tool/mlterm-menu/Makefile.in	2011-03-21 07:36:11.000000000 +0900
++++ mlterm-3.0.3/contrib/tool/mlterm-menu/Makefile.in	2011-05-12 01:34:08.926300233 +0900
+@@ -30,7 +30,7 @@
+ 
+ LIBS = $(LIBS1) $(LIBS2@WIN32TAG@)
+ 
+-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC)
++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS)
+ LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+ 
+ PACKAGE = @PACKAGE@
+diff -Naurb mlterm-3.0.3.orig/contrib/tool/mlterm-zoom/Makefile.in mlterm-3.0.3/contrib/tool/mlterm-zoom/Makefile.in
+--- mlterm-3.0.3.orig/contrib/tool/mlterm-zoom/Makefile.in	2011-03-21 07:36:11.000000000 +0900
++++ mlterm-3.0.3/contrib/tool/mlterm-zoom/Makefile.in	2011-05-12 01:34:08.926300233 +0900
+@@ -21,7 +21,7 @@
+ LIBS = $(LIBS_LOCAL) @X_LIBS@ -lX11 @X_EXTRA_LIBS@
+ #LIBS = $(LIBS_LOCAL) @X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
+ 
+-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC)
++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS)
+ LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+ 
+ PACKAGE = @PACKAGE@
+diff -Naurb mlterm-3.0.3.orig/gtk/Makefile.in mlterm-3.0.3/gtk/Makefile.in
+--- mlterm-3.0.3.orig/gtk/Makefile.in	2011-03-21 07:35:56.000000000 +0900
++++ mlterm-3.0.3/gtk/Makefile.in	2011-05-12 01:34:08.938300163 +0900
+@@ -18,7 +18,7 @@
+ 	`pkg-config vte --cflags`
+ 
+ LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS)
+-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC)
++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS)
+ LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+ 
+ OBJ = vte.o marshal.o vtetypebuiltins.o reaper.o
+diff -Naurb mlterm-3.0.3.orig/inputmethod/ibus/Makefile.in mlterm-3.0.3/inputmethod/ibus/Makefile.in
+--- mlterm-3.0.3.orig/inputmethod/ibus/Makefile.in	2011-03-21 07:37:01.000000000 +0900
++++ mlterm-3.0.3/inputmethod/ibus/Makefile.in	2011-05-12 01:34:08.926300233 +0900
+@@ -30,7 +30,7 @@
+ LIBTOOL = @LIBTOOL@
+ 
+ LIBTOOL_CC      = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS)
+-LIBTOOL_LINK    = $(LIBTOOL) --mode=link $(CC)
++LIBTOOL_LINK    = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS)
+ LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+ 
+ .SUFFIXES: .o .c
+diff -Naurb mlterm-3.0.3.orig/inputmethod/iiimf/Makefile.in mlterm-3.0.3/inputmethod/iiimf/Makefile.in
+--- mlterm-3.0.3.orig/inputmethod/iiimf/Makefile.in	2011-03-21 07:37:01.000000000 +0900
++++ mlterm-3.0.3/inputmethod/iiimf/Makefile.in	2011-05-12 01:34:08.926300233 +0900
+@@ -30,7 +30,7 @@
+ LIBTOOL = @LIBTOOL@
+ 
+ LIBTOOL_CC      = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS)
+-LIBTOOL_LINK    = $(LIBTOOL) --mode=link $(CC)
++LIBTOOL_LINK    = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS)
+ LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+ 
+ .SUFFIXES: .o .c
+diff -Naurb mlterm-3.0.3.orig/inputmethod/kbd/Makefile.in mlterm-3.0.3/inputmethod/kbd/Makefile.in
+--- mlterm-3.0.3.orig/inputmethod/kbd/Makefile.in	2011-03-21 07:37:01.000000000 +0900
++++ mlterm-3.0.3/inputmethod/kbd/Makefile.in	2011-05-12 01:34:08.926300233 +0900
+@@ -28,7 +28,7 @@
+ LIBTOOL = @LIBTOOL@
+ 
+ LIBTOOL_CC      = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS)
+-LIBTOOL_LINK    = $(LIBTOOL) --mode=link $(CC)
++LIBTOOL_LINK    = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS)
+ LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+ 
+ .SUFFIXES: .o .c
+diff -Naurb mlterm-3.0.3.orig/inputmethod/m17nlib/Makefile.in mlterm-3.0.3/inputmethod/m17nlib/Makefile.in
+--- mlterm-3.0.3.orig/inputmethod/m17nlib/Makefile.in	2011-03-21 07:37:01.000000000 +0900
++++ mlterm-3.0.3/inputmethod/m17nlib/Makefile.in	2011-05-12 01:34:08.926300233 +0900
+@@ -30,7 +30,7 @@
+ LIBTOOL = @LIBTOOL@
+ 
+ LIBTOOL_CC      = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS)
+-LIBTOOL_LINK    = $(LIBTOOL) --mode=link $(CC)
++LIBTOOL_LINK    = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS)
+ LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+ 
+ .SUFFIXES: .o .c
+diff -Naurb mlterm-3.0.3.orig/inputmethod/scim/Makefile.in mlterm-3.0.3/inputmethod/scim/Makefile.in
+--- mlterm-3.0.3.orig/inputmethod/scim/Makefile.in	2011-03-21 07:37:01.000000000 +0900
++++ mlterm-3.0.3/inputmethod/scim/Makefile.in	2011-05-12 01:34:08.922300253 +0900
+@@ -33,7 +33,7 @@
+ 
+ LIBTOOL_CC      = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS)
+ LIBTOOL_CXX     = $(LIBTOOL) --mode=compile $(CXX) $(CFLAGS)
+-LIBTOOL_LINK    = $(LIBTOOL) --mode=link $(CC)
++LIBTOOL_LINK    = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS)
+ LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+ 
+ .SUFFIXES: .o .c .cpp
+diff -Naurb mlterm-3.0.3.orig/inputmethod/uim/Makefile.in mlterm-3.0.3/inputmethod/uim/Makefile.in
+--- mlterm-3.0.3.orig/inputmethod/uim/Makefile.in	2011-03-21 07:37:01.000000000 +0900
++++ mlterm-3.0.3/inputmethod/uim/Makefile.in	2011-05-12 01:34:08.926300233 +0900
+@@ -30,7 +30,7 @@
+ LIBTOOL = @LIBTOOL@
+ 
+ LIBTOOL_CC      = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS)
+-LIBTOOL_LINK    = $(LIBTOOL) --mode=link $(CC)
++LIBTOOL_LINK    = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS)
+ LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+ 
+ .SUFFIXES: .o .c
+diff -Naurb mlterm-3.0.3.orig/kiklib/src/Makefile.in mlterm-3.0.3/kiklib/src/Makefile.in
+--- mlterm-3.0.3.orig/kiklib/src/Makefile.in	2011-03-21 07:35:59.000000000 +0900
++++ mlterm-3.0.3/kiklib/src/Makefile.in	2011-05-12 01:34:08.934300183 +0900
+@@ -30,7 +30,7 @@
+ INC = $(COMOBJ:.o=.h) kik_list.h kik_iterator.h kik_types.h kik_util.h kik_def.h kik_net.h kik_pty.h kik_utmp.h kik_dlfcn.h
+ 
+ LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS)
+-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LIBS)
++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LIBS) $(LDFLAGS)
+ LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+ 
+ LIBNAME=libkik
+diff -Naurb mlterm-3.0.3.orig/mkf/lib/Makefile.in mlterm-3.0.3/mkf/lib/Makefile.in
+--- mlterm-3.0.3.orig/mkf/lib/Makefile.in	2011-03-21 07:36:07.000000000 +0900
++++ mlterm-3.0.3/mkf/lib/Makefile.in	2011-05-12 01:34:08.938300163 +0900
+@@ -54,7 +54,7 @@
+ MINOR = 0
+ 
+ LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS)
+-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC)
++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS)
+ LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+ 
+ 
+diff -Naurb mlterm-3.0.3.orig/mkf/libtbl/Makefile.in mlterm-3.0.3/mkf/libtbl/Makefile.in
+--- mlterm-3.0.3.orig/mkf/libtbl/Makefile.in	2011-03-21 07:36:06.000000000 +0900
++++ mlterm-3.0.3/mkf/libtbl/Makefile.in	2011-05-12 01:34:08.934300183 +0900
+@@ -24,7 +24,7 @@
+ OBJ = $(JAJP_TABLE_OBJ) $(KOKR_TABLE_OBJ) $(ZH_TABLE_OBJ) $(BYTE_TABLE_OBJ)
+ 
+ LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS)
+-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC)
++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS)
+ LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+ 
+ all: libmkf_jajp.la libmkf_kokr.la libmkf_zh.la libmkf_8bits.la
+diff -Naurb mlterm-3.0.3.orig/mlterm/Makefile.in mlterm-3.0.3/mlterm/Makefile.in
+--- mlterm-3.0.3.orig/mlterm/Makefile.in	2011-03-21 07:35:54.000000000 +0900
++++ mlterm-3.0.3/mlterm/Makefile.in	2011-05-12 01:34:08.930300204 +0900
+@@ -33,7 +33,7 @@
+ MINOR = 0
+ 
+ LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS)
+-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC)
++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS)
+ LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+ 
+ 
+diff -Naurb mlterm-3.0.3.orig/scrollbar/sample/Makefile.in mlterm-3.0.3/scrollbar/sample/Makefile.in
+--- mlterm-3.0.3.orig/scrollbar/sample/Makefile.in	2011-03-21 07:35:58.000000000 +0900
++++ mlterm-3.0.3/scrollbar/sample/Makefile.in	2011-05-12 01:34:08.934300183 +0900
+@@ -33,7 +33,7 @@
+ LIBTOOL = @LIBTOOL@
+ 
+ LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS)
+-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC)
++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS)
+ LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+ 
+ .SUFFIXES: .o .c
+diff -Naurb mlterm-3.0.3.orig/tool/mlconfig/Makefile.in mlterm-3.0.3/tool/mlconfig/Makefile.in
+--- mlterm-3.0.3.orig/tool/mlconfig/Makefile.in	2011-03-21 07:35:58.000000000 +0900
++++ mlterm-3.0.3/tool/mlconfig/Makefile.in	2011-05-12 01:34:08.930300204 +0900
+@@ -42,7 +42,7 @@
+ 
+ LIBS = $(LIBS1) $(LIBS2@WIN32TAG@)
+ 
+-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC)
++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS)
+ LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+ 
+ PACKAGE = @PACKAGE@
+diff -Naurb mlterm-3.0.3.orig/tool/mlimgloader/Makefile.in mlterm-3.0.3/tool/mlimgloader/Makefile.in
+--- mlterm-3.0.3.orig/tool/mlimgloader/Makefile.in	2011-03-21 07:35:58.000000000 +0900
++++ mlterm-3.0.3/tool/mlimgloader/Makefile.in	2011-05-12 01:34:08.934300183 +0900
+@@ -32,7 +32,7 @@
+ INSTALL_OPT = @INSTALL_OPT@
+ 
+ LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS)
+-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC)
++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS)
+ LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+ 
+ all: $(PROG)
+diff -Naurb mlterm-3.0.3.orig/tool/mlmenu/Makefile.in mlterm-3.0.3/tool/mlmenu/Makefile.in
+--- mlterm-3.0.3.orig/tool/mlmenu/Makefile.in	2011-03-21 07:35:58.000000000 +0900
++++ mlterm-3.0.3/tool/mlmenu/Makefile.in	2011-05-12 01:34:08.934300183 +0900
+@@ -18,7 +18,7 @@
+ LIBS = $(LIBS_LOCAL) @X_LIBS@ -lX11 @X_EXTRA_LIBS@
+ #LIBS = $(LIBS_LOCAL) @X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
+ 
+-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC)
++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS)
+ LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+ 
+ PACKAGE = @PACKAGE@
+diff -Naurb mlterm-3.0.3.orig/xwindow/Makefile.in mlterm-3.0.3/xwindow/Makefile.in
+--- mlterm-3.0.3.orig/xwindow/Makefile.in	2011-03-21 07:35:57.000000000 +0900
++++ mlterm-3.0.3/xwindow/Makefile.in	2011-05-12 01:34:08.930300204 +0900
+@@ -64,7 +64,7 @@
+ INSTALL_OPT = @INSTALL_OPT@
+ 
+ LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS)
+-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC)
++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS)
+ LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+ 
+ all: $(PROG)
diff --git a/x11-terms/mlterm/metadata.xml b/x11-terms/mlterm/metadata.xml
index b0324cbea5a9..38c44c69a73e 100644
--- a/x11-terms/mlterm/metadata.xml
+++ b/x11-terms/mlterm/metadata.xml
@@ -3,7 +3,8 @@
 <pkgmetadata>
 <herd>cjk</herd>
 <use>
-	<flag name='scim'>Enable scim support</flag>
-	<flag name='uim'>Enable uim support</flag>
+	<flag name='ibus'>Enable <pkg>app-i18n/ibus</pkg> support</flag>
+	<flag name='scim'>Enable <pkg>app-i18n/scim</pkg> support</flag>
+	<flag name='uim'>Enable <pkg>app-i18n/uim</pkg> support</flag>
 </use>
 </pkgmetadata>
diff --git a/x11-terms/mlterm/mlterm-2.9.3-r1.ebuild b/x11-terms/mlterm/mlterm-2.9.3-r1.ebuild
deleted file mode 100644
index 135eab5447aa..000000000000
--- a/x11-terms/mlterm/mlterm-2.9.3-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-2.9.3-r1.ebuild,v 1.15 2011/04/05 11:31:59 ulm Exp $
-
-EAPI="1"
-
-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 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 ) )
-	|| ( sys-libs/libutempter sys-apps/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}"/xwindow
-	epatch "${FILESDIR}"/mlterm-2.9.1-gentoo.diff
-	epatch "${FILESDIR}"/${P}-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)"
-
-	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 () {
-	make DESTDIR="${D}" install || die
-
-	dodoc ChangeLog README
-
-	docinto ja
-	dodoc doc/ja/*
-	docinto en
-	dodoc doc/en/*
-}
diff --git a/x11-terms/mlterm/mlterm-3.0.3.ebuild b/x11-terms/mlterm/mlterm-3.0.3.ebuild
new file mode 100644
index 000000000000..a5088f944fb6
--- /dev/null
+++ b/x11-terms/mlterm/mlterm-3.0.3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-3.0.3.ebuild,v 1.1 2011/05/11 23:13:31 matsuu Exp $
+
+EAPI="3"
+inherit eutils
+
+IUSE="bidi gtk ibus m17n-lib nls scim static-libs truetype uim"
+#IUSE="${IUSE} iiimf"
+
+DESCRIPTION="A multi-lingual terminal emulator"
+HOMEPAGE="http://mlterm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mlterm/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+LICENSE="BSD"
+
+RDEPEND="|| ( sys-libs/libutempter sys-apps/utempter )
+	x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libSM
+	gtk? ( x11-libs/gtk+:2 )
+	truetype? ( x11-libs/libXft )
+	bidi? ( >=dev-libs/fribidi-0.10.4 )
+	ibus? ( >=app-i18n/ibus-1.3 )
+	nls? ( virtual/libintl )
+	uim? ( >=app-i18n/uim-1.0 )
+	scim? ( >=app-i18n/scim-1.4 )
+	m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-2.9.4-uim15-fix.patch \
+		"${FILESDIR}"/${PN}-3.0.3-gentoo.diff
+}
+
+src_configure() {
+	local myconf
+
+	if use gtk ; then
+		myconf="${myconf} --with-imagelib=gdk-pixbuf"
+	else
+		myconf="${myconf} --with-tools=mlclient,mlcc"
+	fi
+
+	# iiimf isn't stable enough
+	#myconf="${myconf} $(use_enable iiimf)"
+
+	econf --enable-utmp \
+		$(use_enable truetype anti-alias) \
+		$(use_enable bidi fribidi) \
+		$(use_enable ibus) \
+		$(use_enable nls) \
+		$(use_enable uim) \
+		$(use_enable scim) \
+		$(use_enable m17n-lib m17nlib) \
+		$(use_enable static-libs static) \
+		${myconf} || die "econf failed"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die
+
+	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
+
+	doicon contrib/icon/mlterm* || die
+	make_desktop_entry mlterm mlterm mlterm-icon TerminalEmulator || die
+
+	dodoc ChangeLog README || die
+
+	docinto ja
+	dodoc doc/ja/* || die
+	docinto en
+	dodoc doc/en/* || die
+}