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 14098138334 for ; Mon, 1 Oct 2018 20:08:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 31A3BE094F; Mon, 1 Oct 2018 20:08:38 +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 04978E094F for ; Mon, 1 Oct 2018 20:08:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 C4FF0335C38 for ; Mon, 1 Oct 2018 20:08:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 337D342D for ; Mon, 1 Oct 2018 20:08:35 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1538424499.19c3f586c801c32054718525defffa129cadf9bd.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/aubio/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/aubio/aubio-0.4.7.ebuild X-VCS-Directories: media-libs/aubio/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 19c3f586c801c32054718525defffa129cadf9bd X-VCS-Branch: master Date: Mon, 1 Oct 2018 20:08:35 +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: bf6b9ed0-40c9-4180-af7b-d8d7a2865c28 X-Archives-Hash: c47971fc4e0a50a8286b20b52b5460e4 commit: 19c3f586c801c32054718525defffa129cadf9bd Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Oct 1 19:31:48 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Oct 1 20:08:19 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19c3f586 media-libs/aubio: Fix USE flag conflicts Thanks-to: ak <4nykey gmail.com> Closes: https://bugs.gentoo.org/605750 Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.50, Repoman-2.3.11 media-libs/aubio/aubio-0.4.7.ebuild | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/media-libs/aubio/aubio-0.4.7.ebuild b/media-libs/aubio/aubio-0.4.7.ebuild index 0592ffa0a50..a7d7db9a590 100644 --- a/media-libs/aubio/aubio-0.4.7.ebuild +++ b/media-libs/aubio/aubio-0.4.7.ebuild @@ -37,7 +37,9 @@ DEPEND="${RDEPEND} virtual/pkgconfig doc? ( app-doc/doxygen ) " -REQUIRED_USE="${PYTHON_REQUIRED_USE}" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + ?? ( double-precision libsamplerate ) +" DOCS=( AUTHORS ChangeLog README.md ) PYTHON_SRC_DIR="${S}" @@ -49,16 +51,19 @@ src_prepare() { src_configure() { python_setup - waf-utils_src_configure \ - --enable-complex \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - $(use_enable double-precision double) \ - $(use_enable fftw fftw3f) \ - $(use_enable fftw fftw3) \ - $(use_enable ffmpeg avcodec) \ - $(use_enable jack) \ - $(use_enable libsamplerate samplerate) \ + local mywafconfargs=( + --enable-complex + --docdir="${EPREFIX}"/usr/share/doc/${PF} + $(use_enable double-precision double) + $(use_enable fftw fftw3) + $(use_enable ffmpeg avcodec) + $(use_enable jack) + $(use_enable libsamplerate samplerate) $(use_enable sndfile) + ) + use double-precision || mywafconfargs+=( $(use_enable fftw fftw3f) ) + + waf-utils_src_configure "${mywafconfargs[@]}" if use python ; then cd "${PYTHON_SRC_DIR}" || die