summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-08-29 08:25:09 +0000
committerMike Frysinger <vapier@gentoo.org>2008-08-29 08:25:09 +0000
commit335ee41e05955f094920d837123bc3e63fc91c25 (patch)
tree98ca51feea02f55e7c350991f163bed45a6fa3d0 /net-misc
parentversion bump (diff)
downloadgentoo-2-335ee41e05955f094920d837123bc3e63fc91c25.tar.gz
gentoo-2-335ee41e05955f094920d837123bc3e63fc91c25.tar.bz2
gentoo-2-335ee41e05955f094920d837123bc3e63fc91c25.zip
Tweak --with-ldap catch #235594 by BedOS_Gui.
(Portage version: 2.2_rc8/cvs/Linux 2.6.26.2 x86_64)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/openssh/ChangeLog6
-rw-r--r--net-misc/openssh/openssh-5.1_p1-r1.ebuild4
-rw-r--r--net-misc/openssh/openssh-5.1_p1.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index aa91636c1800..a84116ca19d6 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/openssh
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.314 2008/08/23 22:14:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.315 2008/08/29 08:25:09 vapier Exp $
+
+ 29 Aug 2008; Mike Frysinger <vapier@gentoo.org> openssh-5.1_p1.ebuild,
+ openssh-5.1_p1-r1.ebuild:
+ Tweak --with-ldap catch #235594 by BedOS_Gui.
*openssh-5.1_p1-r1 (23 Aug 2008)
diff --git a/net-misc/openssh/openssh-5.1_p1-r1.ebuild b/net-misc/openssh/openssh-5.1_p1-r1.ebuild
index 7051d6ba562c..20b4d7489819 100644
--- a/net-misc/openssh/openssh-5.1_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-5.1_p1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.1_p1-r1.ebuild,v 1.2 2008/08/23 22:17:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.1_p1-r1.ebuild,v 1.3 2008/08/29 08:25:09 vapier Exp $
inherit eutils flag-o-matic ccc multilib autotools pam
@@ -118,7 +118,7 @@ src_compile() {
--with-privsep-user=sshd \
--with-md5-passwords \
--with-ssl-engine \
- ${LDAP_PATCH:+$(use_with ldap)} \
+ $(use ldap && $(use_with ldap)) \
$(use_with libedit) \
$(use_with kerberos kerberos5 /usr) \
$(use_with tcpd tcp-wrappers) \
diff --git a/net-misc/openssh/openssh-5.1_p1.ebuild b/net-misc/openssh/openssh-5.1_p1.ebuild
index 69f733603e32..768983828e04 100644
--- a/net-misc/openssh/openssh-5.1_p1.ebuild
+++ b/net-misc/openssh/openssh-5.1_p1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.1_p1.ebuild,v 1.2 2008/08/23 21:33:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.1_p1.ebuild,v 1.3 2008/08/29 08:25:09 vapier Exp $
inherit eutils flag-o-matic ccc multilib autotools pam
@@ -116,7 +116,7 @@ src_compile() {
--with-privsep-user=sshd \
--with-md5-passwords \
--with-ssl-engine \
- ${LDAP_PATCH:+$(use_with ldap)} \
+ $(use ldap && $(use_with ldap)) \
$(use_with libedit) \
$(use_with kerberos kerberos5 /usr) \
$(use_with tcpd tcp-wrappers) \