Version bump.

(Portage version: 2.1)

7 files changed, 172 insertions, 4 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index 3c360ad224ed..ccaf7f9d9de2 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.96 2006/05/19 13:57:44 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.97 2006/07/20 09:01:12 phosphan Exp $
+
+*sane-backends-1.0.18 (20 Jul 2006)
+
+  20 Jul 2006; Patrick Kursawe <phosphan@gentoo.org>
+  +sane-backends-1.0.18.ebuild:
+  Version bump. Can remove some sed magic because upstream fixed it.
+  Brother patch had to be updated. http download added because I could not
+  get it by FTP.
 
   19 May 2006; Patrick Kursawe <phosphan@gentoo.org>
   sane-backends-1.0.17.ebuild:
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.15 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.15
index 4ce538aa12b2..b835ffcfd733 100644
--- a/media-gfx/sane-backends/files/digest-sane-backends-1.0.15
+++ b/media-gfx/sane-backends/files/digest-sane-backends-1.0.15
@@ -1,2 +1,6 @@
-MD5 3b804f35cdfbc5ad2d201ffe078bbac9 sane-backends-1.0.15.tar.gz 3231759
 MD5 f2d2c62caf1d4e12005fbb8ee62a5f39 sane-backends-1.0.15-brothermfc.patch.bz2 9753
+RMD160 83e388f8dc14af8c18296186d8983ff856e4487a sane-backends-1.0.15-brothermfc.patch.bz2 9753
+SHA256 afd0bf3cd17ce9240c2af0c2ecddc7ca8379ac70010330f4e7f3248325b35a6a sane-backends-1.0.15-brothermfc.patch.bz2 9753
+MD5 3b804f35cdfbc5ad2d201ffe078bbac9 sane-backends-1.0.15.tar.gz 3231759
+RMD160 0e42007ff24d0a5f94c7c901982619cf4d1a7068 sane-backends-1.0.15.tar.gz 3231759
+SHA256 89106b5bc5a66ca0eaf4553371c89ac8542a757964d7a91c07b8fb77e040eebe sane-backends-1.0.15.tar.gz 3231759
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.15-r3 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.15-r3
index 343c6b6cba70..4adde1403f69 100644
--- a/media-gfx/sane-backends/files/digest-sane-backends-1.0.15-r3
+++ b/media-gfx/sane-backends/files/digest-sane-backends-1.0.15-r3
@@ -1,3 +1,9 @@
-MD5 3b804f35cdfbc5ad2d201ffe078bbac9 sane-backends-1.0.15.tar.gz 3231759
 MD5 b8db53fe037a2cc50cdf6d185d368686 gt68xx-71.patch.bz2 20694
+RMD160 0c33826b6d0e3a44bc1a243fd208826192f10fef gt68xx-71.patch.bz2 20694
+SHA256 6cb6a4228927d44d400dfa81d39ed312d126c143022953ed688a69994e23ac66 gt68xx-71.patch.bz2 20694
 MD5 f2d2c62caf1d4e12005fbb8ee62a5f39 sane-backends-1.0.15-brothermfc.patch.bz2 9753
+RMD160 83e388f8dc14af8c18296186d8983ff856e4487a sane-backends-1.0.15-brothermfc.patch.bz2 9753
+SHA256 afd0bf3cd17ce9240c2af0c2ecddc7ca8379ac70010330f4e7f3248325b35a6a sane-backends-1.0.15-brothermfc.patch.bz2 9753
+MD5 3b804f35cdfbc5ad2d201ffe078bbac9 sane-backends-1.0.15.tar.gz 3231759
+RMD160 0e42007ff24d0a5f94c7c901982619cf4d1a7068 sane-backends-1.0.15.tar.gz 3231759
+SHA256 89106b5bc5a66ca0eaf4553371c89ac8542a757964d7a91c07b8fb77e040eebe sane-backends-1.0.15.tar.gz 3231759
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.16-r4 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.16-r4
index c28bef8f1d50..69062c4abd55 100644
--- a/media-gfx/sane-backends/files/digest-sane-backends-1.0.16-r4
+++ b/media-gfx/sane-backends/files/digest-sane-backends-1.0.16-r4
@@ -1,2 +1,6 @@
-MD5 bec9b9262246316b4ebfe2bc7451aa28 sane-backends-1.0.16.tar.gz 3409799
 MD5 321ec37f7229dda4dc86b06301cfad8e sane-1.0.16-brother-driver.diff.bz2 8224
+RMD160 acbe36d7c4347d49f6e8e708ea81f0ee604fec9f sane-1.0.16-brother-driver.diff.bz2 8224
+SHA256 795b4c553e5195261b4dfe5f624d2dba256910996d10af3af9551c192bbc92fe sane-1.0.16-brother-driver.diff.bz2 8224
+MD5 bec9b9262246316b4ebfe2bc7451aa28 sane-backends-1.0.16.tar.gz 3409799
+RMD160 694030faddf3b14035b6d4cee0151aa48f71049d sane-backends-1.0.16.tar.gz 3409799
+SHA256 85c2720c4417cfe72e4bf8917f84173792b70b834a23fb61c790c6a85b67f036 sane-backends-1.0.16.tar.gz 3409799
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.17 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.17
index 71c01c2b5faa..d0787edd9f81 100644
--- a/media-gfx/sane-backends/files/digest-sane-backends-1.0.17
+++ b/media-gfx/sane-backends/files/digest-sane-backends-1.0.17
@@ -1,2 +1,6 @@
 MD5 321ec37f7229dda4dc86b06301cfad8e sane-1.0.16-brother-driver.diff.bz2 8224
+RMD160 acbe36d7c4347d49f6e8e708ea81f0ee604fec9f sane-1.0.16-brother-driver.diff.bz2 8224
+SHA256 795b4c553e5195261b4dfe5f624d2dba256910996d10af3af9551c192bbc92fe sane-1.0.16-brother-driver.diff.bz2 8224
 MD5 b51c10da8a81a04e1bae88c9e6556df2 sane-backends-1.0.17.tar.gz 3588993
+RMD160 43e440712e9da676e235dc6148c5dda347c30e22 sane-backends-1.0.17.tar.gz 3588993
+SHA256 f5478acc07494498fe94aa8801193f8511cacd023fed19aaee1429e10e805d77 sane-backends-1.0.17.tar.gz 3588993
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.18 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.18
new file mode 100644
index 000000000000..5242a0c5bacf
--- /dev/null
+++ b/media-gfx/sane-backends/files/digest-sane-backends-1.0.18
@@ -0,0 +1,6 @@
+MD5 69b18ea038b8cd0e289c04c512b43b8e sane-1.0.18-brother-driver.diff.bz2 8335
+RMD160 8d86dccca4054699e367412c25d80d8641de42ca sane-1.0.18-brother-driver.diff.bz2 8335
+SHA256 4a2eceb222f6cd55979fd150c4a7c365a9a83f2beab15045852f8859404de23b sane-1.0.18-brother-driver.diff.bz2 8335
+MD5 7ca7e2908e24721471de92cf40c75e60 sane-backends-1.0.18.tar.gz 3789493
+RMD160 aa863adff417d7c33cbb85c193878aa54a056100 sane-backends-1.0.18.tar.gz 3789493
+SHA256 d7876a78c5676b0c4bc29091c7a7e1287b5c0be5ff5bb61ef033fbffc73d66f3 sane-backends-1.0.18.tar.gz 3789493
diff --git a/media-gfx/sane-backends/sane-backends-1.0.18.ebuild b/media-gfx/sane-backends/sane-backends-1.0.18.ebuild
new file mode 100644
index 000000000000..c792009f7ec6
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.18.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2006 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.18.ebuild,v 1.1 2006/07/20 09:01:12 phosphan Exp $
+
+inherit eutils
+
+IUSE="usb gphoto2 ipv6 v4l"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/"
+
+RDEPEND=">=media-libs/jpeg-6b
+	amd64? ( sys-libs/libieee1284 )
+	x86? ( sys-libs/libieee1284 )
+	usb? ( >=dev-libs/libusb-0.1.8 )
+	gphoto2? ( media-libs/libgphoto2 )
+	v4l? ( sys-kernel/linux-headers )"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+BROTHERMFCPATCHVER="1.0.18"
+BROTHERMFCDRIVER="sane-${BROTHERMFCPATCHVER}-brother-driver.diff"
+
+# Could not access via ftp on 2006-07-20
+SRC_URI="http://alioth.debian.org/download.php/1669/sane-backends-1.0.18.tar.gz
+	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
+		http://dev.gentoo.org/~phosphan/${BROTHERMFCDRIVER}.bz2 )"
+SLOT="0"
+LICENSE="GPL-2 public-domain"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# 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 lexmark 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 snapscan niash sm3840 hp4200
+#         sm3600
+#
+# Note that some backends has specific dependencies which make the compilation
+# fail because not supported on your current platform.
+
+pkg_setup() {
+	enewgroup scanner
+
+	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
+
+	cd ${S}
+
+	#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
+
+	if use usb; then
+		epatch ${WORKDIR}/${BROTHERMFCDRIVER}
+		sed -e 's/bh canon/bh brother canon/' -i configure || \
+			die "could not add 'brother' to backend list"
+	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}
+	keepdir /var/lib/lock/sane
+	fowners root:scanner /var/lib/lock/sane
+	fperms g+w /var/lib/lock/sane
+	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
+
+}