Fixed multilib deps related to libtool / libltdl split, bug 528294

(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)

6 files changed, 34 insertions, 11 deletions

diff --git a/app-emulation/emul-linux-x86-baselibs/ChangeLog b/app-emulation/emul-linux-x86-baselibs/ChangeLog
index c9945edc74e0..2920120d18fe 100644
--- a/app-emulation/emul-linux-x86-baselibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-baselibs/ChangeLog
@@ -1,6 +1,14 @@
 # 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.233 2014/09/21 16:41:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.234 2014/11/06 18:56:40 axs Exp $
+
+  06 Nov 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  emul-linux-x86-baselibs-20140406-r4.ebuild,
+  emul-linux-x86-baselibs-20140508-r12.ebuild,
+  emul-linux-x86-baselibs-20140508-r13.ebuild,
+  emul-linux-x86-baselibs-20140508-r14.ebuild,
+  emul-linux-x86-baselibs-20140508-r9.ebuild:
+  Fixed multilib deps related to libtool / libltdl split, bug 528294
 
   21 Sep 2014; Michał Górny <mgorny@gentoo.org> metadata.xml:
   Explain the use of USE=kerberos,ldap,pam. Bug #523318.
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r4.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r4.ebuild
index 8ab0653e1500..e7e1d3228719 100644
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r4.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-20140406-r4.ebuild,v 1.7 2014/07/26 08:51:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r4.ebuild,v 1.8 2014/11/06 18:56:40 axs Exp $
 
 EAPI=5
 inherit emul-linux-x86
@@ -72,7 +72,10 @@ RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
 		>=sys-libs/slang-2.2.4-r1[abi_x86_32(-)]
 		>=sys-apps/acl-2.2.52-r1[abi_x86_32(-)]
 		>=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)]
-		>=sys-devel/libtool-2.4.2-r1[abi_x86_32(-)]
+		|| (
+			>=dev-libs/libltdl-2.4.3:0[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.1h-r2[abi_x86_32(-)]
 	)
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r12.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r12.ebuild
index bc256489df09..21c80ed82814 100644
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r12.ebuild
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r12.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-r12.ebuild,v 1.4 2014/07/26 08:51:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r12.ebuild,v 1.5 2014/11/06 18:56:40 axs Exp $
 
 EAPI=5
 inherit emul-linux-x86
@@ -71,7 +71,10 @@ RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
 		>=sys-libs/slang-2.2.4-r1[abi_x86_32(-)]
 		>=sys-apps/acl-2.2.52-r1[abi_x86_32(-)]
 		>=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)]
-		>=sys-devel/libtool-2.4.2-r1[abi_x86_32(-)]
+		|| (
+			>=dev-libs/libltdl-2.4.3:0[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.1h-r2:0[abi_x86_32(-)]
 		>=dev-libs/openssl-0.9.8z_p1-r2:0.9.8[abi_x86_32(-)]
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r13.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r13.ebuild
index f8d4234f9da0..1cce1dd03258 100644
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r13.ebuild
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r13.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-r13.ebuild,v 1.3 2014/07/26 08:51:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r13.ebuild,v 1.4 2014/11/06 18:56:40 axs Exp $
 
 EAPI=5
 inherit emul-linux-x86
@@ -71,7 +71,10 @@ RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
 		>=sys-libs/slang-2.2.4-r1[abi_x86_32(-)]
 		>=sys-apps/acl-2.2.52-r1[abi_x86_32(-)]
 		>=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)]
-		>=sys-devel/libtool-2.4.2-r1[abi_x86_32(-)]
+		|| (
+			>=dev-libs/libltdl-2.4.3:0[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.1h-r2:0[abi_x86_32(-)]
 		>=dev-libs/openssl-0.9.8z_p1-r2:0.9.8[abi_x86_32(-)]
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r14.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r14.ebuild
index a3c75720a47a..89d15f126e3d 100644
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r14.ebuild
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r14.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-r14.ebuild,v 1.3 2014/07/26 08:51:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r14.ebuild,v 1.4 2014/11/06 18:56:40 axs Exp $
 
 EAPI=5
 inherit emul-linux-x86
@@ -71,7 +71,10 @@ RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
 		>=sys-libs/slang-2.2.4-r1[abi_x86_32(-)]
 		>=sys-apps/acl-2.2.52-r1[abi_x86_32(-)]
 		>=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)]
-		>=sys-devel/libtool-2.4.2-r1[abi_x86_32(-)]
+		|| (
+			>=dev-libs/libltdl-2.4.3:0[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.1h-r2:0[abi_x86_32(-)]
 		>=dev-libs/openssl-0.9.8z_p1-r2:0.9.8[abi_x86_32(-)]
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r9.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r9.ebuild
index 24e03e7434e3..3a9e77429efd 100644
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r9.ebuild
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r9.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-r9.ebuild,v 1.7 2014/07/26 08:51:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r9.ebuild,v 1.8 2014/11/06 18:56:40 axs Exp $
 
 EAPI=5
 inherit emul-linux-x86
@@ -70,7 +70,10 @@ RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
 		>=sys-libs/slang-2.2.4-r1[abi_x86_32(-)]
 		>=sys-apps/acl-2.2.52-r1[abi_x86_32(-)]
 		>=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)]
-		>=sys-devel/libtool-2.4.2-r1[abi_x86_32(-)]
+		|| (
+			>=dev-libs/libltdl-2.4.3:0[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.1h-r2:0[abi_x86_32(-)]
 		>=dev-libs/openssl-0.9.8z_p1-r2:0.9.8[abi_x86_32(-)]