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
commite72cef18af46ff021ac9874ca0dbe4458cfbc92f (patch)
treea8eeb75df06e09dd2e8130e1d6926adb4789eaa0 /x11-misc/cdm
parentStable on amd64 wrt bug #413969 (diff)
downloadhistorical-e72cef18af46ff021ac9874ca0dbe4458cfbc92f.tar.gz
historical-e72cef18af46ff021ac9874ca0dbe4458cfbc92f.tar.bz2
historical-e72cef18af46ff021ac9874ca0dbe4458cfbc92f.zip
Add consolekit and pam use flags.
Package-Manager: portage-2.1.10.57/cvs/Linux x86_64
Diffstat (limited to 'x11-misc/cdm')
-rw-r--r--x11-misc/cdm/ChangeLog5
-rw-r--r--x11-misc/cdm/Manifest12
-rw-r--r--x11-misc/cdm/cdm-0.5.3.ebuild30
-rw-r--r--x11-misc/cdm/metadata.xml3
4 files changed, 35 insertions, 15 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/Manifest b/x11-misc/cdm/Manifest
index 7c33a7559d5f..ff15448b001c 100644
--- a/x11-misc/cdm/Manifest
+++ b/x11-misc/cdm/Manifest
@@ -3,13 +3,13 @@ Hash: SHA256
AUX cdm-0.5.3-invalid-MIT-cookie.patch 520 RMD160 4a8f0806127e873e0272cc6e499233507b2a6f52 SHA1 fcf605dc2dc96a69e9498ed3405930be166a2abe SHA256 1dbc825c393d757ca121f3520128ff32748615ae0e6af100870f5bdb4726f91b
DIST cdm-0.5.3.tar.gz 13751 RMD160 e849b395f80d474613b191d6bf99d802d69c38f6 SHA1 02d9968f98f22960f8a4a020ada846f4ead61344 SHA256 fb9ada13d3416305828c99943698fe7df3b0ab91bd6099e7b2707e1d8dd99a23
-EBUILD cdm-0.5.3.ebuild 1402 RMD160 dbc29d22d1c2ddafbc121d883af5fa81f9de37f0 SHA1 6d38ba4f2b947e2797368af1102cca111571c893 SHA256 46265865f2ff2cff9c84ac18d179dce54cf1cfcf976d9875e0f4d70b5686a0da
-MISC ChangeLog 442 RMD160 8da8b23513e27bae25294a2e9690713e82b2961b SHA1 cf611596185e2eb53916353747220464285fb447 SHA256 e46b95e536e15856df8e256a032364fe6ee2f32bbc0bc442e9ac62800027c73b
-MISC metadata.xml 624 RMD160 37ec729cfda0cdd3cd2fab9794e19976974c6488 SHA1 ef37a57231f03b55b1e459691236cdfe5eb2219c SHA256 6db97103443f6787337e8e41b31a0e9d8633ff7fca1c3facb237ec9812acb230
+EBUILD cdm-0.5.3.ebuild 1795 RMD160 99c5b3fb3f9f183da027941661649bffad36dc4e SHA1 9fbc3d3a28970805a998c5e886e625edd13d1f85 SHA256 a9f5271a617597c8b88de366e892a8f1567dfe633db66ba9ecd8332fbbe5c54c
+MISC ChangeLog 558 RMD160 0e829ee4829910a3fdd5b96b081313b0696d20a0 SHA1 ebe2ab416e24c5df41e1e8021f8a788dab420225 SHA256 ec63591d1a294cd411bd389531a37f563aa218fdac14445449be200f59cb66fc
+MISC metadata.xml 704 RMD160 9e530de19d6242d73ce3320e6fd743fa4c2cc319 SHA1 d10207bea320ba4efaa04255728199dc1596f88f SHA256 996fff70d764d368bae3d5d7862b158874f6574c2ab74c3b59081e3db094746a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iF4EAREIAAYFAk+k/eAACgkQoBEVQmGOlx9AuAD+OBk7Q1MTB71MAnROekgV2yRc
-PRyWZNcT2lt8b65jz1kA/1SAfe1GrohKzBtIbxA4XhjAWkzVAd3uJ4by/byboW0T
-=D3hM
+iF4EAREIAAYFAk+lEvMACgkQoBEVQmGOlx/AZAEAh+4Z9fNOUrGhGIBoF3ZPaANS
+nJOs8FBsRX4a08X+whkBAN3ZgPBNXYLn7xUfRykJK0XXR6bkVpS5jhXo54zzyy+G
+=Hp7y
-----END PGP SIGNATURE-----
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>