6 files changed, 122 insertions, 52 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 8684b27f0f39..377e06e1db8b 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/patchelf/Manifest b/dev-util/patchelf/Manifest
index 17f7b18eac73..a4e79ad0a506 100644
--- a/dev-util/patchelf/Manifest
+++ b/dev-util/patchelf/Manifest
@@ -1,8 +1,4 @@
 AUX patchelf-glibc-dt-mips-xhash.patch 250 BLAKE2B da297064604c0258ff10515e6ad55b22803ac0c8da215da782ca46433c703a67c3b91dbe573e211886aaa54b1921dfd24a35e395f73cf90935ec456e6607e14f SHA512 d76b9b137c182b5541576834f54d9c89033c4ec1cf7d08fd910eb0d091da32c3a5d8719966c5a7547b77325210bf8696b14bc17a60b2fac608d2eb62208989f6
-DIST patchelf-0.17.0.tar.gz 143684 BLAKE2B ef32baae1d1e07c77442878977693849e2dd3d5c1c1b8d53eb54ee7b1b78eb77ebcf87cbd7caa683f0043e6d7b90ca2593968e9c95b0902e45c4634823be196b SHA512 0db2294cc16a919a84a1bb71194b3ed7a87bb669f684e4cc0943b33899d69690097c59d5c9f8e631bc1b4136db7f10f7cb0fbb1c96912aee567a0fd7dc9c9588
-DIST patchelf-0.17.2.tar.gz 143954 BLAKE2B 7ed684c63955a0b9cfe293fb966f7f08a90c76e8efb2b493eaf3705c57767b31b31e48ab59f39ff1d91b7a4501e6d203e32a40040625a44a7d44113b1320530c SHA512 e5545416d32248d023759457d0a5cd4841d69f39366eb0aa9cfd8a43d2ce372c6e05995bf60ba62bd85c6d98fdece2dbd1e20872e338ef5ac75f11b82ae091b3
 DIST patchelf-0.18.0.tar.gz 331312 BLAKE2B e6ce4ec3bd89c280bb37230dbeb566b803f09900006e79f7dba74f138f66e17746d331baea4def6a43163024b3d86aa8dbac9b2c6545ac146298a8b84373d03b SHA512 6a917d7336b1e8c59f42d4cd1dc725df1378d77657fce13cb31547da1d4805b9df8a834a7b8408fda8aa1dbeb37d0cdca74d8698844ea2f44149f800b802dea6
-EBUILD patchelf-0.17.0.ebuild 594 BLAKE2B 029d3c714b64216953a3688c4c9d0d28066bf46c436949a6537251ef59d99dd64475b85154d3a63c89f91bde4613938240f69f2c2026177506f1f9f6d0dc42aa SHA512 d3802dd03f4da721e2b50fd1245d418418ecbb706c05e19831e869884faa02db3506847420c4162dc0b9c1973c1fbb5f0dd67537c3aa17af508cf833aba3adfc
-EBUILD patchelf-0.17.2.ebuild 600 BLAKE2B 4f472b56c8021bf9ab7a50d0b9ade888ef0d116096e885bb88362b5259350b77070015666b26892bbbffa966bb21c33b5271586ef14840873fe84237af1b1651 SHA512 2d51ffd0b08da7cf184ad35b8c37ef305cce289fee9d176f1f4b438e4ba8ec9e36e28adbd5c3e375c952100ca1ba732d0e0e09202d71ec2ea37c7205852f8907
 EBUILD patchelf-0.18.0.ebuild 660 BLAKE2B e0b53342c7f6a241fa9361d606f6b8d9d48ea5e20b18526d591e1c3a48726e781cd5f360a4456687fcf9a334e15d889a80b930132d9cd06e4feb358f73281dd0 SHA512 a2f5121b1e562c4a64c4c3819485a758b4c164be036ec182a9be323c3a70ce049650fca6160cee8d0e66d4d9fb8444da437d5c7540d032d79f37b36859bc19eb
 MISC metadata.xml 304 BLAKE2B f3c4f3a80192390cdeff546ea23f4a03454f17e4900799e10740420f2e158146a6fd8e02b8f77d07fe38646e23eff734d4a7a8571fa23d738e6c000fbe347ec3 SHA512 4a52dc190d6576ddf580830240cbe20c826b609228cc3ca8014f94ff1759a2b1382294b7d5a0c8e3160e7e7e26d055f82855e40076de3b7e410290e119333927
diff --git a/dev-util/patchelf/patchelf-0.17.0.ebuild b/dev-util/patchelf/patchelf-0.17.0.ebuild
deleted file mode 100644
index 416bbff5fc7e..000000000000
--- a/dev-util/patchelf/patchelf-0.17.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executables"
-HOMEPAGE="https://github.com/NixOS/patchelf"
-SRC_URI="https://github.com/NixOS/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~riscv-linux ~x86-linux"
-LICENSE="GPL-3"
-
-src_prepare() {
-	default
-	rm src/elf.h || die
-
-	sed -i \
-		-e 's:-Werror::g' \
-		configure.ac || die
-
-	eautoreconf
-}
diff --git a/dev-util/patchelf/patchelf-0.17.2.ebuild b/dev-util/patchelf/patchelf-0.17.2.ebuild
deleted file mode 100644
index ef24854c8688..000000000000
--- a/dev-util/patchelf/patchelf-0.17.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executables"
-HOMEPAGE="https://github.com/NixOS/patchelf"
-SRC_URI="https://github.com/NixOS/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~riscv-linux ~x86-linux"
-LICENSE="GPL-3"
-
-src_prepare() {
-	default
-	rm src/elf.h || die
-
-	sed -i \
-		-e 's:-Werror::g' \
-		configure.ac || die
-
-	eautoreconf
-}
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 4b9d27e56bb4..5d1d0283af57 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -11,5 +11,6 @@ DIST radare2-5.8.8.tar.gz 11169182 BLAKE2B 7730bfefba5e5b9196404219800693fe37bf8
 DIST radare2-testbins-b598433124fd1fad032e92ca2588b5c0e58674c4.tar.gz 127941374 BLAKE2B 5c4a0f804ded455ae90a546b487a49ed8e9fa19144970d271ef78cd7d6796b628aa4673fb1560b3802a3196558c785fdaf32c37f2b43a38f08650dbd0c1b52a9 SHA512 4ca82bff1055429c4d19f5dfa6a47664eb9c59ff45869419bcaada7579d785ad9540da81f834b4bb82c0a27602d80feeb0e891489c77bc30de7d7e531b948dc5
 DIST radare2-testbins-fbb0059b0a120fbb31d378affd8b47d0996f9676.tar.gz 127037525 BLAKE2B d7387650bb0eeebb2fe247755c9640b1d089f91239a7669da888c13db62147cc0d51bbf17ecf060a789d0319048ee61c8eda9b8477267bd5f53093e1c3b28e98 SHA512 50942dd3f17ccf22b71f3e50fa78e12578966f7cdadbc45ba36719de9117fc0455a74038ed4d9436daa43b74050bea72848841787f7aa660ed765d4644da1fe8
 EBUILD radare2-5.8.6.ebuild 3495 BLAKE2B 6cb69087cc6c428f9dff16a0084efcbd63b0361179eccce1046d9ebd9aa141d81e3349273ad9dfbbf5b13b560048eb242732a62f22605fd0670206d330a04c9a SHA512 bfb1dae6343aa553e15e40aaa596bf988c21a31fd8e92aa98b3cff0185f8de43ae45de537c4df365cbc18d8e61c4db36baef7290ed80f85010e422e6aef598d5
+EBUILD radare2-5.8.8-r1.ebuild 3240 BLAKE2B 3361ff32d5ce01b1a48b22e1841d398fda16e39f8fc68af29aba2b44c12d7abc4318db669c233986ac2421a9a99c5bd8c06e7f628589fa099b5aab159ee3b059 SHA512 7d183613b70005c4f19f4355b7c7f0cbf7b476f2d9771b83b6b607b773d912a5935505f12976b630918162940205779d225a7b22b787612ba0202d32b041b320
 EBUILD radare2-5.8.8.ebuild 3495 BLAKE2B b77920abdaf907f869b5521aecec117cfd2e5fb7ebc2dd7e480904eaef667bfff1510eeb52c8fc70a2f239f1e5408f03f6eabb2721cf4ef0a773714643e43a2f SHA512 b322afe3c3e50c205aadf570aa93bd657fca771c87e4c82c1770c57ad87b756e1dce668e42f0b85f026968b2b732709198fa192d559ab2c18b4e98422ebc1e19
 MISC metadata.xml 479 BLAKE2B 57c303d3344fd8a086d7c41ca92ca18d7291c77abbfc8eab6f9f3f1ff11481235aae3b04cc613e3ad28202ad972e9e24e5516a3a1d805341da2dd0ad74efb77b SHA512 e798ed2144748ea2784f7cd89da1a81c59d44bf77f67738de8bc11c797d50ea3c5e45a8cee7801c06c3fff4c634f400e28ef46c0d9bd1063ecc3066ba1b1809e
diff --git a/dev-util/radare2/radare2-5.8.8-r1.ebuild b/dev-util/radare2/radare2-5.8.8-r1.ebuild
new file mode 100644
index 000000000000..bf6f1ab75983
--- /dev/null
+++ b/dev-util/radare2/radare2-5.8.8-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2023 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=55d73c6bbb94448a5c615933179e73ac618cf876
+ARMV7_COMMIT=f270a6cc99644cb8e76055b6fa632b25abd26024
+BINS_COMMIT=b598433124fd1fad032e92ca2588b5c0e58674c4
+
+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/capstone-5.0_rc4:=
+	dev-libs/libzip:=
+	dev-libs/xxhash
+	sys-apps/file
+	sys-libs/zlib
+	ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/gperf
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.8.2-vector35.patch"
+)
+
+src_prepare() {
+	default
+
+	# Hack for vector35 arm plugins
+	mv "${WORKDIR}/vector35-arch-arm64-${ARM64_COMMIT}" libr/arch/p/arm/v35/arch-arm64 || die
+	mv "${WORKDIR}/vector35-arch-armv7-${ARMV7_COMMIT}" libr/arch/p/arm/v35/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 || die
+}
+
+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+="-Wl,-rpath=${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
+}