Fix html docs installation, bug 336762. Fix by 'zimous'.

Package-Manager: portage-2.2_rc80/cvs/Linux x86_64

4 files changed, 16 insertions, 8 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 37a7da70a327..2804253d933d 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.259 2010/09/12 21:45:26 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.260 2010/09/13 21:23:52 reavertm Exp $
+
+  13 Sep 2010; Maciej Mrozowski <reavertm@gentoo.org> dbus-1.2.24-r2.ebuild,
+  dbus-1.4.0.ebuild:
+  Fix html docs installation, bug 336762. Fix by 'zimous'.
 
 *dbus-1.4.0 (12 Sep 2010)
 
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 215ce29175f2..80a2a5c549a5 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -9,11 +9,11 @@ DIST dbus-1.2.24.tar.gz 1673774 RMD160 2f51def784056bc16fbec2ddc3be22c022a94fb5
 DIST dbus-1.3.0.tar.gz 1517408 RMD160 ed823727c11a437e9a0d548b9c3d92a8fd4d386b SHA1 ebd23c65ebf5448efc6367da1414de212db38055 SHA256 fe32b49667894cf91b0a97503163be5c4814ecf67259e8feb26d1ba57cb03dae
 DIST dbus-1.4.0.tar.gz 1800347 RMD160 e3d44208f39d7c4a1bf916527dc121d3097a82d0 SHA1 4be3281005a9ef8f521f5547128c29a2632cb1d7 SHA256 c96d2f86d40e158e2bf405925a0a42cce0533a8466098e2f2238aa1614926652
 EBUILD dbus-1.2.24-r1.ebuild 3707 RMD160 811ff2f77ab26cf12cb3aabfbf4ff5caba283bf1 SHA1 66e8910d474d93523c4b43ca490ef62b5dece465 SHA256 b790060d03e5855ff3bdb2551de82859418e0a43be05098238a138715f515a73
-EBUILD dbus-1.2.24-r2.ebuild 4614 RMD160 8d3da837c8b4a16a8d09080fac9fcde3f929dfc6 SHA1 7916cfa2cf3390840a2c0386830aafeef75ad54b SHA256 dc84b24c3eddfa79e94a4eabf22188a19478a164a4c9d5f0cf79a85983fed733
+EBUILD dbus-1.2.24-r2.ebuild 4675 RMD160 3878f1edd150a5faebb5cd11424b6475e40f973b SHA1 aa23bc36f4aadb49a09e40e43586dc98d2373029 SHA256 6219b5c8e9ec336c3f6558945a7e4f789509f8f171c1b085b1de3aac83c1b5ad
 EBUILD dbus-1.2.24.ebuild 3679 RMD160 5d4063a79bddee8c3963d68487862bf3638acf0d SHA1 26f2043c6a5d92a567fc92b8dfcba1e6eeee7d09 SHA256 897662b0d33783ef5876b3db04739964d2425f5d24d6242f8ad9ab1680b421bc
 EBUILD dbus-1.3.0-r1.ebuild 4754 RMD160 5f261acbe477250af12fa0b76afcb77633680788 SHA1 aa13343c6a4042f500ee9d8cbffc5b5b60249dd8 SHA256 a0706084f2b840cf18a83e1ad3a685989991275e9429b846f2e4fbc60b06f7f6
 EBUILD dbus-1.3.0-r2.ebuild 4762 RMD160 00b94733ac9084930bdf149179db2b01d8007f4c SHA1 00bb61039a755b56360fb1a85762ded75d40bf46 SHA256 b144cf5436708831f86b133a2bf5e6f719b248be3925bebc3938e24a930cca58
 EBUILD dbus-1.3.0-r3.ebuild 4966 RMD160 2022524010dbc1eab69c0a0e4b0db811a2a0448f SHA1 8ba99da52a85ca69d0297f5a2017ff634a91d183 SHA256 7b658c681da0ce86b5ba4c844d338d28c286fbfde26e955bd0924f9d652da9de
-EBUILD dbus-1.4.0.ebuild 5028 RMD160 4064f4530f2bfd42721e107e2619f19d364df8a3 SHA1 3b204df59db31b25bbaac24934fe4908131b956d SHA256 9fd45773bf7cd1909ea495e5189268f3e6f427cd10143522e5e5b613eea655f2
-MISC ChangeLog 40259 RMD160 6c3a2d5872bd3c052e158fa174fd889f443838c8 SHA1 d05c87a036859a31b9ef95c4f32df3652d3e1549 SHA256 97477333926dac20599371ed3bb9188b5525a607a0b4a21f219c81133917e345
+EBUILD dbus-1.4.0.ebuild 5095 RMD160 bfc242ca3cd749817114922339b7aaf801bd0816 SHA1 d590fecbc054a7a113c05336e47641a8477ee247 SHA256 b7b46f4d367209f4840daa497d46ba9d124bff7eae003213ad8b1d8ff7557a96
+MISC ChangeLog 40417 RMD160 49eb65328c0c920ced6e60ee507b236fb1feeee7 SHA1 500f28b11be31c98c3e0d73fb03f9f57e7f199e3 SHA256 18129b33bc657d9a35abbec9da6bfbfeda9d9a140162c24ac6a68c91283cb2cf
 MISC metadata.xml 285 RMD160 a557848c4782030e9eeb3dc1f06d98840ad7f73a SHA1 e0ba318a0e1a819cc360ea98cc3477dcf52a1526 SHA256 f0df8a3ebe8d22c87645cf66ed8c50c4e64ded6ad1e279e9912cb5074feb5a82
diff --git a/sys-apps/dbus/dbus-1.2.24-r2.ebuild b/sys-apps/dbus/dbus-1.2.24-r2.ebuild
index f6f3d3ef6c4d..aee9b3900a69 100644
--- a/sys-apps/dbus/dbus-1.2.24-r2.ebuild
+++ b/sys-apps/dbus/dbus-1.2.24-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.2.24-r2.ebuild,v 1.1 2010/09/09 23:09:05 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.2.24-r2.ebuild,v 1.2 2010/09/13 21:23:52 reavertm Exp $
 
 EAPI="2"
 
@@ -142,7 +142,9 @@ src_install() {
 	# FIXME: split dtd's in dbus-dtd ebuild
 	emake DESTDIR="${D}" install || die "make install failed"
 	if use doc; then
-		dohtml doc/*.html doc/api/html/* || die "dohtml failed"
+		dohtml -p api/ doc/api/html/* || die "dohtml api failed"
+		cd "${S}"
+		dohtml doc/*.html || die "dohtml failed"
 	fi
 }
 
diff --git a/sys-apps/dbus/dbus-1.4.0.ebuild b/sys-apps/dbus/dbus-1.4.0.ebuild
index 3c0cd3609170..5b65568754b9 100644
--- a/sys-apps/dbus/dbus-1.4.0.ebuild
+++ b/sys-apps/dbus/dbus-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.4.0.ebuild,v 1.1 2010/09/12 21:45:26 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.4.0.ebuild,v 1.2 2010/09/13 21:23:52 reavertm Exp $
 
 EAPI="2"
 
@@ -161,7 +161,9 @@ src_install() {
 	# FIXME: split dtd's in dbus-dtd ebuild
 	emake DESTDIR="${D}" install || die "make install failed"
 	if use doc; then
-		dohtml doc/api/html/* || die "dohtml failed"
+		dohtml -p api/ doc/api/html/* || die "dohtml api failed"
+		cd "${S}"
+		dohtml doc/*.html || die "dohtml failed"
 	fi
 
 	# Remove .la files