re-merge 9999 ebuild