commit: bbb466bb667bb9b0af11e24619c58fe336838e65 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Dec 18 07:05:28 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Dec 18 07:07:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbb466bb
media-gfx/sane-backends: fix udev rule again Previous change wasn't intentional -- the script used for the libtiff revbumps got it wrong. Fixes: 70e19cb29c796c97f89a870ee991374857014d82 Closes: https://bugs.gentoo.org/876772 Signed-off-by: Sam James <sam <AT> gentoo.org> .../sane-backends/sane-backends-1.1.1-r10.ebuild | 367 --------------------- ....1-r7.ebuild => sane-backends-1.1.1-r11.ebuild} | 0 2 files changed, 367 deletions(-) diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r10.ebuild b/media-gfx/sane-backends/sane-backends-1.1.1-r10.ebuild deleted file mode 100644 index 1547683ff308..000000000000 --- a/media-gfx/sane-backends/sane-backends-1.1.1-r10.ebuild +++ /dev/null @@ -1,367 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) - -# python-any-r1 required for a script in -# backends/pixma/scripts/ -inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 systemd toolchain-funcs udev - -# gphoto and v4l are handled by their usual USE flags. -# The pint backend was disabled because I could not get it to compile. -IUSE_SANE_BACKENDS=( - abaton - agfafocus - apple - artec - artec_eplus48u - as6e - avision - bh - canon - canon630u - canon_dr - canon_lide70 - canon_pp - cardscan - coolscan - coolscan2 - coolscan3 - dc210 - dc240 - dc25 - dell1600n_net - dmc - epjitsu - epson - epson2 - epsonds - escl - fujitsu - genesys - gt68xx - hp - hp3500 - hp3900 - hp4200 - hp5400 - hp5590 - hpljm1005 - hpsj5s - hs2p - ibm - kodak - kodakaio - kvs1025 - kvs20xx - kvs40xx - leo - lexmark - ma1509 - magicolor - matsushita - microtek - microtek2 - mustek - mustek_pp - mustek_usb - mustek_usb2 - nec - net - niash - p5 - pie - pieusb - pixma - plustek - plustek_pp - pnm - qcam - ricoh - ricoh2 - rts8891 - s9036 - sceptre - sharp - sm3600 - sm3840 - snapscan - sp15c - st400 - stv680 - tamarack - teco1 - teco2 - teco3 - test - u12 - umax - umax1220u - umax_pp - xerox_mfp -) - -IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf" - -for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do - case ${GBACKEND} in - # Disable backends that require parallel ports as no one has those anymore. - canon_pp|hpsj5s|mustek_pp|\ - pnm|mustek_usb2|kvs40xx) - IUSE+=" sane_backends_${GBACKEND}" - ;; - *) - IUSE+=" +sane_backends_${GBACKEND}" - esac -done - -REQUIRED_USE=" - sane_backends_escl? ( zeroconf ) - sane_backends_kvs40xx? ( threads ) - sane_backends_mustek_usb2? ( threads ) -" - -DESCRIPTION="Scanner Access Now Easy - Backends" -HOMEPAGE="http://www.sane-project.org/"; -SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b6a58d64b43/${P}.tar.gz"; - -LICENSE="GPL-2 public-domain" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" - -# For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build -RDEPEND=" - acct-user/saned - gphoto2? ( - >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}] - media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] - ) - sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) - sane_backends_dc210? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) - sane_backends_dc240? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) - sane_backends_dell1600n_net? ( - >=media-libs/tiff-3.9.7-r1:=[${MULTILIB_USEDEP}] - media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] - ) - sane_backends_escl? ( - app-text/poppler[cairo] - || ( - net-dns/avahi[dbus] - net-dns/avahi[gtk] - ) - net-dns/avahi[${MULTILIB_USEDEP}] - net-misc/curl[${MULTILIB_USEDEP}] - ) - sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) - sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) - sane_backends_pixma? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) - snmp? ( net-analyzer/net-snmp:0= ) - systemd? ( sys-apps/systemd:0= ) - usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] ) - v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] ) - xinetd? ( sys-apps/xinetd ) - zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] ) -" - -DEPEND="${RDEPEND} - dev-libs/libxml2 - v4l? ( sys-kernel/linux-headers ) -" -BDEPEND=" - ${PYTHON_DEPS} - sys-devel/autoconf-archive - sys-devel/gettext - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch - "${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch - "${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch - # https://gitlab.com/sane-project/backends/-/merge_requests/688 - "${FILESDIR}"/${PN}-1.1.1-genesys-gl845-crash.patch - "${FILESDIR}"/${P}-gcc12-tests.patch -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/sane-config -) - -src_prepare() { - default - - # Patch out the git reference so we can run eautoreconf - sed \ - -e "s/m4_esyscmd_s(\[git describe --dirty\])/${PV}/" \ - -e '/^AM_MAINTAINER_MODE/d' \ - -i configure.ac || die - eautoreconf - - # Fix for "make check". Upstream sometimes forgets to update this. - local ver=$(./configure --version | awk '{print $NF; exit 0}') - sed -i \ - -e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \ - testsuite/tools/data/html* || die - - # don't bleed user LDFLAGS into pkgconfig files - sed 's|@LDFLAGS@ ||' -i tools/*.pc.in || die - - # Needed for udev rules generation/installation - multilib_copy_sources -} - -src_configure() { - # From Fedora - append-flags -fno-strict-aliasing - multilib-minimal_src_configure -} - -multilib_src_configure() { - # the blank is intended - an empty string would result in building ALL backends. - local lbackends=" " - - use gphoto2 && lbackends="gphoto2" - use v4l && lbackends+=" v4l" - use sane_backends_escl && multilib_is_native_abi && lbackends+=" escl" - local backend - for backend in ${IUSE_SANE_BACKENDS[@]} ; do - if use "sane_backends_${backend}" && [[ "${backend}" != pnm ]] && [[ "${backend}" != escl ]] ; then - lbackends+=" ${backend}" - fi - done - - local myconf=( - $(use_with usb) - $(multilib_native_use_with snmp) - - $(multilib_native_use_with sane_backends_escl poppler-glib) - # you can only enable this backend, not disable it... - $(usex sane_backends_pnm --enable-pnm-backend '') - $(usex sane_backends_mustek_pp --enable-parport-directio '') - ) - - if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ; } ; then - myconf+=( sane_cv_use_libieee1284=no ) - fi - - # relative path must be used for tests to work properly - # All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory - # that break in many ways, bug #636202, #668232, #668350 - # People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html - myconf+=( - --disable-locking - $(use_with gphoto2) - $(multilib_native_use_with systemd) - $(use_with v4l) - $(use_enable ipv6) - $(use_enable threads pthread) - $(use_with zeroconf avahi) - ) - ECONF_SOURCE="${S}" \ - SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \ - BACKENDS="${lbackends}" \ - econf "${myconf[@]}" -} - -multilib_src_compile() { - emake VARTEXFONTS="${T}/fonts" - - if tc-is-cross-compiler ; then - pushd "${BUILD_DIR}"/tools >/dev/null || die - - # The build system sucks and doesn't handle this properly. - # https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366 - tc-export_build_env BUILD_CC - ${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \ - -I. -I../include -I"${S}"/include \ - "${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \ - "${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die - local dirs=( hal hotplug hotplug-ng udev ) - local targets=( - hal/libsane.fdi - hotplug/libsane.usermap - hotplug-ng/libsane.db - udev/libsane.rules - ) - mkdir -p "${dirs[@]}" || die - emake "${targets[@]}" - - popd >/dev/null || die - fi - - if use usb ; then - sed -i -e '/^$/d' \ - tools/hotplug/libsane.usermap || die - fi -} - -multilib_src_install() { - emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \ - docdir="${EPREFIX}"/usr/share/doc/${PF} - - if multilib_is_native_abi ; then - if use usb ; then - insinto /etc/hotplug/usb - doins tools/hotplug/libsane.usermap - fi - - insinto "/usr/share/pkgconfig" - doins tools/sane-backends.pc - - # From Fedora and Arch, prevent permission conflicts - # https://github.com/OpenPrinting/cups/issues/314 - # https://gitlab.com/sane-project/backends/-/issues/546 - # - # Generate udev udev+hwdb, not needing scanner group - install -vdm 755 "${ED}/$(get_udevdir)/rules.d/" || die - tools/sane-desc -m udev+hwdb -s doc/descriptions/ > "${ED}/$(get_udevdir)/rules.d/65-${PN}.rules" || die - tools/sane-desc -m udev+hwdb -s doc/descriptions-external/ >> "${ED}/$(get_udevdir)/rules.d/65-${PN}.rules" || die - # generate udev hwdb - install -vdm 755 "${ED}/$(get_udevdir)/hwdb.d/" || die - tools/sane-desc -m hwdb -s doc/descriptions/ > "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" - # NOTE: an empty new line is required between the two .desc collections - printf "\n" >> "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" || die - tools/sane-desc -m hwdb -s doc/descriptions-external/ >> "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" || die - # udev rule for saned (SANE scanning daemon) to be able to write on usb port - udev_dorules "${FILESDIR}/66-saned.rules" - fi -} - -multilib_src_install_all() { - dodir /etc/env.d - - if use systemd ; then - systemd_newunit "${FILESDIR}"/saned_at.service "[email protected]" - systemd_newunit "${FILESDIR}"/saned.socket saned.socket - fi - - if use usb ; then - exeinto /etc/hotplug/usb - doexe tools/hotplug/libusbscanner - newdoc tools/hotplug/README README.hotplug - fi - - dodoc NEWS AUTHORS PROBLEMS README README.linux - find "${ED}" -name '*.la' -delete || die - - if use xinetd ; then - insinto /etc/xinetd.d - doins "${FILESDIR}"/saned - fi - - newinitd "${FILESDIR}"/saned.initd saned - newconfd "${FILESDIR}"/saned.confd saned -} - -pkg_postinst() { - optfeature "Network scanner backend" media-gfx/sane-airscan - optfeature "Epson-specific backend" media-gfx/iscan - optfeature "HP-specific backend" net-print/hplip - - if use xinetd ; then - elog "If you want remote clients to connect, edit" - elog "/etc/sane.d/saned.conf and /etc/hosts.allow" - fi -} diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r7.ebuild b/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild similarity index 100% rename from media-gfx/sane-backends/sane-backends-1.1.1-r7.ebuild rename to media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild
