gentoo auto-resync : 19:12:2022 - 07:47:44

3 files changed, 19 insertions, 14 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 894e03eac050..f5da170e2912 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 9af3c7c66bb3..586a3da88dd2 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -15,5 +15,5 @@ AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71
 AUX saned_at.service-r1 432 BLAKE2B e6dab788c0bf705087974642ed714b5f41b3e676b80b5197a753227934b977ce6d1175872163e831e916b6aa36d6c5dd86effa44801494cff6fc669e6c24acaf SHA512 2c8725f9981216129f94a7c4cd75efab37bb75c891fdf7dbd4297161d8d4cd3b1c5fa0eebcaabe1f038aab8500f8b5579d776935f180fb2553bd2cb77506c29d
 DIST sane-backends-1.1.1.tar.gz 7447569 BLAKE2B 02ac1822beabb12f19ce2d7c053f0f727313d13e0f9380325492a2f0048094f78a118f7659b4c6e39b60c4ea319d862a242f8866a67c84e5649d9ae2691d9473 SHA512 25bd9f90d550cfe6a6d01c48e83716a53f4b0e3a294287e455ecb5e5b80c8fe1699f45c6c87f694475cceb85745c70597e18a7b1094669d5091c5fb183dfe94d
 EBUILD sane-backends-1.1.1-r11.ebuild 9418 BLAKE2B 26e6c1979a769149f77bb15526bec0f8d9194a433428c4a34e752c14d4ad1458cee88205575cec780ccf2d5bd24c036da59136084ef3cbc0786a6646338d4a0d SHA512 b4be00af7484c25f488c27e0b2e6fe2132bf48e74d159890ace368d13eef976963a2307c00f1d457ddb45342c9a2992bd1bbbe32cc490d9188f9bc9894d39075
-EBUILD sane-backends-1.1.1-r12.ebuild 9434 BLAKE2B 536645ed9516bb9b46b719cd9f3b655decfdb288f59e8e3ef22fb9a365f5a920bdaeeef1842ff85cf07a0340dbd581a9927d0f526caa46a2cdfc5c293abb7b35 SHA512 f7be5f08fd652f85b9db76de7f45335704a9e10c7f679a31a9305e220071e7f0b3f970ed07f0ef49a7123632948de06a365c7a1c4e54e9d7bbc167290d24ffee
+EBUILD sane-backends-1.1.1-r13.ebuild 9581 BLAKE2B c621ea42804fc018ddb10f615238c1e7edf2cf336fb8e48d692e8684784c1c36e1d5f17e6ede48345623089dc27ac8711111d9df99f87925444881079a3fecb9 SHA512 60902ac37ad4bfaefac1b31ebf9a8a5d3643ea8f5dbaa8e434a5f298a54ed90bef86f6b46be41cd7d2aefd98095cd70262655b5167e081ea91224b86f6bf4d5e
 MISC metadata.xml 333 BLAKE2B 7d543cb4daa6542f7facef3e1f57c09144baed3198010d7c39df40398ab82791f56271375bce36e829a1364350d05f81c332a2359e7038b047df31407543d331 SHA512 52ac311d50fcfe020b4ec891bcbc1df2834d5d1e3ade7ab6926c6f85a31712dd5886b834739f6155873e1e09967c8f565b913c807acd7ea47a4d3b94160fff37
diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r12.ebuild b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
index 432ddeab111d..fb1659fbd216 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r12.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
@@ -103,7 +103,7 @@ IUSE_SANE_BACKENDS=(
 	xerox_mfp
 )
 
-IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
+IUSE="gphoto2 snmp systemd threads usb v4l xinetd +zeroconf"
 
 for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do
 	case ${GBACKEND} in
@@ -129,21 +129,22 @@ SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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
+	acct-group/scanner
 	gphoto2? (
-		media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
 		>=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/libjpeg-turbo:=[${MULTILIB_USEDEP}]
 		>=media-libs/tiff-3.9.7-r1:=[${MULTILIB_USEDEP}]
+		media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
 	)
 	sane_backends_escl? (
 		app-text/poppler[cairo]
@@ -182,6 +183,9 @@ PATCHES=(
 	"${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
+	"${FILESDIR}"/${PN}-1.1.1-configure-clang16.patch
+	"${FILESDIR}"/${P}-musl.patch
 )
 
 MULTILIB_CHOST_TOOLS=(
@@ -250,14 +254,15 @@ multilib_src_configure() {
 	# 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+=(
+		--enable-ipv6
 		--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}" \
@@ -324,7 +329,7 @@ multilib_src_install() {
 		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"
+		udev_newrules "${FILESDIR}/66-saned.rules-r1" 66-saned.rules
 	fi
 }
 
@@ -332,7 +337,7 @@ multilib_src_install_all() {
 	dodir /etc/env.d
 
 	if use systemd ; then
-		systemd_newunit "${FILESDIR}"/saned_at.service "saned@.service"
+		systemd_newunit "${FILESDIR}"/saned_at.service-r1 "saned@.service"
 		systemd_newunit "${FILESDIR}"/saned.socket saned.socket
 	fi
 
@@ -354,7 +359,13 @@ multilib_src_install_all() {
 	newconfd "${FILESDIR}"/saned.confd saned
 }
 
+pkg_postrm() {
+	udev_reload
+}
+
 pkg_postinst() {
+	udev_reload
+
 	optfeature "Network scanner backend" media-gfx/sane-airscan
 	optfeature "Epson-specific backend" media-gfx/iscan
 	optfeature "HP-specific backend" net-print/hplip
@@ -363,10 +374,4 @@ pkg_postinst() {
 		elog "If you want remote clients to connect, edit"
 		elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
 	fi
-
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
 }