summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaohiro Aota <naota@gentoo.org>2011-10-01 03:00:55 +0000
committerNaohiro Aota <naota@gentoo.org>2011-10-01 03:00:55 +0000
commitb33c038896e50a6f5c97301b9df316b1e4da4f9e (patch)
tree76665c404bc957964cff85b298fff2873a44d7af /app-i18n/ibus
parentFix build failure: "no such file to load -- rspec/core/rake_task". (diff)
downloadgentoo-2-b33c038896e50a6f5c97301b9df316b1e4da4f9e.tar.gz
gentoo-2-b33c038896e50a6f5c97301b9df316b1e4da4f9e.tar.bz2
gentoo-2-b33c038896e50a6f5c97301b9df316b1e4da4f9e.zip
Add tiny typo fix patch, which cause access violation with USE=doc Bug #384507
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)
Diffstat (limited to 'app-i18n/ibus')
-rw-r--r--app-i18n/ibus/ChangeLog7
-rw-r--r--app-i18n/ibus/files/ibus-1.4.0-doc-typo.patch13
-rw-r--r--app-i18n/ibus/ibus-1.4.0.ebuild7
3 files changed, 24 insertions, 3 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/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() {