From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 113341396D0 for ; Sat, 23 Sep 2017 10:25:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 569AB1FC1BC; Sat, 23 Sep 2017 10:25:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 2F3701FC1BC for ; Sat, 23 Sep 2017 10:25:44 +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 4539633BE2E for ; Sat, 23 Sep 2017 10:25:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9C0E29064 for ; Sat, 23 Sep 2017 10:25:41 +0000 (UTC) From: "Tim Harder" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tim Harder" Message-ID: <1506162326.a11f05faa23f8e59f59c6fdeb0ce319f5042c47c.radhermit@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/jq/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/jq/jq-1.5-r3.ebuild X-VCS-Directories: app-misc/jq/ X-VCS-Committer: radhermit X-VCS-Committer-Name: Tim Harder X-VCS-Revision: a11f05faa23f8e59f59c6fdeb0ce319f5042c47c X-VCS-Branch: master Date: Sat, 23 Sep 2017 10:25:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 21fb72d4-4335-49b6-b751-5a1d75acfce6 X-Archives-Hash: 7e3e29e81ba51b15dea1c62df995c46e commit: a11f05faa23f8e59f59c6fdeb0ce319f5042c47c Author: Tim Harder gentoo org> AuthorDate: Sat Sep 23 10:21:38 2017 +0000 Commit: Tim Harder gentoo 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[@]}"