Version bump, cleaned up old ebuilds. No major changes to 1.3.3 compared to 1.3.2-r7

Package-Manager: portage-2.1.10.41/cvs/Linux i686

5 files changed, 121 insertions, 216 deletions

diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index 94d7ac56af3b..4651bec45286 100644
--- a/x11-misc/slim/ChangeLog
+++ b/x11-misc/slim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/slim
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.79 2012/02/01 09:24:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.80 2012/02/23 15:17:56 axs Exp $
+
+*slim-1.3.3 (23 Feb 2012)
+
+  23 Feb 2012; Ian Stakenvicius <axs@gentoo.org> -slim-1.3.2-r3.ebuild,
+  +slim-1.3.3.ebuild, +files/slim-1.3.3-config.diff, -files/Xsession:
+  Version bump, cleaned up old ebuilds. No major changes to 1.3.3 compared to
+  1.3.2-r7
 
   01 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> slim-1.3.2-r7.ebuild:
   ppc/ppc64 stable wrt #401135
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index 4e8111e7694b..e7537ec6bdb7 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 14509-fix-keyboard-in-tty-from-which-slim-is-lauched.patch 754 RMD160 079984153eb6ca97dafc94b065aeff6c57cf19ee SHA1 25fc499e10133c5325823453202aefdf828c3c21 SHA256 72995a16600174994864b9af959659d321c1fc6aa093650ed0b95b6760d91a13
 AUX 15287-fix-pam-authentication-with-pam_unix2.patch 3017 RMD160 ae6a20b9eb313bd6b9f93726d5519309a2bafc85 SHA1 e17c582fe0cc1d2a07e51d410db2d61c11aba4c6 SHA256 ced3b92f48ba09cd61287b72737ea58e499a7eedd4f61e25ee1b148d0b6cfbb3
@@ -7,7 +7,6 @@ AUX 252280-fix-default_user-focus_passwd.patch 328 RMD160 ca60567fc2f03403bbd60f
 AUX 261359-fix-SIGTERM-freeze.patch 1284 RMD160 ba75eda8cc539138f68f26de18c76a5e290f4d93 SHA1 dd8b782438bbdb86c44a4e1cb64bd8c3e3afefe6 SHA256 bd3221c9b94cc64ba6f4d786ec57a5d085f247b283cd64117034be15fedc5201
 AUX 261713-restart-xserver-if-killed.patch 3198 RMD160 97b6627b17f74a6fb88a967fee7364bdb3280710 SHA1 15d7bffb0588ac33ece488aa209c2418023d4739 SHA256 c4ff22a4930d6ef12ee6ff30f4782b64785c00d54f687ac620e5cbd5eee283f9
 AUX 346037-stop_setting_host_for_pam_ck_connector_so.patch 328 RMD160 62012df3cccf607d8cba139b0754a7238bfb1dd3 SHA1 04f26bc3ad82dab47c8911f3ac069b756fe5a1a8 SHA256 51bee429be20f2538b19b84c311b136761acdf2b857661af11749e45cc73ad44
-AUX Xsession 4215 RMD160 86ab057ea3f78a9604811a1bff7e5aad88c2f717 SHA1 46dc684b873b190b74df199eae39b38e0f5ffccc SHA256 55671397563aa32d89e66658e6594f17d4ddcddd1ad6aa2d7582ba56ceec7628
 AUX Xsession-r2 4262 RMD160 4346445ae8c0fb6857d098988863e9d9a368e326 SHA1 5798765fb36d260492e5aa58c7e73bb31674018c SHA256 13904325f2c6f905227059c7eb7cf162b233bdb5721ec95ef5e3f35e679a43a3
 AUX Xsession-r3 4045 RMD160 538a23b1f0812fe2243d678276bced4ea03256a3 SHA1 b4deabb6795738cedca66f171e2fc504dc0cc96d SHA256 5eaa3c03278443f27a8477397dd0bcaa5f95e7d0cf99448f028bf0165ce089af
 AUX slim-1.3.2-bsd-install.patch 1315 RMD160 290a7c31b077bce33b120ab55b9bdd3c6262d2be SHA1 a50d2e3e2810af82ab9bef058a72286734afd338 SHA256 bfb5a506b3baec6d24e6f0cfba34f045768bbccccc652af11199f30a7c45d843
@@ -15,21 +14,19 @@ AUX slim-1.3.2-ck.patch 5249 RMD160 f1da27e5c477f2903f637b4852d1b2ca5f61fe57 SHA
 AUX slim-1.3.2-libpng15.patch 247 RMD160 b28d9a376f4c01baa8b1aec0c5e0e76294997255 SHA1 3cd674e548f4e0aadbbd32a67b4efd1ed263afef SHA256 f84e3e4c069ec103a5f4ec2a60698bf9d035346b604dee59b6efc883c7f14042
 AUX slim-1.3.2-r2-config.diff 2572 RMD160 217c3d64b77e0af496670cee82849a0500516d0d SHA1 7dbc1b0df45a49688b52bfc701acc3dc15019394 SHA256 7ea06809e15f40c5113d8c05df2b6ca4eb4ba9ebc1e9fc1747b080337997384d
 AUX slim-1.3.2-r3-config.diff 2736 RMD160 c570cf88acac9ac15bfb1caba025358564b4d13b SHA1 a79319663573c92b224d1d83b11747ca4d5a5a2f SHA256 cb5b95ae0102dc3625ec7b0f82103ababfd3ba97eeec107d9b034838a9ebc328
+AUX slim-1.3.3-config.diff 2752 RMD160 1320354013f0b1215a44eaa9758a80f36f2534dc SHA1 9587b0548c58c4f7fc8d868543c6adf8fb8e76c4 SHA256 f591f4dbf2f719e71fc9a8616dcba3e223f480297d2634f22a631ee99e732166
 AUX slim.logrotate 102 RMD160 ccf614eca8c0b8fc1fbc2dfb8bf71b02485a743b SHA1 d2bc9202862f0d33bb902eba3aa8fefe0797d7a3 SHA256 d0559cf7764147f601f2bab8077fd956b1171adad4872c0d324279f6a978264a
 DIST slim-1.3.2.tar.gz 220592 RMD160 1ca6504c07ea2d420fde86b6db0f4cfbbd6680fc SHA1 e421d5487732c8317f8f591906661e014b036358 SHA256 f1560125005f253b9b88220598fed7a9575ef405716862c6ca3fcc72dbd482b8
-EBUILD slim-1.3.2-r3.ebuild 3845 RMD160 c05d3a83231ff745710f184913797e54fa65d847 SHA1 a215c9cb6e4f01b59bccad3096c2efd9a0d021f2 SHA256 52b09e2d2a8b78c35b82001d5c71eb177494e15652c6a6ce34eeafc111858bc0
+DIST slim-1.3.3.tar.gz 226797 RMD160 d85f66df7239992b001cb37addc7f341a7042d12 SHA1 791635fc13ec859ed3be8bf1eb2ce0ba2bb3f155 SHA256 c15248d99c36cb45c66298b0797246d43cd851765536746a431a1533e48dbbb9
 EBUILD slim-1.3.2-r6.ebuild 4475 RMD160 a49ecbd1806b9afd8a8fc2a998c210b53748a03b SHA1 b78166f0e425544983e7c45f176c7d964796d0f4 SHA256 a7809a0855a4fe663c96c5c6f3ebc9ba830dbebaa5b38bb0d5fb377ee70ef654
 EBUILD slim-1.3.2-r7.ebuild 4360 RMD160 cf5c26a404dc34221169d56f35b5668c4b178eaa SHA1 960fd6c04e2fc45c95afc9dc3834aef8f77d8bb7 SHA256 c202f61587465d9c6f760ee5cb184835f45db92f8951f182b9477afe61c5703f
-MISC ChangeLog 12697 RMD160 e4b3fc4bc379a2e10ecdbbc8d8422b7b0c2f63e4 SHA1 22b959e39371343d5d1e0f29919e2cff7d444aec SHA256 e745164ec175e825291164e12e0a31ebfa694cb446f9a663a5397edaa9f7f389
+EBUILD slim-1.3.3.ebuild 3023 RMD160 6738e1b599d388914e7ea033d9c2ae29446334dd SHA1 34b4e2988c9df848eddd2b5a7e6df5c2a3a96c7a SHA256 631df519929ab0134dbcf944f7775f89e44459593cd23aceec3aa73fb177ac1d
+MISC ChangeLog 12950 RMD160 bdd43fe5b1a379fc579bc962c6bd6a6fb68fdb6b SHA1 befa272e270f7fafc0d4f3ec3001c22c00b8fa05 SHA256 e9053129f5b5626e67fd1711679167b78805731164e6dc9fa5b39f43695313dc
 MISC metadata.xml 317 RMD160 fcfaa261187ff694f4a90b78c82250387f85b375 SHA1 fec8ad82b63348fcabfae1082a661ff051d1b51a SHA256 5b7154fd1fce1e40461b40b06533854dc7605d8b5eb19f68eeb9d84527c579c4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPKQRAAAoJEEdUh39IaPFNd7IH/jgJnmxeRsiHhWS3EcNg7Vi+
-GQnKgzu1io79KlfdwVSrq5fxiRU8Ill5UGzYTUz1uH4GCSuNwzuS1+59/zaJXoVf
-yQsPHWzoaJPRvy2VzpzaWuWjcD9b1q+4FcelG32IKTMe0Q85Cp2yY/KcvlDFjSOC
-k/FAMs2q5wgbgFjjHvhmAn1cTbPI/IpAOv101YBDVAxGzJJt4e78M84QrXq/jwit
-cFmBbL5vE1KdB0vFII9Uc4h/SSzURDjWHsYIsmBtpI71zL1ZiLbbm2nqnwFp3mYb
-lOkAwzLn0GlIWFIas2LTA+h/+or28mNeT2ungpkhoZlOj6F7xcfiufs9iTLgNNM=
-=U1S4
+iF4EAREIAAYFAk9GWKoACgkQAJxUfCtlWe0+ggD/euceJZZZXhRyL0vFln8R5L11
+h666kpyz9e7gTvCMErABAIZdI94CUybu3fIP5r9xQhREBiq6MZ22wd7NH11dVZlf
+=2zR6
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/slim/files/Xsession b/x11-misc/slim/files/Xsession
deleted file mode 100644
index d24ee1c03011..000000000000
--- a/x11-misc/slim/files/Xsession
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/bin/sh
-#
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/files/Xsession,v 1.1 2010/09/20 15:22:38 darkside Exp $
-#
-# SLiM Xsession script
-#
-# This script is a wrapper that handles selection of a session from
-# /etc/X11/Sessions/ as necessary.  It doesn't handle actual session setup.
-#
-# The script takes a session name as the first argument. If no argument is
-# given, or if the argument does not match an available session script:
-#  - Run ~/.xsession and if that's not available,
-#  - Run the appropriate Xclients startup (see the code below)
-#
-# (Note that other arguments could also follow, but only the command one is
-# right now relevant and supported)
-#
-# The output is redirected to /var/log/slim.log.
-#
-# By default this is run in a login shell, see /etc/slim.conf for details.
-
-command="$@"
-
-# this will go into the slim.log along with all other echo's
-# good for debugging where things went wrong
-echo "$0: Beginning session setup..."
-
-# Read /etc/xprofile and .xprofile for X specific setup
-test -f /etc/xprofile && . /etc/xprofile
-test -f "$HOME/.xprofile" && . "$HOME/.xprofile"
-
-# userresources and sysresources and all these other vars are
-# unneeded here as by default the session script we're handing
-# off to will take care of it.
-
-# wrap possible arguments to determine whether to treat special or not
-if [ "x$command" = "xcustom" ] || [ "x$command" = "xCustom" ] || \
-  [ "x$command" = "xdefault" ] || [ "x$command" = "xDefault" ]; then
-    command="Xsession"
-fi
-if [ "x$command" = "x" ]; then
-    # no default specified, check if Xsession will complete
-    # and if not then assign XSESSION to command
-    if [ -x "$HOME/.xsession" ] || [ -x "$HOME/.Xclients" ] || \
-      [ -x /etc/X11/xinit/Xclients ] || [ -x /etc/X11/Xclients ]; then
-        command="Xsession"
-    else
-        command=$XSESSION
-    fi
-fi
-
-# ripped directly from /etc/X11/chooser.sh
-
-sessionscript=""
-for x in /etc/X11/Sessions/* ; do
-    if [ "`echo ${x##*/} | awk '{ print toupper($1) }'`" \
-      = "`echo ${command} | awk '{ print toupper($1) }'`" ]; then
-        # Found the matching session
-	sessionscript="${x}"
-        break
-    fi
-done
-
-if [ -n "$sessionscript" ]; then
-
-    if [ -f ${sessionscript} ]; then
-        if [ -x ${sessionscript} ]; then
-            exec "${sessionscript}"
-        else
-            exec /bin/sh "${sessionscript}"
-        fi
-    fi
-
-    echo "Unable to execute session script ${sessionscript}"
-    exit 1
-
-fi
-
-# Launch a default session
-# This was mostly ripped from GDM's Xsession script
-
-
-echo "Could not find appropriate session script, exec'ing xterm"
-
-userresources="$HOME/.Xresources"
-usermodmap="$HOME/.Xmodmap"
-userxkbmap="$HOME/.Xkbmap"
-
-sysresources=/etc/X11/Xresources
-sysmodmap=/etc/X11/Xmodmap
-sysxkbmap=/etc/X11/Xkbmap
-
-rh6sysresources=/etc/X11/xinit/Xresources
-rh6sysmodmap=/etc/X11/xinit/Xmodmap
-
-# merge in defaults
-if [ -f "$rh6sysresources" ]; then
-    xrdb -merge "$rh6sysresources"
-fi
-
-if [ -f "$sysresources" ]; then
-    xrdb -merge "$sysresources"
-fi
-
-if [ -f "$userresources" ]; then
-    xrdb -merge "$userresources"
-fi
-
-# merge in keymaps
-if [ -f "$sysxkbmap" ]; then
-    setxkbmap `cat "$sysxkbmap"`
-    XKB_IN_USE=yes
-fi
-
-if [ -f "$userxkbmap" ]; then
-    setxkbmap `cat "$userxkbmap"`
-    XKB_IN_USE=yes
-fi
-
-#
-# Eeek, this seems like too much magic here
-#
-if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
-    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
-       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
-       if [ -n "$xkbsymbols" ]; then
-           setxkbmap -symbols "$xkbsymbols"
-           XKB_IN_USE=yes
-       fi
-    fi
-fi
-
-# xkb and xmodmap don't play nice together
-if [ -z "$XKB_IN_USE" ]; then
-    if [ -f "$rh6sysmodmap" ]; then
-       xmodmap "$rh6sysmodmap"
-    fi
-
-    if [ -f "$sysmodmap" ]; then
-       xmodmap "$sysmodmap"
-    fi
-
-    if [ -f "$usermodmap" ]; then
-       xmodmap "$usermodmap"
-    fi
-fi
-
-unset XKB_IN_USE
-
-# run all system xinitrc shell scripts.
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
-    for i in /etc/X11/xinit/xinitrc.d/* ; do
-        if [ -x "$i" ]; then
-	    . "$i"
-        fi
-    done
-fi
-
-exec xterm -geometry 80x24+0+0
-
diff --git a/x11-misc/slim/files/slim-1.3.3-config.diff b/x11-misc/slim/files/slim-1.3.3-config.diff
new file mode 100644
index 000000000000..533b3ac4ac42
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.3-config.diff
@@ -0,0 +1,74 @@
+--- slim.conf.orig	2010-08-25 11:52:23.000000000 -0400
++++ slim.conf	2010-08-25 11:58:58.000000000 -0400
+@@ -2,7 +2,7 @@
+ # Note: -xauth $authfile is automatically appended
+ default_path        /bin:/usr/bin:/usr/local/bin
+ default_xserver     /usr/bin/X
+-#xserver_arguments   -dpi 75
++xserver_arguments   -nolisten tcp -br -deferglyphs 16
+ 
+ # Commands for halt, login, etc.
+ halt_cmd            /sbin/shutdown -h now
+@@ -18,7 +18,7 @@
+ 
+ 
+ # Activate numlock when slim starts. Valid values: on|off
+-# numlock             on
++numlock             on
+ 
+ # Hide the mouse cursor (note: does not work with some WMs).
+ # Valid values: true|false
+@@ -33,7 +33,8 @@
+ # to adjust the command according to your preferred shell,
+ # i.e. for freebsd use:
+ # login_cmd           exec /bin/sh - ~/.xinitrc %session
+-login_cmd           exec /bin/bash -login ~/.xinitrc %session
++# login_cmd           exec /bin/bash -login ~/.xinitrc %session
++login_cmd           exec /bin/bash -login /usr/share/slim/Xsession %session
+ 
+ # Commands executed when starting and exiting a session.
+ # They can be used for registering a X11 session with
+@@ -41,20 +42,27 @@
+ #
+ # sessionstart_cmd	some command
+ # sessionstop_cmd	some command
++sessionstart_cmd	/usr/bin/sessreg -a -l :0.0 %user
++sessionstop_cmd     /usr/bin/sessreg -d -l :0.0 %user
+ 
+ # Start in daemon mode. Valid values: yes | no
+ # Note that this can be overriden by the command line
+ # options "-d" and "-nodaemon"
+-# daemon	yes
++daemon	yes
+ 
+-# Available sessions (first one is the default).
+-# The current chosen session name is replaced in the login_cmd
++# Available sessions:
++# The current chosen session name replaces %session in the login_cmd
+ # above, so your login command can handle different sessions.
++# If no session is chosen (via F1), %session will be an empty string.
+ # see the xinitrc.sample file shipped with slim sources
+-sessions            xfce4,icewm-session,wmaker,blackbox
++#sessions            xfce4,icewm-session,wmaker,blackbox
++# Alternatively, read available sessions from a directory:
++sessiondir           /etc/X11/Sessions
+ 
+-# Executed when pressing F11 (requires imagemagick)
++# Executed when pressing F11 (requires media-gfx/imagemagick for import)
++# Alternative is media-gfx/scrot. See Gentoo bug 252241 for more info.
+ screenshot_cmd      import -window root /slim.png
++#screenshot_cmd      scrot /root/slim.png
+ 
+ # welcome message. Available variables: %host, %domain
+ welcome_msg         Welcome to %host
+@@ -83,8 +88,8 @@
+ # randomly choose from
+ current_theme       default
+ 
+-# Lock file
+-lockfile            /var/run/slim.lock
++# Lock file, /etc/init.d/xdm expects slim.pid
++lockfile            /var/run/slim.pid
+ 
+ # Log file
+ logfile             /var/log/slim.log
diff --git a/x11-misc/slim/slim-1.3.2-r3.ebuild b/x11-misc/slim/slim-1.3.3.ebuild
index 85542081e707..05cc8891fcc7 100644
--- a/x11-misc/slim/slim-1.3.2-r3.ebuild
+++ b/x11-misc/slim/slim-1.3.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.2-r3.ebuild,v 1.7 2011/08/09 17:38:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.3.ebuild,v 1.1 2012/02/23 15:17:56 axs Exp $
 
-EAPI=2
+EAPI=4
 
-inherit toolchain-funcs pam eutils
+inherit cmake-utils pam eutils
 
 DESCRIPTION="Simple Login Manager"
 HOMEPAGE="http://slim.berlios.de"
@@ -12,16 +12,19 @@ SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="branding pam"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="branding pam consolekit"
+REQUIRED_USE="consolekit? ( pam )"
 
 RDEPEND="x11-libs/libXmu
 	x11-libs/libX11
 	x11-libs/libXpm
 	x11-libs/libXft
-	>=media-libs/libpng-1.4
+	media-libs/libpng
 	virtual/jpeg
 	x11-apps/sessreg
+	consolekit? ( sys-auth/consolekit
+		sys-apps/dbus )
 	pam? ( virtual/pam )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -29,64 +32,43 @@ DEPEND="${RDEPEND}
 PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
 
 src_prepare() {
-	# respect C[XX]FLAGS, fix crosscompile,
-	# fix linking order for --as-needed"
-	sed -i -e "s:^CXX=.*:CXX=$(tc-getCXX) ${CXXFLAGS}:" \
-		-e "s:^CC=.*:CC=$(tc-getCC) ${CFLAGS}:" \
-		-e "s:^MANDIR=.*:MANDIR=/usr/share/man:" \
-		-e "s:^\t\(.*\)\ \$(LDFLAGS)\ \(.*\):\t\1\ \2\ \$(LDFLAGS):g" \
-		-e "s:-I/usr/include/libpng12:$(pkg-config --cflags-only-I libpng):" \
-		-e "s:-lpng12:$(pkg-config --libs-only-l libpng):" \
-		-r -e "s:^LDFLAGS=(.*):LDFLAGS=\1 ${LDFLAGS}:" \
-		Makefile || die "sed failed in Makefile"
 	# Our Gentoo-specific config changes
-	epatch "${FILESDIR}"/${PN}-1.3.2-r2-config.diff
+	epatch "${FILESDIR}"/${P}-config.diff
 
 	if use elibc_FreeBSD; then
-		sed -i -e "s/CUSTOM=-DHAVE_SHADOW/CUSTOM=-DNEEDS_BASENAME/" Makefile \
-			|| die "sed failed in Makefile"
-		epatch "${FILESDIR}"/${PN}-1.3.2-bsd-install.patch
+		sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \
+			|| die
 	fi
 
 	if use branding; then
 		sed -i -e 's/  default/  slim-gentoo-simple/' slim.conf || die
 	fi
 
-	# Gentoo bug 297655
-	epatch "${FILESDIR}"/14509-fix-keyboard-in-tty-from-which-${PN}-is-lauched.patch
-	# Upstream bug #15287
+	# Upstream bug #15287 (still not fixed in codebase)
 	epatch "${FILESDIR}"/15287-fix-pam-authentication-with-pam_unix2.patch
-	# Gentoo Bug 261713
-	epatch "${FILESDIR}"/261713-restart-xserver-if-killed.patch
-	# Gentoo bug 261359, upstream 15326
-	epatch "${FILESDIR}"/261359-fix-SIGTERM-freeze.patch
-	# Gentoo bug 346037
-	epatch "${FILESDIR}"/346037-stop_setting_host_for_pam_ck_connector_so.patch
-	# Gentoo bug 378505
-	epatch "${FILESDIR}"/${P}-libpng15.patch
 }
 
-src_compile() {
-	if use pam ; then
-		emake USE_PAM=1 || die "emake failed."
-	else
-		emake || die "emake failed."
-	fi
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use pam USE_PAM)
+		$(cmake-utils_use consolekit USE_CONSOLEKIT)
+	)
+
+	cmake-utils_src_configure
 }
 
 src_install() {
+	cmake-utils_src_install
+
 	if use pam ; then
-		emake USE_PAM=1 DESTDIR="${D}" install || die "emake install failed."
 		pamd_mimic system-local-login slim auth account session
-	else
-		emake DESTDIR="${D}" install || die "emake install failed."
 	fi
 
 	insinto /usr/share/slim
-	newins "${FILESDIR}/Xsession" Xsession || die "newins failed"
+	newins "${FILESDIR}/Xsession-r3" Xsession
 
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}/slim.logrotate" slim || die "newins failed"
+	newins "${FILESDIR}/slim.logrotate" slim
 
 	dodoc xinitrc.sample ChangeLog README TODO THEMES
 }
@@ -110,9 +92,14 @@ pkg_postinst() {
 	elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf"
 	elog "accordingly."
 	elog
+	ewarn "Please note that slim now supports consolekit directly.  Please remove any "
+	ewarn "existing work-arounds (including all calls to 'ck-launch-session' in "
+	ewarn "xinitrc scripts) and enable USE=\"consolekit\""
+	elog
 	if ! use pam; then
 		elog "You have merged ${PN} without USE=pam, this will cause ${PN} to fall back to"
 		elog "the console when restarting your window manager. If this is not"
 		elog "desired, then please remerge ${PN} with USE=pam"
+		elog
 	fi
 }