update multilib deps to use multilib converted packages when available. bug #489058 by Michael Mair-Keimberger (iamnr3)

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 49 insertions, 14 deletions

diff --git a/media-video/tsmuxer/ChangeLog b/media-video/tsmuxer/ChangeLog
index b0aacc5560f3..913709be8761 100644
--- a/media-video/tsmuxer/ChangeLog
+++ b/media-video/tsmuxer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/tsmuxer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/tsmuxer/ChangeLog,v 1.10 2013/07/21 09:03:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/tsmuxer/ChangeLog,v 1.11 2013/12/30 08:10:35 aballier Exp $
+
+  30 Dec 2013; Alexis Ballier <aballier@gentoo.org> tsmuxer-1.10.6-r1.ebuild:
+  update multilib deps to use multilib converted packages when available. bug
+  #489058 by Michael Mair-Keimberger (iamnr3)
 
   21 Jul 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due #92799
diff --git a/media-video/tsmuxer/Manifest b/media-video/tsmuxer/Manifest
index f9cbd38134ea..775882a784ad 100644
--- a/media-video/tsmuxer/Manifest
+++ b/media-video/tsmuxer/Manifest
@@ -3,13 +3,13 @@ Hash: SHA256
 
 DIST tsMuxeR_shared_1.10.6.tar.gz 640010 SHA256 40871629da0968488c90600a0870b6f9e3ed09d30522c56a97d7397365af0910 SHA512 64d5214a84ae1d2fdbaad214ff9586007ed1d88e7d0e18d866dfe4e75cf371de52e4c05eb1d67d0b9c7c2f9cd5ca87b4dbb2b113e81361ba658aa1fecca115d6 WHIRLPOOL ca4993cf04a22051f9a5c8b7cbe8537156263d2b3e0c9f27a889a519eb7b171df7dbca5841a7345237b1623ce46c547ace886ce07bba3e92717513f87fd1cd15
 DIST tsmuxer-icon.png 1634 SHA256 ff166c09d7e5218ee566d876c20873e26ccf6242a3f37a7f01e6514c4396a753
-EBUILD tsmuxer-1.10.6-r1.ebuild 1539 SHA256 2e7abcae37c08f3a9897905ef792aaa3a7fcac3a52fc65b25cbf39ba7bf7f2d4 SHA512 a19cdb1ada136ada3403314ff7b5c3a2ca32a7a67fd3359e2edd81c9a200e64f1650847a28d553651867d9bbe95f161aceffad148421abd00ec5077cd4bfb220 WHIRLPOOL 1668669393802ee7116451df5ee59276e8dd8fb50ad1b8510fb6266a0ecdeb00c59ce0ba47e3ec870fd36597fa295004389b9fef7b62714e392f5cb4501afdf0
-MISC ChangeLog 1619 SHA256 e6544252fed49587c4dedd112fd5484601fc9c2d6b79ab5b0d200c165c114ca9 SHA512 a4941e4d9030cdff9af1fe9e55f6b9e6673b6f1d681b07500f77735e4c83aa346e1370db338a7206869956bf595b6d88d182c2c632bd295d1c5856216c9cd001 WHIRLPOOL b45ba78d07a9530e7f7f0e93ac1c6ba504a6aaddf5a45d776eaa43b0b30a8cda6edaf78d625f9eda5f36503427279ab79ecdf28795eb0fc27b6294f714935be4
+EBUILD tsmuxer-1.10.6-r1.ebuild 2200 SHA256 aa5fefbfa4e4af0b069eae25e034f7026eb77a97d50e54a5da914c04b81df541 SHA512 07772b7f751c990442805ad7f2d0a16df4dcf5fb8ced9d0b9bc123e86f1ef2c5bd490f7e198a841362f04bacb2ea75e5a3d1ee2dd0d113b8c7a570196b28a187 WHIRLPOOL 061b0f87e5b4077c5f8bba535896cd220e9842023a2be32c1cc080e47016c41a0dd7ec0a6cdccf282690743ae0eae83cc20f9fde7bad3de7c452a454e93d9084
+MISC ChangeLog 1825 SHA256 e4f49f0fcaf221f63b929d9ea6f1c7773b152d569c1d7133b86cebec860f6d22 SHA512 4a61cd33784d26aeed30310868432a8454fa90cfc1d8cc595ebf545c25bddae5c17438642799d7908fb18498be6ec3722732cd3f932f3995ba0a33f63bc37bde WHIRLPOOL 37eab51853e2fd0619996b69d151075597d4cb8d5dfde16f43cbf5b58a2802b2eee4829424394a44ab6b0d0ae1925103aaeb7eed8dab20896d1e088d900a8ebf
 MISC metadata.xml 545 SHA256 2013677fa0567ee7e4ead16c7f8dca21cb86a466c2ec0372135dcf57c7065b93 SHA512 5b022c98c76cb99d96c177db5213cbfb3743eaabd5215625880b5c35cea89220822d4706f7d245870375ccf702c86872cf804233e968da5278d1fa9ac7803f35 WHIRLPOOL 81dfbb1bc921d8b453573ae83935bd84e65123857f0cb46f15b28a2f6b74ae6c8c65afdd36ec0bb574da3c60c67d8207f3cbc0ac6792c8187a5da370a6b8e92a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlHro90ACgkQCaWpQKGI+9SzbQCdHufyw5NOlzxKWGOJ9U1yT5qn
-LloAnj9jteqzCxWAvvHRwMb69in8sfNi
-=84Qd
+iEYEAREIAAYFAlLBKnwACgkQvFcC4BYPU0qhbwCdFFHMl+7lom9pMT4L1IyThIUZ
+ppkAnjYb1sg2lw0eRJGMXiVmUrTkHBfK
+=jLq5
 -----END PGP SIGNATURE-----
diff --git a/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild b/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild
index ddeb8d6e666e..5bc014a5774e 100644
--- a/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild
+++ b/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild,v 1.8 2013/03/02 22:43:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild,v 1.9 2013/12/30 08:10:35 aballier Exp $
 
-EAPI="4"
+EAPI=5
 
 inherit eutils base qt4-r2
 
@@ -24,17 +24,48 @@ DEPEND="|| (
 )"
 RDEPEND="
 	x86? (
-		sys-libs/glibc
 		media-libs/freetype:2
 		qt4? (
+			dev-libs/glib:2
+			dev-qt/qtcore:4
 			dev-qt/qtgui:4
-			media-libs/libpng:1.2
+			media-libs/fontconfig
+			x11-libs/libICE
+			x11-libs/libSM
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXrender
 		)
 	)
 	amd64? (
-		app-emulation/emul-linux-x86-xlibs
-		app-emulation/emul-linux-x86-baselibs
-		qt4? ( >=app-emulation/emul-linux-x86-qtlibs-20081109 )
+		|| (
+			media-libs/freetype:2[abi_x86_32(-)]
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		)
+		qt4? (
+			|| (
+				app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+				(
+					media-libs/fontconfig[abi_x86_32(-)]
+					x11-libs/libICE[abi_x86_32(-)]
+					x11-libs/libSM[abi_x86_32(-)]
+					x11-libs/libX11[abi_x86_32(-)]
+					x11-libs/libXext[abi_x86_32(-)]
+					x11-libs/libXrender[abi_x86_32(-)]
+				)
+			)
+			|| (
+				dev-libs/glib:2[abi_x86_32(-)]
+				app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+			)
+			|| (
+				(
+					dev-qt/qtcore[abi_x86_32(-)]
+					dev-qt/qtgui[abi_x86_32(-)]
+				)
+				app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)]
+			)
+		)
 	)"
 
 # cli is linked to freetype, when it will be fixed,