Update initscript

Package-Manager: portage-2.1_pre3-r1

3 files changed, 43 insertions, 6 deletions

diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index ade8f8cb2ac9..05184796500f 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -6,7 +6,7 @@ MD5 017a163921b3054633e2abc22cf8edcd dbus-0.23-r3.ebuild 3241
 MD5 ff2ce39588a6c7a82402d4e0d292835d dbus-0.23.4-r1.ebuild 3582
 MD5 eaaed2cd9d845468bff2f444d0a4f4c7 dbus-0.50-r1.ebuild 3900
 MD5 7fd4127291f0f0e5365d66e5a9a10122 dbus-0.50-r2.ebuild 4335
-MD5 84153b273a64bd8a72ae908462846661 dbus-0.60-r2.ebuild 4118
+MD5 c94c288ac2bf80c697539922b7b00b16 dbus-0.60-r2.ebuild 4128
 MD5 d14e59575f04e55d21a04907b6fd9f3c files/30-dbus 243
 MD5 2a21cd128b106bc728a0566c13e727e3 files/dbus 938
 MD5 768e500cfda89809161576ea2080a7aa files/dbus-0.23-dbus_session_connect.patch 1185
@@ -21,6 +21,7 @@ MD5 3bdcd526c4ee1d21bad01c30aae6b650 files/dbus-0.60-qt-pc.patch 1563
 MD5 f1d9631e7b682986d77feccb080e46a4 files/dbus-0.60-qt.patch 453
 MD5 4fd89997ba6101161202f761bb666167 files/dbus-dnotify_configure-01.diff 2197
 MD5 6f02f0df54613a9e34a452b1c8d92ecb files/dbus-dnotify_watchdirs-01.diff 1252
+MD5 92bb65043e174624ffca3c3ff109a87e files/dbus.init-0.60 944
 MD5 b683f990bc7207366b4dac487a8d1416 files/digest-dbus-0.23-r3 62
 MD5 8a28a6744a8a85a487c87eec1e1725b6 files/digest-dbus-0.23.4-r1 64
 MD5 ac15aecd52ac9b55048015edba699800 files/digest-dbus-0.50-r1 62
@@ -30,7 +31,7 @@ MD5 41b60b877b1e6ea53476ff69c5ed77d3 metadata.xml 282
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDuOkABtvusYtCZMsRAjz/AJ9/mLXt5zJsRqnyoI8kEOg/iW1cnACggN5c
-JDMP9A8rwYNmoK519/VFIoI=
-=wBc2
+iD8DBQFDuOnrBtvusYtCZMsRAhdOAJ9g1jswzGgnsFD5ioa1mikALPe2DwCfRUne
+zH+B2XhaGCDNgcYssm9h4qM=
+=R4Bs
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-0.60-r2.ebuild b/sys-apps/dbus/dbus-0.60-r2.ebuild
index c783c91ad38c..9f60e71eaf21 100644
--- a/sys-apps/dbus/dbus-0.60-r2.ebuild
+++ b/sys-apps/dbus/dbus-0.60-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.60-r2.ebuild,v 1.2 2006/01/02 08:36:26 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.60-r2.ebuild,v 1.3 2006/01/02 08:52:00 cardoe Exp $
 
 inherit eutils mono python multilib debug qt3 autotools
 
@@ -104,7 +104,7 @@ src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 
 	# initscript
-	doinitd "${FILESDIR}"/dbus
+	doinitd "${FILESDIR}"/dbus.init-0.60
 
 	# dbus X session script (#77504)
 	# FIXME : turns out to only work for GDM, better solution needed
diff --git a/sys-apps/dbus/files/dbus.init-0.60 b/sys-apps/dbus/files/dbus.init-0.60
new file mode 100644
index 000000000000..91fe37b6081a
--- /dev/null
+++ b/sys-apps/dbus/files/dbus.init-0.60
@@ -0,0 +1,36 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.init-0.60,v 1.1 2006/01/02 08:52:00 cardoe Exp $
+
+start() {
+
+	ebegin "Starting D-BUS system messagebus"
+
+	start-stop-daemon --start --pidfile /var/run/dbus.pid --exec /usr/bin/dbus-daemon -- --system
+
+	eend $?
+
+}
+
+stop() {
+
+	local retval
+
+	ebegin "Stopping D-BUS system messagebus"
+
+	start-stop-daemon --stop --pidfile /var/run/dbus.pid
+	retval=$?
+
+	eend ${retval}
+
+	# This should vanish when baselayout-1.12.0 is marked stable.
+	[[ -f /var/run/dbus.pid ]] && rm -f /var/run/dbus.pid
+
+	# Changes to the system dbus socket run file force us to take care of both
+	[[ -S /var/lib/dbus/system_bus_socket ]] && rm -f /var/lib/dbus/system_bus_socket
+	[[ -S /var/run/dbus/system_bus_socket ]] && rm -f /var/run/dbus/system_bus_socket
+
+	return ${retval}
+
+}