Fix dependencies and ensure NATIVE_DEPEND is always considered in DEPEND (bug #492986, thanks to Jeffrey Thomas Piercy and Nikos Chantziaras).

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

9 files changed, 102 insertions, 110 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index d5fe7b2bf0d1..47ff6ba5f90c 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.488 2013/12/16 14:31:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.489 2013/12/17 12:33:14 tetromino Exp $
+
+  17 Dec 2013; Alexandre Rostovtsev <tetromino@gentoo.org> wine-1.6.ebuild,
+  wine-1.6.1.ebuild, wine-1.7.0.ebuild, wine-1.7.3.ebuild, wine-1.7.4.ebuild,
+  wine-1.7.8.ebuild, wine-9999.ebuild:
+  Fix dependencies and ensure NATIVE_DEPEND is always considered in DEPEND (bug
+  #492986, thanks to Jeffrey Thomas Piercy and Nikos Chantziaras).
 
   16 Dec 2013; Alexandre Rostovtsev <tetromino@gentoo.org> wine-1.7.8.ebuild,
   wine-9999.ebuild:
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index e6ba2f1e1e8a..4c0534f247fc 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -134,24 +134,24 @@ EBUILD wine-1.5.6.ebuild 6998 SHA256 e5b53be077c3f5b93e8c7d6613135ca537fb36d16d5
 EBUILD wine-1.5.7.ebuild 7230 SHA256 7adaf5bd12c8c1bdea2ef77621965d13b141314385eebc7fa9293b326f7188a6 SHA512 b4b4ef8f894527352c9a6affce27b08b6bf05843d700fcc4bc1387abf3f7d9118e465f1a695eda1f7f36b57d4e03a1608422e4dcdab6784051d75fa06c0da9d5 WHIRLPOOL 9566c9de567852bd234424138920cfad6d1e54bc0ecca2464c33a0a0a2194eaad1eeca687b1f2308970ed429ea32ac5fd3dbcde27965dcdb8331837d987822ea
 EBUILD wine-1.5.8.ebuild 7230 SHA256 726939d8ef8aa0131709a2b5da0d31d35e40f3f30f74257901c991c5dc35bf77 SHA512 408e64f289724abbf88a975464c99977e8358ddf0044798fb26bd584bccde6a56273730cbbe60de31dbaf33ed3cd30c3de8ad9ea30d6b5bcdd188c34f4e7060e WHIRLPOOL fa6ac4eb1fb90524ded60d9fdda4a6860d70a97eabbfa77775a1b697192fb57cb5c093185f3bd0ab569090efbb1a1093ffa43f1b61435613234015bc98457b14
 EBUILD wine-1.5.9.ebuild 7230 SHA256 817512124347085810db9c0528cbeffce07e2cc1ec516b8a7f44a427f52a69ed SHA512 07c87462e77fef0ce94c8b53e236be818a407cab570694d7d572b8252ad99d31b18bf631e8bd748ba7e631898f468dd889cef8afd1cb07673e7c7b6f7ae6395e WHIRLPOOL efbb94392064a0b47f06dc5c32ae83e601d42bbba229e05a2138dc7f1ce70fb342331c3ef27fec645e417fa9cad60ca83c69ff4c3174708f24af01e08dec0a36
-EBUILD wine-1.6.1.ebuild 12565 SHA256 8c70f125ac525c9c2f783ae2d84e7d99bb4afae2ec823fff9f927920b760c662 SHA512 b9cff8fe60431d81bed83da01658ee8d7b8694b4cac3a88f95bd9b60328cbbb739dd2692a1174b660afaa6e456c9ab8918dd836b2e16c94a8edafd3fa5f7abf9 WHIRLPOOL fe428ce804326f891840b623f34802ed019342b0546b5eb859c73042e342c11150d261f18ea94e537611a2d587b2bc5ebc191b8b9fecd2ab1ba02d1664d845fa
-EBUILD wine-1.6.ebuild 12643 SHA256 2c99b3d3ada5721969b7fc85af69b795497f96ef72ddfa4ad20e0acbacd920ec SHA512 6db088b339aa4a64f834c99deda6bf3ab599fe0aa25a70521168ecd17741f9e7168fc4e470448dd6f5dde61c22179b59649be89c04728d474ff69ef2d43d19a0 WHIRLPOOL 1d8da652577646133f26b259c8d871f414f437180ba81d5e67cf5db36dc831ba3513eced8de8bdb6447c74248decd4336e9a8e0f3ecee1dce8006f5e8d7898db
-EBUILD wine-1.7.0.ebuild 12562 SHA256 b060d125bdbc4aaedb6290f5271f3eddb45970c7814a007669c3311afa2d8262 SHA512 2714e9f4ceb9225e69cc6318541fafaef91179c7f1be4d3dcfef949490b25051fca4d0992df9d8dd9796e831b65fcf46275d839e6dbc93130e2d88813db0ffff WHIRLPOOL 9d502249055bdb68e1e630b88a299bd059f1beae18ca6e46f4ba59edb12bd3009e7b393550aa8bea8231651c6a072946c8a6357d3a3ad1ae99a2bdd54e6aff73
-EBUILD wine-1.7.3.ebuild 12564 SHA256 9fa4e02b7f5d5e261c042860993e875bd90355b984d47271d93a6974f7ca50ab SHA512 b9984e8fd0bd422425bdc24c9f3e3e00aa76989389a8bab9969617a472c780a693f5e1fc9537fa6cdfc9c215f6000d8308c49617a34c3f7e8e71a1b6e7ad9360 WHIRLPOOL 14f975ee68b970150ce4681db6b34fbb1c59d369d7895448fc3a7529abe35dfcb5bccc1bb357122035e3974dff217201c401262d3a0b0e333f6c5714305e2d1b
-EBUILD wine-1.7.4.ebuild 12623 SHA256 bfd515e4c98ac0ab01106e71b0182d3e832e62feb02ee0b940c191f660969a66 SHA512 69e50cdfd5195f13ded1c3799365794b946ac80cc8f902560258851e36152d639410cf6851d455e995df487f08cfdb5022000c7b27e59eece7a7d90385f229c4 WHIRLPOOL c3b1ec3503b17a0db7dbe2f2e4ca5dc2318ee4192e250a65704d1394defc4a25a2baa5cffe5cc54888c271a4bea38451f680fd3d98bee05783133fdc6c60cd42
-EBUILD wine-1.7.8.ebuild 12805 SHA256 ad24e2b0951d4fcbe49396da86456e0c1c63593db380fb41f83cbda7b2359257 SHA512 96b0f4d5fe73e6b1a95461233aa3e4699610d900fbbd1c8cd04692adb49dc7df37b4a07a9e8dc78ec8bfd2b2874c9aa3a018ee112599a20d67119ef3e9772ef5 WHIRLPOOL 3b41cc434cdf74e5953329005ac341c19a5ebeb4b4d30fb7096e77064abf2bc2abb03bdd9b3201e0fb23c43c689ec445f7ae62698d5dd839308007d2241adbc4
-EBUILD wine-9999.ebuild 12806 SHA256 9d9bea7878c19eced0eb20092db772dd2c613a98537b57070b617897b8fa0ecf SHA512 97b0c66dea59484deb31536d766089c249ce33429a968e800e2b902dd8e282738882f3878b422b582b91e0195bc83d0aa631c39e0083647b7fc9d4b2f12a6765 WHIRLPOOL 4f4610f1e769c57dce152b7d50643b8d5f7ecd247237a5838747679f0a6e6e98960d596b67bf6e46c8683d3964ed125a3981da11178bb94cca421f5d83079136
-MISC ChangeLog 15703 SHA256 a1c7cd2674635de6804933f37235fa309b2de4bf641f2922cd01be52b76d13a6 SHA512 7f582e442447a72cc6bf7555a994b93ea152e34248b1336a18daf72f137c9440953c86ebc1eebc78fccc94939d3c8f38949c6306761d850b3d92bc4964ca53bb WHIRLPOOL 00958ea276d009ea32499cf82ab768c76c8efe13e19b149241e3469094e6f9c73186435985fb7ba9d3e3b27885c4b30110ee79be244b146373c42775a884b010
+EBUILD wine-1.6.1.ebuild 12514 SHA256 673bfcffc745ba6e83f493edf95bde7772f1e3575ea23da70da2d4b4e85386ce SHA512 a4b2f302f9fdcbb8bfccad3c44a5e4e4373e51d97d437a340e05159191a5b64a74eceac6112deab6277d26a1bfa5f167a73c8a682ea10f8d27d8b6279d94194e WHIRLPOOL d68402ce54e014f5ecef5a0a8e25b3634831bbfbbda950cc017a5fa669efd5976e174aabb3afc28b06098bce7130194660649dc577f42b46bb49525e9dc4024f
+EBUILD wine-1.6.ebuild 12502 SHA256 5b27fc93d97379c12444b0c7a722545080ddfd0b663b01c926b5f9c24ac92b25 SHA512 4e406c3afa77d732d5262cf50f60a4661be2ee03ea4fdb442ab2b91d3cc69159038660cf72ef52fdd646758011543b71078f93479ae58066bef1c22e8456a860 WHIRLPOOL d681c965e9be48d434f713f3878825aa532140c43d3da496415b7442f906305c0aaf780d45af4a3621ccf2461445f3a6b026e50dce1d0792a2ce8330339a5a9e
+EBUILD wine-1.7.0.ebuild 12421 SHA256 411f57e42e30b82d4c1ac099689281582d6f88b6e1c8a55089e1736a369647fd SHA512 6de6f1aa8e9056b2281618fddc8f32cbee9b15d123dc5cc588e73ef68b254e6a8618380bd967de56635ec3a05849354e6da7d1fa2860bbd97430d2bb6782c9b5 WHIRLPOOL ee9bb901643bfde35a1ff5f615c30b24d9afe360e452c61eb6549a15867ec1c2947f6e662f6f15f1b28897921188bb52686a50d3a23828fe29ef335726f1f9a9
+EBUILD wine-1.7.3.ebuild 12423 SHA256 58d6df01c3bede22cb1c84e2b682e273d73060bd869dad74a7d14aa94f2c2aa5 SHA512 5aea1a2b1fa41f3eb61936820aca4c96b7dd404671772894a199cbf12b721f9746ec837020d464c37f49d7da6a4cbd70ffa89746588854a8513a5d16b953d747 WHIRLPOOL 5f267b3b58f5b0e8b6780abf30229e292c836542f684c34042644e28642fab53dccadcb043a22f279e94d5a8f822f8ec2262e1b2cdcdff227c94bf4f13c02dec
+EBUILD wine-1.7.4.ebuild 12423 SHA256 7ef9808dc6efaf8c1fb60407b79ef3a19ab112a21d33f5e34188e3962641d2f9 SHA512 fe9281355ae372866431a68b276327cd3e5cf55887aee7eee6d989e1e6fe5e9f4f0fe9e2bcb3c681f886ca57ba26786cf09eee90f66a87d62fa4882775f5775b WHIRLPOOL e4247512391929136600c3d37ecfc6f757cc1a91ae179e73dc30e73d23f7cdaa4a3678d69bdb96951afa4b2a5a189fdb8ef22f5cbe736675839f58ccd916cdea
+EBUILD wine-1.7.8.ebuild 12754 SHA256 d6c8decb636bd23b1deba6677bf3167515bd9555ce86d91461c8d6595f17c412 SHA512 94622108c0733bce3c6f60cec2d2dc684228e77d2eaa6f90256e3070186881cd142084feec69098dc460727a06c0e9aed2a6ce9d4082023f0d03b24fb5be3d77 WHIRLPOOL bfd3793ff8530ddf5c76b543a16286af1fc841b6ba4e18573910b5ba6e3de663a180c699266a9dedec71f324b4eee15bc9b99c8acd1e50e9f4ca4bdbea1638bf
+EBUILD wine-9999.ebuild 12755 SHA256 699b9c1bbee6b65951416239b54331dc494e6be09bf198a21086b4d80c070130 SHA512 a4d0ce05a25dc48cdb71c577086ed0950ce9507d61c9b4537433082c932d3798d183a8b9a2b488f21c0ab7ae97f1f07123715ea0c5c77f5c480f468446c5f295 WHIRLPOOL 46bd3b226b6caa33a81159bfdd6922e51ed60434552b341544cdf195c794fbee5a6c82521ff123bbe9a7fcf249c0ae08afa06e68fb66398d687261b11b9bf0ba
+MISC ChangeLog 16044 SHA256 f3f413daddbbace8d78222627b369a81ba22101db680a965efdb9bf9f6b4141c SHA512 733b76e030a238de7833a1af14576c06e6efbc78770c39595af92f0cc1c9a8b318f3c94e97c8a7dce41d7cf9cd66217f27480edc7d1743344e63d2ca1df46546 WHIRLPOOL 3410162c1af0d86fcf9ac60bbbc87019be28881e273e2ef142b0eeb1d40e124cb71c2d583d5e82e4afd04ca4de30fb7dbc6883304cd607e99fcde136cbc3962e
 MISC ChangeLog-2012 100362 SHA256 8e70fc54e7945c1f41e3e0b64fef6b9a7fe89acdaf8c79a06a16048fe8d2e26c SHA512 ca875e847ba100e1f19774b31a2b45a81d776275e3d11944be8a7b01dfcdbf4265b1a340d691bc4fe4054fea006059a06ed52bc0516b1f8b44a1772a1c813278 WHIRLPOOL 36ec708601a25cb8fa93b471112538480b6ef82cc4e6703b3d045f883078b49209ceaeef7bafa8417b881c2d11df84df9c83d1985d0d687a11f3db3de5abb014
 MISC metadata.xml 2236 SHA256 2b4d3de73fa84f3f3d192e3d29d8fd22796d4c5630151a380c3c33597263436e SHA512 884a7aa53e7694cec121453103bf3873cba1a8323f8a6ee5fc5e326b05610f1c2d36c07bc357c12777749a33f0ebf986f78341fea5c752dc14f3ab4b90f137a5 WHIRLPOOL 3a2b66e0af17c2e260621e5e065ece87be1a355c8da5bf3c8638f360ed5d1dcd062c44b0e26e72a708e5bc4fb5d8e054e0049ab58b090fc2fe5ed6e2cdee9c19
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSrw7dAAoJEJ0WA1zPCt1hctAH/3Btpsnc7moAGtMGiKlPDtC8
-GoqhJU9BgcTFwrAwDlJaIoV0+QrgLNuOb5eU3IG0/IgoMBc2Vwu5kOcEJH1kKn9m
-JxpCw0S5Mdpp32f6s8RQb5WXQXjm09nm2e51bgW8M5VFsUSv6zKzD3F9D+0Cr1+4
-Mp5GZ2WSdnYf6HO5th5uE9WWAcgN3IWSBd8+e4KN5ZGl+CMLbO5wsM6+83IC5kum
-YcNMGfR/zCi0nAF9ybAevcsOoBH7rC31CDVI/TgKivI07bRU6HAoG4LRO/DpQoQb
-pkayonA9jgs4diPu4CUki68XhT/xhz8WANEDhP0mV7dyjiKzFa7SrDtDATnAvlA=
-=/oqF
+iQEcBAEBCAAGBQJSsESNAAoJEJ0WA1zPCt1hd3YIAJWaN2HeyF1Z7b+V+SSDpvhm
+rsv3lxenuX0AOYECMBknB6Ez065wrAjrICwnDTe0SrdM0pD14epmwy4h+5kF/tDN
+Me6L09R1UTPUV3U6fmXHaMABKDg2MvZK8Ub19mp8fQ+eYCFpF86bQJ/sxCunTi78
+d1BBtGRK3Xnyed2GqkLlDumc1T8vTB8XvYjydZJT5TTymSaAatcO2LIFwY8sgZF7
+LHLNLfarCIhHdMvUxZMtu2FFkcNn8furRwU099dwlK++5eBXRk2H/QpYQmBZvlJX
+Ne0epwKG8xKF6yVGV+QgwQv201M8RWUOT6KTQUFUzs6nvdRipr3ZAHrGke2Owlk=
+=lAuB
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.6.1.ebuild b/app-emulation/wine/wine-1.6.1.ebuild
index ab4849778278..734602ac6a36 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-2013 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.1 2013/12/16 00:28:21 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.1.ebuild,v 1.2 2013/12/17 12:33:14 tetromino Exp $
 
 EAPI="5"
 
@@ -34,7 +34,7 @@ SRC_URI="${SRC_URI}
 		abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
 	)
 	mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
-	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2
+	pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2 )
 	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
 
 LICENSE="LGPL-2.1"
@@ -172,6 +172,10 @@ COMMON_DEPEND="
 				>=app-emulation/emul-linux-x86-opengl-20121028[development]
 				media-libs/mesa[osmesa,abi_x86_32]
 			) )
+			pulseaudio? ( || (
+				app-emulation/emul-linux-x86-soundlibs[development]
+				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
+			) )
 			xml? ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] )
 			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
 			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
@@ -189,24 +193,17 @@ COMMON_DEPEND="
 			) )
 		)
 	)"
-[[ ${PV} == "9999" ]] || COMMON_DEPEND="${COMMON_DEPEND}
-	amd64? ( abi_x86_32? ( pulseaudio? (
-		|| (
-			app-emulation/emul-linux-x86-soundlibs[development]
-			>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
-		)
-	) ) )"
 
 RDEPEND="${COMMON_DEPEND}
 	dos? ( games-emulation/dosbox )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-[[ ${PV} == "9999" ]] || RDEPEND="${RDEPEND}
+	udisks? ( sys-fs/udisks:2 )
 	pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
 
 DEPEND="${COMMON_DEPEND}
+	amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) )
 	X? (
 		x11-proto/inputproto
 		x11-proto/xextproto
diff --git a/app-emulation/wine/wine-1.6.ebuild b/app-emulation/wine/wine-1.6.ebuild
index 68553906c0b6..148277fe9668 100644
--- a/app-emulation/wine/wine-1.6.ebuild
+++ b/app-emulation/wine/wine-1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.ebuild,v 1.10 2013/10/15 17:53:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.ebuild,v 1.11 2013/12/17 12:33:14 tetromino Exp $
 
 EAPI="5"
 
@@ -39,8 +39,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa oss +perl +png +prelink +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml"
-[[ ${PV} == "9999" ]] || IUSE="${IUSE} pulseaudio"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	test? ( abi_x86_32 )
 	elibc_glibc? ( threads )
@@ -85,14 +84,13 @@ NATIVE_DEPEND="
 	nls? ( sys-devel/gettext )
 	odbc? ( dev-db/unixODBC:= )
 	osmesa? ( media-libs/mesa[osmesa] )
+	pulseaudio? ( media-sound/pulseaudio )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
 	ssl? ( net-libs/gnutls:= )
 	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	xcomposite? ( x11-libs/libXcomposite )"
-[[ ${PV} == "9999" ]] || NATIVE_DEPEND="${NATIVE_DEPEND}
-	pulseaudio? ( media-sound/pulseaudio )"
 
 COMMON_DEPEND="
 	!amd64? ( ${NATIVE_DEPEND} )
@@ -107,7 +105,10 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-baselibs[development]
 				sys-libs/ncurses[abi_x86_32]
 			) )
-			udisks? ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] )
+			udisks? ( || (
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
+				sys-apps/dbus[abi_x86_32]
+			) )
 			fontconfig? ( || (
 				app-emulation/emul-linux-x86-xlibs[development]
 				media-libs/fontconfig[abi_x86_32]
@@ -175,6 +176,10 @@ COMMON_DEPEND="
 				>=app-emulation/emul-linux-x86-opengl-20121028[development]
 				media-libs/mesa[osmesa,abi_x86_32]
 			) )
+			pulseaudio? ( || (
+				app-emulation/emul-linux-x86-soundlibs[development]
+				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
+			) )
 			xml? ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] )
 			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
 			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
@@ -192,19 +197,17 @@ COMMON_DEPEND="
 			) )
 		)
 	)"
-[[ ${PV} == "9999" ]] || COMMON_DEPEND="${COMMON_DEPEND}
-	amd64? ( abi_x86_32? ( pulseaudio? ( app-emulation/emul-linux-x86-soundlibs[development] ) ) )"
 
 RDEPEND="${COMMON_DEPEND}
 	dos? ( games-emulation/dosbox )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-[[ ${PV} == "9999" ]] || RDEPEND="${RDEPEND}
+	udisks? ( sys-fs/udisks:2 )
 	pulseaudio? ( sys-auth/rtkit )"
 
 DEPEND="${COMMON_DEPEND}
+	amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) )
 	X? (
 		x11-proto/inputproto
 		x11-proto/xextproto
@@ -269,8 +272,6 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
 		"${FILESDIR}"/${PN}-1.5.17-osmesa-check.patch #429386
 		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
-	)
-	[[ ${PV} == "9999" ]] || PATCHES+=(
 		"../${PULSE_PATCHES}"/*.patch #421365
 	)
 
@@ -336,6 +337,7 @@ src_configure() {
 		$(use_with osmesa)
 		$(use_with oss)
 		$(use_with png)
+		$(use_with pulseaudio pulse)
 		$(use_with threads pthread)
 		$(use_with scanner sane)
 		$(use_enable test tests)
@@ -348,8 +350,6 @@ src_configure() {
 		$(use_with xml xslt)
 	)
 
-	[[ ${PV} == "9999" ]] || myeconfargs+=( $(use_with pulseaudio pulse) )
-
 	if use amd64 && use abi_x86_32; then
 		# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
 		# set AR and RANLIB to make QA scripts happy; #483342
diff --git a/app-emulation/wine/wine-1.7.0.ebuild b/app-emulation/wine/wine-1.7.0.ebuild
index 7d3523cf7575..3156e464e032 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-2013 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.6 2013/10/15 17:53:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.0.ebuild,v 1.7 2013/12/17 12:33:14 tetromino Exp $
 
 EAPI="5"
 
@@ -39,8 +39,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa oss +perl +png +prelink +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml"
-[[ ${PV} == "9999" ]] || IUSE="${IUSE} pulseaudio"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	test? ( abi_x86_32 )
 	elibc_glibc? ( threads )
@@ -85,14 +84,13 @@ NATIVE_DEPEND="
 	nls? ( sys-devel/gettext )
 	odbc? ( dev-db/unixODBC:= )
 	osmesa? ( media-libs/mesa[osmesa] )
+	pulseaudio? ( media-sound/pulseaudio )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
 	ssl? ( net-libs/gnutls:= )
 	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	xcomposite? ( x11-libs/libXcomposite )"
-[[ ${PV} == "9999" ]] || NATIVE_DEPEND="${NATIVE_DEPEND}
-	pulseaudio? ( media-sound/pulseaudio )"
 
 COMMON_DEPEND="
 	!amd64? ( ${NATIVE_DEPEND} )
@@ -107,7 +105,10 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-baselibs[development]
 				sys-libs/ncurses[abi_x86_32]
 			) )
-			udisks? ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] )
+			udisks? ( || (
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
+				sys-apps/dbus[abi_x86_32]
+			) )
 			fontconfig? ( || (
 				app-emulation/emul-linux-x86-xlibs[development]
 				media-libs/fontconfig[abi_x86_32]
@@ -175,6 +176,10 @@ COMMON_DEPEND="
 				>=app-emulation/emul-linux-x86-opengl-20121028[development]
 				media-libs/mesa[osmesa,abi_x86_32]
 			) )
+			pulseaudio? ( || (
+				app-emulation/emul-linux-x86-soundlibs[development]
+				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
+			) )
 			xml? ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] )
 			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
 			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
@@ -192,19 +197,17 @@ COMMON_DEPEND="
 			) )
 		)
 	)"
-[[ ${PV} == "9999" ]] || COMMON_DEPEND="${COMMON_DEPEND}
-	amd64? ( abi_x86_32? ( pulseaudio? ( app-emulation/emul-linux-x86-soundlibs[development] ) ) )"
 
 RDEPEND="${COMMON_DEPEND}
 	dos? ( games-emulation/dosbox )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-[[ ${PV} == "9999" ]] || RDEPEND="${RDEPEND}
+	udisks? ( sys-fs/udisks:2 )
 	pulseaudio? ( sys-auth/rtkit )"
 
 DEPEND="${COMMON_DEPEND}
+	amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) )
 	X? (
 		x11-proto/inputproto
 		x11-proto/xextproto
@@ -269,8 +272,6 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
 		"${FILESDIR}"/${PN}-1.5.17-osmesa-check.patch #429386
 		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
-	)
-	[[ ${PV} == "9999" ]] || PATCHES+=(
 		"../${PULSE_PATCHES}"/*.patch #421365
 	)
 
@@ -336,6 +337,7 @@ src_configure() {
 		$(use_with osmesa)
 		$(use_with oss)
 		$(use_with png)
+		$(use_with pulseaudio pulse)
 		$(use_with threads pthread)
 		$(use_with scanner sane)
 		$(use_enable test tests)
@@ -348,8 +350,6 @@ src_configure() {
 		$(use_with xml xslt)
 	)
 
-	[[ ${PV} == "9999" ]] || myeconfargs+=( $(use_with pulseaudio pulse) )
-
 	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
 	use amd64 && use abi_x86_32 && tc-export PKG_CONFIG
 
diff --git a/app-emulation/wine/wine-1.7.3.ebuild b/app-emulation/wine/wine-1.7.3.ebuild
index d2d4475d227a..da2f2bcb71a5 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-2013 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.3 2013/10/15 17:53:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.3.ebuild,v 1.4 2013/12/17 12:33:14 tetromino Exp $
 
 EAPI="5"
 
@@ -39,8 +39,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa oss +perl +png +prelink +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml"
-[[ ${PV} == "9999" ]] || IUSE="${IUSE} pulseaudio"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	test? ( abi_x86_32 )
 	elibc_glibc? ( threads )
@@ -83,14 +82,13 @@ NATIVE_DEPEND="
 	nls? ( sys-devel/gettext )
 	odbc? ( dev-db/unixODBC:= )
 	osmesa? ( media-libs/mesa[osmesa] )
+	pulseaudio? ( media-sound/pulseaudio )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
 	ssl? ( net-libs/gnutls:= )
 	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	xcomposite? ( x11-libs/libXcomposite )"
-[[ ${PV} == "9999" ]] || NATIVE_DEPEND="${NATIVE_DEPEND}
-	pulseaudio? ( media-sound/pulseaudio )"
 
 COMMON_DEPEND="
 	!amd64? ( ${NATIVE_DEPEND} )
@@ -105,7 +103,10 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-baselibs[development]
 				sys-libs/ncurses[abi_x86_32]
 			) )
-			udisks? ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] )
+			udisks? ( || (
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
+				sys-apps/dbus[abi_x86_32]
+			) )
 			fontconfig? ( || (
 				app-emulation/emul-linux-x86-xlibs[development]
 				media-libs/fontconfig[abi_x86_32]
@@ -171,6 +172,10 @@ COMMON_DEPEND="
 				>=app-emulation/emul-linux-x86-opengl-20121028[development]
 				media-libs/mesa[osmesa,abi_x86_32]
 			) )
+			pulseaudio? ( || (
+				app-emulation/emul-linux-x86-soundlibs[development]
+				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
+			) )
 			xml? ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] )
 			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
 			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
@@ -188,19 +193,17 @@ COMMON_DEPEND="
 			) )
 		)
 	)"
-[[ ${PV} == "9999" ]] || COMMON_DEPEND="${COMMON_DEPEND}
-	amd64? ( abi_x86_32? ( pulseaudio? ( app-emulation/emul-linux-x86-soundlibs[development] ) ) )"
 
 RDEPEND="${COMMON_DEPEND}
 	dos? ( games-emulation/dosbox )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-[[ ${PV} == "9999" ]] || RDEPEND="${RDEPEND}
+	udisks? ( sys-fs/udisks:2 )
 	pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
 
 DEPEND="${COMMON_DEPEND}
+	amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) )
 	X? (
 		x11-proto/inputproto
 		x11-proto/xextproto
@@ -265,8 +268,6 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
 		"${FILESDIR}"/${PN}-1.7.2-osmesa-check.patch #429386
 		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
-	)
-	[[ ${PV} == "9999" ]] || PATCHES+=(
 		"../${PULSE_PATCHES}"/*.patch #421365
 	)
 
@@ -332,6 +333,7 @@ src_configure() {
 		$(use_with osmesa)
 		$(use_with oss)
 		$(use_with png)
+		$(use_with pulseaudio pulse)
 		$(use_with threads pthread)
 		$(use_with scanner sane)
 		$(use_enable test tests)
@@ -344,8 +346,6 @@ src_configure() {
 		$(use_with xml xslt)
 	)
 
-	[[ ${PV} == "9999" ]] || myeconfargs+=( $(use_with pulseaudio pulse) )
-
 	if use amd64 && use abi_x86_32; then
 		# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
 		# set AR and RANLIB to make QA scripts happy; #483342
diff --git a/app-emulation/wine/wine-1.7.4.ebuild b/app-emulation/wine/wine-1.7.4.ebuild
index 21444eedd679..0d89b1002a5a 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-2013 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.4 2013/12/01 09:45:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.4.ebuild,v 1.5 2013/12/17 12:33:14 tetromino Exp $
 
 EAPI="5"
 
@@ -39,8 +39,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa oss +perl +png +prelink +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml"
-[[ ${PV} == "9999" ]] || IUSE="${IUSE} pulseaudio"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	test? ( abi_x86_32 )
 	elibc_glibc? ( threads )
@@ -83,14 +82,13 @@ NATIVE_DEPEND="
 	nls? ( sys-devel/gettext )
 	odbc? ( dev-db/unixODBC:= )
 	osmesa? ( media-libs/mesa[osmesa] )
+	pulseaudio? ( media-sound/pulseaudio )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
 	ssl? ( net-libs/gnutls:= )
 	png? ( media-libs/libpng:0= )
 	v4l? ( media-libs/libv4l )
 	xcomposite? ( x11-libs/libXcomposite )"
-[[ ${PV} == "9999" ]] || NATIVE_DEPEND="${NATIVE_DEPEND}
-	pulseaudio? ( media-sound/pulseaudio )"
 
 COMMON_DEPEND="
 	!amd64? ( ${NATIVE_DEPEND} )
@@ -105,7 +103,10 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-baselibs[development]
 				sys-libs/ncurses[abi_x86_32]
 			) )
-			udisks? ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] )
+			udisks? ( || (
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
+				sys-apps/dbus[abi_x86_32]
+			) )
 			fontconfig? ( || (
 				app-emulation/emul-linux-x86-xlibs[development]
 				media-libs/fontconfig[abi_x86_32]
@@ -171,6 +172,10 @@ COMMON_DEPEND="
 				>=app-emulation/emul-linux-x86-opengl-20121028[development]
 				media-libs/mesa[osmesa,abi_x86_32]
 			) )
+			pulseaudio? ( || (
+				app-emulation/emul-linux-x86-soundlibs[development]
+				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
+			) )
 			xml? ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] )
 			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
 			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
@@ -188,24 +193,17 @@ COMMON_DEPEND="
 			) )
 		)
 	)"
-[[ ${PV} == "9999" ]] || COMMON_DEPEND="${COMMON_DEPEND}
-	amd64? ( abi_x86_32? ( pulseaudio? (
-		|| (
-			app-emulation/emul-linux-x86-soundlibs[development]
-			>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
-		)
-	) ) )"
 
 RDEPEND="${COMMON_DEPEND}
 	dos? ( games-emulation/dosbox )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-[[ ${PV} == "9999" ]] || RDEPEND="${RDEPEND}
+	udisks? ( sys-fs/udisks:2 )
 	pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
 
 DEPEND="${COMMON_DEPEND}
+	amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) )
 	X? (
 		x11-proto/inputproto
 		x11-proto/xextproto
@@ -270,8 +268,6 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
 		"${FILESDIR}"/${PN}-1.7.2-osmesa-check.patch #429386
 		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
-	)
-	[[ ${PV} == "9999" ]] || PATCHES+=(
 		"../${PULSE_PATCHES}"/*.patch #421365
 	)
 
@@ -337,6 +333,7 @@ src_configure() {
 		$(use_with osmesa)
 		$(use_with oss)
 		$(use_with png)
+		$(use_with pulseaudio pulse)
 		$(use_with threads pthread)
 		$(use_with scanner sane)
 		$(use_enable test tests)
@@ -349,8 +346,6 @@ src_configure() {
 		$(use_with xml xslt)
 	)
 
-	[[ ${PV} == "9999" ]] || myeconfargs+=( $(use_with pulseaudio pulse) )
-
 	if use amd64 && use abi_x86_32; then
 		# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
 		# set AR and RANLIB to make QA scripts happy; #483342
diff --git a/app-emulation/wine/wine-1.7.8.ebuild b/app-emulation/wine/wine-1.7.8.ebuild
index 47c27c5621bf..ec129f3779fa 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-2013 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.2 2013/12/16 14:31:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.8.ebuild,v 1.3 2013/12/17 12:33:14 tetromino Exp $
 
 EAPI="5"
 
@@ -34,7 +34,7 @@ SRC_URI="${SRC_URI}
 		abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
 	)
 	mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
-	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2
+	pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2 )
 	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
 
 LICENSE="LGPL-2.1"
@@ -173,6 +173,10 @@ COMMON_DEPEND="
 				>=app-emulation/emul-linux-x86-opengl-20121028[development]
 				media-libs/mesa[osmesa,abi_x86_32]
 			) )
+			pulseaudio? ( || (
+				app-emulation/emul-linux-x86-soundlibs[development]
+				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
+			) )
 			xml? ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] )
 			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
 			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
@@ -190,24 +194,17 @@ COMMON_DEPEND="
 			) )
 		)
 	)"
-[[ ${PV} == "9999" ]] || COMMON_DEPEND="${COMMON_DEPEND}
-	amd64? ( abi_x86_32? ( pulseaudio? (
-		|| (
-			app-emulation/emul-linux-x86-soundlibs[development]
-			>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
-		)
-	) ) )"
 
 RDEPEND="${COMMON_DEPEND}
 	dos? ( games-emulation/dosbox )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-[[ ${PV} == "9999" ]] || RDEPEND="${RDEPEND}
+	udisks? ( sys-fs/udisks:2 )
 	pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
 
 DEPEND="${COMMON_DEPEND}
+	amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) )
 	X? (
 		x11-proto/inputproto
 		x11-proto/xextproto
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index aa5e6316b341..dacdaf5b5743 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.160 2013/12/16 14:31:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.161 2013/12/17 12:33:14 tetromino Exp $
 
 EAPI="5"
 
@@ -34,7 +34,7 @@ SRC_URI="${SRC_URI}
 		abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
 	)
 	mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
-	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2
+	pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2 )
 	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
 
 LICENSE="LGPL-2.1"
@@ -173,6 +173,10 @@ COMMON_DEPEND="
 				>=app-emulation/emul-linux-x86-opengl-20121028[development]
 				media-libs/mesa[osmesa,abi_x86_32]
 			) )
+			pulseaudio? ( || (
+				app-emulation/emul-linux-x86-soundlibs[development]
+				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
+			) )
 			xml? ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] )
 			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
 			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
@@ -190,24 +194,17 @@ COMMON_DEPEND="
 			) )
 		)
 	)"
-[[ ${PV} == "9999" ]] || COMMON_DEPEND="${COMMON_DEPEND}
-	amd64? ( abi_x86_32? ( pulseaudio? (
-		|| (
-			app-emulation/emul-linux-x86-soundlibs[development]
-			>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
-		)
-	) ) )"
 
 RDEPEND="${COMMON_DEPEND}
 	dos? ( games-emulation/dosbox )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-[[ ${PV} == "9999" ]] || RDEPEND="${RDEPEND}
+	udisks? ( sys-fs/udisks:2 )
 	pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
 
 DEPEND="${COMMON_DEPEND}
+	amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) )
 	X? (
 		x11-proto/inputproto
 		x11-proto/xextproto