From a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 28 Apr 2018 20:02:04 +0100 Subject: gentoo resync : 28.04.2018 --- dev-util/radare2/Manifest | 5 ++--- dev-util/radare2/files/radare2-0.9.9-nogit.patch | 13 ------------- dev-util/radare2/radare2-2.5.0.ebuild | 8 ++++---- dev-util/radare2/radare2-9999.ebuild | 16 ++++++++-------- 4 files changed, 14 insertions(+), 28 deletions(-) delete mode 100644 dev-util/radare2/files/radare2-0.9.9-nogit.patch (limited to 'dev-util/radare2') diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest index 1112656e6a2c..aa7478954b0f 100644 --- a/dev-util/radare2/Manifest +++ b/dev-util/radare2/Manifest @@ -1,5 +1,4 @@ -AUX radare2-0.9.9-nogit.patch 352 BLAKE2B b65dd677a246bfd47205061d41f731e5b3ae477946e8b5b1fec6a19aa54fb2bf307ae4421c74ae38049f259476b43897968670c5a5b34808d37de5623ba620c0 SHA512 5a84c2f768b60dc6ffb35130f409714e0ffc4cbc6fb9e08bc4bf86d28651060398d809fed8abafcd56cabde86aa9e8672df77212f0d8c0b6dfc056b243e1c270 DIST radare2-2.5.0.tar.gz 6272646 BLAKE2B 44c88327b544d03bd464f1ecb72a51b7e3fa86602aeae9055b6f2d41763be9ed9d63be4c7b959e1f920605feeed998c1f56ef0ed3a6a7213b4d5265c057b1213 SHA512 a29e0e61aeee6e08a99a1ed8a8bc428ec8b0474b3781475db3091232353d03d39d8750f774a266e01bb7565049269ee5f43b666b3b69bfadafb75cdb35f6cc4b -EBUILD radare2-2.5.0.ebuild 1187 BLAKE2B f526fc8a5b74fd80de3291aebe2a3805bbf7bceda29552772b50fb1ce3a3dab0dbdbbbe2c1895f596dbf79f52ce27445efa43bffcc18a333951b2367db1510a6 SHA512 358c0f8116b15555cb34aec3ccc4ddccfd6c6211a1b9b882242c779f6ea0ac358c7e5dc946bd4d82ed871bfc7a01d45c621eb59ded303ad6a3cb23c1b18c8f56 -EBUILD radare2-9999.ebuild 1164 BLAKE2B e35816da5d7606f7e5ebc26bd5ffc4b2e681e04f7c35074b1062d99b2058a1ebb6ed120c4eeaddd52312b35e9fffc4568810a1ac9f28f179b74a80fac42413ca SHA512 53c4f6b87b4c25e1ac072f9bcd5f06ead66f1b79c329fadaa2c88f27d77777ba160dfe75aa48779ba3083fd532d7957b00c4fa87c66a33d67a52e6c186e848d7 +EBUILD radare2-2.5.0.ebuild 1128 BLAKE2B 1d1afb7c82e61eca36fb9ec37bf3efe5569c2812c86040982b020dce996db8c9eed5fcbc9d80c6d819cf82df37bd0e3bba3a8414df8be513ebde955490d2a622 SHA512 60b78abd86656f51d5b4fcc89ef7594c0b9007f012bc8fd50446895f55b7ddcbb8e81eac73c3bdbeafc6bfd83ee13fba7d13e0cf21006bf3dbd63f6ae4fb16b3 +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-0.9.9-nogit.patch b/dev-util/radare2/files/radare2-0.9.9-nogit.patch deleted file mode 100644 index 9a6979e348a4..000000000000 --- a/dev-util/radare2/files/radare2-0.9.9-nogit.patch +++ /dev/null @@ -1,13 +0,0 @@ -capstone-sync does not work correctly for release tarballs. -It tries to sync/revert from upstream git repo unconditionaly. -diff --git a/shlr/Makefile b/shlr/Makefile -index a1796ce..f8d179a 100644 ---- a/shlr/Makefile -+++ b/shlr/Makefile -@@ -144,5 +144,5 @@ else - - ifeq ($(CS_TAR),) --capstone: capstone-sync -+capstone: # capstone-sync - - capstone-sync: diff --git a/dev-util/radare2/radare2-2.5.0.ebuild b/dev-util/radare2/radare2-2.5.0.ebuild index abe520e9a37a..e054a7433d6f 100644 --- a/dev-util/radare2/radare2-2.5.0.ebuild +++ b/dev-util/radare2/radare2-2.5.0.ebuild @@ -18,14 +18,14 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="ssl libressl +system-capstone" +IUSE="ssl libressl" RDEPEND=" + dev-libs/capstone:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) - system-capstone? ( dev-libs/capstone:0= ) " DEPEND="${RDEPEND} virtual/pkgconfig @@ -33,8 +33,8 @@ DEPEND="${RDEPEND} src_configure() { econf \ - $(use_with ssl openssl) \ - $(use_with system-capstone syscapstone) + --with-syscapstone \ + $(use_with ssl openssl) } src_install() { diff --git a/dev-util/radare2/radare2-9999.ebuild b/dev-util/radare2/radare2-9999.ebuild index e7a0aae0342f..abe520e9a37a 100644 --- a/dev-util/radare2/radare2-9999.ebuild +++ b/dev-util/radare2/radare2-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils +inherit eutils bash-completion-r1 DESCRIPTION="unix-like reverse engineering framework and commandline tools" HOMEPAGE="http://www.radare.org" @@ -14,12 +14,11 @@ if [[ ${PV} == *9999 ]]; then else SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86 ~arm ~arm64" - PATCHES=( "${FILESDIR}"/${PN}-0.9.9-nogit.patch ) fi LICENSE="GPL-2" SLOT="0" -IUSE="ssl libressl +system-capstone zsh-completion" +IUSE="ssl libressl +system-capstone" RDEPEND=" ssl? ( @@ -41,10 +40,11 @@ src_configure() { src_install() { default - if use zsh-completion; then - insinto /usr/share/zsh/site-functions - doins doc/zsh/_* - fi + 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 -- cgit v1.2.3