Fix doc building. #442904

Package-Manager: portage-2.2.0_alpha159/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8551514

5 files changed, 122 insertions, 10 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/Manifest b/app-i18n/ibus/Manifest
index 8ebc91408de3..605145248b95 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,12 +1,33 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ibus-1.4.0-machine-id-fallback.patch 750 SHA256 ad1b7538e324a29fd779d7545860e06f22904974bae931fa3cda045ae74af8ed SHA512 7ed7d36ad3bd369d68aa628a364a6b78421489834d70bb76cbb9f8630b69d0bf58b6cf88c409ebbc100201054efd956aa0199d3395f396bf8932e96159f8d221 WHIRLPOOL 4e8495e611f92b0321c11c6343dcabfe5652e4c1e7613b4f315b8a72d88b58c76a1eec31960bbb709fcf639bf5b26890c53d4de44a6e25e1d0e02d050b2d9b0a
 AUX ibus-1.4.1-gir.patch 482 SHA256 802581c7c4293dd34c5fda9143d8b46d6a2e65dda82836643fbb4122f1b5b275 SHA512 bec6b63bc5e518fa83c077684365354df9402e70ed7b9c7757b56cd778e0f64b9fa391a7cc6c3e22a2197e6389c58232c3748616758f98bd477f665912674f0c WHIRLPOOL 9261329877eb1221c63eb6568b0e075bc8e7fe188164e06ccfa3ece8ad0c190ff31a2ee5e528550b9c3ad65416a72ceae90ec53d17470c9d54e8a63ffd1c21d1
+AUX ibus-1.4.1-libxslt-1.1.27.patch 3413 SHA256 47c0135a406e450676a06e7d6de24b99a972134f9217bb174bea7b5c3e6737c9 SHA512 983e01eec74eaba037d3cde1dc3485615984ab953d4edeffcf2f1e6eefa833055780a381b772fb296f6d625cc0d94bec75e430f7d72b7e23a5cfae03b0e661fb WHIRLPOOL 8b4385f35aef20fb3489c6a45ab1f4ac9f71abacea9f47acc13fcafbe130c5d74db1522dcbabb541254ea8505009dbe438cf0c5022989ca3dd05811497ccb9b9
 AUX ibus-1.4.1-no-gconf.patch 1002 SHA256 7f136de585b41d4ae47e1d9cb58a982f8ab70dc142eb579702e60f67f7f093f2 SHA512 168fefe6d5bb5efdf5e6212ca2ac72ab8a58789cf813c0c280dbbc3788cb70a0d344f9d837e8903b04fed57cdfa98e36f7ca40961b405b969554c384e783a6dd WHIRLPOOL 1fb6f44d7cb24aeaf215c0064bf527af19cd4cf8b0fd767f8ed939103ba3ed1904fd70c591f8f533ec4cc1bc6b6313faf5de7387ec703259639306458fff5206
 AUX ibus-gconf-2.m4.patch 1707 SHA256 40c54a970779f4586161f45ebd245c9db71b46ced0d7deda22f47de851c02954 SHA512 5310d371ae53c31551824e01c9fc3ee815b64c5595c778b956f807973be57ba26efa72977b3f3798347ecf25551f7da95f11bb545def761968b96edd81575985 WHIRLPOOL 74337f038a655689911c0fa3d219747b64c440453d62a1c9597f7cd9e8b45f6b3119e81e8daa8f7dd0eff4a74f2e78bef8ed16ea3c41ebad5cb10b0c7b2d9952
 DIST ibus-1.4.1.tar.gz 1479412 SHA256 2f46de279ef3c0a48d3f52061794cfc6544ad8cfe3f04d9d12b251d119a180d6 SHA512 465f5d099ca60612e9d28c77da6a8da2435cc50c3f2f9b93c4c9258d18bb963d85b84ed9d7f9c58e90dc07a4898dc9668a6e2a3484b69074a1777761389ba468 WHIRLPOOL 800e68481202dfd6f4cef0de692f4fa3ceb9e570d34b632f9547605a9ed9688be75a69402ff5df3df71fed12f463502d6e8041862dd065e725e6fa16ec968bcf
 DIST ibus-1.4.2.tar.gz 1489482 SHA256 2418d9960d177c0ce7d3dc5ef8ab75cfc00e30f5e2c730b7d82f4f22666a04d7 SHA512 0070f7d0a4bc6510692851f60e06e487f75fdbe47f50a2371f62dd06b89f20950161b5f1bb91e025dd8dced654d9e90eb910bb5be8e8923869e96e5048f8316d WHIRLPOOL c480ef6fabfe24f2350a0222945860e3b890b32373e159032cc4a9bb1a1df2ad22b6ce11fb9845c5ebacdb7662b9dd26bffb7dd8f6d366551e9ec226e2b14d8d
 DIST ibus-1.4.99.20121006.tar.gz 1889138 SHA256 45ef3b81d92f72454676697dcd967fccefa2400507256c7d29b4586fe64dbd15 SHA512 00864a83af0124594313a3c89a699c14d8982f3f655526004ed87498081545d63ec83fbd41eb23264a32920e0bd8191c6c46bea23748ddb5c37f2eae5004f2a2 WHIRLPOOL 6dc24d24e170e4722baa2044abd42c24073e8ad93c8b63b15491b6492c91ca84eb31ffcd14a8eb43db0c9a2f4498103c353d4c1eff23a6b8d8a7e0b042a5466b
-EBUILD ibus-1.4.1.ebuild 3967 SHA256 eaf0071ab5bdda1f5480f34bb6518ce866939f013764fb36e4ed2c2ff3929bb7 SHA512 d435805de8e42d500aebfa16c67bca7595bfa9792e5e1d2cf1ec530049d447b0f024c1e4000f15ecdaed8066ccc17b2d410cbb082e2d21ff86a1635f4b4e78df WHIRLPOOL 730cb390b69e31f296e40336a3247ae9cb0a83f8c7356aebe51c5e9c7235b35c1944def682e19536921833952794f42911502f7d5ec71161d2e92dba37d238d5
-EBUILD ibus-1.4.2.ebuild 3326 SHA256 e8d6db99718f2d078e2338007d6afb39067468c36322c733826f5a42243e8af7 SHA512 b4a9b48a5e28683f5ecee8e0ea4d69efc87aab7513e36dc052237013de5583e3a81fb5c540c2f9d7278a82b687d3d031830e58a8d832a7b726428ad6db2cd73f WHIRLPOOL d7e73c789fe084b7f761e8901455892115ef5968241cce257a99c10063562986c57321e7f466bc005478f8c9232fc56adbfc17cd11d89b892bdb84429b17d55f
+EBUILD ibus-1.4.1.ebuild 4018 SHA256 1a03a32ccd2614a24a9fb30a4bc225c50a31005e1629b8487e02a7abd7a6008d SHA512 f12763429aa765b953e73a846190d0fb53fcdb2e144da2bc94142ed9bc00fb3c1d259b090b7dfb87d1732a6696874b02281e5438ebbb8a66bf196da3520b5356 WHIRLPOOL b78dc364143ecdb5d5027f69547290c33f0a7d9cee6facb830276abd0826a2c3cf069909c3d3d69b4f011d12c9cf27ddf6f8a85acca56beb0d5685f15e468f7d
+EBUILD ibus-1.4.2.ebuild 3377 SHA256 3b70f28429caf6b478c72a30238ffea190a874eee266994819c1b2e276f14c57 SHA512 7cbc8a3040c1050926614643295a096340ca13f115cc012bbcccd666132f43039b597bd0070fe054c5813e4342a4dbdac2d9aa3ade759c8e5441e15f14110350 WHIRLPOOL da5388f3c4ea2c629ffe26c88f16f0032a1cbb697a09ef9b49c0f5c776375e32445fc6b5b6dd787bda91c2ba292af2d77adf9d5eddb59b8d94eee6d7bd9de08d
 EBUILD ibus-1.4.99.20121006.ebuild 4420 SHA256 180bb06a9bb23e7b3686a987f41f768a040c04ebe316e2d674fb5055b6d3cc6c SHA512 e45a6574b3bd32e00c0fb595472351092d027119ae524b78eeac4ffe9ea0ff70012df73253ef4566501d30d1089f34b53e7fa7e01ad73ffc800db3ed53932114 WHIRLPOOL 97e71f1ee15f8f222bb03243bd8635f2a3e5825c4136d6426f42d7f0f421119baeb2977fd9c01adb453e1c5b5cfb94994402fb99f6a167d79d00d767dd5bef19
-MISC ChangeLog 18837 SHA256 666c74699c800fb92f1b3b5ba8cc44e79ae2924f503167074588b05785a3ba4f SHA512 c0e595524a0aaeaeb9c5ee0ee89daf0cbebd66e33cebfccd8ee282e1558773d1125c45b5d16563465c6822e7a48a57c253209e5add2b1a4303b7a3ade305ec5b WHIRLPOOL 4c177e5d0bf59deaa0e1b2fe9f7eefd8cdb2fdeb56c40061fdfc500db6d46ef89d7b55d68a0d536b2c5fc7bf5708c7e9bd8c75e39fe2fe4870595521e8481201
+MISC ChangeLog 18995 SHA256 17e2c0b5a79e4175c65b1fed3f4b93ecd4b5262d957d50cfc1f8ac33d5178018 SHA512 5a766f76116559e46cc44ee75c6807a0fe20fd23b650403bd9bb08875df53f53cf5b5eef231354376e7f5c3f298c00fbdcfcfee11d8774f5992dccff199117bb WHIRLPOOL b6ea4ed1b36c99a0fff01c2db26648cb7c067fd7dcea0a4a11d78b80f08ee400900bab4868db086148075f8b471448705d1a660731cae7e664c03f0cb7a7e94a
 MISC metadata.xml 874 SHA256 b4601d52556db214f080e217b8ba86b0a9f9eda360fbb334d2a32f7399f432d3 SHA512 1c4ff452971777a3c64ba53b4c013aa92b8962f1e62f3ead43468da88fa8bc5e330226cfd2c5cc6e9fa0ab94b756dfff43bb0086cceea8a622a22c5dfec8cf6d WHIRLPOOL f1891ef7eb11b751d8550bc7f26d1233b1c0e589f27dc838f94242174b11501f0296c165bbdba5e005064837a079fd433aefcaab9ffe4713acdd012821425e07
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRBk9cAAoJEDYO1FT4VRUUfaYP/i21PxWL0+XUe5sUpiPXQccQ
+Iln7pdsmGk0VDljnPQtmCVD1F+LbOxdwTzStyREoH2+3l+JkLbApB1gSto+e0F8R
+k+3sYKpvy0wRDTm8LazDIanMnfmXkViRbQElYYVwIK65CEueScyLOXCOzXFbHpTm
+n9mlaS637p6nyjyRGXzHzCX3fvdZi7a/JK2/Gn1k/CeegEIXbfDw14OVOAbrqSRe
+GvknvJrEVecINHGcDx2l3WTXsPncs+9gNHLRW0NyHZmOZUwGrwuIU22Zfi8LjvXP
+wt6vU2zR1/x1zJXfU9w94NrQVFmsTuEu66tZh4aPkHse3Tau2DLrXdsclc/+jACB
+W+qkEKEvS/UcPaHTG/Z3WPZu1Ddw59gv3rNr2whQYsMoywbIoTLMTv97Mt5xexib
+LA9TDmaijqpBq0mwCP6xcP61kWYoZjJ02O4zlEVQWvMmpVppk7yZwnuDzIklnIfo
+TNWPlY5pphDReNs+XmQhtpXmHrmbr/WTJehnMpnZkdILsBeaJDDNNGfrZQB+cSsw
+c03fPvJ5SJ8urjriG9pnErcNOYQ9N25JNlyjLzpDuSYT2e6pko5pXAYBksrvhYfF
+Fxs56yHmChJzgfVrBketVBgU7LeZTSPLCnNZ+0vHDnxaFzDBGW7ox74tm2oBsq+c
+L+YRP+vHzAvGSUzxFpNh
+=10kT
+-----END PGP SIGNATURE-----
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
 }