Version bump. #433730

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

3 files changed, 178 insertions, 15 deletions

diff --git a/app-i18n/mozc/ChangeLog b/app-i18n/mozc/ChangeLog
index 8dfce8aaaa39..a1f3be4ed793 100644
--- a/app-i18n/mozc/ChangeLog
+++ b/app-i18n/mozc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/mozc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/mozc/ChangeLog,v 1.2 2012/07/23 04:20:12 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/mozc/ChangeLog,v 1.3 2012/10/02 02:47:19 naota Exp $
+
+*mozc-1.6.1187.102 (02 Oct 2012)
+
+  02 Oct 2012;  <naota@gentoo.org> +mozc-1.6.1187.102.ebuild:
+  Version bump. #433730
 
   23 Jul 2012; Naohiro Aota <naota@gentoo.org> mozc-1.3.975.102.ebuild,
   mozc-1.5.1090.102.ebuild:
diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
index c067d3eee49c..a832fcb828e9 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -6,25 +6,27 @@ AUX mozc-1.2.809.102-gentoo.patch 652 SHA256 2a06a2f9430a1e1407288d535c41b54b6ce
 AUX mozc-1.3.975.102-ibus-1.4.patch 2048 SHA256 4f205c990e2f447bf1bdea8a820f90361a69cf9883d1ea902d6ae097a18fb291 SHA512 8fea1256155f99ab31f7ab6e29e9244c4e112710c52c73fc78c48aa622dbca36906916ff877d3c9416ee4e2d5d8d33ca9be1af1430217599696efa18c3e63001 WHIRLPOOL 89c7b02a692b500ea31b79c34e2d3b403b315d0c9ac13fd73eaf1eb7ecb12a728e40574f3c6efc69fd86afbda3ba664c3a8eb2ec3f2305d2afb370d9a13de548
 DIST mozc-1.3.975.102.tar.bz2 55961505 SHA256 1ee57425c159bc0066645f086472f72aa16567fe5be272f35339c41e9a52d27a SHA512 dd26382f69820fd7a662c02a157dfcb382020cf15d0bcd613e9015d6142241c46c73755f28cdd23e2c07740dbddad65714474e84759c1313d6a1ffe84f3dc176 WHIRLPOOL b786924fa2c7ad5381ce35f565b320fb63cda4d03f35ce5b6878a4193adf52c22aebe06c953de8ba8f281a08ec2bf7583c26a684f94fa5c4ba73b5bec3a7f577
 DIST mozc-1.5.1090.102.tar.bz2 54911799 SHA256 b52c1879c4749041032578ec6c591d9741f521d54993070c050d09ae35bd2107 SHA512 9901e58af10c67025dd030bd70c3b7d6be34b1e868aefcc0705a18f1b3e76394e4a4b36811df2e598ee1647ecd1f24ddcfe87db889863a5095c31a5680833fec WHIRLPOOL d503fd0c7c2871288d887d834996a53952591eb25ed57a5ef789347a8bf8e39ecc54fb408d53daa3a9018848d52b28bc77c964e202a3479d582529ffc021b598
+DIST mozc-1.6.1187.102.tar.bz2 54828375 SHA256 2a9b54275400c768e14156e7654e9b9a4ca27353573627607c70d221c0e2db65 SHA512 0f182316e80baa8c3d268a266398bd2abad4db9ed54bba351b275681d17ef6fd5348d3b66fd95201028c38f29de293f124b9c4f45a5818f20faf17b1eea495ff WHIRLPOOL fb064dd78471d2060871f905cb1c81fd9c52cc15741493aad26df49db4259709860593b65586a6c44893a6454fd7f2d27815739e1525f1c8fd0cf9eb0efff92a
 DIST protobuf-2.4.1.tar.bz2 1440188 SHA256 cf8452347330834bbf9c65c2e68b5562ba10c95fa40d4f7ec0d2cb332674b0bf SHA512 52b0208c685e44126cb3915a74bde692ef91430f0407144b6c30b72a9f143b1ee4f1eea47a550184c689a1758b92582e7f26f0683c2d387205b957a69830f2f3 WHIRLPOOL e5462ff35f63413aff58640c24b9b561ac55749c489803ae009de21bf5d954a77516714361353ef02cfeb3c2d762620c89dc08a5fdee571e3a33b6f5c20edf6e
 EBUILD mozc-1.3.975.102.ebuild 4383 SHA256 ec8aba72b69689f98b15e9825c0f7be74e2a46081896cfe5617f6c3880e15e3f SHA512 f2c736e76ba123f8488856d56df77502190307582fd128d709a92ec6a3d284293dededde961bded454610b15440579accd38d81d894fdf8160cace5be9a146ca WHIRLPOOL 9c5a8f0afe2bc3362fa60cfe15a7911b3fe7cc0f4ed7b44dc8bd95783432ad5fb5512af71686d56f158d9c5349381ebf57a4c5572166baa9135c537f0b22c506
 EBUILD mozc-1.5.1090.102.ebuild 4833 SHA256 168cd52ef407029f5edfdfc75c41395ef424ea27874badaf6f6c3297640bcc8e SHA512 65e7ddd7455a730e05c7d431258814939b78c9a27ddd88ec9254ac271dddc108df82dea9f77aa5b950b7b1b00bc9df05b3a41ac3a5d46dfa8ccf423228912937 WHIRLPOOL fd133d093d5bdffcde3f4f1d64cadd40e3817458d8942d240cb6cf35137e17dc8bd510875fc6b9ca2f515d15963f694b26ae3beaf90b27ce91a0f2dc284ce574
-MISC ChangeLog 6420 SHA256 7d3e8fc5e90ceb248bc25f2923f03399bc4d5d405f3420f136cc42de6e3a24f9 SHA512 e67fb32e7d75c625d7e9c0f0579a44fa9e095b45eeb47e3982694ae7817427385a1b8188c101d11dfa071f439f12b0547b29a1a3759c0cc4bd3f6fe631fd8919 WHIRLPOOL bd98fab5c346ad88332875126990d67d1b053febfc8c5a6069ca515d7835e6f639daae907a2b91751f21a6c8b2e8cdf2e787729da77af24f36def7797e89453a
+EBUILD mozc-1.6.1187.102.ebuild 4164 SHA256 a4a3ff602990c1bf19aaab799bf267e26625a43d73da4dd475767865fd239e75 SHA512 ab489ab5295702a5509a6304d63d1c8e9ec94786ffc2005993538564a0fa996ec958ce67be0a1096cfbf5e94f25739e09dca3a0497f907a9bba658344b87d577 WHIRLPOOL e24e94206fe9b3b9761faf6de6445ac10fcd68107f558c74a043a1b4d259b97a3d5699845622aeda0581bc4e00860a267e47b611216f1f3a3384b448baea200d
+MISC ChangeLog 6541 SHA256 10a050858b12c916d9d6f1c378bbe5e7596ba818f9f8107a4cf9e96fbee498a8 SHA512 eda98adb90ed6dbf91dbed3b078efdbc59e91bd82b117b9730c6c76f1956e8d06ad70f5ba3916e1287afcd12480705a8adba2ffed291f0f69ad41a56a167b8a2 WHIRLPOOL 8e9640d65c3475ac053258dd8d144013dbf7c78c8b9296cab4ba146cb671532de817bf60f7422f92f7a887d179a23330ebe1470a54265a5a6a45f076a2ab82fc
 MISC metadata.xml 603 SHA256 e77d3254c53a7546df4dcde995975b713e7b7c1819e6361a98b8e0d1be183190 SHA512 5890a0bfd8e9a8584468a7bd8cd162e2135a6ca2f3c39a9a2da7bb3b1c64f77f18578241c4013da83dddf6af68817ebb02438d317996f8e712f4b6a17bf07c93 WHIRLPOOL 438f87eb3a1d199d931e0fadfad91e847f3f8e6f376e7b3d317ef2c77f278006078addee4162fd7816c81b75ca8a378bcec84e0f441c3bf73b89e95b6a38bcc3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQDNDoAAoJEDYO1FT4VRUU8rUP/RK+3dGTbQAeOHWCyDevVx/q
-KHttdC1EvVtEXfLwjMj48Vjp8gDcUNLTbVzUJ6yRU1vj96BsD8Hq73PQ86tzNOIA
-mjmSVbsff4KUYQ0oPXJlo4nvnC9H1nBnYoiAoddRvam/vitSvpvY8GNAQHTEFNAq
-XJZhNZ959df+oP6IwdXnYREgCyd/sQvaj5051ziTWEPMwIzxLBEtZGUxZgveLV6+
-LbfVcus6RNWSaHxVX6ZgzJ0lGmD5Q8V27rkilpi4ODeIj6hjxO6x8Gzb2kaJ+mvo
-R6IAP/8J+rP4UxZup1C7rzBa+j3wvfjhiorUGMZe5Pt4QOr6wI8vOrWP87ecEpud
-1cozmncCRbefGBN+oG+fLbnR/7Gh4bDQGfaAysVJJ2NMqyNJlerCQQi3ZUQw5LmS
-4etFv3diOmfQNszaaOFVSFQA+HcGp5wQ25VPdhQKpUabkRA8h2j4VGKcBhw7Y3Cx
-v1a3GnD2MbMEhg3XYWj01EVm/X4NBUbnGgiith9sFpgX0Gutr4/N5C2ZSK/1YDhm
-B6EGG9sMklh7Uiexi/2O2iI2XNqH83u9q2PdS40BwMZy2cByAYqnb+yBG0hnWme+
-19MoL3Xvl2YiLB7difwtjS2QuCsSmUCuTsH+PXzkm1toMENODNE0O8u/aaEMrUgr
-a2HR97hRnKqGuDbUhDYy
-=FwFp
+iQIcBAEBCAAGBQJQalW+AAoJEDYO1FT4VRUU+N0P/jbLQ+zp2pKKrlbyZ/+pcxy4
+BVjwSFFj0vRC4MnnFMLKJGHz/Bjh4EpCu+hRlLjnhawga190bg9BG0ADI5o+FirA
+Iu//UIIhIFUsMMlep9tfmgff5ITNL0A3qKm45j4sXI7ZkLkC1Ugu2c6CDJe5r9+H
+MKZFO55JhhzbIgb8V4lAQEPqHx0ptJAVVGOy6CJhncINSWGq8V3rpfW3ecGYFYvX
+EZLC7ZhVlBLeZ6LYdarNMpX5W3PGShYQtgsthLRSNgWGnzivq7zdaZ9pGnlra6I/
+D23Uk632kxU5X3DjJxad0epu3EeBHjrxxCU81s0DS9cq65fEIyvrrIzHZ6YKnawQ
+U+DSWT3tedgLZGXSPnehH1mZX1B9xLDNu32DKDH5cKnZewRGhwXpaZq+GeC5Prqw
+rGA6iYYNJGqy9Fb35ezDjAOq/VDcoq5UUxXFMREIzvokZ0LhexPnhEIS2T6M2Lu5
+xaOePea9nUWOg/MEOJLUSplZGk0sTIoBzGTFeK6LXMdauI6V8N3iTr7O4juWWr5K
+UyovFGsSBBTKnTrflJvI40hDGv6vci7MlPVEalepOGM9ufajGchkqyntsOxTQ9t9
+KcRhmCkU2eyxH4WPW2HN85rgsLMq469CCa2Hd0lYvNHcjovVul5HQLnvZQO8SPMK
+H1PvOf2drINeP+SwYrqZ
+=oYWn
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/mozc/mozc-1.6.1187.102.ebuild b/app-i18n/mozc/mozc-1.6.1187.102.ebuild
new file mode 100644
index 000000000000..a4173a1ca497
--- /dev/null
+++ b/app-i18n/mozc/mozc-1.6.1187.102.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/mozc/mozc-1.6.1187.102.ebuild,v 1.1 2012/10/02 02:47:18 naota Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+inherit elisp-common eutils multilib multiprocessing python toolchain-funcs
+
+DESCRIPTION="The Mozc engine for IBus Framework"
+HOMEPAGE="http://code.google.com/p/mozc/"
+
+PROTOBUF_VER="2.4.1"
+GMOCK_VER="403"
+MOZC_URL="http://mozc.googlecode.com/files/${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 +qt4 renderer"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/openssl
+	x11-libs/libxcb
+	emacs? ( virtual/emacs )
+	ibus? ( >=app-i18n/ibus-1.4.1 )
+	renderer? ( x11-libs/gtk+:2 )
+	qt4? (
+		x11-libs/qt-gui:4
+		app-i18n/zinnia
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+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 my_makeopts=$(makeopts_jobs)
+	# This is for a safety. -j without a number, makeopts_jobs returns 999.
+	local myjobs=-j${my_makeopts/999/1}
+
+	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 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
+
+	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
+}