Drop USE=pkcs11 per Alon Bar-Lev #308431.

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index c47a43f0f261c233b3fbd17383405e55d31bdaae..1aa07dfc5bd645ae97f06d6e6a37c7e6ae227e69 100644 (file)
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.372 2010/03/12 17:31:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.373 2010/03/13 01:28:51 vapier Exp $
+
+  13 Mar 2010; Mike Frysinger <vapier@gentoo.org> openssh-5.4_p1.ebuild:
+  Drop USE=pkcs11 per Alon Bar-Lev #308431.
 
   12 Mar 2010; Jeroen Roovers <jer@gentoo.org> openssh-5.3_p1-r1.ebuild:
   Stable for HPPA (bug #308555).

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 94f1dcb81cb46e70498509bef022ec24e261a35e..90d556a65ccc28a04b11c4adcff6a63c8e66cfcf 100644 (file)
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX openssh-3.9_p1-opensc.patch 3242 RMD160 9c382109f0a64c30d6404f6c6ecdd274b8114fd3 SHA1 1020a213c5acb479003bebe6e4bed0f5b1e56a9f SHA256 36f27a6cd277cf08fadbc23cd4d019def69f40a601d75e63ead7bdc7cdf0539b
 AUX openssh-4.7_p1-GSSAPI-dns.patch 4494 RMD160 4e02e0a85c0e33c917ec8c22b4e1c173a9d7d79e SHA1 d8a81eb92a49763106cfa5b319c22c6f188508ef SHA256 88a08f349258d4be5b2faa838a89fe1aa0196502990b745ac0e3a70dda30a0d7
 AUX openssh-4.7p1-selinux.diff 541 RMD160 bcb8f1fef2ae8378e7000732223c6116e06e0d6f SHA1 395b4dcff3eb7b92582a4364e612fff87278e7bc SHA256 ef8d71c46059bdcc8487cad06914639a8237197561cc030d8eed3baf418cc810
@@ -37,6 +40,13 @@ DIST openssh-lpk-5.3p1-0.3.11.patch.gz 18137 RMD160 3e316722d521e163a82d661465ab
 EBUILD openssh-5.1_p1-r2.ebuild 5462 RMD160 f36841058b21ed27a1852a5b1570939c2ad709c9 SHA1 fd8625bcc5c76842aea3c3ed5b7f93846be7567c SHA256 2a50479c1d0c4f60a67a2ca74ae658228d3297b528772b43951bac2ea3291c02
 EBUILD openssh-5.2_p1-r3.ebuild 8150 RMD160 b9049bb12151086a4261cfc70aad4ba0def0d4a7 SHA1 a9f0ec39435444e2ca4ca2e0ca99d3a10ded6bd8 SHA256 ba524fd8817de5ece224ba2fca841964020069bd580ae644c99ad9ff3587af1d
 EBUILD openssh-5.3_p1-r1.ebuild 8309 RMD160 e713f6a041c5700365d2f49300e0760559244959 SHA1 b2adb4a3677b4e28080e6d97e5e07cfd95f73ae2 SHA256 580acfe15a421487d4854b4226280e3b3e830c0b2e72264d42414433565bff20
-EBUILD openssh-5.4_p1.ebuild 6876 RMD160 98fad6e1d2e6dedeb7951de290bd57d309432a72 SHA1 0968968a248d7e0af8a7239b57b3f3385c7864bf SHA256 8af4cd7c09282ffa6b8f0eb1480ecb660cc33cfc6a96871dcbb0e500264b0043
-MISC ChangeLog 58264 RMD160 99f8b0cde1bd25ed07e42454e2821e81b3649f17 SHA1 8bf2bbff8815205ed45c9650947e95a501845286 SHA256 90b48a073f7835e72027b7a3ebfe9a01d1dee41d9c0b580a8371fe2545ec665a
+EBUILD openssh-5.4_p1.ebuild 6638 RMD160 5025c29df3fcd9494fc083642cdb3a8fbb2ebaf0 SHA1 10b5f330cae049460542f6ea115d5f2756fa8f33 SHA256 563c7401d005168f1e8b1344960c857d0f7b1b9076333f52dce2e7f6c0d55dc8
+MISC ChangeLog 58385 RMD160 bd863ab24c6fed26283c60f9fe7fa36cdd1a6bf0 SHA1 9abace222dc4834e687ceae547ff928e30516997 SHA256 c205c39c86b121581b35d052e76f398e091b56a6c8e2ef7c717d3b5081142ec8
 MISC metadata.xml 1641 RMD160 b5ae0d7b86c8dcb36414bc31da6fd22a807ced0b SHA1 31923a9db53fcad2b9cca72c39e733376bf6c501 SHA256 d34bb27c9f775ce973246c2a6b32ccd17d300de562920afbdd47312056cd8946
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iF4EAREIAAYFAkua6qIACgkQTwhj9JtAlp7mRQD+M15+IlSbzaMcwGSDZv5Akr3a
+cAa9O84XbxX8ATdQKtMBAK/cpoV4G0iS7u94f4UTxREt+ihE/LOP/wpdVSN4g9Ti
+=6rpU
+-----END PGP SIGNATURE-----

diff --git a/net-misc/openssh/openssh-5.4_p1.ebuild b/net-misc/openssh/openssh-5.4_p1.ebuild
index 8426f46a5a136f0e387834beab43b2ac70019806..198967fd51f08b49295b7a1e5c9032cf46bcbbcf 100644 (file)
--- a/net-misc/openssh/openssh-5.4_p1.ebuild
+++ b/net-misc/openssh/openssh-5.4_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.4_p1.ebuild,v 1.1 2010/03/09 01:06:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.4_p1.ebuild,v 1.2 2010/03/13 01:28:51 vapier Exp $
 
 inherit eutils flag-o-matic multilib autotools pam
 
@@ -22,7 +22,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="hpn kerberos ldap libedit pam pkcs11 selinux skey static tcpd X X509"
+IUSE="hpn kerberos ldap libedit pam selinux skey static tcpd X X509"
 
 RDEPEND="pam? ( virtual/pam )
        kerberos? ( virtual/krb5 )
@@ -32,7 +32,6 @@ RDEPEND="pam? ( virtual/pam )
        libedit? ( dev-libs/libedit )
        >=dev-libs/openssl-0.9.6d
        >=sys-libs/zlib-1.2.3
-       pkcs11? ( dev-libs/pkcs11-helper )
        tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
        X? ( x11-apps/xauth )
        userland_GNU? ( sys-apps/shadow )"
@@ -134,7 +133,6 @@ src_compile() {
                $(static_use_with kerberos kerberos5 /usr) \
                ${LDAP_PATCH:+$(use ldap && use_with ldap)} \
                $(use_with libedit) \
-               $(use pkcs11 && static_use_with pkcs11) \
                $(use_with selinux) \
                $(use_with skey) \
                $(use_with tcpd tcp-wrappers) \
@@ -214,11 +212,6 @@ pkg_postinst() {
                ewarn "Please be aware users need a valid shell in /etc/passwd"
                ewarn "in order to be allowed to login."
        fi
-       if use pkcs11 ; then
-               echo
-               einfo "For PKCS#11 you should also emerge one of the askpass softwares"
-               einfo "Example: net-misc/x11-ssh-askpass"
-       fi
        # This instruction is from the HPN webpage,
        # Used for the server logging functionality
        if [[ -n ${HPN_PATCH} ]] && use hpn; then