Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/oyranos/
Date: Sun, 09 Feb 2020 19:35:59
Message-Id: 1581276935.17c22822b76d61e4958bc379722fd0f29ddd8575.asturm@gentoo
1 commit: 17c22822b76d61e4958bc379722fd0f29ddd8575
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 9 19:35:35 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 9 19:35:35 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17c22822
7
8 media-libs/oyranos: Drop USE qt5, broken by Qt 5.14
9
10 Closes: https://bugs.gentoo.org/703528
11 Package-Manager: Portage-2.3.87, Repoman-2.3.20
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 media-libs/oyranos/oyranos-0.9.6-r1.ebuild | 16 ++++------------
15 1 file changed, 4 insertions(+), 12 deletions(-)
16
17 diff --git a/media-libs/oyranos/oyranos-0.9.6-r1.ebuild b/media-libs/oyranos/oyranos-0.9.6-r1.ebuild
18 index 4eee55d10f7..26ac4c25916 100644
19 --- a/media-libs/oyranos/oyranos-0.9.6-r1.ebuild
20 +++ b/media-libs/oyranos/oyranos-0.9.6-r1.ebuild
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2019 Gentoo Authors
23 +# Copyright 1999-2020 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI=6
27 @@ -19,9 +19,9 @@ HOMEPAGE="https://www.oyranos.org/"
28
29 LICENSE="BSD"
30 SLOT="0"
31 -IUSE="cairo cups doc examples exif fltk jpeg qt5 raw scanner static-libs test tiff X"
32 +IUSE="cairo cups doc examples exif fltk jpeg raw scanner static-libs test tiff X"
33
34 -REQUIRED_USE="qt5? ( X ) test? ( static-libs )"
35 +REQUIRED_USE="test? ( static-libs )"
36
37 COMMON_DEPEND="
38 app-admin/elektra
39 @@ -36,14 +36,6 @@ COMMON_DEPEND="
40 exif? ( media-gfx/exiv2:= )
41 fltk? ( x11-libs/fltk:1 )
42 jpeg? ( virtual/jpeg:0 )
43 - qt5? (
44 - dev-qt/qtcore:5
45 - dev-qt/qtgui:5
46 - dev-qt/qtsvg:5
47 - dev-qt/qtwidgets:5
48 - dev-qt/qtx11extras:5
49 - dev-qt/qtxml:5
50 - )
51 raw? ( media-libs/libraw )
52 scanner? ( media-gfx/sane-backends )
53 tiff? ( media-libs/tiff:0 )
54 @@ -96,7 +88,7 @@ src_configure() {
55 -DCMAKE_DISABLE_FIND_PACKAGE_Exif2=$(usex !exif)
56 -DCMAKE_DISABLE_FIND_PACKAGE_FLTK=$(usex !fltk)
57 -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
58 - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=$(usex !qt5)
59 + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON
60 -DCMAKE_DISABLE_FIND_PACKAGE_LibRaw=$(usex !raw)
61 -DCMAKE_DISABLE_FIND_PACKAGE_Sane=$(usex !scanner)
62 -DENABLE_STATIC_LIBS=$(usex static-libs)