--- wine-1.7.21.ebuild	2014-06-29 02:42:47.000000000 +0200
+++ wine-1.7.22.ebuild	2014-09-23 20:52:19.995340865 +0200
@@ -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.21.ebuild,v 1.1 2014/06/29 00:42:47 tetromino Exp $
+# $Header: $
 
 EAPI="5"
 
@@ -24,8 +24,8 @@
 
 GV="2.24"
 MV="4.5.2"
-PULSE_PATCHES="winepulse-patches-1.7.21"
-COMPHOLIOV="1.7.21"
+PULSE_PATCHES="winepulse-patches-1.7.22"
+COMPHOLIOV="${PV}"
 COMPHOLIO_PATCHES="wine-compholio-daily-${COMPHOLIOV}"
 WINE_GENTOO="wine-gentoo-2013.06.24"
 DESCRIPTION="Free implementation of Windows(tm) on Unix"
@@ -37,7 +37,10 @@
 	)
 	mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
 	pipelight? ( https://github.com/compholio/wine-compholio-daily/archive/v${COMPHOLIOV}.tar.gz -> ${COMPHOLIO_PATCHES}.tar.gz )
-	pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2 )
+	pulseaudio? (
+		http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2
+		https://github.com/compholio/wine-compholio-daily/archive/v${COMPHOLIOV}.tar.gz -> ${COMPHOLIO_PATCHES}.tar.gz
+	)
 	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
 
 LICENSE="LGPL-2.1"
@@ -296,12 +299,14 @@
 	fi
 
 	use pulseaudio && unpack "${PULSE_PATCHES}.tar.bz2"
-	if use pipelight; then
+	if use pipelight || use pulseaudio; then
 		unpack "${COMPHOLIO_PATCHES}.tar.gz"
-		# we use a separate pulseaudio patchset
-		rm -r "${COMPHOLIO_PATCHES}/patches/06-winepulse" || die
+		# we apply pulseaudio patchset conditionally
+		mv "wine-compholio-${COMPHOLIOV}/patches/06-winepulse" "${T}" || die
+	fi
+	if use pipelight; then
 		# ... and need special tools for binary patches
-		mv "${COMPHOLIO_PATCHES}/patches/10-Missing_Fonts" "${T}" || die
+		mv "wine-compholio-${COMPHOLIOV}/patches/10-Missing_Fonts" "${T}" || die
 	fi
 	unpack "${WINE_GENTOO}.tar.bz2"
 
@@ -318,6 +323,7 @@
 		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
 	)
 	use pulseaudio && PATCHES+=(
+		"${T}/06-winepulse"/*.patch #518792
 		"../${PULSE_PATCHES}"/*.patch #421365
 	)
 	if use gstreamer; then
@@ -333,13 +339,13 @@
 		ewarn "to Wine bugzilla unless you can reproduce them with USE=-pipelight"
 
 		PATCHES+=(
-			"../${COMPHOLIO_PATCHES}/patches"/*/*.patch #507950
-			"../${COMPHOLIO_PATCHES}/patches/patch-list.patch"
+			"../wine-compholio-${COMPHOLIOV}/patches"/*/*.patch #507950
+			"../wine-compholio-${COMPHOLIOV}/patches/patch-list.patch"
 		)
 		# epatch doesn't support binary patches
 		ebegin "Applying Compholio font patches"
 		for f in "${T}/10-Missing_Fonts"/*.patch; do
-			"../${COMPHOLIO_PATCHES}/debian/tools/gitapply.sh" < "${f}" || die "Failed to apply Compholio font patches"
+			"../wine-compholio-${COMPHOLIOV}/debian/tools/gitapply.sh" < "${f}" || die "Failed to apply Compholio font patches"
 		done
 		eend
 	fi