From f516638b7fe9592837389826a6152a7e1b251c54 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 May 2020 11:44:06 +0100 Subject: gentoo resync : 30.05.2020 --- dev-util/radare2/Manifest | 4 +- dev-util/radare2/files/radare2-4.4.0-AR.patch | 25 +++++++++ dev-util/radare2/files/radare2-4.4.0-RANLIB.patch | 24 +++++++++ dev-util/radare2/radare2-4.4.0-r1.ebuild | 65 +++++++++++++++++++++++ dev-util/radare2/radare2-4.4.0.ebuild | 56 ------------------- 5 files changed, 117 insertions(+), 57 deletions(-) create mode 100644 dev-util/radare2/files/radare2-4.4.0-AR.patch create mode 100644 dev-util/radare2/files/radare2-4.4.0-RANLIB.patch create mode 100644 dev-util/radare2/radare2-4.4.0-r1.ebuild delete mode 100644 dev-util/radare2/radare2-4.4.0.ebuild (limited to 'dev-util/radare2') diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest index 1cf708587cff..ba467478954a 100644 --- a/dev-util/radare2/Manifest +++ b/dev-util/radare2/Manifest @@ -1,4 +1,6 @@ +AUX radare2-4.4.0-AR.patch 412 BLAKE2B b4049473999a4f8fb6a4a82e4059aaf1f1d34c8472075a8dee0645fa839d052813dbe1f2128f3ee4a234e7700f12e0800f7a75c9839011416ac6baf05e3ef8d9 SHA512 a6dcebd239a76b598c4b4c11fdff607204da4cfd6c415018a45f74a700fbc6bb7873f3c9fc46394a16fcf0579ef2477dd00baa3d48e96ebdc74369a45980e3a5 +AUX radare2-4.4.0-RANLIB.patch 403 BLAKE2B 0086dff0a9ed8b7c6ac9a0dd55cf81ff656e8947738b95009455de7d2b3564574d9103c42e69c90463aa775283b065e6b3a0937c219d0e3ffdeb02252ea75de5 SHA512 9f0892e97d5e7944bc36e5b336b309e7ed5d57a04d9505e8f826dbe3a41c0b9599c96c3ea001b9e16f5e95d8283b67c20a710f952603e4af72922b5567998aa8 DIST radare2-4.4.0.tar.gz 8135544 BLAKE2B 1a1a4ce97dde4b8985cbe95bb889bfdef8f9d64e2c2257030fda523b1a1aced4e6681bc0f7b14d1a3f25fbce355f2062f0edc33ab396bef98792d29d1f708a11 SHA512 6208d97f8333e72dfd04cccdb0234b60fb8979ca559b92532bf7e47d402f91e0c54678a83e6bafee65666fb7d6008b44b961600f24f9b3275cb2eec32490eaa5 -EBUILD radare2-4.4.0.ebuild 1159 BLAKE2B 979869367436022a049bff280f0c2fb72d61ec24546c2aaac9ff588b5677d1feae9f0a60559f7b488ac2c2c0d955e7de4d399b27a9f275918c08118bee020213 SHA512 014d8eb9417ac50fa56161bd1fc48b375126d5090ac2165b940a246756ec58a1bc84f3f5be70756194a602077091543a642e17b141f91dadc72cc8068f723e55 +EBUILD radare2-4.4.0-r1.ebuild 1368 BLAKE2B 94524e049c09d0dd38750e5610ed34913ec1137ccb861d3b1eddacd78d2fae0126163e52f84f707ebf0e6247e06da57aabb408bb6e58a41e36ca75fdf76cdb50 SHA512 2e1716c3545ea7c2f1e2c9c70f2c059fc968c86a0e0b22760a2034ab7e1797ce59610e9c728cddd27a2748f72c9bed9994b030161dc9565dbbf5906ac47e92de EBUILD radare2-9999.ebuild 1159 BLAKE2B 60bd15815bc419615783ddd99a7a606c38cacc1c1727a32c1ab6c327172af4922dd1a67c226ad91877fe6a288b4a3240665e8832faa26aed06e18f6ed3577c84 SHA512 656e5f0b705f533d34ebbae4e43943c55d1b6fc8cb7abb808a1be8576719687993ef64aca6c134bd84fe611037d61bc985cfe5bc8c3074e7a93536d4f4721eab MISC metadata.xml 361 BLAKE2B f92dfa8905623cd3a34f0b61766ae071d09801460b8b2a13bf4c3bb0a4715446b61b79309101b032511851f9d7a15973bca97ce9d1ed667266e2d6a3485933a2 SHA512 fb01d7b5abd1966cf270227640d1e4197a09930afb6f03e18bf4f79ba74e73fd86782b99efbb710b697315c25b63e575ec6120fb1cedaa19d4562831f41f81a4 diff --git a/dev-util/radare2/files/radare2-4.4.0-AR.patch b/dev-util/radare2/files/radare2-4.4.0-AR.patch new file mode 100644 index 000000000000..406bd7ab0046 --- /dev/null +++ b/dev-util/radare2/files/radare2-4.4.0-AR.patch @@ -0,0 +1,25 @@ + +--- a/mk/clang.mk ++++ b/mk/clang.mk +@@ -3,7 +3,8 @@ _INCLUDE_MK_CLANG_=1 + CC?=clang + RANLIB=ranlib + ONELIB=0 +-CC_AR=ar q ${LIBAR} ++AR?=ar ++CC_AR=$(AR) q ${LIBAR} + CFLAGS+=-MD + CFLAGS_INCLUDE=-I + LDFLAGS_LINK=-l +--- a/mk/gcc.mk ++++ b/mk/gcc.mk +@@ -4,7 +4,8 @@ CC?=gcc + OBJCOPY=objcopy + RANLIB=ranlib + ONELIB=0 +-CC_AR=ar q ${LIBAR} ++AR?=ar ++CC_AR=$(AR) q ${LIBAR} + CFLAGS+=-MD + CFLAGS_INCLUDE=-I + LDFLAGS_LINK=-l diff --git a/dev-util/radare2/files/radare2-4.4.0-RANLIB.patch b/dev-util/radare2/files/radare2-4.4.0-RANLIB.patch new file mode 100644 index 000000000000..6ce007a5278f --- /dev/null +++ b/dev-util/radare2/files/radare2-4.4.0-RANLIB.patch @@ -0,0 +1,24 @@ +--- a/mk/clang.mk ++++ b/mk/clang.mk +@@ -1,7 +1,7 @@ + ifeq (${_INCLUDE_MK_CLANG_},) + _INCLUDE_MK_CLANG_=1 + CC?=clang +-RANLIB=ranlib ++RANLIB?=ranlib + ONELIB=0 + AR?=ar + CC_AR=$(AR) q ${LIBAR} +--- a/mk/gcc.mk ++++ b/mk/gcc.mk +@@ -1,8 +1,8 @@ + ifeq (${_INCLUDE_MK_GCC_},) + _INCLUDE_MK_GCC_=1 + CC?=gcc +-OBJCOPY=objcopy +-RANLIB=ranlib ++OBJCOPY?=objcopy ++RANLIB?=ranlib + ONELIB=0 + AR?=ar + CC_AR=$(AR) q ${LIBAR} diff --git a/dev-util/radare2/radare2-4.4.0-r1.ebuild b/dev-util/radare2/radare2-4.4.0-r1.ebuild new file mode 100644 index 000000000000..376d0a9f5210 --- /dev/null +++ b/dev-util/radare2/radare2-4.4.0-r1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 eutils 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/capstone:0= + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-4.4.0-AR.patch + "${FILESDIR}"/${PN}-4.4.0-RANLIB.patch +) + +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 \ + $(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-4.4.0.ebuild b/dev-util/radare2/radare2-4.4.0.ebuild deleted file mode 100644 index c3c2387a8dcf..000000000000 --- a/dev-util/radare2/radare2-4.4.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 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/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/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 -} -- cgit v1.2.3