Update multilib deps for more versions

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

18 files changed, 1297 insertions, 977 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index fcbafccd6be3..9427d34ec17b 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,16 @@
 # 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.521 2014/10/25 20:37:44 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.522 2014/12/16 11:57:04 pacho Exp $
+
+  16 Dec 2014; Pacho Ramos <pacho@gentoo.org> wine-1.6.1.ebuild,
+  wine-1.6.2.ebuild, wine-1.7.0.ebuild, wine-1.7.10.ebuild, wine-1.7.11.ebuild,
+  wine-1.7.12.ebuild, wine-1.7.13.ebuild, wine-1.7.14.ebuild,
+  wine-1.7.15.ebuild, wine-1.7.16.ebuild, wine-1.7.17.ebuild,
+  wine-1.7.18.ebuild, wine-1.7.19-r1.ebuild, wine-1.7.20.ebuild,
+  wine-1.7.21.ebuild, wine-1.7.22.ebuild, wine-1.7.28.ebuild,
+  wine-1.7.29.ebuild, wine-1.7.3.ebuild, wine-1.7.4.ebuild, wine-1.7.8.ebuild,
+  wine-1.7.9.ebuild:
+  Update multilib deps for more versions
 
 *wine-1.7.29 (25 Oct 2014)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 7d946c01ab84..8e4d13b6fbf0 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -69,46 +69,36 @@ DIST winepulse-patches-1.7.8.tar.bz2 49140 SHA256 0fd31ea7fec8817561a7b304bbfad6
 EBUILD wine-1.2.3.ebuild 6278 SHA256 ec9eb016245cd658db8599ce9463f001fbd12f6faac96b57688a86ed2a5b0409 SHA512 bebefc9fe86e82e06d18f02c18c92b8233a6a826361f3a2615a412aa7c68abd5e7d941c7fc2df69c221c3366d1a7bbf4f90c4aee7b0e44f2f73498a3ab099643 WHIRLPOOL 04cecb0c06f149355236faefeb662db84b7a383ea63c9676676b9b94c6201b397ce463f09ad63dfb179ea9eddf5aca224ffb78cec6440c1708eeabeee45d8ab5
 EBUILD wine-1.3.28.ebuild 5794 SHA256 8f431745c960072bd644b92aeab68dd9f23a752310f1f8288f0f6bd2a4461231 SHA512 ecfb8a4831f695fae93f283d55c16e3f5b795b4b34725b0778c381f5f7ac4031be42a89303f014848c231cf675e74b5247d7ba9ad706c264147ddd89645ece52 WHIRLPOOL 67dd67726a89c61b83a1c9b19c37c0695af449c5f726adf146810e8dce49ca6506d01b319f6058ad264aa1fe5fbca36056c0f82cd9dedea3f361da71c3c4cf98
 EBUILD wine-1.4.1.ebuild 6720 SHA256 e194a12bf7077bda6e387f76b4d724ad4a6cfab3f388d4ab21e4d9701104d47c SHA512 cbfb23af8db10ad33d0ae3505218163e5ebf9a4e82f5f417fcf93ea8636588ddb82421619f519a3302a2f4774f19ed03939e1cdb84ce8f2b4ecc66dbd7d349dc WHIRLPOOL a6263b7c3288d1a15700296e6a617d7bc100ccc97dc6696df1ad0a1b508f2176de2c7518617379f47db8c5aca9248b90c2b7c01956a374f8bb69d8be7fa0e67b
-EBUILD wine-1.6.1.ebuild 12875 SHA256 2a3c60cf5bbd2dd3732c903b235b41be07713350eb0907d0375735504df05fc5 SHA512 9431c05a43bdc21433d015c7399ba0e18efd57c7e5ccd35274aa17cf89c8a3c71ee5b509e130de15f7c600f3ac6ed11141b0e7d6c7c2b10c716bef4213c068c8 WHIRLPOOL 6fd4bd6d50811e8d18230c4bb87b306316ba1c303be3ae220068b79c50ad409cf4cfb206ec0542b02f87771a6ada6d1992769030077806370878f8e1bcba5950
-EBUILD wine-1.6.2.ebuild 12866 SHA256 7e1eb616eec410a15e6f52f81483f5c74c8fac46c68e46a9b7fe3ff98e185daa SHA512 bca8cedaac919a8a094fb9a20f6a39d287712b3224ec5b4caecde71505fd2361bec1d699fe3b0fc0db5d696b0d05a49865f7dc3cf137f7024769600b7d101211 WHIRLPOOL 5ee0fc9879cf03ce4988bdb0e1d80206e7b934313c1fd2fce1ec654836abe5d82c30ae722d09a6ff4f40fbdf7546a8a7676fe247005ba36987fd87c0c6f61d72
-EBUILD wine-1.7.0.ebuild 12802 SHA256 b635614c3f5c93c4e7aec33dd5864ee90e16faf816309a35c2c57875b2b146ac SHA512 048adfd05ebbd6d0167c611d7b34d302592c15a6c8eb7610e99f335e443bfe2adf6c17d39e2f95da6a9b5b7c3e3bc09af1461a2310fbd8c4a74118b498154542 WHIRLPOOL 125f9fc538912ff68f311319031c775db784820bd4c8ccccd4f3f51d960c6ddc74fa5094f1bff25c3a1cf9400e416f10eb9119c98ce4bec8771b64f0fd39ffd3
-EBUILD wine-1.7.10.ebuild 13115 SHA256 d0cad4ffe06866b9b6886b9b854f2b0e047ce79e8ce8962e408ef977854a59f4 SHA512 2c0985244ad07d6d07c84f518350bb5b3b3005d28eb4f17c60fa3f4720a4402352a1a8247d0f04f6c91c360504ad7b8caed6edfc1cc33d4497fc1f673f45f46b WHIRLPOOL d704c584c27ab48347b148765146bc925932cba60bd617e30752650050e7f3a6f0915e13dbee3a740c72bfe243a597846e8de1cd6ae77b20e580deaf86b0c78a
-EBUILD wine-1.7.11.ebuild 13115 SHA256 70bf7b63d0a0b36e29ed6fa4636b65c8270fe94f192ae438a421f1650935dc82 SHA512 55c46052818b8b8c9b090adff8e53f5f3f283a204fd43fab70f5ccd3f9f2ba40c27f458e614732b05905c0476352fac0a0f934fe5bc1f40ac14483e6716827a7 WHIRLPOOL 250652f8609e3b6bf732a784fb08b20dabe1ad1a7a9fd1a01b4af78c4eac12605f51f8f338de605e3bd2a715bf4ca4bbf33c8225f4acdbcc3ea7134e2c8a48e4
-EBUILD wine-1.7.12.ebuild 13116 SHA256 a2330882f943083fc7589b56793ff59ff0cb77143fc68afba19e41889e0f1056 SHA512 c75bf4117affa150cd5da5f26a5c9ffda1803d23210733b31130413769fc600753748cb0527930b1b85d4da0f12a5247fce30d8f2fb69dc997be59491ae71d9e WHIRLPOOL c4e002a724857246d1231b31a16eacf87cc56b1bacb6f0c4e66a3e20a37530089acd4e424cf9d1822dbcb44c1ffadd485a3498db4c8a276908e0b78a362f2a9e
-EBUILD wine-1.7.13.ebuild 13116 SHA256 1fae66dcf31da9017fc832ce9cf996d56e8eb85e350de585f3bc0f3cdf4df29c SHA512 92b3f559b15f45f1c46c07bafea3fa02e9542f660c9192d87e7124386d2e9107c4aa638c88cd3114296bfcb744f65e600f41f53420702facb8ae0e701eee808e WHIRLPOOL 348ed3280589fa2e2ad118b99fe5b18370b146daf2ea225626b609d4ebb940bf3147affe41355638d5bb90f8d35406e1f66f20e95c58008a69137e46b92f684f
-EBUILD wine-1.7.14.ebuild 13116 SHA256 116b508e9d5926d61de9ef0c7580ff9945451141a20e3d0123950647da4b6a93 SHA512 cc6544749669afdc129382a6471537c520a83ce68b2f9b8936c4996cfc5823ec2db41a43be6d2d8dc068023da94a0ffef4dcb0bdaaa08c297c0d4a594bad3a45 WHIRLPOOL 9d13e9a5a1684bb02919fc0e21fc2cb485e04f5d6e34a438cce14d5094f3c8709cf088bf1f507154a0153f499f0db35ac9362de01168c1a9ca18c2693369c040
-EBUILD wine-1.7.15.ebuild 13116 SHA256 3053faf72c22316b4b7b20b999317807ebca171d333d9a193895856a3b446b31 SHA512 65217b12a39c3eb0e6e3704839c479da3af365d855c8f237df00bda90f0b672cbc7ac5b7cddb961259e7d22aef34ca6fdcebff6ea9a6ae325d012a7f8134565e WHIRLPOOL 4395a84fe4db37f1ee0850e1f3dd3a042a4c23a40bfabeda45037711fe5d08da248d2c630b355c509cba6a56073a6333d3077407b7fdb0f487eb9b17755d48f8
-EBUILD wine-1.7.16.ebuild 13116 SHA256 371fdcd226236fe5ef2d8db9c30213c0e09cb9fd68f42deff4c4ae48da34be89 SHA512 c55c6ab0495625bc233e6f93d4686efab37ae0a18fefeb4fb6a3dba7f0af64f1c5a12911611aa4fa5c56a3f385ea40761e0e742b3af3ae9a1f822ac034f58275 WHIRLPOOL 86af37e0ce26f8267ceb125e529ed346b6ee38d7e063c78ae6343ffa07b456647251f14f7df25a01978e5e53e99f997e933bc9d844ccea5bfe90dbee9a0bd4bb
-EBUILD wine-1.7.17.ebuild 13116 SHA256 e0a2059cda4ab4f7ccbc4bb986c55699951813e9cea761ab1167068e9ac9d0e7 SHA512 39cfcf0d69545528ac6d0663ec851c864d5473a16497b89dfdc8ea3681186281d6a7b6c5e8ee04bbd38b772aa5a7bc3ba7c94b05257015fb556aa1324d1e9d0c WHIRLPOOL 2355c0b33c53e38bb9556ed17fbed218096e1c3c6ac53af5ecb22d182b3267633f1570612238f022a78fe6dd0c1d09e17b874e441817d859ea04d6ef2d808966
-EBUILD wine-1.7.18.ebuild 13116 SHA256 918377ce31c6dc8eb243786fc28c83af3984b6c382b6a1cb21d342e960e56b36 SHA512 215ce0de8e01913e4ca523c8b42304255ebe995e441362bf3435fd825a1aad16777419b37427daea0871b0628b8d35f6b060414928c0e0a8fcb463b849a3a871 WHIRLPOOL 89e81b9522c958971fbf9033944b931bbb78022fda3bee516276976bb0891c565200cc7dceb916810411cce138a072f7c76e3216b59acb0575498cc8fd1042e5
+EBUILD wine-1.6.1.ebuild 13911 SHA256 b96dfcfdbe91d333369e673ed8bef6ea322520b00891c9c07c2bcbe3d19d1f17 SHA512 3b66e131ebda1cee754878325fadc16fc00474e9bb433655ab929ff097ec33a88eca17bec155039450548d04800d11e8731dd27b0e2cbd900fc2c0881bd5a7fd WHIRLPOOL 7b32bb66fee0ed337d8c6f91717b16b45b09f496504cfe887436fc8fa6ba31af0e26a189e70393921c704a8d54b0e18e216791f2db1b5fbc2cc2d7619b944c3b
+EBUILD wine-1.6.2.ebuild 13905 SHA256 eded3510760983fc9d35f29ec5001e7fbde25c4cc65918f66fa0af6fb26c06c5 SHA512 b86324a78e5ba1a9b60b2b22e1a3a6d8fbe5b36339b719f985e24e81aa66a7e59b49b0ea9e32160559675014b9e88d95b1accfcaaeb85cda2579e75266607424 WHIRLPOOL 6bb52641bf00d33bed93f787254263fe2eed53a6fe732329b3f33533111dd314cda55f25c627fe5c1af2ab88174033c14315666dbb3d29e8d9cabbfe092122c1
+EBUILD wine-1.7.0.ebuild 13848 SHA256 5d9357762604e9f13e4a9eef22529f99ee4f1dce68565054608c24c71bf11a7a SHA512 186c92d0de110406b66228576b65c4afc63c1be1965ebeefb792f5346968a50ef2c5984dbd75342b4fdb9c311938d37e7c914abc6771c0cb93a0b00966ac3531 WHIRLPOOL 98b5bd316280a831681828662ea6589da255cdea348ced17aab34309aa78bbfe67c05c3f705a5ccdaa2887556d4227499e841d7efbfa3f9520d26d82072d3639
+EBUILD wine-1.7.10.ebuild 14154 SHA256 0816a909a4fcc5d3a1b3214c1cb8a0cc94e71e001bf248dee6ca6350bd396e52 SHA512 a01d37d7c5e90fef3a928a56d41e6d33577e0bb2fd92714b1d4b8e6be61822d31188d80e45f1151f6d9ceae3c0cf20481ce1c99d7955834dc1bab8cd382111f3 WHIRLPOOL e70a199a852ea9f09f4501f23c339345f9560a805571266ebabce3ba4fc10fab2decf568919297ce32492dce77abb7b51beb3e5c745dec7b4fcf6ea66c2bc3f5
+EBUILD wine-1.7.11.ebuild 14154 SHA256 a6c5bb64a225f50ad7c31ad2fd3daf051979a6dc96237ed9742597d507a1f85e SHA512 fe8a74e88053789a88e38f4f6a070b9e66a01b12411caa7717d899a270404ea9e20bd88cc46a7aced44bb56a645957ab04ed31b6b33d0f23643edd61494dd808 WHIRLPOOL 92299b02ccbb1d26e866ed32669a47d3dafa68d1dd1d5a62ab9ea29850b1ea7b6766e06e80ef9b1332044e390ded776de788f3601bfeea7a766ee4c2b6348d17
+EBUILD wine-1.7.12.ebuild 14155 SHA256 b0f98670f634921deebbb6f44ebf81b2b64613a5104c9e9d9343a54c2a3c6e23 SHA512 83f3800756fec7060f40f1d8fdbfd98227b29f33db18f8ff6eab67a2135b6e250440813c42131fe324ce25ccc1c682660bca7d8f88e779db52821071f0c4d56a WHIRLPOOL 20dba56aecfd22aff2ce08164a20ca4adcaa8affa94d50b0a7364e14284ebea7aade3cea26b6016b04c6ab7c18b06e39d50afa656ef6da0f89af395332acae66
+EBUILD wine-1.7.13.ebuild 14155 SHA256 e8baefdbcbcc5577812947c6233e581a72c33ebcc7c8c12fbab2c25ab9a1a009 SHA512 244e0212b931fec1dae86de728425a6b9c221f0e34edf8b650e5e9e0a4b86f3ba685335929abfc4e618582c96ff91b69a28ac90bee2714a1704d6eb66fbdcb5e WHIRLPOOL 76a506a2454f01c820e83a5dc3b710b10c67e1ee0c4f968d6c7636f9083fc26b7a3a27b362857ae671f651fa9f3101f73354d909925c306c14a9a842db03dafd
+EBUILD wine-1.7.14.ebuild 14155 SHA256 17c4493a732f1bb00238c56e2d28af26a67bf186c6d07580db793895240a28b3 SHA512 055856d877660af6a49b9e978784f6d93c4020e5a7f6bb895879ae667b08d5014dfdc9af2be90dff61d37b0a10ae3fbfbb23e19b35240de0e84cfc1b3d8bb5be WHIRLPOOL 6c70ae23974e92a688056b966e8a0cd178a664f6de54620ad99867420b9ea2a5ebf4228b4bbd2e67aa0dbe44cf0b7e4d84c9ceef297238ea96c67fd2d971cc3c
+EBUILD wine-1.7.15.ebuild 14155 SHA256 aed866f8c6689549c2d381125e3ebd1de65afb345acd66e99a05f20cb86f5baf SHA512 25d5dd06b9f0509b5f5188647522fdc598902b64d960cbddb7ad08a166acc2fa34acf9fa0073ff4a40f3c838856e9cc0688c3a8e83582a5ed643af4e45812d57 WHIRLPOOL 00c504bb25c122964aa7e863ccc5fd0d6b580183e3be6b525ac1325e910150428e33a46b41f4398f2b0a160f40e7cee88cfc21cd00b4c306030f3311be8a48b3
+EBUILD wine-1.7.16.ebuild 14155 SHA256 2f4b7ac66614dde723b0ce7c739e456f247b73fe1b5d5f3102932079aca7a5d3 SHA512 ca0bcfc7a5fe0069b3e3d80b2283f90013714fde66ddd67cb6d2df9079f5220078f6dd6130488515076f43381d08ab0f44f67d639e87393421e1b99a65279254 WHIRLPOOL 45894a9d8ca4a56d6bd28331f73e13fc1852c6337f601cf937e3e63d5e78ab5923c172d3b02a670f9f709ea1f9cd340df9c9cb5321cd4f862089502ab82e7d11
+EBUILD wine-1.7.17.ebuild 14155 SHA256 e79a42b3948c8c35ece2ba2df47f5757ffbfd074a371d714bd8bb6806d1a5b16 SHA512 cc6a660a3a1d68260703befd92ff50dbce1608308cd6c28211eddb77e4e300978536906a468ffb0d549dab83e7ef5bdd0932cdebe74691d7727eba214fe6ae7e WHIRLPOOL 9e94a5593a2bfa287a76bab5e0d515ca22a8bc96adbbf1be016808117368f7783fa3b1f2e11b51965fe90489f9c7df8095613235d317486e3439f3d1af545958
+EBUILD wine-1.7.18.ebuild 14155 SHA256 e10f75c84fa6d67e456d3c078d8c55173b9dad9a0da91df9eb005be4d76250d2 SHA512 5e06324104a460a13338dffdf570fba8d68085082579017a7d7487fbffa81375179cebf3e5b806bcc2d8a85f25115dc7e240bae43ecf37640b85ce74b6c42269 WHIRLPOOL 29c0af3eb3621961422b69fdf9dfefb8e12f6514b8d29f483804262d08b5a077225ed05251a261b76078e56880b73e32ff0c0c33f1fa6f47baf726b6032eec57
 EBUILD wine-1.7.19-r1.ebuild 15481 SHA256 8d778dbe1fb7a071903b7c42e48dfa69cf55b318c9f7c4b00f574076feaa1c50 SHA512 6ceb9bd9def23164f76328ed783c155f40f2183cc1e95b316ba6475b384a73731565fb436581dfb6e85a439848fc079dddce5baa169b96b0170f2f3849c5170d WHIRLPOOL 0628f471b4ad7477ffe061c31a15107fba7046ec12b9be1c190300b937cd45b5e71fa5d10bf5313450cff80c8348f1a575e8658b5db471d1cf7f5b51bdd192fa
 EBUILD wine-1.7.20.ebuild 15306 SHA256 eb41d4a542dfca79889b2f6e929cd745a002bb5571e070ab656223625ee4a828 SHA512 054fcf1fd262144daa88a51db7f696d7a775426889d12e25a5b8b607d88ffe744b1714bf4ef93eb87abf011e1f4fd9074bbd977baacbda412db522b3a6409ff3 WHIRLPOOL 0ee594393cbdb86317f31df0b307e903bd62734c6a5e92f4fbc40657414ed08aaa5f1dc1d7fcb7da1071a3fb5678e3ba9aaeb29f6d5fb16fe9923d6a0eb71ef6
 EBUILD wine-1.7.21.ebuild 15551 SHA256 73eee67d2f4e9fc9e9391ee757324ebab1ca84ee5c06b380eff32dc829c4b1db SHA512 1479d8db612f20510ec58bf7b51c27489b7e925c7d7d14d41acbb77a9fe8c605e02505fd83607cf2b666017b6a1bbdd75a6a8de28a68fb3b2333bc12ab668cc2 WHIRLPOOL aab6d2211e9eabd419e31baeb327bd03e9839d569612f5fb56d2c72105a4b9d2267880c086ef2b48ae005f9680e7facdcc48697d2ce18f06357805e798ce7336
 EBUILD wine-1.7.22.ebuild 15539 SHA256 3c9af188632fbd003c4c4780e4b0425a3fceef48d96740edd7c24be6eb62c375 SHA512 018be29e634a2f694a940e994ee43e82bf970fc6ef38f813344e2e7a9ad131232b0c1edb0b89d3fd086e7a4cbd4682d25d41221f206febc1c1a4f494f6b4cddf WHIRLPOOL 8b8204204feeb3de7acce1e6855cb1e6df93178d2da9a814248a8bf7b210232ee22dff3f0007be3a2f4e5ca80b79c45973754c9e482187474624bf37c70e6380
 EBUILD wine-1.7.28.ebuild 15574 SHA256 ae251b4f102f29a43aef4b7248cb38c8036015d7334f16e9c82eedbfd0831ffd SHA512 21a44f7d8ebf41a565dcb485d7f013fe713cb92f222e700908f86253df4d34bb4e27ff75c6b5527255f5e32498adba231aaca7d5b5705c6f0b91e32d0be023a4 WHIRLPOOL 7c3ec8a851d98c160cfee399378e9e57f76d18c45d702c048370d7ceb0af9e064d7acb3da652ba5e14907f6c0edae89ed64ed380b05ba36151a8cc67c1c54ddb
 EBUILD wine-1.7.29.ebuild 15473 SHA256 a65a860f35b89492d535d52fa1951d91034bf0e71ec4bbf740afc98bcf907242 SHA512 cad207131d2631a9236954122655803543a3f44aca3a84aff6a6866ad900417078ac495ba1baff4baaa0b22d704a4007f1003de3753bd863cb613424302daf54 WHIRLPOOL fbdd9275d06cccab7cbb39ce81719346fa679563e715466517c9e231903b7061d3cb53c98925cad74b5d4d19bad39c36c531056d6ed002fe867a4bd863e57453
-EBUILD wine-1.7.3.ebuild 12782 SHA256 b8e06428a9b9e86076713b6545cad0216e950b2cc987467092fa978b5f83fa53 SHA512 aca9cd6acaabd50aa2bebc85527d9f491a425270b6861fd1e214853246744cd5b42f657f706bd40c5c3ac83eeeed16bbfc79be8dc6222f8d2734eb6ef8ad6bb0 WHIRLPOOL e43a5fb6b68491755f55cf3565fc854bffd91fd5279edf3257fd3da7efe5926731875ab2c68b4a832e6e3ab7db7523aad24fe901f92c116b99aea93e88050017
-EBUILD wine-1.7.4.ebuild 12782 SHA256 b20dda84df7b2a77612ba8cc0f60b1d9dd2ccbedfacb57a0401f897a0c9a420c SHA512 541183ccd602ad07020b3932d70b24ba6b5ea10b8541bcc3865d180d70e92300d0a049379b0b3bf9b2f1a48452b8cabe5915c9bb50ca2e78af8640cb439f0bb4 WHIRLPOOL 3345620eced37eb8b06d880e7fb01bc9bd6bc6a17984a3e923b0a9874f5820d69b022a459d9ba66f51ae0c05166c9c3902d71eb85944cecff67a16c073c96ed9
-EBUILD wine-1.7.8.ebuild 13113 SHA256 0d58845c1d15b2340de6af172779dc27376f29bb8f42abafdaa81386375d0598 SHA512 2c8a0f86d154f180975afe5c7aa22e2cc600c005662f862a17b5594ddc0fb237f4948a7ce151abbf0d38ab887b3dbdf2135e1dca8594bb17b67ed4d1f8d36eff WHIRLPOOL ffc51d8f0f03d9b0cae0c35e9c1912c853b92c2d7f830d06226191c9c07a4762934d2641771c739ba2682f36939703c88c82fdd3c287d7be20c5db16fea0b7d2
-EBUILD wine-1.7.9.ebuild 13113 SHA256 edd703911ba7173872a7bc41d340c50541022c3b9ea1f68a4bc812cc77bec547 SHA512 8649a1eabc0afd34d9019242b7d15b417ea4b3a90b2d4f2c7438f00eae94aff96f89900d73c1356dec09f7d094ba69c741898ca1342f2bbbb4e03ae88d73877c WHIRLPOOL 5fd76f74f84c2d4f06e150f4e83c6012e37bb8c4252f2e74438d25aae12f206f61afe787961141c088298e8cfdc5d15ea68821a148688ac749a9905854dc315f
+EBUILD wine-1.7.3.ebuild 13821 SHA256 51941f3052010b8d7cbb07523057a103546db04b6d5c26691d65c9ffb927b7ab SHA512 127dabdda13bfb09cc09ea38a41e7a80a66633a877bcff61886f2be151d73e13204d579cfc63999497b4217a9468fd0ebb6e391bf1c32f9c960b76288cdde085 WHIRLPOOL 8e0595dafbac5e60d8cdc71154332038a49cb288c6df695b66093344b7ef12838d3cc8e98201fe1bf508bc1b29790b44297e53880e98e027b1004cc47531a6a3
+EBUILD wine-1.7.4.ebuild 13821 SHA256 c4592101690fb1e55bf8cfe7fe46d7e11c1202a84b2bfb9a893c45d3b06fac33 SHA512 c75bb57ef03e1f999c54381223fa37f6eb5ec9c130196844a5d570a07be13618881a0b5ab00e3f958ef2ceb3a836787099f55d31f5619a9d05f0cf65381af548 WHIRLPOOL 10d6efc7956330e9da87d7a42071cf6527de6515696fed210ef2b8ba0f069d8563b79326996220eecca161a300f6670072eaf0f0a6866f28e0218906c98fdded
+EBUILD wine-1.7.8.ebuild 14152 SHA256 0057834ce0848b593fade5d76211ae6108b8bf562579eb2422aff611be8d39fa SHA512 31393041726de8c65837c7b5475e40de65e704b48e35f7c982c189fc096692e9c7d07c072b30e35c513024ae67533dde10e941720127a2c740f42264dd357d26 WHIRLPOOL bb9bf735ef2e4016566b3559b2b8c5284fd17259d9f2c6a5c1a45ac5fc8946db01134eb15a0e76dede75759392902132860ecab2235ee8d701d39d8166f5e9c4
+EBUILD wine-1.7.9.ebuild 14152 SHA256 b588b273862e9681916cf89c98d58c2529ec59b010e6567f6ed6d2fc0a5a9507 SHA512 9651a50bbc3eba7886d1a13a9b905175dbfc0767264259d2dddbc084344fc443afd925d215ac80e7fd46c377f0a3191b1eb83c654316a67ea8a08923b6499fe9 WHIRLPOOL c09580b958149be7c65b5c26c44cc4ccf7e628e7269af137f3d26a47a296f014f1ea0896d014fac3711d8a23be779f3807b65c2f3b64a58158e2c83f93bec5dd
 EBUILD wine-9999.ebuild 15551 SHA256 371cd01fa5b92c9c5625bcfe7a1ead1419e25380a088a3d96ca887f2170c605f SHA512 11c13a375f419a8120502dc813bfd662cd682c044c80d6c57740863c6e3d3061079184beeadf2b9e202e52038eac95fad9e65b2940f01aeb59d347839ed35516 WHIRLPOOL 90975ddaeb6b0588a09f27a2d93fd00b595e5bc4836fd10412ffb5c9185c7b44592057e3f49d187d21ea9d4bddb484221800b151779c2afef85c16e9a8883445
-MISC ChangeLog 25389 SHA256 a9d5a58b96b06f3901b3bc47fc24e576e704551c636fc8c4f4b7f05f4a76bade SHA512 338b2e10d1e6159e3870ee6de991e85b1cd43abb57a6055a917c6f3a88ec28d726d09fd986292b16267f53d7f8b3b53c5766b103ea2da09bf2b1aec6977b524c WHIRLPOOL af091bf39b83aac52bd0e98249c788836c642c8739cfb9763f0ec24e7ac2ba9cb38e570f4021b2439bf378863a397fcd61d14b3c8f750d57c182630eded93042
+MISC ChangeLog 25928 SHA256 ce2eda5834abd7b4cec65b042ed76672c19704574933de17c42f71144aa635d3 SHA512 55cce573001f5c852bf294a2802891e11320ac757092dee868d5fdc363d13b865e2d1564423c898e0e8d072901560e11a30b2ef939e27bc7388387824676cd8d WHIRLPOOL 6bf41e47e5d5c7d872746194885c0ea5e065ed79a8df55fa7620d045af96e89ac01143955bc3d8a45602a919ca505db72b007938762be23c5ab623ad0d308954
 MISC ChangeLog-2012 100362 SHA256 8e70fc54e7945c1f41e3e0b64fef6b9a7fe89acdaf8c79a06a16048fe8d2e26c SHA512 ca875e847ba100e1f19774b31a2b45a81d776275e3d11944be8a7b01dfcdbf4265b1a340d691bc4fe4054fea006059a06ed52bc0516b1f8b44a1772a1c813278 WHIRLPOOL 36ec708601a25cb8fa93b471112538480b6ef82cc4e6703b3d045f883078b49209ceaeef7bafa8417b881c2d11df84df9c83d1985d0d687a11f3db3de5abb014
 MISC metadata.xml 2270 SHA256 aa8f036c80679a18da22ac843bc96ca86c7855268ae853b3327a52f4075e70af SHA512 9d7e465bfdf90557f3b4ce74ac162e7afb2240f1fe32c21fef696dc5139592a3762238bfb2a5c1ce8f010721c28f2692bce70c5b4d3b0a8d8cbef1e8287aef34 WHIRLPOOL 3e9056f2450fbcb5c1e44dd6921ddbbf3de3e97df6379e50aec6b447a16c1b20a4ae270a1118fcfcb4aefa4637a37543393918c28ab284a1b859c8f64e3aacdb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUTAobAAoJECDuEZm+6ExkfDcQAKKDsZMMvy8IsMPHrdyzYeIM
-k75rXj/rWPzsAFOp0kHj+uzmhBT7o4FrPusPEyQiWNl61SltglNDuJap0Dje6AI+
-lrK1GmItfpu4ZQnEZzGZBUAPbLdB4ThtZCsIS079vjI1o6+zHiWXDF/zMVTeKRTL
-zzrIkenS2FJHN3ZN461DW3n4qfTYXQDuXOilVqvpuRwRXUdh3sygIdQt2pOd4y54
-mwqJKIjueiVaZM6VJRPUCOYU3KLqglGamGEMndydDR6n6mV0J/Zh4YzrJEa6zf3X
-/WKL/8ytrmOs/rO/7ESbCdwCgPIpuTGcq0qLWuoK6jejDBgFAymVQKMrBb3W6jRK
-lLGzPUU83T+HUTn9249B3ilwa0nUkmlxB35AY0IwBy+F/La8HInE5nhhLVDOg049
-sSQciLL4LB7czQGTfp9BMuqu+/09hwd9a9fMPKjbm+ZSVo5GVn73RHBfcJ9RyQX/
-mdD0uF5eaemBN2Bmqn58L5Dve0t0U2MPki3bAjniidWHSPRolCQCCU9EO676Ubjl
-kjbgZaeoeQLgIhTj7hFYRlUQ3G3ukgCagDobTi4G18d8zGewowx/xhJZhW2Qfdy0
-gpSzwRCFUlvjn4DhK9MXbb8ssV4QDaseNzWLomhX3i5WcKs5d/LUkPUA8RkcaTbX
-NJn9+0nR+V8cojeWQdeg
-=YEJE
+iEYEAREIAAYFAlSQHhcACgkQCaWpQKGI+9STHQCfRWFjSXimsFVxZqkjnMsVda6y
+nGgAn2fEh3N1IDFoLunkyDxEw5QpMpt1
+=Eb3e
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.6.1.ebuild b/app-emulation/wine/wine-1.6.1.ebuild
index d9032e9293dc..2367cfe8dcdd 100644
--- a/app-emulation/wine/wine-1.6.1.ebuild
+++ b/app-emulation/wine/wine-1.6.1.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.6.1.ebuild,v 1.6 2014/06/18 19:08:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.1.ebuild,v 1.7 2014/12/16 11:57:04 pacho Exp $
 
 EAPI="5"
 
@@ -96,109 +96,129 @@ COMMON_DEPEND="
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
 			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
+				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
 			) )
 			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
 			) )
 			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
 			) )
 			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+			) )
+			gphoto2? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
 			) )
-			gphoto2? (
-				app-emulation/emul-linux-x86-medialibs[development]
-			)
 			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development]
-				>=media-libs/openal-1.15.1[abi_x86_32]
+				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+				>=media-libs/openal-1.15.1[abi_x86_32(-)]
 			) )
-			gstreamer? (
-				app-emulation/emul-linux-x86-gstplugins
-				app-emulation/emul-linux-x86-medialibs[development]
+			gstreamer? ( || (
+				app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] )
+				(
+					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+				)
 			)
 			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
 				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32]
-					>=x11-libs/libXi-1.7.2[abi_x86_32]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32]
+					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
 				)
 			) )
 			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
 			) )
 			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+			) )
+			cups? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
 			) )
-			cups? ( app-emulation/emul-linux-x86-baselibs )
-			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(+)] )
+			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
 			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development]
+				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
 				(
-					>=virtual/glu-9.0-r1[abi_x86_32]
-					>=virtual/opengl-7.0-r1[abi_x86_32]
+					>=virtual/glu-9.0-r1[abi_x86_32(-)]
+					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
 				)
 			) )
 			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
 			) )
 			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=virtual/jpeg-0-r2:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
+			) )
+			ldap? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
 			) )
-			ldap? ( app-emulation/emul-linux-x86-baselibs[development] )
 			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/lcms-1.19-r1:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/lcms-1.19-r1:0[abi_x86_32(-)]
 			) )
 			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/mpg123-1.15.4[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
 			) )
 			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
+			) )
+			odbc? ( || (
+				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
 			) )
-			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32]
+				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
 			) )
 			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/pulseaudio-5.0[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
 			) )
 			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
 				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32]
+					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+					>=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)]
+				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
+			) )
+			ssl? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
+			) )
 			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
 			) )
 			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development]
-				>=media-libs/libv4l-0.9.5[abi_x86_32]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
 			) )
 			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
 			) )
 		)
 	)"
diff --git a/app-emulation/wine/wine-1.6.2.ebuild b/app-emulation/wine/wine-1.6.2.ebuild
index 9b218d78e716..c35bef3ae480 100644
--- a/app-emulation/wine/wine-1.6.2.ebuild
+++ b/app-emulation/wine/wine-1.6.2.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.6.2.ebuild,v 1.5 2014/06/18 19:08:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.2.ebuild,v 1.6 2014/12/16 11:57:04 pacho Exp $
 
 EAPI="5"
 
@@ -96,109 +96,129 @@ COMMON_DEPEND="
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
 			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
+				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
 			) )
 			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
 			) )
 			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
 			) )
 			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+			) )
+			gphoto2? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
 			) )
-			gphoto2? (
-				app-emulation/emul-linux-x86-medialibs[development]
-			)
 			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development]
-				>=media-libs/openal-1.15.1[abi_x86_32]
+				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+				>=media-libs/openal-1.15.1[abi_x86_32(-)]
 			) )
-			gstreamer? (
-				app-emulation/emul-linux-x86-gstplugins
-				app-emulation/emul-linux-x86-medialibs[development]
+			gstreamer? ( || (
+				app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] )
+				(
+					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+				)
 			)
 			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
 				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32]
-					>=x11-libs/libXi-1.7.2[abi_x86_32]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32]
+					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
 				)
 			) )
 			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
 			) )
 			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+			) )
+			cups? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
 			) )
-			cups? ( app-emulation/emul-linux-x86-baselibs )
-			opencl? ( >=virtual/opencl-0-r3[abi_x86_32] )
+			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
 			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development]
+				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
 				(
-					>=virtual/glu-9.0-r1[abi_x86_32]
-					>=virtual/opengl-7.0-r1[abi_x86_32]
+					>=virtual/glu-9.0-r1[abi_x86_32(-)]
+					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
 				)
 			) )
 			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
 			) )
 			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=virtual/jpeg-0-r2:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
+			) )
+			ldap? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
 			) )
-			ldap? ( app-emulation/emul-linux-x86-baselibs[development] )
 			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/lcms-2.5:2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
 			) )
 			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/mpg123-1.15.4[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
 			) )
 			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
+			) )
+			odbc? ( || (
+				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
 			) )
-			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32]
+				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
 			) )
 			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/pulseaudio-5.0[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
 			) )
 			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
 				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32]
+					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+					>=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)]
+				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
+			) )
+			ssl? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
+			) )
 			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
 			) )
 			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development]
-				>=media-libs/libv4l-0.9.5[abi_x86_32]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
 			) )
 			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
 			) )
 		)
 	)"
diff --git a/app-emulation/wine/wine-1.7.0.ebuild b/app-emulation/wine/wine-1.7.0.ebuild
index 5efc56c55f93..0d3f836d1036 100644
--- a/app-emulation/wine/wine-1.7.0.ebuild
+++ b/app-emulation/wine/wine-1.7.0.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.0.ebuild,v 1.9 2014/06/18 19:08:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.0.ebuild,v 1.10 2014/12/16 11:57:04 pacho Exp $
 
 EAPI="5"
 
@@ -98,111 +98,131 @@ COMMON_DEPEND="
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
 			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
+				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
 			) )
 			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
 			) )
 			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
 			) )
 			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+			) )
+			gphoto2? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
 			) )
-			gphoto2? (
-				app-emulation/emul-linux-x86-medialibs[development]
-			)
 			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development]
-				>=media-libs/openal-1.15.1[abi_x86_32]
+				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+				>=media-libs/openal-1.15.1[abi_x86_32(-)]
 			) )
-			gstreamer? (
-				app-emulation/emul-linux-x86-gstplugins
-				app-emulation/emul-linux-x86-medialibs[development]
+			gstreamer? ( || (
+				app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] )
+				(
+					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+				)
 			)
 			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
 				(
-					>=x11-libs/libICE-1.0.8-r1[abi_x86_32]
-					>=x11-libs/libSM-1.2.1-r1[abi_x86_32]
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32]
-					>=x11-libs/libXi-1.7.2[abi_x86_32]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32]
+					>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
+					>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
+					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
 				)
 			) )
 			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
 			) )
 			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+			) )
+			cups? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
 			) )
-			cups? ( app-emulation/emul-linux-x86-baselibs )
-			opencl? ( >=virtual/opencl-0-r3[abi_x86_32] )
+			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
 			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development]
+				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
 				(
-					>=virtual/glu-9.0-r1[abi_x86_32]
-					>=virtual/opengl-7.0-r1[abi_x86_32]
+					>=virtual/glu-9.0-r1[abi_x86_32(-)]
+					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
 				)
 			) )
 			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
 			) )
 			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=virtual/jpeg-0-r2:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
+			) )
+			ldap? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
 			) )
-			ldap? ( app-emulation/emul-linux-x86-baselibs[development] )
 			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/lcms-2.5:2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
 			) )
 			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/mpg123-1.15.4[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
 			) )
 			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
+			) )
+			odbc? ( || (
+				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
 			) )
-			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32]
+				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
 			) )
 			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/pulseaudio-5.0[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
 			) )
 			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
 				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32]
+					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+					>=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)]
+				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
+			) )
+			ssl? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
+			) )
 			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
 			) )
 			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development]
-				>=media-libs/libv4l-0.9.5[abi_x86_32]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
 			) )
 			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
 			) )
 		)
 	)"
diff --git a/app-emulation/wine/wine-1.7.10.ebuild b/app-emulation/wine/wine-1.7.10.ebuild
index 2400c98548fa..389d3cde1c70 100644
--- a/app-emulation/wine/wine-1.7.10.ebuild
+++ b/app-emulation/wine/wine-1.7.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/app-emulation/wine/wine-1.7.10.ebuild,v 1.3 2014/06/18 19:08:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.10.ebuild,v 1.4 2014/12/16 11:57:04 pacho Exp $
 
 EAPI="5"
 
@@ -97,109 +97,129 @@ COMMON_DEPEND="
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
 			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
+				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
 			) )
 			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
 			) )
 			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
 			) )
 			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+			) )
+			gphoto2? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
 			) )
-			gphoto2? (
-				app-emulation/emul-linux-x86-medialibs[development]
-			)
 			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development]
-				>=media-libs/openal-1.15.1[abi_x86_32]
+				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+				>=media-libs/openal-1.15.1[abi_x86_32(-)]
 			) )
-			gstreamer? (
-				app-emulation/emul-linux-x86-gstplugins
-				app-emulation/emul-linux-x86-medialibs[development]
+			gstreamer? ( || (
+				app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] )
+				(
+					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+				)
 			)
 			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
 				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32]
-					>=x11-libs/libXi-1.7.2[abi_x86_32]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32]
+					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
 				)
 			) )
 			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
 			) )
 			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+			) )
+			cups? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
 			) )
-			cups? ( app-emulation/emul-linux-x86-baselibs )
-			opencl? ( >=virtual/opencl-0-r3[abi_x86_32] )
+			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
 			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development]
+				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
 				(
-					>=virtual/glu-9.0-r1[abi_x86_32]
-					>=virtual/opengl-7.0-r1[abi_x86_32]
+					>=virtual/glu-9.0-r1[abi_x86_32(-)]
+					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
 				)
 			) )
 			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
 			) )
 			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=virtual/jpeg-0-r2:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
+			) )
+			ldap? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
 			) )
-			ldap? ( app-emulation/emul-linux-x86-baselibs[development] )
 			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/lcms-2.5:2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
 			) )
 			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/mpg123-1.15.4[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
 			) )
 			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
+			) )
+			odbc? ( || (
+				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
 			) )
-			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32]
+				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
 			) )
 			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/pulseaudio-5.0[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
 			) )
 			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
 				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32]
+					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+					>=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)]
+				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
+			) )
+			ssl? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
+			) )
 			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
 			) )
 			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development]
-				>=media-libs/libv4l-0.9.5[abi_x86_32]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
 			) )
 			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
 			) )
 		)
 	)"
diff --git a/app-emulation/wine/wine-1.7.11.ebuild b/app-emulation/wine/wine-1.7.11.ebuild
index b6265052d4d8..3ecf6b60c22f 100644
--- a/app-emulation/wine/wine-1.7.11.ebuild
+++ b/app-emulation/wine/wine-1.7.11.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.11.ebuild,v 1.3 2014/06/18 19:08:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.11.ebuild,v 1.4 2014/12/16 11:57:04 pacho Exp $
 
 EAPI="5"
 
@@ -97,109 +97,129 @@ COMMON_DEPEND="
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
 			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
+				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
 			) )
 			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
 			) )
 			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
 			) )
 			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+			) )
+			gphoto2? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
 			) )
-			gphoto2? (
-				app-emulation/emul-linux-x86-medialibs[development]
-			)
 			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development]
-				>=media-libs/openal-1.15.1[abi_x86_32]
+				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+				>=media-libs/openal-1.15.1[abi_x86_32(-)]
 			) )
-			gstreamer? (
-				app-emulation/emul-linux-x86-gstplugins
-				app-emulation/emul-linux-x86-medialibs[development]
+			gstreamer? ( || (
+				app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] )
+				(
+					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+				)
 			)
 			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
 				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32]
-					>=x11-libs/libXi-1.7.2[abi_x86_32]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32]
+					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
 				)
 			) )
 			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
 			) )
 			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+			) )
+			cups? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
 			) )
-			cups? ( app-emulation/emul-linux-x86-baselibs )
-			opencl? ( >=virtual/opencl-0-r3[abi_x86_32] )
+			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
 			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development]
+				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
 				(
-					>=virtual/glu-9.0-r1[abi_x86_32]
-					>=virtual/opengl-7.0-r1[abi_x86_32]
+					>=virtual/glu-9.0-r1[abi_x86_32(-)]
+					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
 				)
 			) )
 			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
 			) )
 			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=virtual/jpeg-0-r2:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
+			) )
+			ldap? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
 			) )
-			ldap? ( app-emulation/emul-linux-x86-baselibs[development] )
 			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/lcms-2.5:2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
 			) )
 			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/mpg123-1.15.4[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
 			) )
 			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
+			) )
+			odbc? ( || (
+				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
 			) )
-			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32]
+				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
 			) )
 			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/pulseaudio-5.0[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
 			) )
 			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
 				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32]
+					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+					>=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)]
+				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
+			) )
+			ssl? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
+			) )
 			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
 			) )
 			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development]
-				>=media-libs/libv4l-0.9.5[abi_x86_32]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
 			) )
 			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
 			) )
 		)
 	)"
diff --git a/app-emulation/wine/wine-1.7.12.ebuild b/app-emulation/wine/wine-1.7.12.ebuild
index d22005a6e096..bc930adb5f99 100644
--- a/app-emulation/wine/wine-1.7.12.ebuild
+++ b/app-emulation/wine/wine-1.7.12.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.12.ebuild,v 1.3 2014/06/18 19:08:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.12.ebuild,v 1.4 2014/12/16 11:57:04 pacho Exp $
 
 EAPI="5"
 
@@ -97,109 +97,129 @@ COMMON_DEPEND="
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
 			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
+				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
 			) )
 			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
 			) )
 			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
 			) )
 			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+			) )
+			gphoto2? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
 			) )
-			gphoto2? (
-				app-emulation/emul-linux-x86-medialibs[development]
-			)
 			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development]
-				>=media-libs/openal-1.15.1[abi_x86_32]
+				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+				>=media-libs/openal-1.15.1[abi_x86_32(-)]
 			) )
-			gstreamer? (
-				app-emulation/emul-linux-x86-gstplugins
-				app-emulation/emul-linux-x86-medialibs[development]
+			gstreamer? ( || (
+				app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] )
+				(
+					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+				)
 			)
 			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
 				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32]
-					>=x11-libs/libXi-1.7.2[abi_x86_32]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32]
+					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
 				)
 			) )
 			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
 			) )
 			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+			) )
+			cups? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
 			) )
-			cups? ( app-emulation/emul-linux-x86-baselibs )
-			opencl? ( >=virtual/opencl-0-r3[abi_x86_32] )
+			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
 			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development]
+				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
 				(
-					>=virtual/glu-9.0-r1[abi_x86_32]
-					>=virtual/opengl-7.0-r1[abi_x86_32]
+					>=virtual/glu-9.0-r1[abi_x86_32(-)]
+					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
 				)
 			) )
 			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
 			) )
 			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=virtual/jpeg-0-r2:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
+			) )
+			ldap? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
 			) )
-			ldap? ( app-emulation/emul-linux-x86-baselibs[development] )
 			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/lcms-2.5:2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
 			) )
 			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/mpg123-1.15.4[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
 			) )
 			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
+			) )
+			odbc? ( || (
+				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
 			) )
-			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32]
+				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
 			) )
 			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/pulseaudio-5.0[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
 			) )
 			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
 				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32]
+					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+					>=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)]
+				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
+			) )
+			ssl? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
+			) )
 			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
 			) )
 			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development]
-				>=media-libs/libv4l-0.9.5[abi_x86_32]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
 			) )
 			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
 			) )
 		)
 	)"
diff --git a/app-emulation/wine/wine-1.7.13.ebuild b/app-emulation/wine/wine-1.7.13.ebuild
index 5ca8e8af32aa..cd3315caff4c 100644
--- a/app-emulation/wine/wine-1.7.13.ebuild
+++ b/app-emulation/wine/wine-1.7.13.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.13.ebuild,v 1.3 2014/06/18 19:08:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.13.ebuild,v 1.4 2014/12/16 11:57:04 pacho Exp $
 
 EAPI="5"
 
@@ -97,109 +97,129 @@ COMMON_DEPEND="
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
 			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
+				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
 			) )
 			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
 			) )
 			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
 			) )
 			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+			) )
+			gphoto2? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
 			) )
-			gphoto2? (
-				app-emulation/emul-linux-x86-medialibs[development]
-			)
 			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development]
-				>=media-libs/openal-1.15.1[abi_x86_32]
+				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+				>=media-libs/openal-1.15.1[abi_x86_32(-)]
 			) )
-			gstreamer? (
-				app-emulation/emul-linux-x86-gstplugins
-				app-emulation/emul-linux-x86-medialibs[development]
+			gstreamer? ( || (
+				app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] )
+				(
+					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+				)
 			)
 			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
 				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32]
-					>=x11-libs/libXi-1.7.2[abi_x86_32]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32]
+					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
 				)
 			) )
 			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
 			) )
 			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+			) )
+			cups? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
 			) )
-			cups? ( app-emulation/emul-linux-x86-baselibs )
-			opencl? ( >=virtual/opencl-0-r3[abi_x86_32] )
+			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
 			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development]
+				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
 				(
-					>=virtual/glu-9.0-r1[abi_x86_32]
-					>=virtual/opengl-7.0-r1[abi_x86_32]
+					>=virtual/glu-9.0-r1[abi_x86_32(-)]
+					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
 				)
 			) )
 			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
 			) )
 			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=virtual/jpeg-0-r2:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
+			) )
+			ldap? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
 			) )
-			ldap? ( app-emulation/emul-linux-x86-baselibs[development] )
 			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/lcms-2.5:2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
 			) )
 			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/mpg123-1.15.4[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
 			) )
 			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
+			) )
+			odbc? ( || (
+				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
 			) )
-			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32]
+				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
 			) )
 			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/pulseaudio-5.0[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
 			) )
 			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
 				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32]
+					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+					>=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)]
+				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
+			) )
+			ssl? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
+			) )
 			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
 			) )
 			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development]
-				>=media-libs/libv4l-0.9.5[abi_x86_32]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
 			) )
 			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
 			) )
 		)
 	)"
diff --git a/app-emulation/wine/wine-1.7.14.ebuild b/app-emulation/wine/wine-1.7.14.ebuild
index c47a63911148..0118b6a05fef 100644
--- a/app-emulation/wine/wine-1.7.14.ebuild
+++ b/app-emulation/wine/wine-1.7.14.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.14.ebuild,v 1.2 2014/06/18 19:08:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.14.ebuild,v 1.3 2014/12/16 11:57:04 pacho Exp $
 
 EAPI="5"
 
@@ -97,109 +97,129 @@ COMMON_DEPEND="
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
 			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
+				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
 			) )
 			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
 			) )
 			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
 			) )
 			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+			) )
+			gphoto2? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
 			) )
-			gphoto2? (
-				app-emulation/emul-linux-x86-medialibs[development]
-			)
 			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development]
-				>=media-libs/openal-1.15.1[abi_x86_32]
+				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+				>=media-libs/openal-1.15.1[abi_x86_32(-)]
 			) )
-			gstreamer? (
-				app-emulation/emul-linux-x86-gstplugins
-				app-emulation/emul-linux-x86-medialibs[development]
+			gstreamer? ( || (
+				app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] )
+				(
+					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+				)
 			)
 			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
 				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32]
-					>=x11-libs/libXi-1.7.2[abi_x86_32]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32]
+					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
 				)
 			) )
 			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
 			) )
 			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+			) )
+			cups? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
 			) )
-			cups? ( app-emulation/emul-linux-x86-baselibs )
-			opencl? ( >=virtual/opencl-0-r3[abi_x86_32] )
+			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
 			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development]
+				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
 				(
-					>=virtual/glu-9.0-r1[abi_x86_32]
-					>=virtual/opengl-7.0-r1[abi_x86_32]
+					>=virtual/glu-9.0-r1[abi_x86_32(-)]
+					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
 				)
 			) )
 			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
 			) )
 			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=virtual/jpeg-0-r2:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
+			) )
+			ldap? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
 			) )
-			ldap? ( app-emulation/emul-linux-x86-baselibs[development] )
 			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/lcms-2.5:2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
 			) )
 			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/mpg123-1.15.4[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
 			) )
 			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
+			) )
+			odbc? ( || (
+				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
 			) )
-			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32]
+				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
 			) )
 			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/pulseaudio-5.0[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
 			) )
 			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
 				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32]
+					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+					>=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)]
+				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
+			) )
+			ssl? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
+			) )
 			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
 			) )
 			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development]
-				>=media-libs/libv4l-0.9.5[abi_x86_32]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
 			) )
 			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
 			) )
 		)
 	)"
diff --git a/app-emulation/wine/wine-1.7.15.ebuild b/app-emulation/wine/wine-1.7.15.ebuild
index 6487438cfae4..79f4d0c4a8d3 100644
--- a/app-emulation/wine/wine-1.7.15.ebuild
+++ b/app-emulation/wine/wine-1.7.15.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.15.ebuild,v 1.2 2014/06/18 19:08:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.15.ebuild,v 1.3 2014/12/16 11:57:04 pacho Exp $
 
 EAPI="5"
 
@@ -97,109 +97,129 @@ COMMON_DEPEND="
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
 			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
+				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
 			) )
 			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
 			) )
 			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
 			) )
 			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+			) )
+			gphoto2? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
 			) )
-			gphoto2? (
-				app-emulation/emul-linux-x86-medialibs[development]
-			)
 			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development]
-				>=media-libs/openal-1.15.1[abi_x86_32]
+				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+				>=media-libs/openal-1.15.1[abi_x86_32(-)]
 			) )
-			gstreamer? (
-				app-emulation/emul-linux-x86-gstplugins
-				app-emulation/emul-linux-x86-medialibs[development]
+			gstreamer? ( || (
+				app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] )
+				(
+					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+				)
 			)
 			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
 				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32]
-					>=x11-libs/libXi-1.7.2[abi_x86_32]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32]
+					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
 				)
 			) )
 			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
 			) )
 			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+			) )
+			cups? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
 			) )
-			cups? ( app-emulation/emul-linux-x86-baselibs )
-			opencl? ( >=virtual/opencl-0-r3[abi_x86_32] )
+			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
 			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development]
+				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
 				(
-					>=virtual/glu-9.0-r1[abi_x86_32]
-					>=virtual/opengl-7.0-r1[abi_x86_32]
+					>=virtual/glu-9.0-r1[abi_x86_32(-)]
+					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
 				)
 			) )
 			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
 			) )
 			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=virtual/jpeg-0-r2:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
+			) )
+			ldap? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
 			) )
-			ldap? ( app-emulation/emul-linux-x86-baselibs[development] )
 			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/lcms-2.5:2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
 			) )
 			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/mpg123-1.15.4[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
 			) )
 			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
+			) )
+			odbc? ( || (
+				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
 			) )
-			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32]
+				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
 			) )
 			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/pulseaudio-5.0[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
 			) )
 			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
 				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32]
+					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+					>=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)]
+				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
+			) )
+			ssl? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
+			) )
 			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
 			) )
 			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development]
-				>=media-libs/libv4l-0.9.5[abi_x86_32]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
 			) )
 			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
 			) )
 		)
 	)"
diff --git a/app-emulation/wine/wine-1.7.16.ebuild b/app-emulation/wine/wine-1.7.16.ebuild
index 25199b490243..682f00134362 100644
--- a/app-emulation/wine/wine-1.7.16.ebuild
+++ b/app-emulation/wine/wine-1.7.16.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.16.ebuild,v 1.2 2014/06/18 19:08:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.16.ebuild,v 1.3 2014/12/16 11:57:04 pacho Exp $
 
 EAPI="5"
 
@@ -97,109 +97,129 @@ COMMON_DEPEND="
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
 			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
+				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
 			) )
 			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
 			) )
 			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
 			) )
 			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+			) )
+			gphoto2? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
 			) )
-			gphoto2? (
-				app-emulation/emul-linux-x86-medialibs[development]
-			)
 			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development]
-				>=media-libs/openal-1.15.1[abi_x86_32]
+				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+				>=media-libs/openal-1.15.1[abi_x86_32(-)]
 			) )
-			gstreamer? (
-				app-emulation/emul-linux-x86-gstplugins
-				app-emulation/emul-linux-x86-medialibs[development]
+			gstreamer? ( || (
+				app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] )
+				(
+					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+				)
 			)
 			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
 				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32]
-					>=x11-libs/libXi-1.7.2[abi_x86_32]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32]
+					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
 				)
 			) )
 			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
 			) )
 			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+			) )
+			cups? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
 			) )
-			cups? ( app-emulation/emul-linux-x86-baselibs )
-			opencl? ( >=virtual/opencl-0-r3[abi_x86_32] )
+			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
 			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development]
+				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
 				(
-					>=virtual/glu-9.0-r1[abi_x86_32]
-					>=virtual/opengl-7.0-r1[abi_x86_32]
+					>=virtual/glu-9.0-r1[abi_x86_32(-)]
+					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
 				)
 			) )
 			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
 			) )
 			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=virtual/jpeg-0-r2:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
+			) )
+			ldap? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
 			) )
-			ldap? ( app-emulation/emul-linux-x86-baselibs[development] )
 			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/lcms-2.5:2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
 			) )
 			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/mpg123-1.15.4[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
 			) )
 			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
+			) )
+			odbc? ( || (
+				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
 			) )
-			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32]
+				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
 			) )
 			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/pulseaudio-5.0[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
 			) )
 			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
 				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32]
+					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+					>=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)]
+				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
+			) )
+			ssl? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
+			) )
 			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
 			) )
 			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development]
-				>=media-libs/libv4l-0.9.5[abi_x86_32]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
 			) )
 			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
 			) )
 		)
 	)"
diff --git a/app-emulation/wine/wine-1.7.17.ebuild b/app-emulation/wine/wine-1.7.17.ebuild
index 85c25c2eae2b..e77ec4b698cf 100644
--- a/app-emulation/wine/wine-1.7.17.ebuild
+++ b/app-emulation/wine/wine-1.7.17.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.17.ebuild,v 1.2 2014/06/18 19:08:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.17.ebuild,v 1.3 2014/12/16 11:57:04 pacho Exp $
 
 EAPI="5"
 
@@ -97,109 +97,129 @@ COMMON_DEPEND="
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
 			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
+				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
 			) )
 			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
 			) )
 			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
 			) )
 			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+			) )
+			gphoto2? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
 			) )
-			gphoto2? (
-				app-emulation/emul-linux-x86-medialibs[development]
-			)
 			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development]
-				>=media-libs/openal-1.15.1[abi_x86_32]
+				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+				>=media-libs/openal-1.15.1[abi_x86_32(-)]
 			) )
-			gstreamer? (
-				app-emulation/emul-linux-x86-gstplugins
-				app-emulation/emul-linux-x86-medialibs[development]
+			gstreamer? ( || (
+				app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] )
+				(
+					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+				)
 			)
 			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
 				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32]
-					>=x11-libs/libXi-1.7.2[abi_x86_32]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32]
+					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
 				)
 			) )
 			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
 			) )
 			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+			) )
+			cups? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
 			) )
-			cups? ( app-emulation/emul-linux-x86-baselibs )
-			opencl? ( >=virtual/opencl-0-r3[abi_x86_32] )
+			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
 			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development]
+				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
 				(
-					>=virtual/glu-9.0-r1[abi_x86_32]
-					>=virtual/opengl-7.0-r1[abi_x86_32]
+					>=virtual/glu-9.0-r1[abi_x86_32(-)]
+					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
 				)
 			) )
 			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
 			) )
 			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=virtual/jpeg-0-r2:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
+			) )
+			ldap? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
 			) )
-			ldap? ( app-emulation/emul-linux-x86-baselibs[development] )
 			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/lcms-2.5:2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
 			) )
 			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/mpg123-1.15.4[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
 			) )
 			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
+			) )
+			odbc? ( || (
+				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
 			) )
-			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32]
+				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
 			) )
 			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/pulseaudio-5.0[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
 			) )
 			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
 				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32]
+					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+					>=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)]
+				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
+			) )
+			ssl? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
+			) )
 			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
 			) )
 			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development]
-				>=media-libs/libv4l-0.9.5[abi_x86_32]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
 			) )
 			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
 			) )
 		)
 	)"
diff --git a/app-emulation/wine/wine-1.7.18.ebuild b/app-emulation/wine/wine-1.7.18.ebuild
index f2d15fb2828b..dddf5dd995b8 100644
--- a/app-emulation/wine/wine-1.7.18.ebuild
+++ b/app-emulation/wine/wine-1.7.18.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.18.ebuild,v 1.2 2014/06/18 19:08:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.18.ebuild,v 1.3 2014/12/16 11:57:04 pacho Exp $
 
 EAPI="5"
 
@@ -97,109 +97,129 @@ COMMON_DEPEND="
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
 			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
+				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
 			) )
 			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
 			) )
 			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
 			) )
 			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+			) )
+			gphoto2? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
 			) )
-			gphoto2? (
-				app-emulation/emul-linux-x86-medialibs[development]
-			)
 			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development]
-				>=media-libs/openal-1.15.1[abi_x86_32]
+				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+				>=media-libs/openal-1.15.1[abi_x86_32(-)]
 			) )
-			gstreamer? (
-				app-emulation/emul-linux-x86-gstplugins
-				app-emulation/emul-linux-x86-medialibs[development]
+			gstreamer? ( || (
+				app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] )
+				(
+					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+				)
 			)
 			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
 				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32]
-					>=x11-libs/libXi-1.7.2[abi_x86_32]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32]
+					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
 				)
 			) )
 			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
 			) )
 			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+			) )
+			cups? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
 			) )
-			cups? ( app-emulation/emul-linux-x86-baselibs )
-			opencl? ( >=virtual/opencl-0-r3[abi_x86_32] )
+			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
 			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development]
+				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
 				(
-					>=virtual/glu-9.0-r1[abi_x86_32]
-					>=virtual/opengl-7.0-r1[abi_x86_32]
+					>=virtual/glu-9.0-r1[abi_x86_32(-)]
+					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
 				)
 			) )
 			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
 			) )
 			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=virtual/jpeg-0-r2:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
+			) )
+			ldap? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
 			) )
-			ldap? ( app-emulation/emul-linux-x86-baselibs[development] )
 			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/lcms-2.5:2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
 			) )
 			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/mpg123-1.15.4[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
 			) )
 			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
+			) )
+			odbc? ( || (
+				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
 			) )
-			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32]
+				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
 			) )
 			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/pulseaudio-5.0[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
 			) )
 			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
 				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32]
+					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+					>=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)]
+				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
+			) )
+			ssl? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
+			) )
 			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
 			) )
 			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development]
-				>=media-libs/libv4l-0.9.5[abi_x86_32]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
 			) )
 			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
 			) )
 		)
 	)"
diff --git a/app-emulation/wine/wine-1.7.3.ebuild b/app-emulation/wine/wine-1.7.3.ebuild
index 9895e4a67472..4d3170ce457c 100644
--- a/app-emulation/wine/wine-1.7.3.ebuild
+++ b/app-emulation/wine/wine-1.7.3.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.3.ebuild,v 1.6 2014/06/18 19:08:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.3.ebuild,v 1.7 2014/12/16 11:57:04 pacho Exp $
 
 EAPI="5"
 
@@ -96,109 +96,129 @@ COMMON_DEPEND="
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
 			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
+				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
 			) )
 			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
 			) )
 			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
 			) )
 			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+			) )
+			gphoto2? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
 			) )
-			gphoto2? (
-				app-emulation/emul-linux-x86-medialibs[development]
-			)
 			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development]
-				>=media-libs/openal-1.15.1[abi_x86_32]
+				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+				>=media-libs/openal-1.15.1[abi_x86_32(-)]
 			) )
-			gstreamer? (
-				app-emulation/emul-linux-x86-gstplugins
-				app-emulation/emul-linux-x86-medialibs[development]
+			gstreamer? ( || (
+				app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] )
+				(
+					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+				)
 			)
 			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
 				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32]
-					>=x11-libs/libXi-1.7.2[abi_x86_32]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32]
+					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
 				)
 			) )
 			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
 			) )
 			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+			) )
+			cups? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
 			) )
-			cups? ( app-emulation/emul-linux-x86-baselibs )
-			opencl? ( >=virtual/opencl-0-r3[abi_x86_32] )
+			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
 			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development]
+				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
 				(
-					>=virtual/glu-9.0-r1[abi_x86_32]
-					>=virtual/opengl-7.0-r1[abi_x86_32]
+					>=virtual/glu-9.0-r1[abi_x86_32(-)]
+					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
 				)
 			) )
 			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
 			) )
 			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=virtual/jpeg-0-r2:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
+			) )
+			ldap? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
 			) )
-			ldap? ( app-emulation/emul-linux-x86-baselibs[development] )
 			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/lcms-2.5:2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
 			) )
 			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/mpg123-1.15.4[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
 			) )
 			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
+			) )
+			odbc? ( || (
+				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
 			) )
-			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32]
+				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
 			) )
 			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/pulseaudio-5.0[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
 			) )
 			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
 				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32]
+					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+					>=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)]
+				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
+			) )
+			ssl? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
+			) )
 			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
 			) )
 			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development]
-				>=media-libs/libv4l-0.9.5[abi_x86_32]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
 			) )
 			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
 			) )
 		)
 	)"
diff --git a/app-emulation/wine/wine-1.7.4.ebuild b/app-emulation/wine/wine-1.7.4.ebuild
index a82a786e891d..3c808c5d0da9 100644
--- a/app-emulation/wine/wine-1.7.4.ebuild
+++ b/app-emulation/wine/wine-1.7.4.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.4.ebuild,v 1.7 2014/06/18 19:08:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.4.ebuild,v 1.8 2014/12/16 11:57:04 pacho Exp $
 
 EAPI="5"
 
@@ -96,109 +96,129 @@ COMMON_DEPEND="
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
 			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
+				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
 			) )
 			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
 			) )
 			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
 			) )
 			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+			) )
+			gphoto2? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
 			) )
-			gphoto2? (
-				app-emulation/emul-linux-x86-medialibs[development]
-			)
 			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development]
-				>=media-libs/openal-1.15.1[abi_x86_32]
+				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+				>=media-libs/openal-1.15.1[abi_x86_32(-)]
 			) )
-			gstreamer? (
-				app-emulation/emul-linux-x86-gstplugins
-				app-emulation/emul-linux-x86-medialibs[development]
+			gstreamer? ( || (
+				app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] )
+				(
+					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+				)
 			)
 			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
 				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32]
-					>=x11-libs/libXi-1.7.2[abi_x86_32]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32]
+					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
 				)
 			) )
 			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
 			) )
 			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+			) )
+			cups? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
 			) )
-			cups? ( app-emulation/emul-linux-x86-baselibs )
-			opencl? ( >=virtual/opencl-0-r3[abi_x86_32] )
+			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
 			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development]
+				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
 				(
-					>=virtual/glu-9.0-r1[abi_x86_32]
-					>=virtual/opengl-7.0-r1[abi_x86_32]
+					>=virtual/glu-9.0-r1[abi_x86_32(-)]
+					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
 				)
 			) )
 			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
 			) )
 			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=virtual/jpeg-0-r2:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
+			) )
+			ldap? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
 			) )
-			ldap? ( app-emulation/emul-linux-x86-baselibs[development] )
 			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/lcms-2.5:2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
 			) )
 			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/mpg123-1.15.4[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
 			) )
 			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
+			) )
+			odbc? ( || (
+				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
 			) )
-			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32]
+				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
 			) )
 			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/pulseaudio-5.0[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
 			) )
 			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
 				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32]
+					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+					>=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)]
+				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
+			) )
+			ssl? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
+			) )
 			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
 			) )
 			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development]
-				>=media-libs/libv4l-0.9.5[abi_x86_32]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
 			) )
 			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
 			) )
 		)
 	)"
diff --git a/app-emulation/wine/wine-1.7.8.ebuild b/app-emulation/wine/wine-1.7.8.ebuild
index 6602d30b9403..648162d1bccc 100644
--- a/app-emulation/wine/wine-1.7.8.ebuild
+++ b/app-emulation/wine/wine-1.7.8.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.8.ebuild,v 1.5 2014/06/18 19:08:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.8.ebuild,v 1.6 2014/12/16 11:57:04 pacho Exp $
 
 EAPI="5"
 
@@ -97,109 +97,129 @@ COMMON_DEPEND="
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
 			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
+				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
 			) )
 			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
 			) )
 			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
 			) )
 			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+			) )
+			gphoto2? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
 			) )
-			gphoto2? (
-				app-emulation/emul-linux-x86-medialibs[development]
-			)
 			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development]
-				>=media-libs/openal-1.15.1[abi_x86_32]
+				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+				>=media-libs/openal-1.15.1[abi_x86_32(-)]
 			) )
-			gstreamer? (
-				app-emulation/emul-linux-x86-gstplugins
-				app-emulation/emul-linux-x86-medialibs[development]
+			gstreamer? ( || (
+				app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] )
+				(
+					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+				)
 			)
 			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
 				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32]
-					>=x11-libs/libXi-1.7.2[abi_x86_32]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32]
+					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
 				)
 			) )
 			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
 			) )
 			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+			) )
+			cups? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
 			) )
-			cups? ( app-emulation/emul-linux-x86-baselibs )
-			opencl? ( >=virtual/opencl-0-r3[abi_x86_32] )
+			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
 			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development]
+				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
 				(
-					>=virtual/glu-9.0-r1[abi_x86_32]
-					>=virtual/opengl-7.0-r1[abi_x86_32]
+					>=virtual/glu-9.0-r1[abi_x86_32(-)]
+					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
 				)
 			) )
 			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
 			) )
 			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=virtual/jpeg-0-r2:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
+			) )
+			ldap? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
 			) )
-			ldap? ( app-emulation/emul-linux-x86-baselibs[development] )
 			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/lcms-2.5:2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
 			) )
 			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/mpg123-1.15.4[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
 			) )
 			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
+			) )
+			odbc? ( || (
+				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
 			) )
-			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32]
+				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
 			) )
 			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/pulseaudio-5.0[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
 			) )
 			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
 				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32]
+					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+					>=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)]
+				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
+			) )
+			ssl? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
+			) )
 			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
 			) )
 			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development]
-				>=media-libs/libv4l-0.9.5[abi_x86_32]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
 			) )
 			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
 			) )
 		)
 	)"
diff --git a/app-emulation/wine/wine-1.7.9.ebuild b/app-emulation/wine/wine-1.7.9.ebuild
index a9cb36378c9f..e5dca3154048 100644
--- a/app-emulation/wine/wine-1.7.9.ebuild
+++ b/app-emulation/wine/wine-1.7.9.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.9.ebuild,v 1.3 2014/06/18 19:08:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.9.ebuild,v 1.4 2014/12/16 11:57:04 pacho Exp $
 
 EAPI="5"
 
@@ -97,109 +97,129 @@ COMMON_DEPEND="
 		abi_x86_64? ( ${NATIVE_DEPEND} )
 		abi_x86_32? (
 			truetype? ( || (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
+				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
 			) )
 			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-libs/ncurses-5.9-r3[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
 			) )
 			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
-				>=sys-apps/dbus-1.6.18-r1[abi_x86_32]
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
 			) )
 			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+			) )
+			gphoto2? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
 			) )
-			gphoto2? (
-				app-emulation/emul-linux-x86-medialibs[development]
-			)
 			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development]
-				>=media-libs/openal-1.15.1[abi_x86_32]
+				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+				>=media-libs/openal-1.15.1[abi_x86_32(-)]
 			) )
-			gstreamer? (
-				app-emulation/emul-linux-x86-gstplugins
-				app-emulation/emul-linux-x86-medialibs[development]
+			gstreamer? ( || (
+				app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] )
+				(
+					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+				)
 			)
 			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
 				(
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32]
-					>=x11-libs/libXi-1.7.2[abi_x86_32]
-					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32]
+					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
 				)
 			) )
 			xinerama? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXinerama-1.1.3[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
 			) )
 			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development]
-				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+			) )
+			cups? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
 			) )
-			cups? ( app-emulation/emul-linux-x86-baselibs )
-			opencl? ( >=virtual/opencl-0-r3[abi_x86_32] )
+			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
 			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development]
+				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
 				(
-					>=virtual/glu-9.0-r1[abi_x86_32]
-					>=virtual/opengl-7.0-r1[abi_x86_32]
+					>=virtual/glu-9.0-r1[abi_x86_32(-)]
+					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
 				)
 			) )
 			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/gsm-1.0.13-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
 			) )
 			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=virtual/jpeg-0-r2:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
+			) )
+			ldap? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
 			) )
-			ldap? ( app-emulation/emul-linux-x86-baselibs[development] )
 			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/lcms-2.5:2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
 			) )
 			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/mpg123-1.15.4[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
 			) )
 			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=sys-devel/gettext-0.18.3.2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
+			) )
+			odbc? ( || (
+				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
 			) )
-			odbc? ( app-emulation/emul-linux-x86-db[development] )
 			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development]
-				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32]
+				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
 			) )
 			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/pulseaudio-5.0[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
 			) )
 			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
 				(
-					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32]
-					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32]
+					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+					>=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)]
+				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
+			) )
+			ssl? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
+			) )
 			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				>=media-libs/libpng-1.6.10:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
 			) )
 			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development]
-				>=media-libs/libv4l-0.9.5[abi_x86_32]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
 			) )
 			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
 			) )
 		)
 	)"