commit:     0115b3ddf062208a29e11acfd1a2125e1b4886e8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  1 01:06:44 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 18:05:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0115b3dd

media-libs/oyranos: Add USE=examples,static-libs, drop USE=qt4

Adapt to recent upstream changes. Reducing REQUIRED_USE pains.

Package-Manager: portage-2.3.0

Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

 media-libs/oyranos/oyranos-9999.ebuild | 47 +++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/media-libs/oyranos/oyranos-9999.ebuild 
b/media-libs/oyranos/oyranos-9999.ebuild
index 276d782..e752203 100644
--- a/media-libs/oyranos/oyranos-9999.ebuild
+++ b/media-libs/oyranos/oyranos-9999.ebuild
@@ -1,19 +1,27 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=6
 
-inherit cmake-multilib flag-o-matic git-r3
+if [[ ${PV} = *9999 ]]; then
+       GITECLASS="git-r3"
+       EGIT_REPO_URI="https://github.com/${PN}-cms/${PN}.git";
+fi
+inherit cmake-multilib flag-o-matic ${GITECLASS}
+unset GITECLASS
 
 DESCRIPTION="Colour management system allowing to share settings across apps 
and services"
 HOMEPAGE="http://www.oyranos.org/";
-EGIT_REPO_URI="https://github.com/${PN}-cms/${PN}.git";
+[[ ${PV} != *9999 ]] && \
+SRC_URI="https://github.com/${PN}-cms/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
 
 KEYWORDS=""
 LICENSE="BSD"
 SLOT="0"
-IUSE="X cairo cups doc exif fltk jpeg qt4 qt5 raw scanner test tiff"
+IUSE="X cairo cups doc examples exif fltk jpeg qt5 raw scanner static-libs 
test tiff"
+
+REQUIRED_USE="qt5? ( X ) test? ( static-libs )"
 
 #OY_LINGUAS="cs;de;eo;eu;fr;ru" #TODO
 
@@ -23,14 +31,13 @@ COMMON_DEPEND="
        >=dev-libs/yajl-2.0.4-r1[${MULTILIB_USEDEP}]
        media-libs/lcms:2[${MULTILIB_USEDEP}]
        media-libs/libpng:0=[${MULTILIB_USEDEP}]
-       >=media-libs/libXcm-0.5.3[${MULTILIB_USEDEP}]
+       >=media-libs/libXcm-0.5.4[${MULTILIB_USEDEP}]
        media-libs/openicc[${MULTILIB_USEDEP}]
        cairo? ( x11-libs/cairo[${MULTILIB_USEDEP}] )
        cups? ( net-print/cups[${MULTILIB_USEDEP}] )
        exif? ( media-gfx/exiv2:=[${MULTILIB_USEDEP}] )
        fltk? ( x11-libs/fltk:1 )
        jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-       qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
        qt5? (
                dev-qt/qtcore:5
                dev-qt/qtgui:5
@@ -60,8 +67,6 @@ RDEPEND="${COMMON_DEPEND}
        media-libs/icc-profiles-basiccolor-printing2009
        media-libs/icc-profiles-openicc"
 
-REQUIRED_USE="qt4? ( X ) qt5? ( X )"
-
 DOCS=( {AUTHORS,ChangeLog,README}.md )
 RESTRICT="test"
 
@@ -72,38 +77,34 @@ MULTILIB_WRAPPED_HEADERS=(
        /usr/include/oyranos/oyranos_version.h
 )
 
-CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindFltk FindXcm 
FindCUPS"
+CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindXcm FindCUPS"
 
 src_prepare() {
        einfo remove bundled libs
-       rm -r yajl || die
-
-       if use fltk ; then
-               #src/examples does not include fltk flags
-               append-cflags $(fltk-config --cflags)
-               append-cxxflags $(fltk-config --cxxflags)
-       fi
-
+       rm -r libxcm openicc yajl || die
        cmake-utils_src_prepare
 }
 
 multilib_src_configure() {
-       local libdir=$(get_libdir)
        local mycmakeargs=(
-               -DLIB_SUFFIX=${libdir#lib}
+               -DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
                -DUSE_SYSTEM_ELEKTRA=ON
-               -DUSE_SYSTEM_YAJL=ON
                -DUSE_SYSTEM_LIBXCM=ON
+               -DUSE_SYSTEM_OPENICC=ON
+               -DUSE_SYSTEM_YAJL=ON
+               -DCMAKE_DISABLE_FIND_PACKAGE_Qt4=ON
                -DCMAKE_DISABLE_FIND_PACKAGE_Cairo=$(usex '!cairo')
                -DCMAKE_DISABLE_FIND_PACKAGE_Cups=$(usex '!cups')
-               -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(usex '!doc')
+               -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc 
OFF ON)
+               -DENABLE_EXAMPLES=$(usex examples)
                -DCMAKE_DISABLE_FIND_PACKAGE_Exif2=$(usex '!exif')
-               -DCMAKE_DISABLE_FIND_PACKAGE_Fltk=$(multilib_native_usex fltk 
OFF ON)
+               -DCMAKE_DISABLE_FIND_PACKAGE_FLTK=$(multilib_native_usex fltk 
OFF ON)
                -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex '!jpeg')
-               -DCMAKE_DISABLE_FIND_PACKAGE_Qt4=$(multilib_native_usex qt4 OFF 
ON)
                -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=$(multilib_native_usex qt5 OFF 
ON)
                -DCMAKE_DISABLE_FIND_PACKAGE_LibRaw=$(usex '!raw')
                -DCMAKE_DISABLE_FIND_PACKAGE_Sane=$(usex '!scanner')
+               -DENABLE_STATIC_LIBS=$(usex static-libs)
+               -DENABLE_TESTS=$(usex test)
                -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=$(usex '!tiff')
                -DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex '!X')
        )

Reply via email to