gentoo resync : 07.01.2022

3 files changed, 134 insertions, 0 deletions

diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index a4eef471fa82..c2e6721bb574 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,6 +1,12 @@
+AUX radare2-5.5.0-vector35.patch 785 BLAKE2B 7e53aa1258290682827a1ab22a1bfeec12222c7e7c7acdde40a0845f47729918c41de9c59bcc1e79cbd1d318944245994c348e6d76f56852803ffda27206216f SHA512 3d5d7c682482973a00d78736c3d92d29711e729d01a220da5b89f66f27fae2c71cf40173d9ca9616709d4a2cc55a0450ae003e3d97998e0dfff5dcb64eba7675
 DIST radare2-4.5.1.tar.gz 8266567 BLAKE2B 0d23c1d47dd79ffd9398ca7b2c8b383ba6a7e3ec662046d1111ab34cabcdaaf1fdd449686433b3229e3c22c31c705530b0a85bbd22b5fc79891a5ad292ba0ff1 SHA512 f08a4cd1e0d65643463d9f9dbb1aacfe793c7b411ec820a18b75a5975d265cfc2cf91e593522c8823aa369098ded21415939acb07c84d8acd102889bf5aed899
 DIST radare2-5.3.1.tar.gz 8500461 BLAKE2B 8b29e81c90f477e313f5d14dea707f3e8d47c9abbe1f9ca2c7caef98a85b38a5b5e37a31063be289c55fda041e10b8403895f863dd602091ab5307213605260d SHA512 34c96c7c863fb8a59f1d03539375d5b8f31f6021dc84ce943daa163d8a0227bf3156963cc187c366790abec4381da6aa987248e76570a498cfcdeb982cb2ffc0
+DIST radare2-5.5.4-vector35-arm64.tar.gz 1021299 BLAKE2B 389bdc43e90ba71961e5d8afca495bd63b25d4c0dc9513c5e9cc0770f091199197dc1e4b8a9d4c57206acfd892a6b4ff9ba8b0f925e493f540956c64edfcd809 SHA512 7762cee60acc7605c2c127acab646c5c58c5736e6801058eec69c2da52901d0ecab85b0496d798be6403bedf27ffd4fe4e3a8d47c8802af1fe3805a4ac32ae26
+DIST radare2-5.5.4-vector35-armv7.tar.gz 255288 BLAKE2B ca96b3f68381a0987c4efa10dcb798194486019762e89d1eb19a3fd24f6983535eea792099c60e4c1a9d2bdb5baab119fe2e9a7a889fad5a14023e5f984959b8 SHA512 e9eb6cee02bbbb265914b1f9118c7a143ed76a201c085af5516855475bf7f3ad5f9c82d1548e85a0339fbc33e029ef0e4be9d8cef68d212ae16ce1a7f18453ff
+DIST radare2-5.5.4.tar.gz 9610424 BLAKE2B 4e113d854a55597270663f9c18f1d71da21fa8e539a997773f30178e93de54d397f56103813ec2c60cfabdf2d811151ad7285fc479e1ee681687831030e18da2 SHA512 b64268a8fcfbd89455b991557c82bb24d5f42471f4424cd971c1143ff604720fb4c00216a7054d72df6bbbdace1b814a6c3538708926c229dd2f8476b7d325da
+DIST radare2-testbins-a6d1a0331605b4a5db9aa9260386c850d484dc70.tar.gz 118148516 BLAKE2B 9b1a1861b4aea7db1cc364d16577a2b7afe082b0838178d307ed24704710edfa572533bab9b194d38c1b294e5a4fb522d1a93e92a1c577ca6622a16d94209bd5 SHA512 8888fab0d2295e92c4bd0ab4c2ba646951e41cc4c1f9915d501a27fbff21e82d5340d1a9255d998dcf0e209a57bb35fc714adcb31ed7adb58aa412f6202e69c6
 EBUILD radare2-4.5.1-r1.ebuild 1635 BLAKE2B 70e132b2d36bab7414ac66b0b1cfeced89880124cd21cd10918db62768d9969b17a81ed8b75ca97f72a97a9260fa350b56cbb65540c2af4a5a007f7938c5947d SHA512 4dec2c92cc02b4523530135167722502da12eef6aff1bf571e2efbfb2c4633170106131a980ea1c94153f5212a6cf8adc0fdb396a60d87d0230dcf8ca24b3691
 EBUILD radare2-5.3.1.ebuild 1654 BLAKE2B 1f5a47aeaee48b973a25ce3aaa2d45e8eb8c39bb57cd0dcdd18a2dbb2d1e459d754681e8cce8692e53ac34b8c046f893a54a2679dd64cc6b83a411e9fe5d0521 SHA512 6b9deb4ef3e1cdae53a72a7d9ecd70afb32aa0e45808ff8ed2a89d2ca792180bbbfe2a03d61a937d228c086bd338fc8baaae163930c83d14314a0fd788bec80e
+EBUILD radare2-5.5.4.ebuild 2760 BLAKE2B 3726d1b139af09977ffeec4380c77e7d4124c0a2c999f6e5b774030d996d78136a54dd46b791591cd5b613b78f7dbdc430032c80ee7ca98ebe1fded566df4105 SHA512 b2ed6d4db225ce28b2610492563ed84dd5814c8d6de731fc27c7cccab9ec0600afe6edd7660aae14e781f3cdf4aacf582f2ce117e7acf018514a4e6af4f7e36d
 EBUILD radare2-9999.ebuild 1654 BLAKE2B 1f5a47aeaee48b973a25ce3aaa2d45e8eb8c39bb57cd0dcdd18a2dbb2d1e459d754681e8cce8692e53ac34b8c046f893a54a2679dd64cc6b83a411e9fe5d0521 SHA512 6b9deb4ef3e1cdae53a72a7d9ecd70afb32aa0e45808ff8ed2a89d2ca792180bbbfe2a03d61a937d228c086bd338fc8baaae163930c83d14314a0fd788bec80e
 MISC metadata.xml 397 BLAKE2B 0da99624e778e490f84d0187d28a27b7f73a3c780fc3151619ef3196ca5c01b3758f0e07b6412b9c4f9fddb8738d5005b412d9bce6456b107e24931ba0ea5052 SHA512 02227b3d952b7dadc9f893246b7913cc7910b440ca6c54e7e0f9efcba95db711f691811a767ca1d81fba3e5c073c56b6154361df4beef7fc621fa8176fc05d47
diff --git a/dev-util/radare2/files/radare2-5.5.0-vector35.patch b/dev-util/radare2/files/radare2-5.5.0-vector35.patch
new file mode 100644
index 000000000000..5ebf58020d4d
--- /dev/null
+++ b/dev-util/radare2/files/radare2-5.5.0-vector35.patch
@@ -0,0 +1,22 @@
+--- 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/radare2/radare2-5.5.4.ebuild b/dev-util/radare2/radare2-5.5.4.ebuild
new file mode 100644
index 000000000000..3a2f15599169
--- /dev/null
+++ b/dev-util/radare2/radare2-5.5.4.ebuild
@@ -0,0 +1,106 @@
+# 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="http://www.radare.org"
+
+ARM64_COMMIT=3c5eaba46dab72ecb7d5f5b865a13fdeee95b464
+ARMV7_COMMIT=dde39f69ffea19fc37e681874b12cb4707bc4f30
+BINS_COMMIT=a6d1a0331605b4a5db9aa9260386c850d484dc70
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/radareorg/radare2"
+else
+	SRC_URI="https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/radareorg/vector35-arch-arm64/archive/${ARM64_COMMIT}.tar.gz -> ${P}-vector35-arm64.tar.gz
+		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="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.5.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_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}
+}
+
+src_test() {
+	emake -C test -k unit_tests || die
+}