[app-emulation/wine] Fixes for version 1.7.25

Some patches from current compholio aren't needed for wine-1.7.25