diff --git a/sys-devel/llvm/llvm17-17.0.1.recipe b/sys-devel/llvm/llvm17-17.0.1.recipe
index 84e749eef..44baafaf5 100644
--- a/sys-devel/llvm/llvm17-17.0.1.recipe
+++ b/sys-devel/llvm/llvm17-17.0.1.recipe
@@ -30,7 +30,7 @@ other than the ones listed above.
 HOMEPAGE="https://www.llvm.org/"
 COPYRIGHT="2003-2023 University of Illinois at Urbana-Champaign"
 LICENSE="Apache v2 with LLVM Exception"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-$portVersion/llvm-project-$portVersion.src.tar.xz"
 CHECKSUM_SHA256="b0e42aafc01ece2ca2b42e3526f54bebc4b1f1dc8de6e34f46a0446a13e882b9"
 SOURCE_DIR="llvm-project-$portVersion.src"
@@ -43,83 +43,83 @@ portVersionCompat="$portVersion compat >= ${portVersion%%.*}"
 
 PROVIDES="
 	llvm17$secondaryArchSuffix = $portVersionCompat
-	cmd:bugpoint
-	cmd:dsymutil
-	cmd:llc
-	cmd:lli
-	cmd:llvm_addr2line
-	cmd:llvm_ar
-	cmd:llvm_as
-	cmd:llvm_bcanalyzer
-	cmd:llvm_bitcode_strip
-	cmd:llvm_c_test
-	cmd:llvm_cat
-	cmd:llvm_cfi_verify
-	cmd:llvm_config = $portVersionCompat
-	cmd:llvm_cov
-	cmd:llvm_cvtres
-	cmd:llvm_cxxdump
-	cmd:llvm_cxxfilt
-	cmd:llvm_cxxmap
-	cmd:llvm_debuginfo_analyzer
-	cmd:llvm_debuginfod
-	cmd:llvm_debuginfod_find
-	cmd:llvm_diff
-	cmd:llvm_dis
-	cmd:llvm_dlltool
-	cmd:llvm_dwarfdump
-	cmd:llvm_dwarfutil
-	cmd:llvm_dwp
-	cmd:llvm_exegesis
-	cmd:llvm_extract
-	cmd:llvm_gsymutil
-	cmd:llvm_ifs
-	cmd:llvm_install_name_tool
-	cmd:llvm_jitlink
-	cmd:llvm_lib
-	cmd:llvm_libtool_darwin
-	cmd:llvm_link
-	cmd:llvm_lipo
-	cmd:llvm_lto
-	cmd:llvm_lto2
-	cmd:llvm_mc
-	cmd:llvm_mca
-	cmd:llvm_ml
-	cmd:llvm_modextract
-	cmd:llvm_mt
-	cmd:llvm_nm
-	cmd:llvm_objcopy
-	cmd:llvm_objdump
-	cmd:llvm_opt_report
-	cmd:llvm_otool
-	cmd:llvm_pdbutil
-	cmd:llvm_profdata
-	cmd:llvm_profgen
-	cmd:llvm_ranlib
-	cmd:llvm_rc
-	cmd:llvm_readelf
-	cmd:llvm_readobj
-	cmd:llvm_reduce
-	cmd:llvm_remark_size_diff
-	cmd:llvm_remarkutil
-	cmd:llvm_rtdyld
-	cmd:llvm_sim
-	cmd:llvm_size
-	cmd:llvm_split
-	cmd:llvm_stress
-	cmd:llvm_strings
-	cmd:llvm_strip
-	cmd:llvm_symbolizer
-	cmd:llvm_tapi_diff
-	cmd:llvm_tblgen
-	cmd:llvm_tli_checker
-	cmd:llvm_undname
-	cmd:llvm_windres
-	cmd:llvm_xray
-	cmd:opt
-	cmd:sancov
-	cmd:sanstats
-	cmd:verify_uselistorder
+	cmd:bugpoint$secondaryArchSuffix
+	cmd:dsymutil$secondaryArchSuffix
+	cmd:llc$secondaryArchSuffix
+	cmd:lli$secondaryArchSuffix
+	cmd:llvm_addr2line$secondaryArchSuffix
+	cmd:llvm_ar$secondaryArchSuffix
+	cmd:llvm_as$secondaryArchSuffix
+	cmd:llvm_bcanalyzer$secondaryArchSuffix
+	cmd:llvm_bitcode_strip$secondaryArchSuffix
+	cmd:llvm_c_test$secondaryArchSuffix
+	cmd:llvm_cat$secondaryArchSuffix
+	cmd:llvm_cfi_verify$secondaryArchSuffix
+	cmd:llvm_config$secondaryArchSuffix = $portVersionCompat
+	cmd:llvm_cov$secondaryArchSuffix
+	cmd:llvm_cvtres$secondaryArchSuffix
+	cmd:llvm_cxxdump$secondaryArchSuffix
+	cmd:llvm_cxxfilt$secondaryArchSuffix
+	cmd:llvm_cxxmap$secondaryArchSuffix
+	cmd:llvm_debuginfo_analyzer$secondaryArchSuffix
+	cmd:llvm_debuginfod$secondaryArchSuffix
+	cmd:llvm_debuginfod_find$secondaryArchSuffix
+	cmd:llvm_diff$secondaryArchSuffix
+	cmd:llvm_dis$secondaryArchSuffix
+	cmd:llvm_dlltool$secondaryArchSuffix
+	cmd:llvm_dwarfdump$secondaryArchSuffix
+	cmd:llvm_dwarfutil$secondaryArchSuffix
+	cmd:llvm_dwp$secondaryArchSuffix
+	cmd:llvm_exegesis$secondaryArchSuffix
+	cmd:llvm_extract$secondaryArchSuffix
+	cmd:llvm_gsymutil$secondaryArchSuffix
+	cmd:llvm_ifs$secondaryArchSuffix
+	cmd:llvm_install_name_tool$secondaryArchSuffix
+	cmd:llvm_jitlink$secondaryArchSuffix
+	cmd:llvm_lib$secondaryArchSuffix
+	cmd:llvm_libtool_darwin$secondaryArchSuffix
+	cmd:llvm_link$secondaryArchSuffix
+	cmd:llvm_lipo$secondaryArchSuffix
+	cmd:llvm_lto$secondaryArchSuffix
+	cmd:llvm_lto2$secondaryArchSuffix
+	cmd:llvm_mc$secondaryArchSuffix
+	cmd:llvm_mca$secondaryArchSuffix
+	cmd:llvm_ml$secondaryArchSuffix
+	cmd:llvm_modextract$secondaryArchSuffix
+	cmd:llvm_mt$secondaryArchSuffix
+	cmd:llvm_nm$secondaryArchSuffix
+	cmd:llvm_objcopy$secondaryArchSuffix
+	cmd:llvm_objdump$secondaryArchSuffix
+	cmd:llvm_opt_report$secondaryArchSuffix
+	cmd:llvm_otool$secondaryArchSuffix
+	cmd:llvm_pdbutil$secondaryArchSuffix
+	cmd:llvm_profdata$secondaryArchSuffix
+	cmd:llvm_profgen$secondaryArchSuffix
+	cmd:llvm_ranlib$secondaryArchSuffix
+	cmd:llvm_rc$secondaryArchSuffix
+	cmd:llvm_readelf$secondaryArchSuffix
+	cmd:llvm_readobj$secondaryArchSuffix
+	cmd:llvm_reduce$secondaryArchSuffix
+	cmd:llvm_remark_size_diff$secondaryArchSuffix
+	cmd:llvm_remarkutil$secondaryArchSuffix
+	cmd:llvm_rtdyld$secondaryArchSuffix
+	cmd:llvm_sim$secondaryArchSuffix
+	cmd:llvm_size$secondaryArchSuffix
+	cmd:llvm_split$secondaryArchSuffix
+	cmd:llvm_stress$secondaryArchSuffix
+	cmd:llvm_strings$secondaryArchSuffix
+	cmd:llvm_strip$secondaryArchSuffix
+	cmd:llvm_symbolizer$secondaryArchSuffix
+	cmd:llvm_tapi_diff$secondaryArchSuffix
+	cmd:llvm_tblgen$secondaryArchSuffix
+	cmd:llvm_tli_checker$secondaryArchSuffix
+	cmd:llvm_undname$secondaryArchSuffix
+	cmd:llvm_windres$secondaryArchSuffix
+	cmd:llvm_xray$secondaryArchSuffix
+	cmd:opt$secondaryArchSuffix
+	cmd:sancov$secondaryArchSuffix
+	cmd:sanstats$secondaryArchSuffix
+	cmd:verify_uselistorder$secondaryArchSuffix
 	devel:libfindAllSymbols$secondaryArchSuffix
 	devel:libLLVM$secondaryArchSuffix = $portVersionCompat
 	devel:libLLVM_$portVersion$secondaryArchSuffix = $portVersionCompat
@@ -257,57 +257,50 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 	"
 CONFLICTS="
-	llvm$secondaryArchSuffix
-	llvm6$secondaryArchSuffix
-	llvm7$secondaryArchSuffix
-	llvm8$secondaryArchSuffix
 	llvm9$secondaryArchSuffix
 	llvm12$secondaryArchSuffix
-	llvm13$secondaryArchSuffix
-	llvm14$secondaryArchSuffix
-	llvm15$secondaryArchSuffix
 	llvm16$secondaryArchSuffix
 	"
 
 PROVIDES_clang="
 	llvm17${secondaryArchSuffix}_clang = $portVersion
-	cmd:amdgpu_arch = $portVersion
-	cmd:c_index_test = $portVersion
-	cmd:clang = $portVersion
-	cmd:clang++ = $portVersion
-	cmd:clang_17 = $portVersion
-	cmd:clang_apply_replacements = $portVersion
-	cmd:clang_change_namespace = $portVersion
-	cmd:clang_check = $portVersion
-	cmd:clang_cl = $portVersion
-	cmd:clang_cpp = $portVersion
-	cmd:clang_doc = $portVersion
-	cmd:clang_extdef_mapping = $portVersion
-	cmd:clang_format = $portVersion
-	cmd:clang_include_cleaner = $portVersion
-	cmd:clang_include_fixer = $portVersion
-	cmd:clang_linker_wrapper = $portVersion
-	cmd:clang_move = $portVersion
-	cmd:clang_offload_bundler = $portVersion
-	cmd:clang_offload_packager = $portVersion
-	cmd:clang_pseudo = $portVersion
-	cmd:clang_query = $portVersion
-	cmd:clang_refactor = $portVersion
-	cmd:clang_rename = $portVersion
-	cmd:clang_reorder_fields = $portVersion
-	cmd:clang_repl = $portVersion
-	cmd:clang_scan_deps = $portVersion
-	cmd:clang_tidy = $portVersion
-	cmd:clang_tblgen = $portVersion
-	cmd:clangd = $portVersion
-	cmd:diagtool = $portVersion
-	cmd:find_all_symbols = $portVersion
-	cmd:git_clang_format = $portVersion
-	cmd:hmaptool = $portVersion
-	cmd:modularize = $portVersion
-	cmd:nvptx_arch = $portVersion
-	cmd:pp_trace = $portVersion
-	cmd:run_clang_tidy = $portVersion
+	cmd:amdgpu_arch$secondaryArchSuffix = $portVersion
+	cmd:c_index_test$secondaryArchSuffix = $portVersion
+	cmd:clang$secondaryArchSuffix = $portVersion
+	cmd:clang++$secondaryArchSuffix = $portVersion
+	cmd:clang_17$secondaryArchSuffix = $portVersion
+	cmd:clang_apply_replacements$secondaryArchSuffix = $portVersion
+	cmd:clang_change_namespace$secondaryArchSuffix = $portVersion
+	cmd:clang_check$secondaryArchSuffix = $portVersion
+	cmd:clang_cl$secondaryArchSuffix = $portVersion
+	cmd:clang_cpp$secondaryArchSuffix = $portVersion
+	cmd:clang_doc$secondaryArchSuffix = $portVersion
+	cmd:clang_extdef_mapping$secondaryArchSuffix = $portVersion
+	cmd:clang_format$secondaryArchSuffix = $portVersion
+	cmd:clang_include_cleaner$secondaryArchSuffix = $portVersion
+	cmd:clang_include_fixer$secondaryArchSuffix = $portVersion
+	cmd:clang_linker_wrapper$secondaryArchSuffix = $portVersion
+	cmd:clang_move$secondaryArchSuffix = $portVersion
+	cmd:clang_offload_bundler$secondaryArchSuffix = $portVersion
+	cmd:clang_offload_packager$secondaryArchSuffix = $portVersion
+	cmd:clang_pseudo$secondaryArchSuffix = $portVersion
+	cmd:clang_query$secondaryArchSuffix = $portVersion
+	cmd:clang_refactor$secondaryArchSuffix = $portVersion
+	cmd:clang_rename$secondaryArchSuffix = $portVersion
+	cmd:clang_reorder_fields$secondaryArchSuffix = $portVersion
+	cmd:clang_repl$secondaryArchSuffix = $portVersion
+	cmd:clang_scan_deps$secondaryArchSuffix = $portVersion
+	cmd:clang_tidy$secondaryArchSuffix = $portVersion
+	cmd:clang_tblgen$secondaryArchSuffix = $portVersion
+	cmd:clangd$secondaryArchSuffix = $portVersion
+	cmd:diagtool$secondaryArchSuffix = $portVersion
+	cmd:find_all_symbols$secondaryArchSuffix = $portVersion
+	cmd:git_clang_format$secondaryArchSuffix = $portVersion
+	cmd:hmaptool$secondaryArchSuffix = $portVersion
+	cmd:modularize$secondaryArchSuffix = $portVersion
+	cmd:nvptx_arch$secondaryArchSuffix = $portVersion
+	cmd:pp_trace$secondaryArchSuffix = $portVersion
+	cmd:run_clang_tidy$secondaryArchSuffix = $portVersion
 	devel:libclang$secondaryArchSuffix = $portVersionCompat
 	devel:libclang_cpp$secondaryArchSuffix = $portVersionCompat
 	devel:libclanganalysis$secondaryArchSuffix = $portVersion
@@ -407,50 +400,36 @@ REQUIRES_clang="
 	lib:libz$secondaryArchSuffix
 	"
 CONFLICTS_clang="
-	llvm${secondaryArchSuffix}_clang
-	llvm6${secondaryArchSuffix}_clang
-	llvm7${secondaryArchSuffix}_clang
-	llvm8${secondaryArchSuffix}_clang
 	llvm9${secondaryArchSuffix}_clang
 	llvm12${secondaryArchSuffix}_clang
-	llvm13${secondaryArchSuffix}_clang
-	llvm14${secondaryArchSuffix}_clang
-	llvm15${secondaryArchSuffix}_clang
 	llvm16${secondaryArchSuffix}_clang
 	"
 
 PROVIDES_clang_analysis="
 	llvm17${secondaryArchSuffix}_clang_analysis = $portVersion
-	cmd:analyze_build = $portVersion
-	cmd:intercept_build = $portVersion
-	cmd:scan_build = $portVersion
-	cmd:scan_build_py = $portVersion
-	cmd:scan_view = $portVersion
+	cmd:analyze_build$secondaryArchSuffix = $portVersion
+	cmd:intercept_build$secondaryArchSuffix = $portVersion
+	cmd:scan_build$secondaryArchSuffix = $portVersion
+	cmd:scan_build_py$secondaryArchSuffix = $portVersion
+	cmd:scan_view$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_clang_analysis="
 	llvm17${secondaryArchSuffix}_clang == $portVersion base
 	cmd:python3
 	"
 CONFLICTS_clang_analysis="
-	llvm${secondaryArchSuffix}_clang_analysis
-	llvm6${secondaryArchSuffix}_clang_analysis
-	llvm7${secondaryArchSuffix}_clang_analysis
-	llvm8${secondaryArchSuffix}_clang_analysis
 	llvm9${secondaryArchSuffix}_clang_analysis
 	llvm12${secondaryArchSuffix}_clang_analysis
-	llvm13${secondaryArchSuffix}_clang_analysis
-	llvm14${secondaryArchSuffix}_clang_analysis
-	llvm15${secondaryArchSuffix}_clang_analysis
 	llvm16${secondaryArchSuffix}_clang_analysis
 	"
 
 PROVIDES_lld="
 	llvm17${secondaryArchSuffix}_lld = $portVersion
-	cmd:ld.lld = $portVersion
-	cmd:ld64.lld = $portVersion
-	cmd:lld = $portVersion
-	cmd:lld_link = $portVersion
-	cmd:wasm_ld = $portVersion
+	cmd:ld.lld$secondaryArchSuffix = $portVersion
+	cmd:ld64.lld$secondaryArchSuffix = $portVersion
+	cmd:lld$secondaryArchSuffix = $portVersion
+	cmd:lld_link$secondaryArchSuffix = $portVersion
+	cmd:wasm_ld$secondaryArchSuffix = $portVersion
 	devel:liblldCOFF$secondaryArchSuffix = $portVersion
 	devel:liblldCommon$secondaryArchSuffix = $portVersion
 	devel:liblldELF$secondaryArchSuffix = $portVersion
@@ -599,11 +578,6 @@ INSTALL()
 	$python setup.py install --root=/ --prefix="$prefix" -O1
 	popd
 
-	if [ -n "$secondaryArchSuffix" ]; then
-		mv $binDir/* $prefix/bin/
-		binDir=$prefix/bin
-	fi
-
 	# You can try and be fancy here parsing each arch in a for loop... but
 	# not all arches contain the same libraries. The inventory for each arch
 	# also changes between releases... so lets KISS.
@@ -773,7 +747,7 @@ INSTALL()
 
 	# python310 package
 	packageEntries python310 \
-		$binDir/lit \
+		$prefix/bin/lit \
 		$prefix/lib/python*
 
 	# libunwind package