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

[David Seifert]

commit:     ab9104d75ad339c38d066df8bf7034f788d68bda
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 21:30:17 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 21:32:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab9104d7

media-libs/jasper: Update live ebuild

Package-Manager: portage-2.3.3

 media-libs/jasper/jasper-9999.ebuild | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/media-libs/jasper/jasper-9999.ebuild 
b/media-libs/jasper/jasper-9999.ebuild
index 3ce95c9..edd5894 100644
--- a/media-libs/jasper/jasper-9999.ebuild
+++ b/media-libs/jasper/jasper-9999.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}
+               -DCMAKE_INSTALL_DOCDIR=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