Add tiny typo fix patch, which cause access violation with USE=doc Bug #384507

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

4 files changed, 30 insertions, 18 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 27e6086a99bc..0022f01b4cac 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/ibus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.91 2011/09/23 16:10:26 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.92 2011/10/01 03:00:55 naota Exp $
+
+  01 Oct 2011; Naohiro Aota <naota@gentoo.org> ibus-1.4.0.ebuild,
+  +files/ibus-1.4.0-doc-typo.patch:
+  Add tiny typo fix patch, which cause access violation with USE=doc Bug
+  #384507
 
 *ibus-1.4.0 (23 Sep 2011)
 
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 6a6dfad537c5..b85ccd971ebb 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX ibus-1.3.9-remove-unused-build.patch 367 RMD160 ff8c355dc1eb3b70cb1efeac4008cf515bef21ac SHA1 715796b48a66267dd13398c37b9a0ce6bb40b889 SHA256 f162a04558da12bc891786535d46c2fcf0a56428e36299c5c8f74f173ad46d7f
+AUX ibus-1.4.0-doc-typo.patch 603 RMD160 ae52cf4cacb59f75c53ec9142f4c80f922426e91 SHA1 bc0b3b774cf36804080f0298958f901f0a00fb82 SHA256 88f7894361c46008451d4be1b2735e7d5daa1b30504961272a52982acb379733
 DIST ibus-1.2.0.20100111.tar.gz 1291877 RMD160 8fc210a7c876c717acaeafa656ad46dc7a2cbbf3 SHA1 8c603844fff37194e835832a7606d240163abb9c SHA256 41f23f1f8bf2746366e2faa57c8bec985098f5770a52c3d56899d33fc5f38384
 DIST ibus-1.3.9.tar.gz 1380081 RMD160 8cf8712d29369bb1934c0d9d66ce5f15953a60d0 SHA1 3eaa95bd2a86c9fae23fdc80dd70d27f0efb7138 SHA256 b2784a668666efa8ae04e6f1cff5749917cd18add0a39a1d020ecc9f3df5285d
 DIST ibus-1.3.99.20110817.tar.gz 1470606 RMD160 3b56578153ffd27080d6f2a136823ef00e1c00bf SHA1 c2b941b17deba1b2ff43b6e4c68ea1854b2b09ac SHA256 5bb66690da0c675bee340388ef26c6ac9558d8480d2b65be0e280cd024a95b32
@@ -10,23 +11,13 @@ EBUILD ibus-1.2.0.20100111.ebuild 2559 RMD160 efd0b291781b1b82bca04f9f1eac8104ca
 EBUILD ibus-1.3.9-r2.ebuild 3921 RMD160 a0c71f1ca1787f93ee88c3706f973b80f9cd3e82 SHA1 a13b48e3f2a207c4f2e8b404987a38a2e88a29f7 SHA256 8d1f2935f53dca993f79a66fcea81209c86f224412d4a87ef3c6c347f823cc30
 EBUILD ibus-1.3.9.ebuild 3338 RMD160 2dc56af1d32eaf49e033ac27193edfdaea81ca12 SHA1 e95792766471b7ab14d45513dfb2275a7efe9b75 SHA256 474cd7ad087f1f06526c73bc9ba2f94f24cfa4ab1bf1d4f994248b7fccd77e43
 EBUILD ibus-1.3.99.20110817.ebuild 3853 RMD160 6a444a666d171c5113f53baceb4560992b6f94e6 SHA1 e8fd3cf9221e7786688078923bd8288c8ac4521e SHA256 42dc633c932b60b9a47a80b5273f4e1d61b367a6f8a49d463622d67648398f0f
-EBUILD ibus-1.4.0.ebuild 3896 RMD160 414d805ba9cb9218ed670a4ab9378a44be01c33c SHA1 82cd6ab060294cc52618687bf02f6eb9c08225aa SHA256 b9374e07a39d6074ea650b837daa66e674277c0f0e811b96067794b09ddf09ee
-MISC ChangeLog 15115 RMD160 8ccfa9175384949bb60edf910ec208ac815ec900 SHA1 666068b3539d3fe284a8dc5aa8ab4d7016f7072f SHA256 62abca344aee4747123de147e6e708fd3f008a6c29dc9d0f670841fff9eaebe1
+EBUILD ibus-1.4.0.ebuild 3961 RMD160 3c5591988df6aadbd7d6aa0db7056ad45a70b0b1 SHA1 cee57f70c9b19cfbd65ff39f931c2272dcb2822c SHA256 b684dab1462b5539da2d4f43a692d453b0e3ff7fec31324e95c51f4634c38ced
+MISC ChangeLog 15300 RMD160 3fe86d1debfe5fc5251deef299b0afcbdddb25a2 SHA1 af46c9444c2a80d08956b799af732df2beb2ee89 SHA256 5d926ca6d2e191ff45e0f8881c8be4598925c8ba7ff540ce72900bbf2d0b1783
 MISC metadata.xml 798 RMD160 00aebf0dab958b7d9a13d7456d9f19c07d247641 SHA1 9208222da6f4015ba64ce30f59ccf20069507159 SHA256 f8cfd5b99a00d0b8cef1a903818e00a957cebb4612dc482b4cb34ed19d73958d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOfK97AAoJECaGw+YFKA1pcxkQAJi/mGW55awYwc35zecEyk4A
-eIKRo4AR9EUKXXframqiIu5AvqBH34yphCRnZ0PUiRU40zJqfzlYmhkWCeb55h+8
-7LylyTebtlaACyFNQNUh1sI8HlFquU9bvIl8dvcOm086s/SGwdI38MW65wEZpy+o
-8KTC2hunk+4/NSl+oksxROH9Wve5WoRMaTtIuzvsvfX9FFsNVYwvNZqv7hlAHLSt
-e+2XlXbSEML9xLEKnkhDyf1bmb1z6HDhqlTAll/fhGG/cqKOvsTDlrkKHsyeteYO
-WTqCRdeQPP4KbPLcbyccimkR7M4vtI8Ue/R73VvvRRODtwYtDR7uflJZbcI+caX3
-N1BTTN89fiSi0TPndC0LlHjsEVsi9wpLwHycRIPZ7HiEbbJ/4KLc1QpKoQrvlmEN
-oAop5lg6whikuCScwLsg+uTyc1LvHnw8dnX0U4Z2ymbDGtoxDaFLMAyUm3TI9dKV
-877rUVpVJrLsGpNClV/MByY2oZNPfFbnSidtenL9vaNu+5clE0L3jrcsAQsdzNcN
-nSWYJghXjzCVxUjUaqfG1C/ShR28ipvgaYrW/r730uwUoaUn6oUVKWktJ9FzYXxX
-ShChqG/tn+LfoB8q8GMEn5Uhf3MrCoMoPecZbJLlQ71ctI/emxVGMyfU4GUBfOLx
-BibhQ9jP6NSwANw2gZRZ
-=InB5
+iEYEARECAAYFAk6GgnEACgkQGpDnPLSHuMBpKQCeIs4SoTbQpesUbG2gTaLawL/I
+QjwAn2ut4KbiG96tHGR2Ns3Mwe4Lio7H
+=E8b+
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus/files/ibus-1.4.0-doc-typo.patch b/app-i18n/ibus/files/ibus-1.4.0-doc-typo.patch
new file mode 100644
index 000000000000..3e3f66896dab
--- /dev/null
+++ b/app-i18n/ibus/files/ibus-1.4.0-doc-typo.patch
@@ -0,0 +1,13 @@
+diff --git a/docs/reference/ibus/Makefile.am b/docs/reference/ibus/Makefile.am
+index 4fa77a1..75e3815 100644
+--- a/docs/reference/ibus/Makefile.am
++++ b/docs/reference/ibus/Makefile.am
+@@ -117,7 +117,7 @@ trim-build.stamp: scan-build.stamp
+ 	$(AM_V_GEN) \
+ 	    $(SED) -f $(srcdir)/trim.sed -i.bak \
+ 			$(builddir)/$(DOC_MODULE)-sections.txt && \
+-	    $(RM) $(buildir)/$(DOC_MODULE)-sections.txt.bak && \
++	    $(RM) $(builddir)/$(DOC_MODULE)-sections.txt.bak && \
+ 	    touch trim-build.stamp
+ 
+ tmpl-build.stamp: trim-build.stamp  $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-overrides.txt
diff --git a/app-i18n/ibus/ibus-1.4.0.ebuild b/app-i18n/ibus/ibus-1.4.0.ebuild
index 5b94f2a5806e..d5cb91feec15 100644
--- a/app-i18n/ibus/ibus-1.4.0.ebuild
+++ b/app-i18n/ibus/ibus-1.4.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.4.0.ebuild,v 1.1 2011/09/23 16:10:26 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.4.0.ebuild,v 1.2 2011/10/01 03:00:55 naota Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
-inherit confutils eutils gnome2-utils multilib python
+inherit confutils eutils gnome2-utils multilib python autotools
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="http://code.google.com/p/ibus/"
@@ -83,6 +83,9 @@ src_prepare() {
 	ln -s "$(type -P true)" py-compile || die
 	echo "ibus/_config.py" >> po/POTFILES.skip || die
 	sed -i -e "s/python/python2/" setup/ibus-setup.in ui/gtk/ibus-ui-gtk.in || die
+
+	epatch "${FILESDIR}"/${P}-doc-typo.patch
+	eautoreconf
 }
 
 src_configure() {