fix upstream bug, tarball contains pre-made lxdm.conf, making greeter= pointing to...

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

diff --git a/lxde-base/lxdm/ChangeLog b/lxde-base/lxdm/ChangeLog
index 31c0952f489d5625651bb3b776ebaec8566181e8..d64f9fe0adcda456be308fdb4b59e785a1fbb4cd 100644 (file)
--- a/lxde-base/lxdm/ChangeLog
+++ b/lxde-base/lxdm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for lxde-base/lxdm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxdm/ChangeLog,v 1.9 2011/08/02 16:44:29 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxdm/ChangeLog,v 1.10 2011/08/03 16:07:53 lxnay Exp $
+
+*lxdm-0.4.1-r1 (03 Aug 2011)
+
+  03 Aug 2011; Fabio Erculiani <lxnay@gentoo.org> -lxdm-0.4.1.ebuild,
+  +lxdm-0.4.1-r1.ebuild:
+  fix upstream bug, tarball contains pre-made lxdm.conf, making greeter=
+  pointing to /usr/local
 
   02 Aug 2011; Fabio Erculiani <lxnay@gentoo.org> lxdm-0.4.1.ebuild,
   +files/lxdm-0.4.1-git-fix-null-pointer-deref.patch:

diff --git a/lxde-base/lxdm/Manifest b/lxde-base/lxdm/Manifest
index 81d9383f86f863816b293ab61e9ddcac5a225e79..3e74c4f19f67c39ca1498a887d71fd690fa4eb83 100644 (file)
--- a/lxde-base/lxdm/Manifest
+++ b/lxde-base/lxdm/Manifest
@@ -8,6 +8,6 @@ DIST lxdm-0.3.0.tar.gz 271373 RMD160 989868e611df4aafe817eaca399ca54155e3dc16 SH
 DIST lxdm-0.4.1.tar.gz 296714 RMD160 cacb103b8ac90b3afa450e9dee3ec01ed0c69a12 SHA1 652886ac27ac01b24e7d13c3be3b1e582e2159cc SHA256 9e0d0a5672fcf31a18de8178ce73eab1723d6ae7097dfe41e9fe2c46e180cf08
 EBUILD lxdm-0.3.0-r1.ebuild 1314 RMD160 2b64fcd1108d941c2beafbb4d447bc3117b3deda SHA1 e533d98abd0ade2df7cf1dcbaacbf2d4caea6832 SHA256 82b63bcb28671761b43ab72869956e93b532c0d8726d3eb1d370f725f1f2877a
 EBUILD lxdm-0.3.0-r3.ebuild 1504 RMD160 d16106d0379a81f4558a2dc0524df83ede24710c SHA1 53176d1965d8480df11382f5cc2c7bf112658f50 SHA256 f12a450fa8009699e271b340033ec4f30b490990cf26040548670b0f9c568657
-EBUILD lxdm-0.4.1.ebuild 1503 RMD160 3c3bf18b6e6082c6a4403a3055a50758062d6f2f SHA1 6851a4314963ef30fa9dcf53cc9aba2609445c4f SHA256 c4f1f6f5ebfdc792dcf3b483615ee44f917e395124f09e992ef1914e7082799b
-MISC ChangeLog 1926 RMD160 094b9653d4df14d06d712f9c062b45165e6d9844 SHA1 0cb72507072fc8679ec7d4db3fbb9cc0c2c34319 SHA256 f2af467bfd9851253dad8ef8cf5b8d88de70cb7993a7b669f908b9a79d1c80b6
+EBUILD lxdm-0.4.1-r1.ebuild 1593 RMD160 ac8e9959c3acbcf5593aafaec7a26b4ad6f209e4 SHA1 c236891a0962920f2be88bf2b1859baf091867a4 SHA256 66be29bea86e4183c37d102cb543f49e588b332872a3bd329e87389900a0a951
+MISC ChangeLog 2151 RMD160 9173d28ce2610e5ce4b5f495653fdf1959c1f8fd SHA1 6388b892bcc02fdd9d5ff0b541035bf8feb1279b SHA256 6d413e4bdfad064fab3de2630e1908d5af81a36707ac5b40e794674ecfde6ea1
 MISC metadata.xml 307 RMD160 780146af5f44d5a94235167d9f27fa430e374101 SHA1 c018aecad3148053495b66d84c45f17bf7c5d5c6 SHA256 854f7a5d79f761b1a129a5f227d74854cd4a5e62827fe6022cddd8dfc2a4b264

diff --git a/lxde-base/lxdm/lxdm-0.4.1.ebuild b/lxde-base/lxdm/lxdm-0.4.1-r1.ebuild
similarity index 87%
rename from lxde-base/lxdm/lxdm-0.4.1.ebuild
rename to lxde-base/lxdm/lxdm-0.4.1-r1.ebuild
index d03562c5d7d7bdd32bc91fbdd8052a5e99fd25a6..44a5ec8e52a2893803fc3278f849cfb65cee05c2 100644 (file)
--- a/lxde-base/lxdm/lxdm-0.4.1.ebuild
+++ b/lxde-base/lxdm/lxdm-0.4.1-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/lxde-base/lxdm/lxdm-0.4.1.ebuild,v 1.2 2011/08/02 16:44:29 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxdm/lxdm-0.4.1-r1.ebuild,v 1.1 2011/08/03 16:07:53 lxnay Exp $
 
 EAPI="2"
 
@@ -38,6 +38,9 @@ src_configure() {
 }
 
 src_prepare() {
+       # Upstream bug, tarball contains pre-made lxdm.conf
+       rm "${S}"/data/lxdm.conf || die
+
        # There is consolekit
        epatch "${FILESDIR}/${P}-pam_console-disable.patch"
        # Fix null pointer dereference, backported from git