--- wine-1.7.34.ebuild	2015-01-13 22:41:29.084981808 -0500
+++ wine-9999.ebuild	2015-01-13 22:44:23.722982767 -0500
@@ -337,18 +337,13 @@
 		ewarn "by Wine developers. Please don't report bugs to Wine bugzilla"
 		ewarn "unless you can reproduce them with USE=-staging"
 
-		# Apply temporary patch to wine-staging to allow for epatch as a backend to wine-staging's new patch script
-		pushd "${STAGING_DIR}"
-		epatch "${FILESDIR}"/wine-staging-gentoo-epatch-support.patch
-		popd
-
 		local STAGING_EXCLUDE=""
 		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
 
 		# Launch wine-staging patcher in a subshell, using epatch as a backend, and gitapply.sh as a backend for binary patches
 		ebegin "Running Wine-Staging patch installer"
 		(
-			set -- DESTDIR="${S}" --backend=epatch --all ${STAGING_EXCLUDE}
+			set -- DESTDIR="${S}" --backend=epatch --no-autoconf --all ${STAGING_EXCLUDE}
 			cd "${STAGING_DIR}/patches"
 			source "${STAGING_DIR}/patches/patchinstall.sh"
 		)