[gentoo-commits] repo/gentoo:master commit in: app-misc/jq/

["Tim Harder" <radhermit@gentoo.org>]

commit:     a11f05faa23f8e59f59c6fdeb0ce319f5042c47c
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 23 10:21:38 2017 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sat Sep 23 10:25:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a11f05fa

app-misc/jq: disable valgrind and conditionally oniguruma tests

Closes: https://bugs.gentoo.org/603532

 app-misc/jq/jq-1.5-r3.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-misc/jq/jq-1.5-r3.ebuild b/app-misc/jq/jq-1.5-r3.ebuild
index 1c820324380..c8225639296 100644
--- a/app-misc/jq/jq-1.5-r3.ebuild
+++ b/app-misc/jq/jq-1.5-r3.ebuild
@@ -12,13 +12,12 @@ SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz"
 LICENSE="MIT CC-BY-3.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
-IUSE="oniguruma static-libs test +valgrind"
+IUSE="oniguruma static-libs test"
 
 DEPEND="
 	>=sys-devel/bison-3.0
 	sys-devel/flex
 	oniguruma? ( dev-libs/oniguruma:=[static-libs?] )
-	test? ( valgrind? ( dev-util/valgrind ) )
 "
 RDEPEND="
 	!static-libs? (
@@ -33,6 +32,7 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.5-heap_buffer_overflow_in_tokenadd.patch
 	)
 
+	use oniguruma || { sed -i 's:tests/onigtest::' Makefile.am || die; }
 	sed -i '/^dist_doc_DATA/d' Makefile.am || die
 	sed -i -r "s:(m4_define\(\[jq_version\],) .+\):\1 \[${PV}\]):" \
 		configure.ac || die
@@ -45,8 +45,8 @@ src_configure() {
 	local econfargs=(
 		# don't try to rebuild docs
 		--disable-docs
+		--disable-valgrind
 		$(use_enable static-libs static)
-		$(use_enable valgrind)
 		$(use_with oniguruma)
 	)
 	econf "${econfargs[@]}"