new upstream release

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key EC917A6D)

11 files changed, 120 insertions, 1024 deletions

diff --git a/x11-terms/mlterm/ChangeLog b/x11-terms/mlterm/ChangeLog
index ed195fa2716d..a528cc1b7d0d 100644
--- a/x11-terms/mlterm/ChangeLog
+++ b/x11-terms/mlterm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-terms/mlterm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/ChangeLog,v 1.97 2014/08/25 17:55:14 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/ChangeLog,v 1.98 2014/09/07 03:07:30 hattya Exp $
+
+*mlterm-3.3.8 (07 Sep 2014)
+
+  07 Sep 2014; Akinori Hattori <hattya@gentoo.org> +mlterm-3.3.8.ebuild,
+  -files/mlterm-2.9.1-gentoo.diff, -files/mlterm-2.9.3-asneeded.diff,
+  -files/mlterm-3.0.3-gentoo.diff, -files/mlterm-3.0.5-ldflags.patch,
+  -files/mlterm-3.0.7-ldflags.patch, -files/mlterm-3.0.8-ldflags.patch,
+  -mlterm-3.0.9-r1.ebuild, -mlterm-3.0.9.ebuild, metadata.xml:
+  new upstream release
 
   25 Aug 2014; Manuel Rüger <mrueg@gentoo.org> -mlterm-2.9.4-r4.ebuild:
   Cleanup EAPI=1 superseded version. See bug #518172.
diff --git a/x11-terms/mlterm/files/mlterm-2.9.1-gentoo.diff b/x11-terms/mlterm/files/mlterm-2.9.1-gentoo.diff
deleted file mode 100644
index e1b41a36f034..000000000000
--- a/x11-terms/mlterm/files/mlterm-2.9.1-gentoo.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2004-10-10 21:48:43.000000000 +0900
-+++ Makefile.in	2004-12-05 08:48:54.000000000 +0900
-@@ -49,7 +49,7 @@
- PROG = mlterm
- INSTALL_OPT = @INSTALL_OPT@
- 
--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/files/mlterm-2.9.3-asneeded.diff b/x11-terms/mlterm/files/mlterm-2.9.3-asneeded.diff
deleted file mode 100644
index 8a8e848e4122..000000000000
--- a/x11-terms/mlterm/files/mlterm-2.9.3-asneeded.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- xwindow/Makefile.in.orig	2006-11-03 13:14:34.000000000 +0900
-+++ xwindow/Makefile.in	2006-11-03 13:14:39.000000000 +0900
-@@ -42,9 +42,9 @@
- 	-DLIBEXECDIR=\"$(LIBEXECDIR)\" -DDATADIR=\"$(DATADIR)\"\
- 	-I$(top_srcdir)/mlterm -I${top_builddir}/xwindow -I/usr/local/include
- 
--LIBS=$(LIBS_LOCAL) @IND_LIBS@ @FRIBIDI_LIBS@ @IMAGELIB_LIBS@ @AA_LIBS@ \
-+LIBS=$(LIBS_LOCAL) @IND_LIBS@ @IMAGELIB_LIBS@ @AA_LIBS@ \
- 	@DL_LIBS_IM@ @DL_LIBS_SB@ \
--	@X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@ $(LMLTERM) $(LMKF) $(LKIK) \
-+	@X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@ $(LMLTERM) @FRIBIDI_LIBS@ $(LMKF) $(LKIK) \
- 	-L/usr/local/lib -R/usr/local/lib
- 
- PROG = mlterm
diff --git a/x11-terms/mlterm/files/mlterm-3.0.3-gentoo.diff b/x11-terms/mlterm/files/mlterm-3.0.3-gentoo.diff
deleted file mode 100644
index 73dcd04e2549..000000000000
--- a/x11-terms/mlterm/files/mlterm-3.0.3-gentoo.diff
+++ /dev/null
@@ -1,240 +0,0 @@
-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/files/mlterm-3.0.5-ldflags.patch b/x11-terms/mlterm/files/mlterm-3.0.5-ldflags.patch
deleted file mode 100644
index f422c1a7688f..000000000000
--- a/x11-terms/mlterm/files/mlterm-3.0.5-ldflags.patch
+++ /dev/null
@@ -1,264 +0,0 @@
-diff -Naur mlterm-3.0.5.orig/contrib/scrollbar/extra/Makefile.in mlterm-3.0.5/contrib/scrollbar/extra/Makefile.in
---- mlterm-3.0.5.orig/contrib/scrollbar/extra/Makefile.in	2011-06-04 01:26:17.000000000 +0900
-+++ mlterm-3.0.5/contrib/scrollbar/extra/Makefile.in	2011-06-09 19:35:38.745471044 +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 -Naur mlterm-3.0.5.orig/contrib/scrollbar/pixmap_engine/Makefile.in mlterm-3.0.5/contrib/scrollbar/pixmap_engine/Makefile.in
---- mlterm-3.0.5.orig/contrib/scrollbar/pixmap_engine/Makefile.in	2011-06-04 01:26:17.000000000 +0900
-+++ mlterm-3.0.5/contrib/scrollbar/pixmap_engine/Makefile.in	2011-06-09 19:35:38.745471044 +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 -Naur mlterm-3.0.5.orig/contrib/tool/mlcc/Makefile.in mlterm-3.0.5/contrib/tool/mlcc/Makefile.in
---- mlterm-3.0.5.orig/contrib/tool/mlcc/Makefile.in	2011-06-04 01:26:17.000000000 +0900
-+++ mlterm-3.0.5/contrib/tool/mlcc/Makefile.in	2011-06-09 23:29:02.851741057 +0900
-@@ -20,7 +20,7 @@
- all: $(PROG)
- 
- $(PROG): $(OBJECTS)
--	$(CC) -g -o $(PROG) $(OBJECTS)
-+	$(CC) -g -o $(PROG) $(OBJECTS) $(LDFLAGS)
- 
- .SUFFIXES: .c.o
- 
-diff -Naur mlterm-3.0.5.orig/contrib/tool/mlterm-menu/Makefile.in mlterm-3.0.5/contrib/tool/mlterm-menu/Makefile.in
---- mlterm-3.0.5.orig/contrib/tool/mlterm-menu/Makefile.in	2011-06-04 01:26:17.000000000 +0900
-+++ mlterm-3.0.5/contrib/tool/mlterm-menu/Makefile.in	2011-06-09 19:35:38.745471044 +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 -Naur mlterm-3.0.5.orig/contrib/tool/mlterm-zoom/Makefile.in mlterm-3.0.5/contrib/tool/mlterm-zoom/Makefile.in
---- mlterm-3.0.5.orig/contrib/tool/mlterm-zoom/Makefile.in	2011-06-04 01:26:17.000000000 +0900
-+++ mlterm-3.0.5/contrib/tool/mlterm-zoom/Makefile.in	2011-06-09 19:35:38.745471044 +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 -Naur mlterm-3.0.5.orig/gtk/Makefile.in mlterm-3.0.5/gtk/Makefile.in
---- mlterm-3.0.5.orig/gtk/Makefile.in	2011-06-04 01:26:09.000000000 +0900
-+++ mlterm-3.0.5/gtk/Makefile.in	2011-06-09 19:35:38.746471084 +0900
-@@ -18,7 +18,7 @@
- 	-DSYSCONFDIR=\"$(SYSCONFDIR)\" @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 -Naur mlterm-3.0.5.orig/inputmethod/ibus/Makefile.in mlterm-3.0.5/inputmethod/ibus/Makefile.in
---- mlterm-3.0.5.orig/inputmethod/ibus/Makefile.in	2011-06-04 01:26:34.000000000 +0900
-+++ mlterm-3.0.5/inputmethod/ibus/Makefile.in	2011-06-09 19:35:38.746471084 +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 -Naur mlterm-3.0.5.orig/inputmethod/iiimf/Makefile.in mlterm-3.0.5/inputmethod/iiimf/Makefile.in
---- mlterm-3.0.5.orig/inputmethod/iiimf/Makefile.in	2011-06-04 01:26:35.000000000 +0900
-+++ mlterm-3.0.5/inputmethod/iiimf/Makefile.in	2011-06-09 19:35:38.746471084 +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 -Naur mlterm-3.0.5.orig/inputmethod/kbd/Makefile.in mlterm-3.0.5/inputmethod/kbd/Makefile.in
---- mlterm-3.0.5.orig/inputmethod/kbd/Makefile.in	2011-06-04 01:26:35.000000000 +0900
-+++ mlterm-3.0.5/inputmethod/kbd/Makefile.in	2011-06-09 19:35:38.746471084 +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 -Naur mlterm-3.0.5.orig/inputmethod/m17nlib/Makefile.in mlterm-3.0.5/inputmethod/m17nlib/Makefile.in
---- mlterm-3.0.5.orig/inputmethod/m17nlib/Makefile.in	2011-06-04 01:26:37.000000000 +0900
-+++ mlterm-3.0.5/inputmethod/m17nlib/Makefile.in	2011-06-09 19:35:38.746471084 +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 -Naur mlterm-3.0.5.orig/inputmethod/scim/Makefile.in mlterm-3.0.5/inputmethod/scim/Makefile.in
---- mlterm-3.0.5.orig/inputmethod/scim/Makefile.in	2011-06-04 01:26:34.000000000 +0900
-+++ mlterm-3.0.5/inputmethod/scim/Makefile.in	2011-06-09 19:35:38.746471084 +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 -Naur mlterm-3.0.5.orig/inputmethod/uim/Makefile.in mlterm-3.0.5/inputmethod/uim/Makefile.in
---- mlterm-3.0.5.orig/inputmethod/uim/Makefile.in	2011-06-04 01:26:35.000000000 +0900
-+++ mlterm-3.0.5/inputmethod/uim/Makefile.in	2011-06-09 19:35:38.747471138 +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 -Naur mlterm-3.0.5.orig/kiklib/src/Makefile.in mlterm-3.0.5/kiklib/src/Makefile.in
---- mlterm-3.0.5.orig/kiklib/src/Makefile.in	2011-06-04 01:26:11.000000000 +0900
-+++ mlterm-3.0.5/kiklib/src/Makefile.in	2011-06-09 19:35:38.747471138 +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 -Naur mlterm-3.0.5.orig/mkf/lib/Makefile.in mlterm-3.0.5/mkf/lib/Makefile.in
---- mlterm-3.0.5.orig/mkf/lib/Makefile.in	2011-06-04 01:26:16.000000000 +0900
-+++ mlterm-3.0.5/mkf/lib/Makefile.in	2011-06-09 19:35:38.747471138 +0900
-@@ -52,7 +52,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 -Naur mlterm-3.0.5.orig/mkf/libtbl/Makefile.in mlterm-3.0.5/mkf/libtbl/Makefile.in
---- mlterm-3.0.5.orig/mkf/libtbl/Makefile.in	2011-06-04 01:26:15.000000000 +0900
-+++ mlterm-3.0.5/mkf/libtbl/Makefile.in	2011-06-09 19:35:38.747471138 +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 -Naur mlterm-3.0.5.orig/mlterm/Makefile.in mlterm-3.0.5/mlterm/Makefile.in
---- mlterm-3.0.5.orig/mlterm/Makefile.in	2011-06-04 01:26:09.000000000 +0900
-+++ mlterm-3.0.5/mlterm/Makefile.in	2011-06-09 19:35:38.747471138 +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 -Naur mlterm-3.0.5.orig/scrollbar/sample/Makefile.in mlterm-3.0.5/scrollbar/sample/Makefile.in
---- mlterm-3.0.5.orig/scrollbar/sample/Makefile.in	2011-06-04 01:26:11.000000000 +0900
-+++ mlterm-3.0.5/scrollbar/sample/Makefile.in	2011-06-09 19:35:38.747471138 +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 -Naur mlterm-3.0.5.orig/tool/mlclient/Makefile.in mlterm-3.0.5/tool/mlclient/Makefile.in
---- mlterm-3.0.5.orig/tool/mlclient/Makefile.in	2011-06-04 01:26:11.000000000 +0900
-+++ mlterm-3.0.5/tool/mlclient/Makefile.in	2011-06-09 23:27:57.251467757 +0900
-@@ -20,7 +20,7 @@
- all: $(PROG)
- 
- $(PROG): $(OBJ)
--	$(CC) -o $(PROG) $(OBJ) $(LIBS)
-+	$(CC) -o $(PROG) $(OBJ) $(LIBS) $(LDFLAGS)
- 	cp $(PROG) $(PROG)x
- 
- .SUFFIXES: .c.o
-diff -Naur mlterm-3.0.5.orig/tool/mlconfig/Makefile.in mlterm-3.0.5/tool/mlconfig/Makefile.in
---- mlterm-3.0.5.orig/tool/mlconfig/Makefile.in	2011-06-04 01:26:11.000000000 +0900
-+++ mlterm-3.0.5/tool/mlconfig/Makefile.in	2011-06-09 19:35:38.748471200 +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 -Naur mlterm-3.0.5.orig/tool/mlimgloader/Makefile.in mlterm-3.0.5/tool/mlimgloader/Makefile.in
---- mlterm-3.0.5.orig/tool/mlimgloader/Makefile.in	2011-06-04 01:26:11.000000000 +0900
-+++ mlterm-3.0.5/tool/mlimgloader/Makefile.in	2011-06-09 19:35:38.748471200 +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 -Naur mlterm-3.0.5.orig/tool/mlmenu/Makefile.in mlterm-3.0.5/tool/mlmenu/Makefile.in
---- mlterm-3.0.5.orig/tool/mlmenu/Makefile.in	2011-06-04 01:26:11.000000000 +0900
-+++ mlterm-3.0.5/tool/mlmenu/Makefile.in	2011-06-09 19:35:38.748471200 +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 -Naur mlterm-3.0.5.orig/xwindow/Makefile.in mlterm-3.0.5/xwindow/Makefile.in
---- mlterm-3.0.5.orig/xwindow/Makefile.in	2011-06-04 01:26:10.000000000 +0900
-+++ mlterm-3.0.5/xwindow/Makefile.in	2011-06-09 19:35:38.748471200 +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/files/mlterm-3.0.7-ldflags.patch b/x11-terms/mlterm/files/mlterm-3.0.7-ldflags.patch
deleted file mode 100644
index 90de20026fbd..000000000000
--- a/x11-terms/mlterm/files/mlterm-3.0.7-ldflags.patch
+++ /dev/null
@@ -1,277 +0,0 @@
-diff -Naur mlterm-3.0.5.orig/contrib/scrollbar/extra/Makefile.in mlterm-3.0.5/contrib/scrollbar/extra/Makefile.in
---- mlterm-3.0.5.orig/contrib/scrollbar/extra/Makefile.in	2011-06-04 01:26:17.000000000 +0900
-+++ mlterm-3.0.5/contrib/scrollbar/extra/Makefile.in	2011-06-09 19:35:38.745471044 +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 -Naur mlterm-3.0.5.orig/contrib/scrollbar/pixmap_engine/Makefile.in mlterm-3.0.5/contrib/scrollbar/pixmap_engine/Makefile.in
---- mlterm-3.0.5.orig/contrib/scrollbar/pixmap_engine/Makefile.in	2011-06-04 01:26:17.000000000 +0900
-+++ mlterm-3.0.5/contrib/scrollbar/pixmap_engine/Makefile.in	2011-06-09 19:35:38.745471044 +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 -Naur mlterm-3.0.5.orig/contrib/tool/mlcc/Makefile.in mlterm-3.0.5/contrib/tool/mlcc/Makefile.in
---- mlterm-3.0.5.orig/contrib/tool/mlcc/Makefile.in	2011-06-04 01:26:17.000000000 +0900
-+++ mlterm-3.0.5/contrib/tool/mlcc/Makefile.in	2011-06-09 23:29:02.851741057 +0900
-@@ -20,7 +20,7 @@
- all: $(PROG)
- 
- $(PROG): $(OBJECTS)
--	$(CC) -g -o $(PROG) $(OBJECTS)
-+	$(CC) -g -o $(PROG) $(OBJECTS) $(LDFLAGS)
- 
- .SUFFIXES: .c.o
- 
-diff -Naur mlterm-3.0.5.orig/contrib/tool/mlterm-menu/Makefile.in mlterm-3.0.5/contrib/tool/mlterm-menu/Makefile.in
---- mlterm-3.0.5.orig/contrib/tool/mlterm-menu/Makefile.in	2011-06-04 01:26:17.000000000 +0900
-+++ mlterm-3.0.5/contrib/tool/mlterm-menu/Makefile.in	2011-06-09 19:35:38.745471044 +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 -Naur mlterm-3.0.5.orig/contrib/tool/mlterm-zoom/Makefile.in mlterm-3.0.5/contrib/tool/mlterm-zoom/Makefile.in
---- mlterm-3.0.5.orig/contrib/tool/mlterm-zoom/Makefile.in	2011-06-04 01:26:17.000000000 +0900
-+++ mlterm-3.0.5/contrib/tool/mlterm-zoom/Makefile.in	2011-06-09 19:35:38.745471044 +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 -Naur mlterm-3.0.5.orig/gtk/Makefile.in mlterm-3.0.5/gtk/Makefile.in
---- mlterm-3.0.5.orig/gtk/Makefile.in	2011-06-04 01:26:09.000000000 +0900
-+++ mlterm-3.0.5/gtk/Makefile.in	2011-06-09 19:35:38.746471084 +0900
-@@ -18,7 +18,7 @@
- 	-DSYSCONFDIR=\"$(SYSCONFDIR)\" @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 -Naur mlterm-3.0.5.orig/inputmethod/ibus/Makefile.in mlterm-3.0.5/inputmethod/ibus/Makefile.in
---- mlterm-3.0.5.orig/inputmethod/ibus/Makefile.in	2011-06-04 01:26:34.000000000 +0900
-+++ mlterm-3.0.5/inputmethod/ibus/Makefile.in	2011-06-09 19:35:38.746471084 +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 -Naur mlterm-3.0.5.orig/inputmethod/iiimf/Makefile.in mlterm-3.0.5/inputmethod/iiimf/Makefile.in
---- mlterm-3.0.5.orig/inputmethod/iiimf/Makefile.in	2011-06-04 01:26:35.000000000 +0900
-+++ mlterm-3.0.5/inputmethod/iiimf/Makefile.in	2011-06-09 19:35:38.746471084 +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 -Naur mlterm-3.0.5.orig/inputmethod/kbd/Makefile.in mlterm-3.0.5/inputmethod/kbd/Makefile.in
---- mlterm-3.0.5.orig/inputmethod/kbd/Makefile.in	2011-06-04 01:26:35.000000000 +0900
-+++ mlterm-3.0.5/inputmethod/kbd/Makefile.in	2011-06-09 19:35:38.746471084 +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 -Naur mlterm-3.0.5.orig/inputmethod/m17nlib/Makefile.in mlterm-3.0.5/inputmethod/m17nlib/Makefile.in
---- mlterm-3.0.5.orig/inputmethod/m17nlib/Makefile.in	2011-06-04 01:26:37.000000000 +0900
-+++ mlterm-3.0.5/inputmethod/m17nlib/Makefile.in	2011-06-09 19:35:38.746471084 +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 -Naur mlterm-3.0.5.orig/inputmethod/scim/Makefile.in mlterm-3.0.5/inputmethod/scim/Makefile.in
---- mlterm-3.0.5.orig/inputmethod/scim/Makefile.in	2011-06-04 01:26:34.000000000 +0900
-+++ mlterm-3.0.5/inputmethod/scim/Makefile.in	2011-06-09 19:35:38.746471084 +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 -Naur mlterm-3.0.5.orig/inputmethod/uim/Makefile.in mlterm-3.0.5/inputmethod/uim/Makefile.in
---- mlterm-3.0.5.orig/inputmethod/uim/Makefile.in	2011-06-04 01:26:35.000000000 +0900
-+++ mlterm-3.0.5/inputmethod/uim/Makefile.in	2011-06-09 19:35:38.747471138 +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 -Naur mlterm-3.0.5.orig/kiklib/src/Makefile.in mlterm-3.0.5/kiklib/src/Makefile.in
---- mlterm-3.0.5.orig/kiklib/src/Makefile.in	2011-06-04 01:26:11.000000000 +0900
-+++ mlterm-3.0.5/kiklib/src/Makefile.in	2011-06-09 19:35:38.747471138 +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 -Naur mlterm-3.0.5.orig/mkf/lib/Makefile.in mlterm-3.0.5/mkf/lib/Makefile.in
---- mlterm-3.0.5.orig/mkf/lib/Makefile.in	2011-06-04 01:26:16.000000000 +0900
-+++ mlterm-3.0.5/mkf/lib/Makefile.in	2011-06-09 19:35:38.747471138 +0900
-@@ -52,7 +52,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 -Naur mlterm-3.0.5.orig/mkf/libtbl/Makefile.in mlterm-3.0.5/mkf/libtbl/Makefile.in
---- mlterm-3.0.5.orig/mkf/libtbl/Makefile.in	2011-06-04 01:26:15.000000000 +0900
-+++ mlterm-3.0.5/mkf/libtbl/Makefile.in	2011-06-09 19:35:38.747471138 +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 -Naur mlterm-3.0.5.orig/mlterm/Makefile.in mlterm-3.0.5/mlterm/Makefile.in
---- mlterm-3.0.5.orig/mlterm/Makefile.in	2011-06-04 01:26:09.000000000 +0900
-+++ mlterm-3.0.5/mlterm/Makefile.in	2011-06-09 19:35:38.747471138 +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 -Naur mlterm-3.0.5.orig/scrollbar/sample/Makefile.in mlterm-3.0.5/scrollbar/sample/Makefile.in
---- mlterm-3.0.5.orig/scrollbar/sample/Makefile.in	2011-06-04 01:26:11.000000000 +0900
-+++ mlterm-3.0.5/scrollbar/sample/Makefile.in	2011-06-09 19:35:38.747471138 +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 -Naur mlterm-3.0.5.orig/tool/mlclient/Makefile.in mlterm-3.0.5/tool/mlclient/Makefile.in
---- mlterm-3.0.5.orig/tool/mlclient/Makefile.in	2011-06-04 01:26:11.000000000 +0900
-+++ mlterm-3.0.5/tool/mlclient/Makefile.in	2011-06-09 23:27:57.251467757 +0900
-@@ -20,7 +20,7 @@
- all: $(PROG)
- 
- $(PROG): $(OBJ)
--	$(CC) -o $(PROG) $(OBJ) $(LIBS)
-+	$(CC) -o $(PROG) $(OBJ) $(LIBS) $(LDFLAGS)
- 	cp $(PROG) $(PROG)x
- 
- .SUFFIXES: .c.o
-diff -Naur mlterm-3.0.5.orig/tool/mlconfig/Makefile.in mlterm-3.0.5/tool/mlconfig/Makefile.in
---- mlterm-3.0.5.orig/tool/mlconfig/Makefile.in	2011-06-04 01:26:11.000000000 +0900
-+++ mlterm-3.0.5/tool/mlconfig/Makefile.in	2011-06-09 19:35:38.748471200 +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 -Naur mlterm-3.0.5.orig/tool/mlimgloader/Makefile.in mlterm-3.0.5/tool/mlimgloader/Makefile.in
---- mlterm-3.0.5.orig/tool/mlimgloader/Makefile.in	2011-06-04 01:26:11.000000000 +0900
-+++ mlterm-3.0.5/tool/mlimgloader/Makefile.in	2011-06-09 19:35:38.748471200 +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 -Naur mlterm-3.0.5.orig/tool/mlmenu/Makefile.in mlterm-3.0.5/tool/mlmenu/Makefile.in
---- mlterm-3.0.5.orig/tool/mlmenu/Makefile.in	2011-06-04 01:26:11.000000000 +0900
-+++ mlterm-3.0.5/tool/mlmenu/Makefile.in	2011-06-09 19:35:38.748471200 +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 -Naur mlterm-3.0.5.orig/xwindow/Makefile.in mlterm-3.0.5/xwindow/Makefile.in
---- mlterm-3.0.5.orig/xwindow/Makefile.in	2011-06-04 01:26:10.000000000 +0900
-+++ mlterm-3.0.5/xwindow/Makefile.in	2011-06-09 19:35:38.748471200 +0900
-@@ -64,7 +64,7 @@
- INSTALL_OPT = @INSTALL_OPT@
- 
- LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS)
--LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS)
-+LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS)
- LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL)
- 
- all: $(PROG)
-diff --git a/xwindow/libtype/Makefile.in b/xwindow/libtype/Makefile.in
-index 391c1fa..fff76f6 100644
---- a/xwindow/libtype/Makefile.in
-+++ b/xwindow/libtype/Makefile.in
-@@ -37,7 +37,7 @@ LIBS = $(LIBS_LOCAL) $(LMKF) $(LKIK) -L/usr/local/lib -R/usr/local/lib
- INSTALL_OPT = -m 755
- 
- LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS)
--LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS)
-+LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS)
- LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL)
- 
- TYPE_LIBS = @TYPE_LIBS@
diff --git a/x11-terms/mlterm/files/mlterm-3.0.8-ldflags.patch b/x11-terms/mlterm/files/mlterm-3.0.8-ldflags.patch
deleted file mode 100644
index 8e6092d292af..000000000000
--- a/x11-terms/mlterm/files/mlterm-3.0.8-ldflags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur mlterm-3.0.5.orig/contrib/tool/mlcc/Makefile.in mlterm-3.0.5/contrib/tool/mlcc/Makefile.in
---- mlterm-3.0.5.orig/contrib/tool/mlcc/Makefile.in	2011-06-04 01:26:17.000000000 +0900
-+++ mlterm-3.0.5/contrib/tool/mlcc/Makefile.in	2011-06-09 23:29:02.851741057 +0900
-@@ -20,7 +20,7 @@
- all: $(PROG)
- 
- $(PROG): $(OBJECTS)
--	$(CC) -g -o $(PROG) $(OBJECTS)
-+	$(CC) -g -o $(PROG) $(OBJECTS) $(LDFLAGS)
- 
- .SUFFIXES: .c.o
- 
-diff -Naur mlterm-3.0.5.orig/tool/mlclient/Makefile.in mlterm-3.0.5/tool/mlclient/Makefile.in
---- mlterm-3.0.5.orig/tool/mlclient/Makefile.in	2011-06-04 01:26:11.000000000 +0900
-+++ mlterm-3.0.5/tool/mlclient/Makefile.in	2011-06-09 23:27:57.251467757 +0900
-@@ -20,7 +20,7 @@
- all: $(PROG)
- 
- $(PROG): $(OBJ)
--	$(CC) -o $(PROG) $(OBJ) $(LIBS)
-+	$(CC) -o $(PROG) $(OBJ) $(LIBS) $(LDFLAGS)
- 	cp $(PROG) $(PROG)x
- 
- .SUFFIXES: .c.o
diff --git a/x11-terms/mlterm/metadata.xml b/x11-terms/mlterm/metadata.xml
index 259c2bc2e074..498ce9c8b363 100644
--- a/x11-terms/mlterm/metadata.xml
+++ b/x11-terms/mlterm/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
-<use>
-	<flag name='ibus'>Enable <pkg>app-i18n/ibus</pkg> support</flag>
-	<flag name='libssh2'>Enable <pkg>net-libs/libssh2</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>
+  <herd>cjk</herd>
+  <use>
+    <flag name="fcitx">Enable <pkg>app-i18n/fcitx</pkg> support</flag>
+    <flag name="ibus">Enable <pkg>app-i18n/ibus</pkg> support</flag>
+    <flag name="libssh2">Enable <pkg>net-libs/libssh2</pkg> support</flag>
+    <flag name="regis">Enable ReGIS support</flag>
+    <flag name="scim">Enable <pkg>app-i18n/scim</pkg> support</flag>
+    <flag name="uim">Enable <pkg>app-i18n/uim</pkg> support</flag>
+    <flag name="utempter">Enable <pkg>sys-libs/libutempter</pkg> support</flag>
+  </use>
 </pkgmetadata>
diff --git a/x11-terms/mlterm/mlterm-3.0.9-r1.ebuild b/x11-terms/mlterm/mlterm-3.0.9-r1.ebuild
deleted file mode 100644
index 74bcb0bd910a..000000000000
--- a/x11-terms/mlterm/mlterm-3.0.9-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-3.0.9-r1.ebuild,v 1.1 2012/06/21 13:41:09 naota Exp $
-
-EAPI="3"
-inherit autotools eutils
-
-IUSE="bidi debug gtk ibus libssh2 m17n-lib nls scim static-libs uim xft"
-
-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="|| ( sys-libs/libutempter sys-apps/utempter )
-	x11-libs/libX11
-	x11-libs/libICE
-	x11-libs/libSM
-	gtk? ( x11-libs/gtk+:2 )
-	xft? ( x11-libs/libXft )
-	bidi? ( >=dev-libs/fribidi-0.10.4 )
-	ibus? ( >=app-i18n/ibus-1.3 )
-	libssh2? ( net-libs/libssh2 )
-	nls? ( virtual/libintl )
-	uim? ( >=app-i18n/uim-1.0 )
-	scim? ( >=app-i18n/scim-1.4 )
-	m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 )"
-#	vte? ( x11-libs/vte )
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.9.4-uim15-fix.patch \
-		"${FILESDIR}"/${PN}-3.0.5-ibus.patch \
-		"${FILESDIR}"/${PN}-3.0.8-ldflags.patch \
-		"${FILESDIR}"/${PN}-3.0.7-underlinking.patch
-
-	eautoconf
-}
-
-src_configure() {
-	local myconf
-
-	if use gtk ; then
-		myconf="${myconf} --with-imagelib=gdk-pixbuf"
-	else
-		myconf="${myconf} --with-tools=mlclient,mlcc"
-	fi
-
-	if use xft ; then
-		myconf="${myconf} --with-type-engines=xft"
-	else
-		myconf="${myconf} --with-type-engines=xcore"
-	fi
-
-	# iiimf isn't stable enough
-	#myconf="${myconf} $(use_enable iiimf)"
-
-	econf --enable-utmp \
-		$(use_enable bidi fribidi) \
-		$(use_enable debug) \
-		$(use_enable ibus) \
-		$(use_enable libssh2 ssh2) \
-		$(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
-
-	if ! use static-libs ; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	doicon contrib/icon/mlterm* || die
-	make_desktop_entry mlterm mlterm mlterm-icon "System;TerminalEmulator" || die
-
-	dodoc ChangeLog README || die
-
-	docinto ja
-	dodoc doc/ja/* || die
-	docinto en
-	dodoc doc/en/* || die
-}
diff --git a/x11-terms/mlterm/mlterm-3.0.9.ebuild b/x11-terms/mlterm/mlterm-3.0.9.ebuild
deleted file mode 100644
index 40de709d419c..000000000000
--- a/x11-terms/mlterm/mlterm-3.0.9.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-3.0.9.ebuild,v 1.8 2012/05/03 07:11:34 jdhore Exp $
-
-EAPI="3"
-inherit autotools eutils
-
-IUSE="bidi debug gtk ibus libssh2 m17n-lib nls scim static-libs uim xft"
-
-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="|| ( sys-libs/libutempter sys-apps/utempter )
-	x11-libs/libX11
-	x11-libs/libICE
-	x11-libs/libSM
-	gtk? ( x11-libs/gtk+:2 )
-	xft? ( x11-libs/libXft )
-	bidi? ( >=dev-libs/fribidi-0.10.4 )
-	ibus? ( >=app-i18n/ibus-1.3 )
-	libssh2? ( net-libs/libssh2 )
-	nls? ( virtual/libintl )
-	uim? ( >=app-i18n/uim-1.0 )
-	scim? ( >=app-i18n/scim-1.4 )
-	m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 )"
-#	vte? ( x11-libs/vte )
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.9.4-uim15-fix.patch \
-		"${FILESDIR}"/${PN}-3.0.5-ibus.patch \
-		"${FILESDIR}"/${PN}-3.0.8-ldflags.patch \
-		"${FILESDIR}"/${PN}-3.0.7-underlinking.patch
-
-	eautoconf
-}
-
-src_configure() {
-	local myconf
-
-	if use gtk ; then
-		myconf="${myconf} --with-imagelib=gdk-pixbuf"
-	else
-		myconf="${myconf} --with-tools=mlclient,mlcc"
-	fi
-
-	if use xft ; then
-		myconf="${myconf} --with-type-engines=xft"
-	else
-		myconf="${myconf} --with-type-engines=xcore"
-	fi
-
-	# iiimf isn't stable enough
-	#myconf="${myconf} $(use_enable iiimf)"
-
-	econf --enable-utmp \
-		$(use_enable bidi fribidi) \
-		$(use_enable debug) \
-		$(use_enable ibus) \
-		$(use_enable libssh2 ssh2) \
-		$(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
-
-	if ! use static-libs ; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	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
-}
diff --git a/x11-terms/mlterm/mlterm-3.3.8.ebuild b/x11-terms/mlterm/mlterm-3.3.8.ebuild
new file mode 100644
index 000000000000..811a6e40de25
--- /dev/null
+++ b/x11-terms/mlterm/mlterm-3.3.8.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-3.3.8.ebuild,v 1.1 2014/09/07 03:07:30 hattya Exp $
+
+EAPI="5"
+
+inherit autotools-utils eutils
+
+DESCRIPTION="A multi-lingual terminal emulator"
+HOMEPAGE="http://mlterm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mlterm/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="bidi cairo debug fcitx gtk ibus libssh2 m17n-lib nls regis scim static-libs uim utempter xft"
+
+RDEPEND="x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	bidi? ( dev-libs/fribidi )
+	cairo? ( x11-libs/cairo )
+	fcitx? ( app-i18n/fcitx )
+	gtk? ( x11-libs/gtk+ )
+	ibus? ( app-i18n/ibus )
+	libssh2? ( net-libs/libssh2 )
+	m17n-lib? ( dev-libs/m17n-lib )
+	nls? ( virtual/libintl )
+	regis? (
+		|| (
+			media-libs/sdl-ttf
+			media-libs/sdl2-ttf
+		)
+	)
+	scim? ( app-i18n/scim )
+	uim? ( app-i18n/uim )
+	utempter? ( sys-libs/libutempter )
+	xft? ( x11-libs/libXft )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+DOCS=( ChangeLog README doc/{en,ja} )
+
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
+
+src_prepare() {
+	# default config
+	sed -i \
+		-e "/ icon_path =/aicon_path = ${EPREFIX}/usr/share/pixmaps/mlterm-icon.svg" \
+		-e "/ scrollbar_view_name =/ascrollbar_view_name = sample" \
+		etc/main
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-type-engines=xcore$(usex xft ",xft")$(usex cairo ",cairo")
+		--enable-optimize-redrawing
+		--enable-vt52
+		$(use_enable bidi fribidi)
+		$(use_enable debug)
+		$(use_enable fcitx)
+		$(use_enable ibus)
+		$(use_enable libssh2 ssh2)
+		$(use_enable m17n-lib m17nlib)
+		$(use_enable nls)
+		$(use_enable scim)
+		$(use_enable uim)
+		$(use_enable utempter utmp)
+	)
+
+	local scrollbars="sample,extra"
+	local tools="mlclient,mlcc,mlmenu,mlterm-zoom"
+	if use gtk; then
+		myeconfargs+=(--with-imagelib=gdk-pixbuf)
+		if has_version x11-libs/gtk+:3; then
+			myeconfargs+=(--with-gtk=3.0)
+		fi
+		scrollbars+=",pixmap_engine"
+		tools+=",mlconfig,mlimgloader"
+	fi
+	if use regis; then
+		tools+=",registobmp"
+	fi
+	myeconfargs+=(--with-scrollbars="${scrollbars}")
+	myeconfargs+=(--with-tools="${tools}")
+
+	autotools-utils_src_configure
+}
+
+src_install () {
+	autotools-utils_src_install
+	docinto contrib/icon
+	dodoc contrib/icon/README
+
+	doicon contrib/icon/mlterm*
+	make_desktop_entry mlterm mlterm mlterm-icon "System;TerminalEmulator"
+}