update manifest (why?)
sync with upstream
resync with gentoo upstream