Rework elog messages (#546612)

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 19 insertions, 33 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 244e197b4c23..3de5972ecb05 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.475 2015/04/08 04:54:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.476 2015/04/18 07:57:20 pacho Exp $
+
+  18 Apr 2015; Pacho Ramos <pacho@gentoo.org> dbus-1.8.16.ebuild:
+  Rework elog messages (#546612)
 
   08 Apr 2015; Mike Frysinger <vapier@gentoo.org> dbus-1.8.16.ebuild:
   Mark arm64/m68k/s390/sh stable.
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 19b27f2a33b1..2e2240aba43e 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -4,23 +4,13 @@ Hash: SHA256
 AUX 80-dbus 341 SHA256 76ce25ce8769cdfcb0d7b7e52e5a7e6474448fc34e8ad9393afac1eca1e07fd2 SHA512 fa019d903e5412d0c47dade4299995e9baa8b86d74ebc0b42967137762bc476628af57f8a6c354660fce731c33a49a66027cd8b5a25be4d898b7d1662c600e89 WHIRLPOOL 74e9e79b86fc4802f34737bb47c3a71919f35fb2375119cdcd7fd6dae2de201e006fb4e6a978addd2300f7075180d4b088a69fa60d2ce4d689b6239b4a1307b1
 AUX dbus.initd 1185 SHA256 98e37b8b6ed25004e48c5855d74c9361eea06d3fee13cefcc0ed10ccf452aa01 SHA512 7983e77015b46c204b10948a1fcedaae53a75848919961eb1ef8878bfa11c933256642c0e3f59163e72374ce1bd33b0338c787ce067c0982fcdf8a798b922a15 WHIRLPOOL 62ef5b9191a2bd3410c53ed63015e9968789f448e5959de2ebc2404bc13ce99c333546bf1eb335f826ef7ea143f70a53c2ecffd81b4e35fa51ba2e2bdf68879f
 DIST dbus-1.8.16.tar.gz 1866436 SHA256 7f795268efd343ff0498786acb35097564390d40b1b6158daf1b4f742b522b07 SHA512 79e0fb21912fe5644e1babf96fc2a64595edef6524ef50d54f6beb8cd0f1224b8484a52a7815494b40bd00bf048176002ab35443c0bb6bd04abdc3c60599f1d5 WHIRLPOOL 5e992caf51c0fb24885099b957ce01205a249118c5db27c5161e6d45ae85a889d7f26d32dfa03a207025e87e233f74c6cffd09a5ccc44d4e598d3d535b8d4247
-EBUILD dbus-1.8.16.ebuild 7185 SHA256 8ce70af1ed5d24970678eb1ce166a9fc90d44b97f38c54be7614446ee4ce26cf SHA512 2ba5cf5cb40974024750a4b52a785543260ba572270334b43ccead5530700d8e72fa4f486e7cb98eadfe6655526cf99426703c5a233aa78e81548d20a5063e21 WHIRLPOOL 5642db89f5bf5942aaff2b733ce3c5f508fea5ee59e5b7f040534240705bf4563884176c76e9f6ebbfc33165a1163465d4def58d9effe5ae79dbb760385cca82
-MISC ChangeLog 67345 SHA256 93406fad651138d8c4ed52b284eeef8c9daa5bfb9afd8afc11ab11588cfd0f7a SHA512 1c333a01aec0d652edbbfafc0c482612e0b35a59ae0899d9e85a900307a777908fe6fd597ac5654d09f8463a871a06c0da03039afb618a34f92e29d084fe2923 WHIRLPOOL 377b8a3ee749f462da27aa380dc854456e62a82f2bb0525e5ab28d9c2089ade7ff7d3838af4cfc141a8c0b046729ff39c96621477ee9763dcf7cf2db92dcf280
+EBUILD dbus-1.8.16.ebuild 6853 SHA256 834ea7c2aace81409682b21b7bf6ca1a9c956f5cb8fea38b10b47d02ef252383 SHA512 54d9035e5b59d16e66b79d6480a1065fbff7d14fbfcac34eb950d3a7e0eaea47bf9c2f536c91da2fc4da8e8637449f6d2b4ad6fe42f03e04f13062cf06b008b1 WHIRLPOOL 42e8c4bf1e630c59cbf32f45daa12656ada74f05d35515803583d26debf71defb0689077caf5c7925dc4542bec98a3caed6f0e6d197676f5dc8cee284205e641
+MISC ChangeLog 67444 SHA256 844ac34f4e4fe4c04056abeec2ee0fbeb5d6b1040c44a298d0e4998d3e6672ba SHA512 9333da0ceb6435afaf685aa68e023e5799cd5792b6cd6ac66873c3cfdf45f572fbde79f154635f60a7cb2fac521463106ea074dd11e0f54ec95dbae2d5214ea2 WHIRLPOOL 3e7c49ab32db8cd63ab27e097a4347d17f428f3754d691d44361a6374d63de01741f37c27f11c3b6bc2df9f8950f658af035079dc84c7f71e487e2f993aeb380
 MISC metadata.xml 427 SHA256 d8fc8fedafc547578a85222cb60fb7eff3740c8ce101b22ba75aa3e5028135ce SHA512 2f8f64ded5050e87ce679d944dcf9c9a801ea03ee14471ab0702f10339f3f995701c313bfe10e7ab01f1bc784f04a5e6efbb29ea0b44513b9b3e384370956dc5 WHIRLPOOL 7a2add023434038b287c141213c2caf2adcc7ff5bcfb8025b2db0163bedd436fea64dd0e1a072f00232722738705fdc1f367e758d108373146d6fbea8803d5b2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVJLR3AAoJEPGu1DbS6WIAOy0P/3hqHlCv/zix6YqXGwei1fpl
-s9q7MpU7cV+X1yZHMtDN4hj0NW8wE+DRn+6WfM1PAe37RL3sTZN4h3RZkAKeWhUT
-oo/+MSIef31M0rb3n76vC7M+BJTTyUJmOmdr+53HXbLEXulwqANwUG+8YCFfC4Oe
-g2hx7WD87/inoFilBJJ9SvaG8tBmhMfaIXtWEB3A3lRSrr88USN4FND6t6xj33pQ
-nJktI1nH5RuwM57eVymnprsYSBWVHlG4f1ADRQ3E4/QSY6yJ1rED4ARf1TUGzrvK
-JMfYtFe/2eK1v5XlNNcVlIKcvBSJjdZoPYdhqk33jpJmJ7gdH2A0bAfytlLS+S6O
-Rzhvhiphfw1DiX+bUx4ZcFxVzIug/Ma8/iU+Soa/f6Dib1qcDM1LfCt2bIzukQqC
-duw+e1N5Ny8Z3iOj5Iln23PcTYYdG9HgD20q7E66YEeFdt47rl23ckHxrXXoxhMP
-WvKmF0dMdbUCp2KKyK0wy/vRLwUNJG60uYUhLIzyRNmL/3D0BAlgJd2G6bwwkAm8
-hbWEzd1iTjGUkGIJKIHc6kNcuZBOkNqXNtYP3ZENNWi7Uf9lNKGwsbyUTNkmMtny
-KjiFmZTawmfCO4Tmb2R2j55MQcvnCFlghnIIR5cSlLyw+4louPKDYRp2DpoCwoIw
-AWQfXCZWmlazKl3SlAXw
-=O1hi
+iEYEAREIAAYFAlUyDmEACgkQCaWpQKGI+9SQDgCfRBrjOgV+vUOn4gYb21lle2dv
+Ty4AnRj1h3e2w1ujTcpvqk+tlhYztY3N
+=hOke
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-1.8.16.ebuild b/sys-apps/dbus/dbus-1.8.16.ebuild
index 18a787045b7f..a7fcf5479b9c 100644
--- a/sys-apps/dbus/dbus-1.8.16.ebuild
+++ b/sys-apps/dbus/dbus-1.8.16.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.8.16.ebuild,v 1.11 2015/04/08 04:54:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.8.16.ebuild,v 1.12 2015/04/18 07:57:20 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils linux-info flag-o-matic multilib-minimal python-any-r1 systemd virtualx user
+inherit autotools eutils linux-info flag-o-matic python-any-r1 readme.gentoo systemd virtualx user multilib-minimal
 
 DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
 HOMEPAGE="http://dbus.freedesktop.org/"
@@ -41,6 +41,11 @@ RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-dbus )
 "
 
+DOC_CONTENTS="
+	Some applications require a session bus in addition to the system
+	bus. Please see \`man dbus-launch\` for more information.
+"
+
 # out of sources build dir for make check
 TBD=${WORKDIR}/${P}-tests-build
 
@@ -206,25 +211,13 @@ multilib_src_install_all() {
 	rm -rf "${ED}"/var/run
 
 	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
+	readme.gentoo_create_doc
+
 	prune_libtool_files --all
 }
 
 pkg_postinst() {
-	if [ "$(rc-config list default | grep dbus)" = "" ] ; then
-		elog "To start the D-Bus system-wide messagebus by default"
-		elog "you should add it to the default runlevel :"
-		elog "\`rc-update add dbus default\`"
-		elog
-	fi
-
-	elog "Some applications require a session bus in addition to the system"
-	elog "bus. Please see \`man dbus-launch\` for more information."
-	elog
-
-	if [ "$(rc-status | grep dbus | grep started)" ] ; then
-		elog "You can restart D-Bus \`/etc/init.d/dbus restart\` to run"
-		elog "the new version of the daemon."
-	fi
+	readme.gentoo_print_elog
 
 	# Ensure unique id is generated and put it in /etc wrt #370451 but symlink
 	# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse