diff --git a/dev-util/annobin/Manifest b/dev-util/annobin/Manifest
index 65bf6bb5a2..a38c6d64be 100644
--- a/dev-util/annobin/Manifest
+++ b/dev-util/annobin/Manifest
@@ -1 +1 @@
-DIST annobin-10.58.tar.xz 846744 BLAKE2B 86a7beb46d7fce153f44d2a42e538ff99d40de239655f001580e34c8e0f40fe4309b908681047d012dc315977a93889f9e4e05f00a97145c5c04663d5f239fb8 SHA512 7d40fe9ddbee788db3331ec138aa588936d726ec50e0286b23be3792f20c2fc111c635b70598e0d8b6ba24a92de514fc637d5cea6b9d7781de781fbf244dfbd8
+DIST annobin-10.60.tar.xz 848432 BLAKE2B df7dafd25af009bf0cbe779088892bd11120cf99f587293f7730083007586d84c452737d4e3b32e2b73586ab51958ba8f16d358cef9041ccb493198e72bc1b37 SHA512 7d5158da6a59000d686fb837b0ac1a86351898c00a93e29c2cb599ec6eccb325b66fbd775855bd3661d2d9541e3d2cb2493b087b6670fca137f9992f33c68082
diff --git a/dev-util/annobin/annobin-10.58.ebuild b/dev-util/annobin/annobin-10.60.ebuild
similarity index 78%
rename from dev-util/annobin/annobin-10.58.ebuild
rename to dev-util/annobin/annobin-10.60.ebuild
index 0b10a8cacc..2a3dfe7f1a 100644
--- a/dev-util/annobin/annobin-10.58.ebuild
+++ b/dev-util/annobin/annobin-10.60.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+LLVM_MAX_SLOT=14
+
 inherit autotools llvm toolchain-funcs
 
 DESCRIPTION="Binary annotation compiler plugin and tools"
@@ -19,23 +21,26 @@ RDEPEND="
 	dev-libs/elfutils
 	sys-libs/binutils-libs
 
-	clang? ( <sys-devel/clang-13:= )
-	!clang? ( llvm? ( <sys-devel/llvm-13:= ) )
+	clang? ( <sys-devel/clang-${LLVM_MAX_SLOT}:= )
+	!clang? ( llvm? ( <sys-devel/llvm-${LLVM_MAX_SLOT}:= ) )
 	llvm? (
 		|| (
 			sys-devel/llvm:11
 			sys-devel/llvm:12
 			sys-devel/llvm:13
+			sys-devel/llvm:${LLVM_MAX_SLOT}
 		)
 	)
 "
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-fix-bashism.patch"
-	"${FILESDIR}/${P}-demangle.h-path.patch"
+	"${FILESDIR}/${PN}-10.58-fix-bashism.patch"
+	"${FILESDIR}/${PN}-10.58-demangle.h-path.patch"
 )
-REQUIRED_USE="clang? ( llvm )"
+REQUIRED_USE="
+	clang? ( llvm )
+"
 RESTRICT="!test? ( test )"
 
 pkg_pretend() {
@@ -52,17 +57,16 @@ src_prepare() {
 	sed -i 's|2.69|2.71|g' config/override.m4 || die
 
 	if use llvm; then
-		local llvmdir="$(get_llvm_prefix -d)"
+		local llvmdir="$(get_llvm_prefix -d)" || die
 		local llvm_plugindir
 		llvm_plugindir="$(
 			clang --print-search-dirs | gawk -e\
 			'BEGIN { FS = ":" } /libraries/ { print gensub(" =","",1,$2) } END { }'
-		)"
+		)" || die
 		einfo $llvm_plugindir
 
 		sed -i "/^INCDIR.*/ s|$| -I${llvmdir}/include|" {llvm,clang}-plugin/Makefile.in || die
 		sed -i "/^CLANG_LIBS.*/ s|$| -L${llvmdir}/$(get_libdir)|" clang-plugin/Makefile.in || die
-		sed -i 's/print-seach-dirs/print-search-dirs/g' {llvm,clang}-plugin/Makefile.in || die
 		sed -i "s|^PLUGIN_INSTALL_DIR =.*|PLUGIN_INSTALL_DIR = \$\{DESTDIR\}/$(realpath ${llvm_plugindir})|" {llvm,clang}-plugin/Makefile.in || die
 	fi
 
@@ -70,14 +74,16 @@ src_prepare() {
 }
 
 src_configure() {
+	local plugdir="$($(tc-getCC) -print-file-name=plugin)" || die
 	local myconf=(
+		--with-gcc-plugin-dir="${plugdir}"
 		--with-libelf
-		--with-gcc-plugin-dir=$($(tc-getCC) -print-file-name=plugin)
 		--without-debuginfod # we don't have it enabled, comes with elfutils
 		$(use_with clang)
+		$(use_with doc docs)
 		$(use_with llvm)
 		$(use_with test tests)
-		$(use_with doc docs)
 	)
+
 	econf "${myconf[@]}"
 }