#79770: fixed unconditional enabling of --enable-xlockrc if pam is unset

Package-Manager: portage-2.0.51.22-r1

4 files changed, 16 insertions, 10 deletions

diff --git a/x11-misc/xlockmore/ChangeLog b/x11-misc/xlockmore/ChangeLog
index eb7e602e5638..c2d1c41f3444 100644
--- a/x11-misc/xlockmore/ChangeLog
+++ b/x11-misc/xlockmore/ChangeLog
@@ -1,6 +1,12 @@
 # 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.22 2005/06/17 00:50:00 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/ChangeLog,v 1.23 2005/06/22 22:03:57 smithj Exp $
+
+*xlockmore-5.17-r1 (22 Jun 2005)
+
+  22 Jun 2005; Jonathan Smith <smithj@gentoo.org> -xlockmore-5.17.ebuild,
+  +xlockmore-5.17-r1.ebuild:
+  #79770: fixed unconditional enabling of --enable-xlockrc if pam is unset
 
 *xlockmore-5.17 (17 Jun 2005)
 
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 577fd2b26204..247e4aebccb8 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 359df955d0d5bb3a4fd543ab0ce176d7 ChangeLog 5846
+MD5 f9b1c12e8b54f6e0f092ebfb14b1da9d ChangeLog 6059
 MD5 fe402b096905cae8dcb4a503d3a838ac metadata.xml 173
 MD5 86689f8d562ebfd5bca7dee1fa917d1e xlockmore-5.12.ebuild 1949
 MD5 c6f1a4e879834678c01995fe2cf9e449 xlockmore-5.18.ebuild 1581
-MD5 c5bacf1dc9b9e8ffdfb36990f4c4bede xlockmore-5.17.ebuild 1581
+MD5 a82440203528cec2c002f01f45ece0e2 xlockmore-5.17-r1.ebuild 1596
 MD5 65f2645fbf61038ec856ee0a3897c587 files/XLock.ad.patch 773
 MD5 be40cedb5d46e442958e0a182a87380c files/digest-xlockmore-5.12 68
 MD5 69d208099f30b11e0bffa0fcfd210cac files/digest-xlockmore-5.18 68
-MD5 9f4d2fc6b5d4094cf494e606b957e8a4 files/digest-xlockmore-5.17 68
+MD5 9f4d2fc6b5d4094cf494e606b957e8a4 files/digest-xlockmore-5.17-r1 68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCsh5el5AvwDPiUowRAkseAKDS9k2nVySmvksjbE5gKiGZkoG98gCfeFUy
-fE265rwEkbwuMW5uvlOMVhY=
-=3ZcN
+iD8DBQFCueB0l5AvwDPiUowRAoZMAKDXCsjCxSeproGyIuCp39UyAMzCwwCgnAzu
+NCnCbtlft7otX2zMtP3s5zE=
+=kHQj
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xlockmore/files/digest-xlockmore-5.17 b/x11-misc/xlockmore/files/digest-xlockmore-5.17-r1
index b2a1e08c2e90..b2a1e08c2e90 100644
--- a/x11-misc/xlockmore/files/digest-xlockmore-5.17
+++ b/x11-misc/xlockmore/files/digest-xlockmore-5.17-r1
diff --git a/x11-misc/xlockmore/xlockmore-5.17.ebuild b/x11-misc/xlockmore/xlockmore-5.17-r1.ebuild
index 10a2559151c9..104eb0f8c23d 100644
--- a/x11-misc/xlockmore/xlockmore-5.17.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.17-r1.ebuild
@@ -1,10 +1,10 @@
 # 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.17.ebuild,v 1.1 2005/06/17 00:50:00 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/xlockmore-5.17-r1.ebuild,v 1.1 2005/06/22 22:03:57 smithj Exp $
 
 inherit gnuconfig eutils pam
 
-IUSE="nas esd motif opengl truetype gtk pam"
+IUSE="nas esd motif opengl truetype gtk pam xlockrc"
 
 DESCRIPTION="Just another screensaver application for X"
 SRC_URI="http://ftp.tux.org/pub/tux/bagleyd/${PN}/${P}.tar.bz2"
@@ -26,8 +26,8 @@ DEPEND="virtual/x11
 src_compile() {
 
 	local myconf
-	use pam || myconf="${myconf} --enable-xlockrc"
 
+	use xlockrc && myconf="${myconf} --enable-xlockrc"
 	use opengl || myconf="${myconf} --without-opengl --without-gltt --without-mesa"
 
 	econf \