Non-maintainer commit: fix xerox_mfp USB support, bug #368083, and use src_prepare

Package-Manager: portage-2.2.0_alpha34/cvs/Linux x86_64

4 files changed, 306 insertions, 6 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index a6447536ad60..2ac4e99e85a7 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.183 2011/05/08 19:35:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.184 2011/05/19 22:53:48 voyageur Exp $
+
+*sane-backends-1.0.22-r1 (19 May 2011)
+
+  19 May 2011; Bernard Cafarelli <voyageur@gentoo.org>
+  +sane-backends-1.0.22-r1.ebuild,
+  +files/sane-backends-1.0.22-xerox_mfp-usb.patch:
+  Non-maintainer commit: fix xerox_mfp USB support, bug #368083, and use
+  src_prepare
 
 *sane-backends-1.0.22 (08 May 2011)
 
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index ca67924a9d3b..2c4edc0ec216 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 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
@@ -7,6 +7,7 @@ AUX epson2fixes-1.0.19.patch 922 RMD160 bdfa3ffb1bbdf78000531093663c134e7b63958e
 AUX fujitsu_DBG_LEVEL.patch 680 RMD160 ed131cc2269ca0e621b226a34e7a96ed319d0162 SHA1 d7e7022b4ce1a4d07a89013bc566ff573a9445f5 SHA256 b7376d0981dec47d589164151b03cecf4d9855d1b02ed5362c34357847c5376a
 AUX genesys_io.patch 918 RMD160 fe105f644eec67a8626db78820a79f51c55ff2ca SHA1 6b75065e2db52ebc7ea58c89e4b4738a016c5b28 SHA256 c45f86420009e1c12c5cde449509bd7c14e94663b36969ff8f60732cb784eff7
 AUX parallel-install-1.0.19.patch 1117 RMD160 c6bc5abc5275dea4418f61cdd4dc007a45e12454 SHA1 5b5e9082f39d34d68fdefd5531e257fb7f7bdbda SHA256 5c3cb9747058df277eb6d7db8574252149834b61b68e0569ddf61bf67869449f
+AUX sane-backends-1.0.22-xerox_mfp-usb.patch 2308 RMD160 8b5547706e391226c33f8fcaa451c384844afba8 SHA1 1e10c4057d839e7a6263d5721b4b47984d7cbb88 SHA256 d3d9a03cb082fb1b735debbfe8a948cb4cee14b13c53a4cc9cd49f23174972c0
 AUX udev-rule-4.patch 1861 RMD160 eb841e97e2729dd7645df9261178d1f644b20032 SHA1 0d4911e060b683c4ded5eaf016c83f022ac94303 SHA256 d423f5027041c1a8fba0873941ad4fc60bc857b788b4e4bd6896b82942a2ca6c
 AUX udev-rule-5.patch 1462 RMD160 116e50bff2d00238946595136de535bdd0a747ff SHA1 cdbb5db3fe6c8e5660d86be7391e345ea242ba43 SHA256 edcf1275743ea4e418ec1468f990ad005f55f22bdf8ef143beda04fbbe070b6d
 AUX udev-rule-6.patch 1110 RMD160 7ba35f5338db19ce57892aaee5524bb484167b2a SHA1 0afe81c28310e8c54a5e0b205eae860589281bc8 SHA256 54426af647ea4bcc3f1318aa5aeccfe05637546c4edd592774d9948a8298fa75
@@ -27,13 +28,14 @@ EBUILD sane-backends-1.0.19-r2.ebuild 4503 RMD160 f9339b89a1aa6530684e4cd7c721ff
 EBUILD sane-backends-1.0.20-r3.ebuild 4450 RMD160 aa8b68ee5de73e1a07604d5128d4602b99a7c18a SHA1 edf22132f28bb59e19be12d3a35a838b0cbbeaa8 SHA256 b516938dcf9b5c5f4d60cb11f08da29465cfb9eccd0334602c3fcac45aa369fd
 EBUILD sane-backends-1.0.21-r1.ebuild 4594 RMD160 de32cd6548de20b9e2888f4fbedce03b137c1b22 SHA1 77e3cee23e93d4674cabddbc6fd2c26c21e828a1 SHA256 bb5d47586cf04126867146144734b8d1d9fb9d1e896c127d7ad68451d786674c
 EBUILD sane-backends-1.0.21.ebuild 4601 RMD160 e34da90534768f9b9aef1cb81459db3f98e2765e SHA1 00e4b4ea2f184f67274959cbb295cf73f94641ae SHA256 7faea4a57ba759eebd38edd495d5d1dc4a0c10aefce5d2c74fb141a0ee00f1a7
+EBUILD sane-backends-1.0.22-r1.ebuild 4571 RMD160 6439c3240cde4269f0d2323f8ef995b1cd27b46e SHA1 19731e8c36b738484ce43e755e301aa8ecd8e6df SHA256 31e2a590a6419ab531bf5e0310364154c3f7ab743be5169cd988c835239bdb25
 EBUILD sane-backends-1.0.22.ebuild 4530 RMD160 c5ff2b6d21a0923921addd8c26180e206800dca3 SHA1 77e26d387fea0e341b0690751bfb5a2e98669457 SHA256 12f9c785ccf631b0e34e1b899e95e15f165e4b10e63e1015eb07e073ec34d549
-MISC ChangeLog 31279 RMD160 843b72e8def578c6be6666aef053ee582ffa5084 SHA1 d1262e357222373da27bdf91a7fc40b2d9813ea1 SHA256 0acc1ff6878197b66d234de7c0a2900dcc64a5507d7533e9f5efec8947a95e3a
+MISC ChangeLog 31547 RMD160 ab85d1841334582161a540c29b95a12dc268257b SHA1 e18160554da26f9db9dfaead9767234dd2bb6f36 SHA256 179731e86d1fcf7878fc8163943b3b2ec9a9144bdbfb1df1ef8fe87eabd452c3
 MISC metadata.xml 224 RMD160 d646bef174a902fd1910871e794292c44f292052 SHA1 411f9bc454756fe51f5ff5033b73f91b0b07a204 SHA256 c2d7984543cf5a2770459f930dc78cbe0a220cb3297123dc108b225edc33a822
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3G8HEACgkQAiZjviIA2XiIFACg1f+CfRNKajxmPSi2Di0Xw7gB
-aDIAoNeGgodjwzVH1ajcBZ9dRr3jOi1V
-=C0CJ
+iF4EAREIAAYFAk3Vn4kACgkQFYEBGcdFJfLe1QD/TT8KSbpj7YOxA1KlBqxUVc5O
+mKytTulnr1qK5ICdxsIA/2Z+Hg8uVpi3cxYrwkzPfbGq2Tdo20o9fHLG5e8mjUiM
+=pAK8
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.22-xerox_mfp-usb.patch b/media-gfx/sane-backends/files/sane-backends-1.0.22-xerox_mfp-usb.patch
new file mode 100644
index 000000000000..b2b3508523ec
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.22-xerox_mfp-usb.patch
@@ -0,0 +1,73 @@
+From 5ea227caeacd504b64eef301e83fa63e0a25b3f7 Mon Sep 17 00:00:00 2001
+From: Alex Belkin <abc@telekom.ru>
+Date: Tue, 8 Mar 2011 17:57:19 +0300
+Subject: [PATCH] keep usb device by default (correct for bug introduced by tcp sub-backend
+
+---
+ backend/xerox_mfp.c |   27 +++++++++++----------------
+ 1 files changed, 11 insertions(+), 16 deletions(-)
+
+diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c
+index e08b50f..d4672a7 100644
+--- a/backend/xerox_mfp.c
++++ b/backend/xerox_mfp.c
+@@ -37,10 +37,10 @@
+ static const SANE_Device **devlist = NULL;	/* sane_get_devices array */
+ static struct device *devices_head = NULL;	/* sane_get_devices list */
+ 
+-transport available_transports[] = {
++enum { TRANSPORT_USB, TRANSPORT_TCP, TRANSPORTS_MAX };
++transport available_transports[TRANSPORTS_MAX] = {
+     { "usb", usb_dev_request, usb_dev_open, usb_dev_close, usb_configure_device },
+     { "tcp", tcp_dev_request, tcp_dev_open, tcp_dev_close, tcp_configure_device },
+-    { 0 }
+ };
+ 
+ static int resolv_state(int state)
+@@ -824,7 +824,13 @@ free_devices (void)
+   devices_head = NULL;
+ }
+ 
+-/* SANE API ignores return code of this callback */
++static transport *tr_from_devname(SANE_String_Const devname)
++{
++  if (strncmp("tcp", devname, 3) == 0)
++    return &available_transports[TRANSPORT_TCP];
++  return &available_transports[TRANSPORT_USB];
++}
++
+ static SANE_Status
+ list_one_device (SANE_String_Const devname)
+ {
+@@ -839,12 +845,7 @@ list_one_device (SANE_String_Const devname)
+       return SANE_STATUS_GOOD;
+   }
+ 
+-  for (tr = available_transports; tr->ttype; tr++) {
+-    if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
+-      break;
+-  }
+-  if (!tr->ttype)
+-    return SANE_STATUS_INVAL;
++  tr = tr_from_devname(devname);
+ 
+   dev = calloc (1, sizeof (struct device));
+   if (dev == NULL)
+@@ -878,13 +879,7 @@ list_one_device (SANE_String_Const devname)
+ static SANE_Status
+ list_conf_devices (UNUSED (SANEI_Config * config), const char *devname)
+ {
+-    transport *tr;
+-
+-    for (tr = available_transports; tr->ttype; tr++) {
+-	if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
+-	    return tr->configure_device(devname, list_one_device);
+-    }
+-    return	SANE_STATUS_INVAL;
++  return tr_from_devname(devname)->configure_device(devname, list_one_device);
+ }
+ 
+ SANE_Status
+-- 
+1.7.1
+
diff --git a/media-gfx/sane-backends/sane-backends-1.0.22-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.22-r1.ebuild
new file mode 100644
index 000000000000..1ce4e15f9cd5
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.22-r1.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2011 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.22-r1.ebuild,v 1.1 2011/05/19 22:53:48 voyageur Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic multilib
+
+# 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
+	kvs20xx
+	leo
+	lexmark
+	ma1509
+	magicolor
+	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? ( virtual/jpeg )
+	sane_backends_dc240? ( virtual/jpeg )
+	sane_backends_dell1600n_net? ( virtual/jpeg )
+	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
+		virtual/jpeg
+	)
+	v4l? ( media-libs/libv4l )"
+
+DEPEND="${RDEPEND}
+	v4l? ( sys-kernel/linux-headers )
+	doc? (
+		virtual/latex-base
+		|| ( dev-texlive/texlive-latexextra app-text/ptex )
+	)
+	>=sys-apps/sed-4"
+
+# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device)
+RDEPEND="${RDEPEND}
+	!<sys-fs/udev-114"
+
+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"
+SLOT="0"
+LICENSE="GPL-2 public-domain"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+pkg_setup() {
+	enewgroup scanner
+}
+
+src_prepare() {
+	cat >> backend/dll.conf.in <<-EOF
+	# Add support for the HP-specific backend.  Needs net-print/hplip installed.
+	hpaio
+	# Add support for the Epson-specific backend.  Needs media-gfx/iscan installed.
+	epkowa
+	EOF
+	#epatch "${DISTDIR}/${P}-i18n.patch"
+
+	# Bug #368083
+	epatch "${FILESDIR}"/${P}-xerox_mfp-usb.patch
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# the blank is intended - an empty string would result in building ALL backends.
+	local BACKENDS=" "
+
+	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
+
+	local 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}
+}
+
+src_compile() {
+	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 () {
+	emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
+		docdir=/usr/share/doc/${PF} || die
+	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
+		insinto /etc/hotplug/usb
+		exeinto /etc/hotplug/usb
+		doins tools/hotplug/libsane.usermap
+		doexe tools/hotplug/libusbscanner
+		newdoc tools/hotplug/README tools/hotplug/README.hotplug
+		echo >> "${D}"/etc/env.d/30sane "USB_DEVFS_PATH=/dev/bus/usb"
+	fi
+	insinto /$(get_libdir)/udev/rules.d
+	newins tools/udev/libsane.rules 41-libsane.rules
+
+	dodoc NEWS AUTHORS ChangeLog* README README.linux
+	echo "SANE_CONFIG_DIR=/etc/sane.d" >> "${D}"/etc/env.d/30sane
+}