Bring 1.7 up to date with gtk logic removed from eclass