Add USE=asm so people can easily turn off assembly code for testing purposes #528158...

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 374e84104feeb465209c90ef9ab5e711726b93c8..656dd0efbeb7b733614a59873ba91a838b0a2cab 100644 (file)
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.642 2015/03/21 10:59:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.643 2015/03/21 11:01:07 vapier Exp $
+
+  21 Mar 2015; Mike Frysinger <vapier@gentoo.org> openssl-1.0.2a.ebuild,
+  metadata.xml:
+  Add USE=asm so people can easily turn off assembly code for testing purposes
+  #528158 by Joakim Tjernlund.
 
   21 Mar 2015; Mike Frysinger <vapier@gentoo.org> openssl-1.0.2a.ebuild:
   Use existing use_ssl helper for sctp flags.

diff --git a/dev-libs/openssl/metadata.xml b/dev-libs/openssl/metadata.xml
index 38505776ece09f2c2ee3ef9e2be275d6892be53e..5e30a851284c1756d5d3555a1913eddaa58ce174 100644 (file)
--- a/dev-libs/openssl/metadata.xml
+++ b/dev-libs/openssl/metadata.xml
@@ -3,7 +3,8 @@
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
- <flag name='bindist'>Disable EC/RC5 algorithms (as they seem to be patented) -- note: changes the ABI</flag>
+ <flag name='asm'>Support assembly hand optimized crypto functions (i.e. faster run time)</flag>
+ <flag name='bindist'>Disable EC algorithms (as they seem to be patented) -- note: changes the ABI</flag>
  <flag name='sctp'>Support for Stream Control Transmission Protocol</flag>
  <flag name='rfc3779'>Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers)</flag>
  <flag name='tls-heartbeat'>Enable the Heartbeat Extension in TLS and DTLS</flag>

diff --git a/dev-libs/openssl/openssl-1.0.2a.ebuild b/dev-libs/openssl/openssl-1.0.2a.ebuild
index 71196d31cc2599ca51e9fb3d0bbeb2b38d28503c..1d2f4de5660f5449adda5ee2f4693926e6d2e1bd 100644 (file)
--- a/dev-libs/openssl/openssl-1.0.2a.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.2a.ebuild,v 1.4 2015/03/21 10:59:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.2a.ebuild,v 1.5 2015/03/21 11:01:07 vapier Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 LICENSE="openssl"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib"
+IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 
 # The blocks are temporary just to make sure people upgrade to a
@@ -154,6 +154,7 @@ multilib_src_configure() {
                enable-mdc2 \
                enable-rc5 \
                enable-tlsext \
+               $(use_ssl asm) \
                $(use_ssl gmp gmp -lgmp) \
                $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
                $(use_ssl rfc3779) \