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

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

2 files changed, 118 insertions, 1 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/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
+}