7 files changed, 123 insertions, 99 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index e9c4c66ece5a..6a8f485bce18 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/codespell/Manifest b/dev-util/codespell/Manifest
index b6444fd220bd..9b69d3e73799 100644
--- a/dev-util/codespell/Manifest
+++ b/dev-util/codespell/Manifest
@@ -1,5 +1,3 @@
-DIST codespell-2.1.0.tar.gz 187490 BLAKE2B 6114aa3a7ad8cd37ab868a3f27f641501dd0cc5bfe80bef0aa5cad0a86f8e2bba6e1f1030d5ac6fb06f78f9e01e37359d0fc17d17eb54608060300f676d3d56c SHA512 16d9a4239ae18fad6a06825a2afae6adc903d50eb90b759cdc61b1e1d145458bbfb1385837c4465b0a9858da100be074c597343c4816ca0260bbf6710d9c84e8
 DIST codespell-2.2.1.tar.gz 211593 BLAKE2B aba431119fd1f16ee51076cd4496ef3f3e80e56a124bbbd4ebbec5dcee5b7e49788db37bcdefd15946d12680596b33ab20ae845fd9a3a3a61ee8c3eed187fe2f SHA512 6c1ce9ed134ba4602cc91c1851a023911ff09ce7d4b1e8a33e655bf821a5b82ae8f0e75defef43e9a8537a6ffc7f0ad7e59af7b200a1294dfe3aff1651869e41
-EBUILD codespell-2.1.0.ebuild 905 BLAKE2B f841dc9d6189ac0325b8b4064aabaefe3fc71c936a4cd90340cd257cef494f3b3f99533b65c8bfef870a81b015f7a0b6c5e2ff8f2b77e79077dca0a4af6156ab SHA512 e031f094df22ead785a808d211b71fdf003aa0517ec885662c79070a27d5b1dacd0160333e2e260a135c49c0c176764bd8ee9cdb525242480291452a31432e1c
 EBUILD codespell-2.2.1.ebuild 943 BLAKE2B 8f9df36a565abc5410bcfd924cca54fe5813ee4e067f731584fe17b57d8aaacace984f03014b60531048d3f36e7970d20a54ed14022a64991a485f3344cbc81b SHA512 aca34fd34e9ecbf0da4aeda3383a9b2fa4f189f3fe77116d0f1f98e889e8a64bf1217b5826f48104435d41505bc6b93396962f800ccdd98167b4001ddf478710
 MISC metadata.xml 774 BLAKE2B fe1de89542c86da21ef70e12bee327af41f09f4af419da14074f01c3d0d995ee51deb13748330d13b61a4e3e1ac392e581656973ece8df5290b21d3c4f1fec81 SHA512 e95c51eeb9da39aa2cc7ad6e5f584050407bd232fd77a9f25b339a2c25262f51194278b47d4e05e55a0c3fcc6daaa41bc0babb242aba83e0b87912400179afa6
diff --git a/dev-util/codespell/codespell-2.1.0.ebuild b/dev-util/codespell/codespell-2.1.0.ebuild
deleted file mode 100644
index b8be16867839..000000000000
--- a/dev-util/codespell/codespell-2.1.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Check text files for common misspellings"
-HOMEPAGE="https://github.com/codespell-project/codespell"
-SRC_URI="https://github.com/codespell-project/codespell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# Code licensed under GPL-2
-# Dictionary licensed under CC-BY-SA-3.0
-LICENSE="GPL-2 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	sys-apps/help2man
-	test? ( dev-python/chardet[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# do not depend on pytest-cov
-	sed -e '/addopts/d' -i setup.cfg || die
-}
-
-python_compile_all() {
-	# generate included man page
-	emake ${PN}.1
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman ${PN}.1
-}
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 2e3452352bff..3db1d25029fb 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -5,8 +5,12 @@ DIST radare2-5.7.4.tar.gz 9814654 BLAKE2B ae8ed1d7b417236c27ee4857f7c33d657d379b
 DIST radare2-5.7.6-vector35-arm64.tar.gz 1050960 BLAKE2B 12faa86a4cdfd9cdc8e307c16d8f797ae3ee800b72e76c6ace84cb7cb5108198dbfbc9a00df6b70448628dc869c94bf8cf9794460d05be99e5a08ee5a3ed40de SHA512 478f06c3fe09232152bbb63e500a440ca8546cc11fe59f9d489a25d327469b1869fe80b4e2e2cfad8a2b96261857cf74b6708628ac30ec8dabc5da05d04c1cfd
 DIST radare2-5.7.6-vector35-armv7.tar.gz 255288 BLAKE2B ca96b3f68381a0987c4efa10dcb798194486019762e89d1eb19a3fd24f6983535eea792099c60e4c1a9d2bdb5baab119fe2e9a7a889fad5a14023e5f984959b8 SHA512 e9eb6cee02bbbb265914b1f9118c7a143ed76a201c085af5516855475bf7f3ad5f9c82d1548e85a0339fbc33e029ef0e4be9d8cef68d212ae16ce1a7f18453ff
 DIST radare2-5.7.6.tar.gz 10071795 BLAKE2B e0bd54fcf4a56b34ec6f3b87ab6a20a8be23514e48842d66d7a30f517fa9ba871bd1e740604840fb16a3ae1329221ee67645774ac7df9f8f8d00dc3548dc7830 SHA512 04717ddb4bef9ed415c22aa25a0bf626f05c5d32133ac46d5e8a30ebe83e7b782a2b1835233f17f16315a99a39b33dd4e67c34798eb8ae9fbc6db51ca1051e94
+DIST radare2-5.7.8-vector35-arm64.tar.gz 1050960 BLAKE2B 12faa86a4cdfd9cdc8e307c16d8f797ae3ee800b72e76c6ace84cb7cb5108198dbfbc9a00df6b70448628dc869c94bf8cf9794460d05be99e5a08ee5a3ed40de SHA512 478f06c3fe09232152bbb63e500a440ca8546cc11fe59f9d489a25d327469b1869fe80b4e2e2cfad8a2b96261857cf74b6708628ac30ec8dabc5da05d04c1cfd
+DIST radare2-5.7.8-vector35-armv7.tar.gz 255288 BLAKE2B ca96b3f68381a0987c4efa10dcb798194486019762e89d1eb19a3fd24f6983535eea792099c60e4c1a9d2bdb5baab119fe2e9a7a889fad5a14023e5f984959b8 SHA512 e9eb6cee02bbbb265914b1f9118c7a143ed76a201c085af5516855475bf7f3ad5f9c82d1548e85a0339fbc33e029ef0e4be9d8cef68d212ae16ce1a7f18453ff
+DIST radare2-5.7.8.tar.gz 10324020 BLAKE2B 628b0c146a8e797f34f43f8d76166fb8c5e945a45232c2e4d63b2c2ce89aef96a20349c519ceb62921bad75ce5faaa8ea51ab1dac79156e00eef8f9ef06f5a45 SHA512 7c819a052f5e4b3da72b945915fca92a747c52dc2e2fa8483a8c2d8e71479ce374efbbe2bc02b1b4af26db6a891b6e44cdbb9e062de2f13b22a258cceab561f6
 DIST radare2-testbins-2fdb78f7f754b3aea90377588d45b774ccb41086.tar.gz 120580683 BLAKE2B ba16206f3c44f43c36fbc3079e43d29cd5b6266f8bd31602d7ec218a2b14601173c9022be9329975bd28de948933deeecc052f56c2acd9d6dfeb5576049ec32f SHA512 2c66c8f68df7c51a52a73b33e854b095a4f5435c60eab2a1456f366376aac0f7c39836699e09eae2918f31e75b7c6562994f0916f45de53ae6a480506da95dcb
 DIST radare2-testbins-602471f72caa60d6ece43c3fa483c43decf7052c.tar.gz 124090448 BLAKE2B 446f4b730095dc263f31bbd886b350fbf3cbde0cd3bc6f5ed0c5d65a90a66b4d97a7397798c0f6fb7596722d827a3805c6d4d810d06837cf46e8798cedb1fea4 SHA512 b490ec951813827bed940ca4fc772691f8e446ce14cf2f0cc7fe2027a481c91939e6212ce94237f71091c18ac8428c9a4a4f35fc58f41ba076c1da75835d0ff4
 EBUILD radare2-5.7.4.ebuild 3228 BLAKE2B 651cd352b8b8c2507f2c1952c98af40cf83affb0ecdf8e1aad7b333f6603bffbfdff0e45f94f9cc8002ae2f589696646d19450b62d10181e747e384c4944ba4c SHA512 d2541eb73826e730996ad80b5f151d03055174c53fe770a6df8e7680c672cb5f80463b6a81d918fe804fe680fe6285a4cdec5f030e3fff61875565304a18f7a5
 EBUILD radare2-5.7.6.ebuild 3228 BLAKE2B d89e881b5039acb23dbb049e225b1d7806238bf73be045f30a9e799fba02899fedae5321904a71a96c7938f7cca2da3d9899888483628ac4dcf3b9a0a207f1b6 SHA512 9432d5208c70523295808f26102c9a79aab2d779b2b3fc91a770c6d80104d7857e0a8093974f27c97c99a56c4e07bbebc0390d0181ee16e523ce8847159e839e
+EBUILD radare2-5.7.8.ebuild 3228 BLAKE2B d89e881b5039acb23dbb049e225b1d7806238bf73be045f30a9e799fba02899fedae5321904a71a96c7938f7cca2da3d9899888483628ac4dcf3b9a0a207f1b6 SHA512 9432d5208c70523295808f26102c9a79aab2d779b2b3fc91a770c6d80104d7857e0a8093974f27c97c99a56c4e07bbebc0390d0181ee16e523ce8847159e839e
 MISC metadata.xml 397 BLAKE2B 0da99624e778e490f84d0187d28a27b7f73a3c780fc3151619ef3196ca5c01b3758f0e07b6412b9c4f9fddb8738d5005b412d9bce6456b107e24931ba0ea5052 SHA512 02227b3d952b7dadc9f893246b7913cc7910b440ca6c54e7e0f9efcba95db711f691811a767ca1d81fba3e5c073c56b6154361df4beef7fc621fa8176fc05d47
diff --git a/dev-util/radare2/radare2-5.7.8.ebuild b/dev-util/radare2/radare2-5.7.8.ebuild
new file mode 100644
index 000000000000..8d4bfd6a4e75
--- /dev/null
+++ b/dev-util/radare2/radare2-5.7.8.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="unix-like reverse engineering framework and commandline tools"
+HOMEPAGE="https://www.radare.org"
+
+ARM64_COMMIT=9ab2b0bedde459dc86e079718333de4a63bbbacb
+ARMV7_COMMIT=dde39f69ffea19fc37e681874b12cb4707bc4f30
+BINS_COMMIT=602471f72caa60d6ece43c3fa483c43decf7052c
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/radareorg/radare2"
+else
+	SRC_URI="mirror+https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz
+		mirror+https://github.com/radareorg/vector35-arch-arm64/archive/${ARM64_COMMIT}.tar.gz -> ${P}-vector35-arm64.tar.gz
+		mirror+https://github.com/radareorg/vector35-arch-armv7/archive/${ARMV7_COMMIT}.tar.gz -> ${P}-vector35-armv7.tar.gz
+		test? ( https://github.com/radareorg/radare2-testbins/archive/${BINS_COMMIT}.tar.gz -> radare2-testbins-${BINS_COMMIT}.tar.gz )
+	"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ssl test"
+
+# Need to audit licenses of the binaries used for testing
+RESTRICT="fetch !test? ( test )"
+
+RDEPEND="
+	dev-libs/libzip:=
+	dev-libs/xxhash
+	sys-apps/file
+	sys-libs/zlib
+	dev-libs/capstone:0=
+	ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/gperf
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-5.7.0-vector35.patch" )
+
+src_prepare() {
+	default
+
+	# Hack for vector35 arm plugins
+	mv "${WORKDIR}/vector35-arch-arm64-${ARM64_COMMIT}" libr/asm/arch/arm/v35arm64/arch-arm64 || die
+	mv "${WORKDIR}/vector35-arch-armv7-${ARMV7_COMMIT}" libr/asm/arch/arm/v35arm64/arch-armv7 || die
+
+	if use test; then
+		cp -r "${WORKDIR}/radare2-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
+		cp -r "${WORKDIR}/radare2-testbins-${BINS_COMMIT}" "${S}" || die
+	fi
+
+	# Fix hardcoded docdir for fortunes
+	sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \
+		libr/include/r_userconf.h.acr
+}
+
+src_configure() {
+	# Ideally these should be set by ./configure
+	tc-export CC AR LD OBJCOPY RANLIB
+	export HOST_CC=${CC}
+
+	econf \
+		--without-libuv \
+		--with-syscapstone \
+		--with-sysmagic \
+		--with-sysxxhash \
+		--with-syszip \
+		$(use_with ssl openssl)
+}
+
+src_test() {
+	ln -fs "${S}/binr/radare2/radare2" "${S}/binr/radare2/r2" || die
+	LDFLAGS=""
+	for i in "${S}"/libr/*; do
+		if [[ -d ${i} ]]; then
+			LDFLAGS+="-R${i} -L${i} "
+			LD_LIBRARY_PATH+=":${i}"
+		fi
+	done
+	export LDFLAGS LD_LIBRARY_PATH
+	export PKG_CONFIG_PATH="${S}/pkgcfg"
+	PATH="${S}/binr/radare2:${PATH}" emake -C test -k unit_tests || die
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/zsh/site-functions
+	doins doc/zsh/_*
+
+	newbashcomp doc/bash_autocompletion.sh "${PN}"
+	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
+
+	# a workaround for unstable $(INSTALL) call, bug #574866
+	local d
+	for d in doc/*; do
+		if [[ -d ${d} ]]; then
+			rm -rfv "${d}" || die "failed to delete '${d}'"
+		fi
+	done
+
+	# These are not really docs. radare assumes
+	# uncompressed files: bug #761250
+	docompress -x /usr/share/doc/${PF}/fortunes.{creepy,fun,nsfw,tips}
+
+	# Create plugins directory although it's currently unsupported by radare2
+	keepdir "/usr/$(get_libdir)/radare2/${PV}" || die
+}
diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest
index f447ff5b1403..8143a0e3ec16 100644
--- a/dev-util/shellcheck/Manifest
+++ b/dev-util/shellcheck/Manifest
@@ -1,4 +1,3 @@
-AUX shellcheck-0.7.2-haddock.patch 2125 BLAKE2B 4e31c5b3a74235af69601ae01c1ad8e3ab5fd334dc55a34e858ce6e5dd81eaef0028750b480a81b8b9abca31f670c2952d3a67464ffbb03271d5ae9b50e21555 SHA512 f9e94857c5ca6e082a03dc7aa60cb07d95e55d114cec10e2db6a47e3ad1e0035cc5befb9e84062590b365baea5246fc6366dcc06fa9f48020f7e3d460d168338
 DIST ShellCheck-0.8.0.tar.gz 194817 BLAKE2B a486a6c72af4f54be776e86d1ebd07e04e64cdc52bc81bf1bb3b001066585b313a626f94572008072096ebde250eb8054544184779524a17c96f447e87e60c34 SHA512 62de6241502fd9e1bb45b224ff5eaf27def9938f5e4ed8345f8173b0be8f9bb7511d8ccc1d1779da319a32843bbf005415c3fcd5b902293e037d44495ec5bb54
 EBUILD shellcheck-0.8.0.ebuild 846 BLAKE2B a40e4aa3d845ccd81b512ec147b6b7aeb08b3d7a94fef77081427c1da6f7976ec5977aeb7b39b4b01fc4401cc07df5446d0c47f15776e5fcea83353f74125c8c SHA512 3f72be87999c881c9691b9075f45590e85e5829ad381b0fc38e105fbb98a563d7534f457bffa33f902e7bd2c7bf76c6a23c117db869ae80ba88179882c30404e
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-util/shellcheck/files/shellcheck-0.7.2-haddock.patch b/dev-util/shellcheck/files/shellcheck-0.7.2-haddock.patch
deleted file mode 100644
index db6297064bad..000000000000
--- a/dev-util/shellcheck/files/shellcheck-0.7.2-haddock.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 9e60b3ea841bcaf48780bfcfc2e44aa6563a62de Mon Sep 17 00:00:00 2001
-From: Vidar Holen <spam@vidarholen.net>
-Date: Thu, 22 Apr 2021 22:17:51 -0700
-Subject: [PATCH] Fix haddock failures (fixes #2216)
-
----
- src/ShellCheck/Analytics.hs | 12 ++++++------
- test/buildtest              |  2 ++
- 2 files changed, 8 insertions(+), 6 deletions(-)
-
---- a/src/ShellCheck/Analytics.hs
-+++ b/src/ShellCheck/Analytics.hs
-@@ -4155,11 +4155,11 @@ checkEqualsInCommand params originalToken =
-                     _ | "===" `isPrefixOf` s -> borderMsg (getId originalToken)
-                     _ -> prefixMsg (getId cmd)
- 
--            -- $var==42
-+            -- '$var==42'
-             _ | "==" `isInfixOf` s ->
-                 badComparisonMsg (getId cmd)
- 
--            -- ${foo[x]}=42 and $foo=42
-+            -- '${foo[x]}=42' and '$foo=42'
-             [T_DollarBraced id braced l] | "=" `isPrefixOf` s -> do
-                 let variableStr = concat $ oversimplify l
-                 let variableReference = getBracedReference variableStr
-@@ -4172,22 +4172,22 @@ checkEqualsInCommand params originalToken =
-                                 && "]" `isSuffixOf` variableModifier
- 
-                 case () of
--                    -- $foo=bar should already have caused a parse-time SC1066
-+                    -- '$foo=bar' should already have caused a parse-time SC1066
-                     -- _ | not braced && isPlain ->
-                     --    return ()
- 
-                     _ | variableStr == "" -> -- Don't try to fix ${}=foo
-                         genericMsg (getId cmd)
- 
--                    -- $#=42 or ${#var}=42
-+                    -- '$#=42' or '${#var}=42'
-                     _ | "#" `isPrefixOf` variableStr ->
-                         genericMsg (getId cmd)
- 
--                    -- ${0}=42
-+                    -- '${0}=42'
-                     _ | variableStr == "0" ->
-                         assign0Msg id $ fixWith [replaceToken id params "BASH_ARGV0"]
- 
--                    -- $2=2
-+                    -- '$2=2'
-                     _ | isPositional ->
-                         positionalMsg id
-