Support multilib providers for deps (only relies on glibc)

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 28 insertions, 10 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/Manifest b/media-video/makemkv/Manifest
index f7cd8d07ce16..de1689b81560 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX makemkv-1.8.10-makefile.linux.patch 348 SHA256 b60e13131f64c60d51b7c044ab42528f07d9179815d7b4e83d27a87c859229f9 SHA512 521f20110929d0b84f63b50ed82286132797d8181f86f00dbae6cb76e502ae1d31990d672048371c7cb89c12768d69ab2af34537aa4eedc8ba93adde2d3559f7 WHIRLPOOL 85658159c4954b2807f264cc13405eb9a9bbb18060fdf875dffced2602db0bda0c959cdcc022bba6069cd9a24dadee9ca1ca87ca8d901ee2cc9943d56576a746
 AUX makemkv-1.8.11-makefile.linux.patch 348 SHA256 838f70e496ab00c53b7caa9d5ef2ed0573dee761dc3e94e54e47a019ef8e3dcb SHA512 2b20075e634d113b9097a5ffb09713750cb2b9a95c1761e3449763ff7aee1115e6800dfa8cc1f7138b22283f814c5abe7db03c3d6fc3bb1bfef91b8ab6a9f3bd WHIRLPOOL fd593c23986dd49b91aa7d0bc1d8e3b2247c1711868a0ff63592cb7e54291ac7307efa6da7e1290b2b3b24f04d87441e9d7f1f906971dff8adca11c09c1829d7
 AUX makemkv-1.8.12-makefile.linux.patch 348 SHA256 63987f7e7f7b74269a4b141572ec00830221154c045e6145d259a822caa49b6c SHA512 430c6615bd96ba0594f491a20f819efb98a061fe015b23bb56a9d310dab37de0726866af92a9968941644d3d05faff6253bc28ffb22e993b0ff189feda7df8bf WHIRLPOOL 3411f74fe114b6a7400d67277c9b5f9a7cd657b65385b0db43afbea0fb40712957159905265abf09eaec667dec17270d62fad7517be42a2025236f1187dd2587
@@ -8,7 +11,14 @@ DIST makemkv-bin-1.8.10.tar.gz 12216470 SHA256 551da0dcd56e313d6da7428da02a87569
 DIST makemkv-bin-1.8.12.tar.gz 12228591 SHA256 54af3d514dfcbf73ef5095b62e962f44ede15412dbf8bb7e17ca75824522a51e SHA512 ce00428630e2f12c3fe3c12a1555099fe5bfcd1c09efad7098e91ac56d1ced0cef541e8a154f14b159b056382621b240ff2135da00af9856ea62614e3092428d WHIRLPOOL 44d8125828e46507d1c1fe14afa365b4593197728cb6f4f1f7db86e12954b25709abf662b85778d5b968efa332585e2a583d5eea73e9af5c8de103e7c293fdcd
 DIST makemkv-oss-1.8.10.tar.gz 4215868 SHA256 e6dd93cb0cfa144e94c110b02b7fcbbc9945cf3fb4cf3398e1babd7b698b959d SHA512 5bba3ad68987d3ec085a14b9db4f25b0e77bf439e4c589f43c823de0a18bd2da41daee45335761bcbf8edb53c64702f8faaffd1d62ce906ea81cf7f63fb29778 WHIRLPOOL 8758acc6ea12b872c1873ab2f0aec8ea175493786cdc517da256b4480c0643b9caa7fd679eb2251698b9749381676a0d99309ab9f35c247ab60aec39706edb95
 DIST makemkv-oss-1.8.12.tar.gz 4215876 SHA256 0f45a1413d705ca4359404d6911fd166cdc67cd3b3bcd8aebbdc3e6970fbfeaf SHA512 10870dbecf5924946e633ac1958abf7572cdc65191398b2e2e297233274f65e547d9f5cef243de434cf8d8b31fe5240ff02e8c67f7fc135ee1c7150fee30116c WHIRLPOOL 11d0248587009d31cb03493fc2110f55a99e7109aaa89db7d989059cdfdcce3ac5c6eee24b20ab343b96afa77806e06343fa7900d4c1d71635252b7a2e3d6ae1
-EBUILD makemkv-1.8.10.ebuild 3081 SHA256 8b4d0be357c6f1f603bf0e484822d3f68484b97b948801c8e894c5f31a648cfe SHA512 796fc6928d4796dfea86de4ffe560360b457f923bf03579725e8bb9d9eaec8cf98c49fe45437f9269593982a60f61d9e8f1737299a16e88cad2ebadbb3af2643 WHIRLPOOL 9930310e36ee1eb2c0d232de603ca4f6acec6dbcb39cc79b577cad0bb8a3639cde21f78cc95e7bc4d68bd6be141b9b2a99a94f5914ed63552e0108081357f114
-EBUILD makemkv-1.8.12-r2.ebuild 3205 SHA256 09a720c674bba6f00b2d87bcff30a38e11faadf18fa50062c3208029c15971f0 SHA512 766bf6d2c8307a387b221c86cdcbef1578aed7d8aab9f9bff1acb3139512b0dcf508b52cb73df63b82d4cd3aba667d0d345ed80e3f8c6a8d35c81f6ef19dab96 WHIRLPOOL 01a49c83dc7667d06a90dd155bc9c2ef41e6c15d43bc95c72533a959d2990c4dfeca7d9485396cb2a63426fe7878cf9b9ca3344803c0fe3101be1d0ebae9ef97
-MISC ChangeLog 9428 SHA256 1b3e9cb70adc885ef8614e79b3c7dd3223db89e3f7ea8d62a6e26590b88402ea SHA512 90dca7dadbdf820ad03bd8388c0e5fbf8e997ad10183541ba5120c16f3d71424122cb9db282b26006c51bea87c97fb5fb9d45447ef3a076fe05a9e5cd155da5f WHIRLPOOL bdc6c0dd8d6d82a0bfac66a16028df9315b7e9e10ec52f3f7fa944ae6ade2b6df99974ba778132b1537a58409110c8ada5f52b78030a9831c6475ddbadaaf5e0
+EBUILD makemkv-1.8.10.ebuild 3047 SHA256 4664ef63c4f48f2de8bd25650a2f2995ac47360b8e5bac387df2730171a75946 SHA512 130bea1e8890f754062e364927c02295440d6c1ffad0175c767c1c9c03093ac458d2bc603ecf41c52bd96ba9c08ae20ccb1ffef61db2ae39fb949942f3a7fb48 WHIRLPOOL 67935a513e9ff0272fc032bd78f7152f0a597e5713f48196b77a76aee0a38a22eea498ed4007d6e783f664681bc9d162bd4018402d37d0e4f93c72081ecef2e8
+EBUILD makemkv-1.8.12-r2.ebuild 3169 SHA256 c2abb917f8f4a3fe5f7357fa018dbb2ea330bb72a82b9898613a7cd046f59105 SHA512 eb4acca6cf194ba5d8d1afa3836e4982b235d141b25e227c4147f24f178e6c98f42ec07425f584b179465061a12b7cf0caf4b10f61098d07ac1b1589571b61e3 WHIRLPOOL b3768be623cae407f21f45ec1e131a2ef83dbcbfb805d982e8a184d32f90695c9bef48eebb0ffb257582f67d8d2a991ab7335b5bf0e3187a5dc4f825383980e6
+MISC ChangeLog 9585 SHA256 6efc261bfe3512c2e115e1e262ab469912b5351359e6f2974df3d837e22ac1a5 SHA512 ee7c23bedb37e79212041ac8fc4d3785295602bd8dcb9dfc89fc2cb6be57999e9fd5259344fbd7d5ddea1e347a795e6e46af3943a98bbc1348a9a1c064780ad8 WHIRLPOOL 83e74321ce96c908e960c1256b160479ee0ebb6d5094fe5da65d7a4ce04611a97388ee4f948c81cc3c05b4693776cb402cf453687924991de20afb44de50afa1
 MISC metadata.xml 260 SHA256 fa1167a5441cabeb411561da356fac4524c470df05240c1f3d38034afb76ead5 SHA512 1a2e8743a75f495fb6bfaf731b3d6e3d2b39f9b20119c2bcd9edef13434d31bf46b56652ce77c5c3e5fb86e21a65ff3a3a5429fb74f8166cc7f4b5bbd84eb146 WHIRLPOOL 412c81eb8ce82f93a682b7ca8a9f566e6a8df4c22bcbb7863bf17a8e69ffd90dcb8fe338b5eb021f02a2fac140a56063d235bb07b73b644f288a203cff1e9316
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlQ+3LMACgkQCaWpQKGI+9TfkgCeMGvJP71lFlHIzJ7oPJJgdQsU
+gmYAn0VIoWbWgOqD2at80GeKcXbmKC8e
+=OR6h
+-----END PGP SIGNATURE-----
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}