Support both emul-linux and multilib dependencies. Bug #485330 with patch from Michael "iamnr3" Mair-Keimberger.

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 43 insertions, 17 deletions

diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog
index d9baedb429a8..af724a64baa8 100644
--- a/net-im/skype/ChangeLog
+++ b/net-im/skype/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/skype
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.151 2013/09/08 21:17:44 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.152 2013/09/18 22:01:30 mgorny Exp $
+
+  18 Sep 2013; Michał Górny <mgorny@gentoo.org> skype-4.2.0.11-r1.ebuild:
+  Support both emul-linux and multilib dependencies. Bug #485330 with patch from
+  Michael "iamnr3" Mair-Keimberger.
 
   08 Sep 2013; Maciej Mrozowski <reavertm@gentoo.org> skype-2.2.0.35-r99.ebuild,
   skype-4.0.0.8-r1.ebuild, skype-4.1.0.20.ebuild, skype-4.2.0.11-r1.ebuild,
diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest
index bf458e49fb16..8917b75feea2 100644
--- a/net-im/skype/Manifest
+++ b/net-im/skype/Manifest
@@ -11,14 +11,26 @@ DIST skype_static-4.0.0.8.tar.bz2 40843888 SHA256 434cfaf1de87d53b8e6b78a3deb85f
 EBUILD skype-2.2.0.35-r99.ebuild 3434 SHA256 1858688346d2a46243597d372f25e2d697bb7453197333a0101fed0e48957be4 SHA512 46a7e6befd3bfbfa4351de50f25b91934d972a4705cc1e0770d3f46c841e9adb58de547a85c1e13c308e0467b6b725a055f726ddfd196f91b573ad08348114ef WHIRLPOOL 8d22ac5aabafcee23b167581d8b33a475142188139a319c91eeeb62ebb8500ecd9419ef7fbc084581206188306d97fede1ef80bb13dfafe189a7d5922b26f591
 EBUILD skype-4.0.0.8-r1.ebuild 3407 SHA256 d9166045c9fc4e0c5648ed4a8a82c84c7410486bdc88aa6849f872fb782c5c9c SHA512 b2498b5ae3ae3908da5cd84d9bfee33cc84acc409e5390abec2a686385affa2270bfa0254f4ec9fca39b45c03ccf223191bb62f5529783ed896e899d1447094a WHIRLPOOL 1198520e267560f6ace342c39194f2bec44ac7ae5637e6909c6ac0beb7d99e264d3418066551786e2674eea5f69a44495fef54328550b5bb3dfbffbad5ebca39
 EBUILD skype-4.1.0.20.ebuild 2795 SHA256 11946078c925b203a7ea047df6a15f34a2426540da50bf53448c9d0f32fe2c1b SHA512 48e7acf82c5beff4d8240167cb722204234b78275f624170df7af5754159ad3d2bf2281b817aecf6672b43612af657aeebfdd9114101a9208bd40fb80af3976d WHIRLPOOL 915a86d80e4fffd718cbc1fbef657371124c3ea186a72609e73f5df0bf97dbabe356b0e06eaeec0572448ea19616cb3fc7f57f1eee347e14b808b10b17bd5096
-EBUILD skype-4.2.0.11-r1.ebuild 2811 SHA256 1ac783c7393380f20674a67cb6485dd2324495e326120dc4a4ac5993a6bd7354 SHA512 35ec00568a5c81cb3fe807bb079176b1248533dcb03f5838060d6141027af431a4edef86d1922d109348af944eb10457cd54fadbd0d46b35d1ff4842196fbe54 WHIRLPOOL d6112819553929c2ec6fa699ae7308332db6b367e4d5a085d0dc02513c523575a0eb87bab76642fc9b3f540b39386f7025a0c3528c523f0bc3538d6356facf8e
+EBUILD skype-4.2.0.11-r1.ebuild 3035 SHA256 23bc25651cba7cbb9ab1368c72cbfb2c4328b845c94b50571c3e188b5c996106 SHA512 1d6850108c6a354acbc3a67a44a7c83d9fa04904553d1156537ceccd493981eb2fa323cde720c82333d9cfe53302d14694f6fc6db64076e78ab75ca352d104e2 WHIRLPOOL a133fa08aaaded5fa14964dae30b6dcef32c8e9b92d3586cbd66793223c86ede054a9c762fb29251090be7e8878a3a311cca9d39fecc5877747e9071b68d978f
 EBUILD skype-4.2.0.11.ebuild 2809 SHA256 ed305e0d28857ee7897edadac16b94843334c43967c3396fa2b137b8903e4736 SHA512 f1612dbd17a584007a5466d2e49ba51631a6073df8eabb1aabcdf2b5fdce8460f96962ba62aceaae41cc0b266bc15e636bb9e709b5d8d86c50a7efa60b0a6856 WHIRLPOOL f0658bd66271e83f521c7105a5e3e73215556aff06f23cc5ed14a7f2e58d32d6792a28818fed819a7cd39d201393ac74fa4e3cc6d76503ca19c1965ada33d330
-MISC ChangeLog 26754 SHA256 667531e7009e7380455b6e3737dacf0bf50397cb4c0b44cd0a4f54889a7c5fd0 SHA512 1bc2ef0b76be8915507a6eb31f540ece56729d9449074c2204ce918decd5b5fdafaaf4d7b5bcbd1539e07c4d71c66e396baad4f86a273634c70f67ffb0f30a0b WHIRLPOOL 429c5a03ef6f8e71d5b0b06042aa82e7c5be0a12265aa52cc6a6b399d6af2e1a55d1465b06ffecf71253b06e23f164bbe27433645829535bf8293fe2ba358db9
+MISC ChangeLog 26946 SHA256 de52d38e4d99b89f8b35344fa9877f29fa0fef37065df9f1f610ec40012dd3af SHA512 c4472aac1d7e6571817c6e98476c3ad34066a6c32fd4bf1205456b1b93914f3772edb5b5f0764f49ead21d81ae9e5a013763bc4ddeb95fabd6ee923f63a4158d WHIRLPOOL 3cfb12f74be46e8a2a5182f39fc1164d40192b698d90c261886d99ba380e8cd995b1c94cf5dfc4a9233ac582fd04ecbf67ddeb2e63696702c3512421fa86f4c0
 MISC metadata.xml 667 SHA256 731cac629cdcd3afb24c75f3b49485799f16fb43735a85d01ad1e26db429fdc5 SHA512 f91159b880661dc498767b75a99d6f0c0b5853601fab291d25ab320fb5b188b65675e6d41ee51d700f281b9ad5b2bb2afb18b712d591a7d1673fdd10baf7cb11 WHIRLPOOL 83358915b9c23776516d690922953690e3acb7559b6b492ddf2038449b866007a5ff26c8b747c2577218eb68c70825bdaff26ef39d125fbf3a4fd74bab69efa8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlIs6ZIACgkQFuHa/bHpVds9cQCeLnDCuNi6SLSJsOFI4f5+bdSb
-MY0AnA1NwLLvpm7Gg6UxpdYEc/GD3YcO
-=Tzjw
+iQJ8BAEBCABmBQJSOiLiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZObbwQANAm5/W1v7Lo+G1lQ04usXo5
+W1e/zHNMPzk6JZmxi6eVBRcE6OOu1CK81psypqGJzgzehrEqWOX+uzRAsLnggDWQ
+vgkbq5SgFJAyZT5Wu1GoLiMBLZ04eCzh631M2rfdCU/4ldveWJtRQqQoq0iVGlki
+cetl6ijgcWOix4lZ82S0YnT2EB4lUoiTfKftMaQS10lQq0B5C74Wr43olxsc6Kuq
+tn5lDkQUnSkUCu6rfQF6RcZg+Jf5rYuUMNYOkx6HyjwMXbRxBJAsQrT8gY4995st
+G0CldsQZY1RtaReDpJpA3bTOCcMY+Zk5bJTZjruIAOU2gtKOTaoaDp2bzIbJfNAh
+gm6m6Qn8MEUjc51XRZhosqAR+OhJm16fMBFySdPdIAkMg76W1oKWLGi6CLx19qsv
+YUef2woAHs9P/uOqWaUjm2Z08HLeUgUPee/GpfmsZJPxW7PdwyCcYOm93HHgKZER
+0gB4H1e4tltPyBcb3KE9jwFSqsvndd5Xc9ILc8bHRv0KxDI4c2XMt6BjW4BK46xl
+fcKAs11Tn1yYRh2GTYq7+YPUqRjvzRC91Szr17mClNAbqitym0tliSYXmHyq6crm
+Mt8CRRuAytY5IWwt1ldCEJ2E1aaOxGaTrB7sIvXhKnY8oxlprbokd4NXiDCbrUof
+9UL8GZq3QQgN6z95EAy8
+=kxPr
 -----END PGP SIGNATURE-----
diff --git a/net-im/skype/skype-4.2.0.11-r1.ebuild b/net-im/skype/skype-4.2.0.11-r1.ebuild
index 49d5f538636c..8b589e5fc8f8 100644
--- a/net-im/skype/skype-4.2.0.11-r1.ebuild
+++ b/net-im/skype/skype-4.2.0.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.2.0.11-r1.ebuild,v 1.2 2013/09/08 21:17:44 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.2.0.11-r1.ebuild,v 1.3 2013/09/18 22:01:30 mgorny Exp $
 
 EAPI=5
 inherit eutils gnome2-utils pax-utils
@@ -21,20 +21,30 @@ EMUL_X86_VER=20120520
 
 RDEPEND="virtual/ttf-fonts
 	amd64? (
-		>=app-emulation/emul-linux-x86-baselibs-${EMUL_X86_VER}
-		>=app-emulation/emul-linux-x86-qtlibs-${EMUL_X86_VER}
-		>=app-emulation/emul-linux-x86-soundlibs-${EMUL_X86_VER}
 		|| (
 			(
-				x11-libs/libX11[abi_x86_32]
-				x11-libs/libXext[abi_x86_32]
-				x11-libs/libXScrnSaver[abi_x86_32]
-				x11-libs/libXv[abi_x86_32]
+				dev-qt/qtcore:4[abi_x86_32(-)]
+				dev-qt/qtdbus:4[abi_x86_32(-)]
+				dev-qt/qtgui:4[accessibility,abi_x86_32(-)]
+				dev-qt/qtwebkit:4[abi_x86_32(-)]
 			)
-			>=app-emulation/emul-linux-x86-xlibs-${EMUL_X86_VER}
+			>=app-emulation/emul-linux-x86-qtlibs-${EMUL_X86_VER}[-abi_x86_32(-)]
+		)
+		|| (
+			media-libs/alsa-lib[abi_x86_32(-)]
+			>=app-emulation/emul-linux-x86-soundlibs-${EMUL_X86_VER}[-abi_x86_32(-)]
+		)
+		|| (
+			(
+				x11-libs/libX11[abi_x86_32(-)]
+				x11-libs/libXext[abi_x86_32(-)]
+				x11-libs/libXScrnSaver[abi_x86_32(-)]
+				x11-libs/libXv[abi_x86_32(-)]
+			)
+			>=app-emulation/emul-linux-x86-xlibs-${EMUL_X86_VER}[-abi_x86_32(-)]
 		)
 	)
-	!amd64? (
+	x86? (
 		media-libs/alsa-lib
 		x11-libs/libX11
 		x11-libs/libXext