Fixed IUSE flags.

4 files changed, 16 insertions, 9 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 8c7ac65cdad4..891471c5f8ff 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,10 +1,14 @@
 # ChangeLog for net-misc/openssh
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.80 2004/04/22 17:26:52 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.81 2004/04/26 01:40:20 aliz Exp $
 
   22 Apr 2004; Guy Martin <gmsoft@gentoo.org> openssh-3.8_p1.ebuild:
   Marked stable on hppa.
 
+  22 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> openssh-3.7.1_p2-r2.ebuild,
+  openssh-3.8.1_p1.ebuild, openssh-3.8_p1.ebuild:
+  Fixed IUSE flags.
+
   21 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> openssh-3.8_p1.ebuild:
   Stable on x86 and amd64.
 
diff --git a/net-misc/openssh/openssh-3.7.1_p2-r2.ebuild b/net-misc/openssh/openssh-3.7.1_p2-r2.ebuild
index cfb3ad4c76cd..58d2800891e9 100644
--- a/net-misc/openssh/openssh-3.7.1_p2-r2.ebuild
+++ b/net-misc/openssh/openssh-3.7.1_p2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.7.1_p2-r2.ebuild,v 1.17 2004/04/13 12:39:42 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.7.1_p2-r2.ebuild,v 1.18 2004/04/26 01:40:20 aliz Exp $
 
 inherit eutils flag-o-matic ccc gnuconfig
 
@@ -20,7 +20,7 @@ SRC_URI="mirror://openssh/${PARCH}.tar.gz
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="x86 ~ppc sparc alpha mips hppa amd64 ia64 ~ppc64"
-IUSE="ipv6 static pam tcpd kerberos skey selinux X509 chroot"
+IUSE="ipv6 static pam tcpd kerberos skey selinux X509 chroot ldap"
 
 # openssh recognizes when openssl has been slightly upgraded and refuses to run.
 # This new rev will use the new openssl.
diff --git a/net-misc/openssh/openssh-3.8.1_p1.ebuild b/net-misc/openssh/openssh-3.8.1_p1.ebuild
index f199b060b473..fcfa1bc2f055 100644
--- a/net-misc/openssh/openssh-3.8.1_p1.ebuild
+++ b/net-misc/openssh/openssh-3.8.1_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.8.1_p1.ebuild,v 1.1 2004/04/21 11:46:05 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.8.1_p1.ebuild,v 1.2 2004/04/26 01:40:20 aliz Exp $
 
 inherit eutils flag-o-matic ccc gnuconfig
 
@@ -20,7 +20,7 @@ SRC_URI="mirror://openssh/${PARCH}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
-IUSE="ipv6 static pam tcpd kerberos skey selinux chroot X509"
+IUSE="ipv6 static pam tcpd kerberos skey selinux chroot X509 ldap"
 
 # openssh recognizes when openssl has been slightly upgraded and refuses to run.
 # This new rev will use the new openssl.
@@ -44,7 +44,7 @@ PROVIDE="virtual/ssh"
 src_unpack() {
 	unpack ${PARCH}.tar.gz ; cd ${S}
 
-	epatch ${FILESDIR}/${P}-kerberos.patch
+#	epatch ${FILESDIR}/${P}-kerberos.patch
 	epatch ${FILESDIR}/${P}-resolv_functions.patch
 
 	use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}
@@ -68,11 +68,14 @@ src_compile() {
 
 	local myconf="\
 		$( use_with tcpd tcp-wrappers ) \
-		$( use_with kerberos kerberos5 ) \
 		$( use_with pam ) \
 		$( use_with skey )"
 
 	use ipv6 || myconf="${myconf} --with-ipv4-default"
+	use kerberos && myconf="${myconf} --with-kerberos5=/usr" || \
+		myconf="${myconf} --without-kerberos5"
+
+	echo ${myconf}
 
 	./configure \
 		--prefix=/usr \
diff --git a/net-misc/openssh/openssh-3.8_p1.ebuild b/net-misc/openssh/openssh-3.8_p1.ebuild
index 9a394791f13a..1a4f37570ce2 100644
--- a/net-misc/openssh/openssh-3.8_p1.ebuild
+++ b/net-misc/openssh/openssh-3.8_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.8_p1.ebuild,v 1.9 2004/04/22 17:26:52 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.8_p1.ebuild,v 1.10 2004/04/26 01:40:20 aliz Exp $
 
 inherit eutils flag-o-matic ccc gnuconfig
 
@@ -20,7 +20,7 @@ SRC_URI="mirror://openssh/${PARCH}.tar.gz
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc ~alpha ~mips hppa amd64 ~ia64 ~ppc64 s390"
-IUSE="ipv6 static pam tcpd kerberos skey selinux chroot X509"
+IUSE="ipv6 static pam tcpd kerberos skey selinux chroot X509 ldap"
 
 # openssh recognizes when openssl has been slightly upgraded and refuses to run.
 # This new rev will use the new openssl.