--- /root/wine-1.9.5.ebuild.orig	2016-03-15 19:18:35.669413867 +1030
+++ wine-1.9.5.ebuild	2016-03-15 19:21:14.129299962 +1030
@@ -161,30 +161,17 @@
 
 	# bug #549768
 	if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-		einfo "Checking for gcc-5 ms_abi compiler bug ..."
-		$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
-		# Run in subshell to prevent "Aborted" message
-		if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
-			eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-			eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-			eerror "or use gcc-config to select a different compiler version."
-			eerror "See https://bugs.gentoo.org/549768"
-			eerror
-			return 1
-		fi
+		elog " 64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+		elog " due to compiler bugs; please upgrade to gcc:5.3"
+		elog " or use gcc-config to select a different compiler version."
+		elog "  See https://bugs.gentoo.org/549768"
+		return 1
 	fi
 	# bug #574044
 	if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-		einfo "Checking for gcc-5-3 stack realignment compiler bug ..."
-		# Compile in subshell to prevent "Aborted" message
-		if ! ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1; then
-			eerror "Wine cannot be built with this version of gcc-5.3"
-			eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-			eerror "or use gcc-config to select a different compiler version."
-			eerror "See https://bugs.gentoo.org/574044"
-			eerror
-			return 1
-		fi
+		elog " gcc-5-3 stack realignment compiler bug found (see bugs.gentoo.org/574044)"
+		elog "  Adding '-fno-omit-frame-pointer' to C(XX)FLAGS as a workaround"
+		append-flags -fno-omit-frame-pointer
 	fi
 
 	if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
@@ -201,10 +188,6 @@
 	fi
 }
 
-pkg_pretend() {
-	wine_build_environment_check || die
-}
-
 pkg_setup() {
 	wine_build_environment_check || die
 }