summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2015-04-18 07:57:20 +0000
committerPacho Ramos <pacho@gentoo.org>2015-04-18 07:57:20 +0000
commitbc6873bad4aca03d4f50b061f0bc932fe1bde7af (patch)
tree0918d30ee678954a07d998120a66a1556c5b77af /sys-apps
parentbump, runtested to installed state (diff)
downloadgentoo-2-bc6873bad4aca03d4f50b061f0bc932fe1bde7af.tar.gz
gentoo-2-bc6873bad4aca03d4f50b061f0bc932fe1bde7af.tar.bz2
gentoo-2-bc6873bad4aca03d4f50b061f0bc932fe1bde7af.zip
Rework elog messages (#546612)
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/dbus/ChangeLog5
-rw-r--r--sys-apps/dbus/dbus-1.8.16.ebuild27
2 files changed, 14 insertions, 18 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/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