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

Package-Manager: portage-2.1.4.4

4 files changed, 63 insertions, 5 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/Manifest b/app-misc/vlock/Manifest
index 9a9ca13b0352..669e3fbe0f53 100644
--- a/app-misc/vlock/Manifest
+++ b/app-misc/vlock/Manifest
@@ -1,5 +1,6 @@
-AUX vlock.pamd 71 RMD160 bbdb2b86cc3c8834c5a692e3bd3a64bd7b41eb8f SHA1 ab954326cbac1c6b6d4044ed7b337b7dc144eb69 SHA256 1cd4f0884d1bd6a0ada71a510263ee88152b5ecc0d818cfb29b888f7a80ae08f
 DIST vlock-1.3.tar.gz 17188 RMD160 434ec6613476efb9386597ac44857d993fb70d47 SHA1 5da5f905bbba1c8dbcae0513668c46c908a1089e SHA256 700b8f45b6b7cdaac2185a4796870ac378015db18a7414eebee5e5b6a4131daf
+DIST vlock-2.2.1.tar.gz 54381 RMD160 55f3cb072fad95c4fcf1a42f33a98fe00948e4c2 SHA1 669f0997a835a7980082b2df7e5fc2de7a92c18c SHA256 11fa31b0cdc9e936cd114384db09b36981c412af7e23db83368d7c40677a031c
 EBUILD vlock-1.3-r2.ebuild 895 RMD160 98e8bcf9549d6ddcd0ea9331db2460289421dabf SHA1 38f510a80529717e7da5e155e1e04d16ca1216eb SHA256 508e970bcf66571ecb05577b5f85b94784cc8f7c78f05dd4221acb3390d365fa
-MISC ChangeLog 3017 RMD160 69d3282056a6aff04ebdc90edbb42427cc1400c7 SHA1 0f67c20afeb48421d2fad55105c8b65ba0b3b8f9 SHA256 49438efae733a170b8cc56676078cbceddc427344528730bede4e3e8642385a1
+EBUILD vlock-2.2.1.ebuild 1347 RMD160 1bd151e6578b0dcf30be0fa35505185596ff5ef9 SHA1 8c0e4a7ce8f276dd5bb7fc99ce7bf89a9be99285 SHA256 8099e1601648d49d0fbbe4245cdb61508f283b5b8d2989ab9ce11b8b94de0dd6
+MISC ChangeLog 3307 RMD160 99fbadde32fb0a5709edb4268d3a59ee27d49132 SHA1 32840da9194e184bb5a7b8124d2b21b1207fab02 SHA256 97d7005f92b5dd7dda4be49b95318311841c1fb5127b7193c9ecdb411df05580
 MISC metadata.xml 165 RMD160 c4557a3518a065b077539be5a0f20e4735fc2141 SHA1 1831705b1eb97b63968fc9eef31aa904a69a854a SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd
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
+}