bump to 1.13.1. Drop 1.8.5

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 09BF4F54C2BA7F3C!)

3 files changed, 40 insertions, 16 deletions

diff --git a/x11-misc/lightdm/ChangeLog b/x11-misc/lightdm/ChangeLog
index b54439703ccb..54cea92d258f 100644
--- a/x11-misc/lightdm/ChangeLog
+++ b/x11-misc/lightdm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/lightdm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.106 2015/01/19 19:54:56 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.107 2015/01/19 20:33:44 hwoarang Exp $
+
+*lightdm-1.13.1 (19 Jan 2015)
+
+  19 Jan 2015; Markos Chandras <hwoarang@gentoo.org> +lightdm-1.13.1.ebuild,
+  -lightdm-1.8.5.ebuild, metadata.xml:
+  bump to 1.13.1. Drop 1.8.5
 
   19 Jan 2015; Markos Chandras <hwoarang@gentoo.org> lightdm-1.13.0.ebuild:
   Drop unconditional dependency on accountservice. Patch by Harvey Mittens. Bug
diff --git a/x11-misc/lightdm/lightdm-1.8.5.ebuild b/x11-misc/lightdm/lightdm-1.13.1.ebuild
index 838e45603ef6..5cb15681acc4 100644
--- a/x11-misc/lightdm/lightdm-1.8.5.ebuild
+++ b/x11-misc/lightdm/lightdm-1.13.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.8.5.ebuild,v 1.4 2013/12/23 22:09:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.13.1.ebuild,v 1.1 2015/01/19 20:33:44 hwoarang Exp $
 
 EAPI=5
-inherit autotools eutils pam readme.gentoo systemd
+inherit autotools eutils pam readme.gentoo systemd versionator
 
-TRUNK_VERSION="1.8"
+TRUNK_VERSION="$(get_version_component_range 1-2)"
 DESCRIPTION="A lightweight display manager"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
 SRC_URI="http://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz
@@ -13,13 +13,13 @@ SRC_URI="http://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc x86"
-IUSE="+gtk +introspection kde qt4 razor"
-REQUIRED_USE="|| ( gtk kde razor )"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="+gtk +introspection kde qt4 +gnome"
+REQUIRED_USE="|| ( gtk kde )"
 
 COMMON_DEPEND=">=dev-libs/glib-2.32.3:2
 	dev-libs/libxml2
-	sys-apps/accountsservice
+	gnome? ( sys-apps/accountsservice )
 	virtual/pam
 	x11-libs/libX11
 	>=x11-libs/libxklavier-5
@@ -34,21 +34,24 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	dev-util/gtk-doc-am
 	dev-util/intltool
-	gnome-base/gnome-common
+	gnome? ( gnome-base/gnome-common )
 	sys-devel/gettext
 	virtual/pkgconfig"
 PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )
-	kde? ( x11-misc/lightdm-kde )
-	razor? ( razorqt-base/razorqt-lightdm-greeter )"
+	kde? ( x11-misc/lightdm-kde )"
 
-RESTRICT="test"
 DOCS=( NEWS )
+RESTRICT="test"
 
 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}"/${PN}-1.7.7-session-wrapper.patch
+	einfo "Fixing the session-wrapper variable in lightdm.conf"
+	sed -i -e \
+		"/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
+		data/lightdm.conf || die "Failed to fix lightdm.conf"
+
 	epatch_user
 
 	# Remove bogus Makefile statement. This needs to go upstream
@@ -72,11 +75,15 @@ src_configure() {
 	einfo "Default session: ${_session}"
 	einfo "Greeter user: ${_user}"
 
+	# also disable tests because libsystem.c does not build. Tests are
+	# restricted so it does not matter anyway.
 	econf \
 		--localstatedir=/var \
 		--disable-static \
+		--disable-tests \
 		$(use_enable introspection) \
 		$(use_enable qt4 liblightdm-qt) \
+		--disable-liblightdm-qt5 \
 		--with-user-session=${_session} \
 		--with-greeter-session=${_greeter} \
 		--with-greeter-user=${_user} \
@@ -86,15 +93,27 @@ src_configure() {
 src_install() {
 	default
 
+	# Delete apparmor profiles because they only work with Ubuntu's
+	# apparmor package. Bug #494426
+	if [[ -d ${D}/etc/apparmor.d ]]; then
+		rm -r "${D}/etc/apparmor.d" || die \
+			"Failed to remove apparmor profiles"
+	fi
+
 	insinto /etc/${PN}
 	doins data/{${PN},keys}.conf
 	doins "${FILESDIR}"/Xsession
 	fperms +x /etc/${PN}/Xsession
+	# /var/lib/lightdm-data could be useful. Bug #522228
+	dodir /var/lib/lightdm-data
 
 	prune_libtool_files --all
 	rm -rf "${ED}"/etc/init
 
-	pamd_mimic system-local-login ${PN} auth account session #372229
+	# Remove existing pam file. We will build a new one. Bug #524792
+	rm -rf "${ED}"/etc/pam.d/${PN}{,-greeter}
+	pamd_mimic system-local-login ${PN} auth account password session #372229
+	pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
 	dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
 
 	readme.gentoo_create_doc
diff --git a/x11-misc/lightdm/metadata.xml b/x11-misc/lightdm/metadata.xml
index 47be3d7bab69..498c2fffd0a9 100644
--- a/x11-misc/lightdm/metadata.xml
+++ b/x11-misc/lightdm/metadata.xml
@@ -9,7 +9,6 @@
 	<flag name="gtk">Pull in the gtk+ greeter</flag>
 	<flag name="introspection">Use dev-libs/gobject-introspection for introspection</flag>
 	<flag name="kde">Pull in the kde greeter</flag>
-	<flag name="razor">Pull in the razorqt greeter</flag>
 </use>
 <longdescription lang="en">
 </longdescription>