gentoo auto-resync : 10:11:2024 - 21:02:06

4 files changed, 5 insertions, 33 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 2f61d1c4cb2f..e69cb547106c 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 7136b46493bb..c8f1af3ad097 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -4,7 +4,6 @@ AUX sane-backends-1.0.24-saned_pidfile_location.patch 345 BLAKE2B dcf7cbd5787c7a
 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 sane-backends-1.1.1-configure-clang16.patch 1537 BLAKE2B 5908f8a11ab78b37b1def559b3e59f7c84fa0d744d81fa130d1816b45ebf058c77caf7fd56ba6b8c97d864a018bcaedddb31525f6c8cd84bac8bb5d7d9a07da1 SHA512 2a1c2addde06841761051f93432da187241f4840568c39f074dc503c3038ab2d5cf57f4f807e728c15d40049c1e06eb8e7939b41daff33c937afd510fc676601
-AUX sane-backends-1.3.1-verfix.patch 896 BLAKE2B 2bce01297d5a5d867c7bfc92f54d98874f3614a4aa604a3b493d4302aed640d2f5c1783ff24a8e2cde6f9dbc44b5156ccef9058eab06c18c958e24edc865e8d6 SHA512 f19f7f41be6a1908398ebf180a0fd613df1f6377e8f6869f9f283d92e3cf2a292cd547769ab8676617fe0b3d72a38a25ed98d042d29af8a97a4072250ce59713
 AUX saned 150 BLAKE2B 306d57a0c09856b387c3c50eb27aaafdb194972c2fdb5d1cb7de3118f0c71cf234898ce958f0d6bd17a5e1f2b5bde458e014a7bfdec52403a6204ebf51aee039 SHA512 26f3d66c6b1e75d87d7d430518aa878c77d5ab8d76a45847cef3ff15566341938eedf46c50d0fa8cdeef828df9cddefdd6fdd767c5de30d3aa7d64ed1911d910
 AUX saned.confd 76 BLAKE2B cac74b6f117f7f78a71b951433bc6b155f8641e2cf1bd747871165764e97ed368d10551075761c34ff01f51f7cae1b8a9c5692fb9666a300b45134fe255ea3c1 SHA512 8f4a99ef24c19b3a7213b3d25ea16f5bca8623735cf25d21e3a706e9e0135ac8cce5d0b8fb8728845977f41dcefe6bd858076d755515fc91b00e05ee5817d751
 AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b5a546d61133522cdc98c7011669feaadc2d030ffeb49a86130075f22a18edab5f4c925780681 SHA512 655200141339f14bf7fc6f4fff3403cf9504809b7f023aa5425aad691c5baa65772100da0a6311669f83ed1dce73b7d65ca20aa31345b13c48dfdb1b30ce5dbd
@@ -14,5 +13,5 @@ AUX saned_at.service-r1 432 BLAKE2B e6dab788c0bf705087974642ed714b5f41b3e676b80b
 DIST backends-1.3.1.tar.bz2 4409356 BLAKE2B 8cedc3adb21c481f346c20de5363439aecabbf81606e3fb81accf4a7af4433eb83cecb3f25be9f4944990651fc66a97ce5f2796cc80846c8e066e4f611c6f8ff SHA512 20774d7b81bbb6a5905f36a312be519e0f664a3fb90ff521f2196c341d80c1ef12164262f063ae0a7b449690213c1e3b8065ebfd6b1e1804cc1581d863f4b720
 DIST sane-backends-1.2.1.tar.gz 7308040 BLAKE2B 8448a66e70548f159cfac63501e52417fb1d0599008ce7bf26bf2e7a25a946e688968f01ae64b72c3d5efce67cfbdc0e8e04d8ab3bc92dae0a7e01bc81bf0140 SHA512 3ffce67e409caa5d32684290a56a46a68fef6991a14858d89cbab5aeb364fbbfd6d7c85bcbc4932c9167073a3a6ba682b4730f11fb320f0c4de53a7e7d3edba1
 EBUILD sane-backends-1.2.1.ebuild 8837 BLAKE2B 942f956dd6f7b23c3e43e1b40517120cabd9ba087a42ea90dbb47d9009022b02ee42e3a60c80897363027bf1df3c757d6e2b2f57ad7c37d088510b255ee32a61 SHA512 d5c62ec336711d97c730338546c3fea7123dd27a21ba27504698cd50fe56963a75620e9d22505d0ebbafdf12fd954cb5141f1e41099bff32928772c6c435682c
-EBUILD sane-backends-1.3.1.ebuild 9015 BLAKE2B 732ccc1b84e0378caae33b1202b9d4fa805613c26fa831e505d85639287682ffeafab216e8cc839118b9cea9d6565492cc9d576c78207c0dc806352ee0904887 SHA512 fb0fec1f6648e072ecbb163c89164faec5624c102317a26679f0fc820d5b3b39787cea6b2a745d8fae969eaf1c279d7664086cf7ec290bc0bc5b6a794b0ced9c
+EBUILD sane-backends-1.3.1-r1.ebuild 8918 BLAKE2B c878c01591a3b0bb8f878ab895afe1a33b5650ef83730c34cad04ed793880bab6c8597f64c301f57b605e9cc1704e78e920dce2b73bf9c298a1edc5811423803 SHA512 b6bb4454130c1dcef2d8aebbca35ef5ec05c5937c6c3f594b7d658fc3b86eb4e3d13abcc18f37ae425caf816b37faea811e2ff29a7f8f9631ca643da5b56fed1
 MISC metadata.xml 333 BLAKE2B 7d543cb4daa6542f7facef3e1f57c09144baed3198010d7c39df40398ab82791f56271375bce36e829a1364350d05f81c332a2359e7038b047df31407543d331 SHA512 52ac311d50fcfe020b4ec891bcbc1df2834d5d1e3ade7ab6926c6f85a31712dd5886b834739f6155873e1e09967c8f565b913c807acd7ea47a4d3b94160fff37
diff --git a/media-gfx/sane-backends/files/sane-backends-1.3.1-verfix.patch b/media-gfx/sane-backends/files/sane-backends-1.3.1-verfix.patch
deleted file mode 100644
index 32f22f6c181c..000000000000
--- a/media-gfx/sane-backends/files/sane-backends-1.3.1-verfix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index ddb52b9..c3046b9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -16,13 +16,11 @@ AM_SILENT_RULES
- dnl ******************************************************************
- dnl  Determine SANE version components and release status
- dnl ******************************************************************
--AS_IF([test x = "x$AWK"],[AC_PROG_AWK])
--AS_IF([test x = "x`echo $VERSION | sed 's/[[.0-9]]//g'`"],
--            [is_release=yes],
--            [is_release=no])
--V_MAJOR=`echo $VERSION | $AWK -F. '{print $1}'`
--V_MINOR=`echo $VERSION | $AWK -F. '{print $2}'`
--V_REV=`echo $VERSION | $AWK -F. '{print $3}' | sed 's/^\([[0-9]]*\).*/\1/'`;
-+is_release=yes
-+is_release=no
-+V_MAJOR=1
-+V_MINOR=3
-+V_REV=1
- 
- AC_DEFINE_UNQUOTED(SANE_DLL_V_MAJOR, $V_MAJOR, [SANE DLL major number])
- AC_DEFINE_UNQUOTED(SANE_DLL_V_MINOR, $V_MINOR, [SANE DLL minor number])
diff --git a/media-gfx/sane-backends/sane-backends-1.3.1.ebuild b/media-gfx/sane-backends/sane-backends-1.3.1-r1.ebuild
index 573d4ca4c003..3ae022e23d53 100644
--- a/media-gfx/sane-backends/sane-backends-1.3.1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.3.1-r1.ebuild
@@ -8,13 +8,10 @@ PYTHON_COMPAT=( python3_{10..13} )
 # 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
 
-MY_PN=backends
-MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Scanner Access Now Easy - Backends"
 HOMEPAGE="http://www.sane-project.org/"
-SRC_URI="https://gitlab.com/sane-project/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2"
-
-S="${WORKDIR}/${MY_P}"
+SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/backends-${PV}.tar.bz2"
+S="${WORKDIR}/backends-${PV}"
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
@@ -182,7 +179,6 @@ 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
-	"${FILESDIR}/${P}-verfix.patch"
 )
 
 # ./configure checks to see if these are defined in sys/io.h,
@@ -196,6 +192,7 @@ MULTILIB_CHOST_TOOLS=(
 src_prepare() {
 	default
 
+	echo "${PV}" > .tarball-version || die
 	eautoreconf
 
 	# Needed for udev rules generation/installation
@@ -250,8 +247,7 @@ multilib_src_configure() {
 		$(use_with zeroconf avahi)
 	)
 
-	ECONF_SOURCE="${S}" SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
-		BACKENDS="${lbackends}" econf "${myconf[@]}"
+	BACKENDS="${lbackends}" econf "${myconf[@]}"
 }
 
 multilib_src_compile() {