1 |
mgorny 14/05/31 08:41:43 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: sane-backends-1.0.24-r5.ebuild |
5 |
Removed: sane-backends-1.0.24-r4.ebuild |
6 |
Log: |
7 |
Fix myconf reference. Bug #511932. |
8 |
|
9 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
10 |
|
11 |
Revision Changes Path |
12 |
1.255 media-gfx/sane-backends/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/ChangeLog?rev=1.255&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/ChangeLog?rev=1.255&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/ChangeLog?r1=1.254&r2=1.255 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v |
21 |
retrieving revision 1.254 |
22 |
retrieving revision 1.255 |
23 |
diff -u -r1.254 -r1.255 |
24 |
--- ChangeLog 24 May 2014 10:11:57 -0000 1.254 |
25 |
+++ ChangeLog 31 May 2014 08:41:43 -0000 1.255 |
26 |
@@ -1,6 +1,12 @@ |
27 |
# ChangeLog for media-gfx/sane-backends |
28 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.254 2014/05/24 10:11:57 ago Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.255 2014/05/31 08:41:43 mgorny Exp $ |
31 |
+ |
32 |
+*sane-backends-1.0.24-r5 (31 May 2014) |
33 |
+ |
34 |
+ 31 May 2014; Michał Górny <mgorny@g.o> +sane-backends-1.0.24-r5.ebuild, |
35 |
+ -sane-backends-1.0.24-r4.ebuild: |
36 |
+ Fix myconf reference. Bug #511932. |
37 |
|
38 |
24 May 2014; Agostino Sarubbo <ago@g.o> sane-backends-1.0.24-r3.ebuild: |
39 |
Stable for x86, wrt bug #506928 |
40 |
|
41 |
|
42 |
|
43 |
1.1 media-gfx/sane-backends/sane-backends-1.0.24-r5.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.24-r5.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.24-r5.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: sane-backends-1.0.24-r5.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2014 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.24-r5.ebuild,v 1.1 2014/05/31 08:41:43 mgorny Exp $ |
53 |
|
54 |
EAPI="5" |
55 |
|
56 |
inherit autotools eutils flag-o-matic multilib multilib-minimal udev user toolchain-funcs |
57 |
|
58 |
# gphoto and v4l are handled by their usual USE flags. |
59 |
# The pint backend was disabled because I could not get it to compile. |
60 |
IUSE_SANE_BACKENDS=" |
61 |
abaton |
62 |
agfafocus |
63 |
apple |
64 |
artec |
65 |
artec_eplus48u |
66 |
as6e |
67 |
avision |
68 |
bh |
69 |
canon |
70 |
canon630u |
71 |
canon_dr |
72 |
canon_pp |
73 |
cardscan |
74 |
coolscan |
75 |
coolscan2 |
76 |
coolscan3 |
77 |
dc210 |
78 |
dc240 |
79 |
dc25 |
80 |
dell1600n_net |
81 |
dmc |
82 |
epjitsu |
83 |
epson |
84 |
epson2 |
85 |
fujitsu |
86 |
genesys |
87 |
gt68xx |
88 |
hp |
89 |
hp3500 |
90 |
hp3900 |
91 |
hp4200 |
92 |
hp5400 |
93 |
hp5590 |
94 |
hpljm1005 |
95 |
hpsj5s |
96 |
hs2p |
97 |
ibm |
98 |
kodak |
99 |
kodakaio |
100 |
kvs1025 |
101 |
kvs20xx |
102 |
kvs40xx |
103 |
leo |
104 |
lexmark |
105 |
ma1509 |
106 |
magicolor |
107 |
matsushita |
108 |
microtek |
109 |
microtek2 |
110 |
mustek |
111 |
mustek_pp |
112 |
mustek_usb |
113 |
mustek_usb2 |
114 |
nec |
115 |
net |
116 |
niash |
117 |
p5 |
118 |
pie |
119 |
pixma |
120 |
plustek |
121 |
plustek_pp |
122 |
pnm |
123 |
qcam |
124 |
ricoh |
125 |
rts8891 |
126 |
s9036 |
127 |
sceptre |
128 |
sharp |
129 |
sm3600 |
130 |
sm3840 |
131 |
snapscan |
132 |
sp15c |
133 |
st400 |
134 |
stv680 |
135 |
tamarack |
136 |
teco1 |
137 |
teco2 |
138 |
teco3 |
139 |
test |
140 |
u12 |
141 |
umax |
142 |
umax1220u |
143 |
umax_pp |
144 |
xerox_mfp" |
145 |
|
146 |
IUSE="avahi doc gphoto2 ipv6 threads usb v4l xinetd snmp systemd" |
147 |
|
148 |
for backend in ${IUSE_SANE_BACKENDS}; do |
149 |
case ${backend} in |
150 |
# Disable backends that require parallel ports as no one has those anymore. |
151 |
canon_pp|hpsj5s|mustek_pp|\ |
152 |
pnm) |
153 |
IUSE+=" -sane_backends_${backend}" |
154 |
;; |
155 |
mustek_usb2|kvs40xx) |
156 |
IUSE+=" sane_backends_${backend}" |
157 |
;; |
158 |
*) |
159 |
IUSE+=" +sane_backends_${backend}" |
160 |
esac |
161 |
done |
162 |
|
163 |
REQUIRED_USE=" |
164 |
sane_backends_mustek_usb2? ( threads ) |
165 |
sane_backends_kvs40xx? ( threads ) |
166 |
" |
167 |
|
168 |
DESCRIPTION="Scanner Access Now Easy - Backends" |
169 |
HOMEPAGE="http://www.sane-project.org/" |
170 |
SRC_URI="https://alioth.debian.org/frs/download.php/file/3958/${P}.tar.gz" |
171 |
|
172 |
LICENSE="GPL-2 public-domain" |
173 |
SLOT="0" |
174 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
175 |
|
176 |
RDEPEND=" |
177 |
sane_backends_dc210? ( virtual/jpeg[${MULTILIB_USEDEP}] ) |
178 |
sane_backends_dc240? ( virtual/jpeg[${MULTILIB_USEDEP}] ) |
179 |
sane_backends_dell1600n_net? ( virtual/jpeg[${MULTILIB_USEDEP}] |
180 |
media-libs/tiff[${MULTILIB_USEDEP}] ) |
181 |
avahi? ( >=net-dns/avahi-0.6.24[${MULTILIB_USEDEP}] ) |
182 |
sane_backends_canon_pp? ( sys-libs/libieee1284[${MULTILIB_USEDEP}] ) |
183 |
sane_backends_hpsj5s? ( sys-libs/libieee1284[${MULTILIB_USEDEP}] ) |
184 |
sane_backends_mustek_pp? ( sys-libs/libieee1284[${MULTILIB_USEDEP}] ) |
185 |
usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] ) |
186 |
gphoto2? ( |
187 |
media-libs/libgphoto2:=[${MULTILIB_USEDEP}] |
188 |
virtual/jpeg[${MULTILIB_USEDEP}] |
189 |
) |
190 |
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) |
191 |
xinetd? ( sys-apps/xinetd ) |
192 |
snmp? ( net-analyzer/net-snmp ) |
193 |
systemd? ( sys-apps/systemd:0= ) |
194 |
" |
195 |
|
196 |
DEPEND="${RDEPEND} |
197 |
v4l? ( sys-kernel/linux-headers ) |
198 |
doc? ( |
199 |
virtual/latex-base |
200 |
dev-texlive/texlive-latexextra |
201 |
) |
202 |
>=sys-apps/sed-4 |
203 |
|
204 |
virtual/pkgconfig[${MULTILIB_USEDEP}]" |
205 |
|
206 |
# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device) |
207 |
RDEPEND="${RDEPEND} |
208 |
!<sys-fs/udev-114 |
209 |
abi_x86_32? ( |
210 |
!<=app-emulation/emul-linux-x86-medialibs-20140508 |
211 |
!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] |
212 |
)" |
213 |
|
214 |
MULTILIB_CHOST_TOOLS=( |
215 |
/usr/bin/sane-config |
216 |
) |
217 |
|
218 |
pkg_setup() { |
219 |
enewgroup scanner |
220 |
enewuser saned -1 -1 -1 scanner |
221 |
} |
222 |
|
223 |
src_prepare() { |
224 |
cat >> backend/dll.conf.in <<-EOF |
225 |
# Add support for the HP-specific backend. Needs net-print/hplip installed. |
226 |
hpaio |
227 |
# Add support for the Epson-specific backend. Needs media-gfx/iscan installed. |
228 |
epkowa |
229 |
EOF |
230 |
epatch "${FILESDIR}"/niash_array_index.patch \ |
231 |
"${FILESDIR}"/${P}-unused-cups.patch \ |
232 |
"${FILESDIR}"/${P}-automagic_systemd.patch \ |
233 |
"${FILESDIR}"/${P}-systemd_pkgconfig.patch \ |
234 |
"${FILESDIR}"/${P}-kodakaio_avahi.patch \ |
235 |
"${FILESDIR}"/${P}-saned_pidfile_location.patch |
236 |
# Fix for "make check". |
237 |
sed -i -e 's/sane-backends 1.0.24git/sane-backends 1.0.24/' testsuite/tools/data/html* |
238 |
AT_NOELIBTOOLIZE=yes eautoreconf |
239 |
} |
240 |
|
241 |
src_configure() { |
242 |
append-flags -fno-strict-aliasing |
243 |
|
244 |
multilib-minimal_src_configure |
245 |
} |
246 |
|
247 |
multilib_src_configure() { |
248 |
# the blank is intended - an empty string would result in building ALL backends. |
249 |
local BACKENDS=" " |
250 |
|
251 |
use gphoto2 && BACKENDS="gphoto2" |
252 |
use v4l && BACKENDS="${BACKENDS} v4l" |
253 |
for backend in ${IUSE_SANE_BACKENDS}; do |
254 |
if use "sane_backends_${backend}" && [ ${backend} != pnm ]; then |
255 |
BACKENDS="${BACKENDS} ${backend}" |
256 |
fi |
257 |
done |
258 |
|
259 |
local myconf=( |
260 |
$(use_enable usb libusb_1_0) |
261 |
$(multilib_native_use_with snmp) |
262 |
) |
263 |
|
264 |
# you can only enable this backend, not disable it... |
265 |
if use sane_backends_pnm; then |
266 |
myconf+=( --enable-pnm-backend ) |
267 |
fi |
268 |
if ! use doc; then |
269 |
myconf+=( --disable-latex ) |
270 |
fi |
271 |
if use sane_backends_mustek_pp; then |
272 |
myconf+=( --enable-parport-directio ) |
273 |
fi |
274 |
if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp; }; then |
275 |
myconf+=( sane_cv_use_libieee1284=no ) |
276 |
fi |
277 |
# if LINGUAS is set, just use the listed and supported localizations. |
278 |
if [ "${LINGUAS-NoLocalesSet}" != NoLocalesSet ]; then |
279 |
mkdir -p po || die |
280 |
echo > po/LINGUAS |
281 |
for lang in ${LINGUAS}; do |
282 |
if [ -a "${S}"/po/${lang}.po ]; then |
283 |
echo ${lang} >> po/LINGUAS |
284 |
fi |
285 |
done |
286 |
fi |
287 |
|
288 |
# relative path must be used for tests to work properly |
289 |
ECONF_SOURCE=../${P} \ |
290 |
SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \ |
291 |
BACKENDS="${BACKENDS}" \ |
292 |
econf \ |
293 |
$(use_with gphoto2) \ |
294 |
$(multilib_native_use_with systemd) \ |
295 |
$(use_with v4l) \ |
296 |
$(use_enable avahi) \ |
297 |
$(use_enable ipv6) \ |
298 |
$(use_enable threads pthread) \ |
299 |
"${myconf[@]}" |
300 |
} |
301 |
|
302 |
multilib_src_compile() { |
303 |
emake VARTEXFONTS="${T}/fonts" |
304 |
|
305 |
if use usb; then |
306 |
cd tools/hotplug || die |
307 |
sed -i -e '/^$/d' libsane.usermap || die |
308 |
fi |
309 |
|
310 |
if tc-is-cross-compiler; then |
311 |
# The build system sucks and doesn't handle this properly. |
312 |
# https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366 |
313 |
tc-export_build_env BUILD_CC |
314 |
cd "${BUILD_DIR}"/tools || die |
315 |
${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} -I. -I../include -I"${S}"/include \ |
316 |
"${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \ |
317 |
"${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die |
318 |
local dirs=( hal hotplug hotplug-ng udev ) |
319 |
local targets=( |
320 |
hal/libsane.fdi |
321 |
hotplug/libsane.usermap |
322 |
hotplug-ng/libsane.db |
323 |
udev/libsane.rules |
324 |
) |
325 |
mkdir -p "${dirs[@]}" || die |
326 |
emake "${targets[@]}" |
327 |
fi |
328 |
} |
329 |
|
330 |
multilib_src_install() { |
331 |
emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \ |
332 |
docdir="${EPREFIX}"/usr/share/doc/${PF} |
333 |
|
334 |
if multilib_is_native_abi; then |
335 |
if use usb; then |
336 |
insinto /etc/hotplug/usb |
337 |
doins tools/hotplug/libsane.usermap |
338 |
fi |
339 |
|
340 |
udev_newrules tools/udev/libsane.rules 41-libsane.rules |
341 |
insinto "/usr/share/pkgconfig" |
342 |
doins tools/sane-backends.pc |
343 |
fi |
344 |
} |
345 |
|
346 |
multilib_src_install_all() { |
347 |
keepdir /var/lib/lock/sane |
348 |
fowners root:scanner /var/lib/lock/sane |
349 |
fperms g+w /var/lib/lock/sane |
350 |
dodir /etc/env.d |
351 |
|
352 |
if use usb; then |
353 |
exeinto /etc/hotplug/usb |
354 |
doexe tools/hotplug/libusbscanner |
355 |
newdoc tools/hotplug/README README.hotplug |
356 |
fi |
357 |
|
358 |
dodoc NEWS AUTHORS ChangeLog* PROBLEMS README README.linux |
359 |
prune_libtool_files --all |
360 |
if use xinetd; then |
361 |
insinto /etc/xinetd.d |
362 |
doins "${FILESDIR}"/saned |
363 |
fi |
364 |
|
365 |
newinitd "${FILESDIR}"/saned.initd saned |
366 |
newconfd "${FILESDIR}"/saned.confd saned |
367 |
} |
368 |
|
369 |
pkg_postinst() { |
370 |
if use xinetd; then |
371 |
elog "If you want remote clients to connect, edit" |
372 |
elog "/etc/sane.d/saned.conf and /etc/hosts.allow" |
373 |
fi |
374 |
|
375 |
elog "If you are using a USB scanner, add all users who want" |
376 |
elog "to access your scanner to the \"scanner\" group." |
377 |
} |