Version bump. Remove old. Fix gobject-introspection dependencies. Bug #471448

(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key B4AFF2C2)

8 files changed, 37 insertions, 126 deletions

diff --git a/x11-misc/lightdm/ChangeLog b/x11-misc/lightdm/ChangeLog
index 33480a61480b..41d638bc2db0 100644
--- a/x11-misc/lightdm/ChangeLog
+++ b/x11-misc/lightdm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/lightdm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.65 2013/05/25 05:41:25 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.66 2013/07/30 13:51:58 hwoarang Exp $
+
+*lightdm-1.7.7 (30 Jul 2013)
+
+  30 Jul 2013; Markos Chandras <hwoarang@gentoo.org>
+  +files/lightdm-1.7.7-session-wrapper.patch, +lightdm-1.7.7.ebuild,
+  -lightdm-1.3.3.ebuild, -lightdm-1.4.0-r1.ebuild, lightdm-1.0.11.ebuild,
+  lightdm-1.2.2-r3.ebuild, lightdm-1.4.0-r2.ebuild, lightdm-1.4.0.ebuild:
+  Version bump. Remove old. Fix gobject-introspection dependencies. Bug #471448
 
   25 May 2013; Ben de Groot <yngwin@gentoo.org> metadata.xml:
   Remove myself as maintainer, bug #412697
diff --git a/x11-misc/lightdm/files/lightdm-1.7.7-session-wrapper.patch b/x11-misc/lightdm/files/lightdm-1.7.7-session-wrapper.patch
new file mode 100644
index 000000000000..40b4159755a2
--- /dev/null
+++ b/x11-misc/lightdm/files/lightdm-1.7.7-session-wrapper.patch
@@ -0,0 +1,13 @@
+Index: lightdm-1.7.7/data/lightdm.conf
+===================================================================
+--- lightdm-1.7.7.orig/data/lightdm.conf
++++ lightdm-1.7.7/data/lightdm.conf
+@@ -87,7 +87,7 @@
+ #user-session=default
+ #allow-guest=true
+ #guest-session=UNIMPLEMENTED
+-#session-wrapper=lightdm-session
++session-wrapper=/etc/lightdm/Xsession
+ #greeter-wrapper=
+ #display-setup-script=
+ #greeter-setup-script=
diff --git a/x11-misc/lightdm/lightdm-1.0.11.ebuild b/x11-misc/lightdm/lightdm-1.0.11.ebuild
index f80673dc22c8..6dd1a5db8aaa 100644
--- a/x11-misc/lightdm/lightdm-1.0.11.ebuild
+++ b/x11-misc/lightdm/lightdm-1.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.0.11.ebuild,v 1.8 2013/03/02 23:49:52 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.0.11.ebuild,v 1.9 2013/07/30 13:51:58 hwoarang Exp $
 
 EAPI=4
 inherit autotools eutils pam virtualx
@@ -24,7 +24,7 @@ RDEPEND="dev-libs/glib:2
 	gtk? ( x11-libs/gtk+:3
 		x11-themes/gnome-themes-standard
 		x11-themes/gnome-icon-theme )
-	introspection? ( dev-libs/gobject-introspection )
+	introspection? ( <dev-libs/gobject-introspection-1.36.0 )
 	qt4? ( dev-qt/qtcore:4
 		dev-qt/qtdbus:4 )
 	sys-apps/accountsservice"
diff --git a/x11-misc/lightdm/lightdm-1.2.2-r3.ebuild b/x11-misc/lightdm/lightdm-1.2.2-r3.ebuild
index 0a8c111af766..7bac5e513b44 100644
--- a/x11-misc/lightdm/lightdm-1.2.2-r3.ebuild
+++ b/x11-misc/lightdm/lightdm-1.2.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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-r3.ebuild,v 1.4 2013/03/02 23:49:52 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.2.2-r3.ebuild,v 1.5 2013/07/30 13:51:58 hwoarang Exp $
 
 EAPI=4
 inherit autotools eutils pam
@@ -21,7 +21,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.32.3:2
 	virtual/pam
 	x11-libs/libX11
 	>=x11-libs/libxklavier-5
-	introspection? ( >=dev-libs/gobject-introspection-1 )
+	introspection? ( <dev-libs/gobject-introspection-1.36.0 )
 	qt4? (
 		dev-qt/qtcore:4
 		dev-qt/qtdbus:4
diff --git a/x11-misc/lightdm/lightdm-1.3.3.ebuild b/x11-misc/lightdm/lightdm-1.3.3.ebuild
deleted file mode 100644
index 991b3ca8c669..000000000000
--- a/x11-misc/lightdm/lightdm-1.3.3.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.3.3.ebuild,v 1.2 2013/03/02 23:49:52 hwoarang Exp $
-
-EAPI=4
-inherit autotools eutils pam
-
-TRUNK_VERSION="1.4"
-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.gz
-	mirror://gentoo/introspection-20110205.m4.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+introspection qt4"
-
-COMMON_DEPEND=">=dev-libs/glib-2.32.3:2
-	dev-libs/libxml2
-	sys-apps/accountsservice
-	virtual/pam
-	x11-libs/libX11
-	>=x11-libs/libxklavier-5
-	introspection? ( >=dev-libs/gobject-introspection-1 )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui: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
-
-	# Remove bogus Makefile statement. This needs to go upstream
-	sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
-	if has_version dev-libs/gobject-introspection; then
-		eautoreconf
-	else
-		AT_M4DIR=${WORKDIR} eautoreconf
-	fi
-}
-
-src_configure() {
-	# Set default values if global vars unset
-	local _greeter _session _user
-	_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
-	_session=${LIGHTDM_SESSION:=gnome}
-	_user=${LIGHTDM_USER:=root}
-	# Let user know how lightdm is configured
-	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},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 #372229
-	dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
-}
-
-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
-}
diff --git a/x11-misc/lightdm/lightdm-1.4.0-r2.ebuild b/x11-misc/lightdm/lightdm-1.4.0-r2.ebuild
index b480da9fab79..a2b61f9d23a9 100644
--- a/x11-misc/lightdm/lightdm-1.4.0-r2.ebuild
+++ b/x11-misc/lightdm/lightdm-1.4.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.4.0-r2.ebuild,v 1.1 2013/05/18 12:41:16 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.4.0-r2.ebuild,v 1.2 2013/07/30 13:51:58 hwoarang Exp $
 
 EAPI=5
 inherit autotools eutils pam readme.gentoo systemd
@@ -23,7 +23,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.32.3:2
 	virtual/pam
 	x11-libs/libX11
 	>=x11-libs/libxklavier-5
-	introspection? ( >=dev-libs/gobject-introspection-1 )
+	introspection? ( <dev-libs/gobject-introspection-1.36.0 )
 	qt4? (
 		dev-qt/qtcore:4
 		dev-qt/qtdbus:4
diff --git a/x11-misc/lightdm/lightdm-1.4.0.ebuild b/x11-misc/lightdm/lightdm-1.4.0.ebuild
index c49f592bfee8..5605766f6596 100644
--- a/x11-misc/lightdm/lightdm-1.4.0.ebuild
+++ b/x11-misc/lightdm/lightdm-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.4.0.ebuild,v 1.7 2013/03/02 23:49:52 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.4.0.ebuild,v 1.8 2013/07/30 13:51:58 hwoarang Exp $
 
 EAPI=5
 inherit autotools eutils pam
@@ -22,7 +22,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.32.3:2
 	virtual/pam
 	x11-libs/libX11
 	>=x11-libs/libxklavier-5
-	introspection? ( >=dev-libs/gobject-introspection-1 )
+	introspection? ( <dev-libs/gobject-introspection-1.36.0 )
 	qt4? (
 		dev-qt/qtcore:4
 		dev-qt/qtdbus:4
diff --git a/x11-misc/lightdm/lightdm-1.4.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.7.7.ebuild
index ca8223309cab..5e067276f4a0 100644
--- a/x11-misc/lightdm/lightdm-1.4.0-r1.ebuild
+++ b/x11-misc/lightdm/lightdm-1.7.7.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.4.0-r1.ebuild,v 1.4 2013/05/09 15:50:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.7.7.ebuild,v 1.1 2013/07/30 13:51:58 hwoarang Exp $
 
 EAPI=5
-inherit autotools eutils pam readme.gentoo
+inherit autotools eutils pam readme.gentoo systemd
 
-TRUNK_VERSION="1.4"
+TRUNK_VERSION="1.8"
 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.gz
+SRC_URI="http://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz
 	mirror://gentoo/introspection-20110205.m4.tar.bz2"
 
 LICENSE="GPL-3 LGPL-3"
@@ -47,8 +47,7 @@ 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 "${FILESDIR}"/${P}-session-wrapper.patch
 	epatch_user
 
 	# Remove bogus Makefile statement. This needs to go upstream
@@ -98,4 +97,6 @@ src_install() {
 	dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
 
 	readme.gentoo_create_doc
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
 }