Fixing udev rules, see bug #276486. Fixing flags and dependency for libusb.

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

4 files changed, 286 insertions, 2 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index cf68b58f2d92..fa8e047a6816 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.162 2009/07/08 18:47:16 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.163 2009/07/17 20:20:09 phosphan Exp $
+
+*sane-backends-1.0.20-r1 (17 Jul 2009)
+
+  17 Jul 2009; Patrick Kursawe <phosphan@gentoo.org>
+  +files/1.0.20-unbreak-udev.diff, +sane-backends-1.0.20-r1.ebuild:
+  Fixing udev rules, see bug #276486. Fixing flags and dependency 
+  for libusb.
 
   08 Jul 2009; Patrick Kursawe <phosphan@gentoo.org>
   sane-backends-1.0.20.ebuild:
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index b7ad748be036..84c78dc7b44d 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,3 +1,4 @@
+AUX 1.0.20-unbreak-udev.diff 688 RMD160 467154092c84c81c6444b788fa9a10d909930a84 SHA1 63d5f52ae04e17a9d1722d55f6e1b6f8ca5094a4 SHA256 467a170a9f4c5d825893029607dcdcb45110c3f2838e9ee230fdbbc1f8f0567e
 AUX broken_coolscan.patch 442 RMD160 9935934fe6963b7da31b544c7f3baa9065c39bab SHA1 2f1bda3b6bb54cae882005eb709cda33cfd17af8 SHA256 87b327a370f4f7e2884a9715dc880362f313611badf978ba1a1dd23f46284c98
 AUX epson2fixes-1.0.19.patch 922 RMD160 bdfa3ffb1bbdf78000531093663c134e7b63958e SHA1 daa5e62c01370c788a25448472fc9d5b55abaf9f SHA256 630aa0ed61c8d426f2b06c557a148caaf2ca07d659e97425fd121c5f896dc203
 AUX fujitsu_DBG_LEVEL.patch 680 RMD160 ed131cc2269ca0e621b226a34e7a96ed319d0162 SHA1 d7e7022b4ce1a4d07a89013bc566ff573a9445f5 SHA256 b7376d0981dec47d589164151b03cecf4d9855d1b02ed5362c34357847c5376a
@@ -15,6 +16,7 @@ EBUILD sane-backends-1.0.17.ebuild 3769 RMD160 aaeaa544e2ff07ee3c56c6fc48c0c85b2
 EBUILD sane-backends-1.0.18-r6.ebuild 4278 RMD160 6813867226c83bacea836184ac70cf1b77fffe17 SHA1 a573b3639310b109360cdc29a24261e2059cbd9e SHA256 b9a5718ea3c36f15de7025b50a0812ae851d7ccf8cc5737f69e55a4a94f18157
 EBUILD sane-backends-1.0.19-r1.ebuild 4376 RMD160 64c5af36b02721e20948f1c6bf69879f7221f8a4 SHA1 f65a57801bea0710c7122de004afa6d52105ae8f SHA256 2d857ae083482603c58557235535638f4f9a9c337d07ae713878da835141b832
 EBUILD sane-backends-1.0.19-r2.ebuild 4482 RMD160 e9139e5efc0c9eadf07b4ed4d88e40e62401246d SHA1 2c15f4318c477c9d959acaf26f026cbb04683991 SHA256 babc258bbfb6cf0edbea22e5b85fd9b2d9f6f0113eddc8471ad545d926b2c7ac
+EBUILD sane-backends-1.0.20-r1.ebuild 5776 RMD160 4909d30b22bf5a60477660ca9414ab3f51903a38 SHA1 d94bced5fa210d726b03468bce3fc4cb50d1a412 SHA256 776b2d0a005789368d9e48242cf53192c3f2380eea3d75040d603d90cebadb2f
 EBUILD sane-backends-1.0.20.ebuild 5840 RMD160 44dab6329833fdce0e83ddfd4c45d8e041c10000 SHA1 12533963b1d1341059682897a84ceee7a1e7a939 SHA256 3ad8e220b309e0dd72b4d5988e8d5cf1afc92faaed3c727b7ee2c82dbb06613f
-MISC ChangeLog 27291 RMD160 3f5e1c2066199f9ad5edf7f61fba80557b6375f1 SHA1 14af6f98bbb4084023c53671011cf30962d2f397 SHA256 6afe8270b102287612b23a672f6fda8c2eb0eb1d0865da8e4599683f994ce0fc
+MISC ChangeLog 27534 RMD160 1fa1068c1f99d2e578d501d663882dcdb12d2495 SHA1 16ea9828e8a02a51c044c194f28db135939d99cb SHA256 d6a52389f0ce792246c4190a20531bbf0fe344ca4549a06738879cb78408af97
 MISC metadata.xml 224 RMD160 d646bef174a902fd1910871e794292c44f292052 SHA1 411f9bc454756fe51f5ff5033b73f91b0b07a204 SHA256 c2d7984543cf5a2770459f930dc78cbe0a220cb3297123dc108b225edc33a822
diff --git a/media-gfx/sane-backends/files/1.0.20-unbreak-udev.diff b/media-gfx/sane-backends/files/1.0.20-unbreak-udev.diff
new file mode 100644
index 000000000000..04f173d4b2e9
--- /dev/null
+++ b/media-gfx/sane-backends/files/1.0.20-unbreak-udev.diff
@@ -0,0 +1,12 @@
+diff -Naur sane-backends-1.0.20-vanilla/tools/sane-desc.c sane-backends-1.0.20/tools/sane-desc.c
+--- sane-backends-1.0.20-vanilla/tools/sane-desc.c	2009-07-04 19:05:52.000000000 +0200
++++ sane-backends-1.0.20/tools/sane-desc.c	2009-07-04 19:07:17.000000000 +0200
+@@ -3475,7 +3475,7 @@
+ 	    }
+ 	}
+       printf ("\n");
+-      printf ("ATTR{idVendor}==\"%s\", ATTR{idProduct}==\"%s\", MODE=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
++      printf ("ATTRS{idVendor}==\"%s\", ATTRS{idProduct}==\"%s\", MODE=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
+ 	      usbid->usb_vendor_id + 2,  usbid->usb_product_id + 2, DEVMODE, DEVGROUP);
+       usbid = usbid->next;
+     }
diff --git a/media-gfx/sane-backends/sane-backends-1.0.20-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.20-r1.ebuild
new file mode 100644
index 000000000000..89254333fe70
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.20-r1.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2009 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.20-r1.ebuild,v 1.1 2009/07/17 20:20:09 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.
+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
+	leo
+	lexmark
+	ma1509
+	matsushita
+	microtek
+	microtek2
+	mustek
+	mustek_pp
+	mustek_usb
+	mustek_usb2
+	nec
+	net
+	niash
+	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 sane_backends_nothing"
+
+# Use old SANE_BACKENDS values as defaults for our USE_EXPAND variable
+for backend in ${IUSE_SANE_BACKENDS}; do
+	IUSE="${IUSE} "
+	if [ -z "${SANE_BACKENDS}" ]; then
+		IUSE="${IUSE}+"
+	else
+		for oldbackend in ${SANE_BACKENDS}; do
+			if [ "${oldbackend}" == "${backend}" ]; then
+				IUSE="${IUSE}+"
+			fi
+		done
+	fi
+	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 )
+	x86? (
+		sane_backends_canon_pp? ( sys-libs/libieee1284 )
+		sane_backends_hpsj5s? ( sys-libs/libieee1284 )
+		sane_backends_mustek_pp? ( sys-libs/libieee1284 )
+		)
+	amd64? (
+		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? ( sys-kernel/linux-headers
+			arm? ( media-libs/libv4l )
+			alpha? ( media-libs/libv4l )
+			amd64? ( media-libs/libv4l )
+			ppc? ( media-libs/libv4l )
+			ppc64? ( media-libs/libv4l )
+			x86? ( media-libs/libv4l )
+			)"
+
+DEPEND="${RDEPEND}
+	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"
+SLOT="0"
+LICENSE="GPL-2 public-domain"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+BACKENDS=""
+
+pkg_setup() {
+
+	ensure_a_backend_is_building
+
+	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
+	IEEE1284_BACKENDS="canon_pp hpsj5s mustek_pp"
+	if ! use x86 && ! use amd64; then
+		tmp="${IUSE_SANE_BACKENDS}"
+		for backend in ${IEEE1284_BACKENDS}; do
+			if [[ "${tmp/$backend/}" != "${IUSE_SANE_BACKENDS}" ]]; then
+				ewarn "You selected a backend which is disabled because it's not usable in your arch."
+			fi
+		done
+	fi
+}
+
+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 "${FILESDIR}/${PV}-unbreak-udev.diff"
+}
+
+src_compile() {
+	append-flags -fno-strict-aliasing
+
+	# if you are using a backend that is not contained in the sane-backends
+	# distribution, it can make sense to build just the libs and no backend
+	# at all.
+	if use sane_backends_nothing; then
+		BACKENDS=" "
+		elog "You are using sane_backends_nothing - disabling all backends!"
+	fi
+	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
+	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 70-libsane.rules
+	cd ../..
+	dodoc NEWS AUTHORS ChangeLog* README README.linux
+	echo "SANE_CONFIG_DIR=/etc/sane.d" >> "${D}"/etc/env.d/30sane
+}
+
+ensure_a_backend_is_building() {
+	use v4l && return
+	use gphoto2 && return
+	use sane_backends_nothing && return
+	for b in ${IUSE_SANE_BACKENDS}; do
+		use "sane_backends_${b}" && return
+	done
+	eerror "You must specify at least one backend or sane_backends_nothing to build."
+	eerror "See \"emerge -pv sane-backends\" for a list."
+	die "No backend selected."
+}