Version bumped.

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

3 files changed, 150 insertions, 6 deletions

diff --git a/app-i18n/ibus-mozc/ChangeLog b/app-i18n/ibus-mozc/ChangeLog
index 3184413b0f06..57e7cd8224e6 100644
--- a/app-i18n/ibus-mozc/ChangeLog
+++ b/app-i18n/ibus-mozc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.14 2011/04/21 12:39:21 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-mozc/ChangeLog,v 1.15 2011/05/17 13:36:40 matsuu Exp $
+
+*ibus-mozc-1.1.690.102 (17 May 2011)
+
+  17 May 2011; MATSUU Takuto <matsuu@gentoo.org> +ibus-mozc-1.1.690.102.ebuild:
+  Version bumped. Add app-i18n/zinnia to dependency.
 
   21 Apr 2011; Thomas Kahle <tomka@gentoo.org> ibus-mozc-1.0.558.102.ebuild:
   x86 stable per bug 360951
diff --git a/app-i18n/ibus-mozc/Manifest b/app-i18n/ibus-mozc/Manifest
index c9f6795c4e60..635b66b74dcf 100644
--- a/app-i18n/ibus-mozc/Manifest
+++ b/app-i18n/ibus-mozc/Manifest
@@ -1,20 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX 50ibus-mozc-gentoo.el 121 RMD160 7af57ab410ccd126594046c74e0d2daaca78ea94 SHA1 3108d0cbd0e33ac967be14a3577b86ddbf03d86d SHA256 833039439dea484a430e832df869b3af0b8d42bae63c4d6999e72c97d55d897b
 AUX ibus-mozc-0.11.365.102-gentoo.patch 768 RMD160 bc8160076eba1aae383f672a2c19845e89cf6ea1 SHA1 ba64ca1d4ee100342163f76704c0350ee9d426ee SHA256 eb18673f2d544e652868cbe00e7976715d31d3e9815f51b9edba8d3d0cab70e6
 DIST mozc-0.13.523.102.tar.bz2 39269824 RMD160 52e1d4fd62fab26af95e41658159f5586f855af7 SHA1 04296ee6f9cb4fbe3697c8de4a072a6d2a1923b6 SHA256 e83a6fa874ac27cd5f15c014f22a5c03c749e9009a078fb812d4e127892abbe2
 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
 EBUILD ibus-mozc-0.13.523.102.ebuild 3336 RMD160 cf337c2eea38bbf67048be74064bdc352f37d7b8 SHA1 3c372766fd6f8379124478277c07f5083f7f4023 SHA256 6ffec4be7eb712fb6a0952467df0c333f79bca1f45e7993f317105b6fad202f5
 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
-MISC ChangeLog 2608 RMD160 1b7d22286f007d3afa354b2d9fa2eea0049a2566 SHA1 72243c6ab79d40f3ffcc01c455d772141c414953 SHA256 f77ef07b880b25d2680bbe7be120d9088af92e0fa233f34c7743344a88503e45
+EBUILD ibus-mozc-1.1.690.102.ebuild 3498 RMD160 7b78b79f6becf862ced9ef150deb13194f766107 SHA1 cad7aedb8160a2a55d3f0a046bbbbd78e4ec4695 SHA256 16ba0c4e3d323ae8ad8140b50c58274f4b2247b5b6a02e30ff27f845328a0aa3
+MISC ChangeLog 2781 RMD160 b7ec5f1451432d379906396ac1d5f926e07f521c SHA1 10f95cc09ccfc4078290bce3b386ba6a3c97168b SHA256 e39a29915bbe57b71b7d38df114fe220bd539fbcf7bea7d9b62dcf498a4fa9bc
 MISC metadata.xml 540 RMD160 92098609fd6a4d8ec147c6bf675bb3626d5e1962 SHA1 6658b008a7f6a3143836901e576b556eecaf1fd9 SHA256 dbc77031a0e9b603d1a15f79367f86375719d4cace47f8c2cb35ef2be29cfe25
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2wJmYACgkQodBTJSDyo67FQAD+IfGrupKQ6ZO3kAh3r+yhwxHQ
-41PNHgUUD6AJs6M0JskA/RFkrNIxX6PI/jnUs7PV81zYcfOyegmhAGb57+W2iHCU
-=uCF1
+iQIcBAEBAgAGBQJN0nnyAAoJECaGw+YFKA1pmq0P/0Mhu+x3Zv5MRb53HwMvZ9J3
+NBm0ABSIdTiywnc4kQq7j7TWd8IqPu1bOjvqDqb733NWMFxUs4ue4NC4bG3VS3zS
+/a8lqNMBMEWlrGaFTEB8I6RVGx/EkCBs01ggnM4M4xs41hN9gb8UFjiDtxe2Cb24
+R+lULg/FSMI4YWD4s8Sz11x3IfmMhONhqHtYI+OfvSdtRUh0jksc2wJyPiVuAuVY
+URRSuFG++3oCk8Qnfs40GqoTqoT36XDIupxJ0m/05/ywWA0XdnRClH1J0lB/260s
+PTDNNaLTSPz4K2ms/dN+K9NKzVkO+doiOJZ/QW1IPwxcW8BeV1uof7Db20OZgJ4g
+A6rfMjJXvlCPxQD5BX3iH71KVLI/zPbCNfCNvUzzBNHa4Sn3dKMZ/j05Qwih15ep
++8a0GAN2IH9ssPCAd45hwl9bdhtHgMKIs2D7AMgG14MXKQyEPSgkT89U8H2t81PH
+9PpfFa8azU6FIJlOgzKa5U/+Y+r2YqQS7NqIcI8eCH8I3yjH1gSzDihbAD1GY3Qo
+IKIrLD1BSnDmnZ6jnjENGi3zJ/gkFioi+ih8kjOssc0h3xseOm864M+oNXEJ8Pj1
+A9VNDpwf3rnz6geguRgBNw0jn5BzUN1rbmQDNu+fXWZjDrH+OSB3F8SUKmu+ZrU9
+g6Zk2JM+teTn/LPyTe59
+=dDEy
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus-mozc/ibus-mozc-1.1.690.102.ebuild b/app-i18n/ibus-mozc/ibus-mozc-1.1.690.102.ebuild
new file mode 100644
index 000000000000..487573c11774
--- /dev/null
+++ b/app-i18n/ibus-mozc/ibus-mozc-1.1.690.102.ebuild
@@ -0,0 +1,127 @@
+# 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.690.102.ebuild,v 1.1 2011/05/17 13:36:40 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="app-i18n/zinnia
+	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 )"
+#	zinnia? ( app-i18n/zinnia )
+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}-0.11.365.102-gentoo.patch"
+}
+
+src_configure() {
+	#if ! use zinnia ; then
+	#	export GYP_DEFINES="use_libzinnia=0"
+	#fi
+	"$(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"
+	# use qt4 && use zinnia && 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
+}