Fix up pulse patches #307927 by Marc-Antoine Perennou.

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

4 files changed, 17 insertions, 11 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 5e6e15be1800..8f655ebd6676 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.297 2010/03/05 20:17:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.298 2010/03/06 21:45:27 vapier Exp $
+
+  06 Mar 2010; Mike Frysinger <vapier@gentoo.org> wine-1.1.39.ebuild,
+  wine-1.1.40.ebuild:
+  Fix up pulse patches #307927 by Marc-Antoine Perennou.
 
 *wine-1.1.40 (05 Mar 2010)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index fd0d11e6a72a..93c74c0f2288 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -90,21 +90,21 @@ EBUILD wine-1.1.35.ebuild 4529 RMD160 ee89d6519dbc3be79c92c66ba780167cae5d9418 S
 EBUILD wine-1.1.36.ebuild 4531 RMD160 80e23407f0a30970d5faa108bcc4a72d187a42e5 SHA1 00d4c300ab18869b4d2aa92851f11295bed626d0 SHA256 3f12783010198251ec3942cd2dabc488d8d695ba8250341ebaead63702dbd254
 EBUILD wine-1.1.37.ebuild 4531 RMD160 da4b46e467fe78f1bcd40b3c8ec8cba339da2423 SHA1 36ccf3377493ca44cb9d368dca2f8ce843fe1fa2 SHA256 eb4c3fd67d72e9ecf60f52829d8ced381dd567f16a0c10de6b92f1ffc29c53ba
 EBUILD wine-1.1.38.ebuild 4531 RMD160 72832d9382e6af3a548c6e0343eeb790329f5717 SHA1 3050662fef4a84f2158fa890a86a33df2555efc2 SHA256 90a69ab1f4f40d6616bd99e3dcb0fd5562d72d5923ff285b147baa8acd3f5f4e
-EBUILD wine-1.1.39.ebuild 4878 RMD160 5b0b45c842adb0318da0c8a1d9ac68721cd31573 SHA1 a328a50f7ba24e38cc430f6c373021a6889830c4 SHA256 462cb773a9c909e9fd9b7add0a3bb62b87d77fbc146c389fa318d11078d14ebd
+EBUILD wine-1.1.39.ebuild 4927 RMD160 fc0a7d9403a4a861998db1ab6506d853e4af5f06 SHA1 a29fa61a67ee4f3f76fedf79e4b6090d18a6fa1b SHA256 e1b6b58461bafc3639dfcfd1ee4d6c50c6ffdf6555a6b7ea386355d14754da4b
 EBUILD wine-1.1.4.ebuild 3888 RMD160 93be4e30494f146fe6db491d7d09fa41030f05fa SHA1 421a6fec6d9faeaefcf2ae4d6431987188a9787b SHA256 ead7b3bc75b9c0b3802ce8f9e5f5a3ed883a13c80e0136cda1cac1f5088841e8
-EBUILD wine-1.1.40.ebuild 4878 RMD160 d89ea2b6f7534347c650721d2d0d93e52d74d8b3 SHA1 2582e801cb5c89b364c5c9066c46d59276e50e21 SHA256 43c70d86edc85b13f505a37e864b5f29990b685528146b5fd3459aa6c0e528f1
+EBUILD wine-1.1.40.ebuild 4927 RMD160 6ca3e6d86640e027854ce8b422a649a3e8bd4fda SHA1 d260d306f11e9edda847908ad9bf6ae17656c1c0 SHA256 1c32cf8549907c32d87483056ee03a213ce295344363612f09c0126814290380
 EBUILD wine-1.1.5.ebuild 3835 RMD160 7b79439212cd5e9b49bd31a2652ee60089ef6419 SHA1 abaf1a7cfaa1858f0d30bf17a59a33f685e1aa32 SHA256 b0feffd4f9603c0b6f916889a52fae612ddbb18f41e50316151bf43b5106ce43
 EBUILD wine-1.1.6.ebuild 3871 RMD160 9e704f4efa5a8fc8818fb2331d545765d6f72ea3 SHA1 17b05d4e9cdda8a3d3eddc55f65f4266bdf359f4 SHA256 02b9571bb4e89afb6d46f2ea47f3d3664bc27f6f6512a6560bdf05bc2a9d9b77
 EBUILD wine-1.1.7.ebuild 3894 RMD160 bb495cece36b7a08a13e35ef83efc3e763165e30 SHA1 13b2af9f51c72322242316f0839c2a462d159180 SHA256 149dbf664b183c3ebbe0555ec014f36bdfb988b2ed09a49cd08d16e2070b71ce
 EBUILD wine-1.1.8.ebuild 3894 RMD160 6ceda8cb1be9baa5c0ca34c298f39516ce4ea371 SHA1 15f7a68441b69e09186ceb3662b80f0a6db406df SHA256 62b888ee26d4a2728cfc21335e1fb3e01ffb4e98d83ce9c62a60efe4b2ce1567
 EBUILD wine-1.1.9.ebuild 3894 RMD160 d13bd0ee943655f18a22dda248834574869ead65 SHA1 53d282f86267df8e1e7f0d8f4678ee0eb95c6e85 SHA256 9599d5350adf1000ad5c0e62b4c905ca4f2a7d0f9d0dd4188a5e2e6913e24281
 EBUILD wine-9999.ebuild 4530 RMD160 509f6ae62b0bc9336c9a534e11b60cf57a3a254f SHA1 9f443d1c1fb870250fff821c3f7babc5341a9c77 SHA256 36249dac9a7b2750553f393fea94056f29790beb6c97a961cc4613e637291547
-MISC ChangeLog 53845 RMD160 1b654e0cd10b3ccf8a811b75fa234eafccac3222 SHA1 696f778b9d46d2748990e6722d402d05506076c8 SHA256 6a9c0c8504f376c65b13e86ac27ae3333a88f667e4ead7ff26a87d47b36450bd
+MISC ChangeLog 53995 RMD160 10aa91719dd08d49934ed2b852abb3ab333c9b35 SHA1 f672a3420aa8d60923b13ce28d68c1f8faa7bddf SHA256 37d508d84a22b248c55fb1d13c4e8a86357a70a8459c35cf0e1a6dede469e31c
 MISC metadata.xml 1333 RMD160 fe0a0c8ec639987ff6c06f7a9e47a391defb5478 SHA1 421e3087a3f122fa15283d82429f1d315fba313a SHA256 edaaae36cc5924ea3be49d2d3628e5de555b87b2bee44685797efee72f599902
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iF4EAREIAAYFAkuRZs0ACgkQTwhj9JtAlp62yQD/dFIPDGJKHL9CYzfv5r5C3ZQh
-3QQ/N53pRzJuOGzYMHoA/jpIZX9NuXHzOtxkCEzUd1F/CLmBfHhnc8eO6opuSXr0
-=KyO3
+iF4EAREIAAYFAkuSzeoACgkQTwhj9JtAlp7L4gD/TATlD66b+9LXOvH47pR4uxOw
+kx3j7DFzMp/zbfKL1U4A+QF0ExgEwYnAzBdXkrTwBfpg37y1nBhjiNvyC+JJHQ6A
+=cjOc
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.1.39.ebuild b/app-emulation/wine/wine-1.1.39.ebuild
index beee2585fc44..18d6449395a0 100644
--- a/app-emulation/wine/wine-1.1.39.ebuild
+++ b/app-emulation/wine/wine-1.1.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.39.ebuild,v 1.1 2010/03/05 18:09:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.39.ebuild,v 1.2 2010/03/06 21:45:27 vapier Exp $
 
 EAPI="2"
 
@@ -103,7 +103,7 @@ src_unpack() {
 
 src_prepare() {
 	if use pulseaudio ; then
-		epatch `pulse_patches "${DISTDIR}"`
+		EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
 		eautoreconf
 	fi
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
@@ -142,6 +142,7 @@ src_configure() {
 		$(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) \
diff --git a/app-emulation/wine/wine-1.1.40.ebuild b/app-emulation/wine/wine-1.1.40.ebuild
index 26f6b9f8a098..841f2d85c035 100644
--- a/app-emulation/wine/wine-1.1.40.ebuild
+++ b/app-emulation/wine/wine-1.1.40.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.40.ebuild,v 1.1 2010/03/05 20:17:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.40.ebuild,v 1.2 2010/03/06 21:45:27 vapier Exp $
 
 EAPI="2"
 
@@ -103,7 +103,7 @@ src_unpack() {
 
 src_prepare() {
 	if use pulseaudio ; then
-		epatch `pulse_patches "${DISTDIR}"`
+		EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
 		eautoreconf
 	fi
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
@@ -142,6 +142,7 @@ src_configure() {
 		$(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) \