app-emulation/wine: merge with upstream
app-emulation/wine: merge with newer ebuilds