1 |
commit: 396d62c451a9c12862d70469345539b04cfba900 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 6 07:57:29 2018 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 6 07:57:29 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=396d62c4 |
7 |
|
8 |
media-gfx/sane-backends: in tree version works |
9 |
|
10 |
media-gfx/sane-backends/Manifest | 1 - |
11 |
.../sane-backends/files/niash_array_index.patch | 140 --------- |
12 |
.../sane-backends-1.0.24-automagic_systemd.patch | 40 --- |
13 |
.../files/sane-backends-1.0.24-cross-compile.patch | 30 -- |
14 |
.../sane-backends-1.0.24-kodakaio_avahi.patch | 84 ------ |
15 |
...ne-backends-1.0.24-saned_pidfile_location.patch | 11 - |
16 |
.../sane-backends-1.0.24-systemd_pkgconfig.patch | 37 --- |
17 |
.../files/sane-backends-1.0.24-u_char.patch | 11 - |
18 |
.../files/sane-backends-1.0.24-unused-cups.patch | 42 --- |
19 |
media-gfx/sane-backends/files/saned | 10 - |
20 |
media-gfx/sane-backends/files/saned.confd | 2 - |
21 |
media-gfx/sane-backends/files/saned.initd | 12 - |
22 |
media-gfx/sane-backends/metadata.xml | 5 - |
23 |
.../sane-backends/sane-backends-1.0.24-r6.ebuild | 329 --------------------- |
24 |
14 files changed, 754 deletions(-) |
25 |
|
26 |
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest |
27 |
deleted file mode 100644 |
28 |
index 1ad06f1..0000000 |
29 |
--- a/media-gfx/sane-backends/Manifest |
30 |
+++ /dev/null |
31 |
@@ -1 +0,0 @@ |
32 |
-DIST sane-backends-1.0.24.tar.gz 5778749 SHA256 27c7085a54f1505d8b551e6f1e69d30e1ee57328b18429bb2225dabf4c45462d SHA512 1e9f962bb9d27f17067eb662dabfc0a1aa0d06e16bec4bd28868124b468578d82f14f6d2c1f5de63d2cec57ca4584ec12d3b2c2b1de20f1199aece581453ebc5 WHIRLPOOL 19b939c920a3c157044c85a941debdc664d8781562fa3fc04f061b9d216b089be80edfd43479069382adf13e68160518fdbd5c84a5f4c506a46f8521d4ed2a1c |
33 |
|
34 |
diff --git a/media-gfx/sane-backends/files/niash_array_index.patch b/media-gfx/sane-backends/files/niash_array_index.patch |
35 |
deleted file mode 100644 |
36 |
index 236c459..0000000 |
37 |
--- a/media-gfx/sane-backends/files/niash_array_index.patch |
38 |
+++ /dev/null |
39 |
@@ -1,140 +0,0 @@ |
40 |
---- backend/niash.c 2010-12-02 00:49:58.000000000 +0100 |
41 |
-+++ backend/niash.c.new 2011-09-21 20:09:07.000000000 +0200 |
42 |
-@@ -82,14 +82,7 @@ |
43 |
- optThreshold, |
44 |
- |
45 |
- |
46 |
-- optLast, |
47 |
--/* put temporarily disabled options here after optLast */ |
48 |
-- |
49 |
-- optGroupMisc, |
50 |
-- optLamp, |
51 |
-- |
52 |
-- optCalibrate, |
53 |
-- optGamma /* analog gamma = single number */ |
54 |
-+ optLast |
55 |
- } EOptionIndex; |
56 |
- |
57 |
- |
58 |
-@@ -685,17 +678,6 @@ |
59 |
- pDesc->size = 0; |
60 |
- break; |
61 |
- |
62 |
-- case optGamma: |
63 |
-- pDesc->name = SANE_NAME_ANALOG_GAMMA; |
64 |
-- pDesc->title = SANE_TITLE_ANALOG_GAMMA; |
65 |
-- pDesc->desc = SANE_DESC_ANALOG_GAMMA; |
66 |
-- pDesc->type = SANE_TYPE_FIXED; |
67 |
-- pDesc->constraint_type = SANE_CONSTRAINT_RANGE; |
68 |
-- pDesc->constraint.range = &rangeGamma; |
69 |
-- pDesc->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT; |
70 |
-- pVal->w = startUpGamma; |
71 |
-- break; |
72 |
-- |
73 |
- case optGammaTable: |
74 |
- pDesc->name = SANE_NAME_GAMMA_VECTOR; |
75 |
- pDesc->title = SANE_TITLE_GAMMA_VECTOR; |
76 |
-@@ -707,31 +689,6 @@ |
77 |
- pVal->wa = s->aGammaTable; |
78 |
- break; |
79 |
- |
80 |
-- case optGroupMisc: |
81 |
-- pDesc->title = SANE_I18N ("Miscellaneous"); |
82 |
-- pDesc->type = SANE_TYPE_GROUP; |
83 |
-- pDesc->size = 0; |
84 |
-- break; |
85 |
-- |
86 |
-- case optLamp: |
87 |
-- pDesc->name = "lamp"; |
88 |
-- pDesc->title = SANE_I18N ("Lamp status"); |
89 |
-- pDesc->desc = SANE_I18N ("Switches the lamp on or off."); |
90 |
-- pDesc->type = SANE_TYPE_BOOL; |
91 |
-- pDesc->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT; |
92 |
-- /* switch the lamp on when starting for first the time */ |
93 |
-- pVal->w = SANE_TRUE; |
94 |
-- break; |
95 |
-- |
96 |
-- case optCalibrate: |
97 |
-- pDesc->name = "calibrate"; |
98 |
-- pDesc->title = SANE_I18N ("Calibrate"); |
99 |
-- pDesc->desc = SANE_I18N ("Calibrates for black and white level."); |
100 |
-- pDesc->type = SANE_TYPE_BUTTON; |
101 |
-- pDesc->cap = SANE_CAP_SOFT_SELECT; |
102 |
-- pDesc->size = 0; |
103 |
-- break; |
104 |
-- |
105 |
- case optGroupMode: |
106 |
- pDesc->title = SANE_I18N ("Scan Mode"); |
107 |
- pDesc->desc = ""; |
108 |
-@@ -1007,7 +964,6 @@ |
109 |
- /* Get options of type SANE_Word */ |
110 |
- case optCount: |
111 |
- case optDPI: |
112 |
-- case optGamma: |
113 |
- case optTLX: |
114 |
- case optTLY: |
115 |
- case optBRX: |
116 |
-@@ -1031,17 +987,6 @@ |
117 |
- strcpy ((char *) pVal, modeList[s->aValues[optMode].w]); |
118 |
- break; |
119 |
- |
120 |
-- /* Get options of type SANE_Bool */ |
121 |
-- case optLamp: |
122 |
-- GetLamp (&s->HWParams, &fLampIsOn); |
123 |
-- *(SANE_Bool *) pVal = fLampIsOn; |
124 |
-- break; |
125 |
-- |
126 |
-- case optCalibrate: |
127 |
-- /* although this option has nothing to read, |
128 |
-- it's added here to avoid a warning when running scanimage --help */ |
129 |
-- break; |
130 |
-- |
131 |
- default: |
132 |
- DBG (DBG_MSG, "SANE_ACTION_GET_VALUE: Invalid option (%d)\n", n); |
133 |
- } |
134 |
-@@ -1061,7 +1006,6 @@ |
135 |
- case optCount: |
136 |
- return SANE_STATUS_INVAL; |
137 |
- |
138 |
-- case optGamma: |
139 |
- case optThreshold: |
140 |
- case optDPI: |
141 |
- |
142 |
-@@ -1089,15 +1033,7 @@ |
143 |
- DBG (DBG_MSG, |
144 |
- "sane_control_option: SANE_ACTION_SET_VALUE %d = %d\n", n, |
145 |
- (int) s->aValues[n].w); |
146 |
-- if (n == optGamma) |
147 |
-- { |
148 |
-- if (!fSame && optLast > optGammaTable) |
149 |
-- { |
150 |
-- info |= SANE_INFO_RELOAD_OPTIONS; |
151 |
-- } |
152 |
-- _SetScalarGamma (s->aGammaTable, s->aValues[n].w); |
153 |
-- } |
154 |
-- break; |
155 |
-+ break; |
156 |
- |
157 |
- case optGammaTable: |
158 |
- DBG (DBG_MSG, "Writing gamma table\n"); |
159 |
-@@ -1158,20 +1094,6 @@ |
160 |
- break; |
161 |
- |
162 |
- |
163 |
-- |
164 |
-- case optLamp: |
165 |
-- fVal = *(SANE_Bool *) pVal; |
166 |
-- DBG (DBG_MSG, "lamp %s\n", fVal ? "on" : "off"); |
167 |
-- if (fVal) |
168 |
-- _WarmUpLamp (s, WARMUP_INSESSION); |
169 |
-- else |
170 |
-- SetLamp (&s->HWParams, SANE_FALSE); |
171 |
-- break; |
172 |
-- |
173 |
-- case optCalibrate: |
174 |
--/* SimpleCalib(&s->HWParams); */ |
175 |
-- break; |
176 |
-- |
177 |
- default: |
178 |
- DBG (DBG_ERR, "SANE_ACTION_SET_VALUE: Invalid option (%d)\n", n); |
179 |
- } |
180 |
|
181 |
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.24-automagic_systemd.patch b/media-gfx/sane-backends/files/sane-backends-1.0.24-automagic_systemd.patch |
182 |
deleted file mode 100644 |
183 |
index c0dfe3c..0000000 |
184 |
--- a/media-gfx/sane-backends/files/sane-backends-1.0.24-automagic_systemd.patch |
185 |
+++ /dev/null |
186 |
@@ -1,40 +0,0 @@ |
187 |
-diff --git a/configure.in b/configure.in |
188 |
-index 4365868..7413646 100644 |
189 |
---- a/configure.in |
190 |
-+++ b/configure.in |
191 |
-@@ -344,17 +344,24 @@ dnl $as_echo "in order to autodetect network scanners in kodakaio." |
192 |
- dnl with_cups="no" |
193 |
- dnl fi |
194 |
- |
195 |
--dnl added by llagendijk 12/7/2012 to detect systemd for saned |
196 |
--$as_echo_n "Checking for systemd..." |
197 |
--if test -e /usr/include/systemd/sd-daemon.h ; then |
198 |
-- AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?]) |
199 |
-- with_systemd="yes" |
200 |
-- SYSTEMD_LIBS=" -lsystemd-daemon" |
201 |
-- AC_SUBST(SYSTEMD_LIBS) |
202 |
-- $as_echo "yes" |
203 |
--else |
204 |
-- with_systemd="no" |
205 |
-- $as_echo "no" |
206 |
-+AC_ARG_WITH(systemd, |
207 |
-+ AC_HELP_STRING([--with-systemd], [enable systemd support @<:@default=yes@:>@])) |
208 |
-+if test "x$with_systemd" != xno ; then |
209 |
-+ dnl added by llagendijk 12/7/2012 to detect systemd for saned |
210 |
-+ $as_echo_n "Checking for systemd..." |
211 |
-+ if test -e /usr/include/systemd/sd-daemon.h ; then |
212 |
-+ AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?]) |
213 |
-+ have_systemd="yes" |
214 |
-+ SYSTEMD_LIBS=" -lsystemd-daemon" |
215 |
-+ AC_SUBST(SYSTEMD_LIBS) |
216 |
-+ $as_echo "yes" |
217 |
-+ else |
218 |
-+ have_systemd="no" |
219 |
-+ $as_echo "no" |
220 |
-+ if test "x$with_systemd" = xyes; then |
221 |
-+ AC_MSG_ERROR([Systemd support was requested but systemd was not found]) |
222 |
-+ fi |
223 |
-+ fi |
224 |
- fi |
225 |
- |
226 |
- dnl *********** |
227 |
|
228 |
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.24-cross-compile.patch b/media-gfx/sane-backends/files/sane-backends-1.0.24-cross-compile.patch |
229 |
deleted file mode 100644 |
230 |
index d66edac..0000000 |
231 |
--- a/media-gfx/sane-backends/files/sane-backends-1.0.24-cross-compile.patch |
232 |
+++ /dev/null |
233 |
@@ -1,30 +0,0 @@ |
234 |
-sent upstream: |
235 |
-https://lists.alioth.debian.org/pipermail/sane-devel/2015-July/033600.html |
236 |
- |
237 |
-From c8df148e2b9784be1827e33224baa1cb5066a383 Mon Sep 17 00:00:00 2001 |
238 |
-From: Mike Frysinger <vapier@××××××××.org> |
239 |
-Date: Wed, 8 Jul 2015 06:31:12 -0400 |
240 |
-Subject: [PATCH] fix cross-compiling paths |
241 |
- |
242 |
-There's no reason to hardcode -I paths to /usr/local. Doing so breaks |
243 |
-cross-compiling when incompatible headers live in there or the toolchain |
244 |
-is set up to throw errors with those flags. |
245 |
---- |
246 |
- configure.in | 1 - |
247 |
- 1 file changed, 1 deletion(-) |
248 |
- |
249 |
-diff --git a/configure.in b/configure.in |
250 |
-index 48953d2..059058b 100644 |
251 |
---- a/configure.in |
252 |
-+++ b/configure.in |
253 |
-@@ -82,7 +82,6 @@ AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes) |
254 |
- dnl *********************************************************************** |
255 |
- dnl set compiler/linker flags |
256 |
- dnl *********************************************************************** |
257 |
--INCLUDES="${INCLUDES} -I/usr/local/include" |
258 |
- AC_SUBST(INCLUDES) |
259 |
- SANE_SET_CFLAGS([$is_release]) |
260 |
- SANE_SET_LDFLAGS |
261 |
--- |
262 |
-2.4.4 |
263 |
- |
264 |
|
265 |
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.24-kodakaio_avahi.patch b/media-gfx/sane-backends/files/sane-backends-1.0.24-kodakaio_avahi.patch |
266 |
deleted file mode 100644 |
267 |
index e6f52ad..0000000 |
268 |
--- a/media-gfx/sane-backends/files/sane-backends-1.0.24-kodakaio_avahi.patch |
269 |
+++ /dev/null |
270 |
@@ -1,84 +0,0 @@ |
271 |
-diff --git a/backend/kodakaio.c b/backend/kodakaio.c |
272 |
-index 8c4583a..b442e50 100644 |
273 |
---- a/backend/kodakaio.c |
274 |
-+++ b/backend/kodakaio.c |
275 |
-@@ -127,7 +127,7 @@ for ubuntu 12.10 |
276 |
- |
277 |
- #define KODAKAIO_VERSION 02 |
278 |
- #define KODAKAIO_REVISION 4 |
279 |
--#define KODAKAIO_BUILD 6 |
280 |
-+#define KODAKAIO_BUILD 7 |
281 |
- |
282 |
- /* for usb (but also used for net though it's not required). */ |
283 |
- #define MAX_BLOCK_SIZE 32768 |
284 |
-@@ -2184,6 +2184,7 @@ static void resolve_callback( |
285 |
- AvahiLookupResultFlags flags, |
286 |
- AVAHI_GCC_UNUSED void* userdata) { |
287 |
- |
288 |
-+ AvahiStringList *vid_pair_list = NULL, *pid_pair_list = NULL; |
289 |
- char *pidkey, *pidvalue; |
290 |
- char *vidkey, *vidvalue; |
291 |
- size_t valuesize; |
292 |
-@@ -2204,20 +2205,40 @@ static void resolve_callback( |
293 |
- avahi_address_snprint(a, sizeof(a), address); |
294 |
- |
295 |
- /* Output short for Kodak ESP */ |
296 |
-- DBG(min(10,DBG_AUTO), "%s:%u %s ", a,port,host_name); |
297 |
-- avahi_string_list_get_pair(avahi_string_list_find(txt, "vid"), |
298 |
-- &vidkey, &vidvalue, &valuesize); |
299 |
-- DBG(min(10,DBG_AUTO), "%s=%s ", vidkey, vidvalue); |
300 |
-- avahi_string_list_get_pair(avahi_string_list_find(txt, "pid"), |
301 |
-- &pidkey, &pidvalue, &valuesize); |
302 |
-- DBG(min(10,DBG_AUTO), "%s=%s\n", pidkey, pidvalue); |
303 |
-+ DBG(min(10,DBG_AUTO), "%s:%u %s\n", a,port,host_name); |
304 |
- |
305 |
-+ vid_pair_list = avahi_string_list_find(txt, "vid"); |
306 |
-+ if(vid_pair_list != NULL) { |
307 |
-+ avahi_string_list_get_pair(vid_pair_list, &vidkey, &vidvalue, &valuesize); |
308 |
-+ DBG(min(10,DBG_AUTO), "%s=%s ", vidkey, vidvalue); |
309 |
-+ } |
310 |
-+ else DBG(min(10,DBG_AUTO), "failed to find key vid\n"); |
311 |
-+ |
312 |
-+ pid_pair_list = avahi_string_list_find(txt, "pid"); |
313 |
-+ if(pid_pair_list != NULL) { |
314 |
-+ avahi_string_list_get_pair(pid_pair_list, &pidkey, &pidvalue, &valuesize); |
315 |
-+ DBG(min(10,DBG_AUTO), "%s=%s\n", pidkey, pidvalue); |
316 |
-+ } |
317 |
-+ else DBG(min(10,DBG_AUTO), "failed to find key pid\n"); |
318 |
-+ |
319 |
-+ if(pid_pair_list != NULL && vid_pair_list != NULL) { |
320 |
- ProcessAvahiDevice(name, vidvalue, pidvalue, a); |
321 |
-- avahi_free(vidkey); avahi_free(vidvalue); |
322 |
-- avahi_free(pidkey); avahi_free(pidvalue); |
323 |
-+ } |
324 |
-+ else DBG(min(10,DBG_AUTO), "didn't call ProcessAvahiDevice\n"); |
325 |
-+ |
326 |
-+ if(vid_pair_list != NULL) { |
327 |
-+ avahi_free(vidkey); |
328 |
-+ avahi_free(vidvalue); |
329 |
-+ DBG(min(15,DBG_AUTO), "vidkey and vidvalue freed\n"); |
330 |
-+ } |
331 |
-+ if(pid_pair_list != NULL) { |
332 |
-+ avahi_free(pidkey); |
333 |
-+ avahi_free(pidvalue); |
334 |
-+ DBG(min(15,DBG_AUTO), "pidkey and pidvalue freed\n"); |
335 |
-+ } |
336 |
- } |
337 |
- } |
338 |
-- |
339 |
-+ DBG(min(10,DBG_AUTO), "ending resolve_callback\n"); |
340 |
- avahi_service_resolver_free(r); |
341 |
- } |
342 |
- |
343 |
-diff --git a/doc/descriptions/kodakaio.desc b/doc/descriptions/kodakaio.desc |
344 |
-index 7882513..5fb18ed 100644 |
345 |
---- a/doc/descriptions/kodakaio.desc |
346 |
-+++ b/doc/descriptions/kodakaio.desc |
347 |
-@@ -1,6 +1,6 @@ |
348 |
- :backend "kodakaio" |
349 |
- :url "http://sourceforge.net/projects/cupsdriverkodak/" |
350 |
--:version "2.4.6" |
351 |
-+:version "2.4.7" |
352 |
- :manpage "sane-kodakaio" |
353 |
- :comment "Backend for Kodak AiO ESP and Hero printers. Also possibly Advent AWL10" |
354 |
- :devicetype :scanner |
355 |
|
356 |
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.24-saned_pidfile_location.patch b/media-gfx/sane-backends/files/sane-backends-1.0.24-saned_pidfile_location.patch |
357 |
deleted file mode 100644 |
358 |
index c682961..0000000 |
359 |
--- a/media-gfx/sane-backends/files/sane-backends-1.0.24-saned_pidfile_location.patch |
360 |
+++ /dev/null |
361 |
@@ -1,11 +0,0 @@ |
362 |
---- sane-backends-1.0.23/frontend/saned.c |
363 |
-+++ sane-backends-1.0.23/frontend/saned.c |
364 |
-@@ -221,7 +221,7 @@ |
365 |
- int numchildren; |
366 |
- |
367 |
- #define SANED_CONFIG_FILE "saned.conf" |
368 |
--#define SANED_PID_FILE "/var/run/saned.pid" |
369 |
-+#define SANED_PID_FILE "/var/run/saned/saned.pid" |
370 |
- |
371 |
- #define SANED_SERVICE_NAME "sane-port" |
372 |
- #define SANED_SERVICE_PORT 6566 |
373 |
|
374 |
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch b/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch |
375 |
deleted file mode 100644 |
376 |
index 2d36cfa..0000000 |
377 |
--- a/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch |
378 |
+++ /dev/null |
379 |
@@ -1,37 +0,0 @@ |
380 |
-diff --git a/configure.in b/configure.in |
381 |
-index 7413646..66828fc 100644 |
382 |
---- a/configure.in |
383 |
-+++ b/configure.in |
384 |
-@@ -347,21 +347,18 @@ dnl fi |
385 |
- AC_ARG_WITH(systemd, |
386 |
- AC_HELP_STRING([--with-systemd], [enable systemd support @<:@default=yes@:>@])) |
387 |
- if test "x$with_systemd" != xno ; then |
388 |
-- dnl added by llagendijk 12/7/2012 to detect systemd for saned |
389 |
-- $as_echo_n "Checking for systemd..." |
390 |
-- if test -e /usr/include/systemd/sd-daemon.h ; then |
391 |
-- AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?]) |
392 |
-- have_systemd="yes" |
393 |
-- SYSTEMD_LIBS=" -lsystemd-daemon" |
394 |
-- AC_SUBST(SYSTEMD_LIBS) |
395 |
-- $as_echo "yes" |
396 |
-- else |
397 |
-- have_systemd="no" |
398 |
-- $as_echo "no" |
399 |
-- if test "x$with_systemd" = xyes; then |
400 |
-- AC_MSG_ERROR([Systemd support was requested but systemd was not found]) |
401 |
-- fi |
402 |
-+ PKG_CHECK_MODULES(SYSTEMD, [libsystemd], have_systemd=yes, have_systemd=no) |
403 |
-+ if test "x$have_systemd" = xno; then |
404 |
-+ PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon], have_systemd=yes, have_systemd=no) |
405 |
-+ fi |
406 |
-+ if test "x$have_systemd" = xyes; then |
407 |
-+ AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?]) |
408 |
-+ AC_SUBST(SYSTEMD_LIBS) |
409 |
-+ else |
410 |
-+ if test "x$with_systemd" = xyes; then |
411 |
-+ AC_MSG_ERROR([Systemd support was requested but systemd was not found]) |
412 |
- fi |
413 |
-+ fi |
414 |
- fi |
415 |
- |
416 |
- dnl *********** |
417 |
|
418 |
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.24-u_char.patch b/media-gfx/sane-backends/files/sane-backends-1.0.24-u_char.patch |
419 |
deleted file mode 100644 |
420 |
index 0a35335..0000000 |
421 |
--- a/media-gfx/sane-backends/files/sane-backends-1.0.24-u_char.patch |
422 |
+++ /dev/null |
423 |
@@ -1,11 +0,0 @@ |
424 |
-diff -ur a/sane-backends-1.0.24/include/sane/sanei_udp.h b/sane-backends-1.0.24/include/sane/sanei_udp.h |
425 |
---- a/sane-backends-1.0.24/include/sane/sanei_udp.h |
426 |
-+++ b/sane-backends-1.0.24/include/sane/sanei_udp.h |
427 |
-@@ -27,6 +27,7 @@ |
428 |
- #include <netinet/in.h> |
429 |
- #include <netdb.h> |
430 |
- #endif |
431 |
-+#include <sys/types.h> |
432 |
- |
433 |
- extern SANE_Status sanei_udp_open(const char *host, int port, int *fdp); |
434 |
- extern SANE_Status sanei_udp_open_broadcast(int *fdp); |
435 |
|
436 |
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch b/media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch |
437 |
deleted file mode 100644 |
438 |
index c8ed34e..0000000 |
439 |
--- a/media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch |
440 |
+++ /dev/null |
441 |
@@ -1,42 +0,0 @@ |
442 |
-diff --git a/configure.in b/configure.in |
443 |
-index e13888c..4365868 100644 |
444 |
---- a/configure.in |
445 |
-+++ b/configure.in |
446 |
-@@ -332,17 +332,17 @@ if test -c /dev/urandom ; then |
447 |
- AC_DEFINE(HAVE_DEV_URANDOM, 1, [Is /dev/urandom available?]) |
448 |
- fi |
449 |
- |
450 |
--dnl added by PN 3/2/12 to detect cups |
451 |
--$as_echo "checking for cups" |
452 |
--if test -e /usr/include/cups/cups.h ; then |
453 |
-- AC_DEFINE(HAVE_CUPS, 1, [Is /usr/include/cups/cups.h available?]) |
454 |
-- with_cups="yes" |
455 |
-- LIBS="-lcups $LIBS" |
456 |
--else |
457 |
-- $as_echo "cups.h not found, you may want to install a cups development package" |
458 |
-- $as_echo "in order to autodetect network scanners in kodakaio." |
459 |
-- with_cups="no" |
460 |
--fi |
461 |
-+dnl added by PN 3/2/12 to detect cups commented out 15/10/13 since avahi is now used instead |
462 |
-+dnl $as_echo "checking for cups" |
463 |
-+dnl if test -e /usr/include/cups/cups.h ; then |
464 |
-+dnl AC_DEFINE(HAVE_CUPS, 1, [Is /usr/include/cups/cups.h available?]) |
465 |
-+dnl with_cups="yes" |
466 |
-+dnl LIBS="-lcups $LIBS" |
467 |
-+dnl else |
468 |
-+dnl $as_echo "cups.h not found, you may want to install a cups development package" |
469 |
-+dnl $as_echo "in order to autodetect network scanners in kodakaio." |
470 |
-+dnl with_cups="no" |
471 |
-+dnl fi |
472 |
- |
473 |
- dnl added by llagendijk 12/7/2012 to detect systemd for saned |
474 |
- $as_echo_n "Checking for systemd..." |
475 |
-@@ -816,7 +816,7 @@ fi |
476 |
- echo "IPv6 support: `eval eval echo ${ipv6}`" |
477 |
- echo "Avahi support: `eval eval echo ${enable_avahi}`" |
478 |
- echo "SNMP support: `eval eval echo ${with_snmp}`" |
479 |
--echo "CUPS support: `eval eval echo ${with_cups}`" |
480 |
-+dnl echo "CUPS support: `eval eval echo ${with_cups}`" commented out 15/10/13 |
481 |
- echo "-> The following backends will be built:" |
482 |
- for backend in ${BACKENDS} ; do |
483 |
- echo $ECHO_N "${backend} " |
484 |
|
485 |
diff --git a/media-gfx/sane-backends/files/saned b/media-gfx/sane-backends/files/saned |
486 |
deleted file mode 100644 |
487 |
index 4b3e228..0000000 |
488 |
--- a/media-gfx/sane-backends/files/saned |
489 |
+++ /dev/null |
490 |
@@ -1,10 +0,0 @@ |
491 |
-service sane-port |
492 |
-{ |
493 |
- socket_type = stream |
494 |
- server = /usr/sbin/saned |
495 |
- protocol = tcp |
496 |
- user = saned |
497 |
- group = scanner |
498 |
- wait = no |
499 |
- disable = yes |
500 |
-} |
501 |
|
502 |
diff --git a/media-gfx/sane-backends/files/saned.confd b/media-gfx/sane-backends/files/saned.confd |
503 |
deleted file mode 100644 |
504 |
index adb1eab..0000000 |
505 |
--- a/media-gfx/sane-backends/files/saned.confd |
506 |
+++ /dev/null |
507 |
@@ -1,2 +0,0 @@ |
508 |
-# The user saned should drop its privileges to after startup |
509 |
-#SANED_USER="" |
510 |
|
511 |
diff --git a/media-gfx/sane-backends/files/saned.initd b/media-gfx/sane-backends/files/saned.initd |
512 |
deleted file mode 100644 |
513 |
index dd07f0a..0000000 |
514 |
--- a/media-gfx/sane-backends/files/saned.initd |
515 |
+++ /dev/null |
516 |
@@ -1,12 +0,0 @@ |
517 |
-#!/sbin/runscript |
518 |
-# Copyright 1999-2013 Gentoo Foundation |
519 |
-# Distributed under the terms of the GNU General Public License v2 |
520 |
-# $Id$ |
521 |
- |
522 |
-pidfile="/var/run/saned/saned.pid" |
523 |
-command="/usr/sbin/saned" |
524 |
-command_args="-a ${SANED_USER:-root}" |
525 |
- |
526 |
-start_pre() { |
527 |
- checkpath -d -o ${SANED_USER:-root} ${pidfile%/*} |
528 |
-} |
529 |
|
530 |
diff --git a/media-gfx/sane-backends/metadata.xml b/media-gfx/sane-backends/metadata.xml |
531 |
deleted file mode 100644 |
532 |
index 6f49eba..0000000 |
533 |
--- a/media-gfx/sane-backends/metadata.xml |
534 |
+++ /dev/null |
535 |
@@ -1,5 +0,0 @@ |
536 |
-<?xml version="1.0" encoding="UTF-8"?> |
537 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
538 |
-<pkgmetadata> |
539 |
-<!-- maintainer-needed --> |
540 |
-</pkgmetadata> |
541 |
|
542 |
diff --git a/media-gfx/sane-backends/sane-backends-1.0.24-r6.ebuild b/media-gfx/sane-backends/sane-backends-1.0.24-r6.ebuild |
543 |
deleted file mode 100644 |
544 |
index 0f00950..0000000 |
545 |
--- a/media-gfx/sane-backends/sane-backends-1.0.24-r6.ebuild |
546 |
+++ /dev/null |
547 |
@@ -1,329 +0,0 @@ |
548 |
-# Copyright 1999-2016 Gentoo Foundation |
549 |
-# Distributed under the terms of the GNU General Public License v2 |
550 |
- |
551 |
-EAPI="5" |
552 |
- |
553 |
-inherit autotools eutils flag-o-matic multilib multilib-minimal udev user toolchain-funcs |
554 |
- |
555 |
-# gphoto and v4l are handled by their usual USE flags. |
556 |
-# The pint backend was disabled because I could not get it to compile. |
557 |
-IUSE_SANE_BACKENDS=" |
558 |
- abaton |
559 |
- agfafocus |
560 |
- apple |
561 |
- artec |
562 |
- artec_eplus48u |
563 |
- as6e |
564 |
- avision |
565 |
- bh |
566 |
- canon |
567 |
- canon630u |
568 |
- canon_dr |
569 |
- canon_pp |
570 |
- cardscan |
571 |
- coolscan |
572 |
- coolscan2 |
573 |
- coolscan3 |
574 |
- dc210 |
575 |
- dc240 |
576 |
- dc25 |
577 |
- dell1600n_net |
578 |
- dmc |
579 |
- epjitsu |
580 |
- epson |
581 |
- epson2 |
582 |
- fujitsu |
583 |
- genesys |
584 |
- gt68xx |
585 |
- hp |
586 |
- hp3500 |
587 |
- hp3900 |
588 |
- hp4200 |
589 |
- hp5400 |
590 |
- hp5590 |
591 |
- hpljm1005 |
592 |
- hpsj5s |
593 |
- hs2p |
594 |
- ibm |
595 |
- kodak |
596 |
- kodakaio |
597 |
- kvs1025 |
598 |
- kvs20xx |
599 |
- kvs40xx |
600 |
- leo |
601 |
- lexmark |
602 |
- ma1509 |
603 |
- magicolor |
604 |
- matsushita |
605 |
- microtek |
606 |
- microtek2 |
607 |
- mustek |
608 |
- mustek_pp |
609 |
- mustek_usb |
610 |
- mustek_usb2 |
611 |
- nec |
612 |
- net |
613 |
- niash |
614 |
- p5 |
615 |
- pie |
616 |
- pixma |
617 |
- plustek |
618 |
- plustek_pp |
619 |
- pnm |
620 |
- qcam |
621 |
- ricoh |
622 |
- rts8891 |
623 |
- s9036 |
624 |
- sceptre |
625 |
- sharp |
626 |
- sm3600 |
627 |
- sm3840 |
628 |
- snapscan |
629 |
- sp15c |
630 |
- st400 |
631 |
- stv680 |
632 |
- tamarack |
633 |
- teco1 |
634 |
- teco2 |
635 |
- teco3 |
636 |
- test |
637 |
- u12 |
638 |
- umax |
639 |
- umax1220u |
640 |
- umax_pp |
641 |
- xerox_mfp" |
642 |
- |
643 |
-IUSE="avahi doc gphoto2 ipv6 threads usb v4l xinetd snmp systemd" |
644 |
- |
645 |
-for backend in ${IUSE_SANE_BACKENDS}; do |
646 |
- case ${backend} in |
647 |
- # Disable backends that require parallel ports as no one has those anymore. |
648 |
- canon_pp|hpsj5s|mustek_pp|\ |
649 |
- pnm) |
650 |
- IUSE+=" -sane_backends_${backend}" |
651 |
- ;; |
652 |
- mustek_usb2|kvs40xx) |
653 |
- IUSE+=" sane_backends_${backend}" |
654 |
- ;; |
655 |
- *) |
656 |
- IUSE+=" +sane_backends_${backend}" |
657 |
- esac |
658 |
-done |
659 |
- |
660 |
-REQUIRED_USE=" |
661 |
- sane_backends_mustek_usb2? ( threads ) |
662 |
- sane_backends_kvs40xx? ( threads ) |
663 |
-" |
664 |
- |
665 |
-DESCRIPTION="Scanner Access Now Easy - Backends" |
666 |
-HOMEPAGE="http://www.sane-project.org/" |
667 |
-SRC_URI="https://alioth.debian.org/frs/download.php/file/3958/${P}.tar.gz" |
668 |
- |
669 |
-LICENSE="GPL-2 public-domain" |
670 |
-SLOT="0" |
671 |
-KEYWORDS="amd64 arm ia64 ppc sparc x86" |
672 |
- |
673 |
-RDEPEND=" |
674 |
- sane_backends_dc210? ( >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] ) |
675 |
- sane_backends_dc240? ( >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] ) |
676 |
- sane_backends_dell1600n_net? ( >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] |
677 |
- >=media-libs/tiff-3.9.7-r1[${MULTILIB_USEDEP}] ) |
678 |
- avahi? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] ) |
679 |
- sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) |
680 |
- sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) |
681 |
- sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) |
682 |
- usb? ( >=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}] ) |
683 |
- gphoto2? ( |
684 |
- >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}] |
685 |
- >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] |
686 |
- ) |
687 |
- v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] ) |
688 |
- xinetd? ( sys-apps/xinetd ) |
689 |
- snmp? ( net-analyzer/net-snmp ) |
690 |
- systemd? ( sys-apps/systemd:0= ) |
691 |
-" |
692 |
- |
693 |
-DEPEND="${RDEPEND} |
694 |
- v4l? ( sys-kernel/linux-headers ) |
695 |
- doc? ( |
696 |
- virtual/latex-base |
697 |
- dev-texlive/texlive-latexextra |
698 |
- ) |
699 |
- >=sys-apps/sed-4 |
700 |
- |
701 |
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" |
702 |
- |
703 |
-# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device) |
704 |
-RDEPEND="${RDEPEND} |
705 |
- !<sys-fs/udev-114 |
706 |
- abi_x86_32? ( |
707 |
- !<=app-emulation/emul-linux-x86-medialibs-20140508 |
708 |
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
709 |
- )" |
710 |
- |
711 |
-MULTILIB_CHOST_TOOLS=( |
712 |
- /usr/bin/sane-config |
713 |
-) |
714 |
- |
715 |
-pkg_setup() { |
716 |
- enewgroup scanner |
717 |
- enewuser saned -1 -1 -1 scanner |
718 |
-} |
719 |
- |
720 |
-src_prepare() { |
721 |
- cat >> backend/dll.conf.in <<-EOF |
722 |
- # Add support for the HP-specific backend. Needs net-print/hplip installed. |
723 |
- hpaio |
724 |
- # Add support for the Epson-specific backend. Needs media-gfx/iscan installed. |
725 |
- epkowa |
726 |
- EOF |
727 |
- epatch "${FILESDIR}"/niash_array_index.patch \ |
728 |
- "${FILESDIR}"/${P}-unused-cups.patch \ |
729 |
- "${FILESDIR}"/${P}-automagic_systemd.patch \ |
730 |
- "${FILESDIR}"/${P}-systemd_pkgconfig.patch \ |
731 |
- "${FILESDIR}"/${P}-kodakaio_avahi.patch \ |
732 |
- "${FILESDIR}"/${P}-saned_pidfile_location.patch \ |
733 |
- "${FILESDIR}"/${P}-cross-compile.patch \ |
734 |
- "${FILESDIR}"/${P}-u_char.patch |
735 |
- # Fix for "make check". |
736 |
- sed -i -e 's/sane-backends 1.0.24git/sane-backends 1.0.24/' testsuite/tools/data/html* |
737 |
- AT_NOELIBTOOLIZE=yes eautoreconf |
738 |
-} |
739 |
- |
740 |
-src_configure() { |
741 |
- append-flags -fno-strict-aliasing |
742 |
- |
743 |
- multilib-minimal_src_configure |
744 |
-} |
745 |
- |
746 |
-multilib_src_configure() { |
747 |
- # the blank is intended - an empty string would result in building ALL backends. |
748 |
- local BACKENDS=" " |
749 |
- |
750 |
- use gphoto2 && BACKENDS="gphoto2" |
751 |
- use v4l && BACKENDS="${BACKENDS} v4l" |
752 |
- for backend in ${IUSE_SANE_BACKENDS}; do |
753 |
- if use "sane_backends_${backend}" && [ ${backend} != pnm ]; then |
754 |
- BACKENDS="${BACKENDS} ${backend}" |
755 |
- fi |
756 |
- done |
757 |
- |
758 |
- local myconf=( |
759 |
- $(use_enable usb libusb_1_0) |
760 |
- $(multilib_native_use_with snmp) |
761 |
- ) |
762 |
- |
763 |
- # you can only enable this backend, not disable it... |
764 |
- if use sane_backends_pnm; then |
765 |
- myconf+=( --enable-pnm-backend ) |
766 |
- fi |
767 |
- if ! use doc; then |
768 |
- myconf+=( --disable-latex ) |
769 |
- fi |
770 |
- if use sane_backends_mustek_pp; then |
771 |
- myconf+=( --enable-parport-directio ) |
772 |
- fi |
773 |
- if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp; }; then |
774 |
- myconf+=( sane_cv_use_libieee1284=no ) |
775 |
- fi |
776 |
- # if LINGUAS is set, just use the listed and supported localizations. |
777 |
- if [ "${LINGUAS-NoLocalesSet}" != NoLocalesSet ]; then |
778 |
- mkdir -p po || die |
779 |
- echo > po/LINGUAS |
780 |
- for lang in ${LINGUAS}; do |
781 |
- if [ -a "${S}"/po/${lang}.po ]; then |
782 |
- echo ${lang} >> po/LINGUAS |
783 |
- fi |
784 |
- done |
785 |
- fi |
786 |
- |
787 |
- # relative path must be used for tests to work properly |
788 |
- ECONF_SOURCE=../${P} \ |
789 |
- SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \ |
790 |
- BACKENDS="${BACKENDS}" \ |
791 |
- econf \ |
792 |
- $(use_with gphoto2) \ |
793 |
- $(multilib_native_use_with systemd) \ |
794 |
- $(use_with v4l) \ |
795 |
- $(use_enable avahi) \ |
796 |
- $(use_enable ipv6) \ |
797 |
- $(use_enable threads pthread) \ |
798 |
- "${myconf[@]}" |
799 |
-} |
800 |
- |
801 |
-multilib_src_compile() { |
802 |
- emake VARTEXFONTS="${T}/fonts" |
803 |
- |
804 |
- if use usb; then |
805 |
- cd tools/hotplug || die |
806 |
- sed -i -e '/^$/d' libsane.usermap || die |
807 |
- fi |
808 |
- |
809 |
- if tc-is-cross-compiler; then |
810 |
- # The build system sucks and doesn't handle this properly. |
811 |
- # https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366 |
812 |
- tc-export_build_env BUILD_CC |
813 |
- cd "${BUILD_DIR}"/tools || die |
814 |
- ${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} -I. -I../include -I"${S}"/include \ |
815 |
- "${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \ |
816 |
- "${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die |
817 |
- local dirs=( hal hotplug hotplug-ng udev ) |
818 |
- local targets=( |
819 |
- hal/libsane.fdi |
820 |
- hotplug/libsane.usermap |
821 |
- hotplug-ng/libsane.db |
822 |
- udev/libsane.rules |
823 |
- ) |
824 |
- mkdir -p "${dirs[@]}" || die |
825 |
- emake "${targets[@]}" |
826 |
- fi |
827 |
-} |
828 |
- |
829 |
-multilib_src_install() { |
830 |
- emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \ |
831 |
- docdir="${EPREFIX}"/usr/share/doc/${PF} |
832 |
- |
833 |
- if multilib_is_native_abi; then |
834 |
- if use usb; then |
835 |
- insinto /etc/hotplug/usb |
836 |
- doins tools/hotplug/libsane.usermap |
837 |
- fi |
838 |
- |
839 |
- udev_newrules tools/udev/libsane.rules 41-libsane.rules |
840 |
- insinto "/usr/share/pkgconfig" |
841 |
- doins tools/sane-backends.pc |
842 |
- fi |
843 |
-} |
844 |
- |
845 |
-multilib_src_install_all() { |
846 |
- keepdir /var/lib/lock/sane |
847 |
- fowners root:scanner /var/lib/lock/sane |
848 |
- fperms g+w /var/lib/lock/sane |
849 |
- dodir /etc/env.d |
850 |
- |
851 |
- if use usb; then |
852 |
- exeinto /etc/hotplug/usb |
853 |
- doexe tools/hotplug/libusbscanner |
854 |
- newdoc tools/hotplug/README README.hotplug |
855 |
- fi |
856 |
- |
857 |
- dodoc NEWS AUTHORS ChangeLog* PROBLEMS README README.linux |
858 |
- prune_libtool_files --all |
859 |
- if use xinetd; then |
860 |
- insinto /etc/xinetd.d |
861 |
- doins "${FILESDIR}"/saned |
862 |
- fi |
863 |
- |
864 |
- newinitd "${FILESDIR}"/saned.initd saned |
865 |
- newconfd "${FILESDIR}"/saned.confd saned |
866 |
-} |
867 |
- |
868 |
-pkg_postinst() { |
869 |
- if use xinetd; then |
870 |
- elog "If you want remote clients to connect, edit" |
871 |
- elog "/etc/sane.d/saned.conf and /etc/hosts.allow" |
872 |
- fi |
873 |
- |
874 |
- elog "If you are using a USB scanner, add all users who want" |
875 |
- elog "to access your scanner to the \"scanner\" group." |
876 |
-} |