From fc44d1f8f1f20484322f88e1e359a99e2770f59d Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 13 Oct 2014 13:43:12 +0200
Subject: [PATCH] dbus: added runit service.

---
 srcpkgs/dbus/files/dbus/run |  4 ++++
 srcpkgs/dbus/template       | 10 +++-------
 2 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100755 srcpkgs/dbus/files/dbus/run

diff --git a/srcpkgs/dbus/files/dbus/run b/srcpkgs/dbus/files/dbus/run
new file mode 100755
index 00000000000..2ed764dd625
--- /dev/null
+++ b/srcpkgs/dbus/files/dbus/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ ! -d /run/dbus ] && install -m755 -g 22 -o 22 -d /run/dbus
+dbus-uuidgen --ensure
+exec dbus-daemon --system --nofork --nopidfile
diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template
index c747eeaf7fa..9713d02d311 100644
--- a/srcpkgs/dbus/template
+++ b/srcpkgs/dbus/template
@@ -2,7 +2,7 @@
 #
 pkgname=dbus
 version=1.8.8
-revision=1
+revision=2
 short_desc="Message bus system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -14,6 +14,7 @@ create_wrksrc=yes
 hostmakedepends="pkg-config intltool gperf xmlto"
 makedepends="expat-devel libX11-devel libcap-devel"
 conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf"
+replaces="runit-void<20141013_2"
 
 # Create dbus:22 system account.
 system_accounts="dbus:22"
@@ -46,7 +47,6 @@ _dbus_bootstrap() {
 	make ${makejobs}
 	make install
 }
-
 _systemd_bootstrap() {
 	# Build a temporary systemd; we are only interested in libsystemd-login.
 	if [ ! -d ${wrksrc}/systemd-bootstrap ]; then
@@ -88,7 +88,6 @@ _systemd_bootstrap() {
 	cp -a ${wrksrc}/systemd-install/usr/lib/pkgconfig/libsystemd* \
 		${_systemddir}/lib/pkgconfig/
 }
-
 pre_configure() {
 	if [ "$build_option_systemd" ]; then
 		if [ ! -f ${wrksrc}/dbus_bootstrap_done ]; then
@@ -101,7 +100,6 @@ pre_configure() {
 		fi
 	fi
 }
-
 do_configure() {
 	cd ${wrksrc}/dbus-${version}
 
@@ -129,7 +127,6 @@ do_build() {
 	cd ${wrksrc}/dbus-${version}
 	make ${makejobs}
 }
-
 do_install() {
 	cd ${wrksrc}/dbus-${version}
 	make DESTDIR=${DESTDIR} install
@@ -140,6 +137,7 @@ do_install() {
 		rm -rf ${_systemddir}/include/systemd
 		rm -f ${_systemddir}/lib/libsystemd-*
 	fi
+	vsv dbus
 }
 
 dbus-devel_package() {
@@ -153,14 +151,12 @@ dbus-devel_package() {
 		vmove usr/share/doc
 	}
 }
-
 dbus-libs_package() {
 	short_desc+=" - shared libraries"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
 	}
 }
-
 dbus-x11_package() {
 	replaces="dbus<1.4.16_2"
 	short_desc+=" - X11 support"