[gentoo-commits] repo/gentoo:master commit in: media-libs/jasper/

[David Seifert]

commit:     f18edb2a313dfbf9b1bb083fecae0edb40612a60
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 10:27:22 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 10:28:20 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f18edb2a

media-libs/jasper: Fix automagic logic

Gentoo-bug: 602186

Package-Manager: portage-2.3.3

 media-libs/jasper/jasper-2.0.5.ebuild | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/media-libs/jasper/jasper-2.0.5.ebuild 
b/media-libs/jasper/jasper-2.0.5.ebuild
index 0582d9c..5eb318c 100644
--- a/media-libs/jasper/jasper-2.0.5.ebuild
+++ b/media-libs/jasper/jasper-2.0.5.ebuild
@@ -41,18 +41,25 @@ DEPEND="${RDEPEND}
 
 multilib_src_configure() {
        local mycmakeargs=(
-               -DJAS_ENABLE_AUTOMATIC_DEPENDENCIES=OFF
                -DALLOW_IN_SOURCE_BUILD=OFF
                -DBASH_PROGRAM="${EPREFIX}"/bin/bash
                -DJAS_ENABLE_ASAN=OFF
-               -DJAS_ENABLE_LIBJPEG=$(usex jpeg)
                -DJAS_ENABLE_LSAN=OFF
                -DJAS_ENABLE_MSAN=OFF
-               -DJAS_ENABLE_OPENGL=$(usex opengl)
                -DJAS_ENABLE_SHARED=ON
                -DJAS_ENABLE_STRICT=ON
                -DJAS_ENABLE_USAN=OFF
                -DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}
+
+               # JPEG
+               -DJAS_ENABLE_LIBJPEG=$(usex jpeg)
+               -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
+
+               # OpenGL
+               -DJAS_ENABLE_OPENGL=$(usex opengl)
+               -DCMAKE_DISABLE_FIND_PACKAGE_OpenGL=$(usex !opengl)
+
+               # Doxygen
                -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc 
OFF ON)
        )
        cmake-utils_src_configure