now in tree

master
parent c7c5011580
commit 96b596fdd8
Signed by: casta
GPG Key ID: C47D4BFADB084424
  1. 11
      media-gfx/sane-backends/Manifest
  2. 11
      media-gfx/sane-backends/files/sane-backends-1.0.24-saned_pidfile_location.patch
  3. 11
      media-gfx/sane-backends/files/sane-backends-1.0.27-disable-usb-tests.patch
  4. 11
      media-gfx/sane-backends/files/sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch
  5. 10
      media-gfx/sane-backends/files/saned
  6. 2
      media-gfx/sane-backends/files/saned.confd
  7. 11
      media-gfx/sane-backends/files/saned.initd
  8. 10
      media-gfx/sane-backends/files/saned.socket
  9. 18
      media-gfx/sane-backends/files/saned_at.service
  10. 8
      media-gfx/sane-backends/metadata.xml
  11. 352
      media-gfx/sane-backends/sane-backends-1.0.32.ebuild

@ -1,11 +0,0 @@
AUX sane-backends-1.0.24-saned_pidfile_location.patch 345 BLAKE2B dcf7cbd5787c7a225450e03663e7c1ca69dd40fc58e3de9d994fde6a66635d6a3ca20d2886fe7cbc6a7ed3202f8f3a8c7e3d9ea4072b4418a7a43048427a06c3 SHA512 49519b8fea68292b8cbd7bdcaf5b4803a1b890800e17015ace1d662e4503cc0844f191793c8f42cd6aa7e9922ee9f961d4784e30f22abc497973be1978bf1b24
AUX sane-backends-1.0.27-disable-usb-tests.patch 336 BLAKE2B 00fd225a4426405d515f5b6641c86e6d9035a588a776aaec26eaa4e10beebf0a9fd97da991646b7964a867c422da2bc1cf93560d1ba326f0086675036338ff00 SHA512 64cce489e87de31e1a865b86d5829ae4914a30f47e27b07fba68629261cefcd617b8eed272c94b7554545e4802283c5bd5b53f79f54403d875726b38378ae74d
AUX sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch 459 BLAKE2B d127c054b3e4f8aca5de54888e7a37c986515350aac84bb66ca195fca57138cbe3ac3f29b0982e4019b5b599b81984dceacd5523f794a04cfb5d416a051a1e61 SHA512 d9bcce33482db2f15ee094a244359fafdce196984a799509d9b16e24f46feb3aecd419520e65ca9513b40ff4975d793bec05924bfdd69586d9a6f3feb42cccc3
AUX saned 150 BLAKE2B 306d57a0c09856b387c3c50eb27aaafdb194972c2fdb5d1cb7de3118f0c71cf234898ce958f0d6bd17a5e1f2b5bde458e014a7bfdec52403a6204ebf51aee039 SHA512 26f3d66c6b1e75d87d7d430518aa878c77d5ab8d76a45847cef3ff15566341938eedf46c50d0fa8cdeef828df9cddefdd6fdd767c5de30d3aa7d64ed1911d910
AUX saned.confd 76 BLAKE2B cac74b6f117f7f78a71b951433bc6b155f8641e2cf1bd747871165764e97ed368d10551075761c34ff01f51f7cae1b8a9c5692fb9666a300b45134fe255ea3c1 SHA512 8f4a99ef24c19b3a7213b3d25ea16f5bca8623735cf25d21e3a706e9e0135ac8cce5d0b8fb8728845977f41dcefe6bd858076d755515fc91b00e05ee5817d751
AUX saned.initd 291 BLAKE2B f266fa56f91a61ef7a9d81bdc9862dc33fd02ed8438d7675e69296f228d7959ae5bce93110750d5b02dbe5944c23da6b9b63450ab254a07458d798f8cab00624 SHA512 a3bbb0e249f5b4d351e3aef07dd15e88f4c6a934777901ec551ba4f3e3d525b811bc2f34a0968f0be6f52ddbfa8f7f8c393d8331738d5d2d9f6bdcc73d9d4ca8
AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9 SHA512 a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093
AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965
DIST sane-backends-1.0.32.tar.gz 7349442 BLAKE2B 8841542ffd520b38bbeb532eaae7cce803f0bd868cae7edc28d2138729dcffb5a2a0908b56c16c25ffbba539525331c12c259e1768e105de1bdd1419d29efe83 SHA512 416757d9a69bbc18678d1f16a024ba5a949c571204a68f36009d416be28723886ccea71daaa7da90d20eac9696cd44e567802d6c21c3fc5914b97213bbedb6d5
EBUILD sane-backends-1.0.32.ebuild 8378 BLAKE2B 77be0023958ecc1ab0d7b5540d64ddde7e47199a78d9f9dfdcb20a0b613b4734f80ce3ff3439956038f4beb05822ccaf91c1fee6124bb2ad780e058c760a4eb3 SHA512 bc66b785de5b525eaa37b80437a80b70b3353aedc86227ad74cfd8fdaa59919ba8801b5e5f8b73c55b25062cb8ea47b00728100b25ceb40f741d396ab29942e3
MISC metadata.xml 267 BLAKE2B cf3ca2583acfc7c5d4b3e053cef4d72bf240aa58c54e8a0f72b9393ee8587bd587d4a88bad4b041cfd50d4465879ed546afa71b6e4570477b376a92ab47bb415 SHA512 d471748b0a9f7d7d4aca203c6bd1ff222f3faa455e7d1df2f8437a188922a40e3a656a5e20032256caf58d664e0f723e25055871e62d102e0c677264942b6fb1

@ -1,11 +0,0 @@
--- sane-backends-1.0.23/frontend/saned.c
+++ sane-backends-1.0.23/frontend/saned.c
@@ -221,7 +221,7 @@
int numchildren;
#define SANED_CONFIG_FILE "saned.conf"
-#define SANED_PID_FILE "/var/run/saned.pid"
+#define SANED_PID_FILE "/var/run/saned/saned.pid"
#define SANED_SERVICE_NAME "sane-port"
#define SANED_SERVICE_PORT 6566

@ -1,11 +0,0 @@
--- a/testsuite/sanei/sanei_usb_test.c~ 2017-05-15 03:19:11.000000000 +0200
+++ b/testsuite/sanei/sanei_usb_test.c 2017-09-27 12:13:57.402803737 +0200
@@ -832,6 +832,8 @@
int detected, opened, i;
SANE_Int dn[MAX_DEVICES];
+ return 77;
+
#ifdef HAVE_LIBUSB_LEGACY
printf ("\n%s built with old libusb\n\n", argv[0]);
#endif

@ -1,11 +0,0 @@
diff -Naur backends-1.0.30/backend/dll.conf.in backends-1.0.30-r1/backend/dll.conf.in
--- backends-1.0.30/backend/dll.conf.in 2020-05-17 14:16:28.000000000 +0300
+++ backends-1.0.30-r1/backend/dll.conf.in 2020-06-27 08:24:18.378856341 +0300
@@ -98,3 +98,7 @@
#umax_pp
v4l
xerox_mfp
+# Add support for the HP-specific backend. Needs net-print/hplip installed.
+hpaio
+# Add support for the Epson-specific backend. Needs media-gfx/iscan installed.
+epkowa

@ -1,10 +0,0 @@
service sane-port
{
socket_type = stream
server = /usr/sbin/saned
protocol = tcp
user = saned
group = scanner
wait = no
disable = yes
}

@ -1,2 +0,0 @@
# The user saned should drop its privileges to after startup
#SANED_USER=""

@ -1,11 +0,0 @@
#!/sbin/openrc-run
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
pidfile="/var/run/saned/saned.pid"
command="/usr/sbin/saned"
command_args="-a ${SANED_USER:-root}"
start_pre() {
checkpath -d -o ${SANED_USER:-root} ${pidfile%/*}
}

@ -1,10 +0,0 @@
[Unit]
Description=saned incoming socket
[Socket]
ListenStream=6566
Accept=yes
MaxConnections=1
[Install]
WantedBy=sockets.target

@ -1,18 +0,0 @@
[Unit]
Description=Scanner Service
Requires=saned.socket
[Service]
ExecStart=/usr/sbin/saned
User=scanner
Group=scanner
StandardInput=null
StandardOutput=syslog
StandardError=syslog
Environment=SANE_CONFIG_DIR=@CONFIGDIR@
# If you need to debug your configuration uncomment the next line and
# change it as appropriate to set the desired debug options
# Environment=SANE_DEBUG_DLL=255 SANE_DEBUG_NET=255
[Install]
Also=saned.socket

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
<remote-id type="cpe">cpe:/a:sane-backends_project:sane-backends</remote-id>
</upstream>
</pkgmetadata>

@ -1,352 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{8..9} )
# 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
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/104f09c07d35519cc8e72e604f11643f/${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-group/scanner
acct-user/saned
gphoto2? (
>=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
)
sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
sane_backends_dell1600n_net? (
>=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
>=virtual/jpeg-0-r2:0=[${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? ( >=virtual/jpeg-0-r2:0=[${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
)
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
}
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
udev_newrules tools/udev/libsane.rules 41-libsane.rules
insinto "/usr/share/pkgconfig"
doins tools/sane-backends.pc
fi
}
multilib_src_install_all() {
keepdir /var/lib/lock/sane
fowners root:scanner /var/lib/lock/sane
fperms g+w /var/lib/lock/sane
dodir /etc/env.d
if use systemd ; then
systemd_newunit "${FILESDIR}"/saned_at.service "saned@.service"
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 "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
if ! use systemd ; then
elog "If you are using a USB scanner, add all users who want"
elog "to access your scanner to the \"scanner\" group."
fi
}
Loading…
Cancel
Save