gentoo auto-resync : 23:12:2022 - 13:59:28

13 files changed, 363 insertions, 5 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index fa52a060a5f9..eed2db3fad08 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bindgen/Manifest b/dev-util/bindgen/Manifest
index d2c3b5a4cb89..6e73295d4be3 100644
--- a/dev-util/bindgen/Manifest
+++ b/dev-util/bindgen/Manifest
@@ -81,7 +81,6 @@ DIST regex-syntax-0.3.9.crate 117427 BLAKE2B 81b0fbd7565902c6b87619b5f66bab9a7e3
 DIST regex-syntax-0.6.21.crate 293572 BLAKE2B 49c499ba1c03447fe7c90f27147dc5d96daf815e330a4073fe293d3be594fab1d798d35a5e49f6af43c71befd47528927246c4ebb24b6a6a141135484bbecd31 SHA512 56507f4432804ea30820984f6cff03c3514988bc3e406b3ba3a89c36c9c5d75951e4acd000ba85b95bb83d253898ce7d7d282ed930e811e12bb644c4a5ec84fa
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
-DIST rustc-hash-1.0.1.crate 8976 BLAKE2B 847953648136fe54213e169b7ff414a42984ba9a591a52b3347c5b4a8503920b884b586d01573a975c464821d8667b631b49e83107573afb77503299a0bc9387 SHA512 e90af9d21da88c4da1deed8d5de65cedaae659819d0f5be8972a125b86d62d72ad710745f195a7a04a92442a6684ca9e7e85c734935852718434577df3dbb34b
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 DIST shlex-0.1.1.crate 5687 BLAKE2B 8e2942051c783369a8161b667f8f5b73b2081f766db26d685b4d3060f8faeecf78e8763ab927149d4cb08a29af756105f7ec3c3408ad6be2e7618053329fbed2 SHA512 a4d202897861ca7955a3561dc1b0fd0307d77948c9b97aa0f8b9caff2b9721d2836a08760d308675973b0e9c7bae92e4d5fbd2a2497cba9e5aeefbe31075e069
 DIST shlex-1.0.0.crate 4555 BLAKE2B c39f219b68e7a85fc0a0bb2df38d3b232a80815f5e541a03173d308c0274f55c61e54887c95c22d51b2e62339365bf5deac5b0d0ab3bb5d40fb70b8f75f1755b SHA512 aea9827adb630b9ed71423fb216113ee20dba31e5f1e7d078445e8bd77e7e9bfe64ea2e73f3be0fcaa472023b724793f86c06ff8efb9e4cc133f805bcf11c560
@@ -115,6 +114,6 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD bindgen-0.56.0.ebuild 1434 BLAKE2B 809a154198bdc7007fb7e31f668075b24fd0d5a836850fc6242566dc83867132308b9cc21733cbc5ab52427a929c7f269a6df037e0d6ff240b2b56cb2cae942d SHA512 fefaa2f180bb6a0cb6c3d29a113aaf149dcabfe18bb7a5efc30588d5300975f19a2bd8d1cba4111ca763244ca982509d2df22939116df3284649efd68fab6793
-EBUILD bindgen-0.62.0.ebuild 2167 BLAKE2B d1cf2e963a98c6f03388bb4f7665231cf79f7e1c79554db6b053b8f445f1a73813ebdd9a0878b61d968178dec349d3f2a6c3abec233ea12ec2c6f668f9969979 SHA512 a23b43f0bf2dafc90a80da89566665f129fc3a353f7f4117af107f80acb05999363fc1bda6b6e1c01beb4e89bfa3a114258d185f8affd1e4cf13b8ba278f0beb
-EBUILD bindgen-0.63.0.ebuild 2167 BLAKE2B d1cf2e963a98c6f03388bb4f7665231cf79f7e1c79554db6b053b8f445f1a73813ebdd9a0878b61d968178dec349d3f2a6c3abec233ea12ec2c6f668f9969979 SHA512 a23b43f0bf2dafc90a80da89566665f129fc3a353f7f4117af107f80acb05999363fc1bda6b6e1c01beb4e89bfa3a114258d185f8affd1e4cf13b8ba278f0beb
+EBUILD bindgen-0.62.0.ebuild 2150 BLAKE2B 6d37fe040567bf48e8cbda60822bb94cc3243130e1b5bc80fd048326703dc3ba11d5f8c4a7fbe5a55553b90536198f2aacb29f7f56bc76e8ac20e1805091c44d SHA512 ace68fec47da08c89ab15b544135db57994886d18a401d92593b847eff3a1303d0be54289a4d924fe2a09880332a31a0bf14283b9114a70dcb36c3cf935518ae
+EBUILD bindgen-0.63.0.ebuild 2150 BLAKE2B 6d37fe040567bf48e8cbda60822bb94cc3243130e1b5bc80fd048326703dc3ba11d5f8c4a7fbe5a55553b90536198f2aacb29f7f56bc76e8ac20e1805091c44d SHA512 ace68fec47da08c89ab15b544135db57994886d18a401d92593b847eff3a1303d0be54289a4d924fe2a09880332a31a0bf14283b9114a70dcb36c3cf935518ae
 MISC metadata.xml 593 BLAKE2B e84dad03374ab90f8d3ea1248e3a4e44799aa63408505ab117b2f6e7064bfe1ca388c32f0cf2c52fb13d91ebde7d0677a22d1ac5bfc166fa6b86d9a781e26355 SHA512 820e8d517c9adc773061903ea62daaf2af28c9861498d6bdb8117866bf34d00276d87f0d17c17d5c75b9e3746c6dca871800341f75ab52ed34fef28bf2a7f207
diff --git a/dev-util/bindgen/bindgen-0.62.0.ebuild b/dev-util/bindgen/bindgen-0.62.0.ebuild
index 4bb1b1302b81..d83f56166510 100644
--- a/dev-util/bindgen/bindgen-0.62.0.ebuild
+++ b/dev-util/bindgen/bindgen-0.62.0.ebuild
@@ -64,7 +64,6 @@ regex-1.5.5
 regex-syntax-0.3.9
 regex-syntax-0.6.25
 remove_dir_all-0.5.3
-rustc-hash-1.0.1
 rustc-hash-1.1.0
 shlex-1.0.0
 strsim-0.10.0
diff --git a/dev-util/bindgen/bindgen-0.63.0.ebuild b/dev-util/bindgen/bindgen-0.63.0.ebuild
index 4bb1b1302b81..d83f56166510 100644
--- a/dev-util/bindgen/bindgen-0.63.0.ebuild
+++ b/dev-util/bindgen/bindgen-0.63.0.ebuild
@@ -64,7 +64,6 @@ regex-1.5.5
 regex-syntax-0.3.9
 regex-syntax-0.6.25
 remove_dir_all-0.5.3
-rustc-hash-1.0.1
 rustc-hash-1.1.0
 shlex-1.0.0
 strsim-0.10.0
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index d6339ad4f18c..c36940a303f2 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,7 +1,9 @@
 DIST CLion-2022.1.3.tar.gz 785987464 BLAKE2B 5b23d54f260a8e6023cce936ba50320c9c815d7024495d4a28a6fe9fa795d9944cce36fedd7b619ccf8188750708eb3bca887f9fc856d2d4defe096505742852 SHA512 5caabc409e9e22e59a26886cb5a5785cc0f2c193e7548a9757d11b4e2b7dad5af7545f3c71b83e3111deb0e0c90507eb5ee6020dcba40e413c0882f2743ac49d
 DIST CLion-2022.2.1.tar.gz 893465319 BLAKE2B c60242c3912b7fbda601e06f6191162da42e3255ed8a3b8eeeab0d910f0d2aac767fa9bc9a4096114c2110f9104604d7294f2e97c4d67004f1c234040d45a6f3 SHA512 b48d8ef74b19e9ba1b75fc9c01ab052a2fbe0a7c1eab086fc0ab9551eabdcb878e478a6c7793bd2bc455453425313b2caa8e884f5ef0a6468ca73fa3877bf892
 DIST CLion-2022.2.4.tar.gz 895935196 BLAKE2B d14fa5bfd91df50f48fcc581133ac1292476fa6706eb486f020141d4addf6d902294766ec9e848974d3e10a31668307c32ef2d7e8db42d65c53d3f36bff4e7dc SHA512 af9cc8a0768877e9fa997655ac3bb5e8fc0fe1128902707bca8574855cce99de855a866d8fdef9c53ef970dfae6bce9edbb2b763dd49df1dc76d45ef85115dc0
+DIST CLion-2022.3.tar.gz 835387407 BLAKE2B 50f6c1e2a8b695e36e0e044ee3d76746ceffc58f2881df8d238afd9db020cf0ddb944425ab50ee830675fcc8b3afe3e7e96763961dfc8814c696e682e80c4ff5 SHA512 4ccda1c6af255be1bf0eec657c5dc908334e2e70d7f62baf4cb32b34c39b66c9c52d4e78c1b312561ef20722ff0b32e1293a8737e7261fd69e5ca612857154ef
 EBUILD clion-2022.1.3-r1.ebuild 2962 BLAKE2B cf320a340c3de6bf4b949faad24ef89976e1395c743f28f7adbb63446960cd9426d4c7290aa36216c02a85c958400b6bf9ce7cba257599f6d285eadb75b15fb6 SHA512 8fbf9ca8b1d7315f225470d83942e28ddfa41b235cb27b14222e8669c2b355170f884573f319fb5246b024d6e4d4d2cf24d513c7ff5d9b2b38a4ecf557b8836c
 EBUILD clion-2022.2.1-r2.ebuild 2980 BLAKE2B 839b519a564f1842802658abdd20ff4eb0d414112ffb843cbf09420f426ae13ea2de6aed993a7806c83e45bbd540f3ca14b40343a02b65e8d106def386cd40c8 SHA512 afb5c402fe3071fd020be4811599d87b9c380987f6752f42527ca365bdf103c8b4e71b60c566817f421ed49b9b76421531210935666e39965f047e13e18a9163
 EBUILD clion-2022.2.4.ebuild 2921 BLAKE2B 4150a87c2b0a153e804e4c6a4b55bc4a4dcb2db5b1734696254e1733a7b679dd5acb1bf9ba6e2e08c8a5a01a0175c3dbd67537f6949925dbeac7da4b53c8e7f3 SHA512 e384e940f1e1e43250ff3fda8a2991df31e006d0e81080f3d951ede68481e52d6e93813050d6d647d0bbdd3164734956ac0c6cbc8585af3aefe4eeb1293b736e
+EBUILD clion-2022.3.ebuild 2850 BLAKE2B b80a4e98de5718242f1b66bee25ad831aa9374b46a8e683d6a12647c84f805cd42d62b4eb1741b327a41db269de40fd7db07404452fe3450bc76621234ec9233 SHA512 4609b82cfe55f70783ee55b563a067c0d92c8c068c13f2a25c29ffce4da47de9f0865550b05b77ddd8b702f4c0516ce8024bea70e02c8c439e29502c5627fbef
 MISC metadata.xml 402 BLAKE2B a74ce91089fa83dc91f1878f17b0e2adc483fdfdd987eb2dd4b184b2a98b8f1d995ab5d2c4dca2d7f25d3a8e1dfec711625e980feb5a0422fe5635c5816ef4fe SHA512 6d425358265cac8deb12c18632cfe520d82a733e4caab71eeb89b6d6643eddbfa27df03fcd8111477a77efea136aca1093c84024c89b85dc66ce1b92633709c6
diff --git a/dev-util/clion/clion-2022.3.ebuild b/dev-util/clion/clion-2022.3.ebuild
new file mode 100644
index 000000000000..a25989330179
--- /dev/null
+++ b/dev-util/clion/clion-2022.3.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop wrapper
+
+DESCRIPTION="A complete toolset for C and C++ development"
+HOMEPAGE="https://www.jetbrains.com/clion/"
+SRC_URI="https://download.jetbrains.com/cpp/CLion-${PV}.tar.gz"
+
+LICENSE="|| ( IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
+	Apache-1.1 Apache-2.0 BSD BSD-2 CC0-1.0 CDDL-1.1 CPL-0.5 CPL-1.0
+	EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception GPL-3 ISC JDOM
+	LGPL-2.1+ LGPL-3 MIT MPL-1.0 MPL-1.1 OFL public-domain PSF-2 UoI-NCSA ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="bindist mirror splitdebug"
+
+BDEPEND="dev-util/patchelf"
+
+# RDEPENDS may cause false positives in repoman.
+# clion requires cmake and gdb at runtime to build and debug C/C++ projects
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	dev-libs/wayland
+	dev-util/cmake
+	dev-util/ninja
+	media-libs/alsa-lib
+	media-libs/freetype:2
+	media-libs/mesa
+	net-print/cups
+	sys-apps/dbus
+	sys-devel/gdb
+	x11-libs/cairo
+	x11-libs/pango
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libXxf86vm
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libxkbcommon"
+
+QA_PREBUILT="opt/${P}/*"
+
+src_prepare() {
+	default
+
+	local remove_me=(
+		bin/cmake
+		bin/lldb/linux
+		bin/gdb/linux
+		bin/ninja
+		license/CMake*
+		plugins/remote-dev-server/selfcontained
+		plugins/cwm-plugin/quiche-native/darwin-aarch64
+		plugins/cwm-plugin/quiche-native/darwin-x86-64
+		plugins/cwm-plugin/quiche-native/linux-aarch64
+		plugins/cwm-plugin/quiche-native/win32-x86-64
+	)
+
+	rm -rv "${remove_me[@]}" || die
+
+	for file in "jbr/lib/"/{libjcef.so,jcef_helper}
+	do
+		if [[ -f "${file}" ]]; then
+			patchelf --set-rpath '$ORIGIN' ${file} || die
+		fi
+	done
+}
+
+src_install() {
+	local dir="/opt/${P}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{clion.sh,fsnotifier,inspect.sh,ltedit.sh,repair,restart.py,clang/linux/{clangd,clang-tidy,clazy-standalone,llvm-symbolizer}}
+
+	if [[ -d jbr ]]; then
+		fperms 755 "${dir}"/jbr/bin/{java,javac,jdb,jrunscript,keytool,rmiregistry,serialver}
+		# Fix #763582
+		fperms 755 "${dir}"/jbr/lib/{chrome-sandbox,jcef_helper,jexec,jspawnhelper}
+	fi
+	dosym -r "${EPREFIX}/usr/bin/ninja" "${dir}"/bin/ninja/linux/ninja
+
+	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
+	newicon "bin/${PN}.svg" "${PN}.svg"
+	make_desktop_entry "${PN}" "CLion" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	dodir /usr/lib/sysctl.d/
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/usr/lib/sysctl.d/30-clion-inotify-watches.conf" || die
+}
diff --git a/dev-util/cvise/Manifest b/dev-util/cvise/Manifest
index 2efb3a7defe8..2140ca89450a 100644
--- a/dev-util/cvise/Manifest
+++ b/dev-util/cvise/Manifest
@@ -1,6 +1,8 @@
 AUX cvise-2.5.0-no-werror-cflags.patch 1830 BLAKE2B 864cde94daabb54e691e59a3634e7cc7ff72dea86a41f757f6d3d764629a803de92950e6abc32f33738c361e5e6bdacffb09c214039c2ee0475fbf1c41366cd6 SHA512 e68e51ecda7005b6542589f3ce958ad5ffef17c72e19a38f9d2be2d1443dc77adb11d4984dfc690cc25cbcb3e1da1c2fc848b9d8869178a7d4eca479ea2d7007
 DIST cvise-2.5.0.tar.gz 255587 BLAKE2B ec33bcb0ac45bf89a66bd30b22386f5c0b994e774c1d30f7869e15bcd5bada2e511ad4028628af6c545a23fddde7bc43978fc63cc3b5168db8d038aec9310073 SHA512 8433d4daf0e0691b99ff78f4b5331da0d230d5872c214ffd4a7dee470d955c2a3d7541c19277555a6e97108f8cd3de589b3f724e2874c44e479e351777c671c4
 DIST cvise-2.6.0.tar.gz 264295 BLAKE2B fcdd27905598c8db6f088c4bdadde966bcd0836560ede642269fa6dc32d1907d32081e56e7a33487bffca64ea53a49b05b05620debc5af352371203e37241b70 SHA512 1707cc46c342197c6b0e11b26a453548fd7bc7bc25baf20215230a7a4743053700189f96c1e0ba4ad6c9de4dd38920700a957ca333b0f123949b7a5a00854291
+DIST cvise-2.7.0.tar.gz 269155 BLAKE2B c0fe9bcf8207acc53f71c5d7cd9c0cb41ba3f771a276e86401c1de4789b9ebad2d91b2881a05e0263827d0ae70805ba4f9b05fdae64f27d83e16d08f89f518e0 SHA512 4da775e177c135d5282f8e3d9a33ae040f403eabcca8baf9f4f78adc05e3069626340005f9f41ab2f530c9269f4c5829bdd35b55433e2d539d42de002e42aa5e
 EBUILD cvise-2.5.0-r1.ebuild 1351 BLAKE2B 40c4efea21dda4f92ae855452e2f252b63724f6ba3b427d1ebcd585de26fa1839444a11bfb8f99490671a2459714da924116e1c09ff033d0304fce3626e530d2 SHA512 b4be0244448d5a59a55e87ab89b8a03a06015a83304774007f54015037b173c21c6f81dbb40f15c4b362064c6a6c57d32d8d8ffbbf34bc32e40a3367de56911b
 EBUILD cvise-2.6.0.ebuild 1358 BLAKE2B c9bee61a064244e7fdf336889312759ef167af4e85342d63a7456605fe8ab8d8834ec3fd031a55646635d6f6a134545a1fcb366371f8bfab1ad9c6b7f311ebf2 SHA512 efddebe91deee37f41eb6509c4b7c2037c421bd1f1474c7f715b5b67e26dd89c73d8b8988215967eb9053531fe5da1860f32ffcaeb965d4da4d43bd9177b9ccf
+EBUILD cvise-2.7.0.ebuild 1408 BLAKE2B 32839c784a091a7a9741cea903a962042c790a5cce62ddcb70f832530b1a2583fc10847cd9e67c2edd57ec56fdc04dd9464a7801e4295459d5a3c089e3b89a23 SHA512 3db497f2e8d810f109413262b9f867e65b7b59913b881e19df2352f9c7929f70ad171ccbef190a69c5b29ebdee1763ae59ebb4ddf4c55f86c07dd9af3456806a
 MISC metadata.xml 325 BLAKE2B 52e58fd0c3babe2c595399ff2878b758960d089b0cefc0f8589365704f3628a93688d5b6ee06e88e54a4435ac0280d8cf542c37c079d149e44a2a64cd4db12c2 SHA512 9e509c76ab4cf07804997751996b5c73efc04839a1d6e2bd4b98c5ad2ffde0fb1008332f1b52bbf0985d65ceed73ccdf101c62a9b7d0bb1f5694083d1e33afb9
diff --git a/dev-util/cvise/cvise-2.7.0.ebuild b/dev-util/cvise/cvise-2.7.0.ebuild
new file mode 100644
index 000000000000..8b11c960f83a
--- /dev/null
+++ b/dev-util/cvise/cvise-2.7.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake llvm python-single-r1
+
+DESCRIPTION="Super-parallel Python port of the C-Reduce"
+HOMEPAGE="https://github.com/marxin/cvise/"
+SRC_URI="
+	https://github.com/marxin/cvise/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+LLVM_MAX_SLOT=15
+DEPEND="
+	|| (
+		sys-devel/clang:15
+		sys-devel/clang:14
+		sys-devel/clang:13
+	)
+	<sys-devel/clang-$(( LLVM_MAX_SLOT + 1 )):=
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/pebble[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	')
+	dev-util/unifdef
+	sys-devel/flex
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-devel/flex
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pebble[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	llvm_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:-Werror::' -e '/CMAKE_CXX_FLAGS_REL/d' CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die
+	epytest
+}
+
+src_install() {
+	cmake_src_install
+
+	python_fix_shebang "${ED}"/usr/bin/cvise
+}
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 503d17cea71b..0c3ca732e55f 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,3 +1,5 @@
 DIST diffoscope-228.tar.gz 3164190 BLAKE2B 21e75cb8e297540b149f22c52949d33a2e6ddd8c0fa8641e5d8b0c20045f1a7f6638b6b844631c2a5353cd23dc4d8447fadd9b8b3f5cd87fa33eb4b85abe3e2b SHA512 5ea3f0dfa17d2e17167241f9388a6fba919deec4c26a39e238fc282b0011f30e77b4daf27c0b076eadcc13ca51eb408eba983ea427adbaee3233db222b60948a
+DIST diffoscope-229.tar.gz 3164192 BLAKE2B bee9fa1561ddcfde98cfa44cd6d66a28c636dbc7f3ec1f4895e91dfd3b66c039b68d53be0528b94c112552069886c3c81de4d9b9bc9038d183afdc9fdde6ddb9 SHA512 825c9c33f3088ba082ea3b998594445987558ee62b8b1fbfcded9b72a739faaa73908f8753b8772b3b1a8a43dbcfd52978265a18bdd92605defcd174884ccb23
 EBUILD diffoscope-228.ebuild 3556 BLAKE2B 058abedfd71123ed6edce1f5a94508fbcb0b89ed6e453f449ea43d92672217116b9bb51cadaa9a6e8b680cb989d740e5700015c2565bfc742bbc476b0c348ba1 SHA512 30a60cd042024b72f0a38523103dd19065e6545928482c192f1b6f18e39947c9bba14de738dcb361b03f5da6c8bbf29ada9a24743296b50205afb1cd07860a8a
+EBUILD diffoscope-229.ebuild 3558 BLAKE2B 2b46d558cc20d8329e66889dc01eec4ffe7d789c7cc59f0ccaa4c97bed69181f6d3a69398fa11b4bd7e67ca9fd9501cb6d19a035b03f721fe019a4779dcf642c SHA512 c4bc0986443fb87a432744f443b90224df2ad30c8856c5be102851cf1492a14434449b7ac4666d518fcc630627ebc31710edede0dda041c958ca0f3ad747916c
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-229.ebuild b/dev-util/diffoscope/diffoscope-229.ebuild
new file mode 100644
index 000000000000..7c383fd0ae02
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-229.ebuild
@@ -0,0 +1,120 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="ncurses"
+inherit distutils-r1
+
+DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
+HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
+find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
+mono opendocument pascal pdf postscript R rpm sqlite squashfs
+ssh tar test tcpdump zip zlib zstd"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/python-magic[${PYTHON_USEDEP}]
+	dev-python/libarchive-c[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/tlsh[${PYTHON_USEDEP}]
+	acl? ( sys-apps/acl )
+	binutils? ( sys-devel/binutils )
+	bzip2? ( app-arch/bzip2 )
+	libcaca? ( media-libs/libcaca )
+	colord? ( x11-misc/colord )
+	cpio? ( app-arch/cpio )
+	diff? ( sys-apps/diffutils )
+	docx? ( app-text/docx2txt )
+	dtc? ( sys-apps/dtc )
+	e2fsprogs? ( sys-fs/e2fsprogs )
+	file? ( sys-apps/file )
+	find? ( sys-apps/findutils )
+	gettext? ( sys-devel/gettext )
+	gif? ( media-libs/giflib )
+	gpg? ( app-crypt/gnupg )
+	haskell? ( dev-lang/ghc )
+	hdf5? ( sci-libs/hdf5 )
+	hex? ( app-editors/vim-core )
+	imagemagick? ( media-gfx/imagemagick )
+	iso? ( app-cdr/cdrtools )
+	java? ( virtual/jdk )
+	llvm? ( sys-devel/llvm )
+	lzma? ( app-arch/xz-utils )
+	mono? ( dev-lang/mono )
+	opendocument? ( app-text/odt2txt )
+	pascal? ( dev-lang/fpc )
+	pdf? (
+		app-text/pdftk
+		app-text/poppler
+		dev-python/PyPDF2[${PYTHON_USEDEP}]
+	)
+	postscript? ( app-text/ghostscript-gpl )
+	R? ( dev-lang/R )
+	rpm? ( app-arch/rpm )
+	sqlite? ( dev-db/sqlite:3 )
+	squashfs? ( sys-fs/squashfs-tools )
+	ssh? ( net-misc/openssh )
+	tar? ( app-arch/tar )
+	tcpdump? ( net-analyzer/tcpdump )
+	zip? ( app-arch/unzip )
+	zlib? ( app-arch/gzip )
+	zstd? ( app-arch/zstd )
+"
+# Presence of filemagic's magic.py breaks imports
+# of dev-python/python-magic: bug #716482
+RDEPEND+=" !dev-python/filemagic"
+
+# pull in optional tools for tests:
+# img2txt: bug #797688
+# docx2txt: bug #797688
+BDEPEND="
+	test? (
+		app-text/docx2txt
+		app-text/html2text
+		media-libs/libcaca
+		virtual/imagemagick-tools[jpeg]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# Test seems to use different tarball
+	tests/test_presenters.py::test_text_proper_indentation
+
+	# Needs triage
+	tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
+	tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
+	tests/comparators/test_gif.py::test_has_visuals
+
+	# img2txt based failures, bug #797688
+	tests/comparators/test_ico_image.py::test_diff
+	tests/comparators/test_ico_image.py::test_diff_meta
+	tests/comparators/test_ico_image.py::test_diff_meta2
+	tests/comparators/test_ico_image.py::test_has_visuals
+	tests/comparators/test_jpeg_image.py::test_diff
+	tests/comparators/test_jpeg_image.py::test_compare_non_existing
+	tests/comparators/test_jpeg_image.py::test_diff_meta
+	tests/comparators/test_jpeg_image.py::test_has_visuals
+
+	# docx2txt based falures, bug #797688
+	tests/comparators/test_docx.py::test_diff
+
+	# Formatting
+	tests/test_source.py::test_code_is_black_clean
+
+	# Fails on ZFS
+	tests/test_main.py::test_non_unicode_filename
+
+	# Fails on (unreleased) LLVM 16 with minor difference
+	tests/comparators/test_macho.py::test_llvm_diff
+)
+
+distutils_enable_tests pytest
diff --git a/dev-util/fq/Manifest b/dev-util/fq/Manifest
new file mode 100644
index 000000000000..d82ecb79e801
--- /dev/null
+++ b/dev-util/fq/Manifest
@@ -0,0 +1,4 @@
+DIST fq-0.1.0-deps.tar.xz 23497408 BLAKE2B 2ea9edad64f5d077026db99b6d981a443a7c5f5501b4525311512100fb68674bfd9f884908af845a007579d45b5e199bbaf8139a5ed0cee764167459bc62072f SHA512 0b028de7c909077253309d6f16d7bb036b67fb9db6716327d6fe403e7e491f1a56547f91159302e19a8bb578ffdcd74bcb1eab80f1ed65be9f11b4c35fbaf0d9
+DIST fq-0.1.0.tar.gz 8549022 BLAKE2B e4a7d8240f6f9adadab95d66b79747417290d24b53dc1b07c9f2cd526ef86f93f932ba15072cef050d9e3da2f1212ee76da5265345d665796c109bb4b104f0f7 SHA512 3cc81962c9a31343109743f9de7b73939df9165d4d5dd4beff3790e85e435c0344fa44f59a66153d9235ed156e9bee0f93e63b36c492d337547c6cf1712132ed
+EBUILD fq-0.1.0.ebuild 777 BLAKE2B 3e3550bd3c7dff2c99d7de5648679ca4b670eeee7cdbbfcbcd1ffb9ac4f023e13f4ab3c889901379ce971674210be8d72fde6461c7e2ce42c43524c3e5e407c6 SHA512 37362498b2b39e3193ce71773d899a79caa7002fdfa4391c266428f358a0825048b40853ac94ba6e59d212e63bf14e14abee9eccec7a0f02a16bd9ee7568d496
+MISC metadata.xml 313 BLAKE2B 49888cd21e49fca7d7913fbd265cbffd73dcfaa5080e09ccd1f5b9c62804e5b9fb1de1e21df96609079c18c481b2847897b4fe1a9fc499d0e6dc2559e677a27f SHA512 1d125e77b24aeffe27b0d54b8b9f247e1e2b62037bdb127f232d3089d63e1b92c2062e37446067850defc382d7e49785152e9af86cd46f44827e2e037dd291a7
diff --git a/dev-util/fq/fq-0.1.0.ebuild b/dev-util/fq/fq-0.1.0.ebuild
new file mode 100644
index 000000000000..ae862b026637
--- /dev/null
+++ b/dev-util/fq/fq-0.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Tool for working with binary data (jq for binary formats)"
+HOMEPAGE="https://github.com/wader/fq"
+SRC_URI="https://github.com/wader/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="MIT BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-tcltk/expect )"
+
+src_prepare() {
+	default
+
+	# https://github.com/wader/fq/issues/494
+	sed -i -e '/test_repl.exp/d' Makefile || die
+}
+
+src_compile() {
+	# Avoid -s being set in Makefile (stripping)
+	export GO_BUILD_LDFLAGS="-w"
+
+	default
+}
+
+src_install() {
+	dobin fq
+}
diff --git a/dev-util/fq/metadata.xml b/dev-util/fq/metadata.xml
new file mode 100644
index 000000000000..df8d11274d38
--- /dev/null
+++ b/dev-util/fq/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">wader/fq</remote-id>
+	</upstream>
+</pkgmetadata>