commit: 19c3f586c801c32054718525defffa129cadf9bd Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Oct 1 19:31:48 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <AT> gmail.com> Closes: https://bugs.gentoo.org/605750 Signed-off-by: Andreas Sturmlechner <asturm <AT> 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