gentoo resync : 18.08.2019

5 files changed, 166 insertions, 0 deletions

diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 898693122776..1bfe1f4d9abe 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,7 +1,13 @@
 AUX radare2-3.5.1-mount-free.patch 733 BLAKE2B bd5301947fab85f68e65e2ed69138df18cef42b1728804f09e4003cf6d633a744660aa89a60569e229928180e4fc3f82a1c5568cfbbc04042774062ad3e17f67 SHA512 d91e75f418c0b3e2e7f76a858b34cae81babaf27829b553d40c9e64d94bd74e2bd529bf43107ff648223648939172c9a98e1b6e0e12467ee474e2dc6c6ca5560
+AUX radare2-3.7.0-with-syscapstone-p1.patch 676 BLAKE2B 888e934d8cf9a14692aebb18ca22e18346b967f9f568dfcc0b3caa8f0b6c4cf9efbf773d07e7e0ddeb4af7b26201a94630a0aefb8031022791a2910c6f57ab42 SHA512 089d8b5f093bd1c884667a00e52f881074343ff8862165a8821094ecacc48522391457bf6393c07bb72a6d08d6791dd2759a3efeccdc5aa80341d6d38da4e42c
+AUX radare2-3.7.0-with-syscapstone-p2.patch 544 BLAKE2B cf29374334a81a7cd4e48951083fcc5f9240b4672b87454b013f859beb32120666fe79239bc0f76168668d471e7efec159503892782ac38246b873df61c69ba2 SHA512 4741d0f7f51e9efcfb6a313451c1ea1c8cdb003c5c160c4a717b16598ccbb2020e10e23b588a9d2c792abc98d23eb5567e5c1e92e31d287b3210a664e28bbb3e
 DIST radare2-3.5.1.tar.gz 7083677 BLAKE2B 3d84e79d4e20e031b6cfdbabcf80922f977328bf7da8c2871924f9520ff87252d4df18a1239793c70f4b800bb7d5c4aef923e63c93aa15d86ae685ddda205da2 SHA512 24c2a45ed539830dcb8dc1585c27e45515c70989132f500527db0ca6795027eaa82ea54d1cd7fc73ddc49641a73148be963ade1648e92b5336d2e86335e2497a
 DIST radare2-3.6.0.tar.gz 7339427 BLAKE2B 60ecd110ac4cafa38dd10f49321e984e98f189398f15196614fb096970cc2f24981ffbbd161fdd55621b65c45a8fb9f843f273bf245ac0ea2b4493981ab0477d SHA512 15c02b744892934bd0b4beeb146d8a0289244405214b62892d7e307cd42f6706aca16c1e02b6b2beb5b6869c5c5920cc291ffec8a690b5338c6973a5e1d7900e
+DIST radare2-3.7.0.tar.gz 7478494 BLAKE2B 547efda30a65783758b132f4b241039b83bb274904a1f69616e60ec83547b22da486e97df06a74cd82f855650dbc3802d31bf3cb00ebd12d956848efd4b6ff5e SHA512 8e4d1b89d0d1e717403ba0bc2ce47e2644d12303ed5391fe4b9efc11b86a0b9c9356fdea1caecabe16d88ded9577fe77c182225adf2fdbd63b2e48f9c9c9f52d
+DIST radare2-3.7.1.tar.gz 7481103 BLAKE2B 4bae07dad298a45704ee45740bc3376902dfa35631efc94874666ead0b9c3dbb407558f4c02283d0909970247bc7730754cad9c6b6859a23ab40f408eff9102e SHA512 972c137e20d73a4cc8001c6d3e3b0c68874ed4a837d2ec20f26bc164a5451dbd46264471adc93332eecadd86d8023579fa69b42fce0291f49979b451118c7673
 EBUILD radare2-3.5.1-r1.ebuild 1210 BLAKE2B 8bbc76b7d1097416f53e8d70c12e5460d1c2971ff2d3cbf05718be0397b014f9b456dfda8411048d48ccd28de37919a9e79e6d8970228c8a9de91ff993c73ecb SHA512 9b54f5aa235c1b693235833618e822a67790773cde3847a65216dd832ef29fba8a43db7ca770d5791f03c976fe5a8b11ab9f64c79ad374947af8b34d6e4bfb0b
 EBUILD radare2-3.6.0.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
+EBUILD radare2-3.7.0.ebuild 1220 BLAKE2B b47051fd9c3a4f0b819f86daaaecfbb95747cda74811c73d788ea055a611eb2e9248e6c80026b0f2a2958397a49b73e20f305b9cf5967522c89c26a35f32e322 SHA512 f423501872f7e672de464ad9f46d06f1fb07511c85939c015c37d89b1a44bcde0e934e324b47aadb446c6e5f8a8044fa73b751f234e1dddb64294a36e36efc84
+EBUILD radare2-3.7.1.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
 EBUILD radare2-9999.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
 MISC metadata.xml 361 BLAKE2B f92dfa8905623cd3a34f0b61766ae071d09801460b8b2a13bf4c3bb0a4715446b61b79309101b032511851f9d7a15973bca97ce9d1ed667266e2d6a3485933a2 SHA512 fb01d7b5abd1966cf270227640d1e4197a09930afb6f03e18bf4f79ba74e73fd86782b99efbb710b697315c25b63e575ec6120fb1cedaa19d4562831f41f81a4
diff --git a/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p1.patch b/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p1.patch
new file mode 100644
index 000000000000..3f87d606bba4
--- /dev/null
+++ b/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p1.patch
@@ -0,0 +1,24 @@
+From 8b37ac49b609cc69b27a6b3b76fa9d8d819bae83 Mon Sep 17 00:00:00 2001
+From: pancake <pancake@nopcode.org>
+Date: Thu, 1 Aug 2019 05:23:56 +0200
+Subject: [PATCH] Add capstone dependency with the mk
+
+---
+ binr/rabin2/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/binr/rabin2/Makefile b/binr/rabin2/Makefile
+index 0ecb48629..33219020b 100644
+--- a/binr/rabin2/Makefile
++++ b/binr/rabin2/Makefile
+@@ -15,6 +15,6 @@ include ../../shlr/grub/deps.mk
+ include ../../shlr/bochs/deps.mk
+ include ../../shlr/qnx/deps.mk
+ include ../../shlr/ar/deps.mk
+-LINK+=../../shlr/capstone/libcapstone.a
++include ../../shlr/capstone.mk
+ 
+ LDFLAGS+=$(LINK)
+-- 
+2.22.0
+
diff --git a/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p2.patch b/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p2.patch
new file mode 100644
index 000000000000..1ebb74efb36d
--- /dev/null
+++ b/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p2.patch
@@ -0,0 +1,22 @@
+From 38a10d64fb33484f0e50c3d8f40a6c19c0ee37ec Mon Sep 17 00:00:00 2001
+From: Slava <slava@bacher09.org>
+Date: Sun, 4 Aug 2019 04:00:12 +0300
+Subject: [PATCH] Fix build with system capstone (--with-syscapstone) (#14753)
+
+---
+ shlr/capstone.mk | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/shlr/capstone.mk b/shlr/capstone.mk
+index b3cc42d24..f1a2de04d 100644
+--- a/shlr/capstone.mk
++++ b/shlr/capstone.mk
+@@ -1 +1,5 @@
++ifeq ($(USE_CAPSTONE),1)
++LINK+=${CAPSTONE_LDFLAGS}
++else
+ LINK+=$(SHLR)/capstone/libcapstone.a
++endif
+-- 
+2.22.0
+
diff --git a/dev-util/radare2/radare2-3.7.0.ebuild b/dev-util/radare2/radare2-3.7.0.ebuild
new file mode 100644
index 000000000000..5d70b601195f
--- /dev/null
+++ b/dev-util/radare2/radare2-3.7.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 eutils
+
+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/radare/radare2"
+else
+	SRC_URI="https://github.com/radare/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/capstone:0=
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=("${FILESDIR}"/${PN}-3.7.0-with-syscapstone-p{1,2}.patch)
+
+src_configure() {
+	econf \
+		--without-libuv \
+		--with-syscapstone \
+		$(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
+}
diff --git a/dev-util/radare2/radare2-3.7.1.ebuild b/dev-util/radare2/radare2-3.7.1.ebuild
new file mode 100644
index 000000000000..0b3f4cfb432b
--- /dev/null
+++ b/dev-util/radare2/radare2-3.7.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 eutils
+
+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/radare/radare2"
+else
+	SRC_URI="https://github.com/radare/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/capstone:0=
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--without-libuv \
+		--with-syscapstone \
+		$(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
+}