gentoo resync : 28.04.2021

6 files changed, 152 insertions, 15 deletions

diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index e346b303e994..07fe15417aba 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,6 +1,9 @@
+AUX radare2-5.2.0-ssl-build.patch 1652 BLAKE2B e9c0e5aac9a5f88b6beeb7cefb5401c3277b2952c41c468e60bc12bcbcf423cf51a36e16a14a763e5111c2d7b756fcd2d4b799b0a22883a96a2567eb135cc49b SHA512 040cb21ac7bdeb7d513ea1b2d69f2abb8e2978aaa57713850e53b0c1175d4884c9a78e44a9e144bc445bbbfaa0fbc8bb9ba2e513794495ca00c36c47e0ed9cfd
 DIST radare2-4.5.1.tar.gz 8266567 BLAKE2B 0d23c1d47dd79ffd9398ca7b2c8b383ba6a7e3ec662046d1111ab34cabcdaaf1fdd449686433b3229e3c22c31c705530b0a85bbd22b5fc79891a5ad292ba0ff1 SHA512 f08a4cd1e0d65643463d9f9dbb1aacfe793c7b411ec820a18b75a5975d265cfc2cf91e593522c8823aa369098ded21415939acb07c84d8acd102889bf5aed899
-DIST radare2-5.1.1.tar.gz 7920840 BLAKE2B c6109453d3da6a08f8169bfdc610614f2aee2d6ef13a975ed89e5337c79ad1a8340a08df1ba9d08cbb0db7b61db8c0357a4878e7b948a988c08b895c24ec366b SHA512 b6728bb59788804f5442d5eec8141f62c3b51f589955589b310733b3aeb28beedb969af540649f454dad96710231df384e389d8b4a1d55627d8370e4d3da454f
-EBUILD radare2-4.5.1-r1.ebuild 1700 BLAKE2B 71ba7c3ec35e8555ae9125e89c9b2b2b97bc6206d591b54ccb79151c195854cfc97b36725ee521cdd431d80214537dbd9c5b04cd418c7da7f222d1f11c744cda SHA512 2658993539d9e2631b83a6e6a52a1d363598f50656e254e21434c76b14e31b79da7c43388e72f77cd7010462982789251da93c02120f969c314dc4bb880b1705
-EBUILD radare2-5.1.1.ebuild 1700 BLAKE2B d66644f48b043f437e1161b57bd40f97d5be9bdc29a6df60fc631ec781461f1e7ba67aefe2c4100e6641beb947d06c79dcdf586c4613d88fb6c4d987b7b35353 SHA512 9084fb753207d024beaca63143781b7f9dc73043845118a2eb86e6230bd5394964c8638bb657fb463ea3fc01ed28270cb325d1bccda49c29a3164a73c908ba7d
-EBUILD radare2-9999.ebuild 1700 BLAKE2B 71ba7c3ec35e8555ae9125e89c9b2b2b97bc6206d591b54ccb79151c195854cfc97b36725ee521cdd431d80214537dbd9c5b04cd418c7da7f222d1f11c744cda SHA512 2658993539d9e2631b83a6e6a52a1d363598f50656e254e21434c76b14e31b79da7c43388e72f77cd7010462982789251da93c02120f969c314dc4bb880b1705
+DIST radare2-5.2.0.tar.gz 8254980 BLAKE2B 51335b5560ea9085a7cb6ae998657d62353ad65e10f715ca25ec34cde75d48cd06d8312a898de71096138365d3ea13de45e6e48b2c0f06cea7d593cca43a0ef9 SHA512 664ea6df65c1ea8d13a80d281c3dbbcae16fb308826b9276e68d63f26f239f4a5c0d59abcf9325c299894ad4ebf1098b964aa3cad0bbe58b6c96cbd6e7b25952
+DIST radare2-5.2.1.tar.gz 8302475 BLAKE2B 2edfa30d15214ac4dac6065349c808b539619413e7a100459efd5bf74e95c2483edb1ec13de8387d3a7dcfe25a2922ee377c37f4781c374df04e63fe98910b7e SHA512 c744f5c8fff163022a7a9a913fe34dfa0dee0d9ab3b18bd4cc038c2d487dbfeba2f1523aa12a3166a2c22c45bcc71e802fae101b72fc2e6adab96b522c0de17b
+EBUILD radare2-4.5.1-r1.ebuild 1699 BLAKE2B e10972dda791e5ab493c474094e4ab16fd8b25dd4acfbf9f25a69fbb9ecc533c7301e9023044ddca3e2a42b4d9445dd274a2c473b6e84e4815fd3e7a0d9bf2c3 SHA512 f1417a0600a2cd5d377b62f9db2f89bd0284cf778058ab5781e06a22a6abd43c7833f38e90822520ddeb4c959a8d1b27edbba4f6e561f6a1de833baf31611b96
+EBUILD radare2-5.2.0.ebuild 1745 BLAKE2B 8ec3f10d7077966aaa7164250955aa7861fca2704e3efa685a53b68a0bfb1bdd79ad09bb62da3333db3ad82f8e1029ee073fb9052b7875a46b8a2e5dcddb20fb SHA512 baba36bdfb94f36f7fda3669141c1ddefbabbb73659d4dc91eac6755bac133cae19a821e51fdc89b0f82726e63571da83a899790728b14a909edab2442a4d76f
+EBUILD radare2-5.2.1.ebuild 1699 BLAKE2B e10972dda791e5ab493c474094e4ab16fd8b25dd4acfbf9f25a69fbb9ecc533c7301e9023044ddca3e2a42b4d9445dd274a2c473b6e84e4815fd3e7a0d9bf2c3 SHA512 f1417a0600a2cd5d377b62f9db2f89bd0284cf778058ab5781e06a22a6abd43c7833f38e90822520ddeb4c959a8d1b27edbba4f6e561f6a1de833baf31611b96
+EBUILD radare2-9999.ebuild 1699 BLAKE2B e10972dda791e5ab493c474094e4ab16fd8b25dd4acfbf9f25a69fbb9ecc533c7301e9023044ddca3e2a42b4d9445dd274a2c473b6e84e4815fd3e7a0d9bf2c3 SHA512 f1417a0600a2cd5d377b62f9db2f89bd0284cf778058ab5781e06a22a6abd43c7833f38e90822520ddeb4c959a8d1b27edbba4f6e561f6a1de833baf31611b96
 MISC metadata.xml 375 BLAKE2B 16f6bc4a1322225cd5188b2555418ba9e64e4cd2b2afc98226a9f4bbfed59f5da1d4495fc154f6ac254e9e5f48d8a9669176391084c6f62d0f04fbb02676a726 SHA512 225a2e358254837ede6e6bba6298fdc9cf5d8fc9dddb7201b094424f62d3ba7fd54b57cc9dc6c1828163f3df50b0bdceb51de30271f4b6e8963b190893582124
diff --git a/dev-util/radare2/files/radare2-5.2.0-ssl-build.patch b/dev-util/radare2/files/radare2-5.2.0-ssl-build.patch
new file mode 100644
index 000000000000..8701adb62664
--- /dev/null
+++ b/dev-util/radare2/files/radare2-5.2.0-ssl-build.patch
@@ -0,0 +1,54 @@
+From 7273429e4ba85318f0da2ae03ecc154834aaa73b Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Mon, 12 Apr 2021 23:48:09 +0100
+Subject: [PATCH] state.c: fix --with-openssl build
+
+Build failure happens at:
+
+```
+$ ./configure --with-openssl && make
+....
+state.c: In function 'r_hash_do_hmac_sha256':
+state.c:155:19: error: 'r_SHA256_BLOCK_LENGTH' undeclared (first use in this function); did you mean 'SHA256_BLOCK_LENGTH'?
+  155 |         ut8 bskey[r_SHA256_BLOCK_LENGTH]; // block-sized key
+      |                   ^~~~~~~~~~~~~~~~~~~~~
+      |                   SHA256_BLOCK_LENGTH
+```
+
+The change defines r2_.* aliases for openssl implementation.
+---
+ libr/hash/state.c | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/libr/hash/state.c b/libr/hash/state.c
+index 6f3ae6b4c..93adafc81 100644
+--- a/libr/hash/state.c
++++ b/libr/hash/state.c
+@@ -7,6 +7,24 @@
+ #include <openssl/md4.h>
+ #include <openssl/md5.h>
+ #include <openssl/sha.h>
++
++#  define r_SHA256_BLOCK_LENGTH SHA256_BLOCK_LENGTH
++
++#  define r_SHA1_Init           SHA1_Init
++#  define r_SHA1_Update         SHA1_Update
++#  define r_SHA1_Final          SHA1_Final
++
++#  define r_SHA256_Init         SHA256_Init
++#  define r_SHA256_Update       SHA256_Update
++#  define r_SHA256_Final        SHA256_Final
++
++#  define r_SHA384_Init         SHA384_Init
++#  define r_SHA384_Update       SHA384_Update
++#  define r_SHA384_Final        SHA384_Final
++
++#  define r_SHA512_Init         SHA512_Init
++#  define r_SHA512_Update       SHA512_Update
++#  define r_SHA512_Final        SHA512_Final
+ #else
+ #include "md4.h"
+ #include "md5.h"
+-- 
+2.31.1
+
diff --git a/dev-util/radare2/radare2-4.5.1-r1.ebuild b/dev-util/radare2/radare2-4.5.1-r1.ebuild
index 963c0b6b6e74..5dc5b337d6ad 100644
--- a/dev-util/radare2/radare2-4.5.1-r1.ebuild
+++ b/dev-util/radare2/radare2-4.5.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit bash-completion-r1 eutils toolchain-funcs
+inherit bash-completion-r1 toolchain-funcs
 
 DESCRIPTION="unix-like reverse engineering framework and commandline tools"
 HOMEPAGE="http://www.radare.org"
@@ -67,8 +67,8 @@ src_install() {
 	# 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'"
+		if [[ -d ${d} ]]; then
+			rm -rfv "${d}" || die "failed to delete '${d}'"
 		fi
 	done
 
diff --git a/dev-util/radare2/radare2-5.2.0.ebuild b/dev-util/radare2/radare2-5.2.0.ebuild
new file mode 100644
index 000000000000..21ead643e77e
--- /dev/null
+++ b/dev-util/radare2/radare2-5.2.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="unix-like reverse engineering framework and commandline tools"
+HOMEPAGE="http://www.radare.org"
+
+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"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ssl libressl"
+
+RDEPEND="
+	dev-libs/libzip
+	dev-libs/xxhash
+	sys-apps/file
+	sys-libs/zlib
+	dev-libs/capstone:0=
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=("${FILESDIR}"/${P}-ssl-build.patch)
+
+src_prepare() {
+	# Fix hardcoded docdir for fortunes
+	sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \
+		libr/include/r_userconf.h.acr
+	default
+}
+
+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}
+}
diff --git a/dev-util/radare2/radare2-5.1.1.ebuild b/dev-util/radare2/radare2-5.2.1.ebuild
index fb93a9ece984..5dc5b337d6ad 100644
--- a/dev-util/radare2/radare2-5.1.1.ebuild
+++ b/dev-util/radare2/radare2-5.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit bash-completion-r1 eutils toolchain-funcs
+inherit bash-completion-r1 toolchain-funcs
 
 DESCRIPTION="unix-like reverse engineering framework and commandline tools"
 HOMEPAGE="http://www.radare.org"
@@ -67,8 +67,8 @@ src_install() {
 	# 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'"
+		if [[ -d ${d} ]]; then
+			rm -rfv "${d}" || die "failed to delete '${d}'"
 		fi
 	done
 
diff --git a/dev-util/radare2/radare2-9999.ebuild b/dev-util/radare2/radare2-9999.ebuild
index 963c0b6b6e74..5dc5b337d6ad 100644
--- a/dev-util/radare2/radare2-9999.ebuild
+++ b/dev-util/radare2/radare2-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit bash-completion-r1 eutils toolchain-funcs
+inherit bash-completion-r1 toolchain-funcs
 
 DESCRIPTION="unix-like reverse engineering framework and commandline tools"
 HOMEPAGE="http://www.radare.org"
@@ -67,8 +67,8 @@ src_install() {
 	# 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'"
+		if [[ -d ${d} ]]; then
+			rm -rfv "${d}" || die "failed to delete '${d}'"
 		fi
 	done