Support multilib providers for deps (only relies on glibc)

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 15 insertions, 7 deletions

diff --git a/media-video/makemkv/ChangeLog b/media-video/makemkv/ChangeLog
index 8fbb97e7269d..9d5546de6a53 100644
--- a/media-video/makemkv/ChangeLog
+++ b/media-video/makemkv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/makemkv
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/ChangeLog,v 1.44 2014/08/22 23:06:31 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/ChangeLog,v 1.45 2014/10/15 20:44:34 pacho Exp $
+
+  15 Oct 2014; Pacho Ramos <pacho@gentoo.org> makemkv-1.8.10.ebuild,
+  makemkv-1.8.12-r2.ebuild:
+  Support multilib providers for deps (only relies on glibc)
 
 *makemkv-1.8.12-r2 (22 Aug 2014)
 
diff --git a/media-video/makemkv/makemkv-1.8.10.ebuild b/media-video/makemkv/makemkv-1.8.10.ebuild
index cf7f21ad144c..19694d3e51f0 100644
--- a/media-video/makemkv/makemkv-1.8.10.ebuild
+++ b/media-video/makemkv/makemkv-1.8.10.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/media-video/makemkv/makemkv-1.8.10.ebuild,v 1.2 2014/06/25 19:14:18 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.8.10.ebuild,v 1.3 2014/10/15 20:44:34 pacho Exp $
 
 EAPI=5
 inherit eutils gnome2-utils multilib flag-o-matic
@@ -20,7 +20,9 @@ IUSE="multilib"
 
 QA_PREBUILT="opt/bin/makemkvcon opt/bin/mmdtsdec"
 
-RDEPEND="dev-libs/expat
+RDEPEND="
+	sys-libs/glibc[multilib?]
+	dev-libs/expat
 	dev-libs/openssl:0
 	sys-libs/zlib
 	virtual/opengl
@@ -28,7 +30,7 @@ RDEPEND="dev-libs/expat
 	dev-qt/qtdbus:4
 	dev-qt/qtgui:4
 	|| ( >=media-video/ffmpeg-1.0.0 >=media-video/libav-0.8.9 )
-	amd64? ( multilib? ( app-emulation/emul-linux-x86-baselibs ) )"
+"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/makemkv-oss-${PV}
diff --git a/media-video/makemkv/makemkv-1.8.12-r2.ebuild b/media-video/makemkv/makemkv-1.8.12-r2.ebuild
index c6b75e5db3a9..8e61a6a429d8 100644
--- a/media-video/makemkv/makemkv-1.8.12-r2.ebuild
+++ b/media-video/makemkv/makemkv-1.8.12-r2.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/media-video/makemkv/makemkv-1.8.12-r2.ebuild,v 1.1 2014/08/22 23:06:31 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.8.12-r2.ebuild,v 1.2 2014/10/15 20:44:34 pacho Exp $
 
 EAPI=5
 inherit eutils gnome2-utils multilib flag-o-matic
@@ -20,7 +20,9 @@ IUSE="multilib qt4"
 
 QA_PREBUILT="opt/bin/makemkvcon opt/bin/mmdtsdec"
 
-RDEPEND="dev-libs/expat
+RDEPEND="
+	sys-libs/glibc[multilib?]
+	dev-libs/expat
 	dev-libs/openssl:0
 	sys-libs/zlib
 	qt4? (
@@ -31,7 +33,7 @@ RDEPEND="dev-libs/expat
 	)
 	>=sys-libs/glibc-2.12.0
 	|| ( >=media-video/ffmpeg-1.0.0 >=media-video/libav-0.8.9 )
-	amd64? ( multilib? ( app-emulation/emul-linux-x86-baselibs ) )"
+"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/makemkv-oss-${PV}