diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-04-20 17:55:52 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-04-20 17:55:52 +0000 |
| commit | 74fe224d277862e10af9093d14cd0533c7faec57 (patch) | |
| tree | e13669f0ee3c553bd6153bc6b62c1d6cbe103f98 /dev-libs/openssl | |
| parent | Version bump. (diff) | |
| download | gentoo-2-74fe224d277862e10af9093d14cd0533c7faec57.tar.gz gentoo-2-74fe224d277862e10af9093d14cd0533c7faec57.tar.bz2 gentoo-2-74fe224d277862e10af9093d14cd0533c7faec57.zip | |
Unmask now that openssh/neon fixes are in place.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/openssl')
| -rw-r--r-- | dev-libs/openssl/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/openssl/openssl-1.0.1a.ebuild | 12 |
2 files changed, 12 insertions, 5 deletions
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog index bf5ec67089df..7d26057e77eb 100644 --- a/dev-libs/openssl/ChangeLog +++ b/dev-libs/openssl/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/openssl # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.441 2012/04/19 19:41:16 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.442 2012/04/20 17:55:52 vapier Exp $ + + 20 Apr 2012; Mike Frysinger <vapier@gentoo.org> openssl-1.0.1a.ebuild: + Unmask now that openssh/neon fixes are in place. 19 Apr 2012; Jeff Horelick <jdhore@gentoo.org> openssl-0.9.8v.ebuild, openssl-1.0.0i.ebuild: diff --git a/dev-libs/openssl/openssl-1.0.1a.ebuild b/dev-libs/openssl/openssl-1.0.1a.ebuild index 219f22c69ae0..5ee4dfcf57ac 100644 --- a/dev-libs/openssl/openssl-1.0.1a.ebuild +++ b/dev-libs/openssl/openssl-1.0.1a.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1a.ebuild,v 1.1 2012/04/19 15:32:40 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1a.ebuild,v 1.2 2012/04/20 17:55:52 vapier Exp $ EAPI="4" @@ -14,8 +14,7 @@ SRC_URI="mirror://openssl/source/${P}.tar.gz LICENSE="openssl" SLOT="0" -# Let openssh make its way out to people w/out openssl check. -#KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" IUSE="bindist gmp kerberos rfc3779 sse2 static-libs test vanilla zlib" # Have the sub-libs in RDEPEND with [static-libs] since, logically, @@ -23,8 +22,13 @@ IUSE="bindist gmp kerberos rfc3779 sse2 static-libs test vanilla zlib" LIB_DEPEND="gmp? ( dev-libs/gmp[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) kerberos? ( app-crypt/mit-krb5 )" +# The blocks are temporary just to make sure people upgrade to a +# version that lack runtime version checking. We'll drop them in +# the future. RDEPEND="static-libs? ( ${LIB_DEPEND} ) - !static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )" + !static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} ) + !<net-misc/openssh-5.9_p1-r4 + !<net-libs/neon-0.29.6-r1" DEPEND="${RDEPEND} sys-apps/diffutils >=dev-lang/perl-5 |