public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-util/radare2/files/, dev-util/radare2/
@ 2017-10-16 16:23 Sergei Trofimovich
  0 siblings, 0 replies; 13+ messages in thread
From: Sergei Trofimovich @ 2017-10-16 16:23 UTC (permalink / raw
  To: gentoo-commits

commit:     948ac4ceef675ff449cec40f4fe6025c75453cb8
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 16 16:22:42 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Oct 16 16:23:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=948ac4ce

dev-util/radare2: drop old ebuilds, bug #634460

Bug: https://bugs.gentoo.org/634460
Package-Manager: Portage-2.3.11, Repoman-2.3.3

 dev-util/radare2/Manifest                          |  6 ---
 .../files/radare2-1.1.0-openssl-1.1.0c.patch       | 31 -------------
 dev-util/radare2/radare2-1.1.0.ebuild              | 42 -----------------
 dev-util/radare2/radare2-1.2.0.ebuild              | 43 ------------------
 dev-util/radare2/radare2-1.3.0.ebuild              | 43 ------------------
 dev-util/radare2/radare2-1.4.0-r1.ebuild           | 45 ------------------
 dev-util/radare2/radare2-1.4.0.ebuild              | 45 ------------------
 dev-util/radare2/radare2-1.6.0.ebuild              | 45 ------------------
 dev-util/radare2/radare2-2.0.0.ebuild              | 53 ----------------------
 9 files changed, 353 deletions(-)

diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 6c40a371368..054b3a79436 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,7 +1 @@
-DIST radare2-1.1.0.tar.gz 8438634 SHA256 7bc1e206a2b4def6bdb8684c2af0281b007986a0b5b5da652bd03be264ca0fa5 SHA512 a99ac488f78c52fa9d6fbfe095b0aae10864f4a591721ee3679310ada3ef5e2a069ad919d1f7472d0dcd2c78569aac584086a7e975f1946194b346c94e4873b7 WHIRLPOOL 0d00f06eac3c6a7f3db1b4dc6b728714c73ea35eb5bbdd8281fe01052bd8519e19f8737c794c51f098d1fde9feaa8f1f7959815afad7a87ea8aaab36e862f834
-DIST radare2-1.2.0.tar.gz 8461187 SHA256 3660f4f8c1490194f5b5b80d7e21e1cc507e6aff2551008074e632c22549b941 SHA512 8419d92c9db2f1312bb188317af53497a75e0c78504d6b9c3fee7cb90f9219d6801543a2bc68f2dd3fc846d75ba60ce3f8d4cde61c99ec1e3c5f63c8c2b8dd88 WHIRLPOOL 1cc31557e4a6882251a517b24f5df59fb2fb9ad083e6670c42d392ab79a8ffd0d56f11f82512ee59f1c233edef3b3c5b08cbbb936ffe5e22753889987e313c2f
-DIST radare2-1.3.0.tar.gz 8517265 SHA256 adf9bbfb36b5cff986e8218455d75d7410e41e2fb4a380b99d1bcf6d36dce222 SHA512 ef410f8c5c0b931dab452c50b694313f26898a5f36c8286d18f56889e056658331cee87097a0e3028b8f53f25ec9c4354f6c78a41365a74d5bc67a38a6510174 WHIRLPOOL d3d5877814893308c0aa344740ef857d5814ec465d1f7deee73e226f4e1609ed9a75b3395c92fc382815464d1ceac3409bf09aade9f0f2f74cda93d3b2937ed8
-DIST radare2-1.4.0.tar.gz 8719644 SHA256 bf6e9ad94fd5828d3936563b8b13218433fbf44231cacfdf37a7312ae2b3e93e SHA512 5d022759e53f762094e237a29780d63dc4f39601ceacb22f58206bbb83a38a8938ea2321e49426b03421dcb0f6493a96f18905f8bf81025293f9c1a8087a4a0a WHIRLPOOL a86f5389d4905b970b22cd79b217d71a37a980b780b53078e5bcaf623d66e24999fb77a9d9b527986f5e9193b72f6b158e8dbefbed4d2557bdd9f0abffc88199
-DIST radare2-1.6.0.tar.gz 5752191 SHA256 759d1c65dcd69d1189fc73e427c568ec234a7ca1958c19f5001c255dd31a3787 SHA512 6e1485c4edaa007790c07a8cfe190c4ea3e4df843620e2575587478e60f1be3dacaa0c545c84e135a51d9f7aff61c27f712c0ffa6038b556d347151f2a3cd2bb WHIRLPOOL 6a35b3b58bc5ec248de53ca3970c4791a8d837b330109f832ccd12d0660537ca0fa62101b806dc29f1123bd48d4139bd7ef1856f5fdbd31afe67daea384f1872
-DIST radare2-2.0.0.tar.gz 6003014 SHA256 7d734cb3c047774600928110c8f8b970eb6117630b66d2c7284bc4ed68242c83 SHA512 387e08d06d017aac7ea7c1d6c6d1f761808ac689c85a5de22b796356fb5580d4cd6218a994ec86fbf9e9864def6d7d589bef290cacc2b10b241fe9681b80a985 WHIRLPOOL df8ca26f4f03ced670c6d911d1291a233aa1bf6e0236ee2ab34394f43afd49f7bf1ff9e7bbfd9b3c8853d126b2feeeaa64fe3553d2cc41504a3335b18c099164
 DIST radare2-2.0.1.tar.gz 6001927 SHA256 d8f7e1ab96028fc8bd62d4f92fbbe8bbf48c6cda8112e6eaec93bf5ffbbbd1dd SHA512 1a8db3c71895fd9ccf284e7d0747770a5490872c5ee7f8e6d1c3a2590d2b344873bfc11b5f686bd08caa441bb787b2ec86aae9e83bf61e296f6a233d3ba35207 WHIRLPOOL 276f5628482a56eba3596a04f42a5fa60ed267ed09efea1adef1305cb3313d6ff59b0821ad05b5421620caa3e902f0839c61c619156f5bc1e1966d33261d1e3e

diff --git a/dev-util/radare2/files/radare2-1.1.0-openssl-1.1.0c.patch b/dev-util/radare2/files/radare2-1.1.0-openssl-1.1.0c.patch
deleted file mode 100644
index 28e2f55126f..00000000000
--- a/dev-util/radare2/files/radare2-1.1.0-openssl-1.1.0c.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit ecd8cf26c2647a1f455595209fcf2d6bfb72240f
-Author: eroen <eroen@users.noreply.github.com>
-Date:   Tue Jan 3 23:45:07 2017 +0100
-
-    Disable deprecated initialization for openssl 1.1.0 (#6423)
-    
-    Openssl 1.1.0 handles this initialization internally. Leaving the calls in
-    place causes "undefined reference" errors if openssl was built with
-    `--api=1.1.0`.
-    
-    X-Gentoo-Bug: 604576
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=604576
-
-diff --git a/libr/socket/socket.c b/libr/socket/socket.c
-index 1e30120fb..1ba87e77e 100755
---- a/libr/socket/socket.c
-+++ b/libr/socket/socket.c
-@@ -116,11 +116,13 @@ R_API RSocket *r_socket_new (int is_ssl) {
- 		s->sfd = NULL;
- 		s->ctx = NULL;
- 		s->bio = NULL;
-+#if OPENSSL_VERSION_NUMBER < 0x1010000fL
- 		if (!SSL_library_init ()) {
- 			r_socket_free (s);
- 			return NULL;
- 		}
- 		SSL_load_error_strings ();
-+#endif
- 	}
- #endif
- 	return s;

diff --git a/dev-util/radare2/radare2-1.1.0.ebuild b/dev-util/radare2/radare2-1.1.0.ebuild
deleted file mode 100644
index 93ff4e14e4e..00000000000
--- a/dev-util/radare2/radare2-1.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Advanced command line hexadecimal editor and more"
-HOMEPAGE="http://www.radare.org"
-SRC_URI="http://cloud.radare.org/get/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-RDEPEND="
-	ssl? ( dev-libs/openssl:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.9.9-nogit.patch
-	epatch "${FILESDIR}"/${P}-openssl-1.1.0c.patch
-}
-
-src_configure() {
-	econf \
-		$(use_with ssl openssl)
-}
-
-src_install() {
-	# 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
-
-	default
-}

diff --git a/dev-util/radare2/radare2-1.2.0.ebuild b/dev-util/radare2/radare2-1.2.0.ebuild
deleted file mode 100644
index fa1392fa116..00000000000
--- a/dev-util/radare2/radare2-1.2.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Advanced command line hexadecimal editor and more"
-HOMEPAGE="http://www.radare.org"
-SRC_URI="http://cloud.radare.org/get/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-RDEPEND="
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.9-nogit.patch
-)
-
-src_configure() {
-	econf \
-		$(use_with ssl openssl)
-}
-
-src_install() {
-	# 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
-
-	default
-}

diff --git a/dev-util/radare2/radare2-1.3.0.ebuild b/dev-util/radare2/radare2-1.3.0.ebuild
deleted file mode 100644
index fa1392fa116..00000000000
--- a/dev-util/radare2/radare2-1.3.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Advanced command line hexadecimal editor and more"
-HOMEPAGE="http://www.radare.org"
-SRC_URI="http://cloud.radare.org/get/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-RDEPEND="
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.9-nogit.patch
-)
-
-src_configure() {
-	econf \
-		$(use_with ssl openssl)
-}
-
-src_install() {
-	# 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
-
-	default
-}

diff --git a/dev-util/radare2/radare2-1.4.0-r1.ebuild b/dev-util/radare2/radare2-1.4.0-r1.ebuild
deleted file mode 100644
index 397bcc5a11f..00000000000
--- a/dev-util/radare2/radare2-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Advanced command line hexadecimal editor and more"
-HOMEPAGE="http://www.radare.org"
-SRC_URI="http://cloud.radare.org/get/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl +system-capstone"
-
-RDEPEND="
-	ssl? ( dev-libs/openssl:0= )
-	system-capstone? ( dev-libs/capstone:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.9-nogit.patch
-)
-
-src_configure() {
-	econf \
-		$(use_with ssl openssl) \
-		$(use_with system-capstone syscapstone)
-}
-
-src_install() {
-	# 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
-
-	default
-}

diff --git a/dev-util/radare2/radare2-1.4.0.ebuild b/dev-util/radare2/radare2-1.4.0.ebuild
deleted file mode 100644
index 397bcc5a11f..00000000000
--- a/dev-util/radare2/radare2-1.4.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Advanced command line hexadecimal editor and more"
-HOMEPAGE="http://www.radare.org"
-SRC_URI="http://cloud.radare.org/get/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl +system-capstone"
-
-RDEPEND="
-	ssl? ( dev-libs/openssl:0= )
-	system-capstone? ( dev-libs/capstone:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.9-nogit.patch
-)
-
-src_configure() {
-	econf \
-		$(use_with ssl openssl) \
-		$(use_with system-capstone syscapstone)
-}
-
-src_install() {
-	# 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
-
-	default
-}

diff --git a/dev-util/radare2/radare2-1.6.0.ebuild b/dev-util/radare2/radare2-1.6.0.ebuild
deleted file mode 100644
index 6edc67c9c1f..00000000000
--- a/dev-util/radare2/radare2-1.6.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Advanced command line hexadecimal editor and more"
-HOMEPAGE="http://www.radare.org"
-SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl +system-capstone"
-
-RDEPEND="
-	ssl? ( dev-libs/openssl:0= )
-	system-capstone? ( dev-libs/capstone:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.9-nogit.patch
-)
-
-src_configure() {
-	econf \
-		$(use_with ssl openssl) \
-		$(use_with system-capstone syscapstone)
-}
-
-src_install() {
-	# 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
-
-	default
-}

diff --git a/dev-util/radare2/radare2-2.0.0.ebuild b/dev-util/radare2/radare2-2.0.0.ebuild
deleted file mode 100644
index cf3939d9299..00000000000
--- a/dev-util/radare2/radare2-2.0.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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"
-	PATCHES=( "${FILESDIR}"/${PN}-0.9.9-nogit.patch )
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl +system-capstone zsh-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
-
-	# 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
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/radare2/files/, dev-util/radare2/
@ 2017-10-28 21:06 Sergei Trofimovich
  0 siblings, 0 replies; 13+ messages in thread
From: Sergei Trofimovich @ 2017-10-28 21:06 UTC (permalink / raw
  To: gentoo-commits

commit:     b3c5759b316133acdf7fc698df524bb5472b4a7a
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 28 21:06:25 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 21:06:36 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3c5759b

dev-util/radare2: fix 32-bit overflow in ELF parsing, bug #635618

Bug: https://bugs.gentoo.org/635618
Package-Manager: Portage-2.3.13, Repoman-2.3.4

 .../radare2/files/radare2-2.0.1-635618-p1.patch    | 29 +++++++++++
 .../radare2/files/radare2-2.0.1-635618-p2.patch    | 30 +++++++++++
 dev-util/radare2/radare2-2.0.1-r1.ebuild           | 58 ++++++++++++++++++++++
 3 files changed, 117 insertions(+)

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
new file mode 100644
index 00000000000..5644e50cc11
--- /dev/null
+++ b/dev-util/radare2/files/radare2-2.0.1-635618-p1.patch
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 00000000000..242f4cc6220
--- /dev/null
+++ b/dev-util/radare2/files/radare2-2.0.1-635618-p2.patch
@@ -0,0 +1,30 @@
+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.0.1-r1.ebuild b/dev-util/radare2/radare2-2.0.1-r1.ebuild
new file mode 100644
index 00000000000..78ee0f1268e
--- /dev/null
+++ b/dev-util/radare2/radare2-2.0.1-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit 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
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.9-nogit.patch
+	"${FILESDIR}"/${P}-635618-p1.patch
+	"${FILESDIR}"/${P}-635618-p2.patch
+)
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ssl +system-capstone zsh-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
+
+	# 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
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/radare2/files/, dev-util/radare2/
@ 2017-11-27 22:55 Sergei Trofimovich
  0 siblings, 0 replies; 13+ messages in thread
From: Sergei Trofimovich @ 2017-11-27 22:55 UTC (permalink / raw
  To: gentoo-commits

commit:     2869d5ce2b00c252852cece926192b8a6fe879d5
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 27 22:55:35 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 22:55:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2869d5ce

dev-util/radare2: drop old

Reported-by: Daj' Uan (Jmbailey)
Reported-by: Aleksandr Wagner (Kivak)
Bug: https://bugs.gentoo.org/636184
Bug: https://bugs.gentoo.org/637454
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 dev-util/radare2/Manifest                          |  1 -
 .../radare2/files/radare2-2.0.1-635618-p1.patch    | 29 -----------
 .../radare2/files/radare2-2.0.1-635618-p2.patch    | 30 -----------
 dev-util/radare2/radare2-2.0.1-r1.ebuild           | 58 ----------------------
 4 files changed, 118 deletions(-)

diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 4e5bb9640a6..223673c2fb4 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,2 +1 @@
-DIST radare2-2.0.1.tar.gz 6001927 BLAKE2B cc74eb5f71cee88e78df7e73175ca84eadf2a16f313d4c1ecd54fb3c3c5aba44eb72c0eed5f739d888fb6a95b65dcdf2d7ae6b0269225a2fa7346bd506496a25 SHA512 1a8db3c71895fd9ccf284e7d0747770a5490872c5ee7f8e6d1c3a2590d2b344873bfc11b5f686bd08caa441bb787b2ec86aae9e83bf61e296f6a233d3ba35207
 DIST radare2-2.1.0.tar.gz 5954222 BLAKE2B 9128a01d40ef1401d457f1fa5610ad7bbda92021e6e16fd70e9488bdb11be923c3d0f453e49a7bf78203c320ec2f1b2276925db2ae6eeaad90100ae0c2724b56 SHA512 38a907834e21967a83943e62cb29d8097e0522ff71ea61a2e3ab9e5263c3884ce28c17fb3ca9201c2b9f341e1b066ed0899e5152e146e61fc4f650f319299cd0

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 5644e50cc11..00000000000
--- 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 242f4cc6220..00000000000
--- 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.0.1-r1.ebuild b/dev-util/radare2/radare2-2.0.1-r1.ebuild
deleted file mode 100644
index 78ee0f1268e..00000000000
--- a/dev-util/radare2/radare2-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.9-nogit.patch
-	"${FILESDIR}"/${P}-635618-p1.patch
-	"${FILESDIR}"/${P}-635618-p2.patch
-)
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl +system-capstone zsh-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
-
-	# 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
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/radare2/files/, dev-util/radare2/
@ 2018-04-28 12:21 Sergei Trofimovich
  0 siblings, 0 replies; 13+ messages in thread
From: Sergei Trofimovich @ 2018-04-28 12:21 UTC (permalink / raw
  To: gentoo-commits

commit:     c6ead6ec63da392259c83b3126c3150b4360403b
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 28 12:20:47 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Apr 28 12:21:04 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6ead6ec

dev-util/radare2: drop USE=-system-capstone

Enable system capstone unconditionally for releases.
radare2 does not ship bundled capstone in 2.5.0.

Reported-by: Michael Palimaka (kensington)
Closes: https://bugs.gentoo.org/645552
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 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             |  1 -
 3 files changed, 4 insertions(+), 18 deletions(-)

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 9a6979e348a..00000000000
--- 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 abe520e9a37..e054a7433d6 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 89e71ebcc42..abe520e9a37 100644
--- a/dev-util/radare2/radare2-9999.ebuild
+++ b/dev-util/radare2/radare2-9999.ebuild
@@ -14,7 +14,6 @@ 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"


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/radare2/files/, dev-util/radare2/
@ 2018-05-22 22:00 Sergei Trofimovich
  0 siblings, 0 replies; 13+ messages in thread
From: Sergei Trofimovich @ 2018-05-22 22:00 UTC (permalink / raw
  To: gentoo-commits

commit:     b7a09680926eec8ae56136838943a2f919c9bb22
Author:     David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Tue May 22 21:51:33 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue May 22 22:00:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7a09680

dev-util/radare2: verbump to 2.6.0

Closes: https://github.com/gentoo/gentoo/pull/8526

 dev-util/radare2/Manifest                          |  1 +
 .../files/radare2-fix-syscapstone-2.6.patch        | 34 +++++++++++++
 dev-util/radare2/radare2-2.6.0.ebuild              | 58 ++++++++++++++++++++++
 3 files changed, 93 insertions(+)

diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 6e6a1d55e9b..2861b0403ce 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1 +1,2 @@
 DIST radare2-2.5.0.tar.gz 6272646 BLAKE2B 44c88327b544d03bd464f1ecb72a51b7e3fa86602aeae9055b6f2d41763be9ed9d63be4c7b959e1f920605feeed998c1f56ef0ed3a6a7213b4d5265c057b1213 SHA512 a29e0e61aeee6e08a99a1ed8a8bc428ec8b0474b3781475db3091232353d03d39d8750f774a266e01bb7565049269ee5f43b666b3b69bfadafb75cdb35f6cc4b
+DIST radare2-2.6.0.tar.gz 6306317 BLAKE2B 213ed0ac92f5b4b9cfc2ba93c5cda9168746cffb0016e1368c4c3939d694bffccf689764c60e0e59a52b70b6b7d49407516c9ecd6e62c59ed0db37c6f72867f5 SHA512 44e7d0c10e17b40d4d71af851cf462c159b03b3242dfccd786bd54d3cf9f92441084f26694166dd1385e84c00626f45dbe09d1fe713595721723c468ac47b01b

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 00000000000..4eb3c053f07
--- /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 00000000000..74ac2faaaf5
--- /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
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/radare2/files/, dev-util/radare2/
@ 2018-10-16 22:23 Sergei Trofimovich
  0 siblings, 0 replies; 13+ messages in thread
From: Sergei Trofimovich @ 2018-10-16 22:23 UTC (permalink / raw
  To: gentoo-commits

commit:     b115ebb739c6779f6f882185da377a3e8ed9e200
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 16 22:16:40 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Oct 16 22:22:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b115ebb7

dev-util/radare2: drop old

Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-util/radare2/Manifest                          |  2 -
 .../files/radare2-fix-syscapstone-2.6.patch        | 34 -------------
 dev-util/radare2/radare2-2.6.0.ebuild              | 58 ----------------------
 dev-util/radare2/radare2-2.7.0.ebuild              | 56 ---------------------
 4 files changed, 150 deletions(-)

diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index c9e2f682773..1b278d21418 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,4 +1,2 @@
-DIST radare2-2.6.0.tar.gz 6306317 BLAKE2B 213ed0ac92f5b4b9cfc2ba93c5cda9168746cffb0016e1368c4c3939d694bffccf689764c60e0e59a52b70b6b7d49407516c9ecd6e62c59ed0db37c6f72867f5 SHA512 44e7d0c10e17b40d4d71af851cf462c159b03b3242dfccd786bd54d3cf9f92441084f26694166dd1385e84c00626f45dbe09d1fe713595721723c468ac47b01b
-DIST radare2-2.7.0.tar.gz 6483865 BLAKE2B 4052a601eb154240fb57c64bf2351063685a25e7d8ca46ad721398cd98b5e8bbec6a6daccb9f2df8e222bad74a0ffb4edc72186d7ca51b69ffbf480a7eb576ba SHA512 4a40e4917967aeef34de6ea69dd3c6d07a215e1f1272221db9af92d898e2d44997e339016b3342d69a276eb99f2d0a1e640ce8e9c889fe728dd86865e917a0fd
 DIST radare2-2.8.0.tar.gz 6513419 BLAKE2B 51ee9fe82c09693e729b49e97b79a54e2b9f7de95ecf93c5e22107f68260ddc9fdee9291f200dba2770315487a85d1541abbb76281e6934d25c677a95e6882e3 SHA512 968c61eb5102125b232f9a74362fb90b0409da80b4cd4f109d11e49d02c80a5beee9e73065ef3b4a22fb8cdf43f86338fd21b648ddfa34001ed6cace47335803
 DIST radare2-3.0.0.tar.gz 6638430 BLAKE2B d95404e0f2d86705703119d53de2e1b60f111bcd8d3b05b5d040692e9d9cc4f51fe682892514b47b55d4ff88314b577253a5f2c6ff8cacebd30fd0663c21d1ff SHA512 5ca698123ccad80c54c483f7e2cc678dabfc9c1c172670ff9e1d11512174c9ecc15e81dfdb5de846b42c951cafe23d29ceca6f3824504a2f3dac722c659bb2d4

diff --git a/dev-util/radare2/files/radare2-fix-syscapstone-2.6.patch b/dev-util/radare2/files/radare2-fix-syscapstone-2.6.patch
deleted file mode 100644
index 4eb3c053f07..00000000000
--- a/dev-util/radare2/files/radare2-fix-syscapstone-2.6.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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
deleted file mode 100644
index 74ac2faaaf5..00000000000
--- a/dev-util/radare2/radare2-2.6.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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
-}

diff --git a/dev-util/radare2/radare2-2.7.0.ebuild b/dev-util/radare2/radare2-2.7.0.ebuild
deleted file mode 100644
index 44da1cbab23..00000000000
--- a/dev-util/radare2/radare2-2.7.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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
-"
-
-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
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/radare2/files/, dev-util/radare2/
@ 2019-08-04 17:53 Sergei Trofimovich
  0 siblings, 0 replies; 13+ messages in thread
From: Sergei Trofimovich @ 2019-08-04 17:53 UTC (permalink / raw
  To: gentoo-commits

commit:     d6932537b09df0d86b6e62da1a4750a4bdccc910
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  4 17:52:51 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Aug  4 17:53:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6932537

dev-util/radare2: bump up to 3.7.0

Package-Manager: Portage-2.3.70, Repoman-2.3.16
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-util/radare2/Manifest                          |  1 +
 .../files/radare2-3.7.0-with-syscapstone-p1.patch  | 24 +++++++++
 .../files/radare2-3.7.0-with-syscapstone-p2.patch  | 22 ++++++++
 dev-util/radare2/radare2-3.7.0.ebuild              | 58 ++++++++++++++++++++++
 4 files changed, 105 insertions(+)

diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 74a78d04d00..082b73a3c8e 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,2 +1,3 @@
 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

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 00000000000..3f87d606bba
--- /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 00000000000..1ebb74efb36
--- /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 00000000000..5d70b601195
--- /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
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/radare2/files/, dev-util/radare2/
@ 2020-05-23 11:39 Sergei Trofimovich
  0 siblings, 0 replies; 13+ messages in thread
From: Sergei Trofimovich @ 2020-05-23 11:39 UTC (permalink / raw
  To: gentoo-commits

commit:     12e796831bdef05d6f3e87088a379c1f612a5725
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat May 23 11:39:14 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat May 23 11:39:28 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12e79683

dev-util/radare2: pass CC,AR,LD,OBJCOPY,RANLIB, bug #720700

Reported-by: Agostino Sarubbo
Closes: https://bugs.gentoo.org/720700
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 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 +++++++++++++++++++++++
 3 files changed, 114 insertions(+)

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 00000000000..406bd7ab004
--- /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 00000000000..6ce007a5278
--- /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 00000000000..376d0a9f521
--- /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
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/radare2/files/, dev-util/radare2/
@ 2020-07-20 21:31 Sergei Trofimovich
  0 siblings, 0 replies; 13+ messages in thread
From: Sergei Trofimovich @ 2020-07-20 21:31 UTC (permalink / raw
  To: gentoo-commits

commit:     f8b1eb856f923a61e2d1c5bf1f12145e89232c5c
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 20 21:30:44 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 21:31:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8b1eb85

dev-util/radare2: drop old <4.5.0 versions

Bug: https://bugs.gentoo.org/733368
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-util/radare2/Manifest                         |  1 -
 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 -----------------------
 4 files changed, 115 deletions(-)

diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index ab7bde52c1b..2d065a4b603 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,2 +1 @@
-DIST radare2-4.4.0.tar.gz 8135544 BLAKE2B 1a1a4ce97dde4b8985cbe95bb889bfdef8f9d64e2c2257030fda523b1a1aced4e6681bc0f7b14d1a3f25fbce355f2062f0edc33ab396bef98792d29d1f708a11 SHA512 6208d97f8333e72dfd04cccdb0234b60fb8979ca559b92532bf7e47d402f91e0c54678a83e6bafee65666fb7d6008b44b961600f24f9b3275cb2eec32490eaa5
 DIST radare2-4.5.0.tar.gz 8265716 BLAKE2B 5288b393eb40f0f9355ad44a102a768924775ce11d126477d89a77d4dbb885556371125ea9f54ce81216bcef25387b816ab679b99a2e6c31c7f48db13ccc4774 SHA512 84d4ffc28f499f4360f57f31ad1b1f4b2a14e7fcbde7198bfb9ec4a85ac6606ceb5b28602624d6419b14b1586afd50330ace6232a183d7bfb876fefe07ea7bf4

diff --git a/dev-util/radare2/files/radare2-4.4.0-AR.patch b/dev-util/radare2/files/radare2-4.4.0-AR.patch
deleted file mode 100644
index 406bd7ab004..00000000000
--- a/dev-util/radare2/files/radare2-4.4.0-AR.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-
---- 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
deleted file mode 100644
index 6ce007a5278..00000000000
--- a/dev-util/radare2/files/radare2-4.4.0-RANLIB.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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
deleted file mode 100644
index 376d0a9f521..00000000000
--- a/dev-util/radare2/radare2-4.4.0-r1.ebuild
+++ /dev/null
@@ -1,65 +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 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
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/radare2/files/, dev-util/radare2/
@ 2020-12-22 23:34 Sergei Trofimovich
  0 siblings, 0 replies; 13+ messages in thread
From: Sergei Trofimovich @ 2020-12-22 23:34 UTC (permalink / raw
  To: gentoo-commits

commit:     fb689df7977dc3a88f8a8fecd1cc6d0095dfbe07
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 22 23:06:18 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Dec 22 23:34:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb689df7

dev-util/radare2: don't compress fortunes

radare2 reads and parses files as is. Compression breaks it.

Reported-by: Esteve Varela Colominas
Closes: https://bugs.gentoo.org/761250
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-util/radare2/files/radare2-4.5.1-docdir.patch | 12 ++++++++++++
 dev-util/radare2/radare2-4.5.1.ebuild             |  6 ++++++
 dev-util/radare2/radare2-9999.ebuild              | 12 ++++++++++--
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/dev-util/radare2/files/radare2-4.5.1-docdir.patch b/dev-util/radare2/files/radare2-4.5.1-docdir.patch
new file mode 100644
index 00000000000..51dcd7b16e1
--- /dev/null
+++ b/dev-util/radare2/files/radare2-4.5.1-docdir.patch
@@ -0,0 +1,12 @@
+Be closer to ${PF} than ${PN}.
+--- a/libr/include/r_userconf.h.acr
++++ b/libr/include/r_userconf.h.acr
+@@ -53,7 +53,7 @@
+ #define R2_ZIGNS            R_JOIN_4_PATHS ("share", "radare2", R2_VERSION, "zigns")
+ #define R2_THEMES           R_JOIN_4_PATHS ("share", "radare2", R2_VERSION, "cons")
+ #define R2_FLAGS            R_JOIN_4_PATHS ("share", "radare2", R2_VERSION, "flag")
+-#define R2_FORTUNES         R_JOIN_3_PATHS ("share", "doc", "radare2")
++#define R2_FORTUNES         R_JOIN_3_PATHS ("share", "doc", "radare2-" R2_VERSION)
+ #define R2_HUD              R_JOIN_4_PATHS ("share", "radare2", R2_VERSION, "hud")
+ #endif
+ 

diff --git a/dev-util/radare2/radare2-4.5.1.ebuild b/dev-util/radare2/radare2-4.5.1.ebuild
index 302e356bc8b..036a151c8c7 100644
--- a/dev-util/radare2/radare2-4.5.1.ebuild
+++ b/dev-util/radare2/radare2-4.5.1.ebuild
@@ -30,6 +30,8 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=("${FILESDIR}"/${PN}-4.5.1-docdir.patch)
+
 src_configure() {
 	# Ideally these should be set by ./configure
 	tc-export CC AR LD OBJCOPY RANLIB
@@ -57,4 +59,8 @@ src_install() {
 			rm -rfv "$d" || die "failed to delete '$d'"
 		fi
 	done
+
+	# These are not really docs. radare assumes
+	# uncompressed files: bug #761250
+	docompress -x /usr/share/doc/${PF}/fortunes.{creepy,fun,nsfw,tips}
 }

diff --git a/dev-util/radare2/radare2-9999.ebuild b/dev-util/radare2/radare2-9999.ebuild
index 36cda6bb0ae..3c24d71a337 100644
--- a/dev-util/radare2/radare2-9999.ebuild
+++ b/dev-util/radare2/radare2-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit bash-completion-r1 eutils
+inherit bash-completion-r1 eutils toolchain-funcs
 
 DESCRIPTION="unix-like reverse engineering framework and commandline tools"
 HOMEPAGE="http://www.radare.org"
@@ -31,6 +31,10 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 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 \
@@ -53,4 +57,8 @@ src_install() {
 			rm -rfv "$d" || die "failed to delete '$d'"
 		fi
 	done
+
+	# These are not really docs. radare assumes
+	# uncompressed files: bug #761250
+	docompress -x /usr/share/doc/${PF}/fortunes.{creepy,fun,nsfw,tips}
 }


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/radare2/files/, dev-util/radare2/
@ 2022-01-06  4:44 John Helmert III
  0 siblings, 0 replies; 13+ messages in thread
From: John Helmert III @ 2022-01-06  4:44 UTC (permalink / raw
  To: gentoo-commits

commit:     6857fe494583e031f9402e81777e91416902df95
Author:     David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Sat Dec  4 20:29:43 2021 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Thu Jan  6 04:37:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6857fe49

dev-util/radare2: verbump to 5.5.4

Closes: https://bugs.gentoo.org/815046
Bug: https://bugs.gentoo.org/790284
Bug: https://bugs.gentoo.org/807061

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23184
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 dev-util/radare2/Manifest                          |   4 +
 .../radare2/files/radare2-5.5.0-vector35.patch     |  22 +++++
 dev-util/radare2/radare2-5.5.4.ebuild              | 106 +++++++++++++++++++++
 3 files changed, 132 insertions(+)

diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index f7e1e52e590e..3ade9bbc8226 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,2 +1,6 @@
 DIST radare2-4.5.1.tar.gz 8266567 BLAKE2B 0d23c1d47dd79ffd9398ca7b2c8b383ba6a7e3ec662046d1111ab34cabcdaaf1fdd449686433b3229e3c22c31c705530b0a85bbd22b5fc79891a5ad292ba0ff1 SHA512 f08a4cd1e0d65643463d9f9dbb1aacfe793c7b411ec820a18b75a5975d265cfc2cf91e593522c8823aa369098ded21415939acb07c84d8acd102889bf5aed899
 DIST radare2-5.3.1.tar.gz 8500461 BLAKE2B 8b29e81c90f477e313f5d14dea707f3e8d47c9abbe1f9ca2c7caef98a85b38a5b5e37a31063be289c55fda041e10b8403895f863dd602091ab5307213605260d SHA512 34c96c7c863fb8a59f1d03539375d5b8f31f6021dc84ce943daa163d8a0227bf3156963cc187c366790abec4381da6aa987248e76570a498cfcdeb982cb2ffc0
+DIST radare2-5.5.4-vector35-arm64.tar.gz 1021299 BLAKE2B 389bdc43e90ba71961e5d8afca495bd63b25d4c0dc9513c5e9cc0770f091199197dc1e4b8a9d4c57206acfd892a6b4ff9ba8b0f925e493f540956c64edfcd809 SHA512 7762cee60acc7605c2c127acab646c5c58c5736e6801058eec69c2da52901d0ecab85b0496d798be6403bedf27ffd4fe4e3a8d47c8802af1fe3805a4ac32ae26
+DIST radare2-5.5.4-vector35-armv7.tar.gz 255288 BLAKE2B ca96b3f68381a0987c4efa10dcb798194486019762e89d1eb19a3fd24f6983535eea792099c60e4c1a9d2bdb5baab119fe2e9a7a889fad5a14023e5f984959b8 SHA512 e9eb6cee02bbbb265914b1f9118c7a143ed76a201c085af5516855475bf7f3ad5f9c82d1548e85a0339fbc33e029ef0e4be9d8cef68d212ae16ce1a7f18453ff
+DIST radare2-5.5.4.tar.gz 9610424 BLAKE2B 4e113d854a55597270663f9c18f1d71da21fa8e539a997773f30178e93de54d397f56103813ec2c60cfabdf2d811151ad7285fc479e1ee681687831030e18da2 SHA512 b64268a8fcfbd89455b991557c82bb24d5f42471f4424cd971c1143ff604720fb4c00216a7054d72df6bbbdace1b814a6c3538708926c229dd2f8476b7d325da
+DIST radare2-testbins-a6d1a0331605b4a5db9aa9260386c850d484dc70.tar.gz 118148516 BLAKE2B 9b1a1861b4aea7db1cc364d16577a2b7afe082b0838178d307ed24704710edfa572533bab9b194d38c1b294e5a4fb522d1a93e92a1c577ca6622a16d94209bd5 SHA512 8888fab0d2295e92c4bd0ab4c2ba646951e41cc4c1f9915d501a27fbff21e82d5340d1a9255d998dcf0e209a57bb35fc714adcb31ed7adb58aa412f6202e69c6

diff --git a/dev-util/radare2/files/radare2-5.5.0-vector35.patch b/dev-util/radare2/files/radare2-5.5.0-vector35.patch
new file mode 100644
index 000000000000..5ebf58020d4d
--- /dev/null
+++ b/dev-util/radare2/files/radare2-5.5.0-vector35.patch
@@ -0,0 +1,22 @@
+--- a/libr/asm/arch/arm/v35arm64/Makefile
++++ b/libr/asm/arch/arm/v35arm64/Makefile
+@@ -30,8 +30,7 @@ $(ALIBS): arch-arm64 arch-armv7
+ 
+ ## ARM64
+ arch-arm64:
+-	git clone -q https://github.com/radareorg/vector35-arch-arm64 arch-arm64
+-	cd arch-arm64 && git checkout -q radare2 > /dev/null && git reset --hard $(ARCH_ARM64_COMMIT)
++	cd arch-arm64 
+ 
+ $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS)
+ 	rm -f arm64dis.$(EXT_AR)
+@@ -40,8 +39,7 @@ $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS)
+ 
+ ## ARMV7
+ arch-armv7:
+-	git clone -q https://github.com/radareorg/vector35-arch-armv7 arch-armv7
+-	cd arch-armv7 && git checkout -q radare2 > /dev/null && git reset --hard $(ARCH_ARMV7_COMMIT)
++	cd arch-armv7 
+ 
+ $(V35ARMV7_HOME)/armv7dis.a armv7dis.a: $(ALIBS)
+ 	rm -f armv7dis.$(EXT_AR)

diff --git a/dev-util/radare2/radare2-5.5.4.ebuild b/dev-util/radare2/radare2-5.5.4.ebuild
new file mode 100644
index 000000000000..3a2f15599169
--- /dev/null
+++ b/dev-util/radare2/radare2-5.5.4.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="unix-like reverse engineering framework and commandline tools"
+HOMEPAGE="http://www.radare.org"
+
+ARM64_COMMIT=3c5eaba46dab72ecb7d5f5b865a13fdeee95b464
+ARMV7_COMMIT=dde39f69ffea19fc37e681874b12cb4707bc4f30
+BINS_COMMIT=a6d1a0331605b4a5db9aa9260386c850d484dc70
+
+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
+		https://github.com/radareorg/vector35-arch-arm64/archive/${ARM64_COMMIT}.tar.gz -> ${P}-vector35-arm64.tar.gz
+		https://github.com/radareorg/vector35-arch-armv7/archive/${ARMV7_COMMIT}.tar.gz -> ${P}-vector35-armv7.tar.gz
+		test? ( https://github.com/radareorg/radare2-testbins/archive/${BINS_COMMIT}.tar.gz -> radare2-testbins-${BINS_COMMIT}.tar.gz )
+	"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ssl test"
+
+# Need to audit licenses of the binaries used for testing
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/libzip:=
+	dev-libs/xxhash
+	sys-apps/file
+	sys-libs/zlib
+	dev-libs/capstone:0=
+	ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/gperf
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-5.5.0-vector35.patch" )
+
+src_prepare() {
+	default
+
+	# Hack for vector35 arm plugins
+	mv "${WORKDIR}/vector35-arch-arm64-${ARM64_COMMIT}" libr/asm/arch/arm/v35arm64/arch-arm64 || die
+	mv "${WORKDIR}/vector35-arch-armv7-${ARMV7_COMMIT}" libr/asm/arch/arm/v35arm64/arch-armv7 || die
+
+	if use test; then
+		cp -r "${WORKDIR}/radare2-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
+		cp -r "${WORKDIR}/radare2-testbins-${BINS_COMMIT}" "${S}" || die
+	fi
+
+	# Fix hardcoded docdir for fortunes
+	sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \
+		libr/include/r_userconf.h.acr
+}
+
+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 \
+		--with-sysmagic \
+		--with-sysxxhash \
+		--with-syszip \
+		$(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
+
+	# These are not really docs. radare assumes
+	# uncompressed files: bug #761250
+	docompress -x /usr/share/doc/${PF}/fortunes.{creepy,fun,nsfw,tips}
+}
+
+src_test() {
+	emake -C test -k unit_tests || die
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/radare2/files/, dev-util/radare2/
@ 2022-07-16 16:51 John Helmert III
  0 siblings, 0 replies; 13+ messages in thread
From: John Helmert III @ 2022-07-16 16:51 UTC (permalink / raw
  To: gentoo-commits

commit:     6fd32965aba1d1c11af8c7df5ba828dfb5d0ad60
Author:     David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Tue May 31 17:51:43 2022 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sat Jul 16 16:51:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fd32965

dev-util/radare2: add 5.7.4

Bug: https://bugs.gentoo.org/841023
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25703
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 dev-util/radare2/Manifest                          |   4 +
 .../radare2/files/radare2-5.7.0-vector35.patch     |  22 ++++
 dev-util/radare2/radare2-5.7.4.ebuild              | 119 +++++++++++++++++++++
 3 files changed, 145 insertions(+)

diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 4795b198ad39..67c1e169c2c2 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,4 +1,8 @@
 DIST radare2-5.6.8-vector35-arm64.tar.gz 1021299 BLAKE2B 389bdc43e90ba71961e5d8afca495bd63b25d4c0dc9513c5e9cc0770f091199197dc1e4b8a9d4c57206acfd892a6b4ff9ba8b0f925e493f540956c64edfcd809 SHA512 7762cee60acc7605c2c127acab646c5c58c5736e6801058eec69c2da52901d0ecab85b0496d798be6403bedf27ffd4fe4e3a8d47c8802af1fe3805a4ac32ae26
 DIST radare2-5.6.8-vector35-armv7.tar.gz 255288 BLAKE2B ca96b3f68381a0987c4efa10dcb798194486019762e89d1eb19a3fd24f6983535eea792099c60e4c1a9d2bdb5baab119fe2e9a7a889fad5a14023e5f984959b8 SHA512 e9eb6cee02bbbb265914b1f9118c7a143ed76a201c085af5516855475bf7f3ad5f9c82d1548e85a0339fbc33e029ef0e4be9d8cef68d212ae16ce1a7f18453ff
 DIST radare2-5.6.8.tar.gz 9627480 BLAKE2B 4de904ee779b72f0a0e305170cdf62b3a4c3fdad768bb2c9a96a90b429c94c2bae1523439d5b869d2fefed89849fde1d996dd1de400fe47ea657bee3dd258fe1 SHA512 e29a3ff235f37bcde4ec6c1c97d1b9c521b57e93512ca40d71be9e88ac1c002f41af905865fdf4685ee94287425cff32500b5a111eec5594bdd7f32f05631910
+DIST radare2-5.7.4-vector35-arm64.tar.gz 1050970 BLAKE2B 17b9f730b514d959640bd259af9ebdb44b951eb839dc62160da167f2ea3906a60b10e20ff32561cc9b625dfffd1a83d25f484c91e1976d61a18dd04b9bed9862 SHA512 bee2f8685dc3760fd51eaa2ab9c68aed2833386145fe164ca6dfc4a5aab20596d1c6305167da2c7410c25be1391853f82fddc1cfa2bfa8e473d7f52129c44a3b
+DIST radare2-5.7.4-vector35-armv7.tar.gz 255288 BLAKE2B ca96b3f68381a0987c4efa10dcb798194486019762e89d1eb19a3fd24f6983535eea792099c60e4c1a9d2bdb5baab119fe2e9a7a889fad5a14023e5f984959b8 SHA512 e9eb6cee02bbbb265914b1f9118c7a143ed76a201c085af5516855475bf7f3ad5f9c82d1548e85a0339fbc33e029ef0e4be9d8cef68d212ae16ce1a7f18453ff
+DIST radare2-5.7.4.tar.gz 9814654 BLAKE2B ae8ed1d7b417236c27ee4857f7c33d657d379b46119391037bdb82ddb5b36ab89088c1c0d958757b7cb7fe87a70dd1b288e082af802c818d83d159e7a8460a8a SHA512 e3fc159f2c009ef98c14930086a34cbbb848f779b37206332ee713daa25d803911652d9f1c28b4f23eca02ac103efe9bca4dea65758f1a2077b1eb1279fc1212
+DIST radare2-testbins-2fdb78f7f754b3aea90377588d45b774ccb41086.tar.gz 120580683 BLAKE2B ba16206f3c44f43c36fbc3079e43d29cd5b6266f8bd31602d7ec218a2b14601173c9022be9329975bd28de948933deeecc052f56c2acd9d6dfeb5576049ec32f SHA512 2c66c8f68df7c51a52a73b33e854b095a4f5435c60eab2a1456f366376aac0f7c39836699e09eae2918f31e75b7c6562994f0916f45de53ae6a480506da95dcb
 DIST radare2-testbins-a6d1a0331605b4a5db9aa9260386c850d484dc70.tar.gz 118148516 BLAKE2B 9b1a1861b4aea7db1cc364d16577a2b7afe082b0838178d307ed24704710edfa572533bab9b194d38c1b294e5a4fb522d1a93e92a1c577ca6622a16d94209bd5 SHA512 8888fab0d2295e92c4bd0ab4c2ba646951e41cc4c1f9915d501a27fbff21e82d5340d1a9255d998dcf0e209a57bb35fc714adcb31ed7adb58aa412f6202e69c6

diff --git a/dev-util/radare2/files/radare2-5.7.0-vector35.patch b/dev-util/radare2/files/radare2-5.7.0-vector35.patch
new file mode 100644
index 000000000000..c358d94ff427
--- /dev/null
+++ b/dev-util/radare2/files/radare2-5.7.0-vector35.patch
@@ -0,0 +1,22 @@
+diff --git a/libr/asm/arch/arm/v35arm64/Makefile b/libr/asm/arch/arm/v35arm64/Makefile
+index afc4322b83..fe77126a08 100644
+--- a/libr/asm/arch/arm/v35arm64/Makefile
++++ b/libr/asm/arch/arm/v35arm64/Makefile
+@@ -31,7 +31,7 @@ $(ALIBS): arch-arm64 arch-armv7
+ ## ARM64
+ arch-arm64:
+ 	git clone -q https://github.com/radareorg/vector35-arch-arm64 arch-arm64
+-	cd arch-arm64 && git checkout -q radare2-wip > /dev/null && git reset --hard $(ARCH_ARM64_COMMIT)
++	cd arch-arm64
+ 
+ $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS)
+ 	rm -f arm64dis.$(EXT_AR)
+@@ -41,7 +41,7 @@ $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS)
+ ## ARMV7
+ arch-armv7:
+ 	git clone -q https://github.com/radareorg/vector35-arch-armv7 arch-armv7
+-	cd arch-armv7 && git checkout -q radare2 > /dev/null && git reset --hard $(ARCH_ARMV7_COMMIT)
++	cd arch-armv7	
+ 
+ $(V35ARMV7_HOME)/armv7dis.a armv7dis.a: $(ALIBS)
+ 	rm -f armv7dis.$(EXT_AR)

diff --git a/dev-util/radare2/radare2-5.7.4.ebuild b/dev-util/radare2/radare2-5.7.4.ebuild
new file mode 100644
index 000000000000..18d2d68effc4
--- /dev/null
+++ b/dev-util/radare2/radare2-5.7.4.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="unix-like reverse engineering framework and commandline tools"
+HOMEPAGE="https://www.radare.org"
+
+ARM64_COMMIT=fddb6d0fb0489c4e797a61b1553ac0d771fbf657
+ARMV7_COMMIT=dde39f69ffea19fc37e681874b12cb4707bc4f30
+BINS_COMMIT=2fdb78f7f754b3aea90377588d45b774ccb41086
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/radareorg/radare2"
+else
+	SRC_URI="mirror+https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz
+		mirror+https://github.com/radareorg/vector35-arch-arm64/archive/${ARM64_COMMIT}.tar.gz -> ${P}-vector35-arm64.tar.gz
+		mirror+https://github.com/radareorg/vector35-arch-armv7/archive/${ARMV7_COMMIT}.tar.gz -> ${P}-vector35-armv7.tar.gz
+		test? ( https://github.com/radareorg/radare2-testbins/archive/${BINS_COMMIT}.tar.gz -> radare2-testbins-${BINS_COMMIT}.tar.gz )
+	"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ssl test"
+
+# Need to audit licenses of the binaries used for testing
+RESTRICT="fetch !test? ( test )"
+
+RDEPEND="
+	dev-libs/libzip:=
+	dev-libs/xxhash
+	sys-apps/file
+	sys-libs/zlib
+	<dev-libs/capstone-5:0=
+	ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/gperf
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-5.7.0-vector35.patch" )
+
+src_prepare() {
+	default
+
+	# Hack for vector35 arm plugins
+	mv "${WORKDIR}/vector35-arch-arm64-${ARM64_COMMIT}" libr/asm/arch/arm/v35arm64/arch-arm64 || die
+	mv "${WORKDIR}/vector35-arch-armv7-${ARMV7_COMMIT}" libr/asm/arch/arm/v35arm64/arch-armv7 || die
+
+	if use test; then
+		cp -r "${WORKDIR}/radare2-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
+		cp -r "${WORKDIR}/radare2-testbins-${BINS_COMMIT}" "${S}" || die
+	fi
+
+	# Fix hardcoded docdir for fortunes
+	sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \
+		libr/include/r_userconf.h.acr
+}
+
+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 \
+		--with-sysmagic \
+		--with-sysxxhash \
+		--with-syszip \
+		$(use_with ssl openssl)
+}
+
+src_test() {
+	ln -fs "${S}/binr/radare2/radare2" "${S}/binr/radare2/r2" || die
+	LDFLAGS=""
+	for i in ${S}/libr/*; do
+		if [[ -d ${i} ]]; then
+			LDFLAGS+="-R${i} -L${i} "
+			LD_LIBRARY_PATH+=":${i}"
+		fi
+	done
+	export LDFLAGS LD_LIBRARY_PATH
+	export PKG_CONFIG_PATH="${S}/pkgcfg"
+	PATH="${S}/binr/radare2:${PATH}" emake -C test -k unit_tests || die
+}
+
+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
+
+	# These are not really docs. radare assumes
+	# uncompressed files: bug #761250
+	docompress -x /usr/share/doc/${PF}/fortunes.{creepy,fun,nsfw,tips}
+
+	# Create plugins directory although it's currently unsupported by radare2
+	keepdir "/usr/$(get_libdir)/radare2/${PV}" || die
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/radare2/files/, dev-util/radare2/
@ 2023-01-23  4:32 John Helmert III
  0 siblings, 0 replies; 13+ messages in thread
From: John Helmert III @ 2023-01-23  4:32 UTC (permalink / raw
  To: gentoo-commits

commit:     f6b02f1030e87d04391b24bdb861bd6406bf2beb
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 04:32:22 2023 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 04:32:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6b02f10

dev-util/radare2: drop 5.7.4, 5.7.6, 5.7.8

Bug: https://bugs.gentoo.org/885395
Bug: https://bugs.gentoo.org/889026
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 dev-util/radare2/Manifest                          |  11 --
 .../radare2/files/radare2-5.7.0-vector35.patch     |  22 ----
 dev-util/radare2/radare2-5.7.4.ebuild              | 119 ---------------------
 dev-util/radare2/radare2-5.7.6.ebuild              | 119 ---------------------
 dev-util/radare2/radare2-5.7.8.ebuild              | 119 ---------------------
 5 files changed, 390 deletions(-)

diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 942e4cb4793e..52d2f8271e66 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,16 +1,5 @@
-DIST radare2-5.7.4-vector35-arm64.tar.gz 1050970 BLAKE2B 17b9f730b514d959640bd259af9ebdb44b951eb839dc62160da167f2ea3906a60b10e20ff32561cc9b625dfffd1a83d25f484c91e1976d61a18dd04b9bed9862 SHA512 bee2f8685dc3760fd51eaa2ab9c68aed2833386145fe164ca6dfc4a5aab20596d1c6305167da2c7410c25be1391853f82fddc1cfa2bfa8e473d7f52129c44a3b
-DIST radare2-5.7.4-vector35-armv7.tar.gz 255288 BLAKE2B ca96b3f68381a0987c4efa10dcb798194486019762e89d1eb19a3fd24f6983535eea792099c60e4c1a9d2bdb5baab119fe2e9a7a889fad5a14023e5f984959b8 SHA512 e9eb6cee02bbbb265914b1f9118c7a143ed76a201c085af5516855475bf7f3ad5f9c82d1548e85a0339fbc33e029ef0e4be9d8cef68d212ae16ce1a7f18453ff
-DIST radare2-5.7.4.tar.gz 9814654 BLAKE2B ae8ed1d7b417236c27ee4857f7c33d657d379b46119391037bdb82ddb5b36ab89088c1c0d958757b7cb7fe87a70dd1b288e082af802c818d83d159e7a8460a8a SHA512 e3fc159f2c009ef98c14930086a34cbbb848f779b37206332ee713daa25d803911652d9f1c28b4f23eca02ac103efe9bca4dea65758f1a2077b1eb1279fc1212
-DIST radare2-5.7.6-vector35-arm64.tar.gz 1050960 BLAKE2B 12faa86a4cdfd9cdc8e307c16d8f797ae3ee800b72e76c6ace84cb7cb5108198dbfbc9a00df6b70448628dc869c94bf8cf9794460d05be99e5a08ee5a3ed40de SHA512 478f06c3fe09232152bbb63e500a440ca8546cc11fe59f9d489a25d327469b1869fe80b4e2e2cfad8a2b96261857cf74b6708628ac30ec8dabc5da05d04c1cfd
-DIST radare2-5.7.6-vector35-armv7.tar.gz 255288 BLAKE2B ca96b3f68381a0987c4efa10dcb798194486019762e89d1eb19a3fd24f6983535eea792099c60e4c1a9d2bdb5baab119fe2e9a7a889fad5a14023e5f984959b8 SHA512 e9eb6cee02bbbb265914b1f9118c7a143ed76a201c085af5516855475bf7f3ad5f9c82d1548e85a0339fbc33e029ef0e4be9d8cef68d212ae16ce1a7f18453ff
-DIST radare2-5.7.6.tar.gz 10071795 BLAKE2B e0bd54fcf4a56b34ec6f3b87ab6a20a8be23514e48842d66d7a30f517fa9ba871bd1e740604840fb16a3ae1329221ee67645774ac7df9f8f8d00dc3548dc7830 SHA512 04717ddb4bef9ed415c22aa25a0bf626f05c5d32133ac46d5e8a30ebe83e7b782a2b1835233f17f16315a99a39b33dd4e67c34798eb8ae9fbc6db51ca1051e94
-DIST radare2-5.7.8-vector35-arm64.tar.gz 1050960 BLAKE2B 12faa86a4cdfd9cdc8e307c16d8f797ae3ee800b72e76c6ace84cb7cb5108198dbfbc9a00df6b70448628dc869c94bf8cf9794460d05be99e5a08ee5a3ed40de SHA512 478f06c3fe09232152bbb63e500a440ca8546cc11fe59f9d489a25d327469b1869fe80b4e2e2cfad8a2b96261857cf74b6708628ac30ec8dabc5da05d04c1cfd
-DIST radare2-5.7.8-vector35-armv7.tar.gz 255288 BLAKE2B ca96b3f68381a0987c4efa10dcb798194486019762e89d1eb19a3fd24f6983535eea792099c60e4c1a9d2bdb5baab119fe2e9a7a889fad5a14023e5f984959b8 SHA512 e9eb6cee02bbbb265914b1f9118c7a143ed76a201c085af5516855475bf7f3ad5f9c82d1548e85a0339fbc33e029ef0e4be9d8cef68d212ae16ce1a7f18453ff
-DIST radare2-5.7.8.tar.gz 10324020 BLAKE2B 628b0c146a8e797f34f43f8d76166fb8c5e945a45232c2e4d63b2c2ce89aef96a20349c519ceb62921bad75ce5faaa8ea51ab1dac79156e00eef8f9ef06f5a45 SHA512 7c819a052f5e4b3da72b945915fca92a747c52dc2e2fa8483a8c2d8e71479ce374efbbe2bc02b1b4af26db6a891b6e44cdbb9e062de2f13b22a258cceab561f6
 DIST radare2-5.8.2-capstone-4.0.2.tar.gz 3439542 BLAKE2B 435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9 SHA512 7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e
 DIST radare2-5.8.2-vector35-arm64.tar.gz 1021315 BLAKE2B 8741de83cddda878536627c0ff6be1f7d4842cf0fefeae2895fe751e39768134f6048167d5aa265169bc22b229a8b66ce37f4ef4df3abc2b3e304dc1f1fe17d1 SHA512 9b0fcf9119304e90b3fbed5e0509a819a0a561953681f5e5f408b55db3b0c962dca59c48553cffef21a56772db7871a3987f0f7c07b5538fd4b7d1af005ccdb0
 DIST radare2-5.8.2-vector35-armv7.tar.gz 255278 BLAKE2B 8b5191c48fad2e7602dc2f7053f9c9ea8cca8e9bc5d68a0cdb7ccff9ecc65c5d1ff6a434e28488dbd6fb71fc7482fce08a0a69c358e5c3d6c017ac1e4cee3b21 SHA512 40c048b29856f48300d4539bc7bda38e6ceae1e8d4d9d131c4a7546b6e26b2fb96309c483b67e2c2290b06cea5fc52a7beb30557d54e89296e7734cc1ab06d10
 DIST radare2-5.8.2.tar.gz 11017554 BLAKE2B 712941ac5871f2201ba806dc7b68ae1825c8dbe896b11aaa6b086651ff28a6d3b7e54b55621e7cc143748d7760ea7007f4dc70232ef16dfe5523a0ab87f0f266 SHA512 3c09d89172ac9a5cee6e52294f10b144237acb31b3d470521a7c8650511a58d1732c73004f2dbb1e6e3c43829e3e310b89d6a8abd5f1fb4fdfd3fea8779a72ec
 DIST radare2-testbins-1f0ea409f2af83fc4d0b685855de9d3b0f9eee41.tar.gz 125596301 BLAKE2B 55b876b09150e780359e753d26143640d410c1c15ace2e29bc06d2163657af2089c5044847f107e20256875c7ea5e7cc72460010df0c662c9da933a0388a3f0e SHA512 44662f0217871a51b856f66e876eb57b2006f6350e6bcfae6629b800197b6f30196caf2474d52881a398fd1d65c68364d870b7de692c9e9a2bd1fab493afe3d0
-DIST radare2-testbins-2fdb78f7f754b3aea90377588d45b774ccb41086.tar.gz 120580683 BLAKE2B ba16206f3c44f43c36fbc3079e43d29cd5b6266f8bd31602d7ec218a2b14601173c9022be9329975bd28de948933deeecc052f56c2acd9d6dfeb5576049ec32f SHA512 2c66c8f68df7c51a52a73b33e854b095a4f5435c60eab2a1456f366376aac0f7c39836699e09eae2918f31e75b7c6562994f0916f45de53ae6a480506da95dcb
-DIST radare2-testbins-602471f72caa60d6ece43c3fa483c43decf7052c.tar.gz 124090448 BLAKE2B 446f4b730095dc263f31bbd886b350fbf3cbde0cd3bc6f5ed0c5d65a90a66b4d97a7397798c0f6fb7596722d827a3805c6d4d810d06837cf46e8798cedb1fea4 SHA512 b490ec951813827bed940ca4fc772691f8e446ce14cf2f0cc7fe2027a481c91939e6212ce94237f71091c18ac8428c9a4a4f35fc58f41ba076c1da75835d0ff4

diff --git a/dev-util/radare2/files/radare2-5.7.0-vector35.patch b/dev-util/radare2/files/radare2-5.7.0-vector35.patch
deleted file mode 100644
index c358d94ff427..000000000000
--- a/dev-util/radare2/files/radare2-5.7.0-vector35.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/libr/asm/arch/arm/v35arm64/Makefile b/libr/asm/arch/arm/v35arm64/Makefile
-index afc4322b83..fe77126a08 100644
---- a/libr/asm/arch/arm/v35arm64/Makefile
-+++ b/libr/asm/arch/arm/v35arm64/Makefile
-@@ -31,7 +31,7 @@ $(ALIBS): arch-arm64 arch-armv7
- ## ARM64
- arch-arm64:
- 	git clone -q https://github.com/radareorg/vector35-arch-arm64 arch-arm64
--	cd arch-arm64 && git checkout -q radare2-wip > /dev/null && git reset --hard $(ARCH_ARM64_COMMIT)
-+	cd arch-arm64
- 
- $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS)
- 	rm -f arm64dis.$(EXT_AR)
-@@ -41,7 +41,7 @@ $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS)
- ## ARMV7
- arch-armv7:
- 	git clone -q https://github.com/radareorg/vector35-arch-armv7 arch-armv7
--	cd arch-armv7 && git checkout -q radare2 > /dev/null && git reset --hard $(ARCH_ARMV7_COMMIT)
-+	cd arch-armv7	
- 
- $(V35ARMV7_HOME)/armv7dis.a armv7dis.a: $(ALIBS)
- 	rm -f armv7dis.$(EXT_AR)

diff --git a/dev-util/radare2/radare2-5.7.4.ebuild b/dev-util/radare2/radare2-5.7.4.ebuild
deleted file mode 100644
index 26de380f0f15..000000000000
--- a/dev-util/radare2/radare2-5.7.4.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="https://www.radare.org"
-
-ARM64_COMMIT=fddb6d0fb0489c4e797a61b1553ac0d771fbf657
-ARMV7_COMMIT=dde39f69ffea19fc37e681874b12cb4707bc4f30
-BINS_COMMIT=2fdb78f7f754b3aea90377588d45b774ccb41086
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radareorg/radare2"
-else
-	SRC_URI="mirror+https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz
-		mirror+https://github.com/radareorg/vector35-arch-arm64/archive/${ARM64_COMMIT}.tar.gz -> ${P}-vector35-arm64.tar.gz
-		mirror+https://github.com/radareorg/vector35-arch-armv7/archive/${ARMV7_COMMIT}.tar.gz -> ${P}-vector35-armv7.tar.gz
-		test? ( https://github.com/radareorg/radare2-testbins/archive/${BINS_COMMIT}.tar.gz -> radare2-testbins-${BINS_COMMIT}.tar.gz )
-	"
-
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl test"
-
-# Need to audit licenses of the binaries used for testing
-RESTRICT="fetch !test? ( test )"
-
-RDEPEND="
-	dev-libs/libzip:=
-	dev-libs/xxhash
-	sys-apps/file
-	sys-libs/zlib
-	dev-libs/capstone:0=
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/gperf
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-5.7.0-vector35.patch" )
-
-src_prepare() {
-	default
-
-	# Hack for vector35 arm plugins
-	mv "${WORKDIR}/vector35-arch-arm64-${ARM64_COMMIT}" libr/asm/arch/arm/v35arm64/arch-arm64 || die
-	mv "${WORKDIR}/vector35-arch-armv7-${ARMV7_COMMIT}" libr/asm/arch/arm/v35arm64/arch-armv7 || die
-
-	if use test; then
-		cp -r "${WORKDIR}/radare2-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
-		cp -r "${WORKDIR}/radare2-testbins-${BINS_COMMIT}" "${S}" || die
-	fi
-
-	# Fix hardcoded docdir for fortunes
-	sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \
-		libr/include/r_userconf.h.acr
-}
-
-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 \
-		--with-sysmagic \
-		--with-sysxxhash \
-		--with-syszip \
-		$(use_with ssl openssl)
-}
-
-src_test() {
-	ln -fs "${S}/binr/radare2/radare2" "${S}/binr/radare2/r2" || die
-	LDFLAGS=""
-	for i in "${S}"/libr/*; do
-		if [[ -d ${i} ]]; then
-			LDFLAGS+="-R${i} -L${i} "
-			LD_LIBRARY_PATH+=":${i}"
-		fi
-	done
-	export LDFLAGS LD_LIBRARY_PATH
-	export PKG_CONFIG_PATH="${S}/pkgcfg"
-	PATH="${S}/binr/radare2:${PATH}" emake -C test -k unit_tests || die
-}
-
-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
-
-	# These are not really docs. radare assumes
-	# uncompressed files: bug #761250
-	docompress -x /usr/share/doc/${PF}/fortunes.{creepy,fun,nsfw,tips}
-
-	# Create plugins directory although it's currently unsupported by radare2
-	keepdir "/usr/$(get_libdir)/radare2/${PV}" || die
-}

diff --git a/dev-util/radare2/radare2-5.7.6.ebuild b/dev-util/radare2/radare2-5.7.6.ebuild
deleted file mode 100644
index 8d4bfd6a4e75..000000000000
--- a/dev-util/radare2/radare2-5.7.6.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="https://www.radare.org"
-
-ARM64_COMMIT=9ab2b0bedde459dc86e079718333de4a63bbbacb
-ARMV7_COMMIT=dde39f69ffea19fc37e681874b12cb4707bc4f30
-BINS_COMMIT=602471f72caa60d6ece43c3fa483c43decf7052c
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radareorg/radare2"
-else
-	SRC_URI="mirror+https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz
-		mirror+https://github.com/radareorg/vector35-arch-arm64/archive/${ARM64_COMMIT}.tar.gz -> ${P}-vector35-arm64.tar.gz
-		mirror+https://github.com/radareorg/vector35-arch-armv7/archive/${ARMV7_COMMIT}.tar.gz -> ${P}-vector35-armv7.tar.gz
-		test? ( https://github.com/radareorg/radare2-testbins/archive/${BINS_COMMIT}.tar.gz -> radare2-testbins-${BINS_COMMIT}.tar.gz )
-	"
-
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl test"
-
-# Need to audit licenses of the binaries used for testing
-RESTRICT="fetch !test? ( test )"
-
-RDEPEND="
-	dev-libs/libzip:=
-	dev-libs/xxhash
-	sys-apps/file
-	sys-libs/zlib
-	dev-libs/capstone:0=
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/gperf
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-5.7.0-vector35.patch" )
-
-src_prepare() {
-	default
-
-	# Hack for vector35 arm plugins
-	mv "${WORKDIR}/vector35-arch-arm64-${ARM64_COMMIT}" libr/asm/arch/arm/v35arm64/arch-arm64 || die
-	mv "${WORKDIR}/vector35-arch-armv7-${ARMV7_COMMIT}" libr/asm/arch/arm/v35arm64/arch-armv7 || die
-
-	if use test; then
-		cp -r "${WORKDIR}/radare2-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
-		cp -r "${WORKDIR}/radare2-testbins-${BINS_COMMIT}" "${S}" || die
-	fi
-
-	# Fix hardcoded docdir for fortunes
-	sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \
-		libr/include/r_userconf.h.acr
-}
-
-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 \
-		--with-sysmagic \
-		--with-sysxxhash \
-		--with-syszip \
-		$(use_with ssl openssl)
-}
-
-src_test() {
-	ln -fs "${S}/binr/radare2/radare2" "${S}/binr/radare2/r2" || die
-	LDFLAGS=""
-	for i in "${S}"/libr/*; do
-		if [[ -d ${i} ]]; then
-			LDFLAGS+="-R${i} -L${i} "
-			LD_LIBRARY_PATH+=":${i}"
-		fi
-	done
-	export LDFLAGS LD_LIBRARY_PATH
-	export PKG_CONFIG_PATH="${S}/pkgcfg"
-	PATH="${S}/binr/radare2:${PATH}" emake -C test -k unit_tests || die
-}
-
-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
-
-	# These are not really docs. radare assumes
-	# uncompressed files: bug #761250
-	docompress -x /usr/share/doc/${PF}/fortunes.{creepy,fun,nsfw,tips}
-
-	# Create plugins directory although it's currently unsupported by radare2
-	keepdir "/usr/$(get_libdir)/radare2/${PV}" || die
-}

diff --git a/dev-util/radare2/radare2-5.7.8.ebuild b/dev-util/radare2/radare2-5.7.8.ebuild
deleted file mode 100644
index 8d4bfd6a4e75..000000000000
--- a/dev-util/radare2/radare2-5.7.8.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="https://www.radare.org"
-
-ARM64_COMMIT=9ab2b0bedde459dc86e079718333de4a63bbbacb
-ARMV7_COMMIT=dde39f69ffea19fc37e681874b12cb4707bc4f30
-BINS_COMMIT=602471f72caa60d6ece43c3fa483c43decf7052c
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radareorg/radare2"
-else
-	SRC_URI="mirror+https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz
-		mirror+https://github.com/radareorg/vector35-arch-arm64/archive/${ARM64_COMMIT}.tar.gz -> ${P}-vector35-arm64.tar.gz
-		mirror+https://github.com/radareorg/vector35-arch-armv7/archive/${ARMV7_COMMIT}.tar.gz -> ${P}-vector35-armv7.tar.gz
-		test? ( https://github.com/radareorg/radare2-testbins/archive/${BINS_COMMIT}.tar.gz -> radare2-testbins-${BINS_COMMIT}.tar.gz )
-	"
-
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl test"
-
-# Need to audit licenses of the binaries used for testing
-RESTRICT="fetch !test? ( test )"
-
-RDEPEND="
-	dev-libs/libzip:=
-	dev-libs/xxhash
-	sys-apps/file
-	sys-libs/zlib
-	dev-libs/capstone:0=
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/gperf
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-5.7.0-vector35.patch" )
-
-src_prepare() {
-	default
-
-	# Hack for vector35 arm plugins
-	mv "${WORKDIR}/vector35-arch-arm64-${ARM64_COMMIT}" libr/asm/arch/arm/v35arm64/arch-arm64 || die
-	mv "${WORKDIR}/vector35-arch-armv7-${ARMV7_COMMIT}" libr/asm/arch/arm/v35arm64/arch-armv7 || die
-
-	if use test; then
-		cp -r "${WORKDIR}/radare2-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
-		cp -r "${WORKDIR}/radare2-testbins-${BINS_COMMIT}" "${S}" || die
-	fi
-
-	# Fix hardcoded docdir for fortunes
-	sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \
-		libr/include/r_userconf.h.acr
-}
-
-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 \
-		--with-sysmagic \
-		--with-sysxxhash \
-		--with-syszip \
-		$(use_with ssl openssl)
-}
-
-src_test() {
-	ln -fs "${S}/binr/radare2/radare2" "${S}/binr/radare2/r2" || die
-	LDFLAGS=""
-	for i in "${S}"/libr/*; do
-		if [[ -d ${i} ]]; then
-			LDFLAGS+="-R${i} -L${i} "
-			LD_LIBRARY_PATH+=":${i}"
-		fi
-	done
-	export LDFLAGS LD_LIBRARY_PATH
-	export PKG_CONFIG_PATH="${S}/pkgcfg"
-	PATH="${S}/binr/radare2:${PATH}" emake -C test -k unit_tests || die
-}
-
-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
-
-	# These are not really docs. radare assumes
-	# uncompressed files: bug #761250
-	docompress -x /usr/share/doc/${PF}/fortunes.{creepy,fun,nsfw,tips}
-
-	# Create plugins directory although it's currently unsupported by radare2
-	keepdir "/usr/$(get_libdir)/radare2/${PV}" || die
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2023-01-23  4:32 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-16 16:51 [gentoo-commits] repo/gentoo:master commit in: dev-util/radare2/files/, dev-util/radare2/ John Helmert III
  -- strict thread matches above, loose matches on Subject: below --
2023-01-23  4:32 John Helmert III
2022-01-06  4:44 John Helmert III
2020-12-22 23:34 Sergei Trofimovich
2020-07-20 21:31 Sergei Trofimovich
2020-05-23 11:39 Sergei Trofimovich
2019-08-04 17:53 Sergei Trofimovich
2018-10-16 22:23 Sergei Trofimovich
2018-05-22 22:00 Sergei Trofimovich
2018-04-28 12:21 Sergei Trofimovich
2017-11-27 22:55 Sergei Trofimovich
2017-10-28 21:06 Sergei Trofimovich
2017-10-16 16:23 Sergei Trofimovich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox