app-emulation/wine: merge with upstream