Version bump, see bug #317749. Renamed the udev rules file, see bug #316909.

Package-Manager: portage-2.1.8.3/cvs/Linux i686

3 files changed, 230 insertions, 2 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index 411a4e2e6554..3568993de0d5 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.170 2010/04/02 22:15:15 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.171 2010/05/11 19:39:28 phosphan Exp $
+
+*sane-backends-1.0.21 (11 May 2010)
+
+  11 May 2010; Patrick Kursawe <phosphan@gentoo.org>
+  +sane-backends-1.0.21.ebuild:
+  Version bump, see bug #317749. Renamed the udev rules file, see bug
+  #316909.
 
   02 Apr 2010; Patrick Kursawe <phosphan@gentoo.org>
   sane-backends-1.0.20-r3.ebuild:
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 8059c471f7a3..612b64d8c415 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -14,10 +14,13 @@ DIST sane-backends-1.0.17.tar.gz 3588993 RMD160 43e440712e9da676e235dc6148c5dda3
 DIST sane-backends-1.0.18.tar.gz 3789493 RMD160 aa863adff417d7c33cbb85c193878aa54a056100 SHA1 f4c360b87ced287e4015a0dafd766ad885c539e1 SHA256 d7876a78c5676b0c4bc29091c7a7e1287b5c0be5ff5bb61ef033fbffc73d66f3
 DIST sane-backends-1.0.19.tar.gz 4293184 RMD160 1aaf304cbfeb3d6c95f6081d04225441a87b6644 SHA1 3ff8eefa8f32e72dcdbaa4bf20fe125df90144d5 SHA256 13271a7eb4dc4aa6072162abbd78848e4faad32c468b9b44e7f95cde96a4e17e
 DIST sane-backends-1.0.20.tar.gz 4760873 RMD160 b80c0a15a75b3bce07060d65aecdcaf7860c323b SHA1 3b4d2ecde8be404bb44269771cf5dc6e4c10b086 SHA256 8fb1531e6192b9cfe2f44a020b881d78a13f05426b46263cfbe7fc2507ae3d3a
+DIST sane-backends-1.0.21-i18n.patch 2250 RMD160 35a16305f30e41478b3de82266eff72892e248d6 SHA1 d44cf640a0c56c3249e9da5cc64b3bf452e1989a SHA256 9f0d16a32fd8b8cc9ae5e0639b1c51af2137c5106b9b318f0df818d5689f3efc
+DIST sane-backends-1.0.21.tar.gz 5050344 RMD160 000ae42ffd6484c54389a9468bdde1dcfc758dde SHA1 4a2789ea9dae1ece090d016abd14b0f2450d9bdb SHA256 e44e2fa2925897cf3a9c637b81224772b4483835bf546a48cf9477689022948b
 EBUILD sane-backends-1.0.17.ebuild 3769 RMD160 aaeaa544e2ff07ee3c56c6fc48c0c85b28374e62 SHA1 a2060c1a3c6acb973784e8244ccd064ec4465e07 SHA256 6c4264dccbab4f098f02045166ecdfb514abc20ba707e5fe8dbeeb24f2133c55
 EBUILD sane-backends-1.0.18-r6.ebuild 4278 RMD160 6813867226c83bacea836184ac70cf1b77fffe17 SHA1 a573b3639310b109360cdc29a24261e2059cbd9e SHA256 b9a5718ea3c36f15de7025b50a0812ae851d7ccf8cc5737f69e55a4a94f18157
 EBUILD sane-backends-1.0.19-r2.ebuild 4482 RMD160 c51a3f8765aaf0a69dbeb82c9aa30a30f1524d11 SHA1 4855d517efab381053569a4f86d9db947572d4dc SHA256 a93c515f00c38e1ef73765a226cdcca69c99376f927b06e04438d4b57c6f77b1
 EBUILD sane-backends-1.0.20-r3.ebuild 4453 RMD160 299a030d8c9b7b2bef01e2d293abecdf901acbaa SHA1 c9da6064b0ba9f52844f81b29f434b065d81136b SHA256 8cca6a45025b1dec842f84541592b0c06009ee955a08f08383a4bbdbc1633db1
-MISC ChangeLog 28900 RMD160 cce39f56e8ba7ee50bc97a022cb4cba727f1db1b SHA1 5702b4e90dacc9e545c78fa3cdcb037add97b499 SHA256 d6b92420c3c9ff73335e263589a84a90414db79f4a825cff67b779fd50fed99c
+EBUILD sane-backends-1.0.21.ebuild 4604 RMD160 c127bb4d67af40bb787688d4e7917b6098859039 SHA1 5fe4bbd36f208c2135dcf97bb891b38fbb2be34e SHA256 7dfac21f77c8677fc99ce28dc4939a9316c76567658398926ac4a8f98aceb58f
+MISC ChangeLog 29104 RMD160 069ac760e84e4f9e4f4abead174dfc0686d3c0bd SHA1 f8ad4ec7d463726d2797aeb483c7e7654a7e2990 SHA256 fa1752a58fcd51dd81d23f9e3c78cc3a7018bb7ea171db99dcd1aa482bcb1e1d
 MISC metadata.xml 224 RMD160 d646bef174a902fd1910871e794292c44f292052 SHA1 411f9bc454756fe51f5ff5033b73f91b0b07a204 SHA256 c2d7984543cf5a2770459f930dc78cbe0a220cb3297123dc108b225edc33a822
 MISC sane-backends-1.0.19-r2.ebuild.orig 4482 RMD160 e9139e5efc0c9eadf07b4ed4d88e40e62401246d SHA1 2c15f4318c477c9d959acaf26f026cbb04683991 SHA256 babc258bbfb6cf0edbea22e5b85fd9b2d9f6f0113eddc8471ad545d926b2c7ac
diff --git a/media-gfx/sane-backends/sane-backends-1.0.21.ebuild b/media-gfx/sane-backends/sane-backends-1.0.21.ebuild
new file mode 100644
index 000000000000..39b86ca9b1fd
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.21.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2010 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.21.ebuild,v 1.1 2010/05/11 19:39:28 phosphan Exp $
+
+EAPI="1"
+
+inherit eutils flag-o-matic
+
+# gphoto and v4l are handled by their usual USE flags.
+# The pint backend was disabled because I could not get it to compile.
+# The mustek_usb2 backend would force us to use --enable-pthreads which is off
+# by default for linux. Let's keep this one out until we find a way how to
+# handle this cleanly.
+IUSE_SANE_BACKENDS="
+	abaton
+	agfafocus
+	apple
+	artec
+	artec_eplus48u
+	as6e
+	avision
+	bh
+	canon
+	canon630u
+	canon_dr
+	canon_pp
+	cardscan
+	coolscan
+	coolscan2
+	coolscan3
+	dc25
+	dc210
+	dc240
+	dell1600n_net
+	dmc
+	epjitsu
+	epson
+	epson2
+	fujitsu
+	genesys
+	gt68xx
+	hp
+	hp3500
+	hp3900
+	hp4200
+	hp5400
+	hp5590
+	hpsj5s
+	hpljm1005
+	hs2p
+	ibm
+	kodak
+	kvs1025
+	leo
+	lexmark
+	ma1509
+	matsushita
+	microtek
+	microtek2
+	mustek
+	mustek_pp
+	mustek_usb
+	nec
+	net
+	niash
+	p5
+	pie
+	pixma
+	plustek
+	plustek_pp
+	qcam
+	ricoh
+	rts8891
+	s9036
+	sceptre
+	sharp
+	sm3600
+	sm3840
+	snapscan
+	sp15c
+	st400
+	stv680
+	tamarack
+	teco1
+	teco2
+	teco3
+	test
+	u12
+	umax
+	umax_pp
+	umax1220u
+	xerox_mfp"
+
+IUSE="avahi usb gphoto2 ipv6 v4l doc"
+
+for backend in ${IUSE_SANE_BACKENDS}; do
+	IUSE="${IUSE} +sane_backends_${backend}"
+done
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/"
+
+RDEPEND="
+	sane_backends_dc210? ( >=media-libs/jpeg-6b )
+	sane_backends_dc240? ( >=media-libs/jpeg-6b )
+	sane_backends_dell1600n_net? ( >=media-libs/jpeg-6b )
+	avahi? ( >=net-dns/avahi-0.6.24 )
+	sane_backends_canon_pp? ( sys-libs/libieee1284 )
+	sane_backends_hpsj5s? ( sys-libs/libieee1284 )
+	sane_backends_mustek_pp? ( sys-libs/libieee1284 )
+	usb? ( virtual/libusb:0 )
+	gphoto2? (
+				media-libs/libgphoto2
+				>=media-libs/jpeg-6b
+			)
+	v4l? ( media-libs/libv4l )"
+
+DEPEND="${RDEPEND}
+	v4l? ( sys-kernel/linux-headers )
+	doc? (
+		virtual/latex-base
+		|| ( dev-texlive/texlive-latexextra app-text/tetex app-text/ptex )
+	)
+	>=sys-apps/sed-4"
+
+# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device)
+RDEPEND="${RDEPEND}
+	!<sys-fs/udev-114"
+
+# Could not access via ftp on 2006-07-20
+SRC_URI="http://alioth.debian.org/frs/download.php/2318/${P}.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
+	ftp://ftp.sane-project.org/pub/sane/${P}/${P}-i18n.patch"
+SLOT="0"
+LICENSE="GPL-2 public-domain"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# the blank is intended - an empty string would result in building ALL backends.
+BACKENDS=" "
+
+pkg_setup() {
+	enewgroup scanner
+
+	use gphoto2 && BACKENDS="gphoto2"
+	use v4l && BACKENDS="${BACKENDS} v4l"
+	for backend in ${IUSE_SANE_BACKENDS}; do
+		if use "sane_backends_${backend}"; then
+			BACKENDS="${BACKENDS} ${backend}"
+		fi
+	done
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	cat >> backend/dll.conf.in <<-EOF
+	# Add support for the HP-specific backend.  Needs net-print/hplip installed.
+	hpaio
+	EOF
+	epatch "${DISTDIR}/${P}-i18n.patch"
+}
+
+src_compile() {
+	append-flags -fno-strict-aliasing
+
+	myconf=$(use_enable usb libusb)
+	if ! use doc; then
+		myconf="${myconf} --disable-latex"
+	fi
+	if use sane_backends_mustek_pp; then
+		myconf="${myconf} --enable-parport-directio"
+	fi
+	if ! ( use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ); then
+		myconf="${myconf} sane_cv_use_libieee1284=no"
+	fi
+	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
+	BACKENDS="${BACKENDS}" econf \
+		$(use_with gphoto2) \
+		$(use_enable ipv6) \
+		$(use_enable avahi) \
+		${myconf} || die "econf failed"
+
+	emake VARTEXFONTS="${T}/fonts" || die
+
+	if use usb; then
+		cd tools/hotplug
+		grep -v '^$' libsane.usermap > libsane.usermap.new
+		mv libsane.usermap.new libsane.usermap
+	fi
+}
+
+src_install () {
+	make INSTALL_LOCKPATH="" DESTDIR="${D}" install \
+		docdir=/usr/share/doc/${PF}
+	keepdir /var/lib/lock/sane
+	fowners root:scanner /var/lib/lock/sane
+	fperms g+w /var/lib/lock/sane
+	dodir /etc/env.d
+	if use usb; then
+		cd tools/hotplug
+		insinto /etc/hotplug/usb
+		exeinto /etc/hotplug/usb
+		doins libsane.usermap
+		doexe libusbscanner
+		newdoc README README.hotplug
+		echo >> "${D}"/etc/env.d/30sane "USB_DEVFS_PATH=/dev/bus/usb"
+		cd ../..
+	fi
+	cd tools/udev
+	dodir /etc/udev/rules.d
+	insinto /etc/udev/rules.d
+	newins libsane.rules 39-libsane.rules
+	cd ../..
+	dodoc NEWS AUTHORS ChangeLog* README README.linux
+	echo "SANE_CONFIG_DIR=/etc/sane.d" >> "${D}"/etc/env.d/30sane
+}