Diff sane-backends-1.1.1-r11 with a sane-backends-1.1.1-r13

/usr/portage/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild 2023-10-09 14:52:31.644368404 +0300
37 37
	epjitsu
38 38
	epson
39 39
	epson2
40
	epsonds
40 41
	escl
41 42
	fujitsu
42 43
	genesys
......
102 103
	xerox_mfp
103 104
)
104 105

  
105
IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
106
IUSE="gphoto2 snmp systemd threads usb v4l xinetd +zeroconf"
106 107

  
107 108
for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do
108 109
	case ${GBACKEND} in
......
133 134
# For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
134 135
RDEPEND="
135 136
	acct-user/saned
137
	acct-group/scanner
136 138
	gphoto2? (
137
		media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
138 139
		>=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
140
		media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
139 141
	)
140 142
	sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
141 143
	sane_backends_dc210? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
142 144
	sane_backends_dc240? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
143 145
	sane_backends_dell1600n_net? (
144
		media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
145 146
		>=media-libs/tiff-3.9.7-r1:=[${MULTILIB_USEDEP}]
147
		media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
146 148
	)
147 149
	sane_backends_escl? (
148 150
		app-text/poppler[cairo]
......
181 183
	"${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch
182 184
	# https://gitlab.com/sane-project/backends/-/merge_requests/688
183 185
	"${FILESDIR}"/${PN}-1.1.1-genesys-gl845-crash.patch
186
	"${FILESDIR}"/${P}-gcc12-tests.patch
187
	"${FILESDIR}"/${PN}-1.1.1-configure-clang16.patch
188
	"${FILESDIR}"/${P}-musl.patch
184 189
)
185 190

  
186 191
MULTILIB_CHOST_TOOLS=(
......
249 254
	# that break in many ways, bug #636202, #668232, #668350
250 255
	# People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html
251 256
	myconf+=(
257
		--enable-ipv6
252 258
		--disable-locking
253 259
		$(use_with gphoto2)
254 260
		$(multilib_native_use_with systemd)
255 261
		$(use_with v4l)
256
		$(use_enable ipv6)
257 262
		$(use_enable threads pthread)
258 263
		$(use_with zeroconf avahi)
259 264
	)
265

  
260 266
	ECONF_SOURCE="${S}" \
261 267
	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
262 268
	BACKENDS="${lbackends}" \
......
323 329
		printf "\n" >> "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" || die
324 330
		tools/sane-desc -m hwdb -s doc/descriptions-external/ >> "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" || die
325 331
		# udev rule for saned (SANE scanning daemon) to be able to write on usb port
326
		udev_dorules "${FILESDIR}/66-saned.rules"
332
		udev_newrules "${FILESDIR}/66-saned.rules-r1" 66-saned.rules
327 333
	fi
328 334
}
329 335

  
......
331 337
	dodir /etc/env.d
332 338

  
333 339
	if use systemd ; then
334
		systemd_newunit "${FILESDIR}"/saned_at.service "saned@.service"
340
		systemd_newunit "${FILESDIR}"/saned_at.service-r1 "saned@.service"
335 341
		systemd_newunit "${FILESDIR}"/saned.socket saned.socket
336 342
	fi
337 343

  
......
353 359
	newconfd "${FILESDIR}"/saned.confd saned
354 360
}
355 361

  
362
pkg_postrm() {
363
	udev_reload
364
}
365

  
356 366
pkg_postinst() {
367
	udev_reload
368

  
357 369
	optfeature "Network scanner backend" media-gfx/sane-airscan
358 370
	optfeature "Epson-specific backend" media-gfx/iscan
359 371
	optfeature "HP-specific backend" net-print/hplip
......
362 374
		elog "If you want remote clients to connect, edit"
363 375
		elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
364 376
	fi
365

  
366
	udev_reload
367
}
368

  
369
pkg_postrm() {
370
	udev_reload
371 377
}
Thank you!