From df599586c6153cf44bf15a0d8f511c19e9128d97 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 23 Oct 2014 17:44:53 +0200
Subject: [PATCH] ConsoleKit: switch to the ConsoleKit2 fork (0.9.1).

---
 srcpkgs/ConsoleKit/files/90-consolekit-3      | 32 -------------------
 .../ConsoleKit/files/pam-foreground-compat.ck | 16 ----------
 srcpkgs/ConsoleKit/template                   | 19 ++++++-----
 3 files changed, 9 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/ConsoleKit/files/90-consolekit-3
 delete mode 100755 srcpkgs/ConsoleKit/files/pam-foreground-compat.ck

diff --git a/srcpkgs/ConsoleKit/files/90-consolekit-3 b/srcpkgs/ConsoleKit/files/90-consolekit-3
deleted file mode 100644
index 358fc24f1a..0000000000
--- a/srcpkgs/ConsoleKit/files/90-consolekit-3
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- sh -*-
-# Xsession.d script for ck-launch-session.
-#
-#
-# This file is sourced by Xsession(5), not executed.
-
-CK_LAUNCH_SESSION=/usr/bin/ck-launch-session
-
-is_on_console() {
-	session=$(dbus-send --system --dest=org.freedesktop.ConsoleKit \
-		--type=method_call --print-reply --reply-timeout=2000 \
-		/org/freedesktop/ConsoleKit/Manager \
-		org.freedesktop.ConsoleKit.Manager.GetCurrentSession \
-		| grep path | awk '{print $3}' | sed s/\"//g)
-	x11_display=$(dbus-send --system --dest=org.freedesktop.ConsoleKit \
-		--type=method_call --print-reply --reply-timeout=2000 \
-		$session org.freedesktop.ConsoleKit.Session.GetX11Display \
-		| grep string | awk '{print $2}' | sed s/\"//g)
-
-	if [ -z "$x11_display" ] ; then
-		return 0
-	else
-		return 1
-	fi
-}
-
-# gdm already creates a CK session for us, so do not run the expensive D-Bus
-# calls if we have $GDMSESSION
-if [ -z "$GDMSESSION" ] && [ -x "$CK_LAUNCH_SESSION" ] && \
- ( [ -z "$XDG_SESSION_COOKIE" ] || is_on_console ) ; then
-    command="$CK_LAUNCH_SESSION $command"
-fi
diff --git a/srcpkgs/ConsoleKit/files/pam-foreground-compat.ck b/srcpkgs/ConsoleKit/files/pam-foreground-compat.ck
deleted file mode 100755
index 7f6b122d5f..0000000000
--- a/srcpkgs/ConsoleKit/files/pam-foreground-compat.ck
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-TAGDIR=/var/run/console
-
-[ -n "$CK_SESSION_USER_UID" ] || exit 1
-
-TAGFILE="$TAGDIR/`getent passwd $CK_SESSION_USER_UID | cut -f 1 -d:`"
-
-if [ "$1" = "session_added" ]; then
-    mkdir -p "$TAGDIR"
-    echo "$CK_SESSION_ID" >> "$TAGFILE"
-fi
-
-if [ "$1" = "session_removed" ] && [ -e "$TAGFILE" ]; then
-    sed -i "\%^$CK_SESSION_ID\$%d" "$TAGFILE"
-    [ -s "$TAGFILE" ] || rm -f "$TAGFILE"
-fi
diff --git a/srcpkgs/ConsoleKit/template b/srcpkgs/ConsoleKit/template
index ee434ae74e..4c8c2f12b0 100644
--- a/srcpkgs/ConsoleKit/template
+++ b/srcpkgs/ConsoleKit/template
@@ -1,32 +1,31 @@
 # Template file for 'gnome-calculator'
 pkgname=ConsoleKit
-version=0.4.6
-revision=6
+version=0.9.1
+revision=1
+wrksrc="${pkgname}2-${version}"
 build_style=gnu-configure
 configure_args="--enable-udev-acl --with-pam-module-dir=/usr/lib/security --enable-pam-module"
-hostmakedepends="automake libtool pkg-config glib-devel"
+hostmakedepends="automake libtool pkg-config gettext-devel glib-devel"
 makedepends="acl-devel libudev-devel polkit-devel dbus-glib-devel glib-devel libX11-devel pam-devel"
-depends="dbus"
+depends="dbus pm-utils"
 short_desc="A framework for defining and tracking users, login sessions, and seats"
 maintainer="Enno Boland <eb@s01.de>"
 homepage="http://www.freedesktop.org/wiki/Software/ConsoleKit"
 license="GPL"
-distfiles="http://www.freedesktop.org/software/ConsoleKit/dist/${pkgname}-${version}.tar.xz"
-checksum=b41d17e06f80059589fbeefe96ad07bcc564c49e65516da1caf975146475565c
+distfiles="https://github.com/ConsoleKit2/ConsoleKit2/releases/download/${version}/ConsoleKit2-${version}.tar.bz2"
+checksum=6a735805bca0841e369a58468cc86b02d4e55184b37a4314429dec19019ff388
 
 make_dirs="
  /etc/${pkgname}/run-seat.d 0755 root root
  /etc/${pkgname}/run-session.d 0755 root root
  /usr/lib/${pkgname}/run-session.d 0755 root root
- /usr/lib/${pkgname}/run-seat.d 0755 root root
- /var/log/${pkgname} 0755 root root"
+ /usr/lib/${pkgname}/run-seat.d 0755 root root"
 
 pre_configure() {
 	autoreconf -fi
 }
 post_install() {
-	vinstall ${FILESDIR}/90-consolekit-3 755 etc/X11/xinit/xinitrc.d 90-consolekit
-	vinstall ${FILESDIR}/pam-foreground-compat.ck 755 usr/lib/${pkgname}/run-session.d
+	vinstall data/90-consolekit 755 etc/X11/xinit/xinitrc.d
 }
 
 ConsoleKit-devel_package() {