From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1020892-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id B12661382C5
for <garchives@archives.gentoo.org>; Sat, 28 Apr 2018 12:21:15 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id EB4B8E092C;
Sat, 28 Apr 2018 12:21:14 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id B1AD4E092C
for <gentoo-commits@lists.gentoo.org>; Sat, 28 Apr 2018 12:21:14 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 5859B335C8A
for <gentoo-commits@lists.gentoo.org>; Sat, 28 Apr 2018 12:21:13 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id B1761272
for <gentoo-commits@lists.gentoo.org>; Sat, 28 Apr 2018 12:21:11 +0000 (UTC)
From: "Sergei Trofimovich" <slyfox@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" <slyfox@gentoo.org>
Message-ID: <1524918064.c6ead6ec63da392259c83b3126c3150b4360403b.slyfox@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/radare2/files/, dev-util/radare2/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-util/radare2/files/radare2-0.9.9-nogit.patch dev-util/radare2/radare2-2.5.0.ebuild dev-util/radare2/radare2-9999.ebuild
X-VCS-Directories: dev-util/radare2/files/ dev-util/radare2/
X-VCS-Committer: slyfox
X-VCS-Committer-Name: Sergei Trofimovich
X-VCS-Revision: c6ead6ec63da392259c83b3126c3150b4360403b
X-VCS-Branch: master
Date: Sat, 28 Apr 2018 12:21:11 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 0a574dbf-8d17-4697-a041-e96e602abc11
X-Archives-Hash: 482f229f156a8c66689544659ed9c819
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"