Apply yet another patch to fix regression due to typos by upstream

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

3 files changed, 40 insertions, 6 deletions

diff --git a/x11-misc/lightdm/ChangeLog b/x11-misc/lightdm/ChangeLog
index 40acac64c24d..93210a392436 100644
--- a/x11-misc/lightdm/ChangeLog
+++ b/x11-misc/lightdm/ChangeLog
@@ -1,6 +1,12 @@
 # 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.10 2011/10/07 07:11:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.11 2011/10/08 00:58:35 hwoarang Exp $
+
+*lightdm-1.0.2-r1 (08 Oct 2011)
+
+  08 Oct 2011; Markos Chandras <hwoarang@gentoo.org> -lightdm-1.0.2.ebuild,
+  +lightdm-1.0.2-r1.ebuild, +files/lightdm-1.0.2-configure.patch:
+  Apply yet another patch to fix regression due to typos by upstream
 
 *lightdm-1.0.2 (07 Oct 2011)
 
diff --git a/x11-misc/lightdm/files/lightdm-1.0.2-configure.patch b/x11-misc/lightdm/files/lightdm-1.0.2-configure.patch
new file mode 100644
index 000000000000..ff205809c89b
--- /dev/null
+++ b/x11-misc/lightdm/files/lightdm-1.0.2-configure.patch
@@ -0,0 +1,29 @@
+Index: lightdm-1.0.2/configure.ac
+===================================================================
+--- lightdm-1.0.2.orig/configure.ac
++++ lightdm-1.0.2/configure.ac
+@@ -13,8 +13,6 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_R
+ 
+ GOBJECT_INTROSPECTION_CHECK(0.9.5)
+ 
+-GNOME_COMPILE_WARNINGS(maximum)
+-
+ dnl ###########################################################################
+ dnl Dependencies
+ dnl ###########################################################################
+@@ -124,12 +122,12 @@ AC_ARG_ENABLE(gtk-greeter,
+ compile_gtk_greeter=no
+ if test x"$enable_gtk_greeter" = "xauto"; then
+     PKG_CHECK_MODULES(LIGHTDM_GTK_GREETER, [
+-        gtk+-3.0
++        gtk+-2.0
+         gmodule-export-2.0
+     ], compile_gtk_greeter=yes, compile_gtk_greeter=no)
+-elif test x"enable_gtk_greeter" = "xyes"; then
++elif test x"$enable_gtk_greeter" = "xyes"; then
+     PKG_CHECK_MODULES(LIGHTDM_GTK_GREETER, [
+-        gtk+-3.0
++        gtk+-2.0
+         gmodule-export-2.0
+     ])
+     compile_gtk_greeter=yes
diff --git a/x11-misc/lightdm/lightdm-1.0.2.ebuild b/x11-misc/lightdm/lightdm-1.0.2-r1.ebuild
index 1d038c766676..2aa89422f2d7 100644
--- a/x11-misc/lightdm/lightdm-1.0.2.ebuild
+++ b/x11-misc/lightdm/lightdm-1.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-1.0.2.ebuild,v 1.1 2011/10/07 07:11:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.0.2-r1.ebuild,v 1.1 2011/10/08 00:58:35 hwoarang Exp $
 
 EAPI=4
 inherit autotools eutils pam
@@ -37,11 +37,10 @@ REQUIRED_USE="branding? ( gtk ) || ( gtk qt4 )"
 DOCS=( NEWS )
 
 src_prepare() {
-	# remove GNOME_COMPILE_WARNING reference which requires
-	# gnome-base/gnome-common dependency.
-	sed -i -e "/GNOME_COMPILE_WARNING/d" "${S}"/configure.ac || die
-	# Hide users with uid < 1000
 	sed -i -e "/minimum-uid/s:500:1000:" "${S}"/data/users.conf	|| die
+	# Fix configure.ac since upstream since unable to apply patches without
+	# introducing regressions for trying to be smart.
+	epatch "${FILESDIR}"/${P}-configure.patch
 	eautoreconf
 }