Remove *unused* automagic dependency, fix "make check" failure.

sane-backends no longer depends on cups, but the detection code was
still in the configure script.
The patch is from upstream's git; it will go away in 1.0.25.
Also, fix make check failure due to
incorrect hard-coded data. Closes bug #488658.

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0x6521e06d)

3 files changed, 57 insertions, 2 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index 5304a571cfb9..aaeeb8d596d6 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.229 2013/10/16 01:21:17 teiresias Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.230 2013/10/22 02:24:22 teiresias Exp $
+
+*sane-backends-1.0.24-r1 (22 Oct 2013)
+
+  22 Oct 2013; Christopher Brannon <teiresias@gentoo.org>
+  -sane-backends-1.0.24.ebuild, +sane-backends-1.0.24-r1.ebuild,
+  +files/sane-backends-1.0.24-unused-cups.patch:
+  Remove *unused* automagic dependency, fix "make check" failure.
+  sane-backends no longer depends on cups, but the detection code was
+  still in the configure script. Also, fix make check failure due to
+  incorrect hard-coded data. Closes bug #488658.
 
 *sane-backends-1.0.24 (16 Oct 2013)
 
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch b/media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch
new file mode 100644
index 000000000000..c8ed34e88ff0
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch
@@ -0,0 +1,42 @@
+diff --git a/configure.in b/configure.in
+index e13888c..4365868 100644
+--- a/configure.in
++++ b/configure.in
+@@ -332,17 +332,17 @@ if test -c /dev/urandom ; then
+     AC_DEFINE(HAVE_DEV_URANDOM, 1, [Is /dev/urandom available?])
+ fi
+ 
+-dnl added by PN 3/2/12 to detect cups
+-$as_echo "checking for cups"
+-if test -e /usr/include/cups/cups.h ; then
+-    AC_DEFINE(HAVE_CUPS, 1, [Is /usr/include/cups/cups.h available?])
+-	with_cups="yes"
+-	LIBS="-lcups  $LIBS"
+-else
+-	$as_echo "cups.h not found, you may want to install a cups development package"
+-	$as_echo "in order to autodetect network scanners in kodakaio."
+-	with_cups="no"
+-fi
++dnl added by PN 3/2/12 to detect cups commented out 15/10/13 since avahi is now used instead
++dnl $as_echo "checking for cups"
++dnl if test -e /usr/include/cups/cups.h ; then
++dnl     AC_DEFINE(HAVE_CUPS, 1, [Is /usr/include/cups/cups.h available?])
++dnl 	with_cups="yes"
++dnl 	LIBS="-lcups  $LIBS"
++dnl else
++dnl 	$as_echo "cups.h not found, you may want to install a cups development package"
++dnl 	$as_echo "in order to autodetect network scanners in kodakaio."
++dnl 	with_cups="no"
++dnl fi
+ 
+ dnl added by llagendijk 12/7/2012 to detect systemd for saned
+ $as_echo_n "Checking for systemd..."
+@@ -816,7 +816,7 @@ fi
+ echo "IPv6 support:  `eval eval echo ${ipv6}`"
+ echo "Avahi support: `eval eval echo ${enable_avahi}`"
+ echo "SNMP support:  `eval eval echo ${with_snmp}`"
+-echo "CUPS support:  `eval eval echo ${with_cups}`"
++dnl echo "CUPS support:  `eval eval echo ${with_cups}`" commented out 15/10/13
+ echo "-> The following backends will be built:"
+ for backend in ${BACKENDS} ; do
+   echo $ECHO_N "${backend} " 
diff --git a/media-gfx/sane-backends/sane-backends-1.0.24.ebuild b/media-gfx/sane-backends/sane-backends-1.0.24-r1.ebuild
index fe77b43eb82d..09c45efb8173 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.24.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.24-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.24.ebuild,v 1.1 2013/10/16 01:21:17 teiresias Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.24-r1.ebuild,v 1.1 2013/10/22 02:24:22 teiresias Exp $
 
 EAPI="5"
 
@@ -166,8 +166,11 @@ src_prepare() {
 	epkowa
 	EOF
 	epatch "${FILESDIR}"/niash_array_index.patch \
+		"${FILESDIR}"/${P}-unused-cups.patch \
 		"${FILESDIR}"/${P}-automagic_systemd.patch \
 		"${FILESDIR}"/${P}-saned_pidfile_location.patch
+	# Fix for "make check".
+	sed -i -e 's/sane-backends 1.0.24git/sane-backends 1.0.24/' testsuite/tools/data/html*
 	AT_NOELIBTOOLIZE=yes eautoreconf
 }