app-emulation/emul-linux-x86-baselibs-20140508-r5: revbump/merge

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

4 files changed, 20 insertions, 18 deletions

diff --git a/app-emulation/emul-linux-x86-baselibs/ChangeLog b/app-emulation/emul-linux-x86-baselibs/ChangeLog
index 71868c7..28b2140 100644
--- a/app-emulation/emul-linux-x86-baselibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-baselibs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.211 2014/05/15 18:37:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.212 2014/05/21 11:04:43 mgorny Exp $
+
+*emul-linux-x86-baselibs-20140508-r4 (21 May 2014)
+
+  21 May 2014; Michał Górny <mgorny@gentoo.org>
+  +emul-linux-x86-baselibs-20140508-r4.ebuild, +files/remove-native-20140508-r4:
+  Add multilib openldap.
 
 *emul-linux-x86-baselibs-20140508-r3 (15 May 2014)
 
diff --git a/app-emulation/emul-linux-x86-baselibs/Manifest b/app-emulation/emul-linux-x86-baselibs/Manifest
index d8df16d..36b2d51 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-r4 18612 SHA256 75cfdaa67cc8f40a6ea67a504e172ed11df0c055e62543b28e85f3805c3edbca SHA512 07e33981ebdf5b057d4409f87c99b7004b4ab0eb01ec07416d7be20506e8458c0705eef0ea422af74fd57738ce0bbe174403dfb2f1b928e368543748e20407c6 WHIRLPOOL f16c10b1d93769e0e13bd152e865ef1c660027c186df26bfc094a680dcf1d869d23e98b9a8f440ebb546c8030fb2371af127ae324cc8d7edd29b16056cdce66a
+AUX remove-native-20140508-r5 18855 SHA256 64a278b5d66cb46595b1cc07c1376db4ca8065fbefcb8cc9bfa6f24ee4e9d1ea SHA512 39565b1cd108bf757b33ea100bacb5bb5d68eaca36ecb143b983b8b63dee0ca6c2281ad417a183f9d5c666fbf56211ec04ddc93f19136d7012c88e52d1de504f WHIRLPOOL 6a7719b0f2511b29753b50848cbb88b087cf3dcadde775fbfc7259a5e52d1c6b7b9e466b31f7a9e76be1d7a4969045a5a5662a67f5de8a1ca0c8d5936a0cd034
 DIST emul-linux-x86-baselibs-20140508.tar.xz 40339976 SHA256 754b9460609d24b89dfb6875aa76a422b53ed3bb2f2e10bad82ad118e2592357 SHA512 2491cf64e2ad91cc19ae84b02887a262cd349f6a44eb3c62adee4a63ccbaff14214e838cb4bd151abc16c62e03e7d18d84e331e4adf2100569331d86211b289f WHIRLPOOL 3af547d12b12f925ac6232de412323a893dc6ae3200c61a08b78ee3c62c7f98acbd2224036d4e265bdf816edc1e7de212fefea6326d7c4275ba3c45377f3edfc
-EBUILD emul-linux-x86-baselibs-20140508-r4.ebuild 4834 SHA256 2ec91ce2492295c28e5c4b1872bb1cf09b46b4bd077fd0e525867c7ec6c15776 SHA512 681cb01b57fe8f608f4d8a64d8e94ab2c7f11f5f131f7c84c1da4260aff37d04295343e92a82c7c922c39c8ee967da6e6d3da350bc0a8120db6324bbe392734e WHIRLPOOL 2618881823fbb6379575b85b7b415ff5d09168cfa17e735451226e75b8cb0849286486350088a07c4da0ded5d1f2dd82e1a4dd0c5ed3d0bad0a8ad5acb39f638
-MISC ChangeLog 42425 SHA256 98895689dcf0dd8cd321b39255d3b27fc7e8b370fee649e37b022bf66d07c1a7 SHA512 f06187eac9de0a319b2aa29c3fb6509e0d005b78e846f8a8f0090f3dc647cb31247ff930866ca65d4dd2437a15333bd08fc599bbe9912591e7561537350a4fbe WHIRLPOOL a3e52e0c527e268fb85976ee4c9767375f9a0103f9da055742ce28550e619dfad24ddf4e308f337bea788069c1d3944cdafced9c56ad5fc12672179792235498
+EBUILD emul-linux-x86-baselibs-20140508-r5.ebuild 4375 SHA256 03ff74779a149eeda193db61e7e414119aba8c9698175932ddb8a3ff286e94fa SHA512 146fb61df080e59ce1274ec31fc94f586e40fb36778162308394284c13eb31fa6fb8ca8ea716d2f8e0c02b50befd9ca0c9339600339cfc2ee50f24707481e2b2 WHIRLPOOL c3beb26975a7fd417fa966f7be4826e10132b7a22cb873986e28a6b133424217de72644a788edefa05d375a3dc8ecd81d23441c5e1ec739598055ec3ac336451
+MISC ChangeLog 42634 SHA256 6579600044fdf1f94d262a9acca02c27ea476f62f549fa9ec9000e30b0ca32ed SHA512 95a1e04d69715b6acec35d356569d765de5648bb83b1865e2a7327e44dec6e4e5e84ac87d70ede3c8f7b49590a8d7ac82c00e603fc6632aef1048035dbb447fc WHIRLPOOL 5936b3433f96d312181bbd39224ad491207d6fdf3094b116f42a5180f1f5816bf5d0b7e02b1ef9fc782091b2a2e47bc55fb64cb74a2ca78f0608acd9718d5d4b
 MISC metadata.xml 312 SHA256 9d3f082956c89c24d50eacf1a35e6d3f7e7605a2b290b3ca01123c357595b680 SHA512 21f9fbd2145e18c319f089f1cb2f99cec289daac7e35c944335d979fca8ae595ac2ab81a025c55d56dde80ed7db88fdcd0b644bf2070b6eee7c26bf643fc4e19 WHIRLPOOL 5cfe4fa3453b53f0d056331b905da9584e13a48af3671f248b7ede707b587338b145613a77cf655af74734ae1e9d0dfe50f13d34a2cb069a73c76abc3a753262
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r4.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r5.ebuild
index af35436..2fe86ce 100644
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r4.ebuild
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r5.ebuild
@@ -93,6 +93,7 @@ RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
 		>=sys-apps/keyutils-1.5.9-r1[abi_x86_32(-)]
 		>=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(-)] )
 	)
 	>=sys-libs/glibc-2.15" # bug 340613
 
@@ -108,20 +109,6 @@ src_prepare() {
 			"${S}/usr/lib32/engines/" \
 			"${S}/usr/lib32/openldap/" || die
 
-	use ldap || rm -v "${S}"/lib32/libnss_ldap-2.17.so \
-		"${S}"/lib32/libnss_ldap.so.2 \
-		"${S}"/usr/lib32/libnss_ldap.so.2 \
-		"${S}"/usr/lib32/libldap-2.4.so.2.9.1 \
-		"${S}"/usr/lib32/libldap_r.so \
-		"${S}"/usr/lib32/libldap.so \
-		"${S}"/usr/lib32/libldap_r-2.4.so.2 \
-		"${S}"/usr/lib32/libldap_r-2.4.so.2.9.1 \
-		"${S}"/lib32/security/pam_ldap.so \
-		"${S}"/usr/lib32/libldap-2.4.so.2 \
-		"${S}"/usr/lib32/libslapi.so \
-		"${S}"/usr/lib32/libslapi-2.4.so.2.9.1 \
-		"${S}"/usr/lib32/libslapi-2.4.so.2 || die
-
 	ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
 
 	# Remove migrated stuff.
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r4 b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r5
index c3fff69..77917d8 100644
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r4
+++ b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r5
@@ -631,3 +631,12 @@ 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/liblber-2.4.so.2
+usr/lib32/liblber-2.4.so.2.9.1
+usr/lib32/liblber.so
+usr/lib32/libldap-2.4.so.2
+usr/lib32/libldap-2.4.so.2.9.1
+usr/lib32/libldap.so
+usr/lib32/libldap_r-2.4.so.2
+usr/lib32/libldap_r-2.4.so.2.9.1
+usr/lib32/libldap_r.so