experimental fix for 5.18 line, which is still masked

(Portage version: 2.0.51.22-r1)

4 files changed, 23 insertions, 16 deletions

diff --git a/x11-misc/xlockmore/ChangeLog b/x11-misc/xlockmore/ChangeLog
index af53d3f6f915..67f0d9e26845 100644
--- a/x11-misc/xlockmore/ChangeLog
+++ b/x11-misc/xlockmore/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xlockmore
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/ChangeLog,v 1.26 2005/06/22 22:50:12 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/ChangeLog,v 1.27 2005/06/25 22:43:08 smithj Exp $
+
+*xlockmore-5.18-r2 (25 Jun 2005)
+
+  25 Jun 2005; Jonathan Smith <smithj@gentoo.org>
+  +files/xlock-5.18-this-should-not-work.patch, -xlockmore-5.18-r1.ebuild,
+  +xlockmore-5.18-r2.ebuild:
+  experimental fix for 5.18 line, which is still masked
 
   22 Jun 2005; Jonathan Smith <smithj@gentoo.org> xlockmore-5.17-r1.ebuild,
   xlockmore-5.18-r1.ebuild:
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index ba923076fcb6..46a32d62d490 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e72edae4bc9149e96df7e1e28fa94376 ChangeLog 6529
+MD5 29c1454ce4367fcad977e1ff16d2f146 ChangeLog 6774
 MD5 fe402b096905cae8dcb4a503d3a838ac metadata.xml 173
 MD5 86689f8d562ebfd5bca7dee1fa917d1e xlockmore-5.12.ebuild 1949
-MD5 76b8d5fafdc14bee49c0167418ef8a8f xlockmore-5.18-r1.ebuild 1697
 MD5 2ad90a3b397db6e2c0fd0625eb4bb5a8 xlockmore-5.17-r1.ebuild 1697
+MD5 6d182ba6040806e6dca86e73faa70295 xlockmore-5.18-r2.ebuild 1917
 MD5 65f2645fbf61038ec856ee0a3897c587 files/XLock.ad.patch 773
 MD5 be40cedb5d46e442958e0a182a87380c files/digest-xlockmore-5.12 68
 MD5 9f4d2fc6b5d4094cf494e606b957e8a4 files/digest-xlockmore-5.17-r1 68
-MD5 69d208099f30b11e0bffa0fcfd210cac files/digest-xlockmore-5.18-r1 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCuetTl5AvwDPiUowRAtmEAKDBYsfKTuWv72QN2t0cFOs3CdwFFACeKvOB
-N5QQIgy8kB1OKOaQuvl+Xpg=
-=53aC
------END PGP SIGNATURE-----
+MD5 69d208099f30b11e0bffa0fcfd210cac files/digest-xlockmore-5.18-r2 68
diff --git a/x11-misc/xlockmore/files/digest-xlockmore-5.18-r1 b/x11-misc/xlockmore/files/digest-xlockmore-5.18-r2
index 774638b3c077..774638b3c077 100644
--- a/x11-misc/xlockmore/files/digest-xlockmore-5.18-r1
+++ b/x11-misc/xlockmore/files/digest-xlockmore-5.18-r2
diff --git a/x11-misc/xlockmore/xlockmore-5.18-r1.ebuild b/x11-misc/xlockmore/xlockmore-5.18-r2.ebuild
index bbca8c276682..299bb87fa24a 100644
--- a/x11-misc/xlockmore/xlockmore-5.18-r1.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.18-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/xlockmore-5.18-r1.ebuild,v 1.2 2005/06/22 22:50:12 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/xlockmore-5.18-r2.ebuild,v 1.1 2005/06/25 22:43:08 smithj Exp $
 
 inherit gnuconfig eutils pam flag-o-matic
 
@@ -23,8 +23,18 @@ DEPEND="virtual/x11
 	motif? ( x11-libs/openmotif )
 	gtk? ( =x11-libs/gtk+-1.2* )"
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
+	cd ${S}/xlock
+
+	# fixes stupid pam bug for #96212
+	einfo "patching passwd.c"
+	sed -e '/pam_error = pam_acct_mgmt(pamh, 0);/a\
+		fprintf("stupid pam fix %s/n", &pam_error);' \
+		-i passwd.c
+}
 
+src_compile() {
 	local myconf
 
 	use xlockrc && myconf="${myconf} --enable-xlockrc"