1 |
commit: 2fc4e079f282541d41fa4e19d8c6bd43cff0c7de |
2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 27 17:47:36 2018 +0000 |
4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 27 17:48:42 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2fc4e079 |
7 |
|
8 |
gnome-extra/gnome-color-manager: do not check for exiv in packagekit |
9 |
|
10 |
Also cleanup vte related comments. Raise minimum dependency for gettext |
11 |
to meson required version and control tests via USE-flag since upstream |
12 |
is not bound to its understanding of autotools anymore. Drop unused |
13 |
libxslt dependency. Synchronize live ebuilds. |
14 |
|
15 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
16 |
Manifest-Sign-Key: 0x5A56C8CD0C13248A |
17 |
|
18 |
.../files/3.26-remove-unwanted-check.patch | 24 ++++++++ |
19 |
.../files/9999-remove-unwanted-check.patch | 24 ++++++++ |
20 |
.../gnome-color-manager-3.26.0.ebuild | 20 ++++--- |
21 |
.../gnome-color-manager-9999.ebuild | 64 ++++++++-------------- |
22 |
4 files changed, 83 insertions(+), 49 deletions(-) |
23 |
|
24 |
diff --git a/gnome-extra/gnome-color-manager/files/3.26-remove-unwanted-check.patch b/gnome-extra/gnome-color-manager/files/3.26-remove-unwanted-check.patch |
25 |
new file mode 100644 |
26 |
index 00000000..30658f2e |
27 |
--- /dev/null |
28 |
+++ b/gnome-extra/gnome-color-manager/files/3.26-remove-unwanted-check.patch |
29 |
@@ -0,0 +1,24 @@ |
30 |
+From dd43972782c34fe4d8925d52ae82d69add00493a Mon Sep 17 00:00:00 2001 |
31 |
+From: Gilles Dartiguelongue <eva@g.o> |
32 |
+Date: Sun, 27 May 2018 19:27:51 +0200 |
33 |
+Subject: [PATCH] Fix unwanted exiv check in packagekit option handling |
34 |
+ |
35 |
+--- |
36 |
+ meson.build | 1 - |
37 |
+ 1 file changed, 1 deletion(-) |
38 |
+ |
39 |
+diff --git a/meson.build b/meson.build |
40 |
+index dd0be0b..0721028 100644 |
41 |
+--- a/meson.build |
42 |
++++ b/meson.build |
43 |
+@@ -101,7 +101,6 @@ if get_option('enable-exiv') |
44 |
+ endif |
45 |
+ |
46 |
+ if get_option('enable-packagekit') |
47 |
+- libexiv = dependency('exiv2') |
48 |
+ conf.set('HAVE_PACKAGEKIT', '1') |
49 |
+ endif |
50 |
+ |
51 |
+-- |
52 |
+2.17.0 |
53 |
+ |
54 |
|
55 |
diff --git a/gnome-extra/gnome-color-manager/files/9999-remove-unwanted-check.patch b/gnome-extra/gnome-color-manager/files/9999-remove-unwanted-check.patch |
56 |
new file mode 100644 |
57 |
index 00000000..b3113474 |
58 |
--- /dev/null |
59 |
+++ b/gnome-extra/gnome-color-manager/files/9999-remove-unwanted-check.patch |
60 |
@@ -0,0 +1,24 @@ |
61 |
+From 534eed4f8664c9f263d666ed78144c37dc05bf90 Mon Sep 17 00:00:00 2001 |
62 |
+From: Gilles Dartiguelongue <eva@g.o> |
63 |
+Date: Sun, 27 May 2018 19:27:51 +0200 |
64 |
+Subject: [PATCH] Fix unwanted exiv check in packagekit option handling |
65 |
+ |
66 |
+--- |
67 |
+ meson.build | 1 - |
68 |
+ 1 file changed, 1 deletion(-) |
69 |
+ |
70 |
+diff --git a/meson.build b/meson.build |
71 |
+index 9e179fb..08a0f79 100644 |
72 |
+--- a/meson.build |
73 |
++++ b/meson.build |
74 |
+@@ -108,7 +108,6 @@ if get_option('exiv') |
75 |
+ endif |
76 |
+ |
77 |
+ if get_option('packagekit') |
78 |
+- libexiv = dependency('exiv2') |
79 |
+ conf.set('HAVE_PACKAGEKIT', '1') |
80 |
+ endif |
81 |
+ |
82 |
+-- |
83 |
+2.17.0 |
84 |
+ |
85 |
|
86 |
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.26.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.26.0.ebuild |
87 |
index f317d6a3..9c49479f 100644 |
88 |
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.26.0.ebuild |
89 |
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.26.0.ebuild |
90 |
@@ -10,9 +10,10 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-color-manager" |
91 |
LICENSE="GPL-2+" |
92 |
SLOT="0" |
93 |
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
94 |
-IUSE="packagekit raw" |
95 |
-# FIXME: libvte atomagic |
96 |
+IUSE="packagekit raw test" |
97 |
+ |
98 |
# Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331 |
99 |
+# vte could be made optional |
100 |
RDEPEND=" |
101 |
>=dev-libs/glib-2.31.10:2 |
102 |
>=media-libs/lcms-2.2:2 |
103 |
@@ -25,8 +26,6 @@ RDEPEND=" |
104 |
>=x11-misc/colord-1.3.1:0= |
105 |
>=x11-libs/colord-gtk-0.1.20 |
106 |
|
107 |
- x11-libs/vte:2.91 |
108 |
- |
109 |
packagekit? ( app-admin/packagekit-base ) |
110 |
raw? ( media-gfx/exiv2:0= ) |
111 |
" |
112 |
@@ -35,19 +34,22 @@ DEPEND="${RDEPEND} |
113 |
app-text/docbook-sgml-dtd:4.1 |
114 |
app-text/docbook-sgml-utils |
115 |
dev-libs/appstream-glib |
116 |
- dev-libs/libxslt |
117 |
dev-util/itstool |
118 |
- >=sys-devel/gettext-0.19.7 |
119 |
+ >=sys-devel/gettext-0.19.8 |
120 |
virtual/pkgconfig |
121 |
" |
122 |
|
123 |
+PATCHES=( |
124 |
+ # https://bugzilla.gnome.org/show_bug.cgi?id=796428 |
125 |
+ "${FILESDIR}"/3.26-remove-unwanted-check.patch |
126 |
+) |
127 |
+ |
128 |
src_configure() { |
129 |
# Always enable tests since they are check_PROGRAMS anyway |
130 |
- # appstream does not want to be relax by default ! |
131 |
gnome-meson_src_configure \ |
132 |
- -Denable-tests=true \ |
133 |
$(meson_use raw enable-exiv) \ |
134 |
- $(meson_use packagekit enable-packagekit) |
135 |
+ $(meson_use packagekit enable-packagekit) \ |
136 |
+ $(meson_use test enable-tests) |
137 |
} |
138 |
|
139 |
src_test() { |
140 |
|
141 |
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-9999.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-9999.ebuild |
142 |
index 632e7706..55635ddf 100644 |
143 |
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-9999.ebuild |
144 |
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-9999.ebuild |
145 |
@@ -1,29 +1,22 @@ |
146 |
-# Copyright 1999-2015 Gentoo Foundation |
147 |
+# Copyright 1999-2018 Gentoo Foundation |
148 |
# Distributed under the terms of the GNU General Public License v2 |
149 |
-# $Id$ |
150 |
|
151 |
-EAPI="5" |
152 |
-GCONF_DEBUG="no" |
153 |
- |
154 |
-inherit gnome2 virtualx |
155 |
-if [[ ${PV} = 9999 ]]; then |
156 |
- inherit gnome2-live |
157 |
-fi |
158 |
+EAPI=6 |
159 |
+inherit git-r3 gnome-meson virtualx |
160 |
|
161 |
DESCRIPTION="Color profile manager for the GNOME desktop" |
162 |
HOMEPAGE="https://git.gnome.org/browse/gnome-color-manager" |
163 |
+SRC_URI="" |
164 |
+EGIT_MODULE="https://git.gnome.org/gnome-color-manager" |
165 |
|
166 |
LICENSE="GPL-2+" |
167 |
SLOT="0" |
168 |
-if [[ ${PV} = 9999 ]]; then |
169 |
- KEYWORDS="" |
170 |
-else |
171 |
- KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" |
172 |
-fi |
173 |
-IUSE="packagekit raw" |
174 |
+KEYWORDS="" |
175 |
+IUSE="packagekit raw test" |
176 |
|
177 |
# Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331 |
178 |
-COMMON_DEPEND=" |
179 |
+# vte could be made optional |
180 |
+RDEPEND=" |
181 |
>=dev-libs/glib-2.31.10:2 |
182 |
>=media-libs/lcms-2.2:2 |
183 |
>=media-libs/libcanberra-0.10[gtk3] |
184 |
@@ -32,50 +25,41 @@ COMMON_DEPEND=" |
185 |
|
186 |
>=x11-libs/gtk+-3.3.8:3 |
187 |
>=x11-libs/vte-0.25.1:2.91 |
188 |
- >=x11-misc/colord-0.1.34:0= |
189 |
+ >=x11-misc/colord-1.3.1:0= |
190 |
>=x11-libs/colord-gtk-0.1.20 |
191 |
|
192 |
packagekit? ( app-admin/packagekit-base ) |
193 |
- raw? ( media-gfx/exiv2 ) |
194 |
+ raw? ( media-gfx/exiv2:0= ) |
195 |
" |
196 |
-RDEPEND="${COMMON_DEPEND}" |
197 |
- |
198 |
# docbook-sgml-{utils,dtd:4.1} needed to generate man pages |
199 |
-DEPEND="${COMMON_DEPEND} |
200 |
+DEPEND="${RDEPEND} |
201 |
app-text/docbook-sgml-dtd:4.1 |
202 |
app-text/docbook-sgml-utils |
203 |
dev-libs/appstream-glib |
204 |
- dev-libs/libxslt |
205 |
- >=dev-util/intltool-0.35 |
206 |
+ dev-util/itstool |
207 |
+ >=sys-devel/gettext-0.19.8 |
208 |
virtual/pkgconfig |
209 |
" |
210 |
|
211 |
-if [[ ${PV} = 9999 ]]; then |
212 |
- DEPEND="${DEPEND} |
213 |
- app-text/yelp-tools" |
214 |
-fi |
215 |
+PATCHES=( |
216 |
+ # https://bugzilla.gnome.org/show_bug.cgi?id=796428 |
217 |
+ "${FILESDIR}"/9999-remove-unwanted-check.patch |
218 |
+) |
219 |
|
220 |
src_configure() { |
221 |
- local myconf="" |
222 |
- [[ ${PV} != 9999 ]] && myconf="${myconf} ITSTOOL=$(type -P true)" |
223 |
- |
224 |
# Always enable tests since they are check_PROGRAMS anyway |
225 |
- # appstream does not want to be relax by default ! |
226 |
- gnome2_src_configure \ |
227 |
- --disable-static \ |
228 |
- --enable-tests \ |
229 |
- $(use_enable packagekit) \ |
230 |
- $(use_enable raw exiv) \ |
231 |
- APPSTREAM_UTIL=$(type -P true) \ |
232 |
- ${myconf} |
233 |
+ gnome-meson_src_configure \ |
234 |
+ $(meson_use raw enable-exiv) \ |
235 |
+ $(meson_use packagekit enable-packagekit) \ |
236 |
+ $(meson_use test enable-tests) |
237 |
} |
238 |
|
239 |
src_test() { |
240 |
- Xemake check |
241 |
+ virtx meson_src_test |
242 |
} |
243 |
|
244 |
pkg_postinst() { |
245 |
- gnome2_pkg_postinst |
246 |
+ gnome-meson_pkg_postinst |
247 |
|
248 |
if ! has_version media-gfx/argyllcms ; then |
249 |
elog "If you want to do display or scanner calibration, you will need to" |