old

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

9 files changed, 9 insertions, 728 deletions

diff --git a/app-i18n/ibus-mozc/ChangeLog b/app-i18n/ibus-mozc/ChangeLog
index cf3c7a6019a6..6a6301038852 100644
--- a/app-i18n/ibus-mozc/ChangeLog
+++ b/app-i18n/ibus-mozc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-i18n/ibus-mozc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-mozc/ChangeLog,v 1.26 2012/01/28 02:51:26 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-mozc/ChangeLog,v 1.27 2012/03/09 19:37:29 ssuominen Exp $
+
+  09 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -files/ibus-mozc-0.11.365.102-gentoo.patch, -ibus-mozc-1.0.558.102.ebuild,
+  -files/ibus-mozc-1.1.717.102-gcc46.patch,
+  -files/ibus-mozc-1.1.758.102-gentoo.patch, -ibus-mozc-1.1.773.102.ebuild,
+  -ibus-mozc-1.2.855.102.ebuild, -ibus-mozc-1.3.911.102.ebuild,
+  -ibus-mozc-1.3.931.102.ebuild:
+  old
 
 *ibus-mozc-1.3.975.102 (28 Jan 2012)
 
diff --git a/app-i18n/ibus-mozc/files/ibus-mozc-0.11.365.102-gentoo.patch b/app-i18n/ibus-mozc/files/ibus-mozc-0.11.365.102-gentoo.patch
deleted file mode 100644
index 7e52ab33155f..000000000000
--- a/app-i18n/ibus-mozc/files/ibus-mozc-0.11.365.102-gentoo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- mozc.orig/build_mozc.py	2010-06-10 16:02:08.000000000 +0900
-+++ mozc/build_mozc.py	2010-06-10 19:59:26.000000000 +0900
-@@ -387,7 +387,7 @@
-     (unused_gyp_file_name, target_name) = ParseTarget(target)
-     target_names.append(target_name)
- 
--  make_command = os.getenv('BUILD_COMMAND', 'make')
-+  make_command = os.getenv('BUILD_COMMAND', 'emake')
-   # flags for building in Chrome OS chroot environment
-   envvars = [
-       'CFLAGS',
-@@ -403,7 +403,7 @@
-     if envvar in os.environ:
-       os.environ[envvar] = os.getenv(envvar)
- 
--  build_args = ['-j%s' % options.jobs, 'BUILDTYPE=%s' % options.configuration]
-+  build_args = ['BUILDTYPE=%s' % options.configuration]
-   if options.build_base:
-     build_args.append('builddir_name=%s' % options.build_base)
- 
diff --git a/app-i18n/ibus-mozc/files/ibus-mozc-1.1.717.102-gcc46.patch b/app-i18n/ibus-mozc/files/ibus-mozc-1.1.717.102-gcc46.patch
deleted file mode 100644
index 098ec3eb9d9e..000000000000
--- a/app-i18n/ibus-mozc/files/ibus-mozc-1.1.717.102-gcc46.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur mozc-1.1.717.102.orig/base/util.cc mozc-1.1.717.102/base/util.cc
---- mozc-1.1.717.102.orig/base/util.cc	2011-05-20 17:17:00.000000000 +0900
-+++ mozc-1.1.717.102/base/util.cc	2011-05-31 19:14:38.129021596 +0900
-@@ -373,7 +373,6 @@
-     while (*str == ' ' || *str == '\t') {
-       ++str;
-     }
--    bool inquote = false;
-     if (*str == '"') {
-       start = ++str;
-       end = start;
-@@ -385,7 +384,6 @@
-         }
-         *end++ = *str;
-       }
--      inquote = true;
-       str = find(str, eos, ',');
-     } else {
-       start = str;
-diff -Naur mozc-1.1.717.102.orig/rewriter/collocation_rewriter.cc mozc-1.1.717.102/rewriter/collocation_rewriter.cc
---- mozc-1.1.717.102.orig/rewriter/collocation_rewriter.cc	2011-05-20 17:17:03.000000000 +0900
-+++ mozc-1.1.717.102/rewriter/collocation_rewriter.cc	2011-06-01 08:17:44.886890850 +0900
-@@ -575,7 +575,6 @@
-   for (size_t i = segments->history_segments_size();
-        i < segments->segments_size(); ++i) {
-     bool rewrited_next = false;
--    bool rewrited_prev = false;
- 
-     if (IsKeyUnknown(segments->segment(i))) {
-       continue;
-@@ -596,7 +595,6 @@
-         RewriteFromPrevSegment(segments->segment(i - 1).candidate(0),
-                                segments->mutable_segment(i))) {
-       changed = true;
--      rewrited_prev =true;
-       segs_changed[i - 1] = true;
-       segs_changed[i] = true;
-     }
diff --git a/app-i18n/ibus-mozc/files/ibus-mozc-1.1.758.102-gentoo.patch b/app-i18n/ibus-mozc/files/ibus-mozc-1.1.758.102-gentoo.patch
deleted file mode 100644
index 5039d4fe4215..000000000000
--- a/app-i18n/ibus-mozc/files/ibus-mozc-1.1.758.102-gentoo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur mozc-1.1.758.102.orig/build_mozc.py mozc-1.1.758.102/build_mozc.py
---- mozc-1.1.758.102.orig/build_mozc.py	2011-07-03 08:07:57.594671843 +0900
-+++ mozc-1.1.758.102/build_mozc.py	2011-07-03 08:11:39.989572696 +0900
-@@ -727,9 +727,7 @@
-   # set output directory
-   os.environ['builddir_name'] = 'out_linux'
- 
--  build_args = ['-j%s' % options.jobs,
--                'MAKE_JOBS=%s' % options.jobs,
--                'BUILDTYPE=%s' % options.configuration]
-+  build_args = ['BUILDTYPE=%s' % options.configuration]
-   if options.build_base:
-     build_args.append('builddir_name=%s' % options.build_base)
- 
diff --git a/app-i18n/ibus-mozc/ibus-mozc-1.0.558.102.ebuild b/app-i18n/ibus-mozc/ibus-mozc-1.0.558.102.ebuild
deleted file mode 100644
index 9e99b78722ad..000000000000
--- a/app-i18n/ibus-mozc/ibus-mozc-1.0.558.102.ebuild
+++ /dev/null
@@ -1,121 +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/ibus-mozc/ibus-mozc-1.0.558.102.ebuild,v 1.5 2011/11/12 04:42:09 naota Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-inherit elisp-common eutils multilib python toolchain-funcs
-
-MY_P="${P/ibus-}"
-DESCRIPTION="The Mozc engine for IBus Framework"
-HOMEPAGE="http://code.google.com/p/mozc/"
-SRC_URI="http://mozc.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="emacs +ibus scim +qt4"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/protobuf
-	net-misc/curl
-	sys-libs/zlib
-	emacs? ( virtual/emacs )
-	ibus? ( >=app-i18n/ibus-1.2 )
-	scim? ( app-i18n/scim )
-	qt4? ( x11-libs/qt-gui:4 )"
-DEPEND="${RDEPEND}
-	dev-cpp/gtest
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-BUILDTYPE="${BUILDTYPE:-Release}"
-
-RESTRICT="test"
-
-SITEFILE=50${PN}-gentoo.el
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	sed -i -e "s:/usr/lib/mozc:${EPREFIX}/usr/$(get_libdir)/mozc:" base/util.cc || die
-	epatch "${FILESDIR}/${PN}-0.11.365.102-gentoo.patch"
-}
-
-src_configure() {
-	"$(PYTHON)" build_mozc.py gyp || die "gyp failed"
-}
-
-src_compile() {
-	tc-export CC CXX AR AS RANLIB LD
-	export QTDIR="${EPREFIX}/usr"
-
-	local mytarget="server/server.gyp:mozc_server"
-	use emacs && mytarget="${mytarget} unix/emacs/emacs.gyp:mozc_emacs_helper"
-	use ibus && mytarget="${mytarget} unix/ibus/ibus.gyp:ibus_mozc"
-	use scim && mytarget="${mytarget} unix/scim/scim.gyp:scim_mozc unix/scim/scim.gyp:scim_mozc_setup"
-	use qt4 && mytarget="${mytarget} gui/gui.gyp:mozc_tool"
-
-	"$(PYTHON)" build_mozc.py build_tools -c "${BUILDTYPE}" || die
-	"$(PYTHON)" build_mozc.py build -c "${BUILDTYPE}" ${mytarget} || die
-
-	if use emacs ; then
-		elisp-compile unix/emacs/*.el || die
-	fi
-}
-
-src_test() {
-	"$(PYTHON)" build_mozc.py runtests -c "${BUILDTYPE}" || die
-}
-
-src_install() {
-	if use emacs ; then
-		dobin "out_linux/${BUILDTYPE}/mozc_emacs_helper" || die
-		elisp-install ${PN} unix/emacs/*.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN} || die
-	fi
-
-	if use ibus ; then
-		exeinto /usr/libexec || die
-		newexe "out_linux/${BUILDTYPE}/ibus_mozc" ibus-engine-mozc || die
-		insinto /usr/share/ibus/component || die
-		doins "out_linux/${BUILDTYPE}/obj/gen/unix/ibus/mozc.xml" || die
-		insinto /usr/share/ibus-mozc || die
-		(
-			cd data/images/unix
-			newins ime_product_icon_opensource-32.png product_icon.png || die
-			for f in ui-*
-			do
-				newins ${f} ${f/ui-} || die
-			done
-		)
-
-	fi
-
-	if use scim ; then
-		exeinto "$(pkg-config --variable=moduledir scim)/IMEngine/" || die
-		newexe "out_linux/${BUILDTYPE}/lib.target/libscim_mozc.so" mozc.so || die
-		exeinto "$(pkg-config --variable=moduledir scim)/SetupUI/" || die
-		newexe "out_linux/${BUILDTYPE}/lib.target/libscim_mozc_setup.so" mozc-setup.so || die
-		insinto "$(pkg-config --variable=icondir scim)" || die
-		(
-			cd data/images/unix
-			newins ime_product_icon_opensource-32.png scim-mozc.png || die
-			for f in ui-*
-			do
-				newins ${f} ${f/ui-/scim-mozc-} || die
-			done
-		)
-	fi
-
-	exeinto "/usr/$(get_libdir)/mozc" || die
-	doexe "out_linux/${BUILDTYPE}/mozc_server" || die
-
-	if use qt4 ; then
-		exeinto "/usr/$(get_libdir)/mozc" || die
-		doexe "out_linux/${BUILDTYPE}/mozc_tool" || die
-	fi
-}
diff --git a/app-i18n/ibus-mozc/ibus-mozc-1.1.773.102.ebuild b/app-i18n/ibus-mozc/ibus-mozc-1.1.773.102.ebuild
deleted file mode 100644
index 6f8e838c554f..000000000000
--- a/app-i18n/ibus-mozc/ibus-mozc-1.1.773.102.ebuild
+++ /dev/null
@@ -1,133 +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/ibus-mozc/ibus-mozc-1.1.773.102.ebuild,v 1.3 2011/11/12 04:42:09 naota Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-inherit elisp-common eutils multilib python toolchain-funcs
-
-MY_P="${P/ibus-}"
-DESCRIPTION="The Mozc engine for IBus Framework"
-HOMEPAGE="http://code.google.com/p/mozc/"
-SRC_URI="http://mozc.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs +ibus scim +qt4"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/protobuf
-	net-misc/curl
-	sys-libs/zlib
-	emacs? ( virtual/emacs )
-	ibus? ( >=app-i18n/ibus-1.2 )
-	scim? ( app-i18n/scim )
-	qt4? (
-		x11-libs/qt-gui:4
-		app-i18n/zinnia
-	)"
-#	chewing? ( dev-libs/libchewing )
-DEPEND="${RDEPEND}
-	dev-cpp/gtest
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-BUILDTYPE="${BUILDTYPE:-Release}"
-
-RESTRICT="test"
-
-SITEFILE=50${PN}-gentoo.el
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	sed -i -e "s:/usr/lib/mozc:${EPREFIX}/usr/$(get_libdir)/mozc:" base/util.cc || die
-	epatch "${FILESDIR}/${PN}-1.1.758.102-gentoo.patch"
-}
-
-src_configure() {
-	local myconf
-	#use chewing && myconf="${myconf} --chewing"
-	if ! use qt4 ; then
-		myconf="${myconf} --noqt"
-		export GYP_DEFINES="use_libzinnia=0"
-	fi
-	"$(PYTHON)" build_mozc.py gyp ${myconf} || die "gyp failed"
-}
-
-src_compile() {
-	tc-export CC CXX AR AS RANLIB LD
-
-	local mytarget="server/server.gyp:mozc_server"
-	use emacs && mytarget="${mytarget} unix/emacs/emacs.gyp:mozc_emacs_helper"
-	use ibus && mytarget="${mytarget} unix/ibus/ibus.gyp:ibus_mozc"
-	use scim && mytarget="${mytarget} unix/scim/scim.gyp:scim_mozc unix/scim/scim.gyp:scim_mozc_setup"
-	if use qt4 ; then
-		export QTDIR="${EPREFIX}/usr"
-		mytarget="${mytarget} gui/gui.gyp:mozc_tool"
-	fi
-
-	"$(PYTHON)" build_mozc.py build_tools -c "${BUILDTYPE}" || die
-	"$(PYTHON)" build_mozc.py build -c "${BUILDTYPE}" ${mytarget} || die
-
-	if use emacs ; then
-		elisp-compile unix/emacs/*.el || die
-	fi
-}
-
-src_test() {
-	"$(PYTHON)" build_mozc.py runtests -c "${BUILDTYPE}" || die
-}
-
-src_install() {
-	if use emacs ; then
-		dobin "out_linux/${BUILDTYPE}/mozc_emacs_helper" || die
-		elisp-install ${PN} unix/emacs/*.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN} || die
-	fi
-
-	if use ibus ; then
-		exeinto /usr/libexec || die
-		newexe "out_linux/${BUILDTYPE}/ibus_mozc" ibus-engine-mozc || die
-		insinto /usr/share/ibus/component || die
-		doins "out_linux/${BUILDTYPE}/obj/gen/unix/ibus/mozc.xml" || die
-		insinto /usr/share/ibus-mozc || die
-		(
-			cd data/images/unix
-			newins ime_product_icon_opensource-32.png product_icon.png || die
-			for f in ui-*
-			do
-				newins ${f} ${f/ui-} || die
-			done
-		)
-
-	fi
-
-	if use scim ; then
-		exeinto "$(pkg-config --variable=moduledir scim)/IMEngine/" || die
-		newexe "out_linux/${BUILDTYPE}/lib.target/libscim_mozc.so" mozc.so || die
-		exeinto "$(pkg-config --variable=moduledir scim)/SetupUI/" || die
-		newexe "out_linux/${BUILDTYPE}/lib.target/libscim_mozc_setup.so" mozc-setup.so || die
-		insinto "$(pkg-config --variable=icondir scim)" || die
-		(
-			cd data/images/unix
-			newins ime_product_icon_opensource-32.png scim-mozc.png || die
-			for f in ui-*
-			do
-				newins ${f} ${f/ui-/scim-mozc-} || die
-			done
-		)
-	fi
-
-	exeinto "/usr/$(get_libdir)/mozc" || die
-	doexe "out_linux/${BUILDTYPE}/mozc_server" || die
-
-	if use qt4 ; then
-		exeinto "/usr/$(get_libdir)/mozc" || die
-		doexe "out_linux/${BUILDTYPE}/mozc_tool" || die
-	fi
-}
diff --git a/app-i18n/ibus-mozc/ibus-mozc-1.2.855.102.ebuild b/app-i18n/ibus-mozc/ibus-mozc-1.2.855.102.ebuild
deleted file mode 100644
index 6b6ab7b08004..000000000000
--- a/app-i18n/ibus-mozc/ibus-mozc-1.2.855.102.ebuild
+++ /dev/null
@@ -1,133 +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/ibus-mozc/ibus-mozc-1.2.855.102.ebuild,v 1.3 2011/11/12 04:42:09 naota Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-inherit elisp-common eutils multilib python toolchain-funcs
-
-MY_P="${P/ibus-}"
-DESCRIPTION="The Mozc engine for IBus Framework"
-HOMEPAGE="http://code.google.com/p/mozc/"
-SRC_URI="http://mozc.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs +ibus scim +qt4"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/protobuf
-	net-misc/curl
-	sys-libs/zlib
-	emacs? ( virtual/emacs )
-	ibus? ( >=app-i18n/ibus-1.2 )
-	scim? ( app-i18n/scim )
-	qt4? (
-		x11-libs/qt-gui:4
-		app-i18n/zinnia
-	)"
-#	chewing? ( dev-libs/libchewing )
-DEPEND="${RDEPEND}
-	dev-cpp/gtest
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-BUILDTYPE="${BUILDTYPE:-Release}"
-
-RESTRICT="test"
-
-SITEFILE=50${PN}-gentoo.el
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	sed -i -e "s:/usr/lib/mozc:${EPREFIX}/usr/$(get_libdir)/mozc:" base/util.cc || die
-	epatch "${FILESDIR}/${PN}-1.2.809.102-gentoo.patch"
-}
-
-src_configure() {
-	local myconf
-	#use chewing && myconf="${myconf} --chewing"
-	if ! use qt4 ; then
-		myconf="${myconf} --noqt"
-		export GYP_DEFINES="use_libzinnia=0"
-	fi
-	"$(PYTHON)" build_mozc.py gyp ${myconf} || die "gyp failed"
-}
-
-src_compile() {
-	tc-export CC CXX AR AS RANLIB LD
-
-	local mytarget="server/server.gyp:mozc_server"
-	use emacs && mytarget="${mytarget} unix/emacs/emacs.gyp:mozc_emacs_helper"
-	use ibus && mytarget="${mytarget} unix/ibus/ibus.gyp:ibus_mozc"
-	use scim && mytarget="${mytarget} unix/scim/scim.gyp:scim_mozc unix/scim/scim.gyp:scim_mozc_setup"
-	if use qt4 ; then
-		export QTDIR="${EPREFIX}/usr"
-		mytarget="${mytarget} gui/gui.gyp:mozc_tool"
-	fi
-
-	"$(PYTHON)" build_mozc.py build_tools -c "${BUILDTYPE}" || die
-	"$(PYTHON)" build_mozc.py build -c "${BUILDTYPE}" ${mytarget} || die
-
-	if use emacs ; then
-		elisp-compile unix/emacs/*.el || die
-	fi
-}
-
-src_test() {
-	"$(PYTHON)" build_mozc.py runtests -c "${BUILDTYPE}" || die
-}
-
-src_install() {
-	if use emacs ; then
-		dobin "out_linux/${BUILDTYPE}/mozc_emacs_helper" || die
-		elisp-install ${PN} unix/emacs/*.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN} || die
-	fi
-
-	if use ibus ; then
-		exeinto /usr/libexec || die
-		newexe "out_linux/${BUILDTYPE}/ibus_mozc" ibus-engine-mozc || die
-		insinto /usr/share/ibus/component || die
-		doins "out_linux/${BUILDTYPE}/obj/gen/unix/ibus/mozc.xml" || die
-		insinto /usr/share/ibus-mozc || die
-		(
-			cd data/images/unix
-			newins ime_product_icon_opensource-32.png product_icon.png || die
-			for f in ui-*
-			do
-				newins ${f} ${f/ui-} || die
-			done
-		)
-
-	fi
-
-	if use scim ; then
-		exeinto "$(pkg-config --variable=moduledir scim)/IMEngine/" || die
-		newexe "out_linux/${BUILDTYPE}/lib.target/libscim_mozc.so" mozc.so || die
-		exeinto "$(pkg-config --variable=moduledir scim)/SetupUI/" || die
-		newexe "out_linux/${BUILDTYPE}/lib.target/libscim_mozc_setup.so" mozc-setup.so || die
-		insinto "$(pkg-config --variable=icondir scim)" || die
-		(
-			cd data/images/unix
-			newins ime_product_icon_opensource-32.png scim-mozc.png || die
-			for f in ui-*
-			do
-				newins ${f} ${f/ui-/scim-mozc-} || die
-			done
-		)
-	fi
-
-	exeinto "/usr/$(get_libdir)/mozc" || die
-	doexe "out_linux/${BUILDTYPE}/mozc_server" || die
-
-	if use qt4 ; then
-		exeinto "/usr/$(get_libdir)/mozc" || die
-		doexe "out_linux/${BUILDTYPE}/mozc_tool" || die
-	fi
-}
diff --git a/app-i18n/ibus-mozc/ibus-mozc-1.3.911.102.ebuild b/app-i18n/ibus-mozc/ibus-mozc-1.3.911.102.ebuild
deleted file mode 100644
index cfe0a35fb8ce..000000000000
--- a/app-i18n/ibus-mozc/ibus-mozc-1.3.911.102.ebuild
+++ /dev/null
@@ -1,133 +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/ibus-mozc/ibus-mozc-1.3.911.102.ebuild,v 1.1 2011/12/04 00:43:05 matsuu Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-inherit elisp-common eutils multilib python toolchain-funcs
-
-MY_P="${P/ibus-}"
-DESCRIPTION="The Mozc engine for IBus Framework"
-HOMEPAGE="http://code.google.com/p/mozc/"
-SRC_URI="http://mozc.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs +ibus scim +qt4"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/protobuf
-	net-misc/curl
-	sys-libs/zlib
-	emacs? ( virtual/emacs )
-	ibus? ( >=app-i18n/ibus-1.2 )
-	scim? ( app-i18n/scim )
-	qt4? (
-		x11-libs/qt-gui:4
-		app-i18n/zinnia
-	)"
-#	chewing? ( dev-libs/libchewing )
-DEPEND="${RDEPEND}
-	dev-cpp/gtest
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-BUILDTYPE="${BUILDTYPE:-Release}"
-
-RESTRICT="test"
-
-SITEFILE=50${PN}-gentoo.el
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	sed -i -e "s:/usr/lib/mozc:${EPREFIX}/usr/$(get_libdir)/mozc:" base/util.cc || die
-	epatch "${FILESDIR}/${PN}-1.2.809.102-gentoo.patch"
-}
-
-src_configure() {
-	local myconf
-	#use chewing && myconf="${myconf} --chewing"
-	if ! use qt4 ; then
-		myconf="${myconf} --noqt"
-		export GYP_DEFINES="use_libzinnia=0"
-	fi
-	"$(PYTHON)" build_mozc.py gyp ${myconf} || die "gyp failed"
-}
-
-src_compile() {
-	tc-export CC CXX AR AS RANLIB LD
-
-	local mytarget="server/server.gyp:mozc_server"
-	use emacs && mytarget="${mytarget} unix/emacs/emacs.gyp:mozc_emacs_helper"
-	use ibus && mytarget="${mytarget} unix/ibus/ibus.gyp:ibus_mozc"
-	use scim && mytarget="${mytarget} unix/scim/scim.gyp:scim_mozc unix/scim/scim.gyp:scim_mozc_setup"
-	if use qt4 ; then
-		export QTDIR="${EPREFIX}/usr"
-		mytarget="${mytarget} gui/gui.gyp:mozc_tool"
-	fi
-
-	"$(PYTHON)" build_mozc.py build_tools -c "${BUILDTYPE}" || die
-	"$(PYTHON)" build_mozc.py build -c "${BUILDTYPE}" ${mytarget} || die
-
-	if use emacs ; then
-		elisp-compile unix/emacs/*.el || die
-	fi
-}
-
-src_test() {
-	"$(PYTHON)" build_mozc.py runtests -c "${BUILDTYPE}" || die
-}
-
-src_install() {
-	if use emacs ; then
-		dobin "out_linux/${BUILDTYPE}/mozc_emacs_helper" || die
-		elisp-install ${PN} unix/emacs/*.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN} || die
-	fi
-
-	if use ibus ; then
-		exeinto /usr/libexec || die
-		newexe "out_linux/${BUILDTYPE}/ibus_mozc" ibus-engine-mozc || die
-		insinto /usr/share/ibus/component || die
-		doins "out_linux/${BUILDTYPE}/obj/gen/unix/ibus/mozc.xml" || die
-		insinto /usr/share/ibus-mozc || die
-		(
-			cd data/images/unix
-			newins ime_product_icon_opensource-32.png product_icon.png || die
-			for f in ui-*
-			do
-				newins ${f} ${f/ui-} || die
-			done
-		)
-
-	fi
-
-	if use scim ; then
-		exeinto "$(pkg-config --variable=moduledir scim)/IMEngine/" || die
-		newexe "out_linux/${BUILDTYPE}/lib.target/libscim_mozc.so" mozc.so || die
-		exeinto "$(pkg-config --variable=moduledir scim)/SetupUI/" || die
-		newexe "out_linux/${BUILDTYPE}/lib.target/libscim_mozc_setup.so" mozc-setup.so || die
-		insinto "$(pkg-config --variable=icondir scim)" || die
-		(
-			cd data/images/unix
-			newins ime_product_icon_opensource-32.png scim-mozc.png || die
-			for f in ui-*
-			do
-				newins ${f} ${f/ui-/scim-mozc-} || die
-			done
-		)
-	fi
-
-	exeinto "/usr/$(get_libdir)/mozc" || die
-	doexe "out_linux/${BUILDTYPE}/mozc_server" || die
-
-	if use qt4 ; then
-		exeinto "/usr/$(get_libdir)/mozc" || die
-		doexe "out_linux/${BUILDTYPE}/mozc_tool" || die
-	fi
-}
diff --git a/app-i18n/ibus-mozc/ibus-mozc-1.3.931.102.ebuild b/app-i18n/ibus-mozc/ibus-mozc-1.3.931.102.ebuild
deleted file mode 100644
index d325c6a248b9..000000000000
--- a/app-i18n/ibus-mozc/ibus-mozc-1.3.931.102.ebuild
+++ /dev/null
@@ -1,135 +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/ibus-mozc/ibus-mozc-1.3.931.102.ebuild,v 1.1 2011/12/23 04:03:47 matsuu Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-inherit elisp-common eutils multilib python toolchain-funcs
-
-MY_P="${P/ibus-}"
-DESCRIPTION="The Mozc engine for IBus Framework"
-HOMEPAGE="http://code.google.com/p/mozc/"
-SRC_URI="http://mozc.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-#IUSE="emacs +ibus scim skk +qt4"
-IUSE="emacs +ibus scim +qt4"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/protobuf
-	net-misc/curl
-	sys-libs/zlib
-	emacs? ( virtual/emacs )
-	ibus? ( >=app-i18n/ibus-1.2 )
-	scim? ( app-i18n/scim )
-	qt4? (
-		x11-libs/qt-gui:4
-		app-i18n/zinnia
-	)"
-#	chewing? ( dev-libs/libchewing )
-DEPEND="${RDEPEND}
-	dev-cpp/gtest
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-BUILDTYPE="${BUILDTYPE:-Release}"
-
-RESTRICT="test"
-
-SITEFILE=50${PN}-gentoo.el
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	sed -i -e "s:/usr/lib/mozc:${EPREFIX}/usr/$(get_libdir)/mozc:" base/util.cc || die
-	epatch "${FILESDIR}/${PN}-1.2.809.102-gentoo.patch"
-}
-
-src_configure() {
-	local myconf="--channel_dev=0"
-	#use chewing && myconf="${myconf} --chewing"
-	if ! use qt4 ; then
-		myconf="${myconf} --noqt"
-		export GYP_DEFINES="use_libzinnia=0"
-	fi
-	"$(PYTHON)" build_mozc.py gyp ${myconf} || die "gyp failed"
-}
-
-src_compile() {
-	tc-export CC CXX AR AS RANLIB LD
-
-	local mytarget="server/server.gyp:mozc_server"
-	use emacs && mytarget="${mytarget} unix/emacs/emacs.gyp:mozc_emacs_helper"
-	use ibus && mytarget="${mytarget} unix/ibus/ibus.gyp:ibus_mozc"
-	use scim && mytarget="${mytarget} unix/scim/scim.gyp:scim_mozc unix/scim/scim.gyp:scim_mozc_setup"
-	#use skk && mytarget="${mytarget} chrome/skk/skk.gyp:skk"
-	if use qt4 ; then
-		export QTDIR="${EPREFIX}/usr"
-		mytarget="${mytarget} gui/gui.gyp:mozc_tool"
-	fi
-
-	"$(PYTHON)" build_mozc.py build_tools -c "${BUILDTYPE}" || die
-	"$(PYTHON)" build_mozc.py build -c "${BUILDTYPE}" ${mytarget} || die
-
-	if use emacs ; then
-		elisp-compile unix/emacs/*.el || die
-	fi
-}
-
-src_test() {
-	"$(PYTHON)" build_mozc.py runtests -c "${BUILDTYPE}" || die
-}
-
-src_install() {
-	if use emacs ; then
-		dobin "out_linux/${BUILDTYPE}/mozc_emacs_helper" || die
-		elisp-install ${PN} unix/emacs/*.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN} || die
-	fi
-
-	if use ibus ; then
-		exeinto /usr/libexec || die
-		newexe "out_linux/${BUILDTYPE}/ibus_mozc" ibus-engine-mozc || die
-		insinto /usr/share/ibus/component || die
-		doins "out_linux/${BUILDTYPE}/obj/gen/unix/ibus/mozc.xml" || die
-		insinto /usr/share/ibus-mozc || die
-		(
-			cd data/images/unix
-			newins ime_product_icon_opensource-32.png product_icon.png || die
-			for f in ui-*
-			do
-				newins ${f} ${f/ui-} || die
-			done
-		)
-
-	fi
-
-	if use scim ; then
-		exeinto "$(pkg-config --variable=moduledir scim)/IMEngine/" || die
-		newexe "out_linux/${BUILDTYPE}/lib.target/libscim_mozc.so" mozc.so || die
-		exeinto "$(pkg-config --variable=moduledir scim)/SetupUI/" || die
-		newexe "out_linux/${BUILDTYPE}/lib.target/libscim_mozc_setup.so" mozc-setup.so || die
-		insinto "$(pkg-config --variable=icondir scim)" || die
-		(
-			cd data/images/unix
-			newins ime_product_icon_opensource-32.png scim-mozc.png || die
-			for f in ui-*
-			do
-				newins ${f} ${f/ui-/scim-mozc-} || die
-			done
-		)
-	fi
-
-	exeinto "/usr/$(get_libdir)/mozc" || die
-	doexe "out_linux/${BUILDTYPE}/mozc_server" || die
-
-	if use qt4 ; then
-		exeinto "/usr/$(get_libdir)/mozc" || die
-		doexe "out_linux/${BUILDTYPE}/mozc_tool" || die
-	fi
-}