Optional PAM support from Christer Ekholm, bug 56503

3 files changed, 16 insertions, 11 deletions

diff --git a/net-misc/netkit-rsh/ChangeLog b/net-misc/netkit-rsh/ChangeLog
index 04617cd39373..a0d2f9af8b4a 100644
--- a/net-misc/netkit-rsh/ChangeLog
+++ b/net-misc/netkit-rsh/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/netkit-rsh
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rsh/ChangeLog,v 1.15 2004/06/24 23:58:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rsh/ChangeLog,v 1.16 2004/07/23 02:38:29 avenj Exp $
+
+  22 Jul 2004; Jon Portnoy <avenj@gentoo.org> netkit-rsh-0.17-r5.ebuild :
+  Optional PAM support from Christer Ekholm in bug #56503.
 
   24 Apr 2004; Tom Gall <tgall@gentoo.org> netkit-rsh-0.17-r5.ebuild:
   marked stable on ppc64
diff --git a/net-misc/netkit-rsh/Manifest b/net-misc/netkit-rsh/Manifest
index 135e6ff2a643..556ba589e429 100644
--- a/net-misc/netkit-rsh/Manifest
+++ b/net-misc/netkit-rsh/Manifest
@@ -1,14 +1,14 @@
-MD5 df7cf8558ff83d3d875f4a66694a063f netkit-rsh-0.17-r4.ebuild 1818
+MD5 ae0c1d43aa52162f89d700b9ada01062 ChangeLog 2443
 MD5 c3806717094d7aa3952ac9f71591f798 netkit-rsh-0.17-r3.ebuild 1644
-MD5 95c5b5d7356bb5f2753f92515c42adc8 netkit-rsh-0.17-r5.ebuild 1830
-MD5 644290ce1e7a52a516545edd1e692224 ChangeLog 2312
-MD5 ec3d6de902670c90897507f4a098f668 files/rlogin.pamd 580
-MD5 0586a4c1829df038be6179b9be20c458 files/rsh.xinetd 279
-MD5 501cf426db7510decc4dee17b07c5ea2 files/rexec.xinetd 280
+MD5 df7cf8558ff83d3d875f4a66694a063f netkit-rsh-0.17-r4.ebuild 1818
+MD5 c95c0271bbb68b4b00446deacc7fa498 netkit-rsh-0.17-r5.ebuild 1898
 MD5 00dc5439d1237d8da5351107131d6e28 files/digest-netkit-rsh-0.17-r3 71
 MD5 00dc5439d1237d8da5351107131d6e28 files/digest-netkit-rsh-0.17-r4 71
 MD5 00dc5439d1237d8da5351107131d6e28 files/digest-netkit-rsh-0.17-r5 71
 MD5 849aa086002eda305d4d6d59a94fadd8 files/rexec.pamd 457
+MD5 501cf426db7510decc4dee17b07c5ea2 files/rexec.xinetd 280
+MD5 ec3d6de902670c90897507f4a098f668 files/rlogin.pamd 580
 MD5 85d47a9df3698dfa22f21aa92c345902 files/rlogin.xinetd 282
 MD5 14c9e8ca2d9f8b9ae525e14fdd13df31 files/rlogind-auth.diff 260
 MD5 7b9d8d0930734500608538c166d0179a files/rsh.pamd 445
+MD5 0586a4c1829df038be6179b9be20c458 files/rsh.xinetd 279
diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r5.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r5.ebuild
index 92c8dd275175..9cf937de2f27 100644
--- a/net-misc/netkit-rsh/netkit-rsh-0.17-r5.ebuild
+++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rsh/netkit-rsh-0.17-r5.ebuild,v 1.7 2004/07/15 03:07:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rsh/netkit-rsh-0.17-r5.ebuild,v 1.8 2004/07/23 02:38:29 avenj Exp $
 
 inherit eutils
 
-IUSE=""
+IUSE="pam"
 
 DESCRIPTION="Netkit's Remote Shell Suite: rexec{,d} rlogin{,d} rsh{,d}"
 SRC_URI="mirror://debian/pool/main/n/${PN}/${PN}_${PV}.orig.tar.gz"
@@ -15,7 +15,7 @@ LICENSE="BSD"
 KEYWORDS="x86 sparc ppc alpha mips amd64 ppc64"
 
 DEPEND=">=sys-libs/ncurses-5.2
-	>=sys-libs/pam-0.72"
+	pam? ( >=sys-libs/pam-0.72 )"
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
@@ -23,7 +23,9 @@ src_unpack() {
 }
 
 src_compile() {
-	./configure || die
+	local myconf
+	use pam || myconf="--without-pam"
+	./configure ${myconf} || die
 
 	cp MCONFIG MCONFIG.orig
 	sed -e "s:-pipe -O2:${CFLAGS}:" \