1 |
commit: 24b5976fcd99ff7aea9c4730f5026be0135eed59 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 29 20:17:36 2016 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 29 22:02:07 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24b5976f |
7 |
|
8 |
media-libs/oyranos: Fix and sort DEPENDs |
9 |
|
10 |
Drop sourceforge from metadata. |
11 |
Shorter DESCRIPTION to make repoman happy. |
12 |
|
13 |
Package-Manager: portage-2.3.0 |
14 |
|
15 |
media-libs/oyranos/metadata.xml | 1 - |
16 |
media-libs/oyranos/oyranos-9999.ebuild | 57 +++++++++++++++++++++------------- |
17 |
2 files changed, 35 insertions(+), 23 deletions(-) |
18 |
|
19 |
diff --git a/media-libs/oyranos/metadata.xml b/media-libs/oyranos/metadata.xml |
20 |
index ab7ceb6..390440d 100644 |
21 |
--- a/media-libs/oyranos/metadata.xml |
22 |
+++ b/media-libs/oyranos/metadata.xml |
23 |
@@ -7,6 +7,5 @@ |
24 |
</maintainer> |
25 |
<upstream> |
26 |
<remote-id type="github">oyranos-cms/oyranos</remote-id> |
27 |
- <remote-id type="sourceforge">oyranos</remote-id> |
28 |
</upstream> |
29 |
</pkgmetadata> |
30 |
|
31 |
diff --git a/media-libs/oyranos/oyranos-9999.ebuild b/media-libs/oyranos/oyranos-9999.ebuild |
32 |
index 54c4b49..276d782 100644 |
33 |
--- a/media-libs/oyranos/oyranos-9999.ebuild |
34 |
+++ b/media-libs/oyranos/oyranos-9999.ebuild |
35 |
@@ -2,11 +2,11 @@ |
36 |
# Distributed under the terms of the GNU General Public License v2 |
37 |
# $Id$ |
38 |
|
39 |
-EAPI=5 |
40 |
+EAPI=6 |
41 |
|
42 |
inherit cmake-multilib flag-o-matic git-r3 |
43 |
|
44 |
-DESCRIPTION="Colour management system allowing to share various settings across applications and services" |
45 |
+DESCRIPTION="Colour management system allowing to share settings across apps and services" |
46 |
HOMEPAGE="http://www.oyranos.org/" |
47 |
EGIT_REPO_URI="https://github.com/${PN}-cms/${PN}.git" |
48 |
|
49 |
@@ -19,26 +19,38 @@ IUSE="X cairo cups doc exif fltk jpeg qt4 qt5 raw scanner test tiff" |
50 |
|
51 |
COMMON_DEPEND=" |
52 |
>=app-admin/elektra-0.8.4:0[${MULTILIB_USEDEP}] |
53 |
- >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] |
54 |
+ dev-libs/libxml2[${MULTILIB_USEDEP}] |
55 |
>=dev-libs/yajl-2.0.4-r1[${MULTILIB_USEDEP}] |
56 |
- >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] |
57 |
- >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] |
58 |
+ media-libs/lcms:2[${MULTILIB_USEDEP}] |
59 |
+ media-libs/libpng:0=[${MULTILIB_USEDEP}] |
60 |
>=media-libs/libXcm-0.5.3[${MULTILIB_USEDEP}] |
61 |
- cairo? ( >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}] ) |
62 |
- cups? ( >=net-print/cups-1.7.1-r1[${MULTILIB_USEDEP}] ) |
63 |
- exif? ( >=media-gfx/exiv2-0.23-r2:=[${MULTILIB_USEDEP}] ) |
64 |
+ media-libs/openicc[${MULTILIB_USEDEP}] |
65 |
+ cairo? ( x11-libs/cairo[${MULTILIB_USEDEP}] ) |
66 |
+ cups? ( net-print/cups[${MULTILIB_USEDEP}] ) |
67 |
+ exif? ( media-gfx/exiv2:=[${MULTILIB_USEDEP}] ) |
68 |
fltk? ( x11-libs/fltk:1 ) |
69 |
jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] ) |
70 |
qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) |
71 |
- qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) |
72 |
- raw? ( >=media-libs/libraw-0.15.4[${MULTILIB_USEDEP}] ) |
73 |
+ qt5? ( |
74 |
+ dev-qt/qtcore:5 |
75 |
+ dev-qt/qtgui:5 |
76 |
+ dev-qt/qtsvg:5 |
77 |
+ dev-qt/qtwidgets:5 |
78 |
+ dev-qt/qtx11extras:5 |
79 |
+ dev-qt/qtxml:5 |
80 |
+ ) |
81 |
+ raw? ( media-libs/libraw[${MULTILIB_USEDEP}] ) |
82 |
scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] ) |
83 |
tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) |
84 |
- X? ( x11-libs/libX11[${MULTILIB_USEDEP}] |
85 |
- >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] |
86 |
- >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] |
87 |
- >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] |
88 |
- >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}] )" |
89 |
+ X? ( |
90 |
+ x11-libs/libX11[${MULTILIB_USEDEP}] |
91 |
+ x11-libs/libXfixes[${MULTILIB_USEDEP}] |
92 |
+ x11-libs/libXinerama[${MULTILIB_USEDEP}] |
93 |
+ x11-libs/libXmu[${MULTILIB_USEDEP}] |
94 |
+ x11-libs/libXrandr[${MULTILIB_USEDEP}] |
95 |
+ x11-libs/libXxf86vm[${MULTILIB_USEDEP}] |
96 |
+ ) |
97 |
+" |
98 |
DEPEND="${COMMON_DEPEND} |
99 |
doc? ( |
100 |
app-doc/doxygen |
101 |
@@ -50,7 +62,7 @@ RDEPEND="${COMMON_DEPEND} |
102 |
|
103 |
REQUIRED_USE="qt4? ( X ) qt5? ( X )" |
104 |
|
105 |
-DOCS=( AUTHORS.md ChangeLog.md README.md ) |
106 |
+DOCS=( {AUTHORS,ChangeLog,README}.md ) |
107 |
RESTRICT="test" |
108 |
|
109 |
MULTILIB_CHOST_TOOLS=( |
110 |
@@ -64,7 +76,7 @@ CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindFltk FindXcm FindCUP |
111 |
|
112 |
src_prepare() { |
113 |
einfo remove bundled libs |
114 |
- rm -rf elektra* yajl || die |
115 |
+ rm -r yajl || die |
116 |
|
117 |
if use fltk ; then |
118 |
#src/examples does not include fltk flags |
119 |
@@ -79,20 +91,21 @@ multilib_src_configure() { |
120 |
local libdir=$(get_libdir) |
121 |
local mycmakeargs=( |
122 |
-DLIB_SUFFIX=${libdir#lib} |
123 |
- -DUSE_SYSTEM_ELEKTRA=YES |
124 |
- -DUSE_SYSTEM_YAJL=YES |
125 |
+ -DUSE_SYSTEM_ELEKTRA=ON |
126 |
+ -DUSE_SYSTEM_YAJL=ON |
127 |
+ -DUSE_SYSTEM_LIBXCM=ON |
128 |
-DCMAKE_DISABLE_FIND_PACKAGE_Cairo=$(usex '!cairo') |
129 |
-DCMAKE_DISABLE_FIND_PACKAGE_Cups=$(usex '!cups') |
130 |
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(usex '!doc') |
131 |
-DCMAKE_DISABLE_FIND_PACKAGE_Exif2=$(usex '!exif') |
132 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_Fltk=$(multilib_native_usex fltk OFF ON) |
133 |
-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex '!jpeg') |
134 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt4=$(multilib_native_usex qt4 OFF ON) |
135 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=$(multilib_native_usex qt5 OFF ON) |
136 |
-DCMAKE_DISABLE_FIND_PACKAGE_LibRaw=$(usex '!raw') |
137 |
-DCMAKE_DISABLE_FIND_PACKAGE_Sane=$(usex '!scanner') |
138 |
-DCMAKE_DISABLE_FIND_PACKAGE_TIFF=$(usex '!tiff') |
139 |
-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex '!X') |
140 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Fltk=$(multilib_native_usex fltk OFF ON) |
141 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt4=$(multilib_native_usex qt4 OFF ON) |
142 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=$(multilib_native_usex qt5 OFF ON) |
143 |
) |
144 |
|
145 |
cmake-utils_src_configure |