Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/colord/
Date: Mon, 30 Oct 2017 22:26:24
Message-Id: 1509402338.17f90a3c6fcb7752ae71bf57c14e986924cdd21c.leio@gentoo
1 commit: 17f90a3c6fcb7752ae71bf57c14e986924cdd21c
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 30 21:22:56 2017 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 30 22:25:38 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17f90a3c
7
8 x11-misc/colord: remove old
9
10 Package-Manager: Portage-2.3.8, Repoman-2.3.2
11
12 x11-misc/colord/Manifest | 2 -
13 x11-misc/colord/colord-1.2.12.ebuild | 170 -----------------------------------
14 x11-misc/colord/colord-1.3.3.ebuild | 161 ---------------------------------
15 3 files changed, 333 deletions(-)
16
17 diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
18 index f78d96089bb..be5a1af63ea 100644
19 --- a/x11-misc/colord/Manifest
20 +++ b/x11-misc/colord/Manifest
21 @@ -1,3 +1 @@
22 -DIST colord-1.2.12.tar.xz 1214992 SHA256 d5241864c16a37f9e40d38d5009255456495a67f170ce0dc9250774442d68c3a SHA512 5ce8f4fd10b92ec0cb54a05017ab050753381663a43e40d959606bb5f71ddce5456a3d67f8ce0538a2c945136834c66615f3615fdfb3e1eaaf5f5ca7a9e9c4eb WHIRLPOOL 5b04acfc8de34758252f0215371f75b9ccab8f80194a9624d6b4c3651929266032f3e9e1e05b48fb82572891e93d6082739c022b2624978b0f8ece7e323e1b48
23 -DIST colord-1.3.3.tar.xz 1240104 SHA256 d1848e797106a036b0d6ebed99a789a6ae07d60f1d9cc59be5b257efe7ec31a4 SHA512 12ebeec00e5a5fd43fbcd97cb2cd725f300843b3c12559fbf0d41f50fc4a80e89c1b5814502c60d92b09a3fb5b0ada9c76a723f89640262a511448085199fb8d WHIRLPOOL 18385812f9fc1f0dcf54c447ba82bf67eececbeda1f1aa15b1fe6792bc1ff1fd8787f9af31530119765518cd20633c4b2574b4d37eb44638ad02a3944b8390d1
24 DIST colord-1.3.4.tar.xz 1259256 SHA256 7e79ba022148900da7c72033f8232eefeab8373da25768f4b32f5aeba53b2238 SHA512 5556cc12cc72bceefd075274a1734b884e88b1a0777f7efde15118cf5d1597aa12c44680bc814dd230f39f39c9ea2dd309bc79170b19ca782488b90cda631937 WHIRLPOOL 3a74fb4a04d959efbda0d180747a90d4dcf10d2e4492d561d70e2c9316868c2c5d899b8e9fe9aab93476e4a58b4f6ab0269d7286061ec67f5ea9efb9240b4626
25
26 diff --git a/x11-misc/colord/colord-1.2.12.ebuild b/x11-misc/colord/colord-1.2.12.ebuild
27 deleted file mode 100644
28 index 9001e282150..00000000000
29 --- a/x11-misc/colord/colord-1.2.12.ebuild
30 +++ /dev/null
31 @@ -1,170 +0,0 @@
32 -# Copyright 1999-2015 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI="5"
36 -GCONF_DEBUG="no"
37 -GNOME2_LA_PUNT="yes"
38 -VALA_USE_DEPEND="vapigen"
39 -
40 -inherit autotools bash-completion-r1 check-reqs eutils gnome2 user systemd udev vala multilib-minimal
41 -
42 -DESCRIPTION="System service to accurately color manage input and output devices"
43 -HOMEPAGE="https://www.freedesktop.org/software/colord/"
44 -SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
45 -
46 -LICENSE="GPL-2+"
47 -SLOT="0/2" # subslot = libcolord soname version
48 -KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
49 -
50 -# We prefer policykit enabled by default, bug #448058
51 -IUSE="argyllcms examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala"
52 -REQUIRED_USE="
53 - gusb? ( udev )
54 - scanner? ( udev )
55 - vala? ( introspection )
56 -"
57 -
58 -COMMON_DEPEND="
59 - dev-db/sqlite:3=
60 - >=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
61 - >=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}]
62 - argyllcms? ( media-gfx/argyllcms )
63 - gusb? ( >=dev-libs/libgusb-0.2.2[introspection?,${MULTILIB_USEDEP}] )
64 - introspection? ( >=dev-libs/gobject-introspection-0.9.8:= )
65 - policykit? ( >=sys-auth/polkit-0.103 )
66 - scanner? (
67 - media-gfx/sane-backends
68 - sys-apps/dbus )
69 - systemd? ( >=sys-apps/systemd-44:0= )
70 - udev? (
71 - virtual/udev
72 - virtual/libgudev:=
73 - virtual/libudev:=[${MULTILIB_USEDEP}]
74 - )
75 -"
76 -RDEPEND="${COMMON_DEPEND}
77 - !media-gfx/shared-color-profiles
78 - !<=media-gfx/colorhug-client-0.1.13
79 -"
80 -DEPEND="${COMMON_DEPEND}
81 - dev-libs/libxslt
82 - >=dev-util/gtk-doc-am-1.9
83 - >=dev-util/intltool-0.35
84 - >=sys-devel/gettext-0.17
85 - virtual/pkgconfig[${MULTILIB_USEDEP}]
86 - extra-print-profiles? ( media-gfx/argyllcms )
87 - vala? ( $(vala_depend) )
88 -"
89 -
90 -# FIXME: needs pre-installed dbus service files
91 -RESTRICT="test"
92 -
93 -# According to upstream comment in colord.spec.in, building the extra print
94 -# profiles requires >=4G of memory
95 -CHECKREQS_MEMORY="4G"
96 -
97 -pkg_pretend() {
98 - use extra-print-profiles && check-reqs_pkg_pretend
99 -}
100 -
101 -pkg_setup() {
102 - use extra-print-profiles && check-reqs_pkg_setup
103 - enewgroup colord
104 - enewuser colord -1 -1 /var/lib/colord colord
105 -}
106 -
107 -src_prepare() {
108 - # Adapt to Gentoo paths
109 - sed -i -e 's/spotread/argyll-spotread/' \
110 - src/sensors/cd-sensor-argyll.c \
111 - configure.ac || die
112 -
113 - eautoreconf
114 - use vala && vala_src_prepare
115 - gnome2_src_prepare
116 -}
117 -
118 -multilib_src_configure() {
119 - # Reverse tools require gusb
120 - # bash-completion test does not work on gentoo
121 - local myconf=(
122 - --disable-bash-completion
123 - --disable-examples
124 - --disable-static
125 - --enable-libcolordcompat
126 - --with-daemon-user=colord
127 - --localstatedir="${EPREFIX}"/var
128 - $(multilib_native_use_enable argyllcms argyllcms-sensor)
129 - $(multilib_native_use_enable extra-print-profiles print-profiles)
130 - $(multilib_native_usex extra-print-profiles COLPROF="$(type -P argyll-colprof)" "")
131 - $(use_enable gusb)
132 - $(multilib_native_use_enable gusb reverse)
133 - $(multilib_native_use_enable introspection)
134 - $(multilib_native_use_enable policykit polkit)
135 - $(multilib_native_use_enable scanner sane)
136 - $(multilib_native_use_enable systemd systemd-login)
137 - $(use_enable udev)
138 - --with-udevrulesdir="$(get_udevdir)"/rules.d
139 - $(multilib_native_use_enable vala)
140 - "$(systemd_with_unitdir)"
141 - )
142 -
143 - if ! multilib_is_native_abi; then
144 - # disable some extraneous checks
145 - myconf+=(
146 - SQLITE_{CFLAGS,LIBS}=' '
147 - GUDEV_{CFLAGS,LIBS}=' '
148 - )
149 - fi
150 -
151 - ECONF_SOURCE=${S} \
152 - gnome2_src_configure "${myconf[@]}"
153 -}
154 -
155 -multilib_src_compile() {
156 - if multilib_is_native_abi; then
157 - gnome2_src_compile
158 - else
159 - emake -C lib/colord
160 - use gusb && emake -C lib/colorhug
161 - emake -C lib/compat
162 - fi
163 -}
164 -
165 -multilib_src_test() {
166 - if multilib_is_native_abi; then
167 - default
168 - else
169 - emake -C lib/colord check
170 - use gusb && emake -C lib/colorhug check
171 - emake -C lib/compat check
172 - fi
173 -}
174 -
175 -multilib_src_install() {
176 - if multilib_is_native_abi; then
177 - gnome2_src_install
178 - else
179 - gnome2_src_install -C lib/colord
180 - use gusb && gnome2_src_install -C lib/colorhug
181 - gnome2_src_install -C lib/compat
182 - gnome2_src_install -C contrib/session-helper install-libcolord_includeHEADERS
183 - fi
184 -}
185 -
186 -multilib_src_install_all() {
187 - DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README.md TODO"
188 - einstalldocs
189 -
190 - newbashcomp data/colormgr colormgr
191 -
192 - # Ensure config and profile directories exist and /var/lib/colord/*
193 - # is writable by colord user
194 - keepdir /var/lib/color{,d}/icc
195 - fowners colord:colord /var/lib/colord{,/icc}
196 -
197 - if use examples; then
198 - docinto examples
199 - dodoc examples/*.c
200 - fi
201 -}
202
203 diff --git a/x11-misc/colord/colord-1.3.3.ebuild b/x11-misc/colord/colord-1.3.3.ebuild
204 deleted file mode 100644
205 index aab58ce6894..00000000000
206 --- a/x11-misc/colord/colord-1.3.3.ebuild
207 +++ /dev/null
208 @@ -1,161 +0,0 @@
209 -# Copyright 1999-2016 Gentoo Foundation
210 -# Distributed under the terms of the GNU General Public License v2
211 -
212 -EAPI=6
213 -GNOME2_LA_PUNT="yes"
214 -VALA_USE_DEPEND="vapigen"
215 -
216 -inherit autotools bash-completion-r1 check-reqs gnome2 user systemd udev vala multilib-minimal
217 -
218 -DESCRIPTION="System service to accurately color manage input and output devices"
219 -HOMEPAGE="https://www.freedesktop.org/software/colord/"
220 -SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
221 -
222 -LICENSE="GPL-2+"
223 -SLOT="0/2" # subslot = libcolord soname version
224 -KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
225 -
226 -# We prefer policykit enabled by default, bug #448058
227 -IUSE="argyllcms examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala"
228 -REQUIRED_USE="
229 - gusb? ( udev )
230 - scanner? ( udev )
231 - vala? ( introspection )
232 -"
233 -
234 -COMMON_DEPEND="
235 - dev-db/sqlite:3=[${MULTILIB_USEDEP}]
236 - >=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}]
237 - >=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}]
238 - argyllcms? ( media-gfx/argyllcms )
239 - gusb? ( >=dev-libs/libgusb-0.2.7[introspection?,${MULTILIB_USEDEP}] )
240 - introspection? ( >=dev-libs/gobject-introspection-0.9.8:= )
241 - policykit? ( >=sys-auth/polkit-0.104 )
242 - scanner? (
243 - media-gfx/sane-backends
244 - sys-apps/dbus )
245 - systemd? ( >=sys-apps/systemd-44:0= )
246 - udev? (
247 - virtual/udev
248 - virtual/libgudev:=[${MULTILIB_USEDEP}]
249 - virtual/libudev:=[${MULTILIB_USEDEP}]
250 - )
251 -"
252 -RDEPEND="${COMMON_DEPEND}
253 - !media-gfx/shared-color-profiles
254 - !<=media-gfx/colorhug-client-0.1.13
255 -"
256 -DEPEND="${COMMON_DEPEND}
257 - dev-libs/libxslt
258 - >=dev-util/gtk-doc-am-1.9
259 - >=dev-util/intltool-0.35
260 - >=sys-devel/gettext-0.17
261 - virtual/pkgconfig[${MULTILIB_USEDEP}]
262 - extra-print-profiles? ( media-gfx/argyllcms )
263 - vala? ( $(vala_depend) )
264 -"
265 -
266 -# FIXME: needs pre-installed dbus service files
267 -RESTRICT="test"
268 -
269 -# According to upstream comment in colord.spec.in, building the extra print
270 -# profiles requires >=4G of memory
271 -CHECKREQS_MEMORY="4G"
272 -
273 -pkg_pretend() {
274 - use extra-print-profiles && check-reqs_pkg_pretend
275 -}
276 -
277 -pkg_setup() {
278 - use extra-print-profiles && check-reqs_pkg_setup
279 - enewgroup colord
280 - enewuser colord -1 -1 /var/lib/colord colord
281 -}
282 -
283 -src_prepare() {
284 - # Adapt to Gentoo paths
285 - sed -i -e 's/spotread/argyll-spotread/' \
286 - src/sensors/cd-sensor-argyll.c \
287 - configure.ac || die
288 -
289 - eautoreconf
290 - use vala && vala_src_prepare
291 - gnome2_src_prepare
292 - multilib_copy_sources
293 -}
294 -
295 -multilib_src_configure() {
296 - # Reverse tools require gusb
297 - # bash-completion test does not work on gentoo
298 - local myconf=(
299 - --disable-bash-completion
300 - --disable-examples
301 - --disable-static
302 - --enable-libcolordcompat
303 - --with-daemon-user=colord
304 - --localstatedir="${EPREFIX}"/var
305 - $(multilib_native_use_enable argyllcms argyllcms-sensor)
306 - $(multilib_native_use_enable extra-print-profiles print-profiles)
307 - $(multilib_native_usex extra-print-profiles COLPROF="$(type -P argyll-colprof)" "")
308 - $(use_enable gusb)
309 - $(multilib_native_use_enable gusb reverse)
310 - $(multilib_native_use_enable introspection)
311 - $(multilib_native_use_enable policykit polkit)
312 - $(multilib_native_use_enable scanner sane)
313 - $(multilib_native_use_enable systemd systemd-login)
314 - $(use_enable udev)
315 - --with-udevrulesdir="$(get_udevdir)"/rules.d
316 - $(multilib_native_use_enable vala)
317 - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
318 - )
319 -
320 - ECONF_SOURCE=${S} \
321 - gnome2_src_configure "${myconf[@]}"
322 -}
323 -
324 -multilib_src_compile() {
325 - if multilib_is_native_abi; then
326 - gnome2_src_compile
327 - else
328 - emake -C lib/colord
329 - use gusb && emake -C lib/colorhug
330 - emake -C lib/compat
331 - fi
332 -}
333 -
334 -multilib_src_test() {
335 - if multilib_is_native_abi; then
336 - default
337 - else
338 - emake -C lib/colord check
339 - use gusb && emake -C lib/colorhug check
340 - emake -C lib/compat check
341 - fi
342 -}
343 -
344 -multilib_src_install() {
345 - if multilib_is_native_abi; then
346 - gnome2_src_install
347 - else
348 - gnome2_src_install -j1 -C lib/colord
349 - use gusb && gnome2_src_install -j1 -C lib/colorhug
350 - gnome2_src_install -j1 -C lib/compat
351 - gnome2_src_install -j1 -C contrib/session-helper install-libcolord_includeHEADERS
352 - fi
353 -}
354 -
355 -multilib_src_install_all() {
356 - einstalldocs
357 -
358 - newbashcomp data/colormgr colormgr
359 -
360 - # Ensure config and profile directories exist and /var/lib/colord/*
361 - # is writable by colord user
362 - keepdir /var/lib/color{,d}/icc
363 - fowners colord:colord /var/lib/colord{,/icc}
364 -
365 - if use examples; then
366 - docinto examples
367 - dodoc examples/*.c
368 - fi
369 -}