Version bumped.

(Portage version: 2.1.10.3/cvs/Linux x86_64)

4 files changed, 288 insertions, 1 deletions

diff --git a/app-i18n/ibus-mozc/ChangeLog b/app-i18n/ibus-mozc/ChangeLog
index 7a6508678174..a01dd494147c 100644
--- a/app-i18n/ibus-mozc/ChangeLog
+++ b/app-i18n/ibus-mozc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/ibus-mozc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-mozc/ChangeLog,v 1.17 2011/06/01 00:01:55 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-mozc/ChangeLog,v 1.18 2011/07/20 14:52:13 matsuu Exp $
+
+*ibus-mozc-1.1.773.102 (20 Jul 2011)
+*ibus-mozc-1.1.758.102 (20 Jul 2011)
+
+  20 Jul 2011; MATSUU Takuto <matsuu@gentoo.org> +ibus-mozc-1.1.758.102.ebuild,
+  +files/ibus-mozc-1.1.758.102-gentoo.patch, +ibus-mozc-1.1.773.102.ebuild:
+  Version bumped.
 
 *ibus-mozc-1.1.717.102-r1 (01 Jun 2011)
 
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
new file mode 100644
index 000000000000..5039d4fe4215
--- /dev/null
+++ b/app-i18n/ibus-mozc/files/ibus-mozc-1.1.758.102-gentoo.patch
@@ -0,0 +1,14 @@
+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.1.758.102.ebuild b/app-i18n/ibus-mozc/ibus-mozc-1.1.758.102.ebuild
new file mode 100644
index 000000000000..94930d0bb8fd
--- /dev/null
+++ b/app-i18n/ibus-mozc/ibus-mozc-1.1.758.102.ebuild
@@ -0,0 +1,133 @@
+# 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.758.102.ebuild,v 1.1 2011/07/20 14:52:13 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-util/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}/${P}-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.1.773.102.ebuild b/app-i18n/ibus-mozc/ibus-mozc-1.1.773.102.ebuild
new file mode 100644
index 000000000000..b2a7c90a676a
--- /dev/null
+++ b/app-i18n/ibus-mozc/ibus-mozc-1.1.773.102.ebuild
@@ -0,0 +1,133 @@
+# 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.1 2011/07/20 14:52:13 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-util/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
+}