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

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

4 files changed, 56 insertions, 21 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/Manifest b/x11-misc/lightdm/Manifest
index 8ac9e0c00bb7..24bb77feeba7 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -2,27 +2,28 @@
 Hash: SHA512
 
 AUX lightdm-0.9.7-gtk.patch 915 RMD160 6705c655470de1df7a568c56cd67569257735f36 SHA1 a3946116ad78b4511b75551586a0939d64e19451 SHA256 540a831d53729e97d80b7bc1bccadd1637fe5f1eac2867397d98db1a5228db93
+AUX lightdm-1.0.2-configure.patch 1015 RMD160 5ea3d31f95f5318d351413f1d09e983cf4af8429 SHA1 a24924da266e8ccff5f9d5532e9f3a19428dd94a SHA256 5395266e2e41c31518a07381b45e01e7c1fe80aad4d06de7980c43a489dfe9e2
 DIST lightdm-0.9.8.tar.gz 630165 RMD160 7c3be9a98124425913884fdd34a64b67bf13ece6 SHA1 e2ec7542324f2f5b1274292cbbdfa565c2b491a0 SHA256 48584ed9ff63697ba93648dbcae9f57f70996071a20353ef48a7228ebc7189f1
 DIST lightdm-1.0.2.tar.gz 633166 RMD160 e5ce68d4a89cfa558d79cd9201c8e6a81d698816 SHA1 fc859453768235da064d0f567c19d8e1abc44e28 SHA256 47ca033de6cd083e12d5dc5065bcbbfc1cbd2624bebad397be9eedd426515180
 DIST lightdm-gentoo-patch.tar.gz 101983 RMD160 6463f6d96b635922ac0f060fbffe450caaec6a74 SHA1 63348e477bffa27c82839c74fe56d3bc4565a3b1 SHA256 2e56d0ef3926428cea7870fbade77b20bd05a7664ae301aacc56504e07cf39ba
 EBUILD lightdm-0.9.8.ebuild 3309 RMD160 e400566fb7996f8719cb4e7f84e7dfd5b9b492d5 SHA1 f8c70ce565a91a25340a622cb005c511ce195bc2 SHA256 4d5595e1ec6a4db04b43b183f3b8ee81ccbaf95edb29b7e8c2961341005b482f
-EBUILD lightdm-1.0.2.ebuild 3266 RMD160 5e89a34a4205e2d51fd8df8701bc1243e2adb929 SHA1 1bd1eb171cc197cd15c22779dbddcdc32181c22b SHA256 e61c60278bba6fc4a7292cc386f5337671d95c5224828c487454823fceb19027
-MISC ChangeLog 745 RMD160 18422d3fc5107aa2cbffdf153c2d15f10785ff37 SHA1 5d7b48a8da59f310fb1ca3763d6a33843fab5a24 SHA256 cfe38783d27035ce9ae3248204919588d404fa8cd8e86146b333ef514c52fb2b
+EBUILD lightdm-1.0.2-r1.ebuild 3245 RMD160 5cb6f29596689661b8524a025fc831daa8650a72 SHA1 95d5f6264f0278833bb082e0150581da3cde3cde SHA256 3c1ea8a7c32eaca67a61a17386f46dda9e92bad5a6ab3f38de6e1dd102e0f561
+MISC ChangeLog 990 RMD160 08c53362d3d7bc8523597580a1d4169d80d7e7e2 SHA1 447d999b1583bb746fa92eb83f6941c6fd15a18a SHA256 0209fad18a8a25dd6b077c90f74751ab0ddc3a9cecdd14e5990deb02c11c3338
 MISC metadata.xml 476 RMD160 ffe13acf80a13cf4793170da46aac1087ab9e753 SHA1 6de246984b16415d8e1fe8cab2478ce5b1da4c31 SHA256 a3a8bd4e87cb4735bcc99606498b27552517c024d0ac85b05a7aec35c6c2983d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOjqYmAAoJEPqDWhW0r/LC0aYQAIaTvreIP8CDb4tG4oKdOZJi
-/vVZB9RlE8TFnAIkq98EKRFcTuPWGiKNmEsM37exg/BR206Ve2MvVqgcgxHk1hnL
-bIsG4dhCirusvAWvUhwMUCLe0A/p29IRg7uWKQWB7inLGqsnG+wDBK+wfyMhr5UE
-CFVEn3jgXgLIrz/933YIKMX64vG/3qaxc52xI4kntpBsefp5dfs/mrdf5ZKEiiCf
-l0FLkW81BUVVIgqQgrrXdZg9vKHNU6RN8obVQqwRzdKkCQ2sDp51evD9SpV+VUG2
-NLOR5Hk+fHVPqi5xZZF8hXvtBVKy3QtgLqLPurbtZdmYmMJCZ5t8ruE/7crvrlAp
-I9sc9QZ5ddJxx4iAyBaLN3kqpYkSx92PQvnbzQtonQdAHh0i/k3md3tST5dOdMXs
-zarQ+V+JV/XSxRaS+cijKMbBW+YckJxatI4OQunzB+L8UH81lDTaQBJ0KUASEk6G
-aIjG8QvQT8M8bhOaPz3E0t3BcnbHJE6mtfTVEACn03VlORTdc3IygIaMq+MY9vVn
-zplPnuz/yB46G6xzKBU6mXwQ1tBVekBBUnERSIt8rmYbvV9AHRwaEdR9BPR7rHIX
-y5/JMtoglYbnRbzuPXZBBJFRzXEAGC2lb0YJV/GZn5ZSiUg6Si0cKrwg4CiyDDAI
-S7aO8sB/V4Fx06FtO7Ij
-=fTUM
+iQIcBAEBCgAGBQJOj6BAAAoJEPqDWhW0r/LC/s4QAKMEG3yZXAEyB7UiTGRUuDBy
+/AmCNmcw+6yQg42zpBztwRb+NRdwczJqC03idcrsiCsMnQ2tFCsoVv+4hNwzPZRl
+A44WHj/CSsQBdO4rkY5Gex6k9TDPC8xjhW96Cj0D4mOM707kyMkMuLtetgiWPAvn
+7WgRhRkl1qgggxJMOUYdQhFjVt+En3EOeT+u21iuk0IXZw20irUcI0I4MsdsnaIG
+lu7Hs9Cq0JStf8Jafx2CrgQwaCzpPjaMnhXksUVxDmbSW6PgyPkkd2VPHKEwJBcS
+D4FqdYaD3/xyy6FXKxAndJv2GF4k9ZAaQ7BIIIBU9OPB7yYKMiPNPwjuSb93kIyx
+AKXQbJ8ENGdbVKO3mEnqeRWmgQgZwJVUMLyamE28cHyerAAz/vjywzL5N4e0G+mg
+LcsvSD73GosXGtazVdrS4p9l9tHZE35Jou+2VldGiKzvMtmEFigcTt4QYaSl327B
+w5UnP2BHqw9X6W5vj2FEr6ryEWwbuVrlfVXGNLLrETXFM5dkHexjlCscQlXhLpom
+JTEXXXfTEd2k9cdmgjxMe5VOGGZ4FvyPxEneaIXjuiSyQpu5wfqcPxDSSFvQhR/K
+kvrQuzUdf0k+poYI1i9r4m1C/suFFnMi4BgDeIxFOPalxaY7qPNqGZmvhFDhrp5k
+paf1HV+utWjmCaSGnLQh
+=u63D
 -----END PGP SIGNATURE-----
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
 }