commit: a29e18c24eacd7f6a85b56adb8e2782c6307683f
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Thu Apr 4 02:40:31 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 5 01:20:51 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a29e18c2
media-gfx/sane-backends: remove confusing and outdated seds
* SED: the following did not cause any changes
* sed -i -e "/by sane-desc 3.5 from sane-backends/s:sane-backends
.*:sane-backends ${ver}:" testsuite/tools/data/html* || die;
* no-op: -e /by sane-desc 3.5 from sane-backends/s:sane-backends
.*:sane-backends 1.2.1:
This is seemingly redundant since upstream ticket:
https://gitlab.com/sane-project/backends/-/issues/228
The sources are changed with a minor version bump to sane-desc (not
sane-backends!) such that the sed no longer applies. Seds are wonderful!
Especially at silently failing and never being noticed.
The tests do still pass, regardless of commented claims in the ebuild.
Is that because the issue was misdiagnosed? Is that because the upstream
ticket to remove timestamps made the issue obsolete? I don't know, and
I'm not fussed about finding out. The tests have passed for years
without this, so that's good enough for me.
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild | 6 ------
media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild | 6 ------
media-gfx/sane-backends/sane-backends-1.2.1.ebuild | 6 ------
3 files changed, 18 deletions(-)
diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild
b/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild
index bed67f34eff9..7cda923f849d 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild
@@ -192,12 +192,6 @@ src_prepare() {
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
diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
index 639413ca7003..cc8ec2c60f74 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
@@ -197,12 +197,6 @@ src_prepare() {
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
diff --git a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
index 11edb9d15f94..2b69e30c7d17 100644
--- a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
@@ -192,12 +192,6 @@ src_prepare() {
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
-
# Needed for udev rules generation/installation
multilib_copy_sources
}
