From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-843688-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id BEC091384B4
	for <garchives@archives.gentoo.org>; Mon,  2 Nov 2015 22:47:48 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 1B8E521C0A8;
	Mon,  2 Nov 2015 22:47:44 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id B514921C0A8
	for <gentoo-commits@lists.gentoo.org>; Mon,  2 Nov 2015 22:47:38 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 05E3033BF0B
	for <gentoo-commits@lists.gentoo.org>; Mon,  2 Nov 2015 22:47:38 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id E33AA1ED9
	for <gentoo-commits@lists.gentoo.org>; Mon,  2 Nov 2015 22:47:34 +0000 (UTC)
From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" <vapier@gentoo.org>
Message-ID: <1446504408.ccdd6dd94b72eea61d1e18d9908acae064f9ae7b.vapier@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-9999.ebuild
X-VCS-Directories: media-gfx/sane-backends/
X-VCS-Committer: vapier
X-VCS-Committer-Name: Mike Frysinger
X-VCS-Revision: ccdd6dd94b72eea61d1e18d9908acae064f9ae7b
X-VCS-Branch: master
Date: Mon,  2 Nov 2015 22:47:34 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 1a521019-414a-47a5-99c4-fa51b0d43ed5
X-Archives-Hash: 871491891acaa4e96f39d7f1f3422978

commit:     ccdd6dd94b72eea61d1e18d9908acae064f9ae7b
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  2 22:34:38 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Nov  2 22:46:48 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccdd6dd9

media-gfx/sane-backends: rework html testdata version update logic

This should make the code work across multiple versions (including the
current live git which is broken).

 media-gfx/sane-backends/sane-backends-9999.ebuild | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/media-gfx/sane-backends/sane-backends-9999.ebuild b/media-gfx/sane-backends/sane-backends-9999.ebuild
index 91e7272..b636bf1 100644
--- a/media-gfx/sane-backends/sane-backends-9999.ebuild
+++ b/media-gfx/sane-backends/sane-backends-9999.ebuild
@@ -192,6 +192,12 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
 	mv configure.{in,ac} || die
 	AT_NOELIBTOOLIZE=yes 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
 }
 
 src_configure() {