Fix doc building. #442904

(Portage version: 2.2.0_alpha159/cvs/Linux x86_64, signed Manifest commit with key F8551514)

4 files changed, 98 insertions, 7 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 86d523db6835..fe2a1a1b9fdc 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/ibus
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.117 2013/01/06 09:15:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.118 2013/01/28 10:13:35 naota Exp $
+
+  28 Jan 2013; Naohiro Aota <naota@gentoo.org>
+  +files/ibus-1.4.1-libxslt-1.1.27.patch, ibus-1.4.1.ebuild, ibus-1.4.2.ebuild:
+  Fix doc building. #442904
 
   06 Jan 2013; Agostino Sarubbo <ago@gentoo.org> ibus-1.4.99.20121006.ebuild:
   Add ~sparc, wrt bug #449220
diff --git a/app-i18n/ibus/files/ibus-1.4.1-libxslt-1.1.27.patch b/app-i18n/ibus/files/ibus-1.4.1-libxslt-1.1.27.patch
new file mode 100644
index 000000000000..4b135bfd9ad0
--- /dev/null
+++ b/app-i18n/ibus/files/ibus-1.4.1-libxslt-1.1.27.patch
@@ -0,0 +1,85 @@
+Fixes building documents.
+https://bugs.gentoo.org/442904
+
+--- ibus-1.4.2.orig/docs/reference/ibus/ibus-docs.sgml.in
++++ ibus-1.4.2/docs/reference/ibus/ibus-docs.sgml.in
+@@ -74,8 +74,10 @@
+       <xi:include href="xml/ibusenginedesc.xml"/>
+       <xi:include href="xml/ibusfactory.xml"/>
+       <xi:include href="xml/ibusinputcontext.xml"/>
++      <xi:include href="xml/ibuskeys.xml"/>
+       <xi:include href="xml/ibuskeymap.xml"/>
+       <xi:include href="xml/ibuskeysyms.xml"/>
++      <xi:include href="xml/ibusutil.xml"/>
+   </chapter>
+   <chapter>
+       <title>Configuration</title>
+@@ -92,9 +94,6 @@
+       <title>Communication</title>
+       <para>Here lists the service communication functions.</para>
+       <xi:include href="xml/ibusbus.xml"/>
+-      <xi:include href="xml/ibusconnection.xml"/>
+-      <xi:include href="xml/ibusmessage.xml"/>
+-      <xi:include href="xml/ibuspendingcall.xml"/>
+       <xi:include href="xml/ibusproxy.xml"/>
+       <xi:include href="xml/ibusserializable.xml"/>
+       <xi:include href="xml/ibusservice.xml"/>
+@@ -104,11 +103,18 @@
+       <para>Definition and functions for IBus internal use.</para>
+       <xi:include href="xml/ibusdebug.xml"/>
+       <xi:include href="xml/ibuserror.xml"/>
+-      <xi:include href="xml/ibusmainloop.xml"/>
+       <xi:include href="xml/ibusobject.xml"/>
+-      <xi:include href="xml/ibusserver.xml"/>
+       <xi:include href="xml/ibusshare.xml"/>
+       <xi:include href="xml/ibustypes.xml"/>
+   </chapter>
++  <index id="api-index-full">
++    <title>Index</title>
++    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
++  </index>
++  <index id="api-index-deprecated" role="deprecated">
++    <title>Index of deprecated symbols</title>
++    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
++  </index>
++  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+ </book>
+ 
+--- ibus-1.4.2.orig/src/ibusobservedpath.h
++++ ibus-1.4.2/src/ibusobservedpath.h
+@@ -75,6 +75,7 @@ struct _IBusObservedPath {
+     IBusSerializable parent;
+     /* instance members */
+ 
++    /*< public >*/
+     gchar *path;
+     glong mtime;
+     gboolean is_dir;
+--- ibus-1.4.2.orig/src/ibusproperty.h
++++ ibus-1.4.2/src/ibusproperty.h
+@@ -124,15 +124,15 @@ typedef struct _IBusPropListClass IBusPr
+ 
+ /**
+  * IBusProperty:
+- * @key: Unique Identity for the IBusProperty.
+- * @icon: Icon file for the IBusProperty.
+- * @label: Text shown in UI.
+- * @tooltip: Message shown if mouse hovered the  IBusProperty.
+- * @sensitive: Whether the IBusProperty is sensitive to keyboard and mouse event.
+- * @visible: Whether the IBusProperty is visible.
+- * @type: IBusPropType of IBusProperty.
+- * @state: IBusPropState of IBusProperty.
+- * @sub_props: IBusPropList that contains sub IBusProperties. These IBusProperties are usually
++ * key: Unique Identity for the IBusProperty.
++ * icon: Icon file for the IBusProperty.
++ * label: Text shown in UI.
++ * tooltip: Message shown if mouse hovered the  IBusProperty.
++ * sensitive: Whether the IBusProperty is sensitive to keyboard and mouse event.
++ * visible: Whether the IBusProperty is visible.
++ * type: IBusPropType of IBusProperty.
++ * state: IBusPropState of IBusProperty.
++ * sub_props: IBusPropList that contains sub IBusProperties. These IBusProperties are usually
+  * shown as sub menu item.
+  *
+  * UI component for input method engine property.
+
diff --git a/app-i18n/ibus/ibus-1.4.1.ebuild b/app-i18n/ibus/ibus-1.4.1.ebuild
index 54773e410728..233f63c59591 100644
--- a/app-i18n/ibus/ibus-1.4.1.ebuild
+++ b/app-i18n/ibus/ibus-1.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.4.1.ebuild,v 1.12 2012/10/08 01:05:22 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.4.1.ebuild,v 1.13 2013/01/28 10:13:35 naota Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2:2.5"
@@ -87,7 +87,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-gconf-2.m4.patch \
 		"${FILESDIR}"/${PN}-1.4.0-machine-id-fallback.patch \
-		"${FILESDIR}"/${PN}-1.4.1-gir.patch
+		"${FILESDIR}"/${PN}-1.4.1-gir.patch \
+		"${FILESDIR}"/${PN}-1.4.1-libxslt-1.1.27.patch
 
 	eautoreconf
 }
diff --git a/app-i18n/ibus/ibus-1.4.2.ebuild b/app-i18n/ibus/ibus-1.4.2.ebuild
index 87f18721d5b7..7cb5c67c4e6b 100644
--- a/app-i18n/ibus/ibus-1.4.2.ebuild
+++ b/app-i18n/ibus/ibus-1.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.4.2.ebuild,v 1.3 2012/10/08 01:05:22 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.4.2.ebuild,v 1.4 2013/01/28 10:13:35 naota Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2:2.5"
@@ -66,7 +66,8 @@ src_prepare() {
 	echo ibus/_config.py >> po/POTFILES.skip
 
 	epatch \
-		"${FILESDIR}"/${PN}-gconf-2.m4.patch
+		"${FILESDIR}"/${PN}-gconf-2.m4.patch \
+		"${FILESDIR}"/${PN}-1.4.1-libxslt-1.1.27.patch
 
 	eautoreconf
 }