Backport OpenSSL to 20140406 since *0508 may be masked for a while. Move 20140508-r1 -> 20140508 since that version is hardmasked anyway.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

4 files changed, 30 insertions, 8 deletions

diff --git a/app-emulation/emul-linux-x86-baselibs/ChangeLog b/app-emulation/emul-linux-x86-baselibs/ChangeLog
index 425467bca2e2..c3369616b423 100644
--- a/app-emulation/emul-linux-x86-baselibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-baselibs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/emul-linux-x86-baselibs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.206 2014/05/12 21:32:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.207 2014/05/13 17:49:00 mgorny Exp $
+
+*emul-linux-x86-baselibs-20140406-r4 (13 May 2014)
+
+  13 May 2014; Michał Górny <mgorny@gentoo.org>
+  +emul-linux-x86-baselibs-20140406-r4.ebuild, +files/remove-native-20140406-r4,
+  -emul-linux-x86-baselibs-20140508-r1.ebuild, -files/remove-native-20140508-r1,
+  files/remove-native-20140508:
+  Backport OpenSSL to 20140406 since *0508 may be masked for a while. Move
+  20140508-r1 -> 20140508 since that version is hardmasked anyway.
 
 *emul-linux-x86-baselibs-20140508-r1 (12 May 2014)
 
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r1.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r4.ebuild
index 76a3157c338c..ce8ba1a1a3cd 100644
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r1.ebuild
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r1.ebuild,v 1.1 2014/05/12 21:32:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r4.ebuild,v 1.1 2014/05/13 17:49:00 mgorny Exp $
 
 EAPI=5
 inherit emul-linux-x86
@@ -13,6 +13,8 @@ LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
 KEYWORDS="-* ~amd64"
 IUSE="abi_x86_32"
 
+SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/emul/openssl-1.0.1g.tbz2"
+
 DEPEND=""
 RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
 	!abi_x86_32? (
@@ -74,7 +76,6 @@ RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
 		>=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)]
 		>=sys-devel/libtool-2.4.2-r1[abi_x86_32(-)]
 		>=virtual/acl-0-r2[abi_x86_32(-)]
-		>=dev-libs/openssl-1.0.2_beta1-r3[abi_x86_32(-)]
 	)
 	>=sys-libs/glibc-2.16" # bug 340613
 
@@ -93,3 +94,8 @@ src_prepare() {
 	# Remove migrated stuff.
 	use abi_x86_32 && rm -f $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
 }
+
+src_install() {
+	emul-linux-x86_src_install
+	rm -rf "${ED}"/usr/include # needed for openssl tbz2
+}
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r1 b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140406-r4
index 2a4c6177a251..d21a180aa700 100644
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r1
+++ b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140406-r4
@@ -13,7 +13,7 @@ usr/lib32/libbz2.so
 usr/lib32/libpng.so
 usr/lib32/libpng16.so
 usr/lib32/libpng16.so.16
-usr/lib32/libpng16.so.16.10.0
+usr/lib32/libpng16.so.16.8.0
 usr/lib32/pkgconfig/libpng.pc
 usr/lib32/pkgconfig/libpng16.pc
 usr/lib32/libudis86.so
@@ -198,10 +198,10 @@ lib32/libgpm.so.1.20.0
 usr/lib32/libgpm.so
 usr/lib32/libgmp.so
 usr/lib32/libgmp.so.10
-usr/lib32/libgmp.so.10.1.3
+usr/lib32/libgmp.so.10.1.2
 usr/lib32/libgmpxx.so
 usr/lib32/libgmpxx.so.4
-usr/lib32/libgmpxx.so.4.3.3
+usr/lib32/libgmpxx.so.4.3.2
 lib32/libpcre.so.1
 lib32/libpcre.so.1.2.1
 usr/lib32/libpcre.so
@@ -326,9 +326,9 @@ usr/lib32/pkgconfig/blkid.pc
 usr/lib32/pkgconfig/mount.pc
 usr/lib32/pkgconfig/uuid.pc
 usr/lib32/libcrypto.so
-usr/lib32/libcrypto.so.1.0.0
+usr/lib32/libcrypto.so.0.9.8
 usr/lib32/libssl.so
-usr/lib32/libssl.so.1.0.0
+usr/lib32/libssl.so.0.9.8
 usr/lib32/pkgconfig/libcrypto.pc
 usr/lib32/pkgconfig/libssl.pc
 usr/lib32/pkgconfig/openssl.pc
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508 b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508
index 663cf20bad21..2a4c6177a251 100644
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508
+++ b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508
@@ -325,3 +325,10 @@ usr/lib32/libuuid.so
 usr/lib32/pkgconfig/blkid.pc
 usr/lib32/pkgconfig/mount.pc
 usr/lib32/pkgconfig/uuid.pc
+usr/lib32/libcrypto.so
+usr/lib32/libcrypto.so.1.0.0
+usr/lib32/libssl.so
+usr/lib32/libssl.so.1.0.0
+usr/lib32/pkgconfig/libcrypto.pc
+usr/lib32/pkgconfig/libssl.pc
+usr/lib32/pkgconfig/openssl.pc