Drop old versions

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key F8551514)

12 files changed, 8 insertions, 1326 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index f9030e401c45..4f514b0e3c91 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/uim
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.259 2013/03/02 19:29:05 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.260 2013/04/06 01:37:45 naota Exp $
+
+  06 Apr 2013; Naohiro Aota <naota@gentoo.org> -files/uim-1.5.4-gcc43.patch,
+  -files/uim-1.5.4-gentoo.patch, -files/uim-1.6.0-linker.patch,
+  -files/uim-1.6.1-canna.patch, -files/uim-1.6.1-libnotify-0.7.patch,
+  -files/uim-1.7.1-qt4.patch, -uim-1.4.2.ebuild, -uim-1.5.7.ebuild,
+  -uim-1.6.1.ebuild, -uim-1.7.1-r1.ebuild, -uim-1.7.1.ebuild, uim-1.8.4.ebuild:
+  Drop old versions
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> uim-1.5.7.ebuild,
   uim-1.6.1.ebuild, uim-1.7.1-r1.ebuild, uim-1.7.1.ebuild, uim-1.7.3.ebuild,
diff --git a/app-i18n/uim/files/uim-1.5.4-gcc43.patch b/app-i18n/uim/files/uim-1.5.4-gcc43.patch
deleted file mode 100644
index 60a42ca3f1bf..000000000000
--- a/app-i18n/uim/files/uim-1.5.4-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur uim-1.5.4.orig/sigscheme/src/read.c uim-1.5.4/sigscheme/src/read.c
---- uim-1.5.4.orig/sigscheme/src/read.c	2008-03-01 23:30:43.000000000 +0900
-+++ uim-1.5.4/sigscheme/src/read.c	2008-12-10 02:09:21.000000000 +0900
-@@ -918,6 +918,7 @@
-     int err;
-     ScmLBuf(char) lbuf;
-     char init_buf[SCM_INITIAL_SYMBOL_BUF_SIZE];
-+    init_buf[0] = '\0';
- 
-     CDBG((SCM_DBG_PARSER, "read_symbol"));
- 
diff --git a/app-i18n/uim/files/uim-1.5.4-gentoo.patch b/app-i18n/uim/files/uim-1.5.4-gentoo.patch
deleted file mode 100644
index b13af6aa2404..000000000000
--- a/app-i18n/uim/files/uim-1.5.4-gentoo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur uim-1.5.4.orig/notify/Makefile.am uim-1.5.4/notify/Makefile.am
---- uim-1.5.4.orig/notify/Makefile.am	2008-03-29 22:33:30.000000000 +0900
-+++ uim-1.5.4/notify/Makefile.am	2008-10-30 01:38:43.000000000 +0900
-@@ -14,6 +14,8 @@
- endif
- 
- if KNOTIFY3
-+QT_CXXFLAGS = $(UIM_QT_CXXFLAGS)
-+QT_LDFLAGS  = $(UIM_QT_LDFLAGS)
- uimnotify_plugin_LTLIBRARIES += libuimnotify-knotify3.la
- libuimnotify_knotify3_la_SOURCES = uim-knotify3.cc
- libuimnotify_knotify3_la_CXXFLAGS = -I@KNOTIFY3_INCLUDE_DIR@ $(QT_CXXFLAGS)
-diff -Naur uim-1.5.4.orig/notify/Makefile.in uim-1.5.4/notify/Makefile.in
---- uim-1.5.4.orig/notify/Makefile.in	2008-10-24 21:11:28.000000000 +0900
-+++ uim-1.5.4/notify/Makefile.in	2008-10-30 01:45:46.000000000 +0900
-@@ -369,6 +369,8 @@
- @LIBNOTIFY_TRUE@libuimnotify_libnotify_la_CFLAGS = @LIBNOTIFY_CFLAGS@
- @LIBNOTIFY_TRUE@libuimnotify_libnotify_la_LDFLAGS = -avoid-version -module
- @LIBNOTIFY_TRUE@libuimnotify_libnotify_la_LIBADD = @LIBNOTIFY_LIBS@ $(top_builddir)/replace/libreplace.la
-+@KNOTIFY3_TRUE@QT_CXXFLAGS = $(UIM_QT_CXXFLAGS)
-+@KNOTIFY3_TRUE@QT_LDFLAGS = $(UIM_QT_LDFLAGS)
- @KNOTIFY3_TRUE@libuimnotify_knotify3_la_SOURCES = uim-knotify3.cc
- @KNOTIFY3_TRUE@libuimnotify_knotify3_la_CXXFLAGS = -I@KNOTIFY3_INCLUDE_DIR@ $(QT_CXXFLAGS)
- @KNOTIFY3_TRUE@libuimnotify_knotify3_la_LDFLAGS = -avoid-version -module -L@KNOTIFY3_LIB_DIR@ $(QT_LDFLAGS)
diff --git a/app-i18n/uim/files/uim-1.6.0-linker.patch b/app-i18n/uim/files/uim-1.6.0-linker.patch
deleted file mode 100644
index ada64cacefac..000000000000
--- a/app-i18n/uim/files/uim-1.6.0-linker.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -Naur uim-1.6.0.orig/configure.ac uim-1.6.0/configure.ac
---- uim-1.6.0.orig/configure.ac	2010-08-02 09:30:14.000000000 +0900
-+++ uim-1.6.0/configure.ac	2011-01-03 11:43:06.375239564 +0900
-@@ -1826,6 +1826,7 @@
- 		 qt4/chardict/uim-chardict-qt4.pro
- 		 qt4/chardict/po/Makefile.in
- 		 qt4/edittest/Makefile
-+		 qt4/edittest/edittest.pro
- 		 qt4/immodule/quiminputcontextplugin.pro
- 		 qt4/immodule/Makefile
- 		 qt4/pref/uim-pref-qt4.pro
-diff -Naur uim-1.6.0.orig/qt4/candwin/uim-candwin-qt4.pro.in uim-1.6.0/qt4/candwin/uim-candwin-qt4.pro.in
---- uim-1.6.0.orig/qt4/candwin/uim-candwin-qt4.pro.in	2010-08-09 13:09:35.000000000 +0900
-+++ uim-1.6.0/qt4/candwin/uim-candwin-qt4.pro.in	2011-01-05 09:27:14.905438175 +0900
-@@ -16,6 +16,9 @@
- QMAKE_CXX               = @CXX@
- QMAKE_CXXFLAGS_DEBUG   += @CXXFLAGS@ @X_CFLAGS@
- QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
-+QMAKE_LINK              = @CXX@
-+QMAKE_LFLAGS_DEBUG     += @LDFLAGS@
-+QMAKE_LFLAGS_RELEASE   += @LDFLAGS@
- 
- QMAKE_STRIP =
- 
-diff -Naur uim-1.6.0.orig/qt4/chardict/uim-chardict-qt4.pro.in uim-1.6.0/qt4/chardict/uim-chardict-qt4.pro.in
---- uim-1.6.0.orig/qt4/chardict/uim-chardict-qt4.pro.in	2010-08-09 13:09:35.000000000 +0900
-+++ uim-1.6.0/qt4/chardict/uim-chardict-qt4.pro.in	2011-01-05 09:27:14.905438175 +0900
-@@ -16,6 +16,9 @@
- QMAKE_CXX               = @CXX@
- QMAKE_CXXFLAGS_DEBUG   += @CXXFLAGS@ @X_CFLAGS@
- QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
-+QMAKE_LINK              = @CXX@
-+QMAKE_LFLAGS_DEBUG     += @LDFLAGS@
-+QMAKE_LFLAGS_RELEASE   += @LDFLAGS@
- 
- QMAKE_STRIP =
- 
-diff -Naur uim-1.6.0.orig/qt4/edittest/Makefile.am uim-1.6.0/qt4/edittest/Makefile.am
---- uim-1.6.0.orig/qt4/edittest/Makefile.am	2010-03-30 13:24:26.000000000 +0900
-+++ uim-1.6.0/qt4/edittest/Makefile.am	2011-01-03 11:41:06.643957761 +0900
-@@ -12,8 +12,8 @@
- 	$(MAKE) $(AM_MAKEFLAGS) -f Makefile.qmake $@
- 	$(MAKE) $(AM_MAKEFLAGS) distclean-am
- endif
--	-rm -f Makefile
-+	-rm -f Makefile edittest.pro
- 
- FORCE:
- 
--EXTRA_DIST = README edittest.pro main.cpp
-+EXTRA_DIST = README edittest.pro.in main.cpp
-diff -Naur uim-1.6.0.orig/qt4/edittest/edittest.pro uim-1.6.0/qt4/edittest/edittest.pro
---- uim-1.6.0.orig/qt4/edittest/edittest.pro	2010-08-09 13:09:35.000000000 +0900
-+++ uim-1.6.0/qt4/edittest/edittest.pro	1970-01-01 09:00:00.000000000 +0900
-@@ -1,14 +0,0 @@
--######################################################################
--# Automatically generated by qmake (1.08a) Tue Aug 24 01:02:27 2004
--######################################################################
--
--TEMPLATE = app
--CONFIG -= moc
--DEPENDPATH += .
--INCLUDEPATH += .
--CONFIG += qt warn_on debug
--
--QMAKE_STRIP =
--
--# Input
--SOURCES += main.cpp
-diff -Naur uim-1.6.0.orig/qt4/edittest/edittest.pro.in uim-1.6.0/qt4/edittest/edittest.pro.in
---- uim-1.6.0.orig/qt4/edittest/edittest.pro.in	1970-01-01 09:00:00.000000000 +0900
-+++ uim-1.6.0/qt4/edittest/edittest.pro.in	2011-01-05 09:27:14.909438151 +0900
-@@ -0,0 +1,24 @@
-+######################################################################
-+# Automatically generated by qmake (1.08a) Tue Aug 24 01:02:27 2004
-+######################################################################
-+
-+TEMPLATE = app
-+CONFIG -= moc
-+DEPENDPATH += .
-+INCLUDEPATH += .
-+CONFIG += qt warn_on debug
-+
-+QMAKE_CC                = @CC@
-+QMAKE_CFLAGS_DEBUG     += @CFLAGS@   @X_CFLAGS@
-+QMAKE_CFLAGS_RELEASE   += @CFLAGS@   @X_CFLAGS@
-+QMAKE_CXX               = @CXX@
-+QMAKE_CXXFLAGS_DEBUG   += @CXXFLAGS@ @X_CFLAGS@
-+QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
-+QMAKE_LINK              = @CXX@
-+QMAKE_LFLAGS_DEBUG     += @LDFLAGS@
-+QMAKE_LFLAGS_RELEASE   += @LDFLAGS@
-+
-+QMAKE_STRIP =
-+
-+# Input
-+SOURCES += main.cpp
-diff -Naur uim-1.6.0.orig/qt4/immodule/quiminputcontextplugin.pro.in uim-1.6.0/qt4/immodule/quiminputcontextplugin.pro.in
---- uim-1.6.0.orig/qt4/immodule/quiminputcontextplugin.pro.in	2010-08-09 13:09:35.000000000 +0900
-+++ uim-1.6.0/qt4/immodule/quiminputcontextplugin.pro.in	2011-01-05 09:27:14.913438127 +0900
-@@ -22,6 +22,9 @@
- QMAKE_CXX               = @CXX@
- QMAKE_CXXFLAGS_DEBUG   += @CXXFLAGS@ @X_CFLAGS@
- QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
-+QMAKE_LINK              = @CXX@
-+QMAKE_LFLAGS_DEBUG     += @LDFLAGS@
-+QMAKE_LFLAGS_RELEASE   += @LDFLAGS@
- 
- QMAKE_STRIP =
- 
-diff -Naur uim-1.6.0.orig/qt4/pref/uim-pref-qt4.pro.in uim-1.6.0/qt4/pref/uim-pref-qt4.pro.in
---- uim-1.6.0.orig/qt4/pref/uim-pref-qt4.pro.in	2010-08-09 13:09:35.000000000 +0900
-+++ uim-1.6.0/qt4/pref/uim-pref-qt4.pro.in	2011-01-05 09:27:14.913438127 +0900
-@@ -16,6 +16,9 @@
- QMAKE_CXX               = @CXX@
- QMAKE_CXXFLAGS_DEBUG   += @CXXFLAGS@ @X_CFLAGS@
- QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
-+QMAKE_LINK              = @CXX@
-+QMAKE_LFLAGS_DEBUG     += @LDFLAGS@
-+QMAKE_LFLAGS_RELEASE   += @LDFLAGS@
- 
- QMAKE_STRIP =
- QMAKE_UIC = $$QMAKE_UIC -tr UIC_
-diff -Naur uim-1.6.0.orig/qt4/switcher/uim-im-switcher-qt4.pro.in uim-1.6.0/qt4/switcher/uim-im-switcher-qt4.pro.in
---- uim-1.6.0.orig/qt4/switcher/uim-im-switcher-qt4.pro.in	2010-08-09 13:09:35.000000000 +0900
-+++ uim-1.6.0/qt4/switcher/uim-im-switcher-qt4.pro.in	2011-01-05 09:27:14.917438104 +0900
-@@ -16,6 +16,9 @@
- QMAKE_CXX               = @CXX@
- QMAKE_CXXFLAGS_DEBUG   += @CXXFLAGS@ @X_CFLAGS@
- QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
-+QMAKE_LINK              = @CXX@
-+QMAKE_LFLAGS_DEBUG     += @LDFLAGS@
-+QMAKE_LFLAGS_RELEASE   += @LDFLAGS@
- 
- QMAKE_STRIP =
- 
-diff -Naur uim-1.6.0.orig/qt4/toolbar/uim-toolbar-qt4.pro.in uim-1.6.0/qt4/toolbar/uim-toolbar-qt4.pro.in
---- uim-1.6.0.orig/qt4/toolbar/uim-toolbar-qt4.pro.in	2010-08-09 13:09:35.000000000 +0900
-+++ uim-1.6.0/qt4/toolbar/uim-toolbar-qt4.pro.in	2011-01-05 09:27:14.917438104 +0900
-@@ -16,6 +16,9 @@
- QMAKE_CXX               = @CXX@
- QMAKE_CXXFLAGS_DEBUG   += @CXXFLAGS@ @X_CFLAGS@
- QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
-+QMAKE_LINK              = @CXX@
-+QMAKE_LFLAGS_DEBUG     += @LDFLAGS@
-+QMAKE_LFLAGS_RELEASE   += @LDFLAGS@
- 
- QMAKE_STRIP =
- 
diff --git a/app-i18n/uim/files/uim-1.6.1-canna.patch b/app-i18n/uim/files/uim-1.6.1-canna.patch
deleted file mode 100644
index 276c2aad502a..000000000000
--- a/app-i18n/uim/files/uim-1.6.1-canna.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- helper/dict-canna.c
-+++ helper/dict-canna.c
-@@ -37,6 +37,7 @@
- #include <sys/types.h>
- #include <sys/param.h>
- 
-+#define CANNA_NEW_WCHAR_AWARE
- #include <canna/RK.h>
- 
- #include <stdlib.h>
diff --git a/app-i18n/uim/files/uim-1.6.1-libnotify-0.7.patch b/app-i18n/uim/files/uim-1.6.1-libnotify-0.7.patch
deleted file mode 100644
index 4899794c52da..000000000000
--- a/app-i18n/uim/files/uim-1.6.1-libnotify-0.7.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- notify/uim-libnotify.c
-+++ notify/uim-libnotify.c
-@@ -44,6 +44,10 @@
- #include "uim-notify.h"
- #include "gettext.h"
- 
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
-+
- #define UIM_ICON UIM_PIXMAPSDIR "/uim-icon.png"
- #define UGETTEXT(str)	(dgettext(GETTEXT_PACKAGE, (str)))
- 
-@@ -73,7 +77,11 @@
-     return UIM_FALSE;
-   }
- 
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+  notification = notify_notification_new("uim", gmsg, UIM_ICON);
-+#else
-   notification = notify_notification_new("uim", gmsg, UIM_ICON, NULL);
-+#endif
- 
-   if (!notification) {
-     fprintf(stderr, "notify_notification_new: can not create notification object\n");
diff --git a/app-i18n/uim/files/uim-1.7.1-qt4.patch b/app-i18n/uim/files/uim-1.7.1-qt4.patch
deleted file mode 100644
index 76b8cfc5f14c..000000000000
--- a/app-i18n/uim/files/uim-1.7.1-qt4.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: fix build with ld --as-needed
- uim-counted-init is a static library which needs symbols from libuim
- which it must be placed behind it on the command line so it is not
- dropped by ld --as-needed
-Author: Julian Taylor <jtaylor.debian@googlemail.com>
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/uim/+bug/832939
-Index: uim-1.7.1/qt4/pref/uim-pref-qt4.pro.in
-===================================================================
---- uim-1.7.1.orig/qt4/pref/uim-pref-qt4.pro.in	2011-08-25 23:31:03.080564183 +0200
-+++ uim-1.7.1/qt4/pref/uim-pref-qt4.pro.in	2011-08-25 23:31:01.170564166 +0200
-@@ -4,7 +4,7 @@
- 
- # to include qtgettext.h
- INCLUDEPATH += @srcdir@/..
--LIBS += -luim-custom -luim-counted-init @LIBINTL@
-+LIBS += -luim-custom -luim-counted-init -luim @LIBINTL@
- 
- QMAKE_UIC = $$QMAKE_UIC -tr UIC_
- 
diff --git a/app-i18n/uim/uim-1.4.2.ebuild b/app-i18n/uim/uim-1.4.2.ebuild
deleted file mode 100644
index c9dd321fb21e..000000000000
--- a/app-i18n/uim/uim-1.4.2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.4.2.ebuild,v 1.17 2011/03/27 11:38:50 nirbheek Exp $
-
-EAPI=1
-inherit eutils 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="amd64 hppa ppc ppc64 x86"
-IUSE="anthy canna eb emacs gnome gtk libedit m17n-lib ncurses nls prime 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:2 )
-	libedit? ( dev-libs/libedit )
-	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
-	ncurses? ( sys-libs/ncurses )
-	nls? ( virtual/libintl )
-	prime? ( app-i18n/prime )
-	!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() {
-	# 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 gtk; 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) \
-		--disable-kde-applet \
-		$(use_with m17n-lib m17nlib) \
-		$(use_enable ncurses fep) \
-		$(use_enable nls) \
-		--without-qt \
-		--without-qt-immodule \
-		${myconf}
-	emake -j1 || die "emake failed"
-
-	if use emacs; then
-		cd emacs
-		elisp-compile *.el || die "elisp-compile 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 "% 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
-	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
-}
diff --git a/app-i18n/uim/uim-1.5.7.ebuild b/app-i18n/uim/uim-1.5.7.ebuild
deleted file mode 100644
index 406aa385202f..000000000000
--- a/app-i18n/uim/uim-1.5.7.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.7.ebuild,v 1.16 2013/03/02 19:29:05 hwoarang Exp $
-
-EAPI="2"
-inherit autotools eutils 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="amd64 hppa ppc ppc64 x86"
-IUSE="+anthy canna eb emacs gnome gtk kde libedit libnotify m17n-lib ncurses nls prime qt4 unicode X xft linguas_zh_CN linguas_zh_TW 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? (
-		unicode? ( >=app-i18n/anthy-8622 )
-		!unicode? ( app-i18n/anthy )
-	)
-	canna? ( app-i18n/canna )
-	eb? ( dev-libs/eb )
-	emacs? ( virtual/emacs )
-	gnome? ( >=gnome-base/gnome-panel-2.14 )
-	gtk? ( >=x11-libs/gtk+-2.4:2 )
-	kde? ( >=kde-base/kdelibs-4 )
-	libedit? ( dev-libs/libedit )
-	libnotify? ( >=x11-libs/libnotify-0.4.5 )
-	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
-	ncurses? ( sys-libs/ncurses )
-	nls? ( virtual/libintl )
-	prime? ( app-i18n/prime )
-	qt4? ( dev-qt/qtgui:4[qt3support] )
-	!app-i18n/uim-svn
-	!<app-i18n/prime-0.9.4"
-#	mana? ( app-i18n/mana )
-#	scim? ( >=app-i18n/scim-1.3.0 ) # broken
-#	sj3? ( >=app-i18n/sj3-2.0.1.21 )
-#	wnn? ( app-i18n/wnn )
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.15
-	kde? ( dev-util/cmake )
-	X? (
-		x11-proto/xextproto
-		x11-proto/xproto
-	)"
-
-RDEPEND="${RDEPEND}
-	X? (
-		media-fonts/font-sony-misc
-		linguas_zh_CN? (
-			|| ( media-fonts/font-isas-misc media-fonts/intlfonts )
-		)
-		linguas_zh_TW? (
-			media-fonts/intlfonts
-		)
-		linguas_ja? (
-			|| ( media-fonts/font-jis-misc media-fonts/intlfonts )
-		)
-		linguas_ko? (
-			|| ( media-fonts/font-daewoo-misc media-fonts/intlfonts )
-		)
-	)"
-
-SITEFILE=50${PN}-gentoo.el
-
-pkg_setup() {
-	# 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_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-1.5.4-gentoo.patch" \
-		"${FILESDIR}/${PN}-1.5.4-gcc43.patch" \
-		"${FILESDIR}/${PN}-1.5.4-zhTW.patch" \
-		"${FILESDIR}/${PN}-1.6.1-libnotify-0.7.patch"
-
-	# bug 275420
-	sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die
-	eautoconf
-}
-
-src_configure() {
-	local myconf
-
-	if use gtk && (use anthy || use canna) ; then
-		myconf="${myconf} --enable-dict"
-	else
-		myconf="${myconf} --disable-dict"
-	fi
-
-	if use gtk || use qt4 ; then
-		myconf="${myconf} --enable-pref"
-	else
-		myconf="${myconf} --disable-pref"
-	fi
-
-	if use anthy ; then
-		if use unicode ; then
-			myconf="${myconf} --with-anthy-utf8"
-		else
-			myconf="${myconf} --with-anthy"
-		fi
-	else
-		myconf="${myconf} --without-anthy"
-	fi
-
-	if use libnotify ; then
-		myconf="${myconf} --enable-notify=libnotify"
-	fi
-
-	econf $(use_with X x) \
-		$(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) \
-		--disable-kde-applet \
-		$(use_enable kde kde4-applet) \
-		$(use_with m17n-lib m17nlib) \
-		$(use_enable ncurses fep) \
-		$(use_enable nls) \
-		$(use_with prime) \
-		--without-qt \
-		--without-qt-immodule \
-		$(use_with qt4 qt4) \
-		$(use_with qt4 qt4-immodule) \
-		$(use_with xft) \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use emacs; then
-		cd emacs
-		elisp-compile *.el || die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	# parallel make install b0rked, bug #222677
-	emake -j1 INSTALL_ROOT="${D}" 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 "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-qt4."
-	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
-}
diff --git a/app-i18n/uim/uim-1.6.1.ebuild b/app-i18n/uim/uim-1.6.1.ebuild
deleted file mode 100644
index 041fde1e34b0..000000000000
--- a/app-i18n/uim/uim-1.6.1.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.6.1.ebuild,v 1.7 2013/03/02 19:29:05 hwoarang Exp $
-
-EAPI="3"
-inherit autotools eutils 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="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+anthy canna curl eb emacs libffi gnome gtk kde libedit libnotify m17n-lib ncurses nls prime qt4 skk sqlite ssl test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
-
-RESTRICT="test"
-
-RDEPEND="X? (
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXrender
-	)
-	anthy? (
-		unicode? ( >=app-i18n/anthy-8622 )
-		!unicode? ( app-i18n/anthy )
-	)
-	canna? ( app-i18n/canna )
-	curl? ( >=net-misc/curl-7.16.4 )
-	eb? ( dev-libs/eb )
-	emacs? ( virtual/emacs )
-	libffi? ( virtual/libffi )
-	gnome? ( >=gnome-base/gnome-panel-2.14 )
-	gtk? ( >=x11-libs/gtk+-2.4:2 )
-	kde? ( >=kde-base/kdelibs-4 )
-	libedit? ( dev-libs/libedit )
-	libnotify? ( >=x11-libs/libnotify-0.4 )
-	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
-	ncurses? ( sys-libs/ncurses )
-	nls? ( virtual/libintl )
-	prime? ( app-i18n/prime )
-	qt4? ( dev-qt/qtgui:4[qt3support] )
-	skk? ( app-i18n/skk-jisyo )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl )
-	!dev-scheme/sigscheme
-	!app-i18n/uim-svn
-	!<app-i18n/prime-0.9.4"
-#	>=dev-scheme/sigscheme-0.8.5
-#	mana? ( app-i18n/mana )
-#	scim? ( >=app-i18n/scim-1.3.0 ) # broken
-#	sj3? ( >=app-i18n/sj3-2.0.1.21 )
-#	wnn? ( app-i18n/wnn )
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.15
-	kde? ( dev-util/cmake )
-	X? (
-		x11-proto/xextproto
-		x11-proto/xproto
-	)"
-
-RDEPEND="${RDEPEND}
-	X? (
-		media-fonts/font-sony-misc
-		linguas_zh_CN? (
-			|| ( media-fonts/font-isas-misc media-fonts/intlfonts )
-		)
-		linguas_zh_TW? (
-			media-fonts/intlfonts
-		)
-		linguas_ja? (
-			|| ( media-fonts/font-jis-misc media-fonts/intlfonts )
-		)
-		linguas_ko? (
-			|| ( media-fonts/font-daewoo-misc media-fonts/intlfonts )
-		)
-	)"
-#	test? ( dev-scheme/gauche )
-
-SITEFILE=50${PN}-gentoo.el
-
-pkg_setup() {
-	# 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_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
-		"${FILESDIR}"/${PN}-1.5.4-zhTW.patch \
-		"${FILESDIR}"/${PN}-1.6.0-linker.patch \
-		"${FILESDIR}"/${PN}-1.6.1-libnotify-0.7.patch \
-		"${FILESDIR}"/${PN}-1.6.1-canna.patch
-
-	# bug 275420
-	sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die
-	#./autogen.sh
-	AT_NO_RECURSIVE=1 eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use gtk && (use anthy || use canna) ; then
-		myconf="${myconf} --enable-dict"
-	else
-		myconf="${myconf} --disable-dict"
-	fi
-
-	if use gtk || use qt4 ; then
-		myconf="${myconf} --enable-pref"
-	else
-		myconf="${myconf} --disable-pref"
-	fi
-
-	if use anthy ; then
-		if use unicode ; then
-			myconf="${myconf} --with-anthy-utf8"
-		else
-			myconf="${myconf} --with-anthy"
-		fi
-	else
-		myconf="${myconf} --without-anthy"
-	fi
-
-	if use libnotify ; then
-		myconf="${myconf} --enable-notify=libnotify"
-	fi
-
-	econf $(use_with X x) \
-		$(use_with canna) \
-		$(use_with curl) \
-		$(use_with eb) \
-		$(use_enable emacs) \
-		$(use_with emacs lispdir "${SITELISP}") \
-		$(use_with libffi ffi) \
-		$(use_enable gnome gnome-applet) \
-		$(use_with gtk gtk2) \
-		$(use_with libedit) \
-		--disable-kde-applet \
-		$(use_enable kde kde4-applet) \
-		$(use_with m17n-lib m17nlib) \
-		$(use_enable ncurses fep) \
-		$(use_enable nls) \
-		$(use_with prime) \
-		--without-qt \
-		--without-qt-immodule \
-		$(use_with qt4 qt4) \
-		$(use_with qt4 qt4-immodule) \
-		$(use_with skk) \
-		$(use_with sqlite sqlite3) \
-		$(use_enable ssl openssl) \
-		$(use_with xft) \
-		${myconf}
-		# $(use_enable qt4 qt4-qt3support) \
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use emacs; then
-		cd emacs
-		elisp-compile *.el || die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	# parallel make install b0rked, bug #222677
-	emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog* NEWS README RELNOTE || die
-	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
-
-	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die
-	insinto /etc/X11/xinit/xinput.d
-	doins "${T}/uim.conf" || die
-
-	# collision with dev-scheme/sigscheme, bug #330975
-	# find "${ED}" -name '*gcroots*' -delete || die
-}
-
-pkg_postinst() {
-	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-qt4."
-	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
-}
diff --git a/app-i18n/uim/uim-1.7.1-r1.ebuild b/app-i18n/uim/uim-1.7.1-r1.ebuild
deleted file mode 100644
index c7eb1e0cd1b4..000000000000
--- a/app-i18n/uim/uim-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.7.1-r1.ebuild,v 1.4 2013/03/02 19:29:05 hwoarang Exp $
-
-EAPI="4"
-inherit autotools eutils 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="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+anthy canna curl eb emacs libffi gnome gtk gtk3 kde libedit libnotify m17n-lib ncurses nls prime qt4 skk sqlite ssl static-libs test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
-
-RESTRICT="test"
-
-REQUIRED_USE="gtk? ( X ) qt4? ( X )"
-
-RDEPEND="X? (
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXrender
-	)
-	anthy? (
-		unicode? ( >=app-i18n/anthy-8622 )
-		!unicode? ( app-i18n/anthy )
-	)
-	canna? ( app-i18n/canna )
-	curl? ( >=net-misc/curl-7.16.4 )
-	eb? ( dev-libs/eb )
-	emacs? ( virtual/emacs )
-	libffi? ( virtual/libffi )
-	gnome? ( >=gnome-base/gnome-panel-2.14 )
-	gtk? ( >=x11-libs/gtk+-2.4:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	kde? ( >=kde-base/kdelibs-4 )
-	libedit? ( dev-libs/libedit )
-	libnotify? ( >=x11-libs/libnotify-0.4 )
-	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
-	ncurses? ( sys-libs/ncurses )
-	nls? ( virtual/libintl )
-	prime? ( app-i18n/prime )
-	qt4? ( dev-qt/qtgui:4[qt3support] )
-	skk? ( app-i18n/skk-jisyo )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl )
-	!dev-scheme/sigscheme
-	!app-i18n/uim-svn
-	!<app-i18n/prime-0.9.4"
-#	>=dev-scheme/sigscheme-0.8.5
-#	mana? ( app-i18n/mana )
-#	scim? ( >=app-i18n/scim-1.3.0 ) # broken
-#	sj3? ( >=app-i18n/sj3-2.0.1.21 )
-#	wnn? ( app-i18n/wnn )
-#	gnome? (
-#		gtk? ( >=gnome-base/gnome-panel-2.14 )
-#		gtk3? ( >=gnome-base/gnome-panel-3 )
-#	)
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.15
-	kde? ( dev-util/cmake )
-	X? (
-		x11-proto/xextproto
-		x11-proto/xproto
-	)"
-
-RDEPEND="${RDEPEND}
-	X? (
-		media-fonts/font-sony-misc
-		linguas_zh_CN? (
-			|| ( media-fonts/font-isas-misc media-fonts/intlfonts )
-		)
-		linguas_zh_TW? (
-			media-fonts/intlfonts
-		)
-		linguas_ja? (
-			|| ( media-fonts/font-jis-misc media-fonts/intlfonts )
-		)
-		linguas_ko? (
-			|| ( media-fonts/font-daewoo-misc media-fonts/intlfonts )
-		)
-	)"
-#	test? ( dev-scheme/gauche )
-
-SITEFILE=50${PN}-gentoo.el
-
-update_gtk_immodules() {
-	local GTK2_CONFDIR="/etc/gtk-2.0"
-	# bug #366889
-	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
-		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
-	fi
-	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
-
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
-	fi
-}
-
-update_gtk3_immodules() {
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.7.1-qt4.patch \
-		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
-		"${FILESDIR}"/${PN}-1.5.4-zhTW.patch
-
-	# bug 275420
-	sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die
-
-	echo "QMAKE_LFLAGS = ${LDFLAGS}" >> qt4/common.pro.in || die
-
-	#./autogen.sh
-	AT_NO_RECURSIVE=1 eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if (use gtk || use gtk3) && (use anthy || use canna) ; then
-		myconf="${myconf} --enable-dict"
-	else
-		myconf="${myconf} --disable-dict"
-	fi
-
-	if use gtk || use gtk3 || use qt4 ; then
-		myconf="${myconf} --enable-pref"
-	else
-		myconf="${myconf} --disable-pref"
-	fi
-
-	if use anthy ; then
-		if use unicode ; then
-			myconf="${myconf} --with-anthy-utf8"
-		else
-			myconf="${myconf} --with-anthy"
-		fi
-	else
-		myconf="${myconf} --without-anthy"
-	fi
-
-	if use libnotify ; then
-		myconf="${myconf} --enable-notify=libnotify"
-	fi
-
-	#if use gnome ; then
-	#	myconf="${myconf} $(use_enable gtk gnome-applet)"
-	#	myconf="${myconf} $(use_enable gtk3 gnome3-applet)"
-	#fi
-
-	econf $(use_with X x) \
-		$(use_with canna) \
-		$(use_with curl) \
-		$(use_with eb) \
-		$(use_enable emacs) \
-		$(use_with emacs lispdir "${SITELISP}") \
-		$(use_with libffi ffi) \
-		$(use_enable gnome gnome-applet) \
-		$(use_with gtk gtk2) \
-		$(use_with gtk3) \
-		$(use_with libedit) \
-		--disable-kde-applet \
-		$(use_enable kde kde4-applet) \
-		$(use_with m17n-lib m17nlib) \
-		$(use_enable ncurses fep) \
-		$(use_enable nls) \
-		$(use_with prime) \
-		--without-qt \
-		--without-qt-immodule \
-		$(use_with qt4 qt4) \
-		$(use_with qt4 qt4-immodule) \
-		$(use_enable qt4 qt4-qt3support) \
-		$(use_with skk) \
-		$(use_with sqlite sqlite3) \
-		$(use_enable ssl openssl) \
-		$(use_enable static-libs static) \
-		$(use_with xft) \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use emacs; then
-		cd emacs
-		elisp-compile *.el || die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	# parallel make install b0rked, bug #222677
-	emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog* NEWS README RELNOTE || die
-	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
-
-	find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} +
-	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
-
-	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die
-	insinto /etc/X11/xinit/xinput.d
-	doins "${T}/uim.conf" || die
-
-	# collision with dev-scheme/sigscheme, bug #330975
-	# find "${ED}" -name '*gcroots*' -delete || die
-}
-
-pkg_postinst() {
-	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 "uim-im-switcher-gtk3 or uim-im-switcher-qt4."
-	elog
-	elog "If you upgrade from a version of uim older than 1.4.0,"
-	elog "you should run revdep-rebuild."
-
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_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 && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
-	use emacs && elisp-site-regen
-}
diff --git a/app-i18n/uim/uim-1.7.1.ebuild b/app-i18n/uim/uim-1.7.1.ebuild
deleted file mode 100644
index 73f24aa99998..000000000000
--- a/app-i18n/uim/uim-1.7.1.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.7.1.ebuild,v 1.5 2013/03/02 19:29:05 hwoarang Exp $
-
-EAPI="3"
-inherit autotools eutils 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="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+anthy canna curl eb emacs libffi gnome gtk gtk3 kde libedit libnotify m17n-lib ncurses nls prime qt4 skk sqlite ssl static-libs test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
-
-RESTRICT="test"
-
-RDEPEND="X? (
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXrender
-	)
-	anthy? (
-		unicode? ( >=app-i18n/anthy-8622 )
-		!unicode? ( app-i18n/anthy )
-	)
-	canna? ( app-i18n/canna )
-	curl? ( >=net-misc/curl-7.16.4 )
-	eb? ( dev-libs/eb )
-	emacs? ( virtual/emacs )
-	libffi? ( virtual/libffi )
-	gnome? ( >=gnome-base/gnome-panel-2.14 )
-	gtk? ( >=x11-libs/gtk+-2.4:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	kde? ( >=kde-base/kdelibs-4 )
-	libedit? ( dev-libs/libedit )
-	libnotify? ( >=x11-libs/libnotify-0.4 )
-	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
-	ncurses? ( sys-libs/ncurses )
-	nls? ( virtual/libintl )
-	prime? ( app-i18n/prime )
-	qt4? ( dev-qt/qtgui:4[qt3support] )
-	skk? ( app-i18n/skk-jisyo )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl )
-	!dev-scheme/sigscheme
-	!app-i18n/uim-svn
-	!<app-i18n/prime-0.9.4"
-#	>=dev-scheme/sigscheme-0.8.5
-#	mana? ( app-i18n/mana )
-#	scim? ( >=app-i18n/scim-1.3.0 ) # broken
-#	sj3? ( >=app-i18n/sj3-2.0.1.21 )
-#	wnn? ( app-i18n/wnn )
-#	gnome? (
-#		gtk? ( >=gnome-base/gnome-panel-2.14 )
-#		gtk3? ( >=gnome-base/gnome-panel-3 )
-#	)
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.15
-	kde? ( dev-util/cmake )
-	X? (
-		x11-proto/xextproto
-		x11-proto/xproto
-	)"
-
-RDEPEND="${RDEPEND}
-	X? (
-		media-fonts/font-sony-misc
-		linguas_zh_CN? (
-			|| ( media-fonts/font-isas-misc media-fonts/intlfonts )
-		)
-		linguas_zh_TW? (
-			media-fonts/intlfonts
-		)
-		linguas_ja? (
-			|| ( media-fonts/font-jis-misc media-fonts/intlfonts )
-		)
-		linguas_ko? (
-			|| ( media-fonts/font-daewoo-misc media-fonts/intlfonts )
-		)
-	)"
-#	test? ( dev-scheme/gauche )
-
-SITEFILE=50${PN}-gentoo.el
-
-update_gtk_immodules() {
-	local GTK2_CONFDIR="/etc/gtk-2.0"
-	# bug #366889
-	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
-		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
-	fi
-	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
-
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
-	fi
-}
-
-update_gtk3_immodules() {
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
-		"${FILESDIR}"/${PN}-1.5.4-zhTW.patch
-
-	# bug 275420
-	sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die
-
-	echo "QMAKE_LFLAGS = ${LDFLAGS}" >> qt4/common.pro.in || die
-
-	#./autogen.sh
-	AT_NO_RECURSIVE=1 eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if (use gtk || use gtk3) && (use anthy || use canna) ; then
-		myconf="${myconf} --enable-dict"
-	else
-		myconf="${myconf} --disable-dict"
-	fi
-
-	if use gtk || use gtk3 || use qt4 ; then
-		myconf="${myconf} --enable-pref"
-	else
-		myconf="${myconf} --disable-pref"
-	fi
-
-	if use anthy ; then
-		if use unicode ; then
-			myconf="${myconf} --with-anthy-utf8"
-		else
-			myconf="${myconf} --with-anthy"
-		fi
-	else
-		myconf="${myconf} --without-anthy"
-	fi
-
-	if use libnotify ; then
-		myconf="${myconf} --enable-notify=libnotify"
-	fi
-
-	#if use gnome ; then
-	#	myconf="${myconf} $(use_enable gtk gnome-applet)"
-	#	myconf="${myconf} $(use_enable gtk3 gnome3-applet)"
-	#fi
-
-	econf $(use_with X x) \
-		$(use_with canna) \
-		$(use_with curl) \
-		$(use_with eb) \
-		$(use_enable emacs) \
-		$(use_with emacs lispdir "${SITELISP}") \
-		$(use_with libffi ffi) \
-		$(use_enable gnome gnome-applet) \
-		$(use_with gtk gtk2) \
-		$(use_with gtk3) \
-		$(use_with libedit) \
-		--disable-kde-applet \
-		$(use_enable kde kde4-applet) \
-		$(use_with m17n-lib m17nlib) \
-		$(use_enable ncurses fep) \
-		$(use_enable nls) \
-		$(use_with prime) \
-		--without-qt \
-		--without-qt-immodule \
-		$(use_with qt4 qt4) \
-		$(use_with qt4 qt4-immodule) \
-		$(use_with skk) \
-		$(use_with sqlite sqlite3) \
-		$(use_enable ssl openssl) \
-		$(use_enable static-libs static) \
-		$(use_with xft) \
-		${myconf}
-		# $(use_enable qt4 qt4-qt3support) \
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use emacs; then
-		cd emacs
-		elisp-compile *.el || die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	# parallel make install b0rked, bug #222677
-	emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog* NEWS README RELNOTE || die
-	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
-
-	find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} +
-	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
-
-	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die
-	insinto /etc/X11/xinit/xinput.d
-	doins "${T}/uim.conf" || die
-
-	# collision with dev-scheme/sigscheme, bug #330975
-	# find "${ED}" -name '*gcroots*' -delete || die
-}
-
-pkg_postinst() {
-	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 "uim-im-switcher-gtk3 or uim-im-switcher-qt4."
-	elog
-	elog "If you upgrade from a version of uim older than 1.4.0,"
-	elog "you should run revdep-rebuild."
-
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_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 && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
-	use emacs && elisp-site-regen
-}