diff options
| -rw-r--r-- | dev-util/radare2/files/radare2-0.9.9-nogit.patch | 13 | ||||
| -rw-r--r-- | dev-util/radare2/radare2-2.5.0.ebuild | 8 | ||||
| -rw-r--r-- | 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 9a6979e348a4..000000000000 --- 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 abe520e9a37a..e054a7433d6f 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 89e71ebcc423..abe520e9a37a 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" |