From 8d663c15c018e6e0084a37a211fd720c6bfcdd45 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 13 Oct 2014 17:53:16 +0200
Subject: [PATCH] lightdm: added runit service.

---
 srcpkgs/lightdm/files/lightdm/run |  6 ++++++
 srcpkgs/lightdm/template          | 13 +++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100755 srcpkgs/lightdm/files/lightdm/run

diff --git a/srcpkgs/lightdm/files/lightdm/run b/srcpkgs/lightdm/files/lightdm/run
new file mode 100755
index 0000000000..67da73372f
--- /dev/null
+++ b/srcpkgs/lightdm/files/lightdm/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+sv check dbus >/dev/null || exit 1
+[ ! -d /run/lightdm ] && mkdir -p /run/lightdm
+chmod 0711 /run/lightdm
+chown lightdm:lightdm /run/lightdm
+exec lightdm
diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template
index d95fa627c9..416a4c8b58 100644
--- a/srcpkgs/lightdm/template
+++ b/srcpkgs/lightdm/template
@@ -1,7 +1,7 @@
 # Template file for 'lightdm'
 pkgname=lightdm
 version=1.10.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-greeter-session=lightdm-gtk-greeter
  --with-greeter-user=lightdm --disable-static --disable-tests"
@@ -24,9 +24,9 @@ conf_files="
 	/etc/pam.d/lightdm
 	/etc/pam.d/lightdm-greeter
 	/etc/pam.d/lightdm-autologin"
+replaces="runit-void<20141013_2"
 system_accounts="lightdm"
 lightdm_homedir="/var/lib/lightdm"
-systemd_services="lightdm.service off"
 make_dirs="
  /var/lib/lightdm 0755 lightdm lightdm
  /var/lib/lightdm-data 0755 lightdm lightdm"
@@ -37,8 +37,11 @@ build_options_default="upower"
 post_install() {
 	# Remove provided init file and use our own.
 	rm -rf ${DESTDIR}/etc/init
-	vinstall ${FILESDIR}/lightdm.service 644 usr/lib/systemd/system
-	vinstall ${FILESDIR}/lightdm.tmpfiles 644 usr/lib/tmpfiles.d lightdm.conf
+	if [ "$build_option_systemd" ]; then
+		vinstall ${FILESDIR}/lightdm.service 644 usr/lib/systemd/system
+		vinstall ${FILESDIR}/lightdm.tmpfiles 644 usr/lib/tmpfiles.d lightdm.conf
+	fi
+	vsv lightdm
 	vinstall ${FILESDIR}/lightdm.rules 644 usr/share/polkit-1/rules.d
 	vinstall ${FILESDIR}/xsession 755 etc/lightdm Xsession
 	# make pam_systemd optional
@@ -55,14 +58,12 @@ liblightdm-gobject_package() {
 		vmove usr/lib/girepository-1.0
 	}
 }
-
 liblightdm-qt_package() {
 	short_desc+=" - QT support library"
 	pkg_install() {
 		vmove "usr/lib/liblightdm-qt*.so.*"
 	}
 }
-
 lightdm-devel_package() {
 	depends="libglib-devel liblightdm-gobject>=${version}_${revision}
 		liblightdm-qt>=${version}_${revision}"