From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BBAC8158041 for ; Fri, 5 Apr 2024 01:21:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EDA58E2A20; Fri, 5 Apr 2024 01:21:53 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C69EAE2A20 for ; Fri, 5 Apr 2024 01:21:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D5D12343290 for ; Fri, 5 Apr 2024 01:21:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6F2E01680 for ; Fri, 5 Apr 2024 01:21:50 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1712280051.a29e18c24eacd7f6a85b56adb8e2782c6307683f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/sane-backends/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild media-gfx/sane-backends/sane-backends-1.2.1.ebuild X-VCS-Directories: media-gfx/sane-backends/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a29e18c24eacd7f6a85b56adb8e2782c6307683f X-VCS-Branch: master Date: Fri, 5 Apr 2024 01:21:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 65b960ae-a744-4a9b-9b2f-b9ef0437fe86 X-Archives-Hash: 0c4f9579ca50b8a55664c2cab72468de commit: a29e18c24eacd7f6a85b56adb8e2782c6307683f Author: Eli Schwartz gmail com> AuthorDate: Thu Apr 4 02:40:31 2024 +0000 Commit: Sam James gentoo 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 gmail.com> Signed-off-by: Sam James 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 }