Don't use system-local-login because of conflict with pam_ck_connector.so. This would...

Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64

diff --git a/x11-misc/lightdm/ChangeLog b/x11-misc/lightdm/ChangeLog
index 2c451e1010957d6d30a3c9d4da07c62f3f11f05b..5b2f126291c1403fc5546f4ec3cc36ff713b4ae3 100644 (file)
--- a/x11-misc/lightdm/ChangeLog
+++ b/x11-misc/lightdm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/lightdm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.13 2011/10/23 16:50:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.14 2011/10/23 17:11:05 ssuominen Exp $
+
+*lightdm-1.1.0-r1 (23 Oct 2011)
+
+  23 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> +lightdm-1.1.0-r1.ebuild,
+  +files/lightdm:
+  Don't use system-local-login because of conflict with pam_ck_connector.so.
+  This would require pambase to separate console and graphical logins for nox11
+  parameter. This pam.d file is copied from gnome-base/gdm.
 
 *lightdm-1.1.0 (23 Oct 2011)
 

diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 8e2b962e83d88cc41dcc18e5b3d27864a67fe5e4..6012e933a888d545b4b673a10c18f7afe26cb19f 100644 (file)
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -1,29 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
+AUX lightdm 209 RMD160 376933fdcdbc9a3196a1eb741f152cac7447c7b3 SHA1 4903519bee34d24c89e42de9e6a4199ff8e8396e SHA256 ccbc64732dce394e0d238e4c095bdbcab23b4adfdbcf213a763e26d96476d208
 AUX lightdm-0.9.7-gtk.patch 915 RMD160 6705c655470de1df7a568c56cd67569257735f36 SHA1 a3946116ad78b4511b75551586a0939d64e19451 SHA256 540a831d53729e97d80b7bc1bccadd1637fe5f1eac2867397d98db1a5228db93
 AUX lightdm-1.0.2-configure.patch 1015 RMD160 5ea3d31f95f5318d351413f1d09e983cf4af8429 SHA1 a24924da266e8ccff5f9d5532e9f3a19428dd94a SHA256 5395266e2e41c31518a07381b45e01e7c1fe80aad4d06de7980c43a489dfe9e2
 DIST lightdm-1.0.2.tar.gz 633166 RMD160 e5ce68d4a89cfa558d79cd9201c8e6a81d698816 SHA1 fc859453768235da064d0f567c19d8e1abc44e28 SHA256 47ca033de6cd083e12d5dc5065bcbbfc1cbd2624bebad397be9eedd426515180
 DIST lightdm-1.1.0.tar.gz 639331 RMD160 7bd38b00a76a977b35408483badd2cdbd66d38c0 SHA1 ba914e667e6383bc39831c62a72ccf84a961b587 SHA256 e8c26ae74760069e26ad61643d7b685f941c30024a2c2dc034945e28ee04bca8
 DIST lightdm-gentoo-patch.tar.gz 101983 RMD160 6463f6d96b635922ac0f060fbffe450caaec6a74 SHA1 63348e477bffa27c82839c74fe56d3bc4565a3b1 SHA256 2e56d0ef3926428cea7870fbade77b20bd05a7664ae301aacc56504e07cf39ba
 EBUILD lightdm-1.0.2-r1.ebuild 3245 RMD160 5cb6f29596689661b8524a025fc831daa8650a72 SHA1 95d5f6264f0278833bb082e0150581da3cde3cde SHA256 3c1ea8a7c32eaca67a61a17386f46dda9e92bad5a6ab3f38de6e1dd102e0f561
+EBUILD lightdm-1.1.0-r1.ebuild 3214 RMD160 7f71c1cb0eddd48c731743202c2182f80e8e4e7a SHA1 1f4d58e355fa6b67e4d9ef0e464e67fd9c4ebc42 SHA256 89c359d6916f5bbaaee49fd4dbe5a4ab424a8f5e1815f4dd3cc085f13adfe2ac
 EBUILD lightdm-1.1.0.ebuild 3241 RMD160 6a64dd4dc2da824a0c3e1885231637fd235eb870 SHA1 48148739be578e56bca06093a62450186ff9d569 SHA256 83a02ef9b58cc7dccbb54f6db7764f0ff535f4a18dcc4e602e2cff99bea085e1
-MISC ChangeLog 1263 RMD160 84acd64780c2c33efcb2fc547c22bb38089b2921 SHA1 879d90a6c6e67ba4644d7421c7d4e274b75953fa SHA256 634eff495eafac5b3b2fa3fe75be033517282b5714b55862fb4ec7d155f97c25
+MISC ChangeLog 1613 RMD160 c788e70455c043d168154f73dacdb8d724f57174 SHA1 6988ac9460f58c84181ac4072b4d8d6010837cb8 SHA256 ca95c517b10d07821d7deb238281d7ad8700d0a34228227722d36c2f30208a20
 MISC metadata.xml 476 RMD160 ffe13acf80a13cf4793170da46aac1087ab9e753 SHA1 6de246984b16415d8e1fe8cab2478ce5b1da4c31 SHA256 a3a8bd4e87cb4735bcc99606498b27552517c024d0ac85b05a7aec35c6c2983d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOpEXhAAoJEPqDWhW0r/LCut4P/3obB1w+oNgJEuJ7lYRi/V29
-bF0C3kYhX5FhONwVEAMlrNZ/6mNYJk8SifXqwp0Xxy1jgqT8yrWGDCao2jXQ5FR8
-9MMPttT13VV+rzCymKWTCjYO084kgIHCVnVNlP1ArbtoMUQNVsiX2XPNdbP6S82r
-3PdalnCVXD8egdO1hBnSNWKcuJQa9UPc4DuuHFTideme7bMQ3w73cLDcVXPweHcb
-SR41SzUwtUAvYJ1h82r/v3obLqFq4uoLLuNbb53jZ/sH3EyavzypgJgDLZ3oX4k3
-ziEMjTx5hQGixgo8yjvPffAJdzl8D2digP1SAnSseZVYa8MqN0JOiCv7oEA+7G81
-WrkNKYz9Gt64v7W5P3F0GYGC2a+bJkDKT84HwRIcv/OwkAsbIrZAOUMPsTqbtOsF
-dTsC8x33VDdoD1lgmCqlpXS/1tZfkxrVEaZsZj9tEzUIIdpKvLCfwz/8aGiyojjT
-JMoP6j0EcYdVX1g5HBtWJq9PdaoKiquKLXb8lyahxZLi874xrvct+mFa+XU0Sj7E
-2urwFX4CQsH3g5/ScoUX7n4KdtXmOOLrIPglCFcebXZVHIRmCvn5EPhDKzkWXQrS
-cNzWA1REnQnstbeJifJFfFXPIwiyq5SX8lu+p7k7gs04zhqsHR17eGueFYXN5NiJ
-5NW5Jr0/fQj/o/MHdZ+V
-=ZY3S
+iQEcBAEBAgAGBQJOpEp/AAoJEEdUh39IaPFNlygH/j0zaQE5AEW/XRVnQrmXwS4T
+OSKa8MdAU5omsWET5HN0oz0cXGL4ZTNMII4y9bp/0sddktTwD9VuGdN+9kHmKix8
+GmFEjW5+5njMgqEdQG9BeIoDSbUArTqUvS0iPynBuve5XnVjz5MS/TNlOMX6uMF0
+L5vYUvGer9cvxLVGL6IvIvD2bDeGu3H73rZCCR6oHhTqXPVPxKi1klrr9Pkk5SYd
+w1NY3SGxEPXEPv4+lUQMuDf5Kb0OrLW86x5Qa/N70oXXcmPzqHufJjz3aKbgd1xT
+E684PfN1R2JqyH+u3dBlFNRlck7w2b8IC3hxHI4rnTqM+Jz1Z0vug85DIZ2kgZI=
+=7l+k
 -----END PGP SIGNATURE-----

diff --git a/x11-misc/lightdm/files/lightdm b/x11-misc/lightdm/files/lightdm
new file mode 100644 (file)
index 0000000..ff404de
--- /dev/null
+++ b/x11-misc/lightdm/files/lightdm
@@ -0,0 +1,7 @@
+#%PAM-1.0
+auth       optional            pam_env.so
+auth       include             system-login
+auth       required            pam_nologin.so
+account    include             system-login
+password   include             system-login
+session    include             system-auth

diff --git a/x11-misc/lightdm/lightdm-1.1.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.1.0-r1.ebuild
new file mode 100644 (file)
index 0000000..a6b0124
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.1.0-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.1.0-r1.ebuild,v 1.1 2011/10/23 17:11:05 ssuominen Exp $
+
+EAPI=4
+inherit autotools eutils pam
+
+DESCRIPTION="A lightweight display manager"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz
+       gtk? ( http://dev.gentoo.org/~hwoarang/distfiles/${PN}-gentoo-patch.tar.gz )"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="branding +gtk +introspection qt4"
+
+RDEPEND="dev-libs/glib:2
+       virtual/pam
+       x11-libs/libxklavier
+       x11-libs/libX11
+       dev-libs/libxml2
+       gtk? ( x11-libs/gtk+:3
+               x11-themes/gnome-themes-standard
+               x11-themes/gnome-icon-theme )
+       qt4? ( x11-libs/qt-core:4
+               x11-libs/qt-dbus:4 )
+       sys-apps/accountsservice"
+DEPEND="${RDEPEND}
+       dev-lang/vala:0.12
+       dev-util/intltool
+       dev-util/pkgconfig
+       sys-devel/gettext
+       introspection? ( dev-libs/gobject-introspection )"
+
+REQUIRED_USE="branding? ( gtk ) || ( gtk qt4 )"
+DOCS=( NEWS )
+
+src_prepare() {
+       sed -i -e "/minimum-uid/s:500:1000:" "${S}"/data/users.conf     || die
+       sed -i -e "s:gtk+-3.0:gtk+-2.0:" "${S}"/configure.ac || die
+       # work around for broken compilation
+       sed -i "s/lightdm-session//" "${S}"/tests/src/Makefile.am || die
+
+       eautoreconf
+}
+
+src_configure() {
+       # Maybe in the future, we can support some automatic session and user
+       # recognition. Until then, use default values
+       local default=gnome greeter= user=root
+
+       # gtk has higher priority because Qt4 interface sucks :)
+       use qt4 && greeter=lightdm-qt-greeter
+       use gtk && greeter=lightdm-gtk-greeter
+
+       # Let user know how lightdm is configured
+       einfo "Gentoo configuration"
+       einfo "Default greeter: ${greeter}"
+       einfo "Default session: ${default}"
+       einfo "Greeter user: ${user}"
+
+       # do the actual configuration
+       econf --localstatedir=/var \
+               --disable-static \
+               $(use_enable introspection) \
+               $(use_enable qt4 liblightdm-qt) \
+               $(use_enable qt4 qt-greeter) \
+               $(use_enable gtk gtk-greeter) \
+               --with-user-session=${default} \
+               --with-greeter-session=${greeter} \
+               --with-greeter-user=${user} \
+               --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+       default
+
+       # Install missing files
+       insinto /etc/${PN}/
+       doins "${S}"/data/{users,keys}.conf
+       # remove .la files
+       find "${ED}" -name "*.la" -exec rm -rf {} +
+       rm -Rf "${ED}"/etc/init || die
+
+       if use gtk; then
+               insinto /etc/${PN}/
+               doins "${WORKDIR}"/${PN}-gtk-greeter.conf
+               if use branding; then
+                       insinto /usr/share/${PN}/backgrounds/
+                       doins "${WORKDIR}"/gentoo1024x768.png
+                       sed -i -e "/background/s:=.*:=/usr/share/${PN}/backgrounds/gentoo1024x768.png:" \
+                               "${D}"/etc/${PN}/${PN}-gtk-greeter.conf || die
+               fi
+       fi
+
+       dopamd "${FILESDIR}"/${PN}
+}
+
+pkg_postinst() {
+       elog
+       elog "Even though the default /etc/${PN}/${PN}.conf will work for"
+       elog "most users, make sure you configure it to suit your needs"
+       elog "before using ${PN} for the first time."
+       elog "You can test the configuration file using the following"
+       elog "command: ${PN} --test-mode -c /etc/${PN}/${PN}.conf. This"
+       elog "requires xorg-server to be built with the 'kdrive' useflag."
+       elog
+}