Add imlib and pam useflags, see bug #220425.

(Portage version: 2.1.5_rc10)

2 files changed, 26 insertions, 15 deletions

diff --git a/x11-misc/alock/ChangeLog b/x11-misc/alock/ChangeLog
index 7c38e813456d..3c91889bf821 100644
--- a/x11-misc/alock/ChangeLog
+++ b/x11-misc/alock/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/alock
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alock/ChangeLog,v 1.12 2008/03/23 00:39:25 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alock/ChangeLog,v 1.13 2008/05/12 08:42:34 nelchael Exp $
+
+  12 May 2008; Krzysiek Pawlik <nelchael@gentoo.org> alock-60-r3.ebuild:
+  Add imlib and pam useflags, see bug #220425.
 
   22 Mar 2008; Santiago M. Mola <coldwind@gentoo.org> alock-60-r3.ebuild:
   amd64 stable, clean up and add desktop-misc to herd.
diff --git a/x11-misc/alock/alock-60-r3.ebuild b/x11-misc/alock/alock-60-r3.ebuild
index da0db0454f2f..8e9b34c39cc2 100644
--- a/x11-misc/alock/alock-60-r3.ebuild
+++ b/x11-misc/alock/alock-60-r3.ebuild
@@ -1,33 +1,30 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alock/alock-60-r3.ebuild,v 1.4 2008/03/23 00:39:25 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alock/alock-60-r3.ebuild,v 1.5 2008/05/12 08:42:34 nelchael Exp $
 
 inherit eutils
 
 DESCRIPTION="locks the local X display until a password is entered"
-HOMEPAGE="
-	http://code.google.com/p/alock/
-	http://darkshed.net/projects/alock
-"
+HOMEPAGE="http://code.google.com/p/alock/
+	http://darkshed.net/projects/alock"
 SRC_URI="http://alock.googlecode.com/files/alock-svn-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE=""
+IUSE="imlib pam"
 
-DEPEND="
-	x11-libs/libX11
+DEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm
-	media-libs/imlib2
-"
-RDEPEND=""
+	imlib? ( media-libs/imlib2 )
+	pam? ( virtual/pam )"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/alock-svn-${PV}
 
 pkg_setup() {
-	if ! built_with_use media-libs/imlib2 X ; then
+	if use imlib && ! built_with_use media-libs/imlib2 X ; then
 		eerror "media-libs/imlib2 has to be built with X support"
 		die "emerge media-libs/imlib2 with USE=\"X\""
 	fi
@@ -40,8 +37,11 @@ src_unpack() {
 }
 
 src_compile() {
-	econf --with-all || die
-	emake || die
+	econf --with-all \
+		$(use_with pam) \
+		$(use_with imlib) \
+	|| die "configure failed"
+	emake || die "make failed"
 }
 
 src_install() {
@@ -55,3 +55,11 @@ src_install() {
 	insinto /usr/share/alock/bitmaps
 	doins bitmaps/*
 }
+
+pkg_postinst() {
+	if ! use pam; then
+		einfo "pam support disabled"
+		einfo "In order to authenticate against /etc/passwd, "
+		einfo "/usr/bin/alock will need to be SUID"
+	fi
+}