Remove shadow from DEPEND #103055 and clean up a bit.

(Portage version: 2.0.51.22-r2)

3 files changed, 42 insertions, 22 deletions

diff --git a/app-admin/skey/ChangeLog b/app-admin/skey/ChangeLog
index 62aaa16bd5f4..f93cf35bdec6 100644
--- a/app-admin/skey/ChangeLog
+++ b/app-admin/skey/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/skey
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/skey/ChangeLog,v 1.32 2005/04/08 10:26:39 corsair Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/skey/ChangeLog,v 1.33 2005/08/19 22:27:28 vapier Exp $
+
+  19 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/skey-1.1.5-bind-now.patch, skey-1.1.5-r5.ebuild:
+  Remove shadow from DEPEND #103055 and clean up a bit.
 
   08 Apr 2005; Markus Rothe <corsair@gentoo.org> skey-1.1.5-r4.ebuild:
   Stable on ppc64
diff --git a/app-admin/skey/files/skey-1.1.5-bind-now.patch b/app-admin/skey/files/skey-1.1.5-bind-now.patch
new file mode 100644
index 000000000000..a56f81e9fc30
--- /dev/null
+++ b/app-admin/skey/files/skey-1.1.5-bind-now.patch
@@ -0,0 +1,15 @@
+--- Makefile.in.orig	2005-08-19 18:14:48.000000000 -0400
++++ Makefile.in	2005-08-19 18:15:45.000000000 -0400
+@@ -67,10 +67,10 @@
+ 	${CC} -o $@ ${SKEYOBJS} ${LDFLAGS} -lskey ${LIBS}
+ 
+ skeyinit: libskey.so ${SKEYINITOBJS}
+-	${CC} -o $@ ${SKEYINITOBJS} ${LDFLAGS} -lskey ${LIBS} 
++	${CC} -o $@ ${SKEYINITOBJS} ${LDFLAGS} -lskey ${LIBS} -Wl,-z,now
+ 
+ skeyinfo: libskey.so ${SKEYINFOOBJS}
+-	${CC} -o $@ ${SKEYINFOOBJS} ${LDFLAGS} -lskey ${LIBS}
++	${CC} -o $@ ${SKEYINFOOBJS} ${LDFLAGS} -lskey ${LIBS} -Wl,-z,now
+ 
+ ${MANPAGES} ${SCRIPTS}::
+ 	${FIXPATHSCMD} ${srcdir}/$@
diff --git a/app-admin/skey/skey-1.1.5-r5.ebuild b/app-admin/skey/skey-1.1.5-r5.ebuild
index 23bfc8532305..618df4a9336f 100644
--- a/app-admin/skey/skey-1.1.5-r5.ebuild
+++ b/app-admin/skey/skey-1.1.5-r5.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/app-admin/skey/skey-1.1.5-r5.ebuild,v 1.3 2005/07/09 16:53:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/skey/skey-1.1.5-r5.ebuild,v 1.4 2005/08/19 22:27:28 vapier Exp $
 
 inherit flag-o-matic ccc eutils
 
@@ -13,52 +13,53 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
-DEPEND="sys-libs/cracklib
-	sys-apps/shadow
-	dev-lang/perl
-	virtual/libc"
-# XXX: skeyaudit requires mailx.
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	sys-libs/cracklib"
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
+	unpack ${A}
+	cd "${S}"
 
 	# porting some updates to this skey implementation from the
 	# NetBSD project, some other updates and fixes, and the addition
 	# of some new features like shadow password and cracklib support.
 	# 	(05 Nov 2003) -taviso@gentoo.org
-	epatch ${FILESDIR}/skey-1.1.5-gentoo.diff.gz
+	epatch "${FILESDIR}"/skey-1.1.5-gentoo.diff.gz
 
 	# glibc 2.2.x does not define LOGIN_NAME_MAX #33315
 	# 	(12 Nov 2003) -taviso@gentoo.org
-	epatch ${FILESDIR}/skey-login_name_max.diff
+	epatch "${FILESDIR}"/skey-login_name_max.diff
 
-	epatch ${FILESDIR}/${P}-fPIC.patch
+	epatch "${FILESDIR}"/${P}-fPIC.patch
+	epatch "${FILESDIR}"/${P}-bind-now.patch
 
 	# allow invokation as otp-foo. #71015
 	# 	(03 Mar 2005) -taviso.
-	epatch ${FILESDIR}/${P}-otp.diff
+	epatch "${FILESDIR}"/${P}-otp.diff
 
 	# set the default hash function to md5, #63995
 	# 	(14 Sep 2004) -taviso
 	append-flags -DSKEY_HASH_DEFAULT=1
 
-	# avoid suid related security issues.
-	append-ldflags -Wl,-z,now
-}
-
-src_compile() {
 	# skeyprune wont honour @sysconfdir@
-	sed -i 's#/etc/skeykeys#/etc/skey/skeykeys#g' skeyprune.pl skeyprune.8
+	sed -i \
+		-e 's:/etc/skeykeys:/etc/skey/skeykeys:g' \
+		skeyprune.pl skeyprune.8 || die
 
 	# skeyprune uses a case sensitive regex to check for zeroed entries
-	sed -i 's#\(if ( ! /.*/\)#\1i#g' skeyprune.pl
+	sed -i \
+		-e 's:\(if ( ! /.*/\):\1i:g' \
+		skeyprune.pl || die
 
 	# skeyinit(1) describes md4 as the default hash algorithm, which
 	# is no longer the case. #64971
 	sed -i \
 		's#\(md4\) \((the default)\), \(md5\) or \(sha1.\)#\1, \3 \2 or \4#g' \
 		skeyinit.1
+}
 
+src_compile() {
 	econf --sysconfdir=/etc/skey || die
 	emake || die
 }
@@ -74,7 +75,7 @@ src_install() {
 	newsbin skeyprune.pl skeyprune
 	newbin skeyaudit.sh skeyaudit
 	dolib.a libskey.a
-	dolib.so libskey.so.1.1.5 libskey.so.1.1 libskey.so.1 libskey.so
+	dolib.so libskey.so.1.1.5 libskey.so.1.1 libskey.so.1 libskey.so || die
 
 	insinto /usr/include
 	doins skey.h
@@ -88,7 +89,7 @@ src_install() {
 	# can generate their passwords.
 	fperms u+s,og-r /usr/bin/skeyinit /usr/bin/skeyinfo
 
-	dodoc README CHANGES md4.copyright md5.copyright
+	dodoc README CHANGES
 
 	prepallman
 }