diff --git a/dev-util/annobin/Manifest b/dev-util/annobin/Manifest
index 2704283dd1..7649141a1a 100644
--- a/dev-util/annobin/Manifest
+++ b/dev-util/annobin/Manifest
@@ -1,2 +1 @@
-DIST annobin-10.60.tar.xz 848432 BLAKE2B df7dafd25af009bf0cbe779088892bd11120cf99f587293f7730083007586d84c452737d4e3b32e2b73586ab51958ba8f16d358cef9041ccb493198e72bc1b37 SHA512 7d5158da6a59000d686fb837b0ac1a86351898c00a93e29c2cb599ec6eccb325b66fbd775855bd3661d2d9541e3d2cb2493b087b6670fca137f9992f33c68082
-DIST annobin-10.62.tar.xz 849684 BLAKE2B 363cc54f56199e210edb82549b7743f9d70e62f481faab7363f715ce3ab2f127e9025f04cf92ccbd0402804df4fe8ff1c92259639b32b6c76f47eb82de0c022b SHA512 60f65d80158dc074f9293ae4d35e312a8b2129b20e10eb3268d335be215e8eee9f6bb0efc341bcaae7169a32a5fbdbf8d81fd372e6b3c793d7380682e1baf595
+DIST annobin-10.65.tar.xz 849952 BLAKE2B 6f6124f6470d3f6fe37ce766dc65af43b3020d0ea745cbaf501c3757a83c500f590276cde98048bd5c47602b8ca954d43039060779cec3d8d2abdd5f1695fac8 SHA512 c7191fc88072431f3c62ae2abe405b88c78b3d703353810aef6bb6bf0c3fa16ad2db84d5e5e940864518474119393454aadc40fdca84bdbba18d686face59ce1
diff --git a/dev-util/annobin/annobin-10.62.ebuild b/dev-util/annobin/annobin-10.62.ebuild
deleted file mode 100644
index 2a3dfe7f1a..0000000000
--- a/dev-util/annobin/annobin-10.62.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 2018-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT=14
-
-inherit autotools llvm toolchain-funcs
-
-DESCRIPTION="Binary annotation compiler plugin and tools"
-HOMEPAGE="https://nickc.fedorapeople.org"
-SRC_URI="https://nickc.fedorapeople.org/${P}.tar.xz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="clang doc llvm test"
-
-RDEPEND="
-	app-arch/rpm
-	dev-libs/elfutils
-	sys-libs/binutils-libs
-
-	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}/${PN}-10.58-fix-bashism.patch"
-	"${FILESDIR}/${PN}-10.58-demangle.h-path.patch"
-)
-REQUIRED_USE="
-	clang? ( llvm )
-"
-RESTRICT="!test? ( test )"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! tc-is-gcc ; then
-			eerror "${PN} is a gcc plugin. Please emerge using gcc as CC"
-			die "use gcc"
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i 's|2.69|2.71|g' config/override.m4 || die
-
-	if use llvm; then
-		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|^PLUGIN_INSTALL_DIR =.*|PLUGIN_INSTALL_DIR = \$\{DESTDIR\}/$(realpath ${llvm_plugindir})|" {llvm,clang}-plugin/Makefile.in || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local plugdir="$($(tc-getCC) -print-file-name=plugin)" || die
-	local myconf=(
-		--with-gcc-plugin-dir="${plugdir}"
-		--with-libelf
-		--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)
-	)
-
-	econf "${myconf[@]}"
-}
diff --git a/dev-util/annobin/annobin-10.60.ebuild b/dev-util/annobin/annobin-10.65.ebuild
similarity index 97%
rename from dev-util/annobin/annobin-10.60.ebuild
rename to dev-util/annobin/annobin-10.65.ebuild
index 2a3dfe7f1a..11bea8f4e7 100644
--- a/dev-util/annobin/annobin-10.60.ebuild
+++ b/dev-util/annobin/annobin-10.65.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-10.58-fix-bashism.patch"
+	"${FILESDIR}/${P}-fix-bashism.patch"
 	"${FILESDIR}/${PN}-10.58-demangle.h-path.patch"
 )
 REQUIRED_USE="
diff --git a/dev-util/annobin/files/annobin-10.58-fix-bashism.patch b/dev-util/annobin/files/annobin-10.65-fix-bashism.patch
similarity index 87%
rename from dev-util/annobin/files/annobin-10.58-fix-bashism.patch
rename to dev-util/annobin/files/annobin-10.65-fix-bashism.patch
index dd04172461..eab710f7b5 100644
--- a/dev-util/annobin/files/annobin-10.58-fix-bashism.patch
+++ b/dev-util/annobin/files/annobin-10.65-fix-bashism.patch
@@ -21,8 +21,8 @@
  
  AC_CONFIG_FILES(Makefile)
  
--if test "$with_annocheck" != no -o test "$with_gcc_plugin" != no; then
-+if test "$with_annocheck" != no || test "$with_gcc_plugin" != no; then
+-if test "$with_annocheck" != no -o "$with_gcc_plugin" != no; then
++if test "$with_annocheck" != no || "$with_gcc_plugin" != no; then
    AC_CONFIG_HEADERS(gcc-plugin/config.h)
  fi
  if test "$with_docs" != no; then