gentoo resync : 25.05.2018

3 files changed, 95 insertions, 0 deletions

diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index aa7478954b0f..9a78768d8d27 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,4 +1,7 @@
+AUX radare2-fix-syscapstone-2.6.patch 954 BLAKE2B 9dd8ebb65f8830643a46c2302e769018ea78045eb18da7ca98adff00ebba63975b5c97eb2398d0eb33970a4102090fdee19734115170f4cbb0c4cd3863c74bbc SHA512 4412c99facdcf15bb6f3202c15e7c0a581df6eda67e5476b70f95e21540d253fdd2dd5518009c139cc7723d589f0d903a2a98f3d6ed33578b0bed2e5c2bf4242
 DIST radare2-2.5.0.tar.gz 6272646 BLAKE2B 44c88327b544d03bd464f1ecb72a51b7e3fa86602aeae9055b6f2d41763be9ed9d63be4c7b959e1f920605feeed998c1f56ef0ed3a6a7213b4d5265c057b1213 SHA512 a29e0e61aeee6e08a99a1ed8a8bc428ec8b0474b3781475db3091232353d03d39d8750f774a266e01bb7565049269ee5f43b666b3b69bfadafb75cdb35f6cc4b
+DIST radare2-2.6.0.tar.gz 6306317 BLAKE2B 213ed0ac92f5b4b9cfc2ba93c5cda9168746cffb0016e1368c4c3939d694bffccf689764c60e0e59a52b70b6b7d49407516c9ecd6e62c59ed0db37c6f72867f5 SHA512 44e7d0c10e17b40d4d71af851cf462c159b03b3242dfccd786bd54d3cf9f92441084f26694166dd1385e84c00626f45dbe09d1fe713595721723c468ac47b01b
 EBUILD radare2-2.5.0.ebuild 1128 BLAKE2B 1d1afb7c82e61eca36fb9ec37bf3efe5569c2812c86040982b020dce996db8c9eed5fcbc9d80c6d819cf82df37bd0e3bba3a8414df8be513ebde955490d2a622 SHA512 60b78abd86656f51d5b4fcc89ef7594c0b9007f012bc8fd50446895f55b7ddcbb8e81eac73c3bdbeafc6bfd83ee13fba7d13e0cf21006bf3dbd63f6ae4fb16b3
+EBUILD radare2-2.6.0.ebuild 1187 BLAKE2B bc87ba5b9e174de19a2588bcd567ecfacd53cf8c3852242d9eaf23258369f4fee7484647c3753eb52b026117b596c2cd261f164d93b647bdb486bbb26955067e SHA512 c22851603eff958ad681d981631a58ca28dc3f4ed704d0c516c542d43a2d09a47509fee62055da4e864c2b5d258cda5c31368f52137fd7b3d7653ea49e8fe79d
 EBUILD radare2-9999.ebuild 1187 BLAKE2B f526fc8a5b74fd80de3291aebe2a3805bbf7bceda29552772b50fb1ce3a3dab0dbdbbbe2c1895f596dbf79f52ce27445efa43bffcc18a333951b2367db1510a6 SHA512 358c0f8116b15555cb34aec3ccc4ddccfd6c6211a1b9b882242c779f6ea0ac358c7e5dc946bd4d82ed871bfc7a01d45c621eb59ded303ad6a3cb23c1b18c8f56
 MISC metadata.xml 472 BLAKE2B 9eac8a52ecd7dae41e0cd32ff13bc02d7c936d0d36bf52309d28b9d03168ec55655ce3588df2c330c08f0779fc8c1a095c972cd6ee3deecb68a9c333d4811421 SHA512 110f9ec2d6dddd20703b9cf6ec8cd77e2459f67aca74065211dc30888cea9c9154128da8a2f15810063de9c4867e3e1a31658d3c5cb27be44824342784b67365
diff --git a/dev-util/radare2/files/radare2-fix-syscapstone-2.6.patch b/dev-util/radare2/files/radare2-fix-syscapstone-2.6.patch
new file mode 100644
index 000000000000..4eb3c053f07a
--- /dev/null
+++ b/dev-util/radare2/files/radare2-fix-syscapstone-2.6.patch
@@ -0,0 +1,34 @@
+From 3752d992f3140806ea1d513739b6f23addf52df1 Mon Sep 17 00:00:00 2001
+From: cc <longlene@gmail.com>
+Date: Tue, 22 May 2018 12:52:12 +0800
+Subject: [PATCH] fix for build with syscapstone
+
+---
+ libr/Makefile | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/libr/Makefile b/libr/Makefile
+index 05cb40fec7..0b39b48c02 100644
+--- a/libr/Makefile
++++ b/libr/Makefile
+@@ -84,13 +84,18 @@ E+=../shlr/bochs/lib/libbochs.${EXT_AR}
+ #E+=../shlr/sdb/src/libsdb.${EXT_AR}
+ #endif
+ 
++ifeq ($(USE_CAPSTONE),1)
++E+=$(CAPSTONE_LDFLAGS)
++else
++E+=../shlr/capstone/libcapstone.${EXT_AR}
++endif
++
+ libr.${EXT_SO}: .libr
+ 	$(CC) -fvisibility=hidden $(MLFLAGS) -shared -dynamiclib -o libr.${EXT_SO}  \
+ 		.libr/*.o \
+ 		../shlr/gdb/lib/libgdbr.${EXT_AR} ../shlr/java/libr_java.${EXT_AR} \
+ 		../shlr/zip/librz.${EXT_AR} \
+-		../shlr/libr_shlr.${EXT_AR} $(E)\
+-		../shlr/capstone/libcapstone.${EXT_AR}
++		../shlr/libr_shlr.${EXT_AR} $(E)
+ 
+ else
+ 
diff --git a/dev-util/radare2/radare2-2.6.0.ebuild b/dev-util/radare2/radare2-2.6.0.ebuild
new file mode 100644
index 000000000000..74ac2faaaf52
--- /dev/null
+++ b/dev-util/radare2/radare2-2.6.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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 ~x86 ~arm ~arm64"
+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}
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${PN}-fix-syscapstone-2.6.patch" )
+
+src_configure() {
+	econf \
+		--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
+}