Version bump. Patch by Jack Chen. #407581

Package-Manager: portage-2.2.0_alpha109/cvs/Linux x86_64

4 files changed, 209 insertions, 3 deletions

diff --git a/app-i18n/ibus-mozc/ChangeLog b/app-i18n/ibus-mozc/ChangeLog
index 05bdacc80f3d..c51fc6641df0 100644
--- a/app-i18n/ibus-mozc/ChangeLog
+++ b/app-i18n/ibus-mozc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.31 2012/05/03 19:24:28 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-mozc/ChangeLog,v 1.32 2012/06/13 11:55:41 naota Exp $
+
+*ibus-mozc-1.5.1090.102 (13 Jun 2012)
+
+  13 Jun 2012; Naohiro Aota <naota@gentoo.org> +ibus-mozc-1.5.1090.102.ebuild,
+  metadata.xml:
+  Version bump. Patch by Jack Chen. #407581
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> ibus-mozc-1.3.975.102.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/app-i18n/ibus-mozc/Manifest b/app-i18n/ibus-mozc/Manifest
index d56eba0f8aa6..b95eee29a176 100644
--- a/app-i18n/ibus-mozc/Manifest
+++ b/app-i18n/ibus-mozc/Manifest
@@ -1,7 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 50ibus-mozc-gentoo.el 121 RMD160 7af57ab410ccd126594046c74e0d2daaca78ea94 SHA1 3108d0cbd0e33ac967be14a3577b86ddbf03d86d SHA256 833039439dea484a430e832df869b3af0b8d42bae63c4d6999e72c97d55d897b
 AUX ibus-mozc-1.2.809.102-gentoo.patch 652 RMD160 68e2da6b75e62a0b1d4a099f3a2f94b3e1f53f84 SHA1 382e9f4288acbb054353ac01272f22ec7e1a0cb0 SHA256 2a06a2f9430a1e1407288d535c41b54b6cef1e9488b92e484f8d4cb86eeb0494
 AUX ibus-mozc-1.3.975.102-ibus-1.4.patch 2048 RMD160 731685ce4d91af1f689ccf910f8cce4a85d20ccb SHA1 a5ff34d70919e5ec23fca74d781a339c115d3521 SHA256 4f205c990e2f447bf1bdea8a820f90361a69cf9883d1ea902d6ae097a18fb291
 DIST mozc-1.3.975.102.tar.bz2 55961505 RMD160 b52eddc64a79a7a9f1579648f3ee878837355971 SHA1 ef3f23083152fa564eba98235e83d72d14a06404 SHA256 1ee57425c159bc0066645f086472f72aa16567fe5be272f35339c41e9a52d27a
+DIST mozc-1.5.1090.102.tar.bz2 54911799 RMD160 5b9b704e68a87d7b4a63bb2ea5ab0561badf90b1 SHA1 9c99333a3a46c190fe14afae573b2ddc2faab64a SHA256 b52c1879c4749041032578ec6c591d9741f521d54993070c050d09ae35bd2107
+DIST protobuf-2.4.1.tar.bz2 1440188 RMD160 405eccad08463c2f84064bb68d8a8e757235765f SHA1 df5867e37a4b51fb69f53a8baf5b994938691d6d SHA256 cf8452347330834bbf9c65c2e68b5562ba10c95fa40d4f7ec0d2cb332674b0bf
 EBUILD ibus-mozc-1.3.975.102.ebuild 4439 RMD160 5bd884cc118413101628894234a3a40b13c6cf97 SHA1 aab53266b70b89ff7b7e1ec4e134c165e2a57254 SHA256 c3642b9dfaff5f9245877c2d0d79c8009d8f3721cb1c25dc209b7c0e805f1b11
-MISC ChangeLog 5976 RMD160 d42f1a6e65ffca28f25b003c38bad3b61621bfe9 SHA1 b04331d82274607961e46859621c82a69f1d7b61 SHA256 1e91c1b59af7fea0e496efa096b13ee8387702e5f3c2f611098913bb2fad85ce
-MISC metadata.xml 540 RMD160 92098609fd6a4d8ec147c6bf675bb3626d5e1962 SHA1 6658b008a7f6a3143836901e576b556eecaf1fd9 SHA256 dbc77031a0e9b603d1a15f79367f86375719d4cace47f8c2cb35ef2be29cfe25
+EBUILD ibus-mozc-1.5.1090.102.ebuild 4821 RMD160 ccb699d398cdf75aeb8695b3c5865bad4b615314 SHA1 9096778488d3d25787c9b0b3a3407ec87bb8629b SHA256 6694f45a2fb3ec810dede1d3ddba8adba5598c72a8371dc1bc6115c7a5c26c70
+MISC ChangeLog 6154 RMD160 753004ad76df690b61bb12c404137ef9ea6e7182 SHA1 f4bb2954f41c44f3071aa4f518ccaabe7305feb1 SHA256 5f318c6939d1c1da9410ce4f32c24200da81ac065334a340b7dff67a8d9ead1e
+MISC metadata.xml 603 RMD160 94a0cffde417f8e7ceec465ec85aa9cbf26ffa0a SHA1 1472b7796117c5ca24d9f9d95220521b1ea784c7 SHA256 e77d3254c53a7546df4dcde995975b713e7b7c1819e6361a98b8e0d1be183190
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJP2H/NAAoJEDYO1FT4VRUUtrIQAI9TIQWZ9gxy1MVmO8+zZMwB
+eyNPgUDTLHl2amSsTT7r//Bafh8FDr6TMj5fsW702rtz4/X60beB9oZrmdArc5b+
+zcCltA6bnLBJmHaNMhKZTcGO+eFF5VyxeI+UKFBMwBSxVcGVkgxkUU5tbo/S9e8j
+6nWz57iEOquRDE4IjVDyJwB+TmfgVcrRtSuWmk5pmNfUqGeOGGrtvm2H/kJNAT2e
+FRiXoHhavV1sBHpzw32nX9PWJYaCbSnsWRwJy+C2nwWePnxga+diVVTK7HluNZ+m
+OcDPxIDb+baIuIYmcyY2w5RYCN+Ksg+jUzqqxje8cSb2gqYwbXYAaVv7QKzppBUv
+BsU7rm4UMDywfmfg1GsIWFdZNHgi/LUWqCIt+g5PUQqSn6Edh3Dk7i2I1J19VKmp
+TjXEPTLL9Ic6xdg/ikfR7B5LcciFI/dbtLkdUHS+dsSD2exdyI5XVZBfKa5naoWp
+SS2vNx/bv6ln3UH/BR/uS9mpyyb9LGlbvAiRN5zjSS7KxZ7x7o2gGEmGcJOCJTLe
+O2WvG12c7hVM7XVHykzdRmQZVe8/Buq0pWi+DxABENfwoRb4M6IGx/UW+LFdNXjI
+oE04DdmspTZZZMytPGuRYJP9+ftOln8MGUnCSxP0KmLupsOKO43IgSovqdVfLT+r
+nF+KrTal18jf80YQ6p2t
+=WGF/
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus-mozc/ibus-mozc-1.5.1090.102.ebuild b/app-i18n/ibus-mozc/ibus-mozc-1.5.1090.102.ebuild
new file mode 100644
index 000000000000..d4515ea35459
--- /dev/null
+++ b/app-i18n/ibus-mozc/ibus-mozc-1.5.1090.102.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2012 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.5.1090.102.ebuild,v 1.1 2012/06/13 11:55:41 naota Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+inherit elisp-common eutils multilib python toolchain-funcs
+
+DESCRIPTION="The Mozc engine for IBus Framework"
+HOMEPAGE="http://code.google.com/p/mozc/"
+
+MY_P="${P/ibus-}"
+PROTOBUF_VER="2.4.1"
+GMOCK_VER="403"
+MOZC_URL="http://mozc.googlecode.com/files/${MY_P}.tar.bz2"
+PROTOBUF_URL="http://protobuf.googlecode.com/files/protobuf-${PROTOBUF_VER}.tar.bz2"
+SRC_URI="${MOZC_URL} ${PROTOBUF_URL}"
+
+LICENSE="Apache-2.0 BSD Boost-1.0 ipadic public-domain unicode"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs +ibus scim +qt4 renderer"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/openssl
+	emacs? ( virtual/emacs )
+	ibus? ( >=app-i18n/ibus-1.4 )
+	renderer? ( x11-libs/gtk+:2 )
+	scim? ( app-i18n/scim )
+	qt4? (
+		x11-libs/qt-gui:4
+		app-i18n/zinnia
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+BUILDTYPE="${BUILDTYPE:-Release}"
+
+RESTRICT="test"
+
+SITEFILE=50${PN}-gentoo.el
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_unpack() {
+	unpack $(basename ${MOZC_URL})
+
+	cd "${S}"/protobuf
+	unpack $(basename ${PROTOBUF_URL})
+	mv protobuf-${PROTOBUF_VER} files
+}
+
+src_configure() {
+	local myconf="--channel_dev=0"
+	myconf+=" --server_dir=/usr/$(get_libdir)/mozc"
+
+	if ! use qt4 ; then
+		myconf+=" --noqt"
+		export GYP_DEFINES="use_libzinnia=0"
+	fi
+
+	if ! use renderer ; then
+		export GYP_DEFINES="${GYP_DEFINES} enable_gtk_renderer=0"
+	fi
+
+	"$(PYTHON)" build_mozc.py gyp ${myconf} || die "gyp failed"
+}
+
+src_compile() {
+	tc-export CC CXX AR AS RANLIB LD
+
+	local myjobs=`expr match "${MAKEOPTS}" '.*\(-j[0-9]*\)'`
+	test -z "${myjobs}" && myjobs="-j1"
+
+	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 renderer && mytarget="${mytarget} renderer/renderer.gyp:mozc_renderer"
+	if use qt4 ; then
+		export QTDIR="${EPREFIX}/usr"
+		mytarget="${mytarget} gui/gui.gyp:mozc_tool"
+	fi
+
+	"$(PYTHON)" build_mozc.py build_tools -c "${BUILDTYPE}" ${myjobs} || die
+	"$(PYTHON)" build_mozc.py build -c "${BUILDTYPE}" ${mytarget} ${myjobs} || 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
+
+	if use renderer ; then
+		exeinto "/usr/$(get_libdir)/mozc" || die
+		doexe "out_linux/${BUILDTYPE}/mozc_renderer" || die
+	fi
+}
+
+pkg_postinst() {
+	if use emacs ; then
+		elisp-site-regen
+		elog "You can use mozc-mode via LEIM (Library of Emacs Input Method)."
+		elog "Write the following settings into your init file (~/.emacs.d/init.el"
+		elog "or ~/.emacs) in order to use mozc-mode by default, or you can call"
+		elog "\`set-input-method' and set \"japanese-mozc\" anytime you have loaded"
+		elog "mozc.el"
+		elog
+		elog "  (require 'mozc)"
+		elog "  (set-language-environment \"Japanese\")"
+		elog "  (setq default-input-method \"japanese-mozc\")"
+		elog
+		elog "Having the above settings, just type C-\\ which is bound to"
+		elog "\`toggle-input-method' by default."
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/app-i18n/ibus-mozc/metadata.xml b/app-i18n/ibus-mozc/metadata.xml
index 01156a20eef9..99115c6964c0 100644
--- a/app-i18n/ibus-mozc/metadata.xml
+++ b/app-i18n/ibus-mozc/metadata.xml
@@ -7,6 +7,7 @@ Mozc is a Japanese Input Method Editor (IME) designed for multi-platform such as
 </longdescription>
 <use>
   <flag name='ibus'>Enable support for <pkg>app-i18n/ibus</pkg></flag>
+  <flag name='renderer'>Enable native candidate window.</flag>
   <flag name='scim'>Enable support for <pkg>app-i18n/scim</pkg></flag>
 </use>
 </pkgmetadata>