Support new multilib-enabled packages as dependencies. Partially bug #510646.

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

3 files changed, 41 insertions, 17 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 4eba6886764f..5660ee9552ff 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.508 2014/05/17 15:31:17 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.509 2014/05/21 19:37:13 mgorny Exp $
+
+  21 May 2014; Michał Górny <mgorny@gentoo.org> wine-1.7.19-r1.ebuild:
+  Support new multilib-enabled packages as dependencies. Partially bug #510646.
 
 *wine-1.7.19-r1 (17 May 2014)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index a48b6ed9705f..6b04837373ca 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -163,23 +163,31 @@ EBUILD wine-1.7.15.ebuild 12899 SHA256 6e0a9e6ab7deb382cc2699b3344810796206c2ceb
 EBUILD wine-1.7.16.ebuild 12899 SHA256 38860f0c1d1cbd4a8c7fdb23b098d0e59273632d0783f70b787afecddde5a7e5 SHA512 1bee25cf27cfc716f730581c463505b482dd3c0a9df9401175ce5fd54c5d89ffeb49928c7cfa14c72417d9c4cce7d5f975e74716dc2b61b54dc954895f569553 WHIRLPOOL 9f29e6634194988e27b1b2eaf8f0c3873c1734cfc181afa8e20e5058b09590d5d3910866714ae465475d54ca96f6d51be6a35d6cac07d58af0cd00f0744edd01
 EBUILD wine-1.7.17.ebuild 12899 SHA256 dc110b7032383d59d4417dfa881b71b2a3777b7ae446fc2508687f596d52f2d4 SHA512 b0fe20e540fc7b2a7756d8e76a2f9eb4609e6a1b36d612029e7a407f3c39b4aefd8ac35f16973a2ee060dab58963a4b33593c3462ff067813a3391ca43af5516 WHIRLPOOL c69897371b9adb51989c741aed6e49cae5c1b626f88cfb565b6a44d52c513c5ef834cb38f83b6b11bae5bc8a4a85f97d377ac5904a481c58117ccf15ff9dedcd
 EBUILD wine-1.7.18.ebuild 12899 SHA256 2fe276899e605599e6b9d1a4ebdb7a4f91146b6b4001bd1364a18d89936768b9 SHA512 534ebf9e9d552cf84acaa6081be5505bd2ff4c7cb0eacbeb5f99b5c8f3c59c3f446cc71de2eae241581216da6ff56e06e5e5420ec18de7b7932307c6c2788db8 WHIRLPOOL 458f61c473487d1c926aaf5f67aaffb855841c52fba72aef9b4fe8f556fb0f59a2092408b8c7083d38d74442850edf0084bb3cd30b5c123854a4fed5a7736389
-EBUILD wine-1.7.19-r1.ebuild 14294 SHA256 ddbbab8aae8acd443a645aadfdc7c60e406fda40a11282390dbe8d39b0e9d97b SHA512 82eb44a1f2b8b7476046546671287744a72a12ded0721a3c237f884fd81926723c974089b3e749b01766742826d99c0cd80233159b405d974a79af7f04421ea5 WHIRLPOOL c9359253eb55f927b3a1aa3439935e07a498d118fa043fe0a3ce859231194d0bf11edbf02607a822f6c44395a94055321eea556616f4a155b36af8024fbced09
+EBUILD wine-1.7.19-r1.ebuild 14534 SHA256 ff69d05c90b338465a803159346469308cc6b0e1b746d32eb25d2bb8a6b0718b SHA512 99854ce5cd08ba7539d9807a1d0f76af5d88671f6d69240eb9295c792e29050f4366319f3890fdbf7c060cbb4d0b90fb064ec146f94ca73d309e22e64392324d WHIRLPOOL 74dac297a358c0d5e71f954c0b564b5c2dec1d65dbdee771c59b890c1e6711e93f385f2fb3d077b6355c421a838919fcd6b6d1ebf8e500da0ae06787d51dfe0d
 EBUILD wine-1.7.3.ebuild 12565 SHA256 d4d42f201a5002b4b9544387d25852cb405f07b2b3aa73eeb10a0cecb803f9fa SHA512 471623eab39c56fa146b033f11101d0146dfaf6af799c0e6bdfc25cf383ac2287a8010fa92c6d1458aa04cc5771d0da0d10d9010755061ab1220955cdaba8d43 WHIRLPOOL d90283e6f9a137b5968f8a0b3a7666442ff1d9386da0faafb78b2de6042712954ea56e802a8e4aa029de2093aca4baa42fc772da7936b5302b5cad2f09b61485
 EBUILD wine-1.7.4.ebuild 12565 SHA256 48459fa1d9211d785b6ce3665d51f619ab2f45c50449a3d6ded5df9f17464ea2 SHA512 6265037bfd2440ffe3a2c0f4f7b281c36edc3207dbd3956da9ce596aa46b3f2ddde65d2f7ab39bc5518fddc980fa8578adb0b0a6d1187cedd710f8a85c7d9432 WHIRLPOOL 27df5ace4d2decef09b780e00ab857922b0e308e912484ffd60b57450d653daf9f254d8e2b594efee223fb96467016349282b59ee6e8eeaaa159998b4d943886
 EBUILD wine-1.7.8.ebuild 12896 SHA256 84904dbdcf3ecf20b67dacf66a9e2c49f5e58bec5e1e9b68e54f1f8712a22921 SHA512 b8d99f97dd6a271b4f3e7d91c6ef44db942db9fbc1e16058235ef2ac379749e8057e18cb8ba2d8060c215015b568e8432f3c11b94e57aaba8a194edf92d570e7 WHIRLPOOL 5d7e52d8311819473b6fc0507394a04bef4cb86bdf80c77f4341d43367a1a5b27c36f93087b48df92241bb00eb93398f593d9ad52ee3cdcac7f1e7372e20ed3e
 EBUILD wine-1.7.9.ebuild 12896 SHA256 1b0432f149e9525e7fc65d97a2f9b2f2aef3b8932cb5b73aa0481936f2e5abe0 SHA512 e59c3e4d7f9a9c290ea3494f90509463e85c37bb1eab7df7706e9bcfa636d9ab3b62ee528ea91dc94b90b8ebe61fafa81b29a371c3b1e7b8da55859a20d7b03e WHIRLPOOL 0eea56d13e09dbdb145cfc798c8f5a4bc507cef5a561ee82a0868fb8ffba0caeb994685b6bc91b47558b2af5fe6ad4ed190c476fe056dece17912950efb73a30
 EBUILD wine-9999.ebuild 14291 SHA256 c549a3dd99b5e25d2b5bed3cbcf334066c65a4773ad5fac0fb8304fbc6dfc289 SHA512 f231278679d00f0f23c62e103730f2b9b24578b64481f2930f49ec52687d5b35e7bda8a8cda1355d3b41a8d587f8945ada5cffd6a3d2295beac855a57afa9fe0 WHIRLPOOL 411e28daf6137d2a3f43effcfe40171983983a2cea5280083e9e67878b7bbccecf9dda1ef84ddb51b7e994c3a9b3b0a2ad66ec8313ecf90ec1b912f1ab7fef4c
-MISC ChangeLog 19544 SHA256 66d72455a7ebbe71926351f0ced56afb05c58091f77559d34bde9919a177bd52 SHA512 fbd1eaa8a8b1fed7690d020d77384ffa94e8957203557a7f082afef90d6090f7c0a71cf659f592be2e3d2e4ceac1a53e2fbc6f71e0ef24f301564c7f9f1298ca WHIRLPOOL c6fa9c0684d144517221dd6a10cbce2571ff032ac8b17c231a81169fc902a394b3b15cefe94e6df6d6d5f4f4bfa5b25b5982ac01e541261dd1bf6e5c7e12be15
+MISC ChangeLog 19695 SHA256 87400d5aefa9822ab27d8cbd71ac15a880ae05f096de221987db4c41c225d6a9 SHA512 22f05efac7d04e6423bbf138f6e7191e013a2de03376459477e4f1165175aa8f52254ef94ac4757329bbb34897253a384ca35594e7d4c222554b4745121afd5e WHIRLPOOL 660a27faa61670571167cf38e36c4fdce642adb06675099f87d7ecd8e6bb28d80fb616db200075ec49abd28f19b223149094ca40ca87752bfce10f7257f2681a
 MISC ChangeLog-2012 100362 SHA256 8e70fc54e7945c1f41e3e0b64fef6b9a7fe89acdaf8c79a06a16048fe8d2e26c SHA512 ca875e847ba100e1f19774b31a2b45a81d776275e3d11944be8a7b01dfcdbf4265b1a340d691bc4fe4054fea006059a06ed52bc0516b1f8b44a1772a1c813278 WHIRLPOOL 36ec708601a25cb8fa93b471112538480b6ef82cc4e6703b3d045f883078b49209ceaeef7bafa8417b881c2d11df84df9c83d1985d0d687a11f3db3de5abb014
 MISC metadata.xml 2361 SHA256 f225b49cac75fd5819b57d69269a33580d83982224d237eed598d2b596ad8939 SHA512 30b6f5748c91dd183628a39e4f9a6e6955bc8b97a27b65bcd8b8698dccaad85f4dbc37981d8080639387d5ae5171cb7685addd686abfefc2d74a9427533c181c WHIRLPOOL 1aeac34fa080dc115d8489e7937c5e06edb5f717f72fa98c10420088a94844fa34952d16976d7af69651dcc02b73e74a589c936926c2b686ebb1a429e6111bad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTd4CPAAoJEJ0WA1zPCt1h41YH/j6Bx4qPdm6N2ZtZOqBNgvE5
-9Ws7PuVJKK2q73LR0zqYBiIK+gjZ4OxtPokqLAWX4whU7xX37q7v/xCRYsy9dMpo
-QbQWdIIPuJ8SJRyjFPSqzX7UepLxF1O01wdlwItWv8VaKEvEVolqjZYMLUlqx+Pj
-H2kS/yh1nuweZzhp02K3RXKz4HvTz4/w/vq9H6caucHG/6WleYeW8qMPzAVzBDdO
-ZQeGu5yNi1GYsVdXaOqXBmtr5HYuxgr1sfIAkD6d++69TCbAWwvsAVwQwBlj0XmO
-G199BbhKg8TG8U07YUvn7MEsX8pA1LMwPi2s0OcSjkLMPuw+GtEmHzvPW94W0wo=
-=wVW3
+iQJ8BAEBCABmBQJTfQBsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO+swQAJDvjMZBHu8Aku/qni2iYuaH
+uVouftDut1RDD1gapxJ6YAHRJUUXdxmloJLJtJXnjmELdxCezQbeLnovPgczqiSf
+souGn0/OTYDy5ZH9cHwqM9Wm09QNmrYU1tFztQLcuuTFgjRE6fBDpC5FchYD7A7z
+dgL5VflgGk4uInQOYNrO26X2d09hxb8+0ajSr9vzfODPwjgQ6TY1PhRWMI7GMxSa
+pH5a9WrxSjdGzZE8dlOGqOrM3bsERWxTkyNg1J22PqI5rZMmNaU/4IDMo5Ce/kUx
+fx/5KGHE39IrxTxXgm/aJiVHdWkho7Ltrd7DAdrJA1VoU7ojs66ZGMGtbDJdsx+8
+++gx8PEcvG9UvNWU+kDGJ71dwf92WpP0bRqskFijqJ0ZmOiQsLj1FGAMB7j5qtKj
+weSgvHMfqXhHOXc50CZLtj0YMvQjaLdAeNXtebTRFuGrx9E6Tz1t7I+wfZmdR17n
+bQOcHc1PVVcC2gvUWOr0VHmSoKHlgoV1gqZFlBNR1g1d2IsJCav6+i3hlaVCN7hb
+b3MVwPPf/7YJYXYhC5L++DAi2CBXXUd2mFemh1fA5Zf+g1FTrQsyR7hrHFV94Tmf
+5JMXWVi/WN0Ksyy6HxvUXZl8SaV6420+CuWeHGa6BfF+cscRKfCyZz0xF78ZLDdI
+5NEMUuM+9D8nGtwfwFRj
+=ZctG
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.7.19-r1.ebuild b/app-emulation/wine/wine-1.7.19-r1.ebuild
index 9b8179e65829..d97cb9de5efe 100644
--- a/app-emulation/wine/wine-1.7.19-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.19-r1.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/wine/wine-1.7.19-r1.ebuild,v 1.1 2014/05/17 15:31:17 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.19-r1.ebuild,v 1.2 2014/05/21 19:37:13 mgorny Exp $
 
 EAPI="5"
 
@@ -116,9 +116,10 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-xlibs[development]
 				media-libs/fontconfig[abi_x86_32]
 			) )
-			gphoto2? (
+			gphoto2? ( || (
 				app-emulation/emul-linux-x86-medialibs[development]
-			)
+				media-libs/libgphoto2[abi_x86_32]
+			) )
 			openal? ( || (
 				app-emulation/emul-linux-x86-sdl[development]
 				media-libs/openal[abi_x86_32]
@@ -145,7 +146,10 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-soundlibs[alsa,development]
 				media-libs/alsa-lib[abi_x86_32]
 			) )
-			cups? ( app-emulation/emul-linux-x86-baselibs )
+			cups? ( || (
+				app-emulation/emul-linux-x86-baselibs
+				net-print/cups[abi_x86_32]
+			) )
 			opencl? ( virtual/opencl[abi_x86_32] )
 			opengl? ( || (
 				app-emulation/emul-linux-x86-opengl[development]
@@ -162,7 +166,10 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-baselibs[development]
 				virtual/jpeg:0[abi_x86_32]
 			) )
-			ldap? ( app-emulation/emul-linux-x86-baselibs[development] )
+			ldap? ( || (
+				app-emulation/emul-linux-x86-baselibs[development]
+				net-nds/openldap:=[abi_x86_32]
+			) )
 			lcms? ( || (
 				app-emulation/emul-linux-x86-baselibs[development]
 				media-libs/lcms:2[abi_x86_32]
@@ -195,8 +202,14 @@ COMMON_DEPEND="
 					dev-libs/libxslt[abi_x86_32]
 				)
 			) )
-			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
-			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
+			scanner? ( || (
+				app-emulation/emul-linux-x86-medialibs[development]
+				media-gfx/sane-backends:=[abi_x86_32]
+			) )
+			ssl? ( || (
+				app-emulation/emul-linux-x86-baselibs[development]
+				net-libs/gnutls:=[abi_x86_32]
+			) )
 			png? ( || (
 				app-emulation/emul-linux-x86-baselibs[development]
 				media-libs/libpng:0[abi_x86_32]