only warn about sftplogging/ldap issues when user has USE="ldap sftplogging" #121436 by MAL

Package-Manager: portage-2.1_pre4-r1

5 files changed, 42 insertions, 32 deletions

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index d1996cb23b3a..fe6983032db0 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 db513696cdb36508967e6c2483cd5c7f ChangeLog 24849
 RMD160 468e3368e9981c229b5d35846ea317d40beded3d ChangeLog 24849
 SHA256 bd29fcf7d097f1d4f310f87d9d0ef9fea05e587026291252762fd320874101c3 ChangeLog 24849
@@ -91,15 +94,22 @@ SHA256 bc756cbd9737146f4aef4b1cf329f9c6fb2dc580fe4230b866c1101d9637c63b metadata
 MD5 a1a8e51121d94ec786a309099bab51dd openssh-3.9_p1-r3.ebuild 4944
 RMD160 a9329b65823347469f0584b50978a62989815999 openssh-3.9_p1-r3.ebuild 4944
 SHA256 2fba52f2a9da538df656a6d950ead3729c6e5c326aadebe0b59672b4567c0441 openssh-3.9_p1-r3.ebuild 4944
-MD5 db737fe30d1a450fa8d5e10745b593a8 openssh-4.0_p1-r2.ebuild 5359
-RMD160 6548787debbf70b67a20302485c49210aa37fb48 openssh-4.0_p1-r2.ebuild 5359
-SHA256 d90d9c571aee36988fd95a4723a20c15f28f3b10c6c29fd6439e6fc14f18160f openssh-4.0_p1-r2.ebuild 5359
-MD5 112e42c96cf751ba3ee3629c2de59b8b openssh-4.1_p1-r1.ebuild 5320
-RMD160 f1ae947350866a8f24b1bd31783055b2860dcdae openssh-4.1_p1-r1.ebuild 5320
-SHA256 243eb9113774122159e05ffe29c83db4e8ce2480e87dac35d77cb9bd54b9ed81 openssh-4.1_p1-r1.ebuild 5320
-MD5 425f3477d5c9798beb2d3b7127e8e5fc openssh-4.2_p1-r1.ebuild 5361
-RMD160 db1f42a6c594ac13aef95e3aef365175247129c8 openssh-4.2_p1-r1.ebuild 5361
-SHA256 2edb6eaf481cecbd46bc30843c2278175a443d7e7a730f162781bf14850bc4c4 openssh-4.2_p1-r1.ebuild 5361
-MD5 b9080df6601dbcb3709b3db424c9d066 openssh-4.2_p1.ebuild 5288
-RMD160 d4daf96cfec8c074d262c3b6fb46bbeaeea2966d openssh-4.2_p1.ebuild 5288
-SHA256 480929627067bf851bd3726fc795c2ee94567fdb158800ac9583a463daff4c2a openssh-4.2_p1.ebuild 5288
+MD5 959cf8a532f182fe7cce94f2445e285c openssh-4.0_p1-r2.ebuild 5380
+RMD160 c35a4d7374aa0203b6c56978acb5118ae6ae90ed openssh-4.0_p1-r2.ebuild 5380
+SHA256 49dd2052b3e27ef0a6716185a8834254b0ab5aaa4f5aa11f35723126010bd69e openssh-4.0_p1-r2.ebuild 5380
+MD5 10b4143adc4f06d6856305ee2bc7e4da openssh-4.1_p1-r1.ebuild 5341
+RMD160 ea482d14be44f901ae0c9da152c04d4c444ccdf4 openssh-4.1_p1-r1.ebuild 5341
+SHA256 dfa4faca63ab67c2f684a490165167631f0f151e33b169d21bc6d12362cd59a2 openssh-4.1_p1-r1.ebuild 5341
+MD5 04543be0e1a1611e2623be5028893480 openssh-4.2_p1-r1.ebuild 5378
+RMD160 9cf45faf563cc9f3e316233d13cc3256855fa2ec openssh-4.2_p1-r1.ebuild 5378
+SHA256 a812374b88f750af11f8694cae207052b86713712022f0173b7ef43b63d0c287 openssh-4.2_p1-r1.ebuild 5378
+MD5 651c9aa863676617988e6ecaa69ac7d7 openssh-4.2_p1.ebuild 5309
+RMD160 73d7ec5b12a66d2f829547548c4f75ba75deed61 openssh-4.2_p1.ebuild 5309
+SHA256 1ac2741f4a2c42ed5b5314a5abfd121c352cb68f957b322dc3e159949f746865 openssh-4.2_p1.ebuild 5309
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD4/ch2+ySkm8kpY0RAv7SAJ4q7ErC7JNRQpX/7kyxcS5mibkSTgCcC/SJ
+1E0P4PT5M28D05A7eol86m8=
+=YzzM
+-----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/openssh-4.0_p1-r2.ebuild b/net-misc/openssh/openssh-4.0_p1-r2.ebuild
index d5e451e46b60..ec174620475a 100644
--- a/net-misc/openssh/openssh-4.0_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-4.0_p1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.0_p1-r2.ebuild,v 1.10 2006/01/31 00:11:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.0_p1-r2.ebuild,v 1.11 2006/02/04 00:35:57 vapier Exp $
 
 inherit eutils flag-o-matic ccc pam
 
@@ -66,10 +66,10 @@ src_unpack() {
 	if ! use X509 ; then
 		use smartcard && epatch "${DISTDIR}"/${SECURID_PATCH} "${FILESDIR}"/openssh-securid-1.3.1-updates.patch
 		use smartcard && use ldap && epatch "${FILESDIR}"/openssh-4.0_p1-smartcard-ldap-happy.patch
-		if use sftplogging ; then
-			ewarn "Sorry, sftplogging and ldap don't get along"
-		else
-			use ldap && epatch "${DISTDIR}"/${LDAP_PATCH}
+		if use ldap ; then
+			use sftplogging \
+				&& ewarn "Sorry, sftplogging and ldap don't get along, disabling ldap" \
+				|| epatch "${DISTDIR}"/${LDAP_PATCH}
 		fi
 	elif use smartcard || use ldap ; then
 		ewarn "Sorry, x509 and smartcard/ldap don't get along"
diff --git a/net-misc/openssh/openssh-4.1_p1-r1.ebuild b/net-misc/openssh/openssh-4.1_p1-r1.ebuild
index d854926c520d..599bc8a22c57 100644
--- a/net-misc/openssh/openssh-4.1_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-4.1_p1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.1_p1-r1.ebuild,v 1.11 2006/01/31 00:11:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.1_p1-r1.ebuild,v 1.12 2006/02/04 00:35:57 vapier Exp $
 
 inherit eutils flag-o-matic ccc pam
 
@@ -67,10 +67,10 @@ src_unpack() {
 			epatch "${DISTDIR}"/${SECURID_PATCH} "${FILESDIR}"/openssh-securid-1.3.1-updates.patch
 			use ldap && epatch "${FILESDIR}"/openssh-4.0_p1-smartcard-ldap-happy.patch
 		fi
-		if use sftplogging ; then
-			ewarn "Sorry, sftplogging and ldap don't get along"
-		else
-			use ldap && epatch "${DISTDIR}"/${LDAP_PATCH}
+		if use ldap ; then
+			use sftplogging \
+				&& ewarn "Sorry, sftplogging and ldap don't get along, disabling ldap" \
+				|| epatch "${DISTDIR}"/${LDAP_PATCH}
 		fi
 	elif use smartcard || use ldap ; then
 		ewarn "Sorry, x509 and smartcard/ldap don't get along"
diff --git a/net-misc/openssh/openssh-4.2_p1-r1.ebuild b/net-misc/openssh/openssh-4.2_p1-r1.ebuild
index 858d744a6add..e3a38dc5a122 100644
--- a/net-misc/openssh/openssh-4.2_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-4.2_p1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.2_p1-r1.ebuild,v 1.10 2006/02/03 21:33:11 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.2_p1-r1.ebuild,v 1.11 2006/02/04 00:35:57 vapier Exp $
 
 inherit eutils flag-o-matic ccc pam
 
@@ -65,10 +65,10 @@ src_unpack() {
 			epatch "${DISTDIR}"/${SECURID_PATCH}
 			use ldap && epatch "${FILESDIR}"/openssh-4.0_p1-smartcard-ldap-happy.patch
 		fi
-		if use sftplogging ; then
-			ewarn "Sorry, sftplogging and ldap don't get along"
-		else
-			use ldap && epatch "${DISTDIR}"/${LDAP_PATCH}
+		if use ldap ; then
+			use sftplogging \
+				&& ewarn "Sorry, sftplogging and ldap don't get along, disabling ldap" \
+				|| epatch "${DISTDIR}"/${LDAP_PATCH}
 		fi
 	elif [[ -n ${SECURID_PATCH} ]] && use smartcard || use ldap ; then
 		ewarn "Sorry, x509 and smartcard/ldap don't get along"
diff --git a/net-misc/openssh/openssh-4.2_p1.ebuild b/net-misc/openssh/openssh-4.2_p1.ebuild
index 12e9b5163bd1..2ddad987fec6 100644
--- a/net-misc/openssh/openssh-4.2_p1.ebuild
+++ b/net-misc/openssh/openssh-4.2_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.2_p1.ebuild,v 1.18 2006/02/03 01:55:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.2_p1.ebuild,v 1.19 2006/02/04 00:35:57 vapier Exp $
 
 inherit eutils flag-o-matic ccc pam
 
@@ -64,10 +64,10 @@ src_unpack() {
 			epatch "${DISTDIR}"/${SECURID_PATCH}
 			use ldap && epatch "${FILESDIR}"/openssh-4.0_p1-smartcard-ldap-happy.patch
 		fi
-		if use sftplogging ; then
-			ewarn "Sorry, sftplogging and ldap don't get along"
-		else
-			use ldap && epatch "${DISTDIR}"/${LDAP_PATCH}
+		if use ldap ; then
+			use sftplogging \
+				&& ewarn "Sorry, sftplogging and ldap don't get along, disabling ldap" \
+				|| epatch "${DISTDIR}"/${LDAP_PATCH}
 		fi
 	elif [[ -n ${SECURID_PATCH} ]] && use smartcard || use ldap ; then
 		ewarn "Sorry, x509 and smartcard/ldap don't get along"