gentoo resync : 01.12.2017

5 files changed, 63 insertions, 65 deletions

diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 7b7619d65cfb..9e5081f28053 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,7 +1,6 @@
 AUX radare2-0.9.9-nogit.patch 352 BLAKE2B b65dd677a246bfd47205061d41f731e5b3ae477946e8b5b1fec6a19aa54fb2bf307ae4421c74ae38049f259476b43897968670c5a5b34808d37de5623ba620c0 SHA512 5a84c2f768b60dc6ffb35130f409714e0ffc4cbc6fb9e08bc4bf86d28651060398d809fed8abafcd56cabde86aa9e8672df77212f0d8c0b6dfc056b243e1c270
-AUX radare2-2.0.1-635618-p1.patch 938 BLAKE2B e93734f76cec74133a4fa443771fd8549592ebd4a6338d47522337c29fa69d44ddb44e5f64ccbf8b05c2bd6186bf18e6da4e1264125fdd1c620e8022973e7077 SHA512 526a0570b60ee90464f441c26c66167bbae734e400d043e3eb54ce335e2e0874a29330e885f3703d116fc3175d5341f0ac9297705757bec54273db4cc0937e8f
-AUX radare2-2.0.1-635618-p2.patch 963 BLAKE2B 3868ec3775777c3727adda7ee760f0638ac22f125948f9f02c8ce045ecdd8d04c092cecf03cfd612e6a80f15f97f20eb74bd43118f6d1b93fc95a598e3628a56 SHA512 d912a3be1b136d963c99c53032fef48b4176421213ffcc12a40ee625a7c126cc1fb0b55b9316fe0385caf5c605396a6d826842d649229ec514d619ce86a752fe
-DIST radare2-2.0.1.tar.gz 6001927 SHA256 d8f7e1ab96028fc8bd62d4f92fbbe8bbf48c6cda8112e6eaec93bf5ffbbbd1dd SHA512 1a8db3c71895fd9ccf284e7d0747770a5490872c5ee7f8e6d1c3a2590d2b344873bfc11b5f686bd08caa441bb787b2ec86aae9e83bf61e296f6a233d3ba35207 WHIRLPOOL 276f5628482a56eba3596a04f42a5fa60ed267ed09efea1adef1305cb3313d6ff59b0821ad05b5421620caa3e902f0839c61c619156f5bc1e1966d33261d1e3e
-EBUILD radare2-2.0.1-r1.ebuild 1173 BLAKE2B 71e6b2b3d3922d1f517bf8f0d3abc0e479a2308b5a8302f3d0f814be8589702c1907329594ad77b64a7c3e31c37fcc93dea0094c3665e22139eb5c9a51c698cf SHA512 d2b9207d58847675ad5eafa9cc26465fd9bca05f6b9b16d32748e28b74d5b04776bfca981bce57986c1974fa5979f9042ea0d88d8b0021f0ea61ead9ef433986
+DIST radare2-2.1.0.tar.gz 5954222 BLAKE2B 9128a01d40ef1401d457f1fa5610ad7bbda92021e6e16fd70e9488bdb11be923c3d0f453e49a7bf78203c320ec2f1b2276925db2ae6eeaad90100ae0c2724b56 SHA512 38a907834e21967a83943e62cb29d8097e0522ff71ea61a2e3ab9e5263c3884ce28c17fb3ca9201c2b9f341e1b066ed0899e5152e146e61fc4f650f319299cd0
+EBUILD radare2-2.1.0-r1.ebuild 1220 BLAKE2B 76313607d2fb45d2a0ce0db3e7ed7ac352c104d96de717fd8303d20c559e1e366356aa618ebd5da7d72c79d33e231ac2020d0147f9522f115fc3a9770de97c1f SHA512 c5596fbba68cf04c21bc836b1bbd7a9cd96b0525132394a6a3c376f7b656533524f44037be404e40abe039afe0170ae5a1ec312ffb058679ff2b6f0180f2ca7d
+EBUILD radare2-2.1.0.ebuild 1101 BLAKE2B 95b47781088e5ed9f60e3e03c077210c392d4c858b6cb9ba453f1a77413e317cac19b06671aeda1d478d804e6a810aa5c76fb46586346e9f5924f602d4363c7d SHA512 c427dc6275301d0a4dc98ceb765369ec677e09c2db0aaf6563d5349584e03222a6d1732d8979a3366af55d27c0bb8fb991af028c56a7130c89d1b49467ae153c
 EBUILD radare2-9999.ebuild 1100 BLAKE2B 3dd09be4a69f5d2b89cbf069148cc12e6f57b7dc476aed4ed5dca5b12a0edc0f712d17cec93b56a3f936bd190edc8c54c4705421a6f819ca18da26ac6bdd0a9e SHA512 960f6846a24780b390e10f090c0678cd6c2295d9dcc4597d55972d158b580b05206b291e5608ee5452d5b269d0eed679b60ddf5d4a123fae7fab382c02fad9c3
 MISC metadata.xml 472 BLAKE2B 9eac8a52ecd7dae41e0cd32ff13bc02d7c936d0d36bf52309d28b9d03168ec55655ce3588df2c330c08f0779fc8c1a095c972cd6ee3deecb68a9c333d4811421 SHA512 110f9ec2d6dddd20703b9cf6ec8cd77e2459f67aca74065211dc30888cea9c9154128da8a2f15810063de9c4867e3e1a31658d3c5cb27be44824342784b67365
diff --git a/dev-util/radare2/files/radare2-2.0.1-635618-p1.patch b/dev-util/radare2/files/radare2-2.0.1-635618-p1.patch
deleted file mode 100644
index 5644e50cc115..000000000000
--- a/dev-util/radare2/files/radare2-2.0.1-635618-p1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c6d0076c924891ad9948a62d89d0bcdaf965f0cd Mon Sep 17 00:00:00 2001
-From: pancake <pancake@nopcode.org>
-Date: Wed, 25 Oct 2017 18:00:11 +0200
-Subject: [PATCH] Fix #8731 - Crash in ELF parser with negative 32bit number
-
----
- libr/bin/format/elf/elf.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/libr/bin/format/elf/elf.c b/libr/bin/format/elf/elf.c
-index 90f6acd30..e3c852fd3 100644
---- a/libr/bin/format/elf/elf.c
-+++ b/libr/bin/format/elf/elf.c
-@@ -900,7 +900,11 @@ static Sdb *store_versioninfo_gnu_verneed(ELFOBJ *bin, Elf_(Shdr) *shdr, int sz)
- 			free (s);
- 		}
- 		sdb_num_set (sdb_version, "cnt", entry->vn_cnt, 0);
--		vstart += entry->vn_aux;
-+		st32 vnaux = entry->vn_aux;
-+		if (vnaux < 1) {
-+			goto beach;
-+		}
-+		vstart += vnaux;
- 		for (j = 0, isum = i + entry->vn_aux; j < entry->vn_cnt && vstart + sizeof (Elf_(Vernaux)) <= end; ++j) {
- 			int k;
- 			Elf_(Vernaux) * aux = NULL;
--- 
-2.14.3
-
diff --git a/dev-util/radare2/files/radare2-2.0.1-635618-p2.patch b/dev-util/radare2/files/radare2-2.0.1-635618-p2.patch
deleted file mode 100644
index 242f4cc6220c..000000000000
--- a/dev-util/radare2/files/radare2-2.0.1-635618-p2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 44ded3ff35b8264f54b5a900cab32ec489d9e5b9 Mon Sep 17 00:00:00 2001
-From: pancake <pancake@nopcode.org>
-Date: Wed, 25 Oct 2017 18:09:24 +0200
-Subject: [PATCH] Fix #8743 - Crash in ELF version parser on 32bit systems
-
----
- libr/bin/format/elf/elf.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/libr/bin/format/elf/elf.c b/libr/bin/format/elf/elf.c
-index e3c852fd3..2248731b3 100644
---- a/libr/bin/format/elf/elf.c
-+++ b/libr/bin/format/elf/elf.c
-@@ -748,7 +748,12 @@ static Sdb *store_versioninfo_gnu_verdef(ELFOBJ *bin, Elf_(Shdr) *shdr, int sz)
- 		verdef->vd_hash = READ32 (dfs, j)
- 		verdef->vd_aux = READ32 (dfs, j)
- 		verdef->vd_next = READ32 (dfs, j)
--		vstart += verdef->vd_aux;
-+		int vdaux = verdef->vd_aux;
-+		if (vdaux < 1) {
-+			sdb_free (sdb_verdef);
-+			goto out_error;
-+		}
-+		vstart += vdaux;
- 		if (vstart > end || vstart + sizeof (Elf_(Verdaux)) > end) {
- 			sdb_free (sdb_verdef);
- 			goto out_error;
--- 
-2.14.3
-
diff --git a/dev-util/radare2/radare2-2.1.0-r1.ebuild b/dev-util/radare2/radare2-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..f69a9666f3b3
--- /dev/null
+++ b/dev-util/radare2/radare2-2.1.0-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils bash-completion-r1
+
+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
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.9-nogit.patch
+)
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ssl +system-capstone zsh-completion bash-completion"
+
+RDEPEND="
+	ssl? ( dev-libs/openssl:0= )
+	system-capstone? ( dev-libs/capstone:0= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf \
+		$(use_with ssl openssl) \
+		$(use_with system-capstone syscapstone)
+}
+
+src_install() {
+	default
+
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		doins doc/zsh/_*
+	fi
+
+	if use bash-completion; then
+		newbashcomp doc/bash_autocompletion.sh "${PN}"
+	fi
+
+	# 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-2.0.1-r1.ebuild b/dev-util/radare2/radare2-2.1.0.ebuild
index 78ee0f1268ef..8f051ac51137 100644
--- a/dev-util/radare2/radare2-2.0.1-r1.ebuild
+++ b/dev-util/radare2/radare2-2.1.0.ebuild
@@ -18,8 +18,6 @@ fi
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.9.9-nogit.patch
-	"${FILESDIR}"/${P}-635618-p1.patch
-	"${FILESDIR}"/${P}-635618-p2.patch
 )
 
 LICENSE="GPL-2"