Version bump, bug #214374, thank Leon for report. Make pam optional dependency, bug #119914, thank Marek Marczykowski for suggestion and ideas. Removed unnecessary file.

(Portage version: 2.1.4.4)

3 files changed, 60 insertions, 3 deletions

diff --git a/app-misc/vlock/ChangeLog b/app-misc/vlock/ChangeLog
index 7c73802aec18..94658368d590 100644
--- a/app-misc/vlock/ChangeLog
+++ b/app-misc/vlock/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/vlock
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/vlock/ChangeLog,v 1.25 2007/02/20 20:16:13 eroyf Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/vlock/ChangeLog,v 1.26 2008/05/12 20:51:29 pva Exp $
+
+*vlock-2.2.1 (12 May 2008)
+
+  12 May 2008; Peter Volkov <pva@gentoo.org> -files/vlock.pamd,
+  +vlock-2.2.1.ebuild:
+  Version bump, bug #214374, thank Leon for report. Make pam optional
+  dependency, bug #119914, thank Marek Marczykowski for suggestion and
+  ideas. Removed unnecessary file.
 
   20 Feb 2007; Alexander H. Færøy <eroyf@gentoo.org> vlock-1.3-r2.ebuild:
   Stable on MIPS.
diff --git a/app-misc/vlock/files/vlock.pamd b/app-misc/vlock/files/vlock.pamd
deleted file mode 100644
index 48e7d87358fd..000000000000
--- a/app-misc/vlock/files/vlock.pamd
+++ /dev/null
@@ -1 +0,0 @@
-auth       required     /lib/security/pam_stack.so service=system-auth
diff --git a/app-misc/vlock/vlock-2.2.1.ebuild b/app-misc/vlock/vlock-2.2.1.ebuild
new file mode 100644
index 000000000000..0a591c541d65
--- /dev/null
+++ b/app-misc/vlock/vlock-2.2.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/vlock/vlock-2.2.1.ebuild,v 1.1 2008/05/12 20:51:29 pva Exp $
+
+inherit eutils pam toolchain-funcs
+
+DESCRIPTION="A console screen locker"
+HOMEPAGE="http://cthulhu.c3d2.de/~toidinamai/vlock/vlock.html"
+SRC_URI="http://cthulhu.c3d2.de/~toidinamai/vlock/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="pam"
+
+DEPEND="pam? ( sys-libs/pam )"
+
+pkg_setup() {
+	enewgroup vlock
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i "s:LDFLAGS +=:LDLIBS +=:" Makefile # Fix --as-needed
+	sed -i 's:$(LD):$(CC):' modules/Makefile # Fix --as-needed
+}
+
+src_compile() {
+	if use pam; then
+		myconf="--enable-pam"
+	else
+		myconf="--enable-shadow"
+	fi
+	# this package has handmade configure system which fails with econf...
+	./configure --prefix=/usr \
+				--mandir=/usr/share/man \
+				${myconf} \
+				CC="$(tc-getCC)" \
+				LD="$(tc-getLD)" \
+				CFLAGS="${CFLAGS} -pedantic -std=gnu99" \
+				LDFLAGS="${LDFLAGS}" || die "configure failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	use pam && pamd_mimic_system vlock auth
+	dodoc ChangeLog PLUGINS README README.X11 SECURITY STYLE TODO
+}