Version bump - please check the ChangeLog if you use $SANE_BACKENDS or have a Brother MFC scanner.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 150 insertions, 4 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index 83d43f0c7d64..c16306d6dd19 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.69 2005/08/04 07:35:45 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.70 2005/08/19 13:33:33 phosphan Exp $
+
+*sane-backends-1.0.16 (19 Aug 2005)
+
+  19 Aug 2005; Patrick Kursawe <phosphan@gentoo.org>
+  +sane-backends-1.0.16.ebuild:
+  Version bump. Most old patches should not be necessary any more. Attention
+  BrotherMFC-users: I didn't yet find the time to port this patch to .16, so it
+  is currently disabled.
+  If you have problems that your scanner isn't found when you use
+  $SANE_BACKENDS, please comment on bug #90598. I haven't been able to
+  reproduce this problem so far.
 
 *sane-backends-1.0.15-r3 (04 Aug 2005)
 
@@ -50,7 +61,7 @@
   sane-backends-1.0.15.ebuild:
   Fixed BUG #86354 (multilib-strict). Marked stable on amd64.
 
-  21 Jan 2005; Bryan Østergaard <kloeri@gentoo.org>
+  21 Jan 2005; Bryan Østergaard <kloeri@gentoo.org>
   sane-backends-1.0.15.ebuild:
   Stable on alpha.
 
@@ -71,7 +82,7 @@
   sane-backends-1.0.14-r6.ebuild, sane-backends-1.0.15.ebuild:
   Update homepage to http://www.sane-project.org/
 
-  23 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  23 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
   sane-backends-1.0.15.ebuild:
   ~alpha keyword.
 
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 31b5e30f9dbf..90e4a5bd63b6 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -2,7 +2,8 @@ MD5 ebd00143bfe66f76d0d0da95cbc84923 sane-backends-1.0.15.ebuild 2598
 MD5 544c2bc7c5a23b2ae8280b879eac1fbb sane-backends-1.0.15-r2.ebuild 3912
 MD5 4c8053c87e31c8209998ba49c07d60a5 sane-backends-1.0.13-r3.ebuild 1717
 MD5 e73a3bf54c049342701898a62ea3b301 sane-backends-1.0.15-r1.ebuild 2674
-MD5 6a540d5227c6ebf6b97f21b7b460b079 ChangeLog 12014
+MD5 9f216bab69e775aa0dba0bc6b7699ee5 sane-backends-1.0.16.ebuild 3669
+MD5 7e6038684a78b2adb9a90a912ebb7fc7 ChangeLog 12505
 MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
 MD5 79980449d94fb97178178bef2a1c7443 sane-backends-1.0.15-r3.ebuild 3975
 MD5 365f695ec2c079ac06dd5bbf495f87ce files/linux_sg3_err.h 4894
@@ -15,3 +16,4 @@ MD5 83640d1e7caa2aa50c676d40b64866c7 files/digest-sane-backends-1.0.15-r1 157
 MD5 83640d1e7caa2aa50c676d40b64866c7 files/digest-sane-backends-1.0.15-r2 157
 MD5 d16f7594dad0db0c268e143c3676041e files/digest-sane-backends-1.0.15-r3 220
 MD5 83640d1e7caa2aa50c676d40b64866c7 files/digest-sane-backends-1.0.15 157
+MD5 f6aabb0fd7dcc3cbec039d7774a038b0 files/digest-sane-backends-1.0.16 73
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.16 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.16
new file mode 100644
index 000000000000..640cd97241ee
--- /dev/null
+++ b/media-gfx/sane-backends/files/digest-sane-backends-1.0.16
@@ -0,0 +1 @@
+MD5 bec9b9262246316b4ebfe2bc7451aa28 sane-backends-1.0.16.tar.gz 3409799
diff --git a/media-gfx/sane-backends/sane-backends-1.0.16.ebuild b/media-gfx/sane-backends/sane-backends-1.0.16.ebuild
new file mode 100644
index 000000000000..710bc595572e
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.16.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2005 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.16.ebuild,v 1.1 2005/08/19 13:33:33 phosphan Exp $
+
+inherit eutils
+
+IUSE="usb gphoto2 ipv6 v4l"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/"
+
+DEPEND=">=media-libs/jpeg-6b
+	amd64? ( sys-libs/libieee1284 )
+	x86? ( sys-libs/libieee1284 )
+	usb? ( dev-libs/libusb )
+	gphoto2? ( media-libs/libgphoto2 )
+	v4l? ( sys-kernel/linux-headers )"
+
+BROTHERMFCDRIVER="sane-backends-1.0.15-brothermfc.patch"
+
+SRC_URI="ftp://ftp.sane-project.org/pub/sane/${P}/${P}.tar.gz
+	ftp://ftp.sane-project.org/pub/sane/old-versions/${P}/${P}.tar.gz"
+	#usb? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2 )"
+SLOT="0"
+LICENSE="GPL-2 public-domain"
+KEYWORDS="~x86 ~sparc ~ppc ~ppc64 ~amd64 ~alpha ~ia64"
+
+# To enable specific backends, define SANE_BACKENDS with the backends you want
+# in those:
+#   abaton agfafocus apple artec as6e avision bh canon canon630u coolscan
+#   coolscan2 dc25 dmc epson fujitsu genesys gt68xx hp leo matsushita microtek
+#   microtek2 mustek mustek_usb nec pie plustek plustek_pp ricoh s9036
+#   sceptre sharp sp15c st400 tamarack test teco1 teco2 teco3 umax umax_pp
+#   umax1220u artec_eplus48u ma1509 ibm hp5400 u12 sm3840 snapscan niash dc210 dc240
+#   pint net
+#
+# Note that some backends has specific dependencies which make the compilation
+# fail because not supported on your current platform.
+pkg_setup() {
+	IEEE1284_BACKENDS="canon_pp hpsj5s mustek_pp"
+
+	if [[ "${SANE_BACKENDS}" != "" ]]; then
+		use gphoto2 && SANE_BACKENDS="${SANE_BACKENDS} gphoto2"
+		use v4l && SANE_BACKENDS="${SANE_BACKENDS} v4l"
+		use usb && SANE_BACKENDS="${SANE_BACKENDS} sm3600"
+	fi
+
+	if ! use x86 && ! use amd64; then
+		tmp="${SANE_BACKENDS}"
+		for backend in ${IEEE1284_BACKENDS}; do
+			if [[ "${tmp/$backend/}" != "${SANE_BACKENDS}" ]]; then
+				ewarn "You selected a backend which is disabled because it's not usable in your arch."
+			fi
+		done
+	fi
+}
+
+src_unpack() {
+	if [ -z "${SANE_BACKENDS}" ]; then
+		einfo "You can use the variable SANE_BACKENDS to pick backends"
+		einfo "instead of building all of them."
+	fi
+	unpack ${A}
+	if use usb; then
+		unpack ${BROTHERMFCDRIVER}.bz2
+	fi
+	#cp ${FILESDIR}/linux_sg3_err.h ${S}/sanei
+
+	cd ${S}
+
+	#epatch ${FILESDIR}/canoscan-focus.patch
+	#epatch ${WORKDIR}/gt68xx-71.patch
+
+	#only generate the .ps and not the fonts
+	sed -i -e 's:$(DVIPS) sane.dvi -o sane.ps:$(DVIPS) sane.dvi -M1 -o sane.ps:' \
+		doc/Makefile.in
+	#compile errors when using NDEBUG otherwise
+	sed -i -e 's:function_name:__FUNCTION__:g' backend/artec_eplus48u.c \
+		|| die "function_name fix failed"
+
+	if use usb; then
+		#epatch ${WORKDIR}/${BROTHERMFCDRIVER}
+		epatch ${FILESDIR}/libusbscanner-device-r1.patch
+		:
+	fi
+}
+
+src_compile() {
+	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
+	BACKENDS="${SANE_BACKENDS}" \
+	econf \
+		$(use_enable usb libusb) \
+		$(use_with gphoto2) \
+		$(use_enable ipv6) \
+		${myconf} || die "econf failed"
+
+	emake || die
+
+	if use usb; then
+		cd tools/hotplug
+		grep -v '^$' libsane.usermap > libsane.usermap.new
+		mv libsane.usermap.new libsane.usermap
+	fi
+}
+
+src_install () {
+	einstall docdir=${D}/usr/share/doc/${PF}
+
+	if use usb; then
+		cd tools/hotplug
+		insinto /etc/hotplug/usb
+		exeinto /etc/hotplug/usb
+		doins libsane.usermap
+		doexe libusbscanner
+		newdoc README README.hotplug
+		cd ../..
+	fi
+
+	docinto backend
+	cd backend
+	dodoc GUIDE *.README *.BUGS *.CHANGES *.FAQ *.TODO
+
+	echo "SANE_CONFIG_DIR=/etc/sane.d" > 30sane
+	insinto /etc/env.d
+	doins 30sane
+
+}
+
+pkg_preinst() {
+	enewgroup scanner
+}
+