Revbump/merge emul-linux-x86-baselibs-r7

This adds upstream deltas from emul-linux-x86-baselibs-r5 and -r6, and
also drops net-dns/libidn which is now multilibutized upstream.

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

4 files changed, 45 insertions, 9 deletions

diff --git a/app-emulation/emul-linux-x86-baselibs/ChangeLog b/app-emulation/emul-linux-x86-baselibs/ChangeLog
index 28b2140..25db0d3 100644
--- a/app-emulation/emul-linux-x86-baselibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-baselibs/ChangeLog
@@ -1,6 +1,18 @@
 # 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.212 2014/05/21 11:04:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.214 2014/05/25 11:29:38 mgorny Exp $
+
+*emul-linux-x86-baselibs-20140508-r6 (25 May 2014)
+
+  25 May 2014; Michał Górny <mgorny@gentoo.org>
+  +emul-linux-x86-baselibs-20140508-r6.ebuild, +files/remove-native-20140508-r6:
+  Add multilib libidn & libnl.
+
+*emul-linux-x86-baselibs-20140508-r5 (23 May 2014)
+
+  23 May 2014; Jonathan Callen <jcallen@gentoo.org>
+  +emul-linux-x86-baselibs-20140508-r5.ebuild, +files/remove-native-20140508-r5:
+  Add multilib dev-libs/openssl:0.9.8 (bug 511078)
 
 *emul-linux-x86-baselibs-20140508-r4 (21 May 2014)
 
diff --git a/app-emulation/emul-linux-x86-baselibs/Manifest b/app-emulation/emul-linux-x86-baselibs/Manifest
index 646a521..bfaefec 100644
--- a/app-emulation/emul-linux-x86-baselibs/Manifest
+++ b/app-emulation/emul-linux-x86-baselibs/Manifest
@@ -1,5 +1,5 @@
-AUX remove-native-20140508-r5 18612 SHA256 75cfdaa67cc8f40a6ea67a504e172ed11df0c055e62543b28e85f3805c3edbca SHA512 07e33981ebdf5b057d4409f87c99b7004b4ab0eb01ec07416d7be20506e8458c0705eef0ea422af74fd57738ce0bbe174403dfb2f1b928e368543748e20407c6 WHIRLPOOL f16c10b1d93769e0e13bd152e865ef1c660027c186df26bfc094a680dcf1d869d23e98b9a8f440ebb546c8030fb2371af127ae324cc8d7edd29b16056cdce66a
+AUX remove-native-20140508-r7 19253 SHA256 4cb9e6ae036dc7b3a6327a841cdfc7e7617b0dee4b336d616bf06b359226f65e SHA512 0a4116dd2fe6ba399b81a73dd3cbdaccc9405dc6674e8d62bd3882a951d4c56d56824d655130fbaf13b20e701f04a0f042ca7bf48ea0e0a259c7eb05579c34a5 WHIRLPOOL b6d9e97147b34be2dcdc9e2b4e3c0ad0ac23c60bf32331d48ad36817be3507020cdbd2e8a5b0f2691b1fcf4c87691a42061e9e004d1562e5a0e9730ed020ed57
 DIST emul-linux-x86-baselibs-20140508.tar.xz 40339976 SHA256 754b9460609d24b89dfb6875aa76a422b53ed3bb2f2e10bad82ad118e2592357 SHA512 2491cf64e2ad91cc19ae84b02887a262cd349f6a44eb3c62adee4a63ccbaff14214e838cb4bd151abc16c62e03e7d18d84e331e4adf2100569331d86211b289f WHIRLPOOL 3af547d12b12f925ac6232de412323a893dc6ae3200c61a08b78ee3c62c7f98acbd2224036d4e265bdf816edc1e7de212fefea6326d7c4275ba3c45377f3edfc
-EBUILD emul-linux-x86-baselibs-20140508-r5.ebuild 5023 SHA256 36868d6600fa2e6316b7fd33d808613b21fd98ede28c49afbb919cf950a10b36 SHA512 094680c406d937a084e1282d400820f239dea21ec0effad55150fdd985d089bd79a685762128fd6b1cd9e320a3b815a76a9991815b41bcbccbb95776880ab068 WHIRLPOOL b8604e9783af163722d39ff4d5caf678899e7fe077616c3167b5fa8ece12155f14698df241bb8afba40dc2353eb4934e55df24563d99f88879d03e01a9a66da5
-MISC ChangeLog 42634 SHA256 6579600044fdf1f94d262a9acca02c27ea476f62f549fa9ec9000e30b0ca32ed SHA512 95a1e04d69715b6acec35d356569d765de5648bb83b1865e2a7327e44dec6e4e5e84ac87d70ede3c8f7b49590a8d7ac82c00e603fc6632aef1048035dbb447fc WHIRLPOOL 5936b3433f96d312181bbd39224ad491207d6fdf3094b116f42a5180f1f5816bf5d0b7e02b1ef9fc782091b2a2e47bc55fb64cb74a2ca78f0608acd9718d5d4b
+EBUILD emul-linux-x86-baselibs-20140508-r7.ebuild 5163 SHA256 c8a480597b1ec9cd259eca6093f2a12a8a0e77f1ecd0604e2a06b55050c5e5d6 SHA512 f90cc3ca2f134abc1cffd56559d65b2594abe6ec33a53b7a0dfb445938e7155ab72a12daaf14d9fab35568509ecb4df58b49f019a1ec729bf828db947150ac95 WHIRLPOOL 1964a0592bdfd81468cacd94f92690cf4acfd80f6cd4d50589884a28dbc5a35d7f13482fcef68a1339e2a8aae9a5b5fbc7c1863b41f70572abf8500510c24d22
+MISC ChangeLog 43086 SHA256 9bae6e909c4e90e751819f40920b3b33de24f09c72bcb0128816d08fc69030c5 SHA512 e5db931e304861f7da2f63d80a54b2c44dbadfb41213f5816dadeb6b71d4832b08507486287fbd38b78c941a5eb7f636f78514d11f2d47315fb81f7f5c9ddd26 WHIRLPOOL 1b3e0656a5a3deefdb295229e6207062cbd13ffaf065a97af0eb3ce0710c5ce41926832b805af65c7c0c8a5f139aaa2d3fe70c4244a39dc9219a20297a3150a0
 MISC metadata.xml 312 SHA256 9d3f082956c89c24d50eacf1a35e6d3f7e7605a2b290b3ca01123c357595b680 SHA512 21f9fbd2145e18c319f089f1cb2f99cec289daac7e35c944335d979fca8ae595ac2ab81a025c55d56dde80ed7db88fdcd0b644bf2070b6eee7c26bf643fc4e19 WHIRLPOOL 5cfe4fa3453b53f0d056331b905da9584e13a48af3671f248b7ede707b587338b145613a77cf655af74734ae1e9d0dfe50f13d34a2cb069a73c76abc3a753262
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r5.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r7.ebuild
index e527d06..a47a4a7 100644
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r5.ebuild
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r7.ebuild
@@ -86,7 +86,8 @@ RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
 		>=net-libs/neon-0.30.0-r1:0[abi_x86_32(-)]
 		>=net-dns/libidn-1.28-r1[abi_x86_32(-)]
 		>=net-misc/curl-7.34.0-r2[abi_x86_32(-)]
-		>=dev-libs/openssl-1.0.1g-r1[abi_x86_32(-)]
+		>=dev-libs/openssl-1.0.1g-r1:0[abi_x86_32(-)]
+		>=dev-libs/openssl-0.9.8y-r1:0.9.8[abi_x86_32(-)]
 		>=net-libs/gnutls-3.3.1-r1[abi_x86_32(-)]
 		>=net-print/cups-1.7.1-r2[abi_x86_32(-)]
 		>=sys-libs/talloc-2.1.0-r1[abi_x86_32(-)]
@@ -94,6 +95,8 @@ RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
 		>=virtual/krb5-0-r1[abi_x86_32(-)]
 		>=sys-libs/db-4.8.30-r1:4.8[abi_x86_32(-)]
 		ldap? ( >=net-nds/openldap-2.4.38-r2[abi_x86_32(-)] )
+		>=net-dns/libidn-1.28-r1[abi_x86_32(-)]
+		>=dev-libs/libnl-3.2.24-r1[abi_x86_32(-)]
 	)
 	>=sys-libs/glibc-2.15" # bug 340613
 
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r5 b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r7
index c3fff69..d1074b7 100644
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r5
+++ b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r7
@@ -538,10 +538,6 @@ usr/lib32/libneon.so.27
 usr/lib32/libneon.so.27.3.0
 usr/lib32/pkgconfig/neon.pc
 usr/lib32/libneon.so.27.2.6
-usr/lib32/libidn.so
-usr/lib32/libidn.so.11
-usr/lib32/libidn.so.11.6.11
-usr/lib32/pkgconfig/libidn.pc
 usr/lib32/libcurl.so.4
 usr/lib32/libcurl.so.4.3.0
 usr/lib32/pkgconfig/libcurl.pc
@@ -631,3 +627,28 @@ usr/lib32/libdb_cxx-4.8.so
 usr/lib32/libdb_cxx.so
 usr/lib32/libdb_stl-4.8.so
 usr/lib32/libdb_stl.so
+usr/lib32/libcrypto.so.0.9.8
+usr/lib32/libssl.so.0.9.8
+usr/lib32/libidn.so
+usr/lib32/libidn.so.11
+usr/lib32/libidn.so.11.6.11
+usr/lib32/pkgconfig/libidn.pc
+usr/lib32/libnl-3.so
+usr/lib32/libnl-3.so.200
+usr/lib32/libnl-3.so.200.18.0
+usr/lib32/libnl-genl-3.so
+usr/lib32/libnl-genl-3.so.200
+usr/lib32/libnl-genl-3.so.200.18.0
+usr/lib32/libnl-idiag-3.so
+usr/lib32/libnl-idiag-3.so.200
+usr/lib32/libnl-idiag-3.so.200.18.0
+usr/lib32/libnl-nf-3.so
+usr/lib32/libnl-nf-3.so.200
+usr/lib32/libnl-nf-3.so.200.18.0
+usr/lib32/libnl-route-3.so
+usr/lib32/libnl-route-3.so.200
+usr/lib32/libnl-route-3.so.200.18.0
+usr/lib32/pkgconfig/libnl-3.0.pc
+usr/lib32/pkgconfig/libnl-genl-3.0.pc
+usr/lib32/pkgconfig/libnl-nf-3.0.pc
+usr/lib32/pkgconfig/libnl-route-3.0.pc