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} }
