--- wine-1.7.28.ebuild	2014-10-04 16:45:56.130052648 +0200
+++ wine-1.7.23.ebuild	2014-09-23 22:10:50.768448097 +0200
@@ -24,7 +24,7 @@
 
 GV="2.24"
 MV="4.5.2"
-PULSE_PATCHES="winepulse-patches-1.7.24"
+PULSE_PATCHES="winepulse-patches-1.7.22"
 COMPHOLIOV="${PV}"
 COMPHOLIO_PATCHES="wine-compholio-daily-${COMPHOLIOV}"
 WINE_GENTOO="wine-gentoo-2013.06.24"
@@ -329,17 +329,21 @@
 		# First of all, don't run autoreconf and tools/make_requests twice
 		sed -i 's/.*cat.*sort.*patchlist.*APPLY.*/&\n\n.PHONY: postinstall\npostinstall:/' \
 			"../wine-compholio-${COMPHOLIOV}"/patches/Makefile || die
+		# See bug #518792: fix possible awk trouble
+		sed -i 's/# Decode base85 git data.*/export LANG=C\nexport LC_ALL=C\n\n&/' \
+			"../wine-compholio-${COMPHOLIOV}"/debian/tools/gitapply.sh || die
+		# excluding patch dirs does not seem to work in this version
+		sed -i '/winepulse-PulseAudio_Support.ok \\/d' \
+			"../wine-compholio-${COMPHOLIOV}"/patches/Makefile || die
 		# Use Makefile instead of manually applying patches
 		# ...exclude pulseaudio patchset, we apply it conditionally
-		# ...also exclude dsound-Fast_Mixer (conflicts with PULSE_PATCHES)
 		make -C "../wine-compholio-${COMPHOLIOV}"/patches DESTDIR=$(pwd) \
-			install -W winepulse-PulseAudio_Support.ok -W dsound-Fast_Mixer.ok
+			install -W winepulse-PulseAudio_Support.ok
 	fi
 	# See bug #518792: use pulseaudio patches as provided by compholio upstream
 	use pulseaudio && PATCHES+=(
 		"../wine-compholio-${COMPHOLIOV}"/patches/winepulse-PulseAudio_Support/*.patch
-		"../wine-compholio-${COMPHOLIOV}"/patches/dsound-Fast_Mixer/*.patch
-		"../${PULSE_PATCHES}"/*.patch #421365 / modified to work with dsound-Fast_Mixer
+		"../${PULSE_PATCHES}"/*.patch #421365
 	)
 	autotools-utils_src_prepare
 
@@ -390,7 +394,6 @@
 		$(use_with opengl)
 		$(use_with osmesa)
 		$(use_with oss)
-		--without-pcap
 		$(use_with png)
 		$(use_with threads pthread)
 		$(use_with scanner sane)