sync with gentoo and remove lots of cruft