Resync with portage
Remove clang and llvm for upstream llvm[clang] and resync with portage