gentoo auto-resync : 14:09:2022 - 11:10:10

author: V3n3RiX <venerix@koprulu.sector> 2022-09-14 11:10:11 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-09-14 11:10:11 +0100
commit: 81b8f20732954c4508baf2f77472b5435e3f851f (patch)
tree: 4180177cb7ba85eab50159ce96218c2419fb24a6 /dev-util
parent: 946859e0e36904cffb3e0ccbccb6b7b1347c1cc8 (diff)
50 files changed, 1150 insertions, 492 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 3c8c2b7077dc..dee9f10900e1 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index ff0c63838b04..0b4c12106416 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,11 +1,10 @@
 DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
 DIST patch-5.18.11.xz 595980 BLAKE2B 74b305bd21c71c9328f02183c3b098ee1e476c1d58e79120b5d9e9ab53da5c32ffe4bba6f4e4c0d75188f187b81fc898fe9fd29762695254e23702caa824f0aa SHA512 5a4972b96438b38aa2bd6b1893557aab528bc465464613ba2c1ef069e501761d995efb26b9a910f638383a821d249d1f6c748e1da993b428c0c4bcbb24621415
-DIST patch-5.19.1.xz 7644 BLAKE2B e0e31aa647bd6e5bbd62e7469f62718362c1d7434dd658de30e79a14dc009b64e748b81939ab9999ae6369149cb13e1e75dff3da0c8800a9780260e6d1df7b22 SHA512 a61c71c6fb935b4b256ff3cbdfdaba502af98f2b4b905dfc8f669aae502049bb4b44eb08e362cd6108e17190343e4cc6f39474b1a62287756401b359205708db
 DIST patch-5.19.2.xz 475316 BLAKE2B e1a3238a1cfb33178d1d9608821ad1f275165b0df0f4883dfd136ebe2ff31839d4cb82af60a874673b256653a0eca625dcb9016179ae9d1522099465b2014642 SHA512 53aecf0c08ce7bbd10e8f7a75397155054badeedbd20a2ef228c6726436e701095a79ae5322c8052550cbd79b8dc02b7caa30c8916cae5733a2bc04ed3157299
+DIST patch-5.19.8.xz 695676 BLAKE2B 3b661fec35c883a97f2f2b489e43cb276eb7cfe6818d37cc3482c880d8c52d3f4ce740b9791d30095d21146ae842988f684c2f7bd153359ba8d2adaaef71221c SHA512 16ee25c1a215a9a14e6bcc4ce6b1a7a83cb99c2ea7754974e247e7a84b21cab8d9f56f174fb49fc682f6a79507c0d7dc3c1162226680364eaa2e632bfb52b161
 DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e SHA512 af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b
 EBUILD bpftool-5.18.11.ebuild 2837 BLAKE2B e59a2fa0d3e1836487fea2074b65a80e844ba74ec57e9f435f7d801c31e275455a4e03f0163638381a79f431af47dc43b240770fc8733ed68f70f09d4dc4636d SHA512 9088ae2324c68990f0654e8c938379be87da3b3df2750c4db001e7a6d5c8dbf999a16115d27b0ece324d552f144f6bcd72a8ea074bf3cfbfe5404337c326ef3f
-EBUILD bpftool-5.19.1.ebuild 2838 BLAKE2B db68f909f5b00257ff8c7516f170eb751abede56e45b908982048be66d488b04839ca9fd5ee1edf961730fa749b01628c1fd6b0ceb3b6410db51dd9151d935f3 SHA512 bf28c750ec794ee6e980cf464e5b23705198bcb35403d183625ea650760a5f9b61da2f0d528f0061f6912d82fe37bb8a7cd2afe73501e5cffa525d33ff66506c
 EBUILD bpftool-5.19.2-r1.ebuild 3169 BLAKE2B 60e127ab6fa63d90ed42b237a192eda67866b38afd83f8f22982966367dd95bb780f12e93ee650441d6d0cbc74db1aeaf2c514d84041a0eb8383507f6d1d259d SHA512 c403228451442e14588da6dc73f94fe72afe16ca0dc1bb640bc1e4e46e2fc299025102b3fcbb51e813b96a5a92ff20dc5b6f6450366d77f32f55dbf89e904eb9
-EBUILD bpftool-5.19.2.ebuild 2838 BLAKE2B db68f909f5b00257ff8c7516f170eb751abede56e45b908982048be66d488b04839ca9fd5ee1edf961730fa749b01628c1fd6b0ceb3b6410db51dd9151d935f3 SHA512 bf28c750ec794ee6e980cf464e5b23705198bcb35403d183625ea650760a5f9b61da2f0d528f0061f6912d82fe37bb8a7cd2afe73501e5cffa525d33ff66506c
+EBUILD bpftool-5.19.8.ebuild 3169 BLAKE2B 60e127ab6fa63d90ed42b237a192eda67866b38afd83f8f22982966367dd95bb780f12e93ee650441d6d0cbc74db1aeaf2c514d84041a0eb8383507f6d1d259d SHA512 c403228451442e14588da6dc73f94fe72afe16ca0dc1bb640bc1e4e46e2fc299025102b3fcbb51e813b96a5a92ff20dc5b6f6450366d77f32f55dbf89e904eb9
 MISC metadata.xml 356 BLAKE2B 4cc2dafd4a125f2144fc8537377c1857c4cf3ace56242965c41f29b5601b346b211ae8a05459b555569b4a11d2eed39345f02c3fe27ba8a8f93117969ee8b8cc SHA512 c2c0f149fbec22400163df406cdc10df537bef638251eeabc332709992e7470c323b366cfc465d6ecf14f2d84065660cccefef7a5ca45980d679b645ebf664be
diff --git a/dev-util/bpftool/bpftool-5.19.2.ebuild b/dev-util/bpftool/bpftool-5.19.2.ebuild
deleted file mode 100644
index 6833c60b6e2a..000000000000
--- a/dev-util/bpftool/bpftool-5.19.2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit estack linux-info optfeature python-any-r1 toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and maps"
-HOMEPAGE="https://kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="caps"
-
-RDEPEND="
-	sys-libs/binutils-libs:=
-	sys-libs/zlib:=
-	virtual/libelf:=
-	caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-	${LINUX_PATCH+dev-util/patchutils}
-	${PYTHON_DEPS}
-	dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-	local paths=(
-		tools/bpf kernel/bpf
-		tools/{arch,build,include,lib,perf,scripts} {scripts,include,lib} "arch/*/lib"
-	)
-
-	# We expect the tar implementation to support the -j option (both
-	# GNU tar and libarchive's tar support that).
-	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-		"${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		eshopts_push -o noglob
-		ebegin "Filtering partial source patch"
-		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
-			> ${P}.patch
-		eend $? || die "filterdiff failed"
-		eshopts_pop
-	fi
-
-	local a
-	for a in ${A}; do
-		[[ ${a} == ${LINUX_SOURCES} ]] && continue
-		[[ ${a} == ${LINUX_PATCH} ]] && continue
-		unpack ${a}
-	done
-}
-
-src_prepare() {
-	default
-
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		pushd "${S_K}" >/dev/null || die
-		eapply "${WORKDIR}"/${P}.patch
-		popd || die
-	fi
-
-	# dev-python/docutils installs rst2man.py, not rst2man
-	sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
-}
-
-bpftool_make() {
-	local arch=$(tc-arch-kernel)
-	tc-export AR CC LD
-
-	emake V=1 VF=1 \
-		HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
-		EXTRA_CFLAGS="${CFLAGS}" ARCH="${arch}" BPFTOOL_VERSION="${MY_PV}" \
-		prefix="${EPREFIX}"/usr \
-		feature-libcap="$(usex caps 1 0)" \
-		"$@"
-}
-
-src_compile() {
-	bpftool_make
-	bpftool_make -C Documentation
-}
-
-src_install() {
-	bpftool_make DESTDIR="${D}" install
-	bpftool_make mandir="${ED}"/usr/share/man -C Documentation install
-}
-
-pkg_postinst() {
-	optfeature "clang-bpf-co-re support" sys-devel/clang[llvm_targets_BPF]
-}
diff --git a/dev-util/bpftool/bpftool-5.19.1.ebuild b/dev-util/bpftool/bpftool-5.19.8.ebuild
index 6833c60b6e2a..3b2b5a406a29 100644
--- a/dev-util/bpftool/bpftool-5.19.1.ebuild
+++ b/dev-util/bpftool/bpftool-5.19.8.ebuild
@@ -20,6 +20,8 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
 LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
 SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-util/perf/perf-5.19-binutils-2.39-patches.tar.xz"
+
 S_K="${WORKDIR}/linux-${LINUX_VER}"
 S="${S_K}/tools/bpf/bpftool"
 
@@ -86,6 +88,12 @@ src_prepare() {
 		popd || die
 	fi
 
+	pushd "${S_K}" >/dev/null || die
+	# Used `git format-patch 00b32625982e0c796f0abb8effcac9c05ef55bd3...600b7b26c07a070d0153daa76b3806c1e52c9e00`
+	# bug #868123
+	eapply "${WORKDIR}"/perf-5.19-binutils-2.39-patches
+	popd || die
+
 	# dev-python/docutils installs rst2man.py, not rst2man
 	sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
 }
diff --git a/dev-util/clair/Manifest b/dev-util/clair/Manifest
index 9e6642caad56..1d5a7ed859bb 100644
--- a/dev-util/clair/Manifest
+++ b/dev-util/clair/Manifest
@@ -1,50 +1,6 @@
 AUX clair.confd 75 BLAKE2B 8700f0e19734c3a6c0f0596e5fcbee5aafaf2bf19dd66fff0a94a29c9f886d6dba1803ba8e3a9e7f9286eaef512c34524a281c952943d455e35446b9a0511187 SHA512 9ff72a41da4600f7c266a7c763520c947e41c1c06dc93f9c8fcdc3f92d5b10ac4a2483122fedc4cf3bfc5de0a48f61366b0d2b72bcc348b736fa958b7065cc87
 AUX clair.initd 593 BLAKE2B ec5f50ef2fe997cd0f5e3aa7837be9bb7e39f4a5b766011034bde27c38d7eb32fc61853c8cc82d738724b4c6c5e01306c6e20c9968be0e4bbe8a5f4e7a79b7eb SHA512 827bf28ba4ad7a40f4eb916f315978da6d3fab52a8ac9b3316383d67ed90006f0b13e7cec3a8843d73e5d23ef27bcd53a9a02ec70c1795725cb98e5d1de788bb
-DIST clair-2.1.3.tar.gz 3568075 BLAKE2B e16c8d466dda1a7bf93f08a055315e2896949fc075d97b3eac8be9f7bfa4d8cc43c79acec2480445700f4a56e6b4702de3bf087f9a4892e34ccb163bbd7afafe SHA512 7ac879ccd7530f14b43c2fddae3d456cfad99a5bb26b79563b7b45a0525dadd999207e222fc0fa49a9502a62accb051a66a7da891b2b6ea7fbcdd966519c862f
-DIST clair-2.1.4.tar.gz 3568060 BLAKE2B 655f162a6cdefc8a07ec665c1eb625eb44cbe9f18c548caaeef264489ba3627331fe2421685e8cb2141250dba497c982eccdbe94580b8a4a4ea38e00ec7445ab SHA512 67fedb487c297d95c9ab7f8e5ac9a08df85d16a218a718be56ed1af4d7ecee65550e448b9468c3c5bf387a8e37716dda22ac482ee2c2b4d41cbaac3672028570
-DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20160804104726-4c0e84591b9a.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
-DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20160804104726-4c0e84591b9a.zip 14808 BLAKE2B 823400c1c34bbc0dbb3f51c5836e748aa8277017d1fbd51b7e6c3922e23229dbfaf103745408fca0c96b84c20eb8eb45636cfdbee633a7552e8030e3c28a6456 SHA512 1130292c0454f84e1f6ab78baee4ccbae0b40a8d625c7a214bd7d1db88f4fea738ccd25fad7e2e15986b09ef963912c3fd35c7a36bb5fc879217198560258ecf
-DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
-DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.zip 56040 BLAKE2B 371b6a37ef8bc88baf94d2a0b95d59454b399c862107cb8b1b30af5cdccc9fff1ee5e400e19d362d0c89203f2c8044316bf853322e05312b5c7a2ce961cd90bf SHA512 2c709a194dcab81cae05040cdef59a21e9f02014cea998dd5957180ff3a28f79607d15c61ce03b54be4a8163c4d5e60f86a5d07012df0f206af735a8d317a6a7
-DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.0.1-0.20160907170601-6d212800a42e.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
-DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.0.1-0.20160907170601-6d212800a42e.zip 61399 BLAKE2B 45b70b85d333abfe8f6e61e7b0ef5658aaef17a12702a14a893606a496d076978a2a51fea3465f50149d0eeb45c981c6704b8152ad0e533a902aed90983b6aa4 SHA512 5f6b58b4f5b36787ff5f8b878510240700dbc59d172ebf8d831eca0711f685a4fdab65ccd634943b6dfff2abecc0132314eb0e6c244dc38cb6d38f668f808699
-DIST github.com%2Ffernet%2Ffernet-go%2F@v%2Fv0.0.0-20151007213151-1b2437bc582b.mod 35 BLAKE2B d74f0deb84e43864fb4a447289a83fbe23aaa185ee273a460d8726ebc29026e9899ec5cf35d3356b7c8bfc2908b97687cb5f8aa4ec9af973477f3d3d9a0581bd SHA512 18bdd654afae1e515f559edcf9c3782bf67ea3600781aef4f96de613cc765db6c54556fe97013b3107a121415e3afe98c9a3fc1abccddc3b49611985a09df018
-DIST github.com%2Ffernet%2Ffernet-go%2F@v%2Fv0.0.0-20151007213151-1b2437bc582b.zip 10419 BLAKE2B 81be3d4d2b89f1321e7b70b196a9b48a4e75c4d03ba6c434df6cbd0671ab03c8e785cde9077a6f068ec8794fccffd46a69d62e66cdca5aa31b78fb754e707891 SHA512 5e1fd4d8c4fc79d7f05b8299c64de2b0c7230158587cda117b4873d4ea974aabdf5193cbebcc6a2f3c8812d75b7310aef95b7f38d893214942d646e72e18e7f8
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20170427213220-18c9bb326172.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20170427213220-18c9bb326172.zip 363026 BLAKE2B cc770d52e001becac760fefa208d14499954cc716a052b13457945f1dc36308a81493d09dfe37a58bf783453a65a3c1730251a5ffa92669d399e7fdfd45789b5 SHA512 e7685ebdbc52db377de6785015d3ea73cc6a034a68125ec86ceb920aaeb773394301df067731a707d8b009ddf1b23bbbde246cf46db58c1ac9fc22345c1b02ac
-DIST github.com%2Fguregu%2Fnull%2F@v%2Fv3.0.2-0.20160228005316-41961cea0328+incompatible.mod 30 BLAKE2B ee12f7484a1fc2340c10a9104ede77833851c600736e852feb714d86eac372e67b99f64e90ec1c52f8cde63e8f78b1415d5e209ebafa675833af65b590c42f5f SHA512 0af156b75f1d1867a7a47f1f0031a1d44919418c0247cd2710dabceaa515257f9b215d001515f9731fac7dbadfcd4af5c4bb2730ef7bc7e80fd7956ee5c95ef7
-DIST github.com%2Fguregu%2Fnull%2F@v%2Fv3.0.2-0.20160228005316-41961cea0328+incompatible.zip 29333 BLAKE2B fb769a765d1a212545f745b4459729898ac2f4b961b0c1d1f98c5ae3c3d541faee1660269df322d4c062f6a6322b360d8a5232112f76164c0abfa25908451eb0 SHA512 c23fb592711c885ff58e0086fa434f6a266bfa894f6f109fc026852cc35a1807a7daf2e6e4317f11a72895503844b2bde83c616ad0f606e2e223c30f263d51af
-DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.0.0-20160813221303-0a025b7e63ad.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
-DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.0.0-20160813221303-0a025b7e63ad.zip 18479 BLAKE2B 14c722deea83ec8ea2450754f861886cbb3dcbcbdc779bb9571eb8f8a134d4bcbabd50b3d9dad2f8306c6775448f2dec4ff52076fecb78c9f41d558eac19224d SHA512 7f76ff75196ef24f86e12b82fcf5a4cc70b3617c4c794c421ecec7f37074c9dcaf05f95c3875b627160678b1d268885e41b5f34459f0ab83605475b2d0a3e039
-DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.1.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
-DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.1.0.zip 23986 BLAKE2B d13e45c6afeb3c710c9a881d55fcd9b51b9f9b832cf1759fe3a246529db799223ed292c678c788610d543f1f4891236940eb9c5e95907c74f4d5f3ad861cf9b9 SHA512 73bfac64e0256243a619c7d893059c51dfe8edb2738011efc48199eb1b695b2293af34c38b0eaaa1860d2e7b96ae91dae7cceac82c867319e75c77824e848e3f
-DIST github.com%2Flib%2Fpq%2F@v%2Fv0.0.0-20170324204654-2704adc878c2.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
-DIST github.com%2Flib%2Fpq%2F@v%2Fv0.0.0-20170324204654-2704adc878c2.zip 102799 BLAKE2B 44c5b735d26e5182cb88cf39546548f78d1a44fa59dcebf3fac34c5d1894a41ede581be147d32e7b58e60774294abe5fe80c7fe41bd8b3ca18aefab14ef62df8 SHA512 9d0fd2ffdb4290d1992ec4761a9617a6535ab5f0a3c24cef6f0763e270b9001cba675f8d779ba94efd0450e1fa688755e862c3d56e7f0e5537b0ec3fa9e12fb1
-DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba
-DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip 44378 BLAKE2B 15ccda2b94bb024656859fb8a6968782b9a1bffb786b0b1ed69a3284b01f4a2100b3f3c46b6ebcb8f7febedb5bd4f6762fe333b7d4f1d14c700f8fce60843352 SHA512 e9349ee2a7d5e5b129ec6a1c0507854aebca82cf9ac2d0a681cac2f4630ea35551ede48e1931494362232a83dc9f26b6b4162c6114e0176084c50101b1da46b0
-DIST github.com%2Fpborman%2Fuuid%2F@v%2Fv0.0.0-20160209185913-a97ce2ca70fa.mod 31 BLAKE2B 0a64e2a7ce87c9805064a3f5f88293c35baa03f682945fe626a9b2fcae2905152f80766d7686e7cec0e2186fe57f850875e1f893b58df1cd440faffd9c0b1b7e SHA512 25d317e15b065eb389c517d977a770fc0c8965f24992ab4e1b665679e8de30625cc53b382863c93f9448cb365c64e2a9adea4202c3b6c224e840e78d1403dbeb
-DIST github.com%2Fpborman%2Fuuid%2F@v%2Fv0.0.0-20160209185913-a97ce2ca70fa.zip 19416 BLAKE2B c7b261d7cb44988b10c00cf5eed78cbd1c6625fa6e5e85db341cd786ac9a072f7b90c861a1ab7df0fd16f66eb5c78d17b697f78723119419503c8625e768a6c8 SHA512 5ec9f32af5a5b14497acfd07e8c329bbba62824f42adcdb3e60d64e4fb4fc681a1b9aede2751cfdcf69b8d0bf07421570216b1b0a207950d33d49a2afcf4a58c
-DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
-DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.zip 12485 BLAKE2B ddc03a0a1699d5ba59735b3a045a31df7f6350df9b8d9bc964f3c04470790f61504b2d82828260f81483d84695ffe1fa79a4f2e149ce8228f37635d2b2847e9e SHA512 b82a2c8a49b809b6cac1d5c0d8f8c6f7cf4ae45f95db52e5a27c2f9c08844951aa95150a4a65fd4e68b854f15665037ee9e7a05eb7249a2a2afb90391cde164c
-DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.8.0.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
-DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.8.0.zip 111363 BLAKE2B 07c1938d531b8176c55e2afbe0ce9cc7bc9cd86ec9699a7f9898b9b19f31cef22c2b98f47200d1b12aa7c0ed747051d84a2ee69aeeec91f889f8594871136f75 SHA512 18c5d4d5a563716e58ac31003bb9a25c6b32f9ae74bbb21c11c63f620539619cd9f79c7dfa7a59ba9567e551e34f4132084cccf63be1e11a540fbeb4b919598c
-DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20170216185247-6f3806018612.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
-DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20170216185247-6f3806018612.zip 65956 BLAKE2B 6d8aa01b2ece4e8779ec7ba58dadd27a5b1ae072397188eba425e7f7e189c62fb7192f12cf0174f76e6aeb7d43a0f32b4419b283664d9e1b25c04794ebb2edba SHA512 e6ff1af5896e5bb9e3753288ec3d1bb74ee2a32b8f9614d754d7c6d94b3ac6048d78da1751dbac8a67c36e1e9d6d226a1ee962765bae30947ffd8a9c414edf22
-DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20170427095455-13ba4ddd0caa.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
-DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20170427095455-13ba4ddd0caa.zip 102871 BLAKE2B efd53444c06eb1809f7501afa013ae0f049a2e21323b8c4e1f6679afde87f0f4b86a60f28b5eb1312f3ffc2c29a3e0ee5a85f5d6f8504f38866554ad3dbc0d18 SHA512 5d3bcecc9a87ab1157145b9e9c9b238218e75af11a6c275e32a2703de80e39f604383f34927da8725c03ade216491bf4317c67d6d1fb6818ce8420528c91a596
-DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20170502131342-d098ca18df8b.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
-DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20170502131342-d098ca18df8b.zip 55782 BLAKE2B 5e6871d57d159926f2846122b4dba796cc87836a7d76e47203ad0d359a183d6eeb5fb6398133ce62d852a39cc0b4d73e2ac9e9daa120595549df6a041f785e73 SHA512 1845dbf620da2846da20811839f7fd9e9c580c11844a212f93358f1b13ec10d241979cdcfdbebfe405cd1b9083e167a7af1f4654f92dd679da8bfc1d95439004
-DIST github.com%2Fremind101%2Fmigrate%2F@v%2Fv0.0.0-20160423010909-d22d647232c2.mod 36 BLAKE2B 471f442a2afdefc5a0c8eb759d2db0814584491cba66b373556ce50fefe575873937083dda062a137bd64806381d782962ccfe71d4815f81cdfc3751cef4b3bf SHA512 30624af327980597d9d84b98ed1f078018949f21564dfa1f88ba6b2e73126e8bd2af685789a8ac81c5e74d59911bf87eaf88a6ff33421c21640aa44779c2c798
-DIST github.com%2Fremind101%2Fmigrate%2F@v%2Fv0.0.0-20160423010909-d22d647232c2.zip 8276 BLAKE2B f2ccccb8091132fee9620dffa88332c939c582e74812bebddb4c9d5ad61fc0b7a1fa3dc3ad6778fe1fceb51b79359ab277adc793367926cf28f0c8778e423c27 SHA512 8790d264499c907c402d879ff3723777baa381261dd6ea3c4e00b6185c4ec1df316aec13dd61b08dad798acb68daf9d718347d0654c4836d9f55231ef8cdb689
-DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv0.11.5.mod 34 BLAKE2B 9ff118e3db6f2a49d8cef81bbb78af4ae29fbcf97955758c08c4a9a610fa66f1f6da80dec5aff3c657bbbdf1fd5330331e58dc46c2b2bb657438ec0879a3c45f SHA512 186b34d707aaf1557ddc8edaf49fbc559024f454bd560ca8451cfa555abc211cccf861aea94018363547e39140d9e507c97f7a3c87bb9f1e5d444bab4c531e36
-DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv0.11.5.zip 39207 BLAKE2B 7fbf8d87085db1eccd52a7394c10e1d9d07029381009423fc175d240e2a853f510ebd13ab095b56fe80683050b93ce1fb68c31ddea91317ea189537bbcc782e0 SHA512 5e9871348bb2729361e3aeecdbf30c505b12205c5c7a887d8e35417f4f0608f6e6ff451ebcd31210be2d77e8d9960cdefd19c176353c5039955ab7f866fe12f8
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.1.4.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.1.4.zip 62178 BLAKE2B 7072b6a9e01c24c5a89533f8e19df4dae83b57fdc0448871e339a078e18f14a194d08fa8777cb2b3d0d8202e1576f1a97dc0cfc14e8705f178170351ffb62c39 SHA512 764e5acbdedc62008b103b1cd689dfb474019c718d7e4408cfccb6d78dcb1abf27d59c56eaf6aa56a07eb1f39661fb36496993105284682ca871051ac4085b98
-DIST github.com%2Ftylerb%2Fgraceful%2F@v%2Fv1.2.15.mod 34 BLAKE2B f5c498f28a30095457f72003c9300ebd0266ef4935b27aea407f606db7124f06145cd5bb7d772fe3da481c50fcd82bfd1f7b9af7edf969e3356a586df4af2b55 SHA512 82dcd9dbf115abaf4f76fcace41bb22ab22686f73b6a13ae57cf5908b2873b360a2f4fb5d2898db017a129902f110ac069fd9aed9a175c1e9d2ef8f53f2a12a5
-DIST github.com%2Ftylerb%2Fgraceful%2F@v%2Fv1.2.15.zip 18999 BLAKE2B 85f7760d9dd80d2302b21dede93031ceddf2f5fa5fe901a94550cc77c14c3f0f943cb8ca1ecfce95ccac92a039f61172b9fb864bc4b041855a7d59467cdf256c SHA512 e48c2afe7a8339f8ef6b77e9fb408354d7bfc53b3969b9e54d13b5efb2ecbd032747f66ebeb77526659522a5c56b04d1f74d1aad82cd893923bcd7c428847c57
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170427041856-9ccfe848b9db.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170407172122-cd8b52f8269e.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170407172122-cd8b52f8269e.zip 68248 BLAKE2B 97d4d17967b276f6e25cf03464627abc28b93b35c82b4140e2d056ed986e9da1c5fc95992ac902188c8d1c769d940044f5a386b2ca19090f7e3a0818f18fc802 SHA512 b3f9fdcd8cb5ebf4afb9e2ef3eca0f16420c31492b877cce4ccd605159379d3c08bf53fb227d40c2fa9caf73ea46ec2d3e3fbacc30dcdb9e310faed732c777d8
-EBUILD clair-2.1.3.ebuild 3698 BLAKE2B 37e428d0e31353d424af486a458dfe63b68dd6f1bb0e11a65a403ee037b6b2467cacab83291af1600f827875118c493969ad574c298df771edb37bd530a293ee SHA512 a7865e087f5cfc49f600ba10206f3dff081b1a8e6833e0d28883153cb12e81e3f23401897f9c7dd5edc1eb441c539af1226a7aff0ea7f767240d50937307ddcf
-EBUILD clair-2.1.4.ebuild 3698 BLAKE2B 37e428d0e31353d424af486a458dfe63b68dd6f1bb0e11a65a403ee037b6b2467cacab83291af1600f827875118c493969ad574c298df771edb37bd530a293ee SHA512 a7865e087f5cfc49f600ba10206f3dff081b1a8e6833e0d28883153cb12e81e3f23401897f9c7dd5edc1eb441c539af1226a7aff0ea7f767240d50937307ddcf
+DIST clair-4.4.4-deps.tar.xz 437105576 BLAKE2B 724f48e93f1be7f0d6294deddfb71566d16e25f17a4e26ee725a9861807c2183d6d0a6a3f6632401916dfad9189e535dc24d88dbf43cc862b658a9df90601aef SHA512 f71c2835064f577bce1ef59d05824b5e57c7923f406c714b17bcb6bdeecc26db19cb4380b1207d392a272b3a82c07104f3ee6f570e28ef48e2c493000ae81d7b
+DIST clair-4.4.4.tar.gz 343872 BLAKE2B dbf56706d652c97f61a3949e843a7a80f1bac03fd9551c88f1a55c3fcd705df49e2de48f00e816276f3b4214da1d53207ad46af657a6b5b246aad8f247774743 SHA512 739d6003fe967ae93bd92f703065bbbb744f1ee1d3612fb6b538469dee0907dbea87620ff4b48b157708ab7832e8c6de53a66feb716c127fbd5aa94458c92087
+EBUILD clair-4.4.4.ebuild 1268 BLAKE2B 9d2ed575a206f0bb13fa6cdd8b918254a3854649f5e469764107fbc8efa8fcf980d40014ab150552abd552bb7945833478f9d4639f4f2e58b04c2f0ec3d639a0 SHA512 1aafc242bed736ce49e7a1bfe63575aac98283579a26f142bd741d7565fc704254d79f6d871376ef597a7292ccb79fa20ec5d4fb800a3f1c1532244a18c7a42c
 MISC metadata.xml 326 BLAKE2B a6547b29194e2114c3eb280b9b563a6dce3c803dd99a60de04a7fc68eae42618154d10239f0ee070846743972a8482d82130f94a99eb46a1520ce9d87e519798 SHA512 32ac6fa845dc10f4da029fa0488407134fa4a13a58e0e128935abf10e7ad69e069523922d7a5df37991da4b282a4e22889efb9087cd1b103a2ec207ebf1f8c96
diff --git a/dev-util/clair/clair-2.1.3.ebuild b/dev-util/clair/clair-2.1.3.ebuild
deleted file mode 100644
index 1c75933038b8..000000000000
--- a/dev-util/clair/clair-2.1.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Vulnerability Static Analysis for Containers"
-HOMEPAGE="https://github.com/quay/clair"
-
-EGO_SUM=(
-	"github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a"
-	"github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod"
-	"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf"
-	"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
-	"github.com/davecgh/go-spew v1.0.1-0.20160907170601-6d212800a42e"
-	"github.com/davecgh/go-spew v1.0.1-0.20160907170601-6d212800a42e/go.mod"
-	"github.com/fernet/fernet-go v0.0.0-20151007213151-1b2437bc582b"
-	"github.com/fernet/fernet-go v0.0.0-20151007213151-1b2437bc582b/go.mod"
-	"github.com/golang/protobuf v0.0.0-20170427213220-18c9bb326172"
-	"github.com/golang/protobuf v0.0.0-20170427213220-18c9bb326172/go.mod"
-	"github.com/guregu/null v3.0.2-0.20160228005316-41961cea0328+incompatible"
-	"github.com/guregu/null v3.0.2-0.20160228005316-41961cea0328+incompatible/go.mod"
-	"github.com/hashicorp/golang-lru v0.0.0-20160813221303-0a025b7e63ad"
-	"github.com/hashicorp/golang-lru v0.0.0-20160813221303-0a025b7e63ad/go.mod"
-	"github.com/julienschmidt/httprouter v1.1.0"
-	"github.com/julienschmidt/httprouter v1.1.0/go.mod"
-	"github.com/lib/pq v0.0.0-20170324204654-2704adc878c2"
-	"github.com/lib/pq v0.0.0-20170324204654-2704adc878c2/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-	"github.com/pborman/uuid v0.0.0-20160209185913-a97ce2ca70fa"
-	"github.com/pborman/uuid v0.0.0-20160209185913-a97ce2ca70fa/go.mod"
-	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0"
-	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
-	"github.com/prometheus/client_golang v0.8.0"
-	"github.com/prometheus/client_golang v0.8.0/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20170216185247-6f3806018612"
-	"github.com/prometheus/client_model v0.0.0-20170216185247-6f3806018612/go.mod"
-	"github.com/prometheus/common v0.0.0-20170427095455-13ba4ddd0caa"
-	"github.com/prometheus/common v0.0.0-20170427095455-13ba4ddd0caa/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20170502131342-d098ca18df8b"
-	"github.com/prometheus/procfs v0.0.0-20170502131342-d098ca18df8b/go.mod"
-	"github.com/remind101/migrate v0.0.0-20160423010909-d22d647232c2"
-	"github.com/remind101/migrate v0.0.0-20160423010909-d22d647232c2/go.mod"
-	"github.com/sirupsen/logrus v0.11.5"
-	"github.com/sirupsen/logrus v0.11.5/go.mod"
-	"github.com/stretchr/testify v1.1.4"
-	"github.com/stretchr/testify v1.1.4/go.mod"
-	"github.com/tylerb/graceful v1.2.15"
-	"github.com/tylerb/graceful v1.2.15/go.mod"
-	"golang.org/x/sys v0.0.0-20170427041856-9ccfe848b9db/go.mod"
-	"gopkg.in/yaml.v2 v2.0.0-20170407172122-cd8b52f8269e"
-	"gopkg.in/yaml.v2 v2.0.0-20170407172122-cd8b52f8269e/go.mod"
-	)
-go-module_set_globals
-SRC_URI="https://github.com/coreos/clair/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-COMMON_DEPEND="acct-group/clair
-	acct-user/clair"
-	DEPEND="${COMMON_DEPEND}"
-RDEPEND="app-arch/rpm
-	app-arch/xz-utils
-	dev-vcs/git
-	${COMMON_DEPEND}
-	!!sci-visualization/xd3d" # File collision (Bug #621044)
-
-src_compile() {
-	go build -o bin/${PN} ./cmd/${PN}  || die
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc {README,ROADMAP,CONTRIBUTING}.md
-	insinto /usr/share/${PN}
-	doins -r contrib
-	insinto /etc/${PN}
-	doins config.example.yaml
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/dev-util/clair/clair-2.1.4.ebuild b/dev-util/clair/clair-2.1.4.ebuild
deleted file mode 100644
index 1c75933038b8..000000000000
--- a/dev-util/clair/clair-2.1.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Vulnerability Static Analysis for Containers"
-HOMEPAGE="https://github.com/quay/clair"
-
-EGO_SUM=(
-	"github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a"
-	"github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod"
-	"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf"
-	"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
-	"github.com/davecgh/go-spew v1.0.1-0.20160907170601-6d212800a42e"
-	"github.com/davecgh/go-spew v1.0.1-0.20160907170601-6d212800a42e/go.mod"
-	"github.com/fernet/fernet-go v0.0.0-20151007213151-1b2437bc582b"
-	"github.com/fernet/fernet-go v0.0.0-20151007213151-1b2437bc582b/go.mod"
-	"github.com/golang/protobuf v0.0.0-20170427213220-18c9bb326172"
-	"github.com/golang/protobuf v0.0.0-20170427213220-18c9bb326172/go.mod"
-	"github.com/guregu/null v3.0.2-0.20160228005316-41961cea0328+incompatible"
-	"github.com/guregu/null v3.0.2-0.20160228005316-41961cea0328+incompatible/go.mod"
-	"github.com/hashicorp/golang-lru v0.0.0-20160813221303-0a025b7e63ad"
-	"github.com/hashicorp/golang-lru v0.0.0-20160813221303-0a025b7e63ad/go.mod"
-	"github.com/julienschmidt/httprouter v1.1.0"
-	"github.com/julienschmidt/httprouter v1.1.0/go.mod"
-	"github.com/lib/pq v0.0.0-20170324204654-2704adc878c2"
-	"github.com/lib/pq v0.0.0-20170324204654-2704adc878c2/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-	"github.com/pborman/uuid v0.0.0-20160209185913-a97ce2ca70fa"
-	"github.com/pborman/uuid v0.0.0-20160209185913-a97ce2ca70fa/go.mod"
-	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0"
-	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
-	"github.com/prometheus/client_golang v0.8.0"
-	"github.com/prometheus/client_golang v0.8.0/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20170216185247-6f3806018612"
-	"github.com/prometheus/client_model v0.0.0-20170216185247-6f3806018612/go.mod"
-	"github.com/prometheus/common v0.0.0-20170427095455-13ba4ddd0caa"
-	"github.com/prometheus/common v0.0.0-20170427095455-13ba4ddd0caa/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20170502131342-d098ca18df8b"
-	"github.com/prometheus/procfs v0.0.0-20170502131342-d098ca18df8b/go.mod"
-	"github.com/remind101/migrate v0.0.0-20160423010909-d22d647232c2"
-	"github.com/remind101/migrate v0.0.0-20160423010909-d22d647232c2/go.mod"
-	"github.com/sirupsen/logrus v0.11.5"
-	"github.com/sirupsen/logrus v0.11.5/go.mod"
-	"github.com/stretchr/testify v1.1.4"
-	"github.com/stretchr/testify v1.1.4/go.mod"
-	"github.com/tylerb/graceful v1.2.15"
-	"github.com/tylerb/graceful v1.2.15/go.mod"
-	"golang.org/x/sys v0.0.0-20170427041856-9ccfe848b9db/go.mod"
-	"gopkg.in/yaml.v2 v2.0.0-20170407172122-cd8b52f8269e"
-	"gopkg.in/yaml.v2 v2.0.0-20170407172122-cd8b52f8269e/go.mod"
-	)
-go-module_set_globals
-SRC_URI="https://github.com/coreos/clair/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-COMMON_DEPEND="acct-group/clair
-	acct-user/clair"
-	DEPEND="${COMMON_DEPEND}"
-RDEPEND="app-arch/rpm
-	app-arch/xz-utils
-	dev-vcs/git
-	${COMMON_DEPEND}
-	!!sci-visualization/xd3d" # File collision (Bug #621044)
-
-src_compile() {
-	go build -o bin/${PN} ./cmd/${PN}  || die
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc {README,ROADMAP,CONTRIBUTING}.md
-	insinto /usr/share/${PN}
-	doins -r contrib
-	insinto /etc/${PN}
-	doins config.example.yaml
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/dev-util/clair/clair-4.4.4.ebuild b/dev-util/clair/clair-4.4.4.ebuild
new file mode 100644
index 000000000000..4f1cf3b18444
--- /dev/null
+++ b/dev-util/clair/clair-4.4.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Vulnerability Static Analysis for Containers"
+HOMEPAGE="https://github.com/quay/clair"
+SRC_URI="https://github.com/coreos/clair/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="acct-group/clair
+	acct-user/clair"
+	DEPEND="${COMMON_DEPEND}"
+RDEPEND="app-arch/rpm
+	app-arch/xz-utils
+	dev-vcs/git
+	${COMMON_DEPEND}
+	!!sci-visualization/xd3d" # File collision (Bug #621044)
+
+src_compile() {
+	go build -o bin/${PN} ./cmd/${PN}  || die
+	go build -o bin/clairctl ./cmd/clairctl  || die
+}
+
+src_install() {
+	dobin bin/*
+	keepdir /etc/clair
+	dodoc -r Documentation/* {CHANGELOG,README,ROADMAP}.md
+	insinto /usr/share/${PN}
+	doins -r contrib config.yaml.sample
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
+
+pkg_postinst() {
+	[[ -f "${ROOT}"/etc/clair/clair.conf ]] && return
+	ewarn "Please create ${ROOT}/etc/clair/config.yaml to use clair."
+	ewarn "An example is in ${ROOT}/usr/share/clair/config.yaml.sample"
+}
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index dc8f89c73dfd..f2d6eeb5ee81 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -15,7 +15,12 @@ DIST cmake-3.24.1-SHA-256.txt 1646 BLAKE2B 0b72b78803e6b6e8055f68895203bcf8e4dfd
 DIST cmake-3.24.1-SHA-256.txt.asc 833 BLAKE2B 2e77922c732e654b40a40043b85ec4794886107cc09765d0a80ea05efad08711046bafd5ae341fb16904129cc7af75e6f4d2d1103e767a9147cca6a6a975b1fd SHA512 b04a73cc483d51d5eafab7153b53e366220db2bad4b1d78fea9aec82e667434b8a27ae522be96b5f6a38e43c84aa3475f86c55c088a6149b03ec98c682b3cc4a
 DIST cmake-3.24.1-docs.tar.xz 491808 BLAKE2B 5bafdcb5b705581fbb63e9733d37ca10b8fa1803ea471afb723e26421989cb3b204952640438db11425e3bb536267bbb3e0bb6e618bee2cd4662517201aa1196 SHA512 8181dd4cbf066d42af620ee265cbd6eac0d2edf744706ec63909ac819458c1dd3f118129f54255e1f27a61af6a0ae4d72a2dc066ca5fd3e747962b9a8b3f9bee
 DIST cmake-3.24.1.tar.gz 10392868 BLAKE2B 628e2610c01af8e03eb7a201ae56a6e909c63314a993d2066f363d6181cfd2d0a0e5c09e9f74ad5ae3d226e15c2b04be250dc9bf1a273158fa3073bcc05c3a8e SHA512 67bfafcf9ceba617d7ebbb0ac88b689a2d90ab51fea4a83bd073ee082fb55de8962ce7fb283f3db5f455d286f2199843ffa595a1de207d4fa3e4472d951eb289
+DIST cmake-3.24.2-SHA-256.txt 1646 BLAKE2B 3c48226c96844c5ddd8567637a61eca697425021735d5dc8613a1fd7a68887f6707b6030c1e4476af5e4bdb4830cc4ff3d8708f4bdf557ba94508086e0447030 SHA512 f7500d8c9a500c9ad2679a68d6343cbbbae1483014ab2cd48a056e1e9591b6edd0d712e9ff5441e19c05284696e6c52ebdc3cf1efc61432f2764da7703816b49
+DIST cmake-3.24.2-SHA-256.txt.asc 833 BLAKE2B fe6a3caa3db7b6be186e49ee5d86706f2cda9a45858bc964be5407f577195d0af74c10e66ea30faa0a35280f1c9f927732f9cc7fcb9dae8e521882955b6ef617 SHA512 a0fa1a002f2f23e8b3b8fb2689905ac618ca423b96f904bee172d6a62e6fb0c0a46394ce57474be9c9810e1d09abf3b192f595cb0e92d5c62d11b60f0c572b82
+DIST cmake-3.24.2-docs.tar.xz 492188 BLAKE2B 64e0d69ce8e739e6622b0cfde8956cb2bf67f9bf412b8d98afa1657bd30d8a2a1cf874e6422c78c222199616aac85d472ef398c83da29d5d64516384e9ed69aa SHA512 d0ef81dfe37ac2a225fe795fd3e6780e3b8fd5caa472a14ff8d036917172efd13126897c7a2a78d8269aa20e4f35c7b9be7bed14ecbfb24df332c332a4ff16c4
+DIST cmake-3.24.2.tar.gz 10396126 BLAKE2B fcfdbbce94ce6cdb3fa478afe591bc63ba25104a32edc3dd9395d7b6bd16e222f41428ef4f9982061d6d1e69b10efbc2a33cc9df4573400612b4b756b80ec348 SHA512 6f0e8e29bf0336f555ba72c4d83f35d820f8a5159cc999d48795dc57a6627b4ee3966dda84ca97d39906e35dd476ea00cf80023672cc0fad862e2996194c0674
 EBUILD cmake-3.23.3.ebuild 7786 BLAKE2B 5157538dc24bf0f62f89c532d5cefa4725687e875780d10da41ac4c0f7c52e5f9008b8428c40da4a01ca1babc61a6fdde8656572dba67acff515e1477a789c7b SHA512 bad1b24104f29b4997800b775989a82bd5d4d7e3f26382a595f16021b98cd096ac345b4cbe5d67b7a243157d3c1dd0301594673192e06ce02579abd16827a3a2
 EBUILD cmake-3.24.1.ebuild 8817 BLAKE2B 06ac24772d2c04132c85a6b6823771eaf1c1b44d6bc77ac891a0b29725d57576e4c23ca54ee7ae54ff6cf20f403909b6f890fe469fca6d5a8a2e350524f8dec6 SHA512 c945fa714a256b0a3e6d8ea713b55ea0f914f37d6776428bb89fd30c0341711130c5bf795f8c8ec3e6c4c9c103be8e93737b86e6528b6d1efe301cb600d40a84
+EBUILD cmake-3.24.2.ebuild 8817 BLAKE2B 06ac24772d2c04132c85a6b6823771eaf1c1b44d6bc77ac891a0b29725d57576e4c23ca54ee7ae54ff6cf20f403909b6f890fe469fca6d5a8a2e350524f8dec6 SHA512 c945fa714a256b0a3e6d8ea713b55ea0f914f37d6776428bb89fd30c0341711130c5bf795f8c8ec3e6c4c9c103be8e93737b86e6528b6d1efe301cb600d40a84
 EBUILD cmake-9999.ebuild 8817 BLAKE2B 06ac24772d2c04132c85a6b6823771eaf1c1b44d6bc77ac891a0b29725d57576e4c23ca54ee7ae54ff6cf20f403909b6f890fe469fca6d5a8a2e350524f8dec6 SHA512 c945fa714a256b0a3e6d8ea713b55ea0f914f37d6776428bb89fd30c0341711130c5bf795f8c8ec3e6c4c9c103be8e93737b86e6528b6d1efe301cb600d40a84
 MISC metadata.xml 456 BLAKE2B 2dc475cae4d2f65744e25381b1e4fe8b6399225380d0f9fa81870813221d180b1c4b538c3f9249f80e921a1db8afab7071db206898fdec294372811dc456d1f5 SHA512 347c1e13f459dfb9bec9d52ce556526eb74e6c432ff28aed28f05dc17bba17934fff1ce2fc27765b390bb55aaa7b02d0800939eb4382eba6c4b85a62ec136f5a
diff --git a/dev-util/cmake/cmake-3.24.2.ebuild b/dev-util/cmake/cmake-3.24.2.ebuild
new file mode 100644
index 000000000000..9491df325a39
--- /dev/null
+++ b/dev-util/cmake/cmake-3.24.2.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${CMAKE_DOCS_PREBUILT:=1}
+
+CMAKE_DOCS_PREBUILT_DEV=sam
+CMAKE_DOCS_VERSION=$(ver_cut 1-3)
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+CMAKE_DOCS_USEFLAG="+doc"
+
+# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
+# ... but seems fine as of 3.22.3?
+# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
+	toolchain-funcs virtualx xdg-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+if [[ ${PV} == 9999 ]] ; then
+	CMAKE_DOCS_PREBUILT=0
+
+	EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git"
+	inherit git-r3
+else
+	SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+	if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
+		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )"
+	fi
+
+	if [[ ${PV} != *_rc* ]] ; then
+		VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
+		inherit verify-sig
+
+		SRC_URI+=" verify-sig? (
+			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt
+			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
+		)"
+
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
+	fi
+fi
+
+[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="CMake"
+SLOT="0"
+IUSE="${CMAKE_DOCS_USEFLAG} emacs ncurses qt5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-arch/libarchive-3.3.3:=
+	app-crypt/rhash
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/jsoncpp-1.9.2-r2:0=
+	>=dev-libs/libuv-1.10.0:=
+	>=net-misc/curl-7.21.5[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( >=app-editors/emacs-23.1:* )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND+="
+	doc? (
+		dev-python/requests
+		dev-python/sphinx
+	)
+	test? ( app-arch/libarchive[zstd] )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# Prefix
+	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
+
+	# Handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
+	# Next patch needs to be reworked
+	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+	# Respect python eclasses
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
+
+	# upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+	# disable running of cmake in bootstrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' \
+			Source/kwsys/CMakeLists.txt || die
+	fi
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
+		|| die "Bootstrap failed"
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	elif ! use verify-sig || [[ ${PV} == *_rc* ]] ; then
+		default
+	else
+		cd "${DISTDIR}" || die
+
+		# See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature
+		verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc}
+		verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz
+
+		cd "${WORKDIR}" || die
+
+		default
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Disable Xcode hooks, bug #652134
+		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
+			Source/CMakeLists.txt || die
+		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
+			-e '/cmGlobalXCodeGenerator.h/d' \
+			Source/cmake.cxx || die
+
+		# Disable isysroot usage with GCC, we've properly instructed
+		# where things are via GCC configuration and ldwrapper
+		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
+			Modules/Platform/Apple-GNU-*.cmake || die
+		# Disable isysroot usage with clang as well
+		sed -i -e '/_SYSROOT_FLAG/d' \
+			Modules/Platform/Apple-Clang.cmake || die
+		# Don't set a POSIX standard, system headers don't like that, #757426
+		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmLoadCommandCommand.cxx \
+			Source/cmStandardLexer.h \
+			Source/cmSystemTools.cxx \
+			Source/cmTimestamp.cxx
+		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmStandardLexer.h
+	fi
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+	if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then
+		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+		cmake_src_bootstrap
+	fi
+}
+
+src_configure() {
+	# Fix linking on Solaris
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+	# ODR warnings, bug #858335
+	# https://gitlab.kitware.com/cmake/cmake/-/issues/20740
+	filter-lto
+
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		-DBUILD_CursesDialog="$(usex ncurses)"
+		-DBUILD_TESTING=$(usex test)
+	)
+	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	# Fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null || die
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CMakeOnly.AllFindModules: pthread issues
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    RunCMake.CompilerLauncher: also requires fortran
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+	#        it can't find a deb package that owns libc
+	#    TestUpload, which requires network access
+	#    RunCMake.CMP0125, known failure reported upstream (bug #829414)
+	local myctestargs=(
+		--output-on-failure
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
+	)
+
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8]
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/vim/syntax/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/vim/indent/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/dev-util/colm/Manifest b/dev-util/colm/Manifest
index 012451bd2883..1a5f775e3bea 100644
--- a/dev-util/colm/Manifest
+++ b/dev-util/colm/Manifest
@@ -4,6 +4,6 @@ AUX colm-0.14.7-solaris.patch 659 BLAKE2B f7e8b4781ffc7a63fa63ee83f69e115ea14609
 DIST colm-0.13.0.7.tar.gz 746841 BLAKE2B 7f816bafc0d1a7ea826b6cc2f5bd5fa2bffcd0eca88d5eaab757201481804dc5fa6c80fa19a550ebd9ee50a00a621690c4eed1788e0d0d3dd600db95ed8240d3 SHA512 d15cc6afeeacc4f34171261e75a7daa285529b98940272566ca6d6661d0778b18930ca72e0bce8d0a56c36c3482adfe4375c32ec66d6e77ee32544bddf35024d
 DIST colm-0.14.7.tar.gz 3110831 BLAKE2B c8be14001e8dc3340f5c55fbf8140b86237ec9462699e417f618cf44c759307eda0ede9f7a9ef897f5b8bc51d1fdf8b7360872a30b4cf07ba8191e405940030c SHA512 a5702cb8202599c75f4f4c1975d02e398f1394826f01b86039bd53a34f3ca250a7250d043a430ce6a383e6ca854fe4c72305891ab98c5f3d0ce54192423b7627
 EBUILD colm-0.13.0.7.ebuild 536 BLAKE2B 63e79a820fc90b689337ae2d4bf23c008414f40e2a731322be6585c154bcda1c54ef7445d3df7ef398f92979c6a77bdb144c9e6714bced9799be80b9115baef3 SHA512 a5a414ceb658cf09730b8a2bfb3c5cc99506f998034ee9131c3ee2b7ee29b362a5053f1ff55991336d31685cd65b8f1c2f76f71456ccf51a198596f07782208d
-EBUILD colm-0.14.7-r1.ebuild 1487 BLAKE2B bc56737a509b517d3a9022f3c93a5928ffb1400d3cdde7dbe8b697ef407573dd6f1579458c0b2e703aa84958762888bbae4fc5cd69a9ed73230728a6ea547a75 SHA512 2af6a5debbd7eb35bdedba42694eddfabb1cd43d00f8038d276ef356a0bd3bf6dbd12c6b8950e159292db81474841d0143d680e468b6bdfa63a6bcb38831c946
+EBUILD colm-0.14.7-r1.ebuild 1548 BLAKE2B cbfd522b33a1444ed0107ce67ed93bdb52d3c08e4759f30a0f29cf0ddb64aaf11e439fc216c0127322e5af2c4d1860019fdb6c38f069c9ffc682815be8deb600 SHA512 5ac04d835b9637569755fe65e4a918820c4d55b08c6eb6a6379aa5eaa1c26cedf8e533cc60090e19b8adc2358a54fec3673d77057b5f65b30be7cdbe99a03cb0
 EBUILD colm-0.14.7.ebuild 1382 BLAKE2B a040745057dc087cca435929c57c7cb09ba76156fddce29a3e8e50bda6e100c550bab847a66a24947bb089566992596d83b69c9f0260287894355a11e9f37284 SHA512 026aa8dcbf7c827840179d3d336bf6ed006732a2b69688df307183ccc6d622eacdf4581510b8499c7cce9904b1028dc6e664af6b71f027dca9dba2f592d1e627
 MISC metadata.xml 253 BLAKE2B a2ab0ef0490c566ca6997a4cf9cb3b5e92449a989cfb7c71a653e6f06c8eeb1945cb81155e315051f91369dcb5ed689eb9f31b4cee0afc479ae4c61d95335833 SHA512 ed9c676e9a7622619fc74ff3cdc943e7ea4203f230043200fe3aa1836b776952ffd2c34160c93ed5156b500ffc538ac0582a201322b5577f29df625224a69ed7
diff --git a/dev-util/colm/colm-0.14.7-r1.ebuild b/dev-util/colm/colm-0.14.7-r1.ebuild
index 59000e4847fa..147625389f13 100644
--- a/dev-util/colm/colm-0.14.7-r1.ebuild
+++ b/dev-util/colm/colm-0.14.7-r1.ebuild
@@ -36,6 +36,7 @@ src_prepare() {
 	sed -i -e 's/(\[ASCIIDOC\], \[asciidoc\], \[asciidoc\]/S([ASCIIDOC], [asciidoc asciidoctor]/' configure.ac || die
 
 	# bug #766069
+	sed -i -e "s:gcc:$(tc-getCC) ${CFLAGS}:" src/main.cc || die
 	sed -i -e "s:gcc:$(tc-getCC):" test/colm.d/gentests.sh || die
 	sed -i -e "s:g++:$(tc-getCXX):" test/colm.d/gentests.sh || die
 
diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest
index d3cbde1e89e8..0635bd915fdd 100644
--- a/dev-util/cutter/Manifest
+++ b/dev-util/cutter/Manifest
@@ -1,4 +1,6 @@
 DIST cutter-2.1.0.tar.gz 2732264 BLAKE2B 463e0f8968c61c7d3b7e3c7a570c9f7c625e4c024306c0284665d39de460bc6780eedd114f51ec722bec6ab7d43077362b676562d0a89665886fbabc3240def1 SHA512 444e27005b9348397097c0c2fd047a557dfd5e8d5d43df6a2ab345da48e26537025ce6f81b256fe765dc59bf5944952965637b84e96136b3025c3dc5bca3f2d6
+DIST cutter-2.1.2.tar.gz 10520198 BLAKE2B f19ebdb09be8df270f72cfd17c8e3bf0172fd4506942e33c0f57d771f483ef365504b05eaf030eff7d1b4f4520484f6731d3e60eafaf4d8d2481718d48ad8d77 SHA512 f01cc08085587be00c5b64f0797180d74a02e2cce60c8ec040d831ca4b74fe371e34b284a293a0d88447ebdca4d72718aaf179ab3bb4db3bd6659deaae732272
 DIST cutter-translations-974298653ba71b958e1b6c83f6011f5fefff6236.tar.gz 595073 BLAKE2B 4445c4c16c47a05c74816d88a68fda97037c45caf7508fc1162f4978a0b3cb194653e879b77f6fc5be2f264a929ac11c4fc2aee68ceed6a23447094d0b249cdd SHA512 11450631602e7bd81132650b3edd028d56b2f6343a9561fe8bf3281427d8d22b0296651414756236b8544f719c8d4fc11be44a843532c8c32fe21dd7a82066d2
 EBUILD cutter-2.1.0.ebuild 1573 BLAKE2B ef62857706daa30e21094ae4ca1e669d34dc579bbfe887d641fd2a10ff3866a7881434736010cdd6bcde37905f06acad32d8c399861ac16b4b836cdea2f21802 SHA512 b65eaf5fee5d31b2293e3baa365147c1c9cfa9b69e9c85cf164ca34506b8cfe868fc1d2521e86bba027bc15adcaaf4175d23411bb51a4488beb234df24c9fba9
+EBUILD cutter-2.1.2.ebuild 1291 BLAKE2B 1c28b16f228f38ccfea39c374c01b8124f637077a3b57ef5cc26c3af908d32764896c5f0c7c4230ea4c0b43cf9e055c997f0ab0ea4efbb1a54e73279a602d6e7 SHA512 f1ab653ab196eeb62aaa5de9889d7ed3b4bf446b76cca907affb09e83b2df2ed6f9855cd20cea2cf8ec8c3d435749c7e4f6765e4784ce63e68196917e6a81842
 MISC metadata.xml 329 BLAKE2B ccc11908a8ba66fdc15f6fe8ea45e62e797050488dc82de159525338cb4ffc4d52609bd815dd0a2ad3ad23a915e5bf631dc3db640a0e7c314fb5fa66cfe5b2b7 SHA512 208b070fdb02df4825d364ee5d86c3be7658fb6c84420d53b5e4f72427de0a2b8c201e46a6bae9d923eb5e9b0f195fb639336452c89dd4affc5527908cd152fb
diff --git a/dev-util/cutter/cutter-2.1.2.ebuild b/dev-util/cutter/cutter-2.1.2.ebuild
new file mode 100644
index 000000000000..6f475ad8994e
--- /dev/null
+++ b/dev-util/cutter/cutter-2.1.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake toolchain-funcs xdg-utils python-single-r1
+
+MY_P="${PN^}-v${PV}"
+
+DESCRIPTION="A Qt and C++ GUI for rizin reverse engineering framework"
+HOMEPAGE="https://cutter.re https://github.com/rizinorg/cutter/"
+SRC_URI="https://github.com/rizinorg/${PN}/releases/download/v${PV}/${MY_P}-src.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="CC-BY-SA-3.0 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="graphviz"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	>=dev-util/rizin-0.4.0:=
+	graphviz? ( media-gfx/graphviz )"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_CXX_COMPILER="$(tc-getCXX)"
+		-DCMAKE_C_COMPILER="$(tc-getCC)"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCUTTER_ENABLE_GRAPHVIZ="$(usex graphviz)"
+		-DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=OFF
+		-DCUTTER_ENABLE_PYTHON=ON
+		-DCUTTER_USE_ADDITIONAL_RIZIN_PATHS=OFF
+		-DCUTTER_USE_BUNDLED_RIZIN=OFF
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/dev-util/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest
index e6ddc962de7d..d8581ed354d2 100644
--- a/dev-util/edb-debugger/Manifest
+++ b/dev-util/edb-debugger/Manifest
@@ -1,5 +1,6 @@
+AUX edb-debugger-1.3.0-capstone-5.patch 1135 BLAKE2B 835105b255338811747521ca9b76c88eb5b88cebb050c536657b110fcf20fa81b5e0a33fae1c81fe9c890daba9021f4782df7440a1197ae5da7b325a1076d504 SHA512 7b6edec1d8fa7f350883eb0e1184c5051096dec3a4ea9519dbaacd036a0c893ed452f11906ae2c1844c94f3df5f215ba43a21cc70c5da74412b1e905deb9c06a
 AUX edb-debugger-1.3.0-gcc12.patch 3374 BLAKE2B 6e75e6d940da2d54d20bfdd62dd26c7955ffcc00d00d84a1029b583b00bee69106e43a64ad5b9ab96a269b84f7a69e48c12d6acbfd0f4404b8d490660620c35f SHA512 9b0fb244ce7e80ca4810323d6198e273019b3255c40e198563da109e228f1329bf0b36560024607b6015bc1ba992e396151858cb1bed1fecc39d2dd688232e62
 DIST edb-debugger-1.3.0.tgz 618227 BLAKE2B 1650e727851b629d7778c8488a464b6439f2ac4e5a72c0738cfe1ee302538b0d97dcbf9587a1108a82f8f8f4a6bec273e31ad454063f70704ffb48ca8ba5b73f SHA512 9d813bb61cdc7b61b594e63834ffb3999d3e1bb0c7a435095efea9b3b6726369a06c553ba6633df160d9456758ff54d5eee8cfbee6a1304f3a01d09fe2c7a65d
-EBUILD edb-debugger-1.3.0.ebuild 1175 BLAKE2B a1cdcee8c104480f9edbef70aa619cd3a1776e5a4c161cea7b6e069294f4a96da2fd753040b1943930ee49cb3ece37e5642b7fd58f188058b009147c24ffa54a SHA512 5a4afc4dbd8a317a5a8057da9b100ed71bcf216618299a2087bf4dc43aa48ce6b5ba8ca0d7c812d068a05aca2aa127f52017be0cdf09beb1881650d86a5e7057
-EBUILD edb-debugger-9999.ebuild 932 BLAKE2B 060e1be8043c1fd6f12684b197f60cd88de8f8d35c1227246de4bba18546b23f16ddcd60cdf92a54a48cda5ab1640e9e199a1429edf52bdf935ebf18f120df19 SHA512 1c09eaaecff1866de7307512ced499f0eb10f1f3defc8663111d9cfa64f6a7ef3b846365f8e9e18e14d19fde18909e1a5bbbdc60a674f1918f0476316399d929
-MISC metadata.xml 275 BLAKE2B 382b1023fe29dd71c57d25b04115b5757d90933d0cc3eefed19ac110608bcc02c260308112523d142d342921a652eb8bb66395e10c37aeadaec13e26db64dc10 SHA512 187c55986315e59f9adfc9129c81243da596fc9827774e08c244d64301380303c682c55af8db1acc80d90f648b1b154dc5a8cbdcbba7a7475c7a90735da1ef44
+EBUILD edb-debugger-1.3.0-r1.ebuild 1336 BLAKE2B 41f403885d80cda118d40e99da7b0f814f2fef59f050a1e3c2a02f87496d14cd2ce0a2cfda87069eeb9feeffe73925ef7c2329df2d9872a0564a90e9f09b369e SHA512 f63b41bbc3f219457eb4e66c64ba197bc242b0d33894f0868616a4b764c89b981f6ae34280f4c336706025195adc05295d99d0134827c9e18fed55c88548abf4
+EBUILD edb-debugger-9999.ebuild 1247 BLAKE2B 227bada04e32d2ddd645338e6572b68d8b70b920f2925e02c78d3e57c9922f30e18849920a3fff9f1a7ede030e77f2df83bef2f01ed2cd26be1c4f34b2ee879f SHA512 53ebf7ff9a2ab643b45610e3ab5b99d1cc8976a60d7ac08e23f068de850201523f25d8fd8879ffc9f6367f43040e287018665f730a8f379e81c4b049304b3e07
+MISC metadata.xml 252 BLAKE2B fb12cf596eb089cfb2077cf0726394d90785dbea303035ffbb140513dbb5e0fc69ddcdab039f0d159a41cedd601084eab5f93d017c8eed995112ced496a1ebf2 SHA512 23a9f942e083e04792112e33470839ef3906e11035ef61a24b4f5aa2bf0a5b4fc322ed9f48e09905132c9a8a5f7abe02b2711bd3396da9f6d4ec95fea50ccadb
diff --git a/dev-util/edb-debugger/edb-debugger-1.3.0.ebuild b/dev-util/edb-debugger/edb-debugger-1.3.0-r1.ebuild
index e550d9ad3f47..01f72a1e8911 100644
--- a/dev-util/edb-debugger/edb-debugger-1.3.0.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-1.3.0-r1.ebuild
@@ -7,16 +7,23 @@ inherit cmake
 
 DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
 HOMEPAGE="https://github.com/eteran/edb-debugger"
-SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz"
-S="${WORKDIR}"/${PN}
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/eteran/edb-debugger"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz"
+	S="${WORKDIR}"/${PN}
+
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="graphviz"
 
 RDEPEND="dev-libs/capstone:=
-	dev-libs/double-conversion
+	dev-libs/double-conversion:=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -32,6 +39,7 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc12.patch
+	"${FILESDIR}"/${PN}-1.3.0-capstone-5.patch
 )
 
 src_prepare() {
diff --git a/dev-util/edb-debugger/edb-debugger-9999.ebuild b/dev-util/edb-debugger/edb-debugger-9999.ebuild
index 6ff5cb3e1c08..de40794d96ce 100644
--- a/dev-util/edb-debugger/edb-debugger-9999.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-9999.ebuild
@@ -1,22 +1,29 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake git-r3
+inherit cmake
 
 DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
 HOMEPAGE="https://github.com/eteran/edb-debugger"
-EGIT_REPO_URI="https://github.com/eteran/edb-debugger.git"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/eteran/edb-debugger"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz"
+	S="${WORKDIR}"/${PN}
+
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS=""
-IUSE="graphviz jumbo-build"
+IUSE="graphviz"
 
-RDEPEND="
-	dev-libs/capstone:=
-	dev-libs/double-conversion
+RDEPEND="dev-libs/capstone:=
+	dev-libs/double-conversion:=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -25,25 +32,19 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	dev-qt/qtxmlpatterns:5
-	graphviz? ( media-gfx/graphviz )
-"
-
-DEPEND="
-	dev-libs/boost
-	virtual/pkgconfig
-	${RDEPEND}
-"
+	graphviz? ( media-gfx/graphviz )"
+DEPEND="dev-libs/boost
+	${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
+	# Make the desktop's entries somewhat better
+	sed -i -e 's/GenericName=edb debugger/GenericName=Evan\x27s Debugger/' edb.desktop || die
+	sed -i -e 's/Comment=edb debugger/Comment=edb is a cross platform x86\/x86-64 debugger/' edb.desktop || die
+
 	if ! use graphviz; then
 		sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
 	fi
-	cmake_src_prepare
-}
 
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_JUMBO=$(usex jumbo-build)
-	)
-	cmake_src_configure
+	cmake_src_prepare
 }
diff --git a/dev-util/edb-debugger/files/edb-debugger-1.3.0-capstone-5.patch b/dev-util/edb-debugger/files/edb-debugger-1.3.0-capstone-5.patch
new file mode 100644
index 000000000000..d900ae335242
--- /dev/null
+++ b/dev-util/edb-debugger/files/edb-debugger-1.3.0-capstone-5.patch
@@ -0,0 +1,29 @@
+From cb1da3fb1d2e45e279118ee8e68468373b71dbc8 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 13 Sep 2022 17:52:01 +0100
+Subject: [PATCH] Fix build with Capstone 5
+
+Capstone 5 drops X86_INS_VCVTPD2DQX and X86_INS_VCVTPD2PSX from
+x86.h (happened in https://github.com/capstone-engine/capstone/commit/dd91f03fef5102492352756e2adb5972dd79a70f
+but no real explanation).
+
+Given:
+1. these instructions had no wiring up;
+2. other Capstone consumers have done the same
+let's drop based on a macro for the Capstone version.
+
+Bug: https://bugs.gentoo.org/843755
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/src/capstone-edb/Instruction.cpp
++++ b/src/capstone-edb/Instruction.cpp
+@@ -880,8 +880,10 @@ bool is_SIMD_PD(const Operand &operand) {
+ 	case X86_INS_CVTPD2PI:
+ 	case X86_INS_CVTPD2PS:
+ 	case X86_INS_VCVTPD2PS:
++#if CS_API_MAJOR < 5
+ 	case X86_INS_VCVTPD2DQX: // FIXME: what's this?
+ 	case X86_INS_VCVTPD2PSX: // FIXME: what's this?
++#endif
+ 	// case X86_INS_VCVTPD2QQ: // FIXME: Capstone seems to not support it
+ 	case X86_INS_VCVTPD2UDQ:
+ 		// case X86_INS_VCVTPD2UQQ: // FIXME: Capstone seems to not support it
diff --git a/dev-util/edb-debugger/metadata.xml b/dev-util/edb-debugger/metadata.xml
index 31849a247616..09229532f67a 100644
--- a/dev-util/edb-debugger/metadata.xml
+++ b/dev-util/edb-debugger/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<use>
-		<flag name="jumbo-build">Experimental jumbo (also known as unity) build capability</flag>
-	</use>
+	<upstream>
+		<remote-id type="github">eteran/edb-debugger</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index e82e87f41ef6..0704b3f4f3be 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -3,5 +3,5 @@ AUX glade-3.38.2-meson-0.61.patch 1334 BLAKE2B 009af5a6617b59519eec3c4033d63f898
 DIST glade-3.38.2.tar.xz 2709224 BLAKE2B 2bcd447b90d6e67abc44dd273f0f5d7fc1d6848ef0bd878481f2c10e8846828e63fbf9c9c96e5effe8126b4aec7eb05886606ca1dc5fb94943bc5d1d8d0ef4e2 SHA512 2df8c8363206905663cd3ac9196da44445425a888b64f1b3b3ac6cd41e14c4a82a5d2c299730ef0606c3970a04dd8f245bb5639218794eb67dcbd26fae17565e
 DIST glade-3.40.0.tar.xz 2654772 BLAKE2B 472dfd841e9501f7bbc96bde49ebe26dfd54193cd479658d042547eba5d1af196c0a06212ec5c894c53c12f3791967f6c77859f96802e3df5760b36c6c0c4af1 SHA512 6b018f882e9d155a4b2256c0b4c72743f971c8d730a53f16faa240d01e14051f5b6ce04e355dcc78e1679579fb091facaa06acdda6297c5b8efc642c42bb7b4e
 EBUILD glade-3.38.2-r1.ebuild 2008 BLAKE2B b9869b6d34e51d97199cd8b8ca8271c91cee76ffa177f2917bbf71e656e362f5772434893061189ce3c15a5e4120119ddd34ed38b308ea7a00b047af2da03e77 SHA512 9a4102ff48256be6c7528b3607bc0184469d1055a27f8e0cb4429e1a7e5386d9ae2274464d9bee4ca88c879fa9351892058b78e2e19ab935d35802b93a06aeab
-EBUILD glade-3.40.0.ebuild 1971 BLAKE2B 1e0545706571cfbfdfa238740bdc4f6a7306dac6432cb828b7a286149cdc5c54941508f9629ef0bdce9586974253797ac4ac4f6cdd8dbc41117909a252812b84 SHA512 bab7adc8f20fe2683fabc9c5362a5875b4db7bd57f5f8fb8e49ed0a2154df9d3760cc60cf2cff7d7da6f68bd5f16081a2bd67b7f2fd40f4f4bb441bc8a3104d4
+EBUILD glade-3.40.0.ebuild 1969 BLAKE2B 35adbdd031a3050af6777e4082668a8518c7414a53b53f0ea02152a54256cda7b0458719be859c457cf3d3b63ad01976af09c25f20de06f5e039bcb4dc12d3b0 SHA512 3ecebb534d4d4360a4059a502e356d85d195a0e428ae0e2926794cedebdc9e41860f795c36912c7b7c47b2a840b6ac35ceafe6add9383b4c1f8e4348df7bbf5c
 MISC metadata.xml 443 BLAKE2B 26f4701b1aaa6e751e838240b2c5d5f45b76b5dc2a5321a2f58384f9afa25ddd0409722cbe8865fb160272968babdc9145cbeb9ff3602697a7aaec3c9d5e6db6 SHA512 6a334008fb56ba68d64a0f1c064032b9677d8891bb0af7d6f9a02ee5408dfccb2e917f64ece43bc2e9b3ea740a29f2bae12b7fa14c07b7c6dca388d2e9725af8
diff --git a/dev-util/glade/glade-3.40.0.ebuild b/dev-util/glade/glade-3.40.0.ebuild
index 6204835b1876..0e0bd9593e72 100644
--- a/dev-util/glade/glade-3.40.0.ebuild
+++ b/dev-util/glade/glade-3.40.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://glade.gnome.org https://gitlab.gnome.org/GNOME/glade"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="3.10/13" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="gjs gtk-doc +introspection python webkit"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index e6e59a90f610..17aa94ccba85 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,6 +1,7 @@
+AUX glslang-1.3.224-Fix-cmake-file-install-dir.patch 13162 BLAKE2B fb58095f7f9c136e3d1aeacb0d7e0a1ddc4d8972a160f8e31e7542526ae9eed9c1acb07dc1bf160e58f8df2582420b9df4532c0aae723729293b0fa5b4bc24df SHA512 8eb4cf63767d83219b56996477521da067f06e0d9db52c8a5a7c842e28f988935181cacb5727795c33fc75ec81d6085c6d30f0498ed4f1a8c3e6fbe33c1cc7be
 DIST glslang-1.3.216.tar.gz 3537750 BLAKE2B 0eddc7be8a4499a283b941b51aefec5bfa3d555b8f44408f33a6993db1bea96b6dfeedb093d64117ef4ffca6ad264ea5968492af642fc2b0563bb43eff241cb8 SHA512 4ab3953df2e881e4eb923307d6ec906daaa1786a1ad1b4d7d6713d63599c8f7cfd41257d53f7caeddcc4ad8cc4aac707393d2b7a1c7452ff5e9d1ae5f84696e8
 DIST glslang-1.3.224.tar.gz 3543160 BLAKE2B 5773f884b39f2bd01bf71269e62ee3c0ee36a736249e65b6b205560227698230e708feb4137cffe7b4b30e8756c206e53663bb3942b1d5d528511ac96e8bc407 SHA512 d982fb166d07e8862b8b41d90652fd419a35a0987ff86e21b4cb760594e0c8505d927dcdb089540168ca4b47e4d89d5e150706758ff82b25011f52c1716cfbf4
 EBUILD glslang-1.3.216.ebuild 809 BLAKE2B a207750c9898380d2ca4b7b3769828d3a7e7950666282cc54a7e02f0e1b1dd0ba1834b08ca081e152cdcfe55dcf5ab165c3ad743539253e69988008e717be603 SHA512 a51a0c70ef135db12b71c6b42663f5528127602adf1327411fb81a10159461314472814e8aab044c48ff7dbb2c3e8ee9fa2e76c9eeb74725a9ed33ecdfd70f0e
-EBUILD glslang-1.3.224.ebuild 815 BLAKE2B 48e125d4206ab446a51bdf65e6b9cd86e8853ef6c6e7ab704fbd7b6370308187f671866178f4a1191c87916639a38edd61d7400783fa78c85618676b678a699f SHA512 cea3c3fd2565c395b7a01d2e98c0e879b52eef6278b351fff78ccad222554f3d9b5d987aa553254d1a143779a0a4f236054566957cbaab28b57097d0bc823a53
+EBUILD glslang-1.3.224-r1.ebuild 880 BLAKE2B f4e4a13341eb7fd9c6f61777115adeb17ebe6162428d84436b8ca81bcad2e70149c60c7e59724c88b2ae6c04c5c638cb0b17e80c2f4e8891cc6f5cc7070285bc SHA512 0917150e19bffb965bddd8054d35c8385f30f372ae446908d9050bf46e7e5193cf65710634028ce77f10be6d4a7a6e7f6e9cc8d459b4dc404ec5ba2b0a66ba50
 EBUILD glslang-9999.ebuild 815 BLAKE2B 5e6986adf59b9c16a8f7792d3cb5317bf5f98b0afdcc8aa6046a3eb3cdd136ed715dde7acc5ed2854ba0064f433f4047f034558f7cc4371bd6cfc4e898a32f64 SHA512 5d935aa37f345e8008d735208ebf4e8a14de4fafbd0cd46675f2cb23068ae8781ca9c60a43783283d775bcf9dfa72ccd99b7283d0600e74f947d9b78907afc4c
 MISC metadata.xml 330 BLAKE2B c3874bbe807a8dd1a55897feadfc0a89e4cb806441390ee7e7cc317f3b533a08338a669834122ede89cefd9b6532d789aece2c29fcc6cdfc7f76a81bf382192b SHA512 1c591a28214fb76334171e4a49c8ac302b6f174f265749ad005f2503df1312e8303c92a68248775ed3db98d65107471f9cfc8cfb758c89261f283711beaac764
diff --git a/dev-util/glslang/files/glslang-1.3.224-Fix-cmake-file-install-dir.patch b/dev-util/glslang/files/glslang-1.3.224-Fix-cmake-file-install-dir.patch
new file mode 100644
index 000000000000..685584eee2c8
--- /dev/null
+++ b/dev-util/glslang/files/glslang-1.3.224-Fix-cmake-file-install-dir.patch
@@ -0,0 +1,258 @@
+From 1b32fc8eb242f264f2bedb384d3f3e359f3cdd1d Mon Sep 17 00:00:00 2001
+From: Andrea Pappacoda <andrea@pappacoda.it>
+Date: Thu, 25 Aug 2022 23:15:14 +0200
+Subject: [PATCH] build: install glslang-config.cmake to libdir
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+As glslang ships architecture dependant files, the Config file should be
+installed to libdir, not datadir. See
+https://github.com/KhronosGroup/glslang/pull/2989#discussion_r955367103
+for more details.
+
+Here's the diff between the install tree before and after this patch:
+
+    $ diff <(tree install-datadir) <(tree install)
+    1c1
+    < install-datadir
+    ---
+    > install
+    74,99c74,98
+    <         ├── lib
+    <         │   ├── cmake
+    <         │   │   ├── glslang-default-resource-limitsTargets.cmake
+    <         │   │   ├── glslangTargets.cmake
+    <         │   │   ├── glslangValidatorTargets.cmake
+    <         │   │   ├── HLSLTargets.cmake
+    <         │   │   ├── OGLCompilerTargets.cmake
+    <         │   │   ├── OSDependentTargets.cmake
+    <         │   │   ├── spirv-remapTargets.cmake
+    <         │   │   ├── SPIRVTargets.cmake
+    <         │   │   └── SPVRemapperTargets.cmake
+    <         │   ├── libGenericCodeGen.a
+    <         │   ├── libglslang.a
+    <         │   ├── libglslang-default-resource-limits.a
+    <         │   ├── libHLSL.a
+    <         │   ├── libMachineIndependent.a
+    <         │   ├── libOGLCompiler.a
+    <         │   ├── libOSDependent.a
+    <         │   ├── libSPIRV.a
+    <         │   └── libSPVRemapper.a
+    <         └── share
+    <             └── glslang
+    <                 ├── glslang-config.cmake
+    <                 ├── glslang-config-version.cmake
+    <                 ├── glslang-targets.cmake
+    <                 └── glslang-targets-debug.cmake
+    ---
+    >         └── lib
+    >             ├── cmake
+    >             │   ├── glslang-default-resource-limitsTargets.cmake
+    >             │   ├── glslangTargets.cmake
+    >             │   ├── glslangValidatorTargets.cmake
+    >             │   ├── HLSLTargets.cmake
+    >             │   ├── OGLCompilerTargets.cmake
+    >             │   ├── OSDependentTargets.cmake
+    >             │   ├── spirv-remapTargets.cmake
+    >             │   ├── SPIRVTargets.cmake
+    >             │   └── SPVRemapperTargets.cmake
+    >             ├── glslang
+    >             │   ├── glslang-config.cmake
+    >             │   ├── glslang-config-version.cmake
+    >             │   ├── glslang-targets.cmake
+    >             │   └── glslang-targets-debug.cmake
+    >             ├── libGenericCodeGen.a
+    >             ├── libglslang.a
+    >             ├── libglslang-default-resource-limits.a
+    >             ├── libHLSL.a
+    >             ├── libMachineIndependent.a
+    >             ├── libOGLCompiler.a
+    >             ├── libOSDependent.a
+    >             ├── libSPIRV.a
+    >             └── libSPVRemapper.a
+    101c100
+    < 15 directories, 83 files
+    ---
+    > 14 directories, 83 files
+---
+ CMakeLists.txt                             | 8 ++++----
+ OGLCompilersDLL/CMakeLists.txt             | 2 +-
+ SPIRV/CMakeLists.txt                       | 4 ++--
+ StandAlone/CMakeLists.txt                  | 6 +++---
+ glslang/CMakeLists.txt                     | 2 +-
+ glslang/OSDependent/Unix/CMakeLists.txt    | 2 +-
+ glslang/OSDependent/Windows/CMakeLists.txt | 2 +-
+ gtests/CMakeLists.txt                      | 2 +-
+ hlsl/CMakeLists.txt                        | 2 +-
+ 9 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a01168603..b7fe3d775 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -375,13 +375,13 @@ if(ENABLE_GLSLANG_INSTALL)
+         include("@PACKAGE_PATH_EXPORT_TARGETS@")
+     ]=])
+     
+-    set(PATH_EXPORT_TARGETS "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake")
++    set(PATH_EXPORT_TARGETS "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake")
+     configure_package_config_file(
+         "${CMAKE_CURRENT_BINARY_DIR}/glslang-config.cmake.in"
+         "${CMAKE_CURRENT_BINARY_DIR}/glslang-config.cmake"
+         PATH_VARS
+             PATH_EXPORT_TARGETS
+-        INSTALL_DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}
++        INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}
+     )
+     
+     write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/glslang-config-version.cmake"
+@@ -392,7 +392,7 @@ if(ENABLE_GLSLANG_INSTALL)
+     install(
+         EXPORT      glslang-targets
+         NAMESPACE   "glslang::"
+-        DESTINATION "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}"
++        DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}"
+     )
+     
+     install(
+@@ -400,6 +400,6 @@ if(ENABLE_GLSLANG_INSTALL)
+             "${CMAKE_CURRENT_BINARY_DIR}/glslang-config.cmake"
+             "${CMAKE_CURRENT_BINARY_DIR}/glslang-config-version.cmake"
+         DESTINATION
+-            "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}"
++            "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}"
+     )
+ endif()
+\ No newline at end of file
+diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt
+index 8c0e2ba5c..841b3e2c6 100644
+--- a/OGLCompilersDLL/CMakeLists.txt
++++ b/OGLCompilersDLL/CMakeLists.txt
+@@ -49,7 +49,7 @@ if(ENABLE_GLSLANG_INSTALL)
+         message(WARNING \"Using `OGLCompilerTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
+ 
+         if (NOT TARGET glslang::OGLCompiler)
+-            include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\")
++            include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
+         endif()
+ 
+         add_library(OGLCompiler ALIAS glslang::OGLCompiler)
+diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
+index c26e310da..6724417f4 100644
+--- a/SPIRV/CMakeLists.txt
++++ b/SPIRV/CMakeLists.txt
+@@ -121,7 +121,7 @@ if(ENABLE_GLSLANG_INSTALL)
+             message(WARNING \"Using `SPVRemapperTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
+ 
+             if (NOT TARGET glslang::SPVRemapper)
+-                include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\")
++                include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
+             endif()
+ 
+             add_library(SPVRemapper ALIAS glslang::SPVRemapper)
+@@ -133,7 +133,7 @@ if(ENABLE_GLSLANG_INSTALL)
+         message(WARNING \"Using `SPIRVTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
+ 
+         if (NOT TARGET glslang::SPIRV)
+-            include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\")
++            include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
+         endif()
+ 
+         add_library(SPIRV ALIAS glslang::SPIRV)
+diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
+index 027575047..d54a1df8c 100644
+--- a/StandAlone/CMakeLists.txt
++++ b/StandAlone/CMakeLists.txt
+@@ -111,7 +111,7 @@ if(ENABLE_GLSLANG_INSTALL)
+         message(WARNING \"Using `glslangValidatorTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
+ 
+         if (NOT TARGET glslang::glslangValidator)
+-            include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\")
++            include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
+         endif()
+ 
+         add_library(glslangValidator ALIAS glslang::glslangValidator)
+@@ -126,7 +126,7 @@ if(ENABLE_GLSLANG_INSTALL)
+             message(WARNING \"Using `spirv-remapTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
+ 
+             if (NOT TARGET glslang::spirv-remap)
+-                include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\")
++                include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
+             endif()
+ 
+             add_library(spirv-remap ALIAS glslang::spirv-remap)
+@@ -141,7 +141,7 @@ if(ENABLE_GLSLANG_INSTALL)
+         message(WARNING \"Using `glslang-default-resource-limitsTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
+ 
+         if (NOT TARGET glslang::glslang-default-resource-limits)
+-            include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\")
++            include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
+         endif()
+ 
+         add_library(glslang-default-resource-limits ALIAS glslang::glslang-default-resource-limits)
+diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
+index 45c9813a8..f63e8fc32 100644
+--- a/glslang/CMakeLists.txt
++++ b/glslang/CMakeLists.txt
+@@ -209,7 +209,7 @@ if(ENABLE_GLSLANG_INSTALL)
+         message(WARNING \"Using `glslangTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
+ 
+         if (NOT TARGET glslang::glslang)
+-            include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\")
++            include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
+         endif()
+ 
+         if(${BUILD_SHARED_LIBS})
+diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt
+index 96ae21604..ec1eda4a3 100644
+--- a/glslang/OSDependent/Unix/CMakeLists.txt
++++ b/glslang/OSDependent/Unix/CMakeLists.txt
+@@ -60,7 +60,7 @@ if(ENABLE_GLSLANG_INSTALL)
+         message(WARNING \"Using `OSDependentTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
+ 
+         if (NOT TARGET glslang::OSDependent)
+-            include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\")
++            include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
+         endif()
+ 
+         add_library(OSDependent ALIAS glslang::OSDependent)
+diff --git a/glslang/OSDependent/Windows/CMakeLists.txt b/glslang/OSDependent/Windows/CMakeLists.txt
+index 548984470..6048bb872 100644
+--- a/glslang/OSDependent/Windows/CMakeLists.txt
++++ b/glslang/OSDependent/Windows/CMakeLists.txt
+@@ -55,7 +55,7 @@ if(ENABLE_GLSLANG_INSTALL)
+         message(WARNING \"Using `OSDependentTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
+ 
+         if (NOT TARGET glslang::OSDependent)
+-            include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\")
++            include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
+         endif()
+ 
+         add_library(OSDependent ALIAS glslang::OSDependent)
+diff --git a/gtests/CMakeLists.txt b/gtests/CMakeLists.txt
+index dd555ecca..8dff7ede0 100644
+--- a/gtests/CMakeLists.txt
++++ b/gtests/CMakeLists.txt
+@@ -76,7 +76,7 @@ if(BUILD_TESTING)
+                 message(WARNING \"Using `glslangtestsTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
+ 
+                 if (NOT TARGET glslang::glslangtests)
+-                    include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\")
++                    include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
+                 endif()
+ 
+                 add_library(glslangtests ALIAS glslang::glslangtests)
+diff --git a/hlsl/CMakeLists.txt b/hlsl/CMakeLists.txt
+index 4616cfe01..b34df3aea 100644
+--- a/hlsl/CMakeLists.txt
++++ b/hlsl/CMakeLists.txt
+@@ -52,7 +52,7 @@ if(ENABLE_GLSLANG_INSTALL)
+         message(WARNING \"Using `HLSLTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
+ 
+         if (NOT TARGET glslang::HLSL)
+-            include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\")
++            include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
+         endif()
+ 
+         add_library(HLSL ALIAS glslang::HLSL)
diff --git a/dev-util/glslang/glslang-1.3.224.ebuild b/dev-util/glslang/glslang-1.3.224-r1.ebuild
index ffb48adf4b6f..7d76d7006c5b 100644
--- a/dev-util/glslang/glslang-1.3.224.ebuild
+++ b/dev-util/glslang/glslang-1.3.224-r1.ebuild
@@ -26,3 +26,5 @@ BDEPEND="${PYTHON_DEPS}"
 
 # Bug 698850
 RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-Fix-cmake-file-install-dir.patch" )
diff --git a/dev-util/hip/Manifest b/dev-util/hip/Manifest
index e10dc8f75b58..493f7b093317 100644
--- a/dev-util/hip/Manifest
+++ b/dev-util/hip/Manifest
@@ -14,7 +14,9 @@ AUX hip-5.0.1-hip_vector_types.patch 312 BLAKE2B fb5a61a73e741e2456c031adc9c2e96
 AUX hip-5.0.2-correct-ldflag.patch 1117 BLAKE2B 8d11bc278660fb7e14585822a462de96ebca78bf5cec026c8097fa2b9eef87f3d4fd21641d0cfe77f217067bc161b6ece94eb55de71611f106243c8bd41b157c SHA512 1d4b46f941f5b3115705a416822b2a7c034ca6611a7706bc126902e5130239dcf84624f35624f9c7b952314c1d76fcba3f17e40ceb2574b4b37bddada073f808
 AUX hip-5.0.2-set-build-id.patch 741 BLAKE2B 9d4668ab770fd1ebc93a19a3ddc2916e8feb69a95e54ceb5955c4a162733b8899d43f906c86b0b994add22ab46969ff18aad03035e6285a6492bc9c1405bce38 SHA512 714b2f8e791f0e30a7af567e430e2bba38473725e0d96e42de0c97a2ba939fd83b2f233eebf03cb8a6a82d10c46cfa5ea869af97f35c02da38924250a19e660a
 AUX hip-5.1.3-clang-include-path.patch 564 BLAKE2B 8cdfbd9eba9c5e642a8e85aa269b0e369ef11a90c30771e0b1ef21d1ff1bfbb6d9f27cc03693b22b39347d939a11994ffbe4dd2f9edc5583811fff273c304307 SHA512 e6d8dda10155a6d269435f37bf8d4fa25b503861450d474cc01c21ea582857caa9ed26ca04e513b12708ae60348cd32296aaf39c805ee3f925e7d6590cae658c
+AUX hip-5.1.3-correct-sample-install-location.patch 537 BLAKE2B 924010e903cf7a27591930f5533bc41591ea7821b1f5f73bbbe5d5659a78a712699bb3be94ec5e473a0a5e0d11140850f7bb8e00f7775688adaa79deb7f2597f SHA512 91d89d403eef7ba460e648f5415f654601147920a81f650c40928733d5dbb8a99ebc00530052bf22bec67d9d325bde867c08e7d24e1e05b734b9e31a909030f7
 AUX hip-5.1.3-fix-hip_prof_gen.patch 1480 BLAKE2B caa3fa9840a8add5a25daaeb6f26eed9da3fe55686f6343e31b836a0b2e12999cd45d9220469cde036c7914f672b6cc46695fce1bfe4a8d6d35c836cdc14e413 SHA512 a588238cb12dc973acc6513bead68439b10b49214d5dceb81a0498510f79269b79897a02dd9e2ee1ef396a762d49310fd0a406d7f8b6c0e85faeba0f69b1de23
+AUX hip-5.1.3-remove-cmake-doxygen-commands.patch 896 BLAKE2B 35640516bf416760db69b736d72c1e78efdbad8a930d621fdaffd13c5c250f5d80a6975c1e4c368389ce8059aee964c36645f420d0844141d09463637ba0bccb SHA512 b1288e1f4b7553c5bf0fe38a46fbdf269ca5c01fd8e0e225b9454d4916092601d565c57eaf9f716e06fee816e41cb3a948884060551b5a9d71da9b1a050765f9
 AUX hip-5.1.3-rocm-path.patch 564 BLAKE2B ad554063a11d58ce5acfa8c8980bac2668d199b059bc2555d4cea40fbc53b6334daaea448d99cc391cee246d8318a450efdef669db2ee164a4db3a55d7d8e193 SHA512 eaa03f4d2394f61dcedde376de6c398625d284a7ac0c94ff2484929efdf298f455c796b96f16bf3989de6593a9a026a7681620b5ca13ce403aba4a32e5a38226
 AUX hipvars-5.0.2.pm 590 BLAKE2B b67de8f86bc53d9fbcd50a9cfa9759feb0145f3b3e40360cc322676411e038ff21b8f81265ba27d099e51c3dc55230f87c477cbadfba2b48c08978216f2fbd81 SHA512 0becd625e6f34d687338e25ca4697e68a735a1df60a4c2c53f577e7999a34bc07041f513632f9534aa4b35da2cf50b02c96187f69fd183bff893343257aa85b9
 AUX hipvars-5.1.3.pm 629 BLAKE2B 6149f230aa0756603ac0b455d802db9c698be8e4a22367e98915db974ea16176f85f9b5a22e2572183641734cedbbe2ba2c826aa0223ea3e12c5550983db0480 SHA512 26ba459b13df1ad6dc50411ac6589dd3d17eff727fee0e938275912e36459c7a43b35233a7f78bbed282a992e969d8b8f95007964c810a5954b0abeccc67082d
@@ -44,6 +46,6 @@ EBUILD hip-4.2.0.ebuild 3634 BLAKE2B 6ab4a5d74b08a2dd765bae85bb91fa7174cb0fbe411
 EBUILD hip-4.3.0-r1.ebuild 3782 BLAKE2B b3f7e96b664662e9cdae955993251af254cd44f66e9a4306035875eaed8f507badca6c357bf4fa82e93e76eefdbdf7923de5f56a9eeee762c7ba364abff2b1e7 SHA512 97f34852764c8810eb093ee2aa09f3484382f5a0af5f21543020138bcd8cc40838480a03b1ea88be8044bca71500bf746ed768749e6c71e939b8438f569bd8cb
 EBUILD hip-4.3.0-r2.ebuild 3978 BLAKE2B 16ffbeddfdd5c6d0338e5be1fd609272bb4d00e1a5d1530a00a75d82a5882f52fc0bfd97b14bf9042affa4af4617507a5cd1b8d8f90a1f4c8744028ab63b7f38 SHA512 e664a11e69cc4a7629a8f088992d2e26517635d1f4e685d8dac69e74e6f94e8c1f782f09d0f54308b73c134021579a624bfa2ba8ecac3c470ab81cb317dcb67a
 EBUILD hip-4.3.0.ebuild 3761 BLAKE2B 7fdd7e65a7b1b246ad94a1e5ee37e7c3199f9dcc02df575e774fdbacf9690ac7609f53c122eff5dd87cddf9afd9c4f52d66a5502b3ec311fd6e9db5f3889a895 SHA512 07d8317cae9f7b2f4c179938477eb00ff8d0a136c730bd18582a835c23a8d9934d03824c2bb520c53cb1c2525e26618236b12dfcbfe520612a60c191a1d2947b
-EBUILD hip-5.0.2-r2.ebuild 4885 BLAKE2B a5b5c0cd40d1ae31d15ba4d774bfc6ce744b06025b08114976b6aa24758f5880eadf0cdd0b483d80469f6afd953beca56bf5dd6e8c79af111bbbe490baa876bb SHA512 00708d55c02c65cba95b009e3e14006901f92ea1ba8a08a32c25996e04613f4d6237c3b9ba0b1e2c237ad8269282fad39e17ef67b2319fb64bbe6ae9654f5748
-EBUILD hip-5.1.3.ebuild 6042 BLAKE2B d57df2bb4a811b42a048f6f9e72ef54b2d567784eb2d6b80416408363c0246a67ae2f83ca0c9e5c76f1834a987b33b6408688a0c6037e34f6a7dc83b11abcc46 SHA512 761bd007526189d308a437781ffada9244c7ee58b29c4ac63cbf8b5b7f1f265b0e5de1e90aff9b799c1aa1bfc53deb368f181b8a1a27d201762379b7a6f3fa73
+EBUILD hip-5.0.2-r3.ebuild 4908 BLAKE2B 20066eb60d72abf5ebc97b0465806c902dde41d2e856959dfa92ca39ea4b42f713225d7290ad0d28b55cec4f07b92529e5d3116b5db3d90ee10e774ec8d7609a SHA512 281fb82e31085a11428ce386a9d2b1fcc72798cf8260be6a6e3f6157d7b01e4b3a769ab1d42d4fdff3a1571ffdc648e1546c9a0ba2f256076830cc0fe16b6d42
+EBUILD hip-5.1.3-r1.ebuild 6360 BLAKE2B 17517f80975904747b851887acda76a3ac2dd026062b9faa37691809191be2d839aa3d9e3b47f83228a5903ad988e13608f3d96b4eae5e6f907eec719af33c0d SHA512 68111a62f42fc4a5806df44edff06bad86b2032dc0eb3c47151396f5713d37225ff426f9ca45b4b80a3ca885eb532956753e59006b575b3d6b9f613338a1dcc1
 MISC metadata.xml 597 BLAKE2B cca1b105463e26741aa4bf95c9d85dd582df075795646f633ed5f0d39bace0b07be98f771aa8eb1b89984788249837303b67617e92c4076eb7601611cd2abf6d SHA512 42767156ae0e89b3ce438bfb163161b543e15114838a5c14b4b1c889fe799e44dd9bf9684ee685798a1fc5d2d4c520d3c42c9c74a88178a079ccb634148e0738
diff --git a/dev-util/hip/files/hip-5.1.3-correct-sample-install-location.patch b/dev-util/hip/files/hip-5.1.3-correct-sample-install-location.patch
new file mode 100644
index 000000000000..57ac5cc3e992
--- /dev/null
+++ b/dev-util/hip/files/hip-5.1.3-correct-sample-install-location.patch
@@ -0,0 +1,13 @@
+Index: hipamd-rocm-5.1.3/packaging/CMakeLists.txt
+===================================================================
+--- hipamd-rocm-5.1.3.orig/packaging/CMakeLists.txt
++++ hipamd-rocm-5.1.3/packaging/CMakeLists.txt
+@@ -106,7 +106,7 @@ endif()
+ #End doc files install
+ 
+ #Begin samples files install
+-install(DIRECTORY ${HIP_COMMON_DIR}/samples DESTINATION . COMPONENT samples)
++install(DIRECTORY ${HIP_COMMON_DIR}/samples DESTINATION ${CMAKE_INSTALL_DOCDIR}/ COMPONENT samples)
+ #End samples files install
+ 
+ #Begin test files install
diff --git a/dev-util/hip/files/hip-5.1.3-remove-cmake-doxygen-commands.patch b/dev-util/hip/files/hip-5.1.3-remove-cmake-doxygen-commands.patch
new file mode 100644
index 000000000000..921452b2ba92
--- /dev/null
+++ b/dev-util/hip/files/hip-5.1.3-remove-cmake-doxygen-commands.patch
@@ -0,0 +1,21 @@
+Index: hipamd-rocm-5.1.3/packaging/CMakeLists.txt
+===================================================================
+--- hipamd-rocm-5.1.3.orig/packaging/CMakeLists.txt
++++ hipamd-rocm-5.1.3/packaging/CMakeLists.txt
+@@ -88,16 +88,6 @@ install(FILES ${CMAKE_BINARY_DIR}/includ
+         DESTINATION include/hip COMPONENT dev)
+ #End dev files install
+ 
+-#Begin doc files install
+-find_program(DOXYGEN_EXE doxygen)
+-if(DOXYGEN_EXE)
+-    add_custom_target(build_doxygen ALL
+-                  COMMAND HIP_PATH=${HIP_COMMON_DIR} doxygen ${HIP_COMMON_DIR}/docs/doxygen-input/doxy.cfg)
+-    install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/RuntimeAPI/html
+-            DESTINATION docs/RuntimeAPI COMPONENT doc)
+-endif()
+-#End doc files install
+-
+ #Begin samples files install
+ install(DIRECTORY ${HIP_COMMON_DIR}/samples DESTINATION ${CMAKE_INSTALL_DOCDIR}/ COMPONENT samples)
+ #End samples files install
diff --git a/dev-util/hip/hip-5.0.2-r2.ebuild b/dev-util/hip/hip-5.0.2-r3.ebuild
index fd069acfe4b4..15ea58b0895c 100644
--- a/dev-util/hip/hip-5.0.2-r2.ebuild
+++ b/dev-util/hip/hip-5.0.2-r3.ebuild
@@ -74,7 +74,7 @@ src_prepare() {
 
 	# correct libs and cmake install dir
 	sed -e "/LIB_INSTALL_DIR/s:PREFIX}/lib:PREFIX}/$(get_libdir):" \
-		-e "/${HIP_COMMON_DIR}\/cmake DESTINATION/s: .): $(get_libdir)):" -i CMakeLists.txt || die
+		-e "/\${HIP_COMMON_DIR}/s:cmake DESTINATION .):cmake/ DESTINATION share/cmake/Modules):" -i CMakeLists.txt || die
 	sed -e "/LIBRARY DESTINATION/s:lib:$(get_libdir):" -i src/CMakeLists.txt || die
 
 	cd ${HIP_S} || die
diff --git a/dev-util/hip/hip-5.1.3.ebuild b/dev-util/hip/hip-5.1.3-r1.ebuild
index a9e9844fdcc2..27d78bc64fc7 100644
--- a/dev-util/hip/hip-5.1.3.ebuild
+++ b/dev-util/hip/hip-5.1.3-r1.ebuild
@@ -4,8 +4,10 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..11} )
+DOCS_BUILDER="doxygen"
+DOCS_DEPEND="media-gfx/graphviz"
 
-inherit cmake llvm prefix python-any-r1
+inherit cmake docs llvm prefix python-any-r1
 
 LLVM_MAX_SLOT=14
 
@@ -47,12 +49,14 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.2.0-cancel-hcc-header-removal.patch"
 	"${FILESDIR}/${PN}-5.0.2-set-build-id.patch"
 	"${FILESDIR}/${PN}-5.1.3-fix-hip_prof_gen.patch"
+	"${FILESDIR}/${PN}-5.1.3-correct-sample-install-location.patch"
+	"${FILESDIR}/${PN}-5.1.3-remove-cmake-doxygen-commands.patch"
 	"${FILESDIR}/0001-SWDEV-316128-HIP-surface-API-support.patch"
 )
 
 python_check_deps() {
 	if use profile; then
-		has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]"
+		python_has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]"
 	fi
 }
 
@@ -61,6 +65,8 @@ HIP_S="${WORKDIR}"/HIP-rocm-${PV}
 OCL_S="${WORKDIR}"/ROCm-OpenCL-Runtime-rocm-${PV}
 CLR_S="${WORKDIR}"/ROCclr-rocm-${PV}
 RTC_S="${WORKDIR}"/roctracer-rocm-${PV}
+DOCS_DIR="${HIP_S}"/docs/doxygen-input
+DOCS_CONFIG_NAME=doxy.cfg
 
 src_prepare() {
 	cmake_src_prepare
@@ -81,12 +87,12 @@ src_prepare() {
 
 	# correct libs and cmake install dir
 	sed -e "/LIB_INSTALL_DIR/s:PREFIX}/lib:PREFIX}/$(get_libdir):" \
-		-e "/${HIP_COMMON_DIR}\/cmake DESTINATION/s: .): $(get_libdir)):" -i CMakeLists.txt || die
+		-e "/\${HIP_COMMON_DIR}/s:cmake DESTINATION .):cmake/ DESTINATION share/cmake/Modules):" -i CMakeLists.txt || die
 	sed -e "/LIBRARY DESTINATION/s:lib:$(get_libdir):" -i src/CMakeLists.txt || die
 
 	sed -e "/\.hip/d" \
 		-e "s,DESTINATION lib,DESTINATION $(get_libdir),g" \
-		-e "/\(cmake\|samples\)/s,DESTINATION \.,DESTINATION share,g" \
+		-e "/cmake DESTINATION/d" \
 		-e "/CPACK_RESOURCE_FILE_LICENSE/d" -i packaging/CMakeLists.txt || die
 
 	pushd ${HIP_S} || die
@@ -150,6 +156,11 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_compile() {
+	HIP_PATH=${HIP_S} docs_compile
+	cmake_src_compile
+}
+
 src_install() {
 
 	cmake_src_install
diff --git a/dev-util/libabigail/Manifest b/dev-util/libabigail/Manifest
index 6ce9b2d982fc..7215e148254d 100644
--- a/dev-util/libabigail/Manifest
+++ b/dev-util/libabigail/Manifest
@@ -1,4 +1,4 @@
 AUX libabigail-2.0-musl.patch 1911 BLAKE2B 58f9099cde19a18a44f2e1db208b74b8ee7371c2033da539b46af824d29067e13a543619013012d8fe8ca718cc7ee37fd06314608bcca53b2177d5d84cf54a86 SHA512 4591d3f838ac42e28ae28e059be0837c473edd41b44e942e5a7fbe324ed57afdf6244d4a93696b4498ab3c8d74fcb7175abbe951e4b2ef45ef59f985fa846ec3
 DIST libabigail-2.0.tar.gz 286383045 BLAKE2B 2ba6f59bcd7a1484c4a60c6c9f212ad76af239a552d2cc9e47748e0db52363afadd7a99ef3e123c263de34b416f71b9d679bf2a5c542c419bb38ee75f3d5c57b SHA512 288f63f3495f0cd38258c50b78f30a573e43ab60494fefa22c8cba6d6776c5f94742ffea26297a232b78d25f6804f1b3f51febd59ec487733e6ef683cef2c180
-EBUILD libabigail-2.0.ebuild 1632 BLAKE2B f7f4aa5c3c11176d3191acf9a0b048d9f7f5a32b02e4108423d27c289981f7709db42f1d4505ae83ef316f75b3b1abc6db31b481467fd8eb996f5b8832a86e54 SHA512 66544588fc517196bad4ead42f4c69f2de22e7d6b734d63e853857eebb5e60ec2771d9124d2811a47abf62b9ade97eeb34de39af2474b443b287f25f82419e9d
+EBUILD libabigail-2.0-r1.ebuild 1799 BLAKE2B 09bd488160175ed6215731a1ca5e5ae124c3154a79a7cbdffb38e694af3127bfddb218c5344b98802c160eed3e155cb3b30d6a51c798667861a1f5ac5ffaa5eb SHA512 d5bc22432ba3e4dfb7df1d964682df5e8952ce0afa014ef4764df8fbf7a1b9c942ec13c69b1da12b829a97f41644ffafb4729ea71245dd408d0cbebb3511a0a0
 MISC metadata.xml 245 BLAKE2B 4ac08132cfdd18d0ef2c38470da5045bca296f4975a8fa1e7094c1f6f524ebf02103d487ae7d6d0bb1c912d46eb207a74a417bbdc10bc92499331112f15392e6 SHA512 fa5b2d519f191de35a1f8719e8ba7ea346c54173c797e152df2aeefda32dfb0e0741ff171b87e1ee835c1d5383f424b8bb276d597bdf2fe911525bd5719cab9d
diff --git a/dev-util/libabigail/libabigail-2.0.ebuild b/dev-util/libabigail/libabigail-2.0-r1.ebuild
index 8c7bf65df427..96de89727269 100644
--- a/dev-util/libabigail/libabigail-2.0.ebuild
+++ b/dev-util/libabigail/libabigail-2.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit autotools python-any-r1 out-of-source
+inherit autotools bash-completion-r1 python-any-r1 out-of-source
 
 DESCRIPTION="Suite of tools for checking ABI differences between ELF objects"
 HOMEPAGE="https://sourceware.org/libabigail/"
@@ -75,6 +75,11 @@ my_src_install() {
 my_src_install_all() {
 	einstalldocs
 
+	local file
+	for file in abicompat abidiff abidw abilint abinilint abipkgdiff abisym fedabipkgdiff ; do
+		dobashcomp bash-completion/${file}
+	done
+
 	# no static archives
 	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-util/librnp/Manifest b/dev-util/librnp/Manifest
index d19fa4767506..ac808c03e6fe 100644
--- a/dev-util/librnp/Manifest
+++ b/dev-util/librnp/Manifest
@@ -1,3 +1,5 @@
 DIST librnp-0.16.0.tar.gz 2755417 BLAKE2B bdd06b1bd20ae816b54be19fa844767e9978eb387487db85db2dcd699da1d1b426455565a6c0508bf3782e07317d3bf6ae3613ebe6f8721f80849cb985e7850f SHA512 3d1ba077f85b08ca308d0ebc6499b3a2f32db38f0fd3abbfa7c38277d4552d2bcb7b2e7d07b7fa3222130af347b73d853136974ec289d6de3e97c1e18e407b36
+DIST librnp-0.16.1.tar.gz 2897069 BLAKE2B 0ce261a5f1229ab1567d4726b8d75eaf3fa72774ef66280bd587f28282371cde9691de24de329f8209f99c76dc6cf01e7c711e1bd3fd47b8b145762936a1b655 SHA512 948d8c1342c34ec850605b79b490d6da3094b4fb1f8435f4c928473c15a0df364f2ad56091f4b746afc98119d85137cf7b341c72054ccac79ab236f13cca48f4
 EBUILD librnp-0.16.0.ebuild 1021 BLAKE2B 9e608b9c201584ec17ccef7d08f16901d35464628778e7b4bb021ebfcfe9791a4ab838259e4c9a1709fd01849546a36134a70918dcbe4fa21c0daaffcf629bb4 SHA512 ff997a44da8262838135052fbc8b67f90a7d3262ddec9a8728377289dda33ca2b88e881dd67a1b260ca0faf1ca38cd36128b06f8db6ebd430b26e03f7c9cb400
-MISC metadata.xml 339 BLAKE2B 435d74e705e406e63a6349676c46f3a9ce2fb6b3952bd36d31372cadf163ab1f61ba7bfb4de16e4586695783cf9bd3cbd29b67bfe236c6e1fb52e1e2edab14cc SHA512 5431a0d99435dd7001c179159cb728e2b0af71c0c3df23856e1cbc794af2b0808b046de6ead30a8679cace52f67667f5ab634f9ffb04efedf4f24a247eb4f211
+EBUILD librnp-0.16.1.ebuild 1747 BLAKE2B 09dd5d19778e51b1b66bc2ed5b6bcb2fc0a2fbac93283ea90f883cca8e5af26e138a5d4bfa8fd7421d58f9f980e53367bc6d2a7e9398fca25eeb6c37902d2790 SHA512 79f346bc6a991503d0791e12fce50f8e98ea604e14e9e5df3edb7b0317429cdb575c5bdd1328bcf7c9c356b18d032842704de848682d738d476e18cc1a74c43b
+MISC metadata.xml 430 BLAKE2B 739d6cddc56f385ad2b1679f6b3d9ba567ce77ec536894ca3861ad7ad127fd60c395db49b31d89963df12c03d8cf69fc6f083f5d3361b790079952c1e76ccf03 SHA512 ad7b3e6332741e1f2eae9e158d5ca767f5985a8f5c86eb5f21b7ee0214b9c7fdd2e90beddf1a9287218edf35aff39bd7ff1a4f1d15eb10552ab664738f8d1959
diff --git a/dev-util/librnp/librnp-0.16.1.ebuild b/dev-util/librnp/librnp-0.16.1.ebuild
new file mode 100644
index 000000000000..b6ba813ff651
--- /dev/null
+++ b/dev-util/librnp/librnp-0.16.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="High performance C++ OpenPGP library"
+HOMEPAGE="https://www.rnpgp.org/ https://github.com/rnpgp/rnp"
+SRC_URI="https://github.com/rnpgp/rnp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2"
+SLOT="0/0.16.1"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+botan man test"
+
+RDEPEND="app-arch/bzip2
+	dev-libs/json-c:=
+	sys-libs/zlib
+	botan? ( dev-libs/botan:2= )
+	!botan? ( >=dev-libs/openssl-1.1.1:= )"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
+BDEPEND="man? ( dev-ruby/asciidoctor )"
+
+RESTRICT="!test? ( test )"
+S="${WORKDIR}/${P/*lib/}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test on off)
+
+		-DCRYPTO_BACKEND=$(usex botan botan openssl)
+
+		-DDOWNLOAD_GTEST=off
+		-DDOWNLOAD_RUBYRNP=off
+
+		-DENABLE_COVERAGE=off
+		-DENABLE_DOC=$(usex man on off)
+		-DENABLE_FUZZERS=off
+		-DENABLE_SANITIZERS=off
+	)
+
+	if use botan; then
+		local mycmakeargs+=(
+			-DENABLE_AEAD=on
+			-DENABLE_BRAINPOOL=on
+			-DENABLE_SM2=on
+			-DENABLE_TWOFISH=on
+		)
+
+	# OpenSSL support is still not as complete as botan.
+	# https://github.com/rnpgp/rnp/issues/1642 AEAD,
+	# https://github.com/rnpgp/rnp/issues/1902 BRAINPOOL,
+	# https://github.com/rnpgp/rnp/issues/1877 SM2,
+	# https://github.com/openssl/openssl/issues/2046 TWOFISH.
+	else
+		local mycmakeargs+=(
+			-DENABLE_AEAD=off
+			-DENABLE_BRAINPOOL=off
+			-DENABLE_SM2=off
+			-DENABLE_TWOFISH=off
+		)
+	fi
+
+	# Broken in 0.16.1.
+	# https://github.com/rnpgp/rnp/issues/1901
+	local mycmakeargs+=( -DENABLE_IDEA=off )
+
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die
+	ctest -j"${MAKEOPTS}" -R .* --output-on-failure || die
+}
diff --git a/dev-util/librnp/metadata.xml b/dev-util/librnp/metadata.xml
index 086e8d1f3ea1..1e8aefe95c28 100644
--- a/dev-util/librnp/metadata.xml
+++ b/dev-util/librnp/metadata.xml
@@ -5,6 +5,9 @@
     <email>mozilla@gentoo.org</email>
     <name>Gentoo Mozilla Team</name>
   </maintainer>
+  <use>
+    <flag name="botan">Use Botan crypto backend instead of OpenSSL</flag>
+  </use>
   <upstream>
     <remote-id type="github">rnpgp/rnp</remote-id>
   </upstream>
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 37130dca103d..88c9cb0ec48a 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,3 +1,5 @@
 DIST meld-3.20.4.tar.xz 617020 BLAKE2B 70bdd7c6ecfd4dd99d1bc0b503900da65563ba74469b97590da4971d0597d4023cf74a3fd6300701d73fe7ed1b646089a5b23527e4a519313816f53c31632dad SHA512 e7b5c07e68972e7e8e4d396140fa2ee627609728533269f1bc52e9339e89a58f0949a1e8ec7b7847eec3eff5a67ea0bd5e07ad8002d2c640d173f9b0c4aa724e
+DIST meld-3.22.0.tar.xz 674212 BLAKE2B 1d5af5fa9943c46fd150bd1e1c74003579a0017dea56178e92c4ba0dd1ba0bc3348a6f2625bfe5191fe4d8394b06462a30f2173ae623ffd32c637642f9c36183 SHA512 4cc1c9a76379401c1f116292bb4730301ec0f2413cdab7b463ed519ea7ee0ee86143a9c83a13f1ef09860aad192c04769d111bfb1eb10b5e1bc81fb44c530526
 EBUILD meld-3.20.4.ebuild 1732 BLAKE2B 011373c0cb2155e968c762e1132fff049a6f34f6027b41f24352ea13cf5d603d374d754ff7008fb91ec1f332002f18e7cb7538edeedc4b15c65fe213557f4957 SHA512 1de351b39e4c3d47c7205bfaba733197960c1cc7e1709082e79cfc71a1ee2148d41654843a492bd4eeec708e8ee464fa36c366f08c638cd88cd8a7a3334f36c3
+EBUILD meld-3.22.0.ebuild 1466 BLAKE2B c060f32e42159746f8cbc3a306db77831f8db9a9b2226a448824e7f367abe497b76243ed37e5ebf8cb9145c9db0c323943df44e74b1b52d5f3be0596e17f6001 SHA512 ccb01545b09f849eeca312d582093b06502250ebc239e1039d53c653e480a3cb06a2b3d87b459c94b04b3feffbf1ef5dc8281dd267179c4933dcecb14894192c
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-util/meld/meld-3.22.0.ebuild b/dev-util/meld/meld-3.22.0.ebuild
new file mode 100644
index 000000000000..546bbe598e0a
--- /dev/null
+++ b/dev-util/meld/meld-3.22.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit gnome.org meson python-single-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=x11-libs/gtk+-3.20:3[introspection]
+	>=dev-libs/glib-2.48:2
+	>=x11-libs/gtksourceview-4.0.0:4[introspection]
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.30:3[cairo,${PYTHON_USEDEP}]
+	')
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/pango-1.34[introspection]
+	x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-util/desktop-file-utils
+		dev-libs/appstream-glib
+	)
+"
+BDEPEND="
+	dev-util/intltool
+	dev-util/itstool
+	sys-devel/gettext
+	$(python_gen_cond_dep 'dev-python/distro[${PYTHON_USEDEP}]')
+"
+# dev-python/distro is soft-required in BDEPEND for python3.8 and onwards,
+# but it's mainly needed for debian and derivatives - seems the fallback
+# works fine, as we aren't a special_case, just an annoying warning.
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dprofile=''
+		-Dbyte-compile=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index fe2d9400aeb8..2e40496c04c8 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,3 +1,4 @@
+AUX meson-0.63-xtools-support.patch 1136 BLAKE2B 7600b29f1c4accbf33ca587b848566d4f9d30e26695b125aa895ec8a48ee0f7355c7692845c0d9bbb59eb452fc0cd8b634bd2a90d8918efa0b65ef4759b56d8e SHA512 725b193afe229690b6ef0d7a2a832695b7c09ca3376512097baec597a84df6e8e18791e9f29221e8a4a3537ad2371672e74041aa05ec6a218ed9b6218ea2ab61
 DIST meson-0.62.2.tar.gz 2038542 BLAKE2B 51446cd348f3e8681a61ebecf95f5aafcafd90654e3c86d87ee2b68239237bd889b667f3c6543faba7d4b98d7e0ed73d96c6a988913e5262d3b9611b80ff8db2 SHA512 4089588701f0f702eb3b794e0ede78b99f13ec7545d1a7470c7bfd6a857de59673684a543928dd578402578c53f38365a3a59e3e29022fd30a525353818a4195
 DIST meson-0.63.0.tar.gz 2060688 BLAKE2B 763d35a6dee42d7ef61b00c472681042289f38737374178d43eb8e66c3abe38affd372fca7aea4f4c7cd52f25ad3754485f54f24ac5e453b7a58011397ddbbb8 SHA512 8d427261bb42d2bd1da7d4f7b5f53908044aa2cea6d020fb320b0ab9d9848e17cf28deb12ae6dc139807f9e377db0c8a546561e94301216b634bd77703f17cea
 DIST meson-0.63.1.tar.gz 2064118 BLAKE2B 2d7bf439ed096cc38d9e676a8837069d10f34299cc5a61773df7a27d9a67fd33ce3b4193f33b35e5d77dc5cc346098e427f70f0dc0eafcebce055940420c785e SHA512 25f96e18bcdbb6346c44d9f8e63035d6cb3d8f781cf43ac5530ddd6f8090f4d16d192f8d331240154602e92b498b410fabb1381dc5f39db1dfb9da05a964d44e
@@ -5,6 +6,6 @@ DIST meson-0.63.2.tar.gz 2063397 BLAKE2B 765ef8994168bb149cce4dbbbdab4a5531b1c11
 EBUILD meson-0.62.2.ebuild 2848 BLAKE2B 0f1794a5141c01af083d614e9acd9d37461a0ffc68f71d33177bf934efe1261c260c1518e502552193d45814529335e9a98ba1ceb78349cf243bcdbe6eb3b12d SHA512 d333739fa3d7557cf9e84950004c1539c072ce43a3dcd88bd1409af4961ab2a37cf2989ed34fd0c6e80bf79d66a53f0e7e9d550e5e802d8b70ecc7f54a3dcd68
 EBUILD meson-0.63.0.ebuild 2895 BLAKE2B 8927bd8e995e0dcd1de37d303f5ee045dcd3a5969078f1619ccbb4b360da151fa7e5859a033548ffb7fa3002047f9e204d24c0e8568b2e06932f7091336eff97 SHA512 6b1af00bb3305ff75b19d7e442df9978a05a754aa244e2a19e5272316761dbac12ff23b4f7ba96122c6744f72aaf58f9567f182e9e115695133a7933152b45da
 EBUILD meson-0.63.1.ebuild 2895 BLAKE2B 8927bd8e995e0dcd1de37d303f5ee045dcd3a5969078f1619ccbb4b360da151fa7e5859a033548ffb7fa3002047f9e204d24c0e8568b2e06932f7091336eff97 SHA512 6b1af00bb3305ff75b19d7e442df9978a05a754aa244e2a19e5272316761dbac12ff23b4f7ba96122c6744f72aaf58f9567f182e9e115695133a7933152b45da
-EBUILD meson-0.63.2.ebuild 2895 BLAKE2B 8927bd8e995e0dcd1de37d303f5ee045dcd3a5969078f1619ccbb4b360da151fa7e5859a033548ffb7fa3002047f9e204d24c0e8568b2e06932f7091336eff97 SHA512 6b1af00bb3305ff75b19d7e442df9978a05a754aa244e2a19e5272316761dbac12ff23b4f7ba96122c6744f72aaf58f9567f182e9e115695133a7933152b45da
-EBUILD meson-9999.ebuild 2895 BLAKE2B 8927bd8e995e0dcd1de37d303f5ee045dcd3a5969078f1619ccbb4b360da151fa7e5859a033548ffb7fa3002047f9e204d24c0e8568b2e06932f7091336eff97 SHA512 6b1af00bb3305ff75b19d7e442df9978a05a754aa244e2a19e5272316761dbac12ff23b4f7ba96122c6744f72aaf58f9567f182e9e115695133a7933152b45da
+EBUILD meson-0.63.2-r1.ebuild 2955 BLAKE2B ce83a122ad852be0032506fdde5a0948ce56fc94acb61f84002dfece2c36320040fbae9c4ced3f37023bac0fcf97c9d391c5286d2401a941ff7d0f2e786f2703 SHA512 abaa87cd7153c900120c1dcdffec5ea4232128a6848a7f5cdb736b07f906bd28dd6942b5bea39f9841f7be2c087c9ddd7cbb0cf3cb519e5a5731d0b0f1e5ccdd
+EBUILD meson-9999.ebuild 2955 BLAKE2B ce83a122ad852be0032506fdde5a0948ce56fc94acb61f84002dfece2c36320040fbae9c4ced3f37023bac0fcf97c9d391c5286d2401a941ff7d0f2e786f2703 SHA512 abaa87cd7153c900120c1dcdffec5ea4232128a6848a7f5cdb736b07f906bd28dd6942b5bea39f9841f7be2c087c9ddd7cbb0cf3cb519e5a5731d0b0f1e5ccdd
 MISC metadata.xml 480 BLAKE2B 5d3a0af4d84e497dcc2ccd5eb680e898beda896d5c37dc71fcaad2fe63f436f758d356990a5bca06baee9d265389b6e7084daec90d13c004f5523df4d0badbff SHA512 748f91fc17a18302ad0892d458e8e59650ab23dd3db5e83da85cfbca03d7932633c37b16f039faa12d87f6e4ec75a7a7fe4cc22f17328e61d57d99b073b6df3f
diff --git a/dev-util/meson/files/meson-0.63-xtools-support.patch b/dev-util/meson/files/meson-0.63-xtools-support.patch
new file mode 100644
index 000000000000..ea1e8597b00a
--- /dev/null
+++ b/dev-util/meson/files/meson-0.63-xtools-support.patch
@@ -0,0 +1,26 @@
+linkers_detect: detect xtools (Apple ld64 derivative)
+
+xtools is in use on x86_64 and ppc based darwin Prefix installs.  Pick
+it up as a valid linker.
+
+Meson is the only thing known at this point to try and figure out what
+linker is in use exactly, so instead of changing the linker (xtools),
+just teach Meson about xtools.
+
+Author: Fabian Groffen <grobian@gentoo.org>
+Bug: https://bugs.gentoo.org/868516
+
+--- a/mesonbuild/linkers/detect.py
++++ b/mesonbuild/linkers/detect.py
+@@ -188,6 +188,11 @@
+             v = search_version(o)
+ 
+         linker = LLVMDynamicLinker(compiler, for_machine, comp_class.LINKER_PREFIX, override, version=v)
++    # detect xtools first, bug #868516
++    elif 'xtools-' in o.split('\n')[0]:
++        xtools = o.split(' ')[0]
++        v = xtools.split('-')[1]
++        linker = AppleDynamicLinker(compiler, for_machine, comp_class.LINKER_PREFIX, override, version=v)
+     # first might be apple clang, second is for real gcc, the third is icc
+     elif e.endswith('(use -v to see invocation)\n') or 'macosx_version' in e or 'ld: unknown option:' in e:
+         if isinstance(comp_class.LINKER_PREFIX, str):
diff --git a/dev-util/meson/meson-0.63.2.ebuild b/dev-util/meson/meson-0.63.2-r1.ebuild
index 14ecaa4f465b..f2e31397c003 100644
--- a/dev-util/meson/meson-0.63.2.ebuild
+++ b/dev-util/meson/meson-0.63.2-r1.ebuild
@@ -37,6 +37,10 @@ DEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.63-xtools-support.patch
+)
+
 python_prepare_all() {
 	local disable_unittests=(
 		# ASAN and sandbox both want control over LD_PRELOAD
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index 14ecaa4f465b..f2e31397c003 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -37,6 +37,10 @@ DEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.63-xtools-support.patch
+)
+
 python_prepare_all() {
 	local disable_unittests=(
 		# ASAN and sandbox both want control over LD_PRELOAD
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index eef5df61e2af..2e3452352bff 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,5 +1,3 @@
-AUX CVE-2022-1437.patch 2434 BLAKE2B 8671f028406cea47719c393f6a96d3f32a569bf5dd9e97a215326c19fb273c569119a6f79d63e2a9b93ea7def7c09c0110cb28e0c2ce60a345ed297f1a7168c0 SHA512 c32141bd9a282c0b6ba38468a7a77c2df26ad1153f5ada6b6bc0cb9d647fc462a54262272a4113fb7dc1adedb88c3b97e25798553b9b3f2c99d961f8e2a6ea37
-AUX radare2-5.5.0-vector35.patch 785 BLAKE2B 7e53aa1258290682827a1ab22a1bfeec12222c7e7c7acdde40a0845f47729918c41de9c59bcc1e79cbd1d318944245994c348e6d76f56852803ffda27206216f SHA512 3d5d7c682482973a00d78736c3d92d29711e729d01a220da5b89f66f27fae2c71cf40173d9ca9616709d4a2cc55a0450ae003e3d97998e0dfff5dcb64eba7675
 AUX radare2-5.7.0-vector35.patch 907 BLAKE2B f8bf7cd898a5bda19a50f8966b765bfe3d3b8bb39c9d7132fbe21e5c877400279ee7e79b4b0b367c46c05911cea401e7f2bcc1859ec7128321d7d6842a30ac78 SHA512 f6e2b1f5aa3fc33c09f273ecfc52dff7f9f4c1cf860e83f1928559a6555d0552b3b35aa02e7d1ebddd8c7d31757353779866581564bb8dd48b0dfb8da8beb154
 DIST radare2-5.7.4-vector35-arm64.tar.gz 1050970 BLAKE2B 17b9f730b514d959640bd259af9ebdb44b951eb839dc62160da167f2ea3906a60b10e20ff32561cc9b625dfffd1a83d25f484c91e1976d61a18dd04b9bed9862 SHA512 bee2f8685dc3760fd51eaa2ab9c68aed2833386145fe164ca6dfc4a5aab20596d1c6305167da2c7410c25be1391853f82fddc1cfa2bfa8e473d7f52129c44a3b
 DIST radare2-5.7.4-vector35-armv7.tar.gz 255288 BLAKE2B ca96b3f68381a0987c4efa10dcb798194486019762e89d1eb19a3fd24f6983535eea792099c60e4c1a9d2bdb5baab119fe2e9a7a889fad5a14023e5f984959b8 SHA512 e9eb6cee02bbbb265914b1f9118c7a143ed76a201c085af5516855475bf7f3ad5f9c82d1548e85a0339fbc33e029ef0e4be9d8cef68d212ae16ce1a7f18453ff
diff --git a/dev-util/radare2/files/CVE-2022-1437.patch b/dev-util/radare2/files/CVE-2022-1437.patch
deleted file mode 100644
index 16e67c5d3193..000000000000
--- a/dev-util/radare2/files/CVE-2022-1437.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- a/libr/bin/format/mach0/coresymbolication.c
-+++ b/libr/bin/format/mach0/coresymbolication.c
-@@ -269,6 +269,9 @@ RCoreSymCacheElement *r_coresym_cache_element_new(RBinFile *bf, RBuffer *buf, ut
- 		for (i = 0; i < hdr->n_sections && cursor < end; i++) {
- 			ut8 *sect_start = cursor;
- 			RCoreSymCacheElementSection *sect = &result->sections[i];
-+			if (cursor + (word_size * 4) > end) {
-+				goto beach;
-+			}
- 			sect->vaddr = sect->paddr = r_read_ble (cursor, false, bits);
- 			if (sect->vaddr < page_zero_size) {
- 				sect->vaddr += page_zero_size;
-@@ -359,6 +362,10 @@ RCoreSymCacheElement *r_coresym_cache_element_new(RBinFile *bf, RBuffer *buf, ut
- 				continue;
- 			}
- 			string_origin = relative_to_strings? b + start_of_strings : cursor;
-+			if (!string_origin) {
-+				cursor += R_CS_EL_SIZE_LSYM;
-+				continue;
-+			}
- 			lsym->flc.file = str_dup_safe (b, string_origin + file_name_off, end);
- 			if (!lsym->flc.file) {
- 				cursor += R_CS_EL_SIZE_LSYM;
---- a/libr/bin/p/bin_symbols.c
-+++ b/libr/bin/p/bin_symbols.c
-@@ -353,28 +353,30 @@ static bool check_buffer(RBinFile *bf, RBuffer *b) {
- }
- 
- static RList *symbols(RBinFile *bf) {
--	RList *res = r_list_newf ((RListFree)r_bin_symbol_free);
--	r_return_val_if_fail (res && bf->o && bf->o->bin_obj, res);
-+	r_return_val_if_fail (bf && bf->o && bf->o->bin_obj, NULL);
- 	RCoreSymCacheElement *element = bf->o->bin_obj;
- 	size_t i;
- 	HtUU *hash = ht_uu_new0 ();
- 	if (!hash) {
--		return res;
-+		return NULL;
- 	}
-+	RList *res = r_list_newf ((RListFree)r_bin_symbol_free);
- 	bool found = false;
--	for (i = 0; i < element->hdr->n_lined_symbols; i++) {
--		RCoreSymCacheElementSymbol *sym = (RCoreSymCacheElementSymbol *)&element->lined_symbols[i];
--		if (!sym) {
--			break;
--		}
--		ht_uu_find (hash, sym->paddr, &found);
--		if (found) {
--			continue;
--		}
--		RBinSymbol *s = bin_symbol_from_symbol (element, sym);
--		if (s) {
--			r_list_append (res, s);
--			ht_uu_insert (hash, sym->paddr, 1);
-+	if (element->lined_symbols) {
-+		for (i = 0; i < element->hdr->n_lined_symbols; i++) {
-+			RCoreSymCacheElementSymbol *sym = (RCoreSymCacheElementSymbol *)&element->lined_symbols[i];
-+			if (!sym) {
-+				break;
-+			}
-+			ht_uu_find (hash, sym->paddr, &found);
-+			if (found) {
-+				continue;
-+			}
-+			RBinSymbol *s = bin_symbol_from_symbol (element, sym);
-+			if (s) {
-+				r_list_append (res, s);
-+				ht_uu_insert (hash, sym->paddr, 1);
-+			}
- 		}
- 	}
- 	if (element->symbols) {
diff --git a/dev-util/radare2/files/radare2-5.5.0-vector35.patch b/dev-util/radare2/files/radare2-5.5.0-vector35.patch
deleted file mode 100644
index 5ebf58020d4d..000000000000
--- a/dev-util/radare2/files/radare2-5.5.0-vector35.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/libr/asm/arch/arm/v35arm64/Makefile
-+++ b/libr/asm/arch/arm/v35arm64/Makefile
-@@ -30,8 +30,7 @@ $(ALIBS): arch-arm64 arch-armv7
- 
- ## ARM64
- arch-arm64:
--	git clone -q https://github.com/radareorg/vector35-arch-arm64 arch-arm64
--	cd arch-arm64 && git checkout -q radare2 > /dev/null && git reset --hard $(ARCH_ARM64_COMMIT)
-+	cd arch-arm64 
- 
- $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS)
- 	rm -f arm64dis.$(EXT_AR)
-@@ -40,8 +39,7 @@ $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS)
- 
- ## ARMV7
- arch-armv7:
--	git clone -q https://github.com/radareorg/vector35-arch-armv7 arch-armv7
--	cd arch-armv7 && git checkout -q radare2 > /dev/null && git reset --hard $(ARCH_ARMV7_COMMIT)
-+	cd arch-armv7 
- 
- $(V35ARMV7_HOME)/armv7dis.a armv7dis.a: $(ALIBS)
- 	rm -f armv7dis.$(EXT_AR)
diff --git a/dev-util/rizin/Manifest b/dev-util/rizin/Manifest
index 8dba76914b1c..3e35d7cb595d 100644
--- a/dev-util/rizin/Manifest
+++ b/dev-util/rizin/Manifest
@@ -1,6 +1,9 @@
 AUX rizin-0.4.0-capstone.patch 681 BLAKE2B ad680ca6ee4782d0a164048e9884a3154fd817ffea42810dc3e11ebd9b5254da7fa1c1379180ba43eec9d3b1966329ffbc7a807df1beee6bcc9879e7e7b5cb65 SHA512 dca9648697d9b419002d27de4ac562ec519c4ffd2161960c489c90e5c0950beaac7a7e9b86cfa32a34efdf60f11fd953547b9a37fe457fe294b5516e5d07d412
 AUX rizin-0.4.0-never-rebuild-parser.patch 1568 BLAKE2B c77276adb8349188ebc937d84b011650b978ba5bed6c0596258963d395014c5e0733e44930b4c2db6dd88941d99b2aa37acf461d035fc31dcd321571ef0d6392 SHA512 a46311772dc42b90b8e3e49ddb66f6d64873773e254ac943934de0129d5f4a77ccb759d20b519b58418d45c076f136d582f2e70056693c75b2f6aae19eb07551
 DIST rizin-src-v0.4.0.tar.xz 11432232 BLAKE2B 095ca9d317296afca9514a70f208e9aa87fc426e6b7e41163f64d5a1192a4d9ccd8ece9c4f13a24fc973668dece625fa13ad75542695a66c542fe2f0d9e66733 SHA512 9d576bee48e5ceae46b4e309c53e01b82edf89a95046f576e1c38fefa73353d6d1f04e6d444332324387d4e115bc87659a358629f7277a41dfef44c82364547b
+DIST rizin-src-v0.4.1.tar.xz 11453808 BLAKE2B dcae21320e2533904d9a337d4fb9cc9a450439753106dc5c341e3ca7c788f0a44034340eb0dfe3fad4f1d8a7ebe873720d42d70ce343e8c7b953d4d148a38da2 SHA512 565358e11fd4db44ec7f8c25313a1cfc726c38a17afcb699c3fc2af520242fb343ea4a267f0a8e35bdc08e9a765a6a17ec7b8eaba9f9ad9ef5a7dcfe01c7354c
 DIST rizin-testbins-64a6f26369bf5893ecc20cb8984a5ad506ef8566.tar.gz 172591261 BLAKE2B e78843fd95ac0406f66490b7253206e77787fc65780bc7c6a67d26aa9618a6f85803a88724ad424a7bdeeb20d95ebf9314e582029ac778d7d4de4f207ff54aad SHA512 ada4a3faad94553f0f2802419ba604177bb66d332b1a351effd485d65bd8365abb36d736486bbd0bcbc0da584ad4a2edaa7aa3cb62fa12811282c2e0afecb950
+DIST rizin-testbins-aef7f7b714a696f382f55b8cbbf94c5b69518de3.tar.gz 178497762 BLAKE2B 8c82a537a58e65d35bd8b309311c4377b5996ff4b650fc6cff4cf347e04fbe4b2ec0e88f03ff43572c8e99675186b05b393b7da070a60ab107c3cca829d2544b SHA512 2745b58646963c28a45b46e8e709845c355863e61cf796aeb3d2e617f1bf2f9916a4b106cd08f48b1ef6e36f7f38624b5977dcd62c921124b0a1122b7220baa8
 EBUILD rizin-0.4.0-r1.ebuild 2482 BLAKE2B 6e24b0d62bc4a01c9cf7cdeabd3526c06133679435cc1c184901e10caaf6f9880d99b25d14a6420d08ddb10304381e2845f9d358bc1e63b4eef92a22e5bb7889 SHA512 8bc1f55ef8c2d4026aac7cbffa6be4687856607b324f6619b1ae0a10ac671ccc69f63496cff533e2472406944fee56c92e65e6ecdce77cc37401a14cd93174f0
+EBUILD rizin-0.4.1.ebuild 2447 BLAKE2B 18afb0d0b664e636ffd6f605befe22621594045cac56cb3c90968cd2bb18e363a2192b61d55406c7ac1866eb2b15d47c2ed5295402bfa547940509bf7d6fa35f SHA512 a2d103f22892db99233377c9f994d744a9171608adfe16a655fe11d60c3d12275afabdcb96ec43c2beea041eeae116f7ebe170da25e2ba36165711c26753a6c0
 MISC metadata.xml 348 BLAKE2B eea14d9f2e713f2f272a46bd754e500b28ec3958f0f4295e6fe6e73c9dcfa1e180fa62901bdb591fdb43ec8ead23a63f20416e52605e6ae186532e651e0eb1a3 SHA512 db41ccd0ce1493387c47eb707dd303c556ad784ffab2ffe03509a4ff7b0c1b650b0f0999edb5e4e040f95f1f550e9a11ead273ec74ebedb97e645e40c6ad37d5
diff --git a/dev-util/rizin/rizin-0.4.1.ebuild b/dev-util/rizin/rizin-0.4.1.ebuild
new file mode 100644
index 000000000000..1fcd320b67bf
--- /dev/null
+++ b/dev-util/rizin/rizin-0.4.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+# This is the commit that the CI for the release commit used
+BINS_COMMIT="aef7f7b714a696f382f55b8cbbf94c5b69518de3"
+
+inherit meson python-any-r1
+
+DESCRIPTION="reverse engineering framework for binary analysis"
+HOMEPAGE="https://rizin.re/"
+
+SRC_URI="mirror+https://github.com/rizinorg/rizin/releases/download/v${PV}/rizin-src-v${PV}.tar.xz
+	test? ( https://github.com/rizinorg/rizin-testbins/archive/${BINS_COMMIT}.tar.gz -> rizin-testbins-${BINS_COMMIT}.tar.gz )"
+KEYWORDS="amd64 ~arm64 ~x86"
+
+LICENSE="Apache-2.0 BSD LGPL-3 MIT"
+SLOT="0/${PV}"
+IUSE="test"
+
+# Need to audit licenses of the binaries used for testing
+RESTRICT="fetch !test? ( test )"
+
+RDEPEND="
+	sys-apps/file
+	app-arch/lz4:0=
+	dev-libs/capstone:0=
+	dev-libs/libuv:0=
+	dev-libs/libzip:0=
+	dev-libs/openssl:0=
+	>=dev-libs/tree-sitter-0.19.0
+	dev-libs/xxhash
+	sys-libs/zlib:0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.4.0-never-rebuild-parser.patch"
+)
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+src_prepare() {
+	default
+
+	local py_to_mangle=(
+		librz/core/cmd_descs/cmd_descs_generate.py
+		subprojects/lz4-1.9.3/contrib/meson/meson/GetLz4LibraryVersion.py
+		subprojects/lz4-1.9.3/contrib/meson/meson/InstallSymlink.py
+		subprojects/lz4-1.9.3/tests/test-lz4-list.py
+		subprojects/lz4-1.9.3/tests/test-lz4-speed.py
+		subprojects/lz4-1.9.3/tests/test-lz4-versions.py
+		sys/clang-format.py
+		test/fuzz/scripts/fuzz_rz_asm.py
+		test/scripts/gdbserver.py
+	)
+
+	python_fix_shebang "${py_to_mangle[@]}"
+
+	if use test; then
+		cp -r "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
+		cp -r "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}" || die
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dcli=enabled
+		-Duse_sys_capstone=enabled
+		-Duse_sys_magic=enabled
+		-Duse_sys_libzip=enabled
+		-Duse_sys_zlib=enabled
+		-Duse_sys_lz4=enabled
+		-Duse_sys_xxhash=enabled
+		-Duse_sys_openssl=enabled
+		-Duse_sys_tree_sitter=enabled
+
+		$(meson_use test enable_tests)
+		$(meson_use test enable_rz_test)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	# We can select running either unit or integration tests, or all of
+	# them by not passing --suite. According to upstream, integration
+	# tests are more fragile and unit tests are sufficient for testing
+	# packaging, so only run those.
+	meson_src_test --suite unit
+}
diff --git a/dev-util/seer/Manifest b/dev-util/seer/Manifest
index e1edb79644b6..0cdd51ddba8e 100644
--- a/dev-util/seer/Manifest
+++ b/dev-util/seer/Manifest
@@ -1,4 +1,6 @@
+DIST seer-1.10.tar.gz 367629 BLAKE2B e09ed500103428d5aee7138beb2cf8b2dafa167e2c6e3e60d0a5e26be358945af8544a9165dda835b2ec44264da4d16a3a44398000392263d690c6080cad914f SHA512 b691b433e206c78b121a48578ac632f236ca8734f9ee6c5e9c0eb3503ac11ee786595d66ef15c46e7ae5b31a58b444b7631cea2ef67389f0be7e292c7d2279ef
 DIST seer-1.9.tar.gz 337520 BLAKE2B 2c5a68cbc9a0530596501d2c92dfaccfe69f9b7fadc033efcb64b66a60a8f67e6e7bc06173bd5fd844ba104364328d30c017187143b2e1ea957b5a59fb3a7723 SHA512 e23a389d624488db445477687ea2129f8ef7364ea22229be6a79653878a73d328a3a7cde0233c951129dbc7478b0b5e3cfe37b694fe3eece030e37ad6a7ce87d
+EBUILD seer-1.10.ebuild 939 BLAKE2B c2e94cfe86db4f938afa2a1262364f71e8299e9a7df6b0b2250713211acee662072b94d2c3b83ec899b9eb26fb4818cca4d93cce6733bce0784c1a3410c5d857 SHA512 6165033e812c43ed711ca73d9fceb650ee8f5561e88221b3374cbb68715a975cf13664d2cdb0032f1a21bebc5830965bde6f8ee1c84e83a693c278841f0b6741
 EBUILD seer-1.9-r2.ebuild 827 BLAKE2B 223afed689bd5796acd44f12cafd687126d1522250ab67ffcde24ffd34169923dba05d09c90111aced86473263ca59b05c10766d8f6f3face7d06ecd05d72766 SHA512 73501710567735d0bf26f6882f7742025b3f8cb1cf58cae64696c238a5af1d34075ca16f664ae727eb771e6a917fdec725abb9606b15cff80f956f9489287834
-EBUILD seer-9999.ebuild 827 BLAKE2B 223afed689bd5796acd44f12cafd687126d1522250ab67ffcde24ffd34169923dba05d09c90111aced86473263ca59b05c10766d8f6f3face7d06ecd05d72766 SHA512 73501710567735d0bf26f6882f7742025b3f8cb1cf58cae64696c238a5af1d34075ca16f664ae727eb771e6a917fdec725abb9606b15cff80f956f9489287834
+EBUILD seer-9999.ebuild 939 BLAKE2B c2e94cfe86db4f938afa2a1262364f71e8299e9a7df6b0b2250713211acee662072b94d2c3b83ec899b9eb26fb4818cca4d93cce6733bce0784c1a3410c5d857 SHA512 6165033e812c43ed711ca73d9fceb650ee8f5561e88221b3374cbb68715a975cf13664d2cdb0032f1a21bebc5830965bde6f8ee1c84e83a693c278841f0b6741
 MISC metadata.xml 318 BLAKE2B a34dc163a2b5e0fc9db7808eaa083a7b978a5578db14c5f33e870a2b73ec21f056c3b287997e8db4c1951e8d56852df746fccc30cf47ad24fdbae13896329014 SHA512 4c3706be2572cfb702b357753b35deb33199ed701d95b37f005919e374712ee5412a8b9214ea4c3c82e8371457b5571ed9a055b1df963196650a64e8c0d67fbd
diff --git a/dev-util/seer/seer-1.10.ebuild b/dev-util/seer/seer-1.10.ebuild
new file mode 100644
index 000000000000..ecf4ab10dc4a
--- /dev/null
+++ b/dev-util/seer/seer-1.10.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop xdg
+
+DESCRIPTION="A GUI frontend to gdb"
+HOMEPAGE="https://github.com/epasveer/seer"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/epasveer/seer"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/epasveer/seer/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+S="${WORKDIR}"/${P}/src
+
+# Upstream keep 'debian/copyright' up to date
+# https://github.com/epasveer/seer/issues/86
+LICENSE="GPL-3+ CC-BY-3.0 CC-BY-4.0"
+SLOT="0"
+
+DEPEND="
+	dev-qt/qtcharts:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="
+	${DEPEND}
+	sys-devel/gdb
+"
+
+src_install() {
+	cmake_src_install
+
+	domenu resources/seergdb.desktop
+
+	local size
+	for size in 32 64 128 256 512 ; do
+		newicon -s ${size} resources/seergdb_${size}x${size}.png seergdb.png
+	done
+}
diff --git a/dev-util/seer/seer-9999.ebuild b/dev-util/seer/seer-9999.ebuild
index b5ad9e01cc7a..ecf4ab10dc4a 100644
--- a/dev-util/seer/seer-9999.ebuild
+++ b/dev-util/seer/seer-9999.ebuild
@@ -18,7 +18,9 @@ fi
 
 S="${WORKDIR}"/${P}/src
 
-LICENSE="GPL-3"
+# Upstream keep 'debian/copyright' up to date
+# https://github.com/epasveer/seer/issues/86
+LICENSE="GPL-3+ CC-BY-3.0 CC-BY-4.0"
 SLOT="0"
 
 DEPEND="
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index a790c57651a4..e380077db0f8 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -11,6 +11,6 @@ DIST valgrind-3.19.0.tar.bz2 16403296 BLAKE2B d3ccd25789ec4d87a0ddab58d8098246a3
 EBUILD valgrind-3.16.1.ebuild 3703 BLAKE2B 311cbc2ba147e6bde2c6e8352eed928361be75f96c84086870b45decf3675107a2fdae7ae48bca5ddbc1ea5dbbd29bdb886b15f514bbb40d7eaf65772e46f5f3 SHA512 9f87ff366eb7e51d697527350c8135778537b8d2a09ceddc38e96b830f07eed040ade236bb204637e625b336f12508ed36240d0f8818aaa2e60a64e136947ead
 EBUILD valgrind-3.17.0.ebuild 3749 BLAKE2B 6d2fa93b2b3beee059041ea84c24ce99b96379907b707745d90799db4a4e5d034cd34cbaf22c8ef1a61be0c5d4f47877e71ea40080e36f58e5310153a46d0e86 SHA512 c892f4b885b12b9acd73e1a7c1af38256c72329d322ba9f1d1a9d4e815c1eea03e5754376be404a752735c84a1ec8213b0fcf2b010d222967ef71c409d7aea0c
 EBUILD valgrind-3.18.1.ebuild 3703 BLAKE2B 8cebf6e55574abde88bb9cb173c35ccb283b1b7c4d62664d26137478f5174b6ca7c366100e09540357caa27d4a221d8e3b5225aaa019fd6b1c7cfe6928932569 SHA512 eba7ba77309a201722ccb4b1e30e1ab7f41a3b90344e4003c64e34cc3e7d71adcba2efe829b31622e9fc2258a49ecda0e84a1b48bd245e8b795518b31d868cac
-EBUILD valgrind-3.19.0.ebuild 3964 BLAKE2B 8cb9ec4bf7095a4c898349cf2a690f4eb41436f4992820b81cc50927802ed3a20f8dde5fc15a8cf28832ef4395498ce7378481040195a97538f8cd0681868e01 SHA512 0a40fcfa2413b2227aad708f90df341bea35195a069c673f63c073272c59b920b8c605b6e07a903843db3452b603959062a03f4b4fe4f0d3709e9546d459077e
+EBUILD valgrind-3.19.0.ebuild 3961 BLAKE2B b804dcea08d2f9383cd62b532b6a464024dba883b14677bd26effc8dd9a8cbf5a301584af3e960b2640f5073a5934038bf175e33263716f2fab07cd4dfee1526 SHA512 15ce0b1e595b8e5c4087063623a73d5c14c3beca4b4e2efd7f1a57afd80c402a7f710c8dff117a1096f95494a4811139fe9a0ef119c714b316edc40a55f27fb5
 EBUILD valgrind-9999.ebuild 3921 BLAKE2B c0f5ce239d2e5990afe6f272de7006219c9ca97e8859ec9491f64f7211c6760f5feecd453356ea3e89e77d14dfa4c27375259c1aa1d886ee0ee028611221fb84 SHA512 655489b4b0cb46f12607edd429277fd677db5793dfbd6e4743c3ac02e160353e3238802c1923d14e533ac040242478730d5091ab756e00ad505b1da832f6eed1
 MISC metadata.xml 1028 BLAKE2B 5e6d52b6a5e657f56dc8da70f83d340c8ad8ff1448b109916d77a51b62f9018dafaf20586684d9d5c0984647df9fb3886b9fc0fabcfd62bcd13ef8d5e1de223e SHA512 1b9bd9d815de416b73e03bb13f88b662b14b4c135a36549ea5ad69a59c9395a240b80c30e6847eaecc2318ca88a2081e71fed41af2e9eed5162dfca78c7af920
diff --git a/dev-util/valgrind/valgrind-3.19.0.ebuild b/dev-util/valgrind/valgrind-3.19.0.ebuild
index 14e4020342ba..7c171ce67095 100644
--- a/dev-util/valgrind/valgrind-3.19.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.19.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="-* amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
author	V3n3RiX <venerix@koprulu.sector>	2022-09-14 11:10:11 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-09-14 11:10:11 +0100
commit	81b8f20732954c4508baf2f77472b5435e3f851f (patch)
tree	4180177cb7ba85eab50159ce96218c2419fb24a6 /dev-util
parent	946859e0e36904cffb3e0ccbccb6b7b1347c1cc8 (diff)