Stop using custom pam.d files from $FILESDIR and use pamd_mimic to properly use system-local-login. This is now safe because /etc/pam.d/system-login pam_ck_connector.so line has the "nox11" argument in place. This will also be required for systemd compability (pam_systemd.so) wrt #372229. Fix building with sys-devel/gcc >= 4.7.0 wrt #412369 by Alphat-PC and Kacper Kowalik. tidy, drop unused sed, etc

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

3 files changed, 128 insertions, 16 deletions

diff --git a/x11-misc/lightdm/ChangeLog b/x11-misc/lightdm/ChangeLog
index 374ebb47bbc5..0d1e0ab48667 100644
--- a/x11-misc/lightdm/ChangeLog
+++ b/x11-misc/lightdm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-misc/lightdm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.41 2012/06/04 23:23:38 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.42 2012/06/20 04:58:41 ssuominen Exp $
+
+*lightdm-1.2.2-r2 (20 Jun 2012)
+
+  20 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> +lightdm-1.2.2-r2.ebuild:
+  Stop using custom pam.d files from $FILESDIR and use pamd_mimic to properly
+  use system-local-login. This is now safe because /etc/pam.d/system-login
+  pam_ck_connector.so line has the "nox11" argument in place. This will also be
+  required for systemd compability (pam_systemd.so) wrt #372229. Fix building
+  with sys-devel/gcc >= 4.7.0 wrt #412369 by Alphat-PC and Kacper Kowalik.
 
   04 Jun 2012; Markos Chandras <hwoarang@gentoo.org> lightdm-1.0.11.ebuild,
   lightdm-1.2.2-r1.ebuild, lightdm-1.2.2.ebuild:
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index d4a9976aac72..dfea9610ed0d 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX Xsession 1641 RMD160 fec5ca0ab491c2d23a631d7bab4bfa634788841d SHA1 7261a104c145025c63f8febfcecc189badfd3e86 SHA256 fb38b265420e55b2fd96f003ab00ad2a2d2cd1902984c84239c8ca84eb9b66a9
 AUX lightdm 257 RMD160 85f6b3f74ce06fdd8ee9a5c550ec6c9a1cb75345 SHA1 1b93afa7fa26d5b7ad0292c49be274aa7b2ab932 SHA256 c43240d1fbdb76d219d11ffbb8ad406bcbd7c78c8eba9c03c0feb353b6671c27
@@ -13,23 +13,18 @@ DIST lightdm-1.2.2.tar.gz 642334 RMD160 bfd65206d389bc29e9b5a60e91044fa19c703115
 DIST lightdm-gentoo-patch.tar.gz 101983 RMD160 6463f6d96b635922ac0f060fbffe450caaec6a74 SHA1 63348e477bffa27c82839c74fe56d3bc4565a3b1 SHA256 2e56d0ef3926428cea7870fbade77b20bd05a7664ae301aacc56504e07cf39ba
 EBUILD lightdm-1.0.11.ebuild 3637 RMD160 ea1ef882661e1d53e631207dedfd9517c013b7fe SHA1 762931d6fc84ff0ad7e8cf21d7639fe7d2de709d SHA256 03064e876254588c136599d334f79f91be48ccbff3b710255afb1a5f3fa087eb
 EBUILD lightdm-1.2.2-r1.ebuild 2982 RMD160 4770d6200c6faa81b68f0127b0e568d6b605c795 SHA1 72c16a6e0953ccdcf1fd00cc3f65816e2cdd15cc SHA256 2f9a9f00f07879c54948b1917aca104e9ca353d02ac3c60d1926adad7004d9f3
+EBUILD lightdm-1.2.2-r2.ebuild 2962 RMD160 4e9d1e27912af7ef9c06a2a70a5a6cfbccb1c770 SHA1 70f3169f6a60f18abc90a13d05471f8f39cae6b1 SHA256 efb8e4de7a6f6322c129282f59f41a671e08adeea3da7c2fb3a234fac6a4a17b
 EBUILD lightdm-1.2.2.ebuild 2751 RMD160 8b64cf6c134421447bd1a7ac45f62c45479c2007 SHA1 837564b400183024bbf5d184fd9d20e122089b9c SHA256 3ee3832e3d74657978db01be096072511d09415e2dd1b1b8d591a0a38638497e
-MISC ChangeLog 6608 RMD160 466be89b61b757cb684bbbf844c0c4c05c9e87ef SHA1 b0d3fdb2c011b49d68b0908104e93db0a3fec757 SHA256 2cb2b6b7eb995d26f51a162a3b0367af5f0d353bbb8828152a925650431cf5bc
+MISC ChangeLog 7109 RMD160 5179415bccbf63a8a88e27df6f40f145ffbd37f7 SHA1 4f80bbb58f2fe5d61a102335a40e153c652a7659 SHA256 7a2b1f98583424ddfd64f78767054e98b40b244ac3dbe8d39381a6163dca2a6d
 MISC metadata.xml 565 RMD160 1f9bedfcdaeebb452bfd81e1e6ac52910381841e SHA1 2407aa8809f8da8403a865614dd2daacc53c6c42 SHA256 f229bd86fcc0af59f4d1d68e2f57d56ddda188940ec4b6a01ac26816b3d98fcd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPzUOAAAoJEPqDWhW0r/LCMr0P/3W2L/4jOehTB8l89340IrmI
-p41NzrfS4zU66h/AISPnWs2t/aY/lq9HPshRISffIgvBnTDP2C4bLtVFQ3plba3j
-IqJ1nzvfoGEI2ZeNKvBtudpmLywAbxyWtt0SknqGw9phelrBoyhwE9cYKU0TtTdG
-cHB9dWSo0ZFhVUJnt3xJFoDS2plAdseyGZudEd5QwBiaWhQkpBwlzK1ssQ/wRiYw
-W2sj136XDVzm8Cpd+XUFDAt5e6pR/tGzaWcMFlRHievNOMFzgmQA3/+h8DE25sas
-eIKFiqmEOjRSeuQUR5InuMl0mVRslo8C27qMBme3dzGBcOBaWhXNjhpLCvc+qfaX
-SsgGAfmWyMvFa5fd6tsEvAf95shI30hxCEFKA1wzMRokRVXVoIYEXevcGIAZbmLr
-tazmQ8p69YHMnYqP09oi6/gT9+/4T41bVYLLlvdPEcSP3xly/z/wLZGMXhNAv3tv
-HpGGI6WzqbY5S0Zbun0FIZUicFynH7l1QaUR/ffLHLCFyy9EoSylzKewwze1rv55
-4pXdget6kaZtXxtWdRvaqtOC4GiTd9vfr0SVYlxfCrnZ7bWas2bkdSjtW64durea
-MqMY6QUTGUqtu548eGBnTHXynQNLXG2CRTzv5j3blanIiFj4zoJwQoGghoOUUk5f
-vPpD3Jt9t1jQrsxxsGMZ
-=3v5w
+iQEcBAEBAgAGBQJP4VdtAAoJEEdUh39IaPFNmP0IAKO6bPegeF2LKJTnjWYX5DCx
+eAXJd0JfF8E6CEzJf/WC00uq/Pe3QCK31XPMEKPwZ49Hg8NFl01LCR69rKTX+RLd
+T4dQDpKSHknyZgNw6PBhTaBVmWUws50M6Eyrx6Vyy6I70073xNtfVZSmSYcE6pfG
+bcDUWE4P5rw6bMT4U80Ook9UT9bKfEA6VHLL6UHDv0PODhaYPI4yHwOI05fqRkOh
+NA7rFkKjZocshTk2OebTM2s+ik2UI5G8dzLM+PZ/cmRyo7fx4uOQej4jJa7lPGwf
+PJ3VcS1PeMXmrKHAQyT+OvMz1/1QWxEKxErQOXZXg92xz3inAxQ7NfdMqIgNnvM=
+=luO2
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild b/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild
new file mode 100644
index 000000000000..c82ebc2c7efb
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild,v 1.1 2012/06/20 04:58:41 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}/${PV%.*}/${PV}/+download/${P}.tar.gz
+	mirror://gentoo/introspection-20110205.m4.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection qt4"
+
+COMMON_DEPEND=">=dev-libs/glib-2
+	dev-libs/libxml2
+	sys-apps/accountsservice
+	virtual/pam
+	x11-libs/libX11
+	>=x11-libs/libxklavier-5
+	introspection? ( >=dev-libs/gobject-introspection-1 )
+	qt4? (
+		x11-libs/qt-core:4
+		x11-libs/qt-dbus:4
+		x11-libs/qt-gui:4
+		)"
+RDEPEND="${COMMON_DEPEND}
+	>=sys-auth/pambase-20101024-r2"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS="NEWS"
+
+src_prepare() {
+	sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
+	sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
+
+	epatch "${FILESDIR}"/session-wrapper-${PN}.patch
+	epatch "${FILESDIR}/${PN}"-1.2.0-fix-configure.patch
+	epatch_user
+
+	if has_version dev-libs/gobject-introspection; then
+		eautoreconf
+	else
+		AT_M4DIR=${WORKDIR} eautoreconf
+	fi
+}
+
+src_configure() {
+	local _greeter _session _user
+	_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
+	_session=${LIGHTDM_SESSION:=gnome}
+	_user=${LIGHTDM_USER:=root}
+
+	einfo "Gentoo configuration"
+	einfo "Default greeter: ${_greeter}"
+	einfo "Default session: ${_session}"
+	einfo "Greeter user: ${_user}"
+
+	econf \
+		--localstatedir=/var \
+		--disable-static \
+		$(use_enable introspection) \
+		$(use_enable qt4 liblightdm-qt) \
+		--with-user-session=${_session} \
+		--with-greeter-session=${_greeter} \
+		--with-greeter-user=${_user} \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+
+	insinto /etc/${PN}
+	doins data/{${PN},users,keys}.conf
+
+	doins "${FILESDIR}"/Xsession
+	fperms +x /etc/${PN}/Xsession
+
+	prune_libtool_files --all
+	rm -rf "${ED}"/etc/init
+
+	pamd_mimic system-local-login ${PN} auth account session
+	pamd_mimic system-local-login ${PN}-autologin auth account session
+}
+
+pkg_postinst() {
+	elog
+	elog "You will need to install a greeter as actual GUI for LightDM."
+	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
+	elog "You can also set your own default values for LIGHTDM_GREETER,"
+	elog "LIGHTDM_SESSION, LIGHTDM_USER in /etc/make.conf"
+	elog
+}