Fixed compile issue with gcc-4.6, bug #368713.

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

4 files changed, 196 insertions, 15 deletions

diff --git a/app-i18n/ibus-mozc/ChangeLog b/app-i18n/ibus-mozc/ChangeLog
index 99716ab18e0e..7a6508678174 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.16 2011/05/24 23:21:02 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-mozc/ChangeLog,v 1.17 2011/06/01 00:01:55 matsuu Exp $
+
+*ibus-mozc-1.1.717.102-r1 (01 Jun 2011)
+
+  01 Jun 2011; MATSUU Takuto <matsuu@gentoo.org>
+  +ibus-mozc-1.1.717.102-r1.ebuild, +files/ibus-mozc-1.1.717.102-gcc46.patch:
+  Fixed compile issue with gcc-4.6, bug #368713.
 
 *ibus-mozc-1.1.717.102 (24 May 2011)
 
diff --git a/app-i18n/ibus-mozc/Manifest b/app-i18n/ibus-mozc/Manifest
index ac2549492a6d..e4d43ea603a5 100644
--- a/app-i18n/ibus-mozc/Manifest
+++ b/app-i18n/ibus-mozc/Manifest
@@ -3,6 +3,7 @@ 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
+AUX ibus-mozc-1.1.717.102-gcc46.patch 1386 RMD160 a7342340515761b3c765fe6925bb9da28d27b178 SHA1 e4a04ea7bf09f8053ce6e3816d155ca50cac7796 SHA256 13e1cefbe0a08053c25b0203ce62d5a8094ab31e446174f3b331aa2c01c14a50
 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
@@ -10,23 +11,24 @@ DIST mozc-1.1.717.102.tar.bz2 54407981 RMD160 5801246a1c71b2000846500f0172de0022
 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
+EBUILD ibus-mozc-1.1.717.102-r1.ebuild 3582 RMD160 b42f0b73686a91b3bae0169fa29189edf7047474 SHA1 9933c45da1b698d7f68b5ab58e41bcd8c2b6e085 SHA256 49f86c9cd04e67feb6bb4f45be8f8424056726b3e2fb3cf8f9daefeeb1243666
 EBUILD ibus-mozc-1.1.717.102.ebuild 3540 RMD160 9ecdf5a67cb501902a71ce0eb4bb15cd0f3ed8de SHA1 208e8dd9aa83ce71b610ecffa6796accacd55032 SHA256 1933025bd268d5d9391628edf7c0cec5ad58c960d7a2f5176ce18e8686b81410
-MISC ChangeLog 2991 RMD160 44ac3b87633bce3f9d4bf63b3d4d7caeb28df85c SHA1 613c744e7e3860d45adc0ef753f0561a6eec2757 SHA256 a91cd202df112612af551dd9cafe4281bb4389f126da51c456c1c89f92c7444e
+MISC ChangeLog 3209 RMD160 906fd956d285e7738a6a1963c544dca5fc000b75 SHA1 ff1fb64a2e69b9d990f5827c1f7eb9f9099c826d SHA256 7bbe4eb096d6d4033ecfd9bfbca2e3f94439966685f70405f4971556e32be690
 MISC metadata.xml 540 RMD160 92098609fd6a4d8ec147c6bf675bb3626d5e1962 SHA1 6658b008a7f6a3143836901e576b556eecaf1fd9 SHA256 dbc77031a0e9b603d1a15f79367f86375719d4cace47f8c2cb35ef2be29cfe25
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJN3D2wAAoJECaGw+YFKA1pY4YQAITX6YjuQhbjt2Kz8gLtREQL
-BS3uaw4/A2BpUwLE7EB1ugj3U8ZGEUbbc6hJRM0H9+rO22RZryYKXN9O6dQY2H0N
-s+Co3u1ik83Wr919CpH7e33+5EROwqkTLJLK9RKzxWrIW6ffhaJ0fPa1qYnlckZ3
-CvsO6oLWxi8aDPqNsoE0nfmq2IXlm4Yz+zHGJPdq7CWmg76+BBIAFAe76PFf4FGi
-jWDFGJWMUOcWlh9DlmQgamL4dD74/OrJIUcshtQTUEmcQ20eLIhxCEKeieA1Ygay
-13BAWBfaGyHTGAYZnMaFKEypc/e5JpyGgW9c3kx3XaPAQiZ0Ywikjp6kUIf3e4Js
-J6H2OaAUU17WI07s6Ztc3Oqyb02B6cHkzfR+MsoAlI+YlWEY62Q5aseMmPVYx9hA
-bQIJxeeH8PxcPDEQgiOiKfPYSPKyuNs9nRiuxLv/sA9pNXrXGfWQi/fFyGUErlfA
-9+fjqqmWJcf33ECtQ3+yOfB0N6fE+zUihsawS7xOsH8Qq7qWUxN/AaupBmZyn5q8
-4mClE9t3KAwBqh6XZNosQa7zKPJuL4yzR/ViLAULWW43pIqUoojBEnPNOtKwPVcR
-0EYvyk+F/QJBMX7qc/DulUhc19GXwOSRnGt1Ui7Rzumvj5prxoefM0pUpKSIX8OG
-xPqa4dmPDnKJ6dKJqdEU
-=pcGY
+iQIcBAEBAgAGBQJN5YF+AAoJECaGw+YFKA1pd+oP/iA2HneM5g3U1nWxY9FmX4gZ
+UL3DiEfC+dKJARwkNhm/nHkFcIbKCtgsW1yrIXCEJXdwH/1xwViP4GuddY5ylmx/
+3M9wG95+cyZDlPZ+xzxVvZSoPpg+jroFoam/AuRijdxkayIs2YWr0GKKtaOFYEqB
+s2+oWby8UUImQj1w/lWZEfl9WdkqJjcpmRXEvCcxBNNHH83mK57dMY8JK9O0sd7z
+Lk/jM+aYvyyk12ygd6Ohb2/hT71zxSyAf36YAPuZRnaOoyR9BpghsTtsqTYeh2zJ
+U3GUrbDAP5bYG5Liai/8SvqgnRkgQGp1rJq4dTTI6ZRqg1hJRCzrLnygP3t1lwEi
+e0vPmAHlZjijBvDpNRBflxda3OqkevBOjzOBxNL1hO8COXKqEk6Vm+EqLJ3mmKLu
+pcpIIP3ejV6g6we37oHZrbH4oZx5iSEhGgeSo78gZ69pWbNcVK8Il7J61M/LXpYa
+RZH4AKRfKBo+SgR+aA19z2UoIR5s7ZEtSN89VyES1NcAeHO7y+uz9WN2+YLvcw9B
+4d6zgYI7v/i+eREziNVrUD7uQkpKEMHtII1y9/Wfk7qTYEOfEH4/ZZ2vOtLLE5IC
+SZVJ1CMsiurY+oawhoiFgrg6Ymx1RlKXClkdNNa+TE5YDeoRbFp8eLbBT4zTBVsc
+tsul1haHfvBng2xpgB9B
+=5Un0
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus-mozc/files/ibus-mozc-1.1.717.102-gcc46.patch b/app-i18n/ibus-mozc/files/ibus-mozc-1.1.717.102-gcc46.patch
new file mode 100644
index 000000000000..098ec3eb9d9e
--- /dev/null
+++ b/app-i18n/ibus-mozc/files/ibus-mozc-1.1.717.102-gcc46.patch
@@ -0,0 +1,38 @@
+diff -Naur mozc-1.1.717.102.orig/base/util.cc mozc-1.1.717.102/base/util.cc
+--- mozc-1.1.717.102.orig/base/util.cc	2011-05-20 17:17:00.000000000 +0900
++++ mozc-1.1.717.102/base/util.cc	2011-05-31 19:14:38.129021596 +0900
+@@ -373,7 +373,6 @@
+     while (*str == ' ' || *str == '\t') {
+       ++str;
+     }
+-    bool inquote = false;
+     if (*str == '"') {
+       start = ++str;
+       end = start;
+@@ -385,7 +384,6 @@
+         }
+         *end++ = *str;
+       }
+-      inquote = true;
+       str = find(str, eos, ',');
+     } else {
+       start = str;
+diff -Naur mozc-1.1.717.102.orig/rewriter/collocation_rewriter.cc mozc-1.1.717.102/rewriter/collocation_rewriter.cc
+--- mozc-1.1.717.102.orig/rewriter/collocation_rewriter.cc	2011-05-20 17:17:03.000000000 +0900
++++ mozc-1.1.717.102/rewriter/collocation_rewriter.cc	2011-06-01 08:17:44.886890850 +0900
+@@ -575,7 +575,6 @@
+   for (size_t i = segments->history_segments_size();
+        i < segments->segments_size(); ++i) {
+     bool rewrited_next = false;
+-    bool rewrited_prev = false;
+ 
+     if (IsKeyUnknown(segments->segment(i))) {
+       continue;
+@@ -596,7 +595,6 @@
+         RewriteFromPrevSegment(segments->segment(i - 1).candidate(0),
+                                segments->mutable_segment(i))) {
+       changed = true;
+-      rewrited_prev =true;
+       segs_changed[i - 1] = true;
+       segs_changed[i] = true;
+     }
diff --git a/app-i18n/ibus-mozc/ibus-mozc-1.1.717.102-r1.ebuild b/app-i18n/ibus-mozc/ibus-mozc-1.1.717.102-r1.ebuild
new file mode 100644
index 000000000000..3f2d5b6ef49b
--- /dev/null
+++ b/app-i18n/ibus-mozc/ibus-mozc-1.1.717.102-r1.ebuild
@@ -0,0 +1,135 @@
+# 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.717.102-r1.ebuild,v 1.1 2011/06/01 00:01:55 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}-0.11.365.102-gentoo.patch" \
+		"${FILESDIR}/${P}-gcc46.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
+}