Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/sane-backends/
Date: Mon, 02 Nov 2015 22:47:48
Message-Id: 1446504408.ccdd6dd94b72eea61d1e18d9908acae064f9ae7b.vapier@gentoo
1 commit: ccdd6dd94b72eea61d1e18d9908acae064f9ae7b
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 2 22:34:38 2015 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 2 22:46:48 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccdd6dd9
7
8 media-gfx/sane-backends: rework html testdata version update logic
9
10 This should make the code work across multiple versions (including the
11 current live git which is broken).
12
13 media-gfx/sane-backends/sane-backends-9999.ebuild | 6 ++++++
14 1 file changed, 6 insertions(+)
15
16 diff --git a/media-gfx/sane-backends/sane-backends-9999.ebuild b/media-gfx/sane-backends/sane-backends-9999.ebuild
17 index 91e7272..b636bf1 100644
18 --- a/media-gfx/sane-backends/sane-backends-9999.ebuild
19 +++ b/media-gfx/sane-backends/sane-backends-9999.ebuild
20 @@ -192,6 +192,12 @@ src_prepare() {
21 epatch "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
22 mv configure.{in,ac} || die
23 AT_NOELIBTOOLIZE=yes eautoreconf
24 +
25 + # Fix for "make check". Upstream sometimes forgets to update this.
26 + local ver=$(./configure --version | awk '{print $NF; exit 0}')
27 + sed -i \
28 + -e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \
29 + testsuite/tools/data/html* || die
30 }
31
32 src_configure() {