Version bumped.

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

4 files changed, 172 insertions, 16 deletions

diff --git a/app-i18n/ibus-mozc/ChangeLog b/app-i18n/ibus-mozc/ChangeLog
index a01dd494147c..261b3047149c 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-mozc/ChangeLog,v 1.18 2011/07/20 14:52:13 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-mozc/ChangeLog,v 1.19 2011/08/18 15:18:44 matsuu Exp $
+
+*ibus-mozc-1.2.809.102 (18 Aug 2011)
+
+  18 Aug 2011; MATSUU Takuto <matsuu@gentoo.org> +ibus-mozc-1.2.809.102.ebuild,
+  +files/ibus-mozc-1.2.809.102-gentoo.patch:
+  Version bumped.
 
 *ibus-mozc-1.1.773.102 (20 Jul 2011)
 *ibus-mozc-1.1.758.102 (20 Jul 2011)
diff --git a/app-i18n/ibus-mozc/Manifest b/app-i18n/ibus-mozc/Manifest
index f1cb685f4f67..4fbf3f073301 100644
--- a/app-i18n/ibus-mozc/Manifest
+++ b/app-i18n/ibus-mozc/Manifest
@@ -5,12 +5,14 @@ AUX 50ibus-mozc-gentoo.el 121 RMD160 7af57ab410ccd126594046c74e0d2daaca78ea94 SH
 AUX ibus-mozc-0.11.365.102-gentoo.patch 768 RMD160 bc8160076eba1aae383f672a2c19845e89cf6ea1 SHA1 ba64ca1d4ee100342163f76704c0350ee9d426ee SHA256 eb18673f2d544e652868cbe00e7976715d31d3e9815f51b9edba8d3d0cab70e6
 AUX ibus-mozc-1.1.717.102-gcc46.patch 1386 RMD160 a7342340515761b3c765fe6925bb9da28d27b178 SHA1 e4a04ea7bf09f8053ce6e3816d155ca50cac7796 SHA256 13e1cefbe0a08053c25b0203ce62d5a8094ab31e446174f3b331aa2c01c14a50
 AUX ibus-mozc-1.1.758.102-gentoo.patch 612 RMD160 75ef300d281005b413bb88281c70e93f9d2f72f7 SHA1 faba9dcf33a52774efe072ddd4ea851e55f6a197 SHA256 7e305e0b19b3fe46dc016924518f51428e72d6d30079a9d8d2eb0563fb0f7651
+AUX ibus-mozc-1.2.809.102-gentoo.patch 652 RMD160 68e2da6b75e62a0b1d4a099f3a2f94b3e1f53f84 SHA1 382e9f4288acbb054353ac01272f22ec7e1a0cb0 SHA256 2a06a2f9430a1e1407288d535c41b54b6cef1e9488b92e484f8d4cb86eeb0494
 DIST mozc-1.0.558.102.tar.bz2 41540430 RMD160 46d00bdac42cfa56e4a1eebc79653a7bf5050caa SHA1 24fbb0d39d6d81953114d39e546edd85361cef3a SHA256 52849be12c77c2bebc1038a47366e36f5e86bcc1089c12ae0dc4901be4e2f548
 DIST mozc-1.1.626.102.tar.bz2 41588386 RMD160 41d83013f4d7d68a54712972d5bdfb371f3c36cd SHA1 a755b0c32c31e5c0f69611896871f848ca2a5454 SHA256 081a3a620e49e7b1faf9b62c810310d45c5c5a13cc141c024d6671f2855daca5
 DIST mozc-1.1.690.102.tar.bz2 42686358 RMD160 ba4988fc5a5265825dba5cd3c21d5869b6cc97be SHA1 2305e57b63bb5fc631f3e64eab1f1bfffffd3bf0 SHA256 4d349f326f14247e0243426cec6a6edf14e2e08e940abdd9b1380dfc38bd7041
 DIST mozc-1.1.717.102.tar.bz2 54407981 RMD160 5801246a1c71b2000846500f0172de0022975951 SHA1 30278c796e5a4dd9829170f44a2a21db0b43540e SHA256 08f7f86428352ff9a246027b7d30bfc3e4e960eaf13c97f4eb5f6ca35cc2519e
 DIST mozc-1.1.758.102.tar.bz2 36826879 RMD160 50a7b99a11605502ba689e02a9f7852a76e709c2 SHA1 61a1c023a076849cd60445d8db5dd21f17f90522 SHA256 498bb65c8f7a12c27fc82a23574449634a348bd0e9c57ba50cddcce0c7ab4afb
 DIST mozc-1.1.773.102.tar.bz2 36818453 RMD160 9e8b24bbb551e3f3c252605f584af73dca774291 SHA1 8552b89d428571b034f757161a08995d725fc4aa SHA256 24f9f05111ac40a7f121bc3c460429c54a7308cd65a7536a69c41cfc6c6c7850
+DIST mozc-1.2.809.102.tar.bz2 39597919 RMD160 171796a91790e44ad632abd7ffc0e943891e9600 SHA1 303515507b8643a5e9e9409f053ccdbbfb24f4f6 SHA256 6fae802e7677a3d21226da5093d11f858118c96a10564991c572f7e1c61107f2
 EBUILD ibus-mozc-1.0.558.102.ebuild 3305 RMD160 3b339d0a5913abbd5d8977d6e8898e278ca4a802 SHA1 8d4ff29c040e8c05c18b2caacc07759aef195f79 SHA256 21c441fb10c2af6b3fc69c89c96a5aa7320502fd3840f182177fb488e29792d4
 EBUILD ibus-mozc-1.1.626.102.ebuild 3308 RMD160 bd7a5b15cea43c8992f25e9770d4d482906e2c66 SHA1 29c8a72e13f7c7acf50c26eb9fe74e402c1182f4 SHA256 c5a5954816441852a487d6b1db5a51e67117b8ba0ab9473c8e4b4787e4924fc4
 EBUILD ibus-mozc-1.1.690.102.ebuild 3498 RMD160 7b78b79f6becf862ced9ef150deb13194f766107 SHA1 cad7aedb8160a2a55d3f0a046bbbbd78e4ec4695 SHA256 16ba0c4e3d323ae8ad8140b50c58274f4b2247b5b6a02e30ff27f845328a0aa3
@@ -18,22 +20,23 @@ EBUILD ibus-mozc-1.1.717.102-r1.ebuild 3582 RMD160 b42f0b73686a91b3bae0169fa2918
 EBUILD ibus-mozc-1.1.717.102.ebuild 3540 RMD160 9ecdf5a67cb501902a71ce0eb4bb15cd0f3ed8de SHA1 208e8dd9aa83ce71b610ecffa6796accacd55032 SHA256 1933025bd268d5d9391628edf7c0cec5ad58c960d7a2f5176ce18e8686b81410
 EBUILD ibus-mozc-1.1.758.102.ebuild 3526 RMD160 54bbf05b035574e7f6d29809dcee5ac881a33b7f SHA1 587f9e77ca4cc7f4f453e9bfb02be66e1dba3517 SHA256 63077a6627c707bf2aab205646ae3b53dd3af3f54b6c1773111aff34be7e9b04
 EBUILD ibus-mozc-1.1.773.102.ebuild 3539 RMD160 2c002ee3a96c51010fefbb40b58d03b6f819fe7b SHA1 e8d9ce4438eb2326af260b11c6392c34476fac7e SHA256 830862dfbbff1fd40545e6098b034692ceb70c24d426d9616336c5dd3599f841
-MISC ChangeLog 3459 RMD160 209f3e680c46330df0b3d02d8ddbed5b3453b562 SHA1 2d1d28028a918e1e3fea6f0fe5c759f54f4886ea SHA256 748628eaf7511bf3e93fd637100f849a454ccc8a790aa25f3936e735270952a4
+EBUILD ibus-mozc-1.2.809.102.ebuild 3526 RMD160 421b8ee39da5baec9e7a256c1dc703006ee92c28 SHA1 2dc2268106277ca1092d720460d6a1364dbbaa95 SHA256 e77b88f6478ad45baba778668a2d61954c4fe45b7e9e5681fab8fc1c02fe841a
+MISC ChangeLog 3641 RMD160 b4ec29ae86b8fb894501c8b75569e4ca256a205d SHA1 9d2ddef3b069d61980f96323efa50dcfd57f7198 SHA256 72c1f30376179f820bd53aae8fe2e87cf75fd6c958ae1c75f6f75e718791e66e
 MISC metadata.xml 540 RMD160 92098609fd6a4d8ec147c6bf675bb3626d5e1962 SHA1 6658b008a7f6a3143836901e576b556eecaf1fd9 SHA256 dbc77031a0e9b603d1a15f79367f86375719d4cace47f8c2cb35ef2be29cfe25
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOJu25AAoJECaGw+YFKA1pv3oQAK0R2Euxg9qqH7QZ8VkKreVz
-37EL4rwWt9HiwIXtWmNnGu27NUoqxBThYX7jj0wK/LXu6OjqMjx/cnoHm9IJrDVC
-YuM8H6r60vpSOxNmP5o01sGm+/Mcuu1OlThrsFhsAaC1I/H7l6FgWlJOr1nasC5s
-bICX5/mbr2fHoQjWwVUwkezT9/v5ZUnlFfzAb11yNWG7PQNqOtnHdsY0f4y0gelw
-SYnTqgH2CYQ/oxS9tTOqRs95Bqhp87lgb5OKdnbbQIugGQsP8icNYmmdh5S+U67J
-QqZxpM+soZuPF/unU6XxrCJKIkceEBgIhxLwiglI66iR0mxr7YVokaqz9uxR3KxJ
-xMdPMJO8qLygy2LV7NQhQlsv5ABgNtxJY2DYILaJeZXtSZS6Ex/zkQDclOcewuVF
-e049OPgEiQSptmu4Bmfl2JeO5vm7iHR+LNx/Vl3jj9D3MvZNjk1xf2vKtp1FLZ7X
-DWMh6ay0+gmrV/Mjdy+v0/V7+3iOgx+Iyg6bmaO9L4BW9w76fp0Xl219lsxmBWAs
-I3Soq4vNl7XVwB2QpjdmjdpZ5cx5qC28uCF8BS8BJ6P5BKGJd4WNEjbP6DiKZEh+
-+OAKX6RQqzaqBGqeoFF9R05txe3emTYlvg2+JcI40qGuAQY9s0FxVwZahnGT4clw
-SE0+2GthysvtLBCY7DOw
-=GeeY
+iQIcBAEBAgAGBQJOTS1eAAoJECaGw+YFKA1pbSEP/AmwbPadQmyA7vWHzxGtmmG+
+bfhKqI4s9NQgqfB6SaTuTA196Tv15L8fM9LHcbs9RRNJeQFnCn8xCv7aaXujAiQw
+CZjyZzO02/J5JOdRFWFI8P42eKP6EDgol+Gh4DCX3LvBCY6he749PFpIdhWpgBa0
+ttwp45ZFzNMK526ctb1nMa6JA0ENzHESWrR+EhQzwDVURysQIxnAu5Io77CxK7wc
+3zHUhMbYA5BdXf/+owZ3nseTkHh65gBoVJqZ5W//jyS2+I3zsFz463UQ1cbO7/6N
+bYgvXG3RdgoJTk0v2XnCGv68HSRihmuSWDUIo+pxP5T3edjgdbZPvvvFNeEpL6ZD
+/2rYxfbrxMzUYEUUokWqx1yHBp07JSdfUIiM52GUTYWUHLR36/cKrFUJmTyS/wu7
+rCwOU+baP4wzY2LiKh+4HO82KJZTZ2YoyU+zrwPiMAPIUWrPGPwnL391igMfhoIl
+hCjHPn8iBQ98N1/YVYcw00P3EZ0IsyVFJFV/CsUu7c4O+rBmpgn4308rl/dD8rxQ
+G18JUQRGSp9fxO8pTB9Sk2uovALye7idO36C2EXlfBoGWBWl1XtX0VO14eC1iY2w
+YkobbFKi1DjaZkNyxOTlgmgC9Kdpx14xS2JuilCwkzSQN3hp/NcDXgYfZnhfSxca
+2HV6gJsIfqBI/P9grLtT
+=YDnr
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus-mozc/files/ibus-mozc-1.2.809.102-gentoo.patch b/app-i18n/ibus-mozc/files/ibus-mozc-1.2.809.102-gentoo.patch
new file mode 100644
index 000000000000..3e3ef1392932
--- /dev/null
+++ b/app-i18n/ibus-mozc/files/ibus-mozc-1.2.809.102-gentoo.patch
@@ -0,0 +1,14 @@
+diff -Naur mozc-1.2.809.102.orig/build_mozc.py mozc-1.2.809.102/build_mozc.py
+--- mozc-1.2.809.102.orig/build_mozc.py	2011-08-17 10:02:41.000000000 +0900
++++ mozc-1.2.809.102/build_mozc.py	2011-08-18 01:01:25.109704261 +0900
+@@ -654,9 +654,7 @@
+     if envvar in os.environ:
+       os.environ[envvar] = os.getenv(envvar)
+ 
+-  build_args = ['-j%s' % options.jobs,
+-                'MAKE_JOBS=%s' % options.jobs,
+-                'BUILDTYPE=%s' % options.configuration]
++  build_args = ['BUILDTYPE=%s' % options.configuration]
+   build_args.append('builddir_name=%s' % GetBuildBaseName(options))
+ 
+   RunOrDie([make_command] + build_args + target_names)
diff --git a/app-i18n/ibus-mozc/ibus-mozc-1.2.809.102.ebuild b/app-i18n/ibus-mozc/ibus-mozc-1.2.809.102.ebuild
new file mode 100644
index 000000000000..0dc9b7f1fb6c
--- /dev/null
+++ b/app-i18n/ibus-mozc/ibus-mozc-1.2.809.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.2.809.102.ebuild,v 1.1 2011/08/18 15:18:44 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
+}