Version bump.

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

4 files changed, 59 insertions, 125 deletions

diff --git a/x11-misc/lightdm/ChangeLog b/x11-misc/lightdm/ChangeLog
index c57ea3032c19..10710eae2c58 100644
--- a/x11-misc/lightdm/ChangeLog
+++ b/x11-misc/lightdm/ChangeLog
@@ -1,6 +1,11 @@
 # 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.5 2011/03/21 23:28:06 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.6 2011/03/28 18:48:47 ssuominen Exp $
+
+*lightdm-0.2.3 (28 Mar 2011)
+
+  28 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> +lightdm-0.2.3.ebuild:
+  Version bump.
 
   21 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> lightdm-0.1.1.ebuild,
   lightdm-0.1.2.ebuild:
diff --git a/x11-misc/lightdm/files/lightdm-0.1.1-webkit.patch b/x11-misc/lightdm/files/lightdm-0.1.1-webkit.patch
deleted file mode 100644
index 5fc49ce45343..000000000000
--- a/x11-misc/lightdm/files/lightdm-0.1.1-webkit.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Make webkit-greeter optional
-
---- greeters/Makefile.am
-+++ greeters/Makefile.am	2010-09-07 22:14:42.287187204 +0200
-@@ -1,4 +1,7 @@
--libexec_PROGRAMS = ldm-gtk-greeter ldm-webkit-greeter
-+libexec_PROGRAMS = ldm-gtk-greeter
-+if WEBKIT
-+  libexec_PROGRAMS += ldm-webkit-greeter
-+endif
- 
- LIBGREETER_LIB = $(top_builddir)/libldmgreeter/libldmgreeter.la
- LIBGREETER_CFLAGS = \
---- configure.ac
-+++ configure.ac
-@@ -9,10 +9,11 @@
- AC_PROG_LIBTOOL
- AM_MAINTAINER_MODE
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)])
-+PKG_PROG_PKG_CONFIG
- 
- GOBJECT_INTROSPECTION_CHECK(0.6.7)
- 
--GNOME_COMPILE_WARNINGS(maximum)
-+dnl GNOME_COMPILE_WARNINGS(maximum)
- 
- dnl ###########################################################################
- dnl Dependencies
-@@ -66,11 +67,16 @@
-     dbus-glib-1
- ])
- 
--PKG_CHECK_MODULES(LIGHTDM_WKGREETER, [
--    gtk+-2.0
--    webkit-1.0
--    dbus-glib-1
-+AC_ARG_ENABLE([webkit], AC_HELP_STRING([--enable-webkit],[Build with webkit interface]))
-+
-+AS_IF([test "x$enable_webkit" != "xno"], [
-+    PKG_CHECK_MODULES(LIGHTDM_WKGREETER, [
-+       gtk+-2.0
-+       webkit-1.0
-+       dbus-glib-1
-+    ])
- ])
-+AM_CONDITIONAL([WEBKIT], [test x$webkit = xtrue])
- 
- AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
- AC_PATH_PROG(DBUSBINDINGTOOL, dbus-binding-tool)
-@@ -190,7 +196,7 @@
- dnl Documentation
- dnl ###########################################################################
- 
--GNOME_DOC_INIT
-+dnl GNOME_DOC_INIT
- GTK_DOC_CHECK
- 
- dnl ###########################################################################
---- Makefile.am
-+++ Makefile.am
-@@ -1,3 +1,5 @@
-+ACLOCAL_AMFLAGS = -I m4
-+
- SUBDIRS = libldmgreeter data greeters po src themes doc
- 
- DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc
diff --git a/x11-misc/lightdm/lightdm-0.1.2.ebuild b/x11-misc/lightdm/lightdm-0.1.2.ebuild
deleted file mode 100644
index 06b5a4d6c5bf..000000000000
--- a/x11-misc/lightdm/lightdm-0.1.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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-0.1.2.ebuild,v 1.3 2011/03/21 23:28:06 nirbheek Exp $
-
-EAPI=2
-inherit autotools eutils pam
-
-DESCRIPTION="A lightweight display manager"
-HOMEPAGE="http://launchpad.net/lightdm"
-SRC_URI="http://people.ubuntu.com/~robert-ancell/${PN}/releases/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="consolekit +introspection nls webkit"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/dbus-glib
-	x11-libs/gtk+:2
-	x11-libs/libxcb
-	x11-libs/libXdmcp
-	x11-libs/libxklavier
-	virtual/pam
-	consolekit? ( sys-auth/consolekit )
-	introspection? ( dev-libs/gobject-introspection )
-	webkit? ( net-libs/webkit-gtk:2 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( dev-util/intltool )"
-
-src_prepare() {
-	# hardcoded service name to start PAM session
-	sed -i -e "s:check_pass:${PN}:" src/pam-session.c || die
-	# Fix ubuntu way of launching WM
-	sed -i -e "s:/etc/X11/Xsession::" src/display.c || die
-
-	epatch "${FILESDIR}"/${PN}-0.1.1-webkit.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--disable-dependency-tracking \
-		--disable-static \
-		$(use_enable webkit) \
-		$(use_enable introspection) \
-		$(use_enable consolekit console-kit) \
-		$(use_enable nls) \
-		--with-html-dir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	pamd_mimic system-local-login lightdm auth account session
-	dodoc ChangeLog NEWS
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/x11-misc/lightdm/lightdm-0.2.3.ebuild b/x11-misc/lightdm/lightdm-0.2.3.ebuild
new file mode 100644
index 000000000000..c4f77e89f3b1
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-0.2.3.ebuild
@@ -0,0 +1,53 @@
+# 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-0.2.3.ebuild,v 1.1 2011/03/28 18:48:47 ssuominen Exp $
+
+EAPI=4
+inherit pam
+
+DESCRIPTION="A lightweight display manager"
+HOMEPAGE="http://launchpad.net/lightdm"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz
+	http://people.ubuntu.com/~robert-ancell/${PN}/releases/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection qt4"
+
+RDEPEND=">=dev-libs/dbus-glib-0.88
+	net-libs/webkit-gtk
+	virtual/pam
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXdmcp
+	x11-libs/libxklavier
+	introspection? ( dev-libs/gobject-introspection )
+	qt4? ( x11-libs/qt-gui:4 )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+src_configure() {
+	local default=gnome
+	has_version xfce-base/xfce4-meta && default=xfce
+
+	econf \
+		--localstatedir=/var \
+		--disable-static \
+		--disable-dependency-tracking \
+		$(use_enable introspection) \
+		$(use_enable qt4 liblightdm-qt) \
+		--with-default-session=${default} \
+		--with-html-dir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -exec rm -f {} +
+
+	pamd_mimic system-local-login lightdm auth account session
+}