gentoo auto-resync : 15:04:2024 - 12:04:02

3 files changed, 9 insertions, 141 deletions

diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 5d1d0283af57..c263762f3803 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,16 +1,13 @@
 AUX radare2-5.8.2-bundled-capstone.patch 562 BLAKE2B 9ec99a25383f17615ba548d67516179dd4f860dad5e1f68674f0e3ac80df9d3edab6f0b6e3911758bf6010bd7be1628d7d4f88b68161739088662007543ea782 SHA512 44972fd7d337c14169a123fcb6e5e27ea71abac84c1cdd654a81fc9c8e6112c6cad596b529b20ce1c85245e1726149dd5e2103c30ca0b7f16faff3ccade838c2
 AUX radare2-5.8.2-vector35.patch 882 BLAKE2B 6453cdeec6e5656ff86af84f0876fd7543896ac289810e1783cc66eecea0e86513ef6374a93109845b6a78d211fff4b82c87e6a66f21b349291ed54f99a36642 SHA512 b9fb378d1817bba06945802d2b1e243c3df493f688d5e1b294acf410666e6e3946cc2438ffb9ef0d60485e4c76995d832ff02c12e6c2ca486a6ead68e23b5c57
-DIST radare2-5.8.6-capstone-4.0.2.tar.gz 3439542 BLAKE2B 435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9 SHA512 7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e
-DIST radare2-5.8.6-vector35-arm64.tar.gz 1050988 BLAKE2B 889c5a98b6efb45026349ca25b73d39e8a8049fce052d49b5e37d974bff038de85f99f1d7651db6c621b036be2948e29a62e6b8261cab6a9bdfd72442858d7e9 SHA512 433a9e972ee13269a495e94aba335b97892eb2614de1460e055e30d60976989f986ef253b352ba918786d4056e3a4d948a66ea90d25aa5ddf52a276152279c92
-DIST radare2-5.8.6-vector35-armv7.tar.gz 255278 BLAKE2B 8b5191c48fad2e7602dc2f7053f9c9ea8cca8e9bc5d68a0cdb7ccff9ecc65c5d1ff6a434e28488dbd6fb71fc7482fce08a0a69c358e5c3d6c017ac1e4cee3b21 SHA512 40c048b29856f48300d4539bc7bda38e6ceae1e8d4d9d131c4a7546b6e26b2fb96309c483b67e2c2290b06cea5fc52a7beb30557d54e89296e7734cc1ab06d10
-DIST radare2-5.8.6.tar.gz 11119704 BLAKE2B da53500982894a84de0a60640622b6498d3a6cc5236d7141cbd400b76448dc53535c74eef620e13531965c855124065a7f8ccfc3d8622c4e366100dc777e5274 SHA512 cd53ed7519d485253182d8d7d414b8d0927e65dd4d0c9716d0d8819e739c8e5e39deb702d93cb5a2a9425804d9798e6eb0acb58a4b904e25a9ba4fcad2315f47
-DIST radare2-5.8.8-capstone-4.0.2.tar.gz 3439542 BLAKE2B 435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9 SHA512 7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e
 DIST radare2-5.8.8-vector35-arm64.tar.gz 1050988 BLAKE2B 889c5a98b6efb45026349ca25b73d39e8a8049fce052d49b5e37d974bff038de85f99f1d7651db6c621b036be2948e29a62e6b8261cab6a9bdfd72442858d7e9 SHA512 433a9e972ee13269a495e94aba335b97892eb2614de1460e055e30d60976989f986ef253b352ba918786d4056e3a4d948a66ea90d25aa5ddf52a276152279c92
 DIST radare2-5.8.8-vector35-armv7.tar.gz 255278 BLAKE2B 8b5191c48fad2e7602dc2f7053f9c9ea8cca8e9bc5d68a0cdb7ccff9ecc65c5d1ff6a434e28488dbd6fb71fc7482fce08a0a69c358e5c3d6c017ac1e4cee3b21 SHA512 40c048b29856f48300d4539bc7bda38e6ceae1e8d4d9d131c4a7546b6e26b2fb96309c483b67e2c2290b06cea5fc52a7beb30557d54e89296e7734cc1ab06d10
 DIST radare2-5.8.8.tar.gz 11169182 BLAKE2B 7730bfefba5e5b9196404219800693fe37bf86b97f196b200dfbda913c07001e970c98f4b999a059e9636983b7311880e37f436890a68397d732a5a463ce7015 SHA512 38f3373cc3029a7d92e1ae44ab515f0bea4c897cb981a904b40a7e05c04c29786dc8ac2f46fc97b495c4a2ec4905e0e196633dd3144c557c550239c462c9360b
+DIST radare2-5.9.0-vector35-arm64.tar.gz 1050988 BLAKE2B 889c5a98b6efb45026349ca25b73d39e8a8049fce052d49b5e37d974bff038de85f99f1d7651db6c621b036be2948e29a62e6b8261cab6a9bdfd72442858d7e9 SHA512 433a9e972ee13269a495e94aba335b97892eb2614de1460e055e30d60976989f986ef253b352ba918786d4056e3a4d948a66ea90d25aa5ddf52a276152279c92
+DIST radare2-5.9.0-vector35-armv7.tar.gz 255278 BLAKE2B 8b5191c48fad2e7602dc2f7053f9c9ea8cca8e9bc5d68a0cdb7ccff9ecc65c5d1ff6a434e28488dbd6fb71fc7482fce08a0a69c358e5c3d6c017ac1e4cee3b21 SHA512 40c048b29856f48300d4539bc7bda38e6ceae1e8d4d9d131c4a7546b6e26b2fb96309c483b67e2c2290b06cea5fc52a7beb30557d54e89296e7734cc1ab06d10
+DIST radare2-5.9.0.tar.gz 11425359 BLAKE2B 4e345eb93f50dd57f65d659e82918a3e83c29f86d758d6b98efbfea8a3ecebf2648d32dac53cc43c2a36b8a71aa969b6e1eaab87dd9bf667570110eb6ed056b1 SHA512 f184ad6e066a5113091912c11cca87cb9450eff20e920a00dc9da0efa9de97d6bfdaf44ae4d9e08a4760f4ebca82732832a309fad8452930adb4ee2438d9668e
+DIST radare2-testbins-32e2480e3b7b6959cd1ba483a200c792b4cb9236.tar.gz 156265712 BLAKE2B 4729c30f56ab9c318f8de83e2a0de820539351cb44aa64c500fa02ed94e4bf6494c60a928b64980767ec3003d72619c98769cfd229d8381524f5175027c03c2e SHA512 d8de16e7aacd2ea4e5ecc85ddc1d38c4b8c47b37964c680084bfcb49144e2da783bccd859cb0a84de6080c7ce893af08f27d170725dcdc5f87ee4f830c5dc6da
 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
+EBUILD radare2-5.9.0.ebuild 3240 BLAKE2B a36399f1207fae59e7efc9f23d7d4dc19537956281cd6692d88d252d2ad4408b55f8a34d5cc993adc7849ba020f7b458bad6e2f9a4df1adf7217f1eb978f28a4 SHA512 3cab706d9c81cf06c8945fe6094b5e6398803ad5121ab73d6dd4958d654e50422439908c2099b8bf6ce6786a81aea2e22d03ba2d39c2a3177b3c412da211576e
 MISC metadata.xml 479 BLAKE2B 57c303d3344fd8a086d7c41ca92ca18d7291c77abbfc8eab6f9f3f1ff11481235aae3b04cc613e3ad28202ad972e9e24e5516a3a1d805341da2dd0ad74efb77b SHA512 e798ed2144748ea2784f7cd89da1a81c59d44bf77f67738de8bc11c797d50ea3c5e45a8cee7801c06c3fff4c634f400e28ef46c0d9bd1063ecc3066ba1b1809e
diff --git a/dev-util/radare2/radare2-5.8.8.ebuild b/dev-util/radare2/radare2-5.8.8.ebuild
deleted file mode 100644
index d74025cdf3b9..000000000000
--- a/dev-util/radare2/radare2-5.8.8.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# 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
-CAPSTONE_VER=4.0.2
-
-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
-		mirror+https://codeload.github.com/capstone-engine/capstone/tar.gz/${CAPSTONE_VER} -> ${P}-capstone-${CAPSTONE_VER}.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
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/gperf
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.8.2-vector35.patch"
-	# Maybe temporary, https://bugs.gentoo.org/891805
-	"${FILESDIR}/${PN}-5.8.2-bundled-capstone.patch"
-)
-
-src_prepare() {
-	default
-
-	mv "${WORKDIR}/capstone-${CAPSTONE_VER}" shlr/capstone || die
-
-	# 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-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
-}
diff --git a/dev-util/radare2/radare2-5.8.6.ebuild b/dev-util/radare2/radare2-5.9.0.ebuild
index 83d4c245039c..fcd2d8642dc6 100644
--- a/dev-util/radare2/radare2-5.8.6.ebuild
+++ b/dev-util/radare2/radare2-5.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,8 +10,7 @@ HOMEPAGE="https://www.radare.org"
 
 ARM64_COMMIT=55d73c6bbb94448a5c615933179e73ac618cf876
 ARMV7_COMMIT=f270a6cc99644cb8e76055b6fa632b25abd26024
-BINS_COMMIT=fbb0059b0a120fbb31d378affd8b47d0996f9676
-CAPSTONE_VER=4.0.2
+BINS_COMMIT=32e2480e3b7b6959cd1ba483a200c792b4cb9236
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -20,7 +19,6 @@ 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
-		mirror+https://codeload.github.com/capstone-engine/capstone/tar.gz/${CAPSTONE_VER} -> ${P}-capstone-${CAPSTONE_VER}.tar.gz
 		test? ( https://github.com/radareorg/radare2-testbins/archive/${BINS_COMMIT}.tar.gz -> radare2-testbins-${BINS_COMMIT}.tar.gz )
 	"
 
@@ -35,6 +33,7 @@ IUSE="ssl test"
 RESTRICT="fetch !test? ( test )"
 
 RDEPEND="
+	>=dev-libs/capstone-5.0_rc4:=
 	dev-libs/libzip:=
 	dev-libs/xxhash
 	sys-apps/file
@@ -49,15 +48,11 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.8.2-vector35.patch"
-	# Maybe temporary, https://bugs.gentoo.org/891805
-	"${FILESDIR}/${PN}-5.8.2-bundled-capstone.patch"
 )
 
 src_prepare() {
 	default
 
-	mv "${WORKDIR}/capstone-${CAPSTONE_VER}" shlr/capstone || die
-
 	# 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
@@ -79,6 +74,7 @@ src_configure() {
 
 	econf \
 		--without-libuv \
+		--with-syscapstone \
 		--with-sysmagic \
 		--with-sysxxhash \
 		--with-syszip \