From 66370e532b9d4bde46d665916fba49f97bd93b0d Mon Sep 17 00:00:00 2001
From: Samuli Suominen <ssuominen@gentoo.org>
Date: Tue, 4 Oct 2011 08:06:11 +0000
Subject: [PATCH] Fix install location of system-activation.txt and remove
 useless dohtml wrt #385421 by Chris Mayo

Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64
---
 sys-apps/dbus/ChangeLog          |  6 +++++-
 sys-apps/dbus/Manifest           | 18 +++++++++---------
 sys-apps/dbus/dbus-1.4.16.ebuild |  4 ++--
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index a8144c7f524e..775e708365fb 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.302 2011/09/26 21:04:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.303 2011/10/04 08:06:11 ssuominen Exp $
+
+  04 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> dbus-1.4.16.ebuild:
+  Fix install location of system-activation.txt and remove useless dohtml wrt
+  #385421 by Chris Mayo
 
 *dbus-1.4.16 (26 Sep 2011)
 
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index b70dee551df9..116510cc6b37 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -9,17 +9,17 @@ DIST dbus-1.4.14.tar.gz 1880298 RMD160 fe48465c7505b7f0f96b4d4c1eb80194d21aaded
 DIST dbus-1.4.16.tar.gz 1889465 RMD160 8a63492090acd717e6a58f63026181e78ae089f0 SHA1 d6e6538cfc1ed71992f6786a6da55d815d995b5b SHA256 1d8ee6262f8cc2148f06578eee522c755ba0896206b3464ca9bdc84f411b29c6
 EBUILD dbus-1.4.12.ebuild 5033 RMD160 7fa7355bea5e98fd6119da855c88880093c15f38 SHA1 17e12b2302990f2fe9e6eeebe31b0ef4eddac328 SHA256 bda8a2dc34b8778c99df13f75b5c4def5b5f5cdf7cdbebed1cee1771209cdbec
 EBUILD dbus-1.4.14.ebuild 4926 RMD160 45b681904c243ff40a388df7a3ea172b6f145092 SHA1 2bde5d9c86309d5e1f20e636cef6461194f18843 SHA256 5adc2dc59afd56cc72b3480a14f7f1c6ff44bd5b91b867523b40b25cc1d82f88
-EBUILD dbus-1.4.16.ebuild 4879 RMD160 1ed9dc59b59ec4d896aa94e02585c2c8294c9b27 SHA1 09ace0c93b3196780c1e76d9cabdf012aaa0c911 SHA256 106a43d9a6c6b3e473a793b5f5c3bdfcc72ff5ef525d8cdfea5eb172fb320e35
-MISC ChangeLog 45233 RMD160 811fe100190ab2dd659896621629100e8a2424de SHA1 d35f6ab980a60bfff37319664c0802e58b4a0763 SHA256 a75a8191cbfb1e5bcecbe108672448ba7f2ae64dd844c971929e6d6ce76c2051
+EBUILD dbus-1.4.16.ebuild 4885 RMD160 d7fc5fabaf0e8faf7ab8b0514ece2ee7aa6ecbbd SHA1 e4ba02163d9862c4a09b190b38f448c00415029a SHA256 c0ecc2346cfeef45326a12788fa3bd0bfd45247b9f99f82bdf5d014cb5c9bf48
+MISC ChangeLog 45410 RMD160 c1cdbca70de8d2f959cc8fd44276115e16386f74 SHA1 8956311bc21c50990723c43c1272eef23f88ed72 SHA256 e6a63e44c781dfb0fe851cd304506247eb76478910b0dd56db01919e8f1bed51
 MISC metadata.xml 285 RMD160 a557848c4782030e9eeb3dc1f06d98840ad7f73a SHA1 e0ba318a0e1a819cc360ea98cc3477dcf52a1526 SHA256 f0df8a3ebe8d22c87645cf66ed8c50c4e64ded6ad1e279e9912cb5074feb5a82
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOgOksAAoJEEdUh39IaPFNroEH/jSohat8J7nzK67RuwOEuCD6
-N5T3wF1rTLbD/3Rsd9ii8bhEYCi2PrWCaXF9uUKWRXOSbzpVjeeMWsiQVkf3rRBu
-CM+4EaDU/OZsbHYKMq3oJTMsSDtWfsXiFYmGaKxYN/UZWQCmld7YXW4ijJGZmi3P
-iKpqnaIycDmJOgou6AE+zoBHzr0iKyitp5N1shc6Ly2eeQ84cdtwRhnVt/JXMjiy
-s1lgw2xurktO71nfqKV/m33XmlSsn+Rgr5qcDlzqN21kMDOmrMnaJQLQ/4nnX/fc
-u7JUkTphGDC3aWHwJtAGf1yE3PbTqCIGNPyJKUpoT892ROV7h7oByXRXUsMTci0=
-=l0w+
+iQEcBAEBAgAGBQJOir6XAAoJEEdUh39IaPFNOi8IAINakrPQqUz/Z+hwGovE1+0v
+JoHLH1IT3qhp71+iv0bJGsT2AmWcYxixQH+qVUrLKYOjbbT45XvkH1H8IOCIHi5b
+/h6h+dRIbqlgRYcqRkxnZSCEh/gPQwB2I62CUey+TU8UwXGuz+mRuIksii5764oP
+XctVQzkHxJ0hMNCb6+JCKeP2DQv3XWipyASmGq5t5JVkYGpRvF6DUGfOaKbarY+o
+jld0fBWuT5pPeMlgTGsXyZHKO7ljM2+1hdMeqRsjwGbZVxjaEAt7DUD6XD78Mi6Y
+fDuRM/xSpwCbpmsaxcB01Ks4RFh70hdM1qsIEhAZDJCW2LO+4QL6/KbXwfANj2U=
+=g2Zr
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-1.4.16.ebuild b/sys-apps/dbus/dbus-1.4.16.ebuild
index edc515368985..066b3cc20392 100644
--- a/sys-apps/dbus/dbus-1.4.16.ebuild
+++ b/sys-apps/dbus/dbus-1.4.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.4.16.ebuild,v 1.1 2011/09/26 21:04:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.4.16.ebuild,v 1.2 2011/10/04 08:06:11 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils multilib flag-o-matic python systemd virtualx
@@ -95,6 +95,7 @@ src_configure() {
 		--with-dbus-user=messagebus
 		$(systemd_with_unitdir)
 		--localstatedir=/var
+		--docdir=/usr/share/doc/${PF}
 		--htmldir=/usr/share/doc/${PF}/html"
 
 	mkdir "${BD}"
@@ -163,7 +164,6 @@ src_install() {
 	keepdir /etc/dbus-1/session.d/
 
 	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO || die
-	dohtml doc/*.html || die
 
 	cd "${BD}"
 	emake DESTDIR="${D}" install || die
-- 
2.26.2