1 |
commit: e78428586689a9d863a60353b2990f9967e595e5 |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Jul 3 23:26:47 2016 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jul 6 07:56:07 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e7842858 |
7 |
|
8 |
media-gfx/synnefo: Drop USE=qt5, make it unconditional |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
Signed-off-by: Johannes Huber <johu <AT> gentoo.org> |
13 |
|
14 |
media-gfx/synnefo/metadata.xml | 3 --- |
15 |
media-gfx/synnefo/synnefo-9999.ebuild | 35 +++++++++-------------------------- |
16 |
2 files changed, 9 insertions(+), 29 deletions(-) |
17 |
|
18 |
diff --git a/media-gfx/synnefo/metadata.xml b/media-gfx/synnefo/metadata.xml |
19 |
index 27f7827..d85e5ec 100644 |
20 |
--- a/media-gfx/synnefo/metadata.xml |
21 |
+++ b/media-gfx/synnefo/metadata.xml |
22 |
@@ -8,7 +8,4 @@ |
23 |
<upstream> |
24 |
<remote-id type="github">oyranos-cms/Synnefo</remote-id> |
25 |
</upstream> |
26 |
- <use> |
27 |
- <flag name="qt5">Build default Qt5 frontend (Qt4 fallback)</flag> |
28 |
- </use> |
29 |
</pkgmetadata> |
30 |
|
31 |
diff --git a/media-gfx/synnefo/synnefo-9999.ebuild b/media-gfx/synnefo/synnefo-9999.ebuild |
32 |
index 6e5ac63..baa0056 100644 |
33 |
--- a/media-gfx/synnefo/synnefo-9999.ebuild |
34 |
+++ b/media-gfx/synnefo/synnefo-9999.ebuild |
35 |
@@ -4,45 +4,28 @@ |
36 |
|
37 |
EAPI=6 |
38 |
|
39 |
+EGIT_REPO_URI="https://github.com/oyranos-cms/Synnefo.git" |
40 |
inherit cmake-utils |
41 |
+[[ ${PV} == "9999" ]] && inherit git-r3 |
42 |
|
43 |
DESCRIPTION="Qt front end for the Oyranos Color Management System" |
44 |
HOMEPAGE="https://github.com/oyranos-cms/Synnefo" |
45 |
-if [[ ${PV} == "9999" ]] ; then |
46 |
- EGIT_REPO_URI="https://github.com/oyranos-cms/Synnefo.git" |
47 |
- inherit git-r3 |
48 |
- KEYWORDS="" |
49 |
-else |
50 |
- SRC_URI="https://github.com/oyranos-cms/Synnefo/archive/${PV}.tar.gz -> ${P}.tar.gz" |
51 |
- KEYWORDS="~amd64 ~x86" |
52 |
-fi |
53 |
+[[ ${PV} == 9999 ]] || \ |
54 |
+SRC_URI="https://github.com/oyranos-cms/Synnefo/archive/${PV}.tar.gz -> ${P}.tar.gz" |
55 |
|
56 |
LICENSE="BSD-2" |
57 |
SLOT="0" |
58 |
-IUSE="qt5" |
59 |
+[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86" |
60 |
+IUSE="" |
61 |
|
62 |
DEPEND=" |
63 |
+ dev-qt/qtcore:5 |
64 |
+ dev-qt/qtgui:5 |
65 |
+ dev-qt/qtwidgets:5 |
66 |
>=media-libs/oyranos-0.9.6 |
67 |
- qt5? ( |
68 |
- dev-qt/qtcore:5 |
69 |
- dev-qt/qtgui:5 |
70 |
- dev-qt/qtwidgets:5 |
71 |
- ) |
72 |
- !qt5? ( |
73 |
- dev-qt/qtcore:4 |
74 |
- dev-qt/qtgui:4 |
75 |
- ) |
76 |
" |
77 |
RDEPEND="${DEPEND} |
78 |
x11-misc/xcalib |
79 |
" |
80 |
|
81 |
DOCS=( AUTHORS.md README.md ) |
82 |
- |
83 |
-src_configure() { |
84 |
- local mycmakeargs=( |
85 |
- -DUSE_Qt4=$(usex !qt5) |
86 |
- ) |
87 |
- |
88 |
- cmake-utils_src_configure |
89 |
-} |