Removed "ssl2" USE flag again. Broke ABI and caused some packages to fail like cmake (bug #537452) and mozilla packages

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 26 insertions, 21 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 0b406c2927e5..59253817d408 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,13 @@
 # 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.626 2015/01/23 11:19:23 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.627 2015/01/23 15:30:57 polynomial-c Exp $
+
+*openssl-1.0.2-r1 (23 Jan 2015)
+
+  23 Jan 2015; Lars Wendler <polynomial-c@gentoo.org> -openssl-1.0.2.ebuild,
+  +openssl-1.0.2-r1.ebuild, metadata.xml:
+  Removed "ssl2" USE flag again. Broke ABI and caused some packages to fail
+  like cmake (bug #537452) and mozilla packages.
 
 *openssl-1.0.2 (23 Jan 2015)
 
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index eb73daf17464..fb3a71dac10e 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -40,23 +40,23 @@ EBUILD openssl-1.0.0q.ebuild 7053 SHA256 88a36b82d5ab5b248435fbbf6b9c9e2ac4c3d1a
 EBUILD openssl-1.0.1j.ebuild 8753 SHA256 d8d6837da8e3e74531d752a181836087d214de18ce57ca985317badb1e4a8b97 SHA512 02a154b3aeb6ec4e51f872ae811c83ed27c0caac2ca25450f1ec54b4ce82367042e09600ddfc9e4fd4bcd439e24c8a5a0d787f74ba0d148e0d6fe44e0d6eb6d2 WHIRLPOOL b36cdf732b11cb9d36b4a328d67d000a99c3ab50a9372937e988734e705787ec2f68c195dfed1047df8b746abf6de6ea0a8961401c309af141531847a3e9eb9c
 EBUILD openssl-1.0.1k.ebuild 8754 SHA256 20b872f77cb2a0c0a29b8b903f20857f398f90bb6e8927fdc7555371a2c1f0e6 SHA512 6623906dba49a5a3e4fa340dd8475df6056cd7abac3adef8b166332549afc03c0d99d88936fd7869f3d72cf77e1e960dd482736645a474e0c6b245f663cf449c WHIRLPOOL a60e3d87a2ff6e8faecacd5b672cee919e0120af17a90b4d26bb3948d04428dde3efe81cad367e627a357527f49c7e1560d61eea83b50717087193e0f23c0537
 EBUILD openssl-1.0.1l.ebuild 8771 SHA256 7c16b419102480fecd2482374e2503a6726e5e37b9eb187a2ce5b498bea531e5 SHA512 d1eb045844db5e13f177bf7f5977e90e2b6dd412185276b16aab271d8b051e1019d06a48a1f7f7fe09ebb7ba6a7fb72e3648f79bcf34675dbb0673c223e22787 WHIRLPOOL 8d213d74d57fb8394e34128ad3a0bb8f40de216d867a5dd83d5baa5caf486ac77e0145bdce98b3aae8802b86b260180efaf491b86c770bd25075ae518ab4859a
-EBUILD openssl-1.0.2.ebuild 8745 SHA256 c74cdec7cbde4de754dfeb594c94826d4cde61a9a9a350c4fc8267efc811f60a SHA512 e9064059aab6a6c4fe1b5cc9595fa44c5850a52a572598051290e113d3e9c8cf092d911e0c0a679b7f260c8e76d9d3ad138fa90ef7f2f938397830ffe40fa764 WHIRLPOOL 47584669ef648b3da05715a1a0020db63fd263135ff8045840e37773812b3b2542bebf0c178e39e6799520bd3bea85a45283c682a6b3d2378bed8f3488b4c8e2
-MISC ChangeLog 95753 SHA256 cb40581f9aa4f0b00a782a33a650b0191ce0075cd6637617320a1bc1b5cb4fd4 SHA512 7302fb6f1b0cd33c7af0bbae81a6808c3d1621b98bc8cd03eaf0dc77792af01b6c245ffab7b93f1391d07a60ee3c8c8192e669c3f80b37ddc455f14cb80b06d1 WHIRLPOOL e8273c5bc2b22439dabc937cbd93ed4de6a1d8efebdfc1a2bda7a4050060cf1b96dcbcd3c0b205db87825af39ba4629436b78bf2bb93dd85945363e995634654
-MISC metadata.xml 714 SHA256 fa5c91eb85b49d06c1ed530bbca51a8a905498bdac0a68785a046ec7039fc710 SHA512 90275e498057448399932d664ec6d5a531ff87cda06460a9f5c78f780a017d03c8ee23409a906995ca0234dc978a72ea3465ebabd9386e625af184a38abc75e1 WHIRLPOOL 668a77c92ebb4fce5aa4358795bbc126e05bee144ff59f7c676e4af9d8ba51adfedf0b3433ac8a8913e49afa7f7d180a34c64e6cbb080c0328f31f72c2e69ccc
+EBUILD openssl-1.0.2-r1.ebuild 8709 SHA256 70d826ccd7a43529e7f94e4e995ad8892f6eea8227938df772d4f01167c937fa SHA512 11e68358b8bfcdc2cb7a44927e46ae5f7c35cf93071c708e8e107aa19fa323c4d9c930d25f38f293a878a30f9de7378c2804393b4e1ce202e9925a34a7d14384 WHIRLPOOL eb5c1b50dcb01d9b6e8f710a259bdd0f1d0207e110d103d6357bc97b5d8dbd635a40e383708c2b558863ed2119ff93958bf4b1158b351a33b6df7e48abd27413
+MISC ChangeLog 96031 SHA256 bd3fa0005e90622d38886ab4ca6811cc6c4aa587c5b1509b6d29bfafaaeee526 SHA512 706788e4a8f99edb1bc112fa4b279081febcfc4e6b2a39be284166e8896704edd5a0f45830c33218705604079b839d7f013898a93f6259c1927e661cc4e9de7d WHIRLPOOL 0614d8986e2c681ade34d25474dad1bbdf0a64a332bbd1cfead40c79d9619bb21e7a9a7d91acc4ed4d787fb8728077b58f1c46797bef5a04e84e122d63b0e0d5
+MISC metadata.xml 637 SHA256 7b96f0e49fc5ab28bf914be847a89300bf3c7e65f652d748a48721a40c444b8d SHA512 a92ca59f6fc42237f7d30c4b0cd7339a7e82455ef31e155fb09d61012b3e3892d235d09a8c535f1db73b1468d483bb697575167cfe0d1ab45ef184bb95dc37db WHIRLPOOL f6fe48fc5b7a3a94eff327c5a8d6930efe2a7c92e7fb8a3366d8af0133b466420e68e168883742f993e89e45db12dab8c5a11e665242e368f012b0dc26d3c9ef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUwi48AAoJEPiazRVxLXTFsE8QAMnotnxfcdTNK5OE/zeALj0G
-oRGzRqUF6spgVhrUvakjQ9DJ7PP4cIXL4uXCEFI6s1w7D/boDYbH3ZsTfpPkkkMA
-d+uF/EDGjwf8cSHzEUykUDN2qJ1WH2EbcYAZ8G7sG4JY6CzsI7/zKnjU3lz7Rj3v
-PBiAzgYablsvsAntvZE84z9/awGrGkzLOZ0ohz15vsiYBw5EytkmWtgHe0nXA8oj
-MJ/yn8RXnpc9+zATSlEevXSMG0M/k2A4vSBrZilqfvhMI9aTWAhPMZwOp71vqo+f
-s8FRSJjUkdT/gRA8eoyZV9Bsg6Pa7rtj+58GfPC4tnA4lGrT5tk8uxUscoSH6ARR
-4sJ90yBj5TBavKMsSdRRtciRyFtwdrE/Nmen4G+tteqCqNEbKaQe12AyxA6Xc212
-0qLkcU32pbPkkbx7QwNOmrBXWIUnnJ8cbJ2cx80JsaZLNE0BoAREs+C+lkQis6Z+
-BecZOzidsFAI6D67la73paLtQ7VbatVgoMct0nkY2H3eRlMgNVP/YB4dJ9y9Nmkr
-HVCZshgDSxt0UfLutMi6QvlgLBUoDQ212LCGVvpaDtxcilw0x5da5yfdn/pQmjMq
-/2aCB5EWcxWqlPHbAJXUFSphhFv1lpUkhB589Hyepg0ofZW8EjuwAmGXNTvfi5o9
-t4nlnOMYPFM8rReQIMkE
-=Oozs
+iQIcBAEBCAAGBQJUwmkyAAoJEPiazRVxLXTFwLAQALBvpmqW7MaidGss6aThtpjT
+Az0KfH7zzhwlN9iuQrHSv/UrpRuEkjSAfvG7sFFjHNuvoZLSSO4W8frG9N4jD4jL
+hBjvV28NbBbvIRoi8st22GK9BtS/nbnfruTlFPkzDXtZGjxH5sgx/sxY7wMar+BG
+B21AbNaK6dqeJ2MITqLExK/SVPvKKtiwiua0Rd38bFt/GWGu3aBJN5C+BrENj3ot
+4d+jKChHePcsJgi/CaXj+QWe1WzHwQmCVCQXrP2VN5HpFOxtOBZuRwyy5iMsnLPY
+tGqXzLjeBLYcL7arGyg1h+cX54OYcqCqU63IFvYDuh5MoBBd2Sxd/j0Xw3JQYiHM
+nnY+a8+6NwOzSon4uff27rIM2nCxC0c1xJBNfsnpq6kz7Jo51YVovzriXHTjnGQx
+6jL/N2bVFLnLRpuRY+XzVZuHsNd5HHu02lyxB3bF4wtp+v1csl6Za+FawE/hAhIK
+bjVd3bj6eQeFZ/9c0kTItBO+CvphbQsrmYAaQ5Bccs9LLYB6nHq8l7MFtQQKYPJ2
+BBaD+C7OTDuwCc54bebq6+cBrb1/9HUOKNi9r4Gg69Ak71U0wX1zRHQ7TGaNWsGE
+jp6LDGF8n5jdIbSxxa4hcyW/Er1Fp80OL4gb2wSxZl4GR/uXyd3nQu+OLr8gj+HL
+HKYhomg+Dwunq0vGHoJp
+=Ax6D
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/metadata.xml b/dev-libs/openssl/metadata.xml
index d5ef6de3c554..38505776ece0 100644
--- a/dev-libs/openssl/metadata.xml
+++ b/dev-libs/openssl/metadata.xml
@@ -5,7 +5,6 @@
 <use>
  <flag name='bindist'>Disable EC/RC5 algorithms (as they seem to be patented) -- note: changes the ABI</flag>
  <flag name='sctp'>Support for Stream Control Transmission Protocol</flag>
- <flag name='ssl2'>Support for deprecated (and broken) SSLv2 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>
 </use>
diff --git a/dev-libs/openssl/openssl-1.0.2.ebuild b/dev-libs/openssl/openssl-1.0.2-r1.ebuild
index 3ec7bfa81fb6..0bac611268ea 100644
--- a/dev-libs/openssl/openssl-1.0.2.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2-r1.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.2.ebuild,v 1.1 2015/01/23 11:19:23 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.2-r1.ebuild,v 1.1 2015/01/23 15:30:57 polynomial-c 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 sse2 ssl2 static-libs test +tls-heartbeat vanilla zlib"
+IUSE="bindist gmp kerberos rfc3779 sctp sse2 static-libs test +tls-heartbeat vanilla zlib"
 
 # The blocks are temporary just to make sure people upgrade to a
 # version that lack runtime version checking.  We'll drop them in
@@ -146,7 +146,6 @@ multilib_src_configure() {
 		${sslout} \
 		$(use sctp && echo "sctp") \
 		$(use sse2 || echo "no-sse2") \
-		$(use ssl2 || echo "no-ssl2") \
 		enable-camellia \
 		$(use_ssl !bindist ec) \
 		${ec_nistp_64_gcc_128} \