only apply LDAP_PATCH if it is available #170527 by Heiko Baums

Package-Manager: portage-2.1.2.2

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index e7f061808d2b40c75ac7c1d64396433c1f74931c..f1e394f503c243f86fa640b3f62e381c20833c84 100644 (file)
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -232,10 +232,10 @@ EBUILD openssh-4.5_p1.ebuild 5350 RMD160 6d40a35a0bee3b9f2c1463862577add3fec7901
 MD5 5765ff0b2c4d25a3d86a87605017d155 openssh-4.5_p1.ebuild 5350
 RMD160 6d40a35a0bee3b9f2c1463862577add3fec79015 openssh-4.5_p1.ebuild 5350
 SHA256 74de4db846c5251d5ff87853aac67bce589d62e49fb1ea4c082bd9c40c3ec4cf openssh-4.5_p1.ebuild 5350
-EBUILD openssh-4.6_p1.ebuild 5333 RMD160 85f8e8560014f0856d5173e1ddfc28d20d2cb794 SHA1 6d66e7b9109bc7cb66482a2bd67957f757ab8e4a SHA256 83fe7fda6d2724f4cd10bf2c0f2d9a453055e5c7861f8da6cae2ced0e62c4727
-MD5 2fba5d47af8723ca89434775260a3fda openssh-4.6_p1.ebuild 5333
-RMD160 85f8e8560014f0856d5173e1ddfc28d20d2cb794 openssh-4.6_p1.ebuild 5333
-SHA256 83fe7fda6d2724f4cd10bf2c0f2d9a453055e5c7861f8da6cae2ced0e62c4727 openssh-4.6_p1.ebuild 5333
+EBUILD openssh-4.6_p1.ebuild 5410 RMD160 c70579399d39f89a3c68b5eafca1915819f52a41 SHA1 b90d0bc4845fe6c8f687360ca80d87bab55227cd SHA256 87caf8b62e48cfe8aea5e624966517986cf1fe28d4db48f4a7c0c9bea0f59298
+MD5 29dc8f998e0151bb2751a9fb7865bfe9 openssh-4.6_p1.ebuild 5410
+RMD160 c70579399d39f89a3c68b5eafca1915819f52a41 openssh-4.6_p1.ebuild 5410
+SHA256 87caf8b62e48cfe8aea5e624966517986cf1fe28d4db48f4a7c0c9bea0f59298 openssh-4.6_p1.ebuild 5410
 MISC ChangeLog 36966 RMD160 6d06f45a2afded1dd3f460b84483c916a9484852 SHA1 7d5d5eee2a867c90b0db0235d2fba6ac0d2b7c00 SHA256 51385809120cb1b61c1f891332ca9208171132fe0adbb08bf07268a41e4d37d4
 MD5 f3ee3548ecec02d67ea2aab20624d0ec ChangeLog 36966
 RMD160 6d06f45a2afded1dd3f460b84483c916a9484852 ChangeLog 36966
@@ -275,9 +275,9 @@ MD5 028552b80ff1297d99f185559938328d files/digest-openssh-4.6_p1 518
 RMD160 c4547b53bb2c361f3c4b65e3cacbce55a64ee6f1 files/digest-openssh-4.6_p1 518
 SHA256 25ba3ac9d41810adc59829a3c7d9be9d73a3cd365a6e6ef54202358068560147 files/digest-openssh-4.6_p1 518
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF9FdK8bi6rjpTunYRAtoFAJ0ZmaX0o3JPsVt2hU8xgYFdMoFcmACg4Ze1
-hFx1zMi8HUZ+Jg9VWDs8tfs=
-=DEn5
+iD8DBQFF9P2i8bi6rjpTunYRAr65AJ4uQa2zb0S1JAJ/ZeKRydVgCR89HwCeI/84
+QNQ+ZBjO/wJ3j3rtyfSXiKw=
+=xtlH
 -----END PGP SIGNATURE-----

diff --git a/net-misc/openssh/openssh-4.6_p1.ebuild b/net-misc/openssh/openssh-4.6_p1.ebuild
index 677e555904da0fee7d555c84e0b9454d60675498..7ef295fccad4585efa392fe56b99ab3235539383 100644 (file)
--- a/net-misc/openssh/openssh-4.6_p1.ebuild
+++ b/net-misc/openssh/openssh-4.6_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.6_p1.ebuild,v 1.1 2007/03/11 19:23:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.6_p1.ebuild,v 1.2 2007/03/12 07:13:18 vapier Exp $
 
 inherit eutils flag-o-matic ccc multilib autotools pam
 
@@ -49,9 +49,13 @@ S=${WORKDIR}/${PARCH}
 pkg_setup() {
        # this sucks, but i'd rather have people unable to `emerge -u openssh`
        # than not be able to log in to their server any more
-       local fail=""
-       [[ -z ${X509_PATCH}        ]] && use X509          && fail="${fail} X509"
-       [[ -z ${SECURID_PATCH} ]] && use smartcard && fail="${fail} smartcard"
+       maybe_fail() { [[ -z ${!2} ]] && use ${1} && echo ${1} ; }
+       local fail="
+               $(maybe_fail X509 X509_PATCH)
+               $(maybe_fail smartcard SECURID_PATCH)
+               $(maybe_fail ldap LDAP_PATCH)
+       "
+       fail=$(echo ${fail})
        if [[ -n ${fail} ]] ; then
                eerror "Sorry, but this version does not yet support features"
                eerror "that you requested:      ${fail}"
@@ -80,7 +84,7 @@ src_unpack() {
                                "${FILESDIR}"/${PN}-4.3_p2-securid-hpn-glue.patch
                        use ldap && epatch "${FILESDIR}"/openssh-4.0_p1-smartcard-ldap-happy.patch
                fi
-               if use ldap ; then
+               if [[ -n ${LDAP_PATCH} ]] && use ldap ; then
                        epatch "${DISTDIR}"/${LDAP_PATCH} "${FILESDIR}"/${PN}-4.4_p1-ldap-hpn-glue.patch
                fi
        elif [[ -n ${SECURID_PATCH} ]] && use smartcard || use ldap ; then