From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1233826-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 E26A81382C5
for <garchives@archives.gentoo.org>; Tue, 22 Dec 2020 23:34:50 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 13FFFE098F;
Tue, 22 Dec 2020 23:34:50 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(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 C067DE098F
for <gentoo-commits@lists.gentoo.org>; Tue, 22 Dec 2020 23:34:49 +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 38066341892
for <gentoo-commits@lists.gentoo.org>; Tue, 22 Dec 2020 23:34:48 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id CEA30CB
for <gentoo-commits@lists.gentoo.org>; Tue, 22 Dec 2020 23:34:46 +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: <1608680082.fb689df7977dc3a88f8a8fecd1cc6d0095dfbe07.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-4.5.1-docdir.patch dev-util/radare2/radare2-4.5.1.ebuild dev-util/radare2/radare2-9999.ebuild
X-VCS-Directories: dev-util/radare2/ dev-util/radare2/files/
X-VCS-Committer: slyfox
X-VCS-Committer-Name: Sergei Trofimovich
X-VCS-Revision: fb689df7977dc3a88f8a8fecd1cc6d0095dfbe07
X-VCS-Branch: master
Date: Tue, 22 Dec 2020 23:34:46 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 59a621ee-f132-450a-a433-23e689ab02c5
X-Archives-Hash: 9116a0089366bbc5d9e00e9a53edc84a
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}
}