Update pulseaudio patches, thanks to Maarten Lankhorst.

Package-Manager: portage-2.2.0_alpha137/cvs/Linux x86_64

4 files changed, 294 insertions, 15 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 0927cbaf4641..d89641cf96d3 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.432 2012/10/12 21:17:20 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.433 2012/10/13 00:19:19 tetromino Exp $
+
+*wine-1.5.15-r1 (12 Oct 2012)
+
+  12 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +wine-1.5.15-r1.ebuild, wine-9999.ebuild:
+  Update pulseaudio patches, thanks to Maarten Lankhorst.
 
 *wine-1.5.15 (12 Oct 2012)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 18886ba6871f..aa897d7e4146 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -43,6 +43,7 @@ DIST winepulse-0.35-configure.ac.patch 2826 SHA256 837bffaaddb6b7b0a474c7262a57f
 DIST winepulse-0.36.patch 101815 SHA256 7508b171bfecb461ecb464426cb4bcd9c3ff77645b787fcbf61e27dd34fe1b05 SHA512 9b9ca1284c6f8f1108a0456989dd0e7a3a35a3075dd5e6601e84d91e65a60a263992736a16c432a7ca75f40e9dc904cdb546b51acd1508b78cbaff060a461d6f WHIRLPOOL d00f9ebd163b632c9cdf3d6581cc9c010b7c0db4c96666591dc4fc1aa48bac030def35964a4dca9c9405ab32b51eaecf2f392b0f57771bc2dd04f5bc2603e789
 DIST winepulse-0.38-winecfg.patch 13088 SHA256 051ef1cb5598c319152ad28b85733927a711b45e0bfa92f0b0b2331588f5894e SHA512 714358ec1c1251fde97430e6a3342a8a455f5bf56f1f57f895c6ebaf73e4c396f15f7b12d0f8e02822526e1b4d19a6f161b53ad7c7dd6db1cf8516c95352404f WHIRLPOOL 9e34956d2da028fed29112791bd8497fcdf8b7de8f5f04903b411f091bbe57a8b8ea647a829ab04fcf08ebc5e59d96029e855fbd20a99ae222aad9b322925ab0
 DIST winepulse-2012.06.15.patch 100596 SHA256 f6baf816e6170c406607d81e298fea2d175452ca822ee4cd2748fe4381ecd4dc SHA512 cd14a3407820d5d7b64a1ea19e41ae816a6a06888d57314cd7314192744574885501c98fa9e9f0fb102d3427d9f7bcc4f1a5ac532947b89db52ef731e071cb69 WHIRLPOOL 2dbb40afb633f5b1238d8849825b4711de865033ebb5c8f04c8e930a2974b8a5f4958fe87b5c1a9ccb1417ab1f4fbd2ed37feec11d2212efa01a6e05171a06a6
+DIST winepulse-patches-1.5.15.tar.bz2 39808 SHA256 373291b020308d639ee12a05cb94f74ad9bb7cdd1024d5406067421b0aac0713 SHA512 0bd2e04922a144aa5f1ddc6fea9deb383bce934176f3e485f41a77007512720e2d68131c1e6002167673a2df8431a820fb009afd440bf05123ff40872deffb2b WHIRLPOOL 96a6ce6b01a1a2137bbe6963734bd19b32f9b27e57b1dd81f9934e2f8718ec534815fd45f7c5a70389af69a6eceee2024dbc9d90833f8444699afe29c2e1df9d
 EBUILD wine-1.2.3.ebuild 6069 SHA256 12c09c9540e500f8b61e811fa5789723bd19c03b86a0d87ab1c3fedd37e8335f SHA512 a5671a6c9a2f2543e8c7a3cd3a53834ff50b7b31ab4b343b97331f9e9ecdfb8a99b2a6a95d9aab223049215469d1cde912a5177ac33b2eccbb9b12f6f9759155 WHIRLPOOL 4aca7be22d5275f06393a3dddb66a51873862321d0d39b74556eec6bb40a7c3ecc3ce905bc0df49c375b992ff83dcf5cac570502f5a1d2c43bd70443c362efaa
 EBUILD wine-1.3.28.ebuild 5765 SHA256 fb2166f871f6887ec0651b2722ad3f2e4fcf9116ae600cdbf9bb1062b897e965 SHA512 63128e5ea50cfd93dcb5fcbd59de5de893a25c6d9b86c06c97448997e74184b97df50cfadddf80915b32f98188f06a532a07ad0001b2cdea8d3632b5a956779d WHIRLPOOL e82f295ef6ac8b63cae7995e31d59eea01a6fed6b1726fcf2ee3616a5b7342ce9fcc1c73e78fef4f8c4bbac7eebe355aeb1ed1891dd39c27dc597ec4e5958168
 EBUILD wine-1.4.1.ebuild 6378 SHA256 58bdc3466b947f47500c8ec69d2f40735c3db43d28cffe9107994cd07f0f18a9 SHA512 fa45c082a430fff4c91dd8ff753cf3621e9a3320f41658a81b354a1da1fb9463ca7ec1fa042f6fa733bd47a83205ea15aff1aa9e2c24fbaf728870acc329fbe4 WHIRLPOOL ee1e3e5335602f9a049e37c79c32d680480cce2e33a1a57be3f61e4b37cb5e2600b1c0d6ad1ce9d0aaec0d9aeaeacdddd7b4b1feca313fe0301252ce5511d27f
@@ -54,6 +55,7 @@ EBUILD wine-1.5.11.ebuild 7188 SHA256 a9f90d55961668c11f4210d2502019768576b9a5da
 EBUILD wine-1.5.12.ebuild 7188 SHA256 53d08ed4abff1beb8d445c1ff427939602023328014637e9d825fcd2b380f97b SHA512 c96c6c23f24f7c68e3895d13b83270af9276178313319ecdc6e70b7578fd710372484dc54d4b370c53f5f54a2e434704cb4e7cf399829ba0c29c3fe1ad986dbb WHIRLPOOL a9a1c9b50c616a42676e8d9290420af3d5cb2df39f33dd69da1a7543a2204bffec50dd000694f4d273aafe052b7d96c020f8a06b8484aeffa977d64decb4c7bb
 EBUILD wine-1.5.13.ebuild 7188 SHA256 673ede6d04e9e3947d176f4c8a7edf17ba78b6bcd0faea3f00becdb36f6c58ce SHA512 089b0e235832f3dfd0f4cbd48ca58605713c53dcc8644a0a226917fcd9fd18b26a89bc41d2013d6cbbc16abbc5f923e2786a88271975b3339d733e0ce685001f WHIRLPOOL 1b17f2d3681223dd60ef554bdf8b706f9752a7129f7d77a6677b0ff091f524b25d9414e4020e27dc4a3f67f86995c66e3759c81ad8a80715fcdf304d264be36d
 EBUILD wine-1.5.14.ebuild 7188 SHA256 e21d48b0beea7342f3c96912374761168596e509367f6a8bd6d6166716d715bf SHA512 e3edd68d6991e955755731985abd470aa70a8dab31ffff1238a50fc2532d1c58478868929120dc557ad7068ca65273cce77581b7e64d8b17429fe5535c0d3bfa WHIRLPOOL d7602173bb6e95f48c6b4ada1a7829c6eb3e42ee1dd73e26bb0910d65e2be0fc77052d5842bf3856343969c80321db7ae9e82b1ede7f2cb0dccd5679ca7f25c2
+EBUILD wine-1.5.15-r1.ebuild 7356 SHA256 e9a1a2b2c512dd121c52a57aa270f0e7be21e7dd1afb5cd67e6d6daceb6fa726 SHA512 baad57da21415440625338a529a2f246325d78b44eeefc2f5f31acac4999fd2639ae8383711e1a6390dcc3f7fdc71ad868b29f63d45d984bf1564f3af772f0f8 WHIRLPOOL a6d6bdfbe8c8b8ce6058fe896e17f98635459c2677e70450cb0b2e4fb0c9376f4cb2406df754c1b65f18a76347ed7f1a7b7fdb9391ca44f6ada20f2ae2ce70d9
 EBUILD wine-1.5.15.ebuild 7283 SHA256 6903d99c1d70d4d6e78467250e75fb9104a5c1fbfe6ff8c21785a08119bb46b6 SHA512 6dbb8de237cbe8f5d753ae67e58bdd7c480f2de7b7152450513ccf6e8d1c503922e1ec3d7202593b87cb865812f5bf8fecdf0f968ba7adae359acbdd2e1d97f8 WHIRLPOOL 41edaf898ff72b1328f4e6907ff2c10a4533d19e3609945cde4b7212907b5156dc99dba3188ff7df621a36d7616dc9991a2cf99f90e4db1556e457af6d76018e
 EBUILD wine-1.5.2.ebuild 6380 SHA256 34f31231d23cd9cafa293f283fcb62d48e36b2bd5d37890912c684dfa08ec344 SHA512 6d07a8285c1314a91209f19bd242940f8a066afb74dfa57d26f6d89f23d26f438c2fc1562bea25e777400f92569ec6f8261b0d2edb09381ac78b960d3a73bf39 WHIRLPOOL 0f72f3162bfd391b0c0d630db5abebe54d6444d858e59bba400fd68828c996a79c2b528273757fab1c35314276812b764db2cf0780029b22656cc15639cc31a3
 EBUILD wine-1.5.3.ebuild 6380 SHA256 2b50db261660e8412390fde17fbabe205624ab040d8e74546398f1c2ed4d9f37 SHA512 5c3015f0bb86cec191ca76515272aee17925b2fea461c5825291ce5b296922b9e91096a8d2954aef3d47d4a6e1b251fa7f37bab72760b409106e0c55da7eef51 WHIRLPOOL 0174d09e19293a4c7eb2724f42e86fc153fd2338c99fdb7b6480988ce4d54acb79857b211f2ace2caba1796c0d793dc92982b32b2e26f29cbc8bccc7b21e9cad
@@ -63,17 +65,17 @@ EBUILD wine-1.5.6.ebuild 6600 SHA256 a8757e0c512668f3d8f956b2f3ebda976ed0feb59c7
 EBUILD wine-1.5.7.ebuild 6848 SHA256 43b470b64a239ca09e23d349d19964979515f3a9cc872581b83286df99c1e709 SHA512 531b680701e43fbfa03587c39da21597566672e5f91ba3c655e8126d6f143d9313627697cd0217eb04facfc4d0b8c54779cd491764fa88239d42b02f8ad430b6 WHIRLPOOL bb96ef28fe66d5b647228e7cfa1305266f4b9e78a0a242e42994882fb839dd95ebb52363f50d4894360cbb78a405daae676f92acc4dafc9408054ddedcfea8e6
 EBUILD wine-1.5.8.ebuild 6848 SHA256 75eab43687f3c080dd3d194ede4f4991e06d2542e22424414b4940c69d9cffae SHA512 90c7b1df8b2917de5b30c2898c19a4872574a3866e674353520bcf2288d1c74d62c05764a82cb06c3c18f413568f0195f7863a4bacbdff8aca6fed2d9efa477a WHIRLPOOL 79880cbbc161cac17744ab4b44cd34f7e05ea6b27eeab33ef095dce1259054c83aacb719c76cc58236554d086be444b6da5249d86d80da0ecb53ba0f3fa9f32f
 EBUILD wine-1.5.9.ebuild 6848 SHA256 61fcdb98649500dc314cf25eb83327f497264cb62f6510f7eb9ba4ab234202ce SHA512 ee959dcce8b6a761da3561da372169df29019f4c405e9c848184db6f056ec582cafe52b0f8ce83ef8febc025904d7fc643d93a220eb7c35694f306adbddd6805 WHIRLPOOL 9ef72a118c92c046e90243d938e254e5d9d78f10ad380ea213b7effee9ffa9c2c6c50f7240268fcb3560b39dee5767772a6faaf1b09fd43208ece28b22f5f9eb
-EBUILD wine-9999.ebuild 7283 SHA256 6be0f9a848933650a7b67f1a18da48b19bf3c1abc38b80530d421f45f79dd0c6 SHA512 a9f7dd930fbf6452a346825f073364bf7c61e00a2db95dd2bb555f1dd7d2c19035b95a5fc3d1caf238dc3bc7e7c6233fd9cd413fad964c003b79475dca03b8ec WHIRLPOOL 538ee6d5486ad14003c183aada5e1db7aeffd54a505fdded9345e49b8bac4b84e0a089cd2f5906acca6d6ef6fc592220f191f2235fd2fdfd91d8346a8d4630c3
-MISC ChangeLog 96330 SHA256 200de6cc8367cbc683f6dfefaa38255bdecb830dd3cde8f124592d704f8ed14e SHA512 39516e912105cd876d44214e179154071e580bcace3a613310a41d2ae597ab0fd6fc2470e3e17eb6cbb7fbe87115d9ba97092bb4611058469c26257dffdd72ee WHIRLPOOL bea484d1656aa1c6cbc08179c929fbd71023651ce0166cb965825c6fbd4bb5e9ad504c56a0c83606bc09f5946a015c03dab0454d6f778da834acecbdbd496be2
+EBUILD wine-9999.ebuild 7353 SHA256 ba939be14aba498a5c2c8624dd66804d0a5e931691a83a0a8db344054c49b9fc SHA512 af0059b7a39348058921fb6dfd7790d3a398d768b15c20fedf17ec71b22667f6faa58f53054c087eaa0c61285828ebae477ed9fa686482859506dcad4341923b WHIRLPOOL 5e4e732e11638c9fa3664c43fde166d74d5dfb14ba6dd94f56a7fb997b1239ccc4f95aeee0548dbc6c0a7b67d5417be74c4f23b0e423ed2f326835fe681e6eef
+MISC ChangeLog 96523 SHA256 caf1f55ebdbdca52c5ffd6d801dce481a6c906a25576773d55f9f13ca7d7fbc9 SHA512 501c40572c7664062b8018ef24f2c82c0a355a0f5d5cb11b00a303b969a0427b0cef826ef0d6dd0b86ce34cba40650ce5269317d76cae765b370b0b1b68b5e99 WHIRLPOOL 5caf3f5e3c70704c493112f4c97baa54cd2e2d595d7bb9c19f236099a22fc6948b121afde6dea86344853b74d603cf519e15fd67561d5a19a75edb94f8a9831e
 MISC metadata.xml 1908 SHA256 0c2f8ace61499c12daaf6ff5317dbb53f86437d702875c9a9f63e209501fe214 SHA512 d30a4ee3a2a3b53d3622fb613143e74d945ebbe76d4cc04f2140c7b07d214f535f3468ffc7e5f078226b006940753098f5e4bcc9c867d50233c4801ad255b624 WHIRLPOOL 92d8335e734433471612a3d6bb565b35f9a2bcfef9f7c38f43081a387ab01bcce684fad1bfb9af5a208f1ed863ca6270ae4666ba23849793c7bc71f33267e887
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQeIjiAAoJEJ0WA1zPCt1hM2QIALkIgxnWXgCxNozPWnT5uVRX
-BBDAlW+XKz+K1zLr3Ib/riQxHI6lA142dGjgnfDs1qHjdVWzORE7gb687D/vACdX
-M/KWJZijsmjTewhma07ZAL3W/op7FmMLgNn32nnwKnlpj8Jk5evWzO3Y/2RWJ1cH
-4XIfxsKlMr+tZu9afw9MljGqU8BuGpMIIBt6OWhvO6oAa6xki5+vRsUC7I1MidG+
-tF55wGG8zfuZy+0ZVCj3+WefROz//gh9KkTr9WPyTWzcnbIslDTpR0Oi+vE+ywm4
-ToEG8CnIdk4XTz7ky3tT12gQnI/UZk8fc09iErXsB/g4rvLOCDxbrqc1+Zww6+8=
-=BWd1
+iQEcBAEBCAAGBQJQeLOIAAoJEJ0WA1zPCt1hwhYH/RKX8FlSA4L88Y6ppHHBr7WK
+kGvb1dwkH6tI9jjKjUEku2K6OsXahKcjoV4maTaZv2Z2ccIfTIVbniqEQjUZ3o4K
+lwyTSs4e8HM/DB9SkHvs7OUZeCpD8CiBDE30zTlxnRJAA7FvkgkiA3COnB4g66Pk
+ZE7Iafr1inTwX2XX9nz2YbJN8Wvk8UyEardVeUixIaYi7XuCCgPUzdALVlnQzI7I
+LzuUTcWKyfy5DIg16/QCUuFVI1Ec3KQ24hL8t2CHC0wtPdh/F1DRdKA2tFmVhJf1
+3W/2shHuUUyNH3ZIEQAdUmYNSVsO/1u3GmAcJg6x7pq2+N336Qrwun8SXQYul8w=
+=Y9Xc
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.5.15-r1.ebuild b/app-emulation/wine/wine-1.5.15-r1.ebuild
new file mode 100644
index 000000000000..5fad02963ab7
--- /dev/null
+++ b/app-emulation/wine/wine-1.5.15-r1.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.15-r1.ebuild,v 1.1 2012/10/13 00:19:19 tetromino Exp $
+
+EAPI="4"
+
+inherit autotools eutils flag-o-matic multilib pax-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
+	inherit git-2
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MY_P="${PN}-${PV/_/-}"
+	SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	S=${WORKDIR}/${MY_P}
+fi
+
+GV="1.8"
+MV="0.0.4"
+PULSE_PATCHES="winepulse-patches-1.5.15"
+DESCRIPTION="free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	gecko? (
+		mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi
+		win64? ( 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"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa osmesa-multilib +oss +perl png pulseaudio samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
+REQUIRED_USE="elibc_glibc? ( threads )
+	mono? ( || ( win32 !win64 ) )
+	osmesa? ( opengl )" #286560
+RESTRICT="test" #72375
+
+MLIB_DEPS="amd64? (
+	truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
+	X? (
+		>=app-emulation/emul-linux-x86-xlibs-2.1
+		>=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?]
+	)
+	mp3? ( app-emulation/emul-linux-x86-soundlibs )
+	odbc? ( app-emulation/emul-linux-x86-db )
+	openal? ( app-emulation/emul-linux-x86-sdl )
+	opengl? ( app-emulation/emul-linux-x86-opengl )
+	scanner? ( app-emulation/emul-linux-x86-medialibs )
+	v4l? ( app-emulation/emul-linux-x86-medialibs )
+	app-emulation/emul-linux-x86-baselibs
+	>=sys-kernel/linux-headers-2.6
+	)"
+RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
+	perl? ( dev-lang/perl dev-perl/XML-Simple )
+	capi? ( net-dialup/capi4k-utils )
+	ncurses? ( >=sys-libs/ncurses-5.2 )
+	fontconfig? ( media-libs/fontconfig )
+	gphoto2? ( media-libs/libgphoto2 )
+	openal? ( media-libs/openal )
+	udisks? (
+		sys-apps/dbus
+		sys-fs/udisks:2
+	)
+	gnutls? ( net-libs/gnutls )
+	gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+	)
+	xinerama? ( x11-libs/libXinerama )
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	opencl? ( virtual/opencl )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	gsm? ( media-sound/gsm )
+	jpeg? ( virtual/jpeg )
+	ldap? ( net-nds/openldap )
+	lcms? ( =media-libs/lcms-1* )
+	mp3? ( >=media-sound/mpg123-1.5.0 )
+	nls? ( sys-devel/gettext )
+	odbc? ( dev-db/unixODBC )
+	osmesa? ( media-libs/mesa[osmesa] )
+	pulseaudio? (
+		media-sound/pulseaudio
+		sys-auth/rtkit
+	)
+	samba? ( >=net-fs/samba-3.0.25 )
+	selinux? ( sec-policy/selinux-wine )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
+	scanner? ( media-gfx/sane-backends )
+	ssl? ( dev-libs/openssl )
+	png? ( media-libs/libpng )
+	v4l? ( media-libs/libv4l )
+	!win64? ( ${MLIB_DEPS} )
+	win32? ( ${MLIB_DEPS} )
+	xcomposite? ( x11-libs/libXcomposite )"
+DEPEND="${RDEPEND}
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	xinerama? ( x11-proto/xineramaproto )
+	!hardened? ( sys-devel/prelink )
+	virtual/pkgconfig
+	virtual/yacc
+	sys-devel/flex"
+
+src_unpack() {
+	if use win64 ; then
+		[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
+			&& die "you need gcc-4.4+ to build 64bit wine"
+	fi
+
+	if use win32 && use opencl; then
+		[[ x$(eselect opencl show) = "xintel" ]] &&
+			die "Cannot build wine[opencl,win32]: intel-ocl-sdk is 64-bit only" # 403947
+	fi
+
+	if [[ ${PV} == "9999" ]] ; then
+		git-2_src_unpack
+	else
+		unpack ${MY_P}.tar.bz2
+	fi
+
+	unpack "${PULSE_PATCHES}.tar.bz2"
+}
+
+src_prepare() {
+	local md5="$(md5sum server/protocol.def)"
+	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+	epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
+	epatch "${FILESDIR}"/${PN}-1.5.11-osmesa-check.patch #429386
+	epatch "../${PULSE_PATCHES}"/*.patch #421365
+	epatch_user #282735
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	eautoreconf
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+}
+
+do_configure() {
+	local builddir="${WORKDIR}/wine$1"
+	mkdir -p "${builddir}"
+	pushd "${builddir}" >/dev/null
+
+	with_osmesa=$(use_with osmesa)
+	if use amd64 && [[ $1 = 32 ]]; then #430268
+		if use osmesa-multilib; then
+			with_osmesa=--with-osmesa
+		else
+			elog "win32 osmesa support is disabled for now, see bug #430268"
+			with_osmesa=--without-osmesa
+		fi
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--sysconfdir=/etc/wine \
+		$(use_with alsa) \
+		$(use_with capi) \
+		$(use_with lcms cms) \
+		$(use_with cups) \
+		$(use_with ncurses curses) \
+		$(use_with udisks dbus) \
+		$(use_with fontconfig) \
+		$(use_with gnutls) \
+		$(use_with gphoto2 gphoto) \
+		$(use_with gsm) \
+		$(use_with gstreamer) \
+		--without-hal \
+		$(use_with jpeg) \
+		$(use_with ldap) \
+		$(use_with mp3 mpg123) \
+		$(use_with nls gettext) \
+		$(use_with openal) \
+		$(use_with opencl) \
+		$(use_with opengl) \
+		$(use_with ssl openssl) \
+		${with_osmesa} \
+		$(use_with oss) \
+		$(use_with png) \
+		$(use_with threads pthread) \
+		$(use_with pulseaudio pulse) \
+		$(use_with scanner sane) \
+		$(use_enable test tests) \
+		$(use_with truetype freetype) \
+		$(use_with v4l) \
+		$(use_with X x) \
+		$(use_with xcomposite) \
+		$(use_with xinerama) \
+		$(use_with xml) \
+		$(use_with xml xslt) \
+		$2
+
+	emake -j1 depend
+
+	popd >/dev/null
+}
+
+src_configure() {
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	if use win64 ; then
+		do_configure 64 --enable-win64
+		use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
+	else
+		ABI=x86 do_configure 32 --disable-win64
+	fi
+}
+
+src_compile() {
+	local b
+	for b in 64 32 ; do
+		local builddir="${WORKDIR}/wine${b}"
+		[[ -d ${builddir} ]] || continue
+		emake -C "${builddir}" all
+	done
+}
+
+src_install() {
+	local b
+	for b in 64 32 ; do
+		local builddir="${WORKDIR}/wine${b}"
+		[[ -d ${builddir} ]] || continue
+		emake -C "${builddir}" install DESTDIR="${D}"
+	done
+	dodoc ANNOUNCE AUTHORS README
+	if use gecko ; then
+		insinto /usr/share/wine/gecko
+		doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
+		use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+	fi
+	if use mono ; then
+		insinto /usr/share/wine/mono
+		doins "${DISTDIR}"/wine-mono-${MV}.msi
+	fi
+	if ! use perl ; then
+		rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
+	fi
+
+	if use win32 || ! use win64; then
+		pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
+	fi
+	use win64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
+
+	if use win64 && ! use win32; then
+		dosym /usr/bin/wine{64,} # 404331
+		dosym /usr/bin/wine{64,}-preloader
+	fi
+}
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 5f2d0c4049bc..40863547f261 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.116 2012/10/12 21:17:20 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.117 2012/10/13 00:19:19 tetromino Exp $
 
 EAPI="4"
 
@@ -20,7 +20,7 @@ fi
 
 GV="1.8"
 MV="0.0.4"
-PULSE_PATCH="winepulse-2012.06.15.patch"
+PULSE_PATCHES="winepulse-patches-1.5.15"
 DESCRIPTION="free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
@@ -29,7 +29,7 @@ SRC_URI="${SRC_URI}
 		win64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
 	)
 	mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
-	http://source.winehq.org/patches/data/87234 -> ${PULSE_PATCH}"
+	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -91,7 +91,10 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	nls? ( sys-devel/gettext )
 	odbc? ( dev-db/unixODBC )
 	osmesa? ( media-libs/mesa[osmesa] )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? (
+		media-sound/pulseaudio
+		sys-auth/rtkit
+	)
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
@@ -130,6 +133,8 @@ src_unpack() {
 	else
 		unpack ${MY_P}.tar.bz2
 	fi
+
+	unpack "${PULSE_PATCHES}.tar.bz2"
 }
 
 src_prepare() {
@@ -137,7 +142,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
 	epatch "${FILESDIR}"/${PN}-1.5.11-osmesa-check.patch #429386
-	epatch "${DISTDIR}/${PULSE_PATCH}" #421365
+	epatch "../${PULSE_PATCHES}"/*.patch #421365
 	epatch_user #282735
 	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
 		einfo "server/protocol.def was patched; running tools/make_requests"