Make webkit greeter optional, add missing doc flag and dependencies.

Package-Manager: portage-2.2_rc73/cvs/Linux x86_64

5 files changed, 87 insertions, 22 deletions

diff --git a/x11-misc/lightdm/ChangeLog b/x11-misc/lightdm/ChangeLog
index 629e82f0c9f0..2ea515b4a8f3 100644
--- a/x11-misc/lightdm/ChangeLog
+++ b/x11-misc/lightdm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/lightdm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.1 2010/09/07 18:35:47 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.2 2010/09/08 07:09:21 xarthisius Exp $
+
+  08 Sep 2010; Kacper Kowalik <xarthisius@gentoo.org> lightdm-0.1.1.ebuild,
+  +files/lightdm-0.1.1-webkit.patch, metadata.xml:
+  Make webkit greeter optional, add missing doc flag and dependencies.
 
 *lightdm-0.1.1 (07 Sep 2010)
 
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 0321892ab52e..a5b9e518c993 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -1,16 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX lightdm-0.1.1-webkit.patch 1735 RMD160 2d0b1133a9bafe157ed08a92dbcb0a704b2b073d SHA1 ebe249cbea4fe4d7fec4fe8aae5a82d0afd1db0e SHA256 7970341481d45a386f473f440907ae55b58aff3ff62b7a73f81c22e985820b8b
 DIST lightdm-0.1.1.tar.gz 827695 RMD160 20d1be2c0ae9df9bd57229202e1bfdfcaf765c46 SHA1 2cb3e9d284828f43c8080d343ad5c23fc025b356 SHA256 0c0a25d563ff1b8edf1ff40ee773da0dc72aef8ae58903adb92263ddbe22d6ee
-EBUILD lightdm-0.1.1.ebuild 1496 RMD160 fa669bdd7be5035b2705a58a4ac28f19959682a1 SHA1 d70f902ba0c31b0359bdac1ec39ba8e835f735bb SHA256 cd4d851ae4e8096f02b40e42519bb77f88b9af6c163da9cac629c7b8f14f7599
-MISC ChangeLog 427 RMD160 84eaa6043901ebb3328ab9a3840bc63919404cd2 SHA1 9c8d4e75340d4e14f41eb04e3782c67e36b630c2 SHA256 8c23ec82e9dfa772256f8a590be33c32c84763d4849ec924fddda34f21ff5128
-MISC metadata.xml 601 RMD160 4e1fcd83debc6aaff0cc75b9092e305e76f39f76 SHA1 3cd1006c7dde9a5f36c1d65243c472aaa2b0af3b SHA256 5f01a6294620929cb0f441532f707b3b0b0e0aa0708ff2d66ce119e9090c70c3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iJwEAQECAAYFAkyGhgwACgkQIiMqcbOVdxTv0gP+PqnGwM7B5WuuJQhIQ1Xxd/9k
-x+vXvEunjLnmyti08EEpnaYP2U9e79S1o3B/NjYnmuCX8JO2/XWULg+ZIkyafRPc
-UAogfHkAXnBNjVcaYts7p41TIdh5FUZ47pR4eFs0XKmn4tvWR0GZqPdAaiMO5Nxj
-O6yaXJRFE8Y7919vvuw=
-=G6QN
------END PGP SIGNATURE-----
+EBUILD lightdm-0.1.1.ebuild 1638 RMD160 12646c1af39a151c0198ed1ca8356a0135a422ea SHA1 9f5f8ca3ade6de02212d16a455b183b0f6a93ad0 SHA256 a878d39141f98f0ced3e8e90300c7f9ed4411002fbbd55686bb12f0b7003a3fc
+MISC ChangeLog 626 RMD160 19f43758f01397b94caa0208c0da6d55839f13ed SHA1 85e6e83a8c7cad4305276c84a562fbf3392150e2 SHA256 baa5063aef34967d52ab605204c211ec5d1a38bedbc29bf0eb903b54a873e59f
+MISC metadata.xml 685 RMD160 995e95e96fe048faa98b62a7d80e9239b667185e SHA1 19421f10a235a09ec78cf6732859200021209dda SHA256 3aa93a8186d0176045b192052c3cc19ece173c616a1dd8504412c5dc4ec69f2e
diff --git a/x11-misc/lightdm/files/lightdm-0.1.1-webkit.patch b/x11-misc/lightdm/files/lightdm-0.1.1-webkit.patch
new file mode 100644
index 000000000000..5fc49ce45343
--- /dev/null
+++ b/x11-misc/lightdm/files/lightdm-0.1.1-webkit.patch
@@ -0,0 +1,66 @@
+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.1.ebuild b/x11-misc/lightdm/lightdm-0.1.1.ebuild
index 29e2cb9d2d09..134b58d5886d 100644
--- a/x11-misc/lightdm/lightdm-0.1.1.ebuild
+++ b/x11-misc/lightdm/lightdm-0.1.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-0.1.1.ebuild,v 1.1 2010/09/07 18:35:47 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-0.1.1.ebuild,v 1.2 2010/09/08 07:09:21 xarthisius Exp $
 
 EAPI=2
 
-inherit eutils pam
+inherit autotools eutils pam
 
 DESCRIPTION="A lightweight display manager"
 HOMEPAGE="http://launchpad.net/lightdm"
@@ -13,19 +13,20 @@ SRC_URI="http://people.ubuntu.com/~robert-ancell/${PN}/releases/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="consolekit nls"
+IUSE="consolekit doc nls webkit"
 
 RDEPEND="dev-libs/glib:2
 	dev-libs/dbus-glib
-	net-libs/webkit-gtk
+	webkit? ( net-libs/webkit-gtk )
+	consolekit? ( sys-auth/consolekit )
 	x11-libs/gtk+:2
 	x11-libs/libxcb
 	x11-libs/libXdmcp
 	x11-libs/libxklavier
-	consolekit? ( sys-auth/consolekit )
 	virtual/pam"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
+	doc? ( dev-util/gtk-doc )
 	nls? ( dev-util/intltool )"
 
 src_prepare() {
@@ -33,15 +34,19 @@ src_prepare() {
 	sed -e "s/check_pass/${PN}/" -i src/pam-session.c || die #report me upstream
 	# Fix ubuntu way of launching WM
 	sed -e "s:/etc/X11/Xsession::" -i src/display.c || die #report me upstream
+
+	epatch "${FILESDIR}"/${P}-webkit.patch
+	eautoreconf
 }
 
 src_configure() {
 	econf \
 		--disable-static \
+		$(use_enable doc gtk-doc) \
+		$(use_enable webkit) \
 		--disable-dependency-tracking \
 		--disable-introspection \
 		$(use_enable consolekit console-kit) \
-		--disable-scrollkeeper \
 		$(use_enable nls) \
 		--with-html-dir=/usr/share/doc/${PF}/html \
 		--localstatedir=/var  #overcoming econf default (fix me?)
diff --git a/x11-misc/lightdm/metadata.xml b/x11-misc/lightdm/metadata.xml
index 22158347ab8e..636e5b0f3ad7 100644
--- a/x11-misc/lightdm/metadata.xml
+++ b/x11-misc/lightdm/metadata.xml
@@ -11,5 +11,6 @@
 	</longdescription>
 	<use>
 	  <flag name="consolekit">Enables support for authorization using consolekit</flag>
+	  <flag name="webkit">Build greeter based on <pkg>net-libs/webkit-gtk</pkg></flag>
     </use>
 </pkgmetadata>