--- wine-1.7.21.ebuild	2014-06-29 02:42:47.000000000 +0200
+++ wine-1.7.22.ebuild	2014-10-05 00:11:54.139531496 +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,9 +24,12 @@
 
 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}"
+COMPHOLIO_SRC_URI="https://github.com/compholio/wine-compholio-daily/archive/v${COMPHOLIOV}.tar.gz -> ${COMPHOLIO_PATCHES}.tar.gz"
+GSTREAMERV="1.7.12"
+GSTREAMER_PATCHES="wine-gstreamer-patches-${GSTREAMERV}"
 WINE_GENTOO="wine-gentoo-2013.06.24"
 DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
@@ -36,8 +39,12 @@
 		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 )
-	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 )
+	gstreamer? ( https://googledrive.com/host/0BwvWj1tAgHFpcmMwY1hsbUo3Nk0 -> ${GSTREAMER_PATCHES}.tar.xz )
+	pipelight? ( ${COMPHOLIO_SRC_URI} )
+	pulseaudio? (
+		https://googledrive.com/host/0BwvWj1tAgHFpMFRleE11a0dNNTQ -> ${PULSE_PATCHES}.tar.bz2
+		${COMPHOLIO_SRC_URI}
+	)
 	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
 
 LICENSE="LGPL-2.1"
@@ -46,10 +53,8 @@
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	test? ( abi_x86_32 )
 	elibc_glibc? ( threads )
-	gstreamer? ( pulseaudio )
 	mono? ( abi_x86_32 )
 	osmesa? ( opengl )" #286560
-# winepulse patches needed for gstreamer due to http://bugs.winehq.org/show_bug.cgi?id=30557
 
 # FIXME: the test suite is unsuitable for us; many tests require net access
 # or fail due to Xvfb's opengl limitations.
@@ -295,13 +300,16 @@
 		unpack ${MY_P}.tar.bz2
 	fi
 
+	use gstreamer && unpack "${GSTREAMER_PATCHES}.tar.xz"
 	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"
 
@@ -317,29 +325,30 @@
 		"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
 		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
 	)
-	use pulseaudio && PATCHES+=(
-		"../${PULSE_PATCHES}"/*.patch #421365
-	)
 	if use gstreamer; then
 		# See http://bugs.winehq.org/show_bug.cgi?id=30557
 		ewarn "Applying experimental patch to fix GStreamer support. Note that"
 		ewarn "this patch has been reported to cause crashes in certain games."
 
-		PATCHES+=( "../${PULSE_PATCHES}"/gstreamer/*.patch )
+		PATCHES+=( "../${GSTREAMER_PATCHES}"/*.patch )
 	fi
+	use pulseaudio && PATCHES+=(
+		"${T}/06-winepulse"/*.patch #518792
+		"../${PULSE_PATCHES}"/*.patch #421365
+	)
 	if use pipelight; then
 		ewarn "Applying the unofficial Compholio patchset for Pipelight support,"
 		ewarn "which is unsupported by Wine developers. Please don't report bugs"
 		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