summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNP-Hardass <NP-Hardass@gentoo.org>2017-01-18 19:09:24 -0500
committerNP-Hardass <NP-Hardass@gentoo.org>2017-01-18 19:09:49 -0500
commit63cb35d829797f139b3464bbea65fe38d3908602 (patch)
tree01186e3de48f9c63b3300020f63f61d429b6a41f /app-emulation/wine/wine-9999.ebuild
parentsys-kernel/gentoo-sources: Linux patch 3.18.46 and 3.18.47. Removal of redund... (diff)
downloadgentoo-63cb35d829797f139b3464bbea65fe38d3908602.tar.gz
gentoo-63cb35d829797f139b3464bbea65fe38d3908602.tar.bz2
gentoo-63cb35d829797f139b3464bbea65fe38d3908602.zip
app-emulation/wine: Bump mono version and prevent double patch for flex
Package-Manager: portage-2.3.0
Diffstat (limited to 'app-emulation/wine/wine-9999.ebuild')
-rw-r--r--app-emulation/wine/wine-9999.ebuild5
1 files changed, 3 insertions, 2 deletions
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index b6f6e7664a29..19c2d3920b79 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -22,9 +22,9 @@ else
fi
VANILLA_GV="2.47"
-VANILLA_MV="4.6.3"
+VANILLA_MV="4.6.4"
STAGING_GV="2.47"
-STAGING_MV="4.6.3"
+STAGING_MV="4.6.4"
[[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
STAGING_P="wine-staging-${PV}"
STAGING_DIR="${WORKDIR}/${STAGING_P}${SUFFIX}"
@@ -347,6 +347,7 @@ src_prepare() {
ewarn "Wine bugzilla should explicitly state that staging was used."
local STAGING_EXCLUDE=""
+ STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132
use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches