Drop old (#508854)

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

16 files changed, 9 insertions, 2724 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 3ce26f823b3e..7615939a5eda 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-i18n/uim
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.271 2014/06/22 12:39:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.272 2014/11/13 12:52:45 pacho Exp $
+
+  13 Nov 2014; Pacho Ramos <pacho@gentoo.org> -files/50uim-gentoo.el,
+  -files/uim-1.7.3-glib-2.32.patch, -files/uim-1.7.3-linguas.patch,
+  -files/uim-1.8.0-glib2.32.patch, -uim-1.7.3-r1.ebuild, -uim-1.7.3.ebuild,
+  -uim-1.8.0-r1.ebuild, -uim-1.8.0.ebuild, -uim-1.8.2-r1.ebuild,
+  -uim-1.8.2.ebuild, -uim-1.8.3-r1.ebuild, -uim-1.8.3.ebuild,
+  -uim-1.8.4-r1.ebuild, -uim-1.8.4.ebuild, -uim-1.8.6.ebuild:
+  Drop old (#508854)
 
   22 Jun 2014; Agostino Sarubbo <ago@gentoo.org> uim-1.8.6-r1.ebuild:
   Stable for ppc64, wrt bug #510672
diff --git a/app-i18n/uim/files/50uim-gentoo.el b/app-i18n/uim/files/50uim-gentoo.el
deleted file mode 100644
index 350f6216139f..000000000000
--- a/app-i18n/uim/files/50uim-gentoo.el
+++ /dev/null
@@ -1,4 +0,0 @@
-;;; app-i18n/uim site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'uim-mode "uim" nil t)
diff --git a/app-i18n/uim/files/uim-1.7.3-glib-2.32.patch b/app-i18n/uim/files/uim-1.7.3-glib-2.32.patch
deleted file mode 100644
index 7290240a8a9d..000000000000
--- a/app-i18n/uim/files/uim-1.7.3-glib-2.32.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit d9c316e49a03dcd5736eb04396657cc369eb6215
-Author: Muneyuki Noguchi <nogu.dev@gmail.com>
-Date:   Sat Apr 21 14:49:18 2012 +0900
-
-    Fix compile error with glib 2.32.
-    
-    * notify/uim-libnotify.c
-      - Don't include glib/gconvert.h directly.
-
-diff --git a/notify/uim-libnotify.c b/notify/uim-libnotify.c
-index 414e74c..a6578a1 100644
---- a/notify/uim-libnotify.c
-+++ b/notify/uim-libnotify.c
-@@ -37,7 +37,6 @@
- #include <stdarg.h>
- #include <string.h>
- #include <glib.h>
--#include <glib/gconvert.h>
- #include <libnotify/notify.h>
- 
- #include "uim.h"  /* for uim_bool */
diff --git a/app-i18n/uim/files/uim-1.7.3-linguas.patch b/app-i18n/uim/files/uim-1.7.3-linguas.patch
deleted file mode 100644
index 4eb737a5f1f1..000000000000
--- a/app-i18n/uim/files/uim-1.7.3-linguas.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/po/LINGUAS b/po/LINGUAS
-index 4eb4f64..f85c7c7 100644
---- a/po/LINGUAS
-+++ b/po/LINGUAS
-@@ -1 +1,3 @@
--fr ja ko
-+fr
-+ja
-+ko
diff --git a/app-i18n/uim/files/uim-1.8.0-glib2.32.patch b/app-i18n/uim/files/uim-1.8.0-glib2.32.patch
deleted file mode 100644
index 8e8ed6307ecf..000000000000
--- a/app-i18n/uim/files/uim-1.8.0-glib2.32.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: uim-1.8.0/notify/uim-libnotify.c
-===================================================================
---- uim-1.8.0.orig/notify/uim-libnotify.c
-+++ uim-1.8.0/notify/uim-libnotify.c
-@@ -37,7 +37,6 @@
- #include <stdarg.h>
- #include <string.h>
- #include <glib.h>
--#include <glib/gconvert.h>
- #include <libnotify/notify.h>
- 
- #include "uim.h"  /* for uim_bool */
diff --git a/app-i18n/uim/uim-1.7.3-r1.ebuild b/app-i18n/uim/uim-1.7.3-r1.ebuild
deleted file mode 100644
index 6c7d32618382..000000000000
--- a/app-i18n/uim/uim-1.7.3-r1.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.7.3-r1.ebuild,v 1.3 2014/01/29 01:47:37 naota Exp $
-
-EAPI="4"
-inherit autotools eutils multilib elisp-common flag-o-matic gnome2-utils
-
-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 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 )
-	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"
-#	>=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
-
-pkg_setup() {
-	strip-linguas fr ja ko
-	if [[ -z "${LINGUAS}" ]]; then
-		# no linguas set, using the default one
-		LINGUAS=" "
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
-		"${FILESDIR}"/${PN}-1.5.4-zhTW.patch \
-		"${FILESDIR}"/${PN}-1.7.3-linguas.patch
-
-	if has_version ">=dev-libs/glib-2.32"; then
-		epatch "${FILESDIR}"/${P}-glib-2.32.patch
-	fi
-
-	# 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
-	cp po/Makefile.in.in qt/chardict/po || die
-	cp po/Makefile.in.in qt4/chardict/po || die
-}
-
-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) \
-		--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 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	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 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	use emacs && elisp-site-regen
-}
diff --git a/app-i18n/uim/uim-1.7.3.ebuild b/app-i18n/uim/uim-1.7.3.ebuild
deleted file mode 100644
index b047da144ae4..000000000000
--- a/app-i18n/uim/uim-1.7.3.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.7.3.ebuild,v 1.13 2014/01/29 01:47:37 naota Exp $
-
-EAPI="4"
-inherit autotools eutils multilib elisp-common flag-o-matic gnome2-utils
-
-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 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 )
-	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"
-#	>=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
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
-		"${FILESDIR}"/${PN}-1.5.4-zhTW.patch
-
-	if has_version ">=dev-libs/glib-2.32"; then
-		epatch "${FILESDIR}"/${P}-glib-2.32.patch
-	fi
-
-	# 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
-	cp po/Makefile.in.in qt/chardict/po || die
-	cp po/Makefile.in.in qt4/chardict/po || die
-}
-
-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) \
-		--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 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk2
-	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 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	use emacs && elisp-site-regen
-}
diff --git a/app-i18n/uim/uim-1.8.0-r1.ebuild b/app-i18n/uim/uim-1.8.0-r1.ebuild
deleted file mode 100644
index 077150a0d97f..000000000000
--- a/app-i18n/uim/uim-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.0-r1.ebuild,v 1.3 2014/01/29 01:47:36 naota Exp $
-
-EAPI="4"
-inherit autotools eutils multilib elisp-common flag-o-matic gnome2-utils
-
-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 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 )
-	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"
-#	>=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
-
-pkg_setup() {
-	strip-linguas fr ja ko
-	if [[ -z "${LINGUAS}" ]]; then
-		# no linguas set, using the default one
-		LINGUAS=" "
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
-		"${FILESDIR}"/${PN}-1.5.4-zhTW.patch \
-		"${FILESDIR}"/${PN}-1.8.0-glib2.32.patch \
-		"${FILESDIR}"/${PN}-1.7.3-linguas.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) \
-		--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
-
-	rmdir "${ED}"/usr/share/doc/sigscheme || 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 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	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 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	use emacs && elisp-site-regen
-}
diff --git a/app-i18n/uim/uim-1.8.0.ebuild b/app-i18n/uim/uim-1.8.0.ebuild
deleted file mode 100644
index 6b3f0ce070d9..000000000000
--- a/app-i18n/uim/uim-1.8.0.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.0.ebuild,v 1.12 2014/01/29 01:47:37 naota Exp $
-
-EAPI="4"
-inherit autotools eutils multilib elisp-common flag-o-matic gnome2-utils
-
-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 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 )
-	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"
-#	>=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
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
-		"${FILESDIR}"/${PN}-1.5.4-zhTW.patch \
-		"${FILESDIR}"/${PN}-1.8.0-glib2.32.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) \
-		--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
-
-	rmdir "${ED}"/usr/share/doc/sigscheme || 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 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	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 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	use emacs && elisp-site-regen
-}
diff --git a/app-i18n/uim/uim-1.8.2-r1.ebuild b/app-i18n/uim/uim-1.8.2-r1.ebuild
deleted file mode 100644
index 6b9016287488..000000000000
--- a/app-i18n/uim/uim-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.2-r1.ebuild,v 1.3 2014/01/29 01:47:37 naota Exp $
-
-EAPI="4"
-inherit autotools eutils multilib elisp-common flag-o-matic gnome2-utils
-
-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 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 )
-	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"
-#	>=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
-
-pkg_setup() {
-	strip-linguas fr ja ko
-	if [[ -z "${LINGUAS}" ]]; then
-		# no linguas set, using the default one
-		LINGUAS=" "
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
-		"${FILESDIR}"/${PN}-1.5.4-zhTW.patch \
-		"${FILESDIR}"/${PN}-1.7.3-linguas.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) \
-		--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
-
-	rmdir "${ED}"/usr/share/doc/sigscheme || 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 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	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 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	use emacs && elisp-site-regen
-}
diff --git a/app-i18n/uim/uim-1.8.2.ebuild b/app-i18n/uim/uim-1.8.2.ebuild
deleted file mode 100644
index fe6024ec4e0d..000000000000
--- a/app-i18n/uim/uim-1.8.2.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.2.ebuild,v 1.4 2014/01/29 01:47:37 naota Exp $
-
-EAPI="4"
-inherit autotools eutils multilib elisp-common flag-o-matic gnome2-utils
-
-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 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 )
-	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"
-#	>=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
-
-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) \
-		--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
-
-	rmdir "${ED}"/usr/share/doc/sigscheme || 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 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	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 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	use emacs && elisp-site-regen
-}
diff --git a/app-i18n/uim/uim-1.8.3-r1.ebuild b/app-i18n/uim/uim-1.8.3-r1.ebuild
deleted file mode 100644
index cf161f01cb6b..000000000000
--- a/app-i18n/uim/uim-1.8.3-r1.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.3-r1.ebuild,v 1.3 2014/01/29 01:47:36 naota Exp $
-
-EAPI="4"
-inherit autotools eutils multilib elisp-common flag-o-matic gnome2-utils
-
-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 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 )
-	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"
-#	>=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
-
-pkg_setup() {
-	strip-linguas fr ja ko
-	if [[ -z "${LINGUAS}" ]]; then
-		# no linguas set, using the default one
-		LINGUAS=" "
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
-		"${FILESDIR}"/${PN}-1.5.4-zhTW.patch \
-		"${FILESDIR}"/${PN}-1.7.3-linguas.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) \
-		--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
-
-	#rmdir "${ED}"/usr/share/doc/sigscheme || 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 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	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 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	use emacs && elisp-site-regen
-}
diff --git a/app-i18n/uim/uim-1.8.3.ebuild b/app-i18n/uim/uim-1.8.3.ebuild
deleted file mode 100644
index 578dd0f5565b..000000000000
--- a/app-i18n/uim/uim-1.8.3.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.3.ebuild,v 1.4 2014/01/29 01:47:37 naota 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 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 )
-	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"
-#	>=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
-
-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) \
-		--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
-
-	#rmdir "${ED}"/usr/share/doc/sigscheme || 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 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	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 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	use emacs && elisp-site-regen
-}
diff --git a/app-i18n/uim/uim-1.8.4-r1.ebuild b/app-i18n/uim/uim-1.8.4-r1.ebuild
deleted file mode 100644
index bcb49e98283c..000000000000
--- a/app-i18n/uim/uim-1.8.4-r1.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.4-r1.ebuild,v 1.3 2014/01/29 01:47:37 naota Exp $
-
-EAPI="4"
-inherit autotools eutils multilib elisp-common flag-o-matic gnome2-utils
-
-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 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 )
-	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"
-#	>=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
-
-pkg_setup() {
-	strip-linguas fr ja ko
-	if [[ -z "${LINGUAS}" ]]; then
-		# no linguas set, using the default one
-		LINGUAS=" "
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
-		"${FILESDIR}"/${PN}-1.5.4-zhTW.patch \
-		"${FILESDIR}"/${PN}-1.7.3-linguas.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) \
-		--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
-
-	#rmdir "${ED}"/usr/share/doc/sigscheme || 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 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	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 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	use emacs && elisp-site-regen
-}
diff --git a/app-i18n/uim/uim-1.8.4.ebuild b/app-i18n/uim/uim-1.8.4.ebuild
deleted file mode 100644
index 8b84d8bc249c..000000000000
--- a/app-i18n/uim/uim-1.8.4.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.4.ebuild,v 1.4 2014/01/29 01:47:37 naota Exp $
-
-EAPI="4"
-inherit autotools eutils multilib elisp-common flag-o-matic gnome2-utils
-
-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 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 )
-	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"
-#	>=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
-
-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) \
-		--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
-
-	#rmdir "${ED}"/usr/share/doc/sigscheme || 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 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	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 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	use emacs && elisp-site-regen
-}
diff --git a/app-i18n/uim/uim-1.8.6.ebuild b/app-i18n/uim/uim-1.8.6.ebuild
deleted file mode 100644
index bc54a8ff5f74..000000000000
--- a/app-i18n/uim/uim-1.8.6.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.6.ebuild,v 1.2 2014/04/14 14:27:44 jer Exp $
-
-EAPI="5"
-inherit autotools eutils multilib elisp-common gnome2-utils
-
-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 expat libffi gnome gtk gtk3 kde libedit libnotify m17n-lib ncurses nls 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 )
-	expat? ( dev-libs/expat )
-	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 )
-	qt4? ( dev-qt/qtgui:4[qt3support] )
-	skk? ( app-i18n/skk-jisyo )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl )
-	!dev-scheme/sigscheme"
-#	scim? ( >=app-i18n/scim-1.3.0 ) # broken
-#	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
-
-pkg_setup() {
-	strip-linguas fr ja ko
-	if [[ -z "${LINGUAS}" ]]; then
-		# no linguas set, using the default one
-		LINGUAS=" "
-	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 "sed failed!"
-
-	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 expat) \
-		$(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) \
-		--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() {
-	default
-
-	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
-
-	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
-
-	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 "sed failed!"
-	insinto /etc/X11/xinit/xinput.d
-	doins "${T}/uim.conf"
-
-	# collision with dev-scheme/sigscheme, bug #330975
-	# find "${ED}" -name '*gcroots*' -delete || die
-
-	#rmdir "${ED}"/usr/share/doc/sigscheme || 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 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	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 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	use emacs && elisp-site-regen
-}