summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wright <gienah@gentoo.org>2012-05-05 11:45:41 +0000
committerMark Wright <gienah@gentoo.org>2012-05-05 11:45:41 +0000
commit28ee871b32284bff4d6e147015f33f5d9e37c5b6 (patch)
tree9d4545ff1e9da908245ebe2e5110fc10a074e603
parentStable on amd64 wrt bug #413969 (diff)
downloadgentoo-2-28ee871b32284bff4d6e147015f33f5d9e37c5b6.tar.gz
gentoo-2-28ee871b32284bff4d6e147015f33f5d9e37c5b6.tar.bz2
gentoo-2-28ee871b32284bff4d6e147015f33f5d9e37c5b6.zip
Add consolekit and pam use flags.
(Portage version: 2.1.10.57/cvs/Linux x86_64)
-rw-r--r--x11-misc/cdm/ChangeLog5
-rw-r--r--x11-misc/cdm/cdm-0.5.3.ebuild30
-rw-r--r--x11-misc/cdm/metadata.xml3
3 files changed, 29 insertions, 9 deletions
diff --git a/x11-misc/cdm/ChangeLog b/x11-misc/cdm/ChangeLog
index 9f1194ac836a..86bbb1822f46 100644
--- a/x11-misc/cdm/ChangeLog
+++ b/x11-misc/cdm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-misc/cdm
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/cdm/ChangeLog,v 1.1 2012/05/05 10:15:47 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/cdm/ChangeLog,v 1.2 2012/05/05 11:45:41 gienah Exp $
+
+ 05 May 2012; Mark Wright <gienah@gentoo.org> cdm-0.5.3.ebuild, metadata.xml:
+ Add consolekit and pam use flags.
*cdm-0.5.3 (05 May 2012)
diff --git a/x11-misc/cdm/cdm-0.5.3.ebuild b/x11-misc/cdm/cdm-0.5.3.ebuild
index d43ed5e381b7..0ec648333071 100644
--- a/x11-misc/cdm/cdm-0.5.3.ebuild
+++ b/x11-misc/cdm/cdm-0.5.3.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/cdm/cdm-0.5.3.ebuild,v 1.1 2012/05/05 10:15:47 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/cdm/cdm-0.5.3.ebuild,v 1.2 2012/05/05 11:45:41 gienah Exp $
EAPI="4"
-inherit base eutils
+inherit base pam eutils
DESCRIPTION="The Console Display Manager"
HOMEPAGE="https://wiki.archlinux.org/index.php/CDM"
@@ -13,19 +13,34 @@ SRC_URI="http://dev.gentoo.org/~gienah/snapshots/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="pam consolekit"
+REQUIRED_USE="consolekit? ( pam )"
DEPEND="app-shells/bash"
RDEPEND="${DEPEND}
dev-util/dialog
x11-apps/xdpyinfo
- x11-apps/xinit"
+ x11-apps/xinit
+ consolekit? ( sys-auth/consolekit
+ sys-apps/dbus )
+ pam? ( virtual/pam )"
PATCHES=("${FILESDIR}/${PN}-0.5.3-invalid-MIT-cookie.patch")
-src_install()
-{
+src_prepare() {
+ base_src_prepare
+ if ! use consolekit; then
+ sed -e 's@consolekit=yes@consolekit=no@' \
+ -i "${S}/src/cdmrc" || die "Could not turn off consolekit in cdmrc"
+ fi
+}
+
+src_install() {
+ if use pam ; then
+ pamd_mimic system-local-login cdm auth account session
+ fi
+
insinto /usr/bin/
insopts -m0755
dobin src/${PN}
@@ -49,8 +64,7 @@ src_install()
dodoc CHANGELOG
}
-pkg_postinst()
-{
+pkg_postinst() {
einfo "In order to use CDM you must first edit your /etc/cdmrc"
einfo "At least these should be edited before you start using CDM:"
einfo "wmbinlist=(awesome openbox-session startkde startxfce4 gnome-session)"
diff --git a/x11-misc/cdm/metadata.xml b/x11-misc/cdm/metadata.xml
index dda9caa2e8d6..489455364bd5 100644
--- a/x11-misc/cdm/metadata.xml
+++ b/x11-misc/cdm/metadata.xml
@@ -13,4 +13,7 @@ or the instability of qingy. Written in pure bash, CDM has no other
dependencies, yet supports multiple users/sessions and can start
virtually any DE/WM.
</longdescription>
+<use>
+ <flag name='consolekit'>Enable native consolekit support</flag>
+</use>
</pkgmetadata>