Fixed #90598 ($SANE_BACKENDS usage)

(Portage version: 2.0.51.19)

8 files changed, 158 insertions, 224 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index 520cf49b43e5..8bb40aedb1f2 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.65 2005/04/27 08:08:38 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.66 2005/05/09 09:45:49 phosphan Exp $
+
+*sane-backends-1.0.15-r2 (09 May 2005)
+
+  09 May 2005; Patrick Kursawe <phosphan@gentoo.org>
+  -sane-backends-1.0.14-r3.ebuild, -sane-backends-1.0.14-r6.ebuild,
+  +sane-backends-1.0.15-r2.ebuild:
+  Compiling (almost) only selected backends using $SANE_BACKENDS now.
+  See bug #90598.
+  The patch by Diego (flameeyes@gentoo.org) also does some cleanups and adds
+  parallel port support for amd64.
+  Cleaning up unused versions.
 
 *sane-backends-1.0.15-r1 (27 Apr 2005)
 
@@ -24,7 +35,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.
 
@@ -45,7 +56,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 96fdf50a3a50..8a5484a8f2d3 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,9 +1,8 @@
-MD5 e6269ace86c387b75b472389e0035c9a sane-backends-1.0.14-r6.ebuild 2805
-MD5 c8907f60d5922fb1d60049928b143590 sane-backends-1.0.14-r3.ebuild 2482
 MD5 f24e9a92ca44a1e7ef7e60ac21db70fc sane-backends-1.0.15.ebuild 2593
+MD5 f48ac702218e95ae87e2b96dfc55a823 sane-backends-1.0.15-r2.ebuild 3902
 MD5 4c8053c87e31c8209998ba49c07d60a5 sane-backends-1.0.13-r3.ebuild 1717
 MD5 315104e179e89c26639041e5e1476eb8 sane-backends-1.0.15-r1.ebuild 2664
-MD5 5474f787f040ac074faf1d807600ec9c ChangeLog 11069
+MD5 35a1f286d0a316be96eb230cc3a6897f ChangeLog 11501
 MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
 MD5 365f695ec2c079ac06dd5bbf495f87ce files/linux_sg3_err.h 4894
 MD5 f49c8e2b591496e87e91ae243d9864d0 files/sane-backend-1.0.15-gt68xx-update67.patch 5682
@@ -11,7 +10,6 @@ MD5 820e842ff4247de984a89752ac129ceb files/libusbscanner-device.patch 582
 MD5 026dc517ef9d45268cd506ec83519a0e files/canoscan-focus.patch 472
 MD5 cb4dcb744752238bdfed71fdcce81c79 files/libusbscanner-device-r1.patch 681
 MD5 01607471a4380f74f7b9da650e5ca5ad files/digest-sane-backends-1.0.13-r3 160
-MD5 38efb4d762b212d339caa112194dbf56 files/digest-sane-backends-1.0.14-r3 160
-MD5 e8109e4fa602f9e29257c4abea88f69d files/digest-sane-backends-1.0.14-r6 229
 MD5 83640d1e7caa2aa50c676d40b64866c7 files/digest-sane-backends-1.0.15-r1 157
+MD5 83640d1e7caa2aa50c676d40b64866c7 files/digest-sane-backends-1.0.15-r2 157
 MD5 83640d1e7caa2aa50c676d40b64866c7 files/digest-sane-backends-1.0.15 157
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.14-r3 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.14-r3
deleted file mode 100644
index 3249e577723f..000000000000
--- a/media-gfx/sane-backends/files/digest-sane-backends-1.0.14-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7ae5bf91aea34ef7956df6f53cf073bd sane-backends-1.0.14.tar.gz 3198777
-MD5 643de6a8321df8ef561170610b91b538 sane-backends-1.0.13-brothermfc-r1.patch.bz2 9727
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.14-r6 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.14-r6
deleted file mode 100644
index df429dcc0a62..000000000000
--- a/media-gfx/sane-backends/files/digest-sane-backends-1.0.14-r6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7ae5bf91aea34ef7956df6f53cf073bd sane-backends-1.0.14.tar.gz 3198777
-MD5 1b2f83dcb5dae520ef845d071bceb4f5 backend-20040723_1.tar.gz 31201
-MD5 643de6a8321df8ef561170610b91b538 sane-backends-1.0.13-brothermfc-r1.patch.bz2 9727
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.15-r2 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.15-r2
new file mode 100644
index 000000000000..4ce538aa12b2
--- /dev/null
+++ b/media-gfx/sane-backends/files/digest-sane-backends-1.0.15-r2
@@ -0,0 +1,2 @@
+MD5 3b804f35cdfbc5ad2d201ffe078bbac9 sane-backends-1.0.15.tar.gz 3231759
+MD5 f2d2c62caf1d4e12005fbb8ee62a5f39 sane-backends-1.0.15-brothermfc.patch.bz2 9753
diff --git a/media-gfx/sane-backends/sane-backends-1.0.14-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.14-r3.ebuild
deleted file mode 100644
index a4f3917a914d..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.14-r3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# 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.14-r3.ebuild,v 1.14 2005/01/10 09:47:04 phosphan Exp $
-
-inherit eutils
-
-IUSE="usb gphoto2"
-
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.sane-project.org/"
-
-DEPEND=">=media-libs/jpeg-6b
-	x86? ( sys-libs/libieee1284 )
-	=sys-apps/sed-4*
-	usb? ( dev-libs/libusb )
-	gphoto2? ( media-gfx/gphoto2 )"
-
-BROTHERMFCDRIVER="sane-backends-1.0.13-brothermfc-r1.patch"
-
-SRC_URI="ftp://ftp.mostang.com/pub/sane/${P}/${P}.tar.gz
-	ftp://ftp.mostang.com/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"
-
-
-src_unpack() {
-	unpack ${A}
-	use usb && unpack ${BROTHERMFCDRIVER}.bz2
-	cp ${FILESDIR}/linux_sg3_err.h ${S}/sanei
-
-	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
-	#compile errors when using NDEBUG otherwise
-	sed -i -e 's:function_name:__FUNCTION__:g' backend/artec_eplus48u.c
-	use usb && epatch ${WORKDIR}/${BROTHERMFCDRIVER}
-	use usb && epatch ${FILESDIR}/libusbscanner-device-r1.patch
-}
-
-src_compile() {
-	local myconf
-	myconf="$(use_enable usb libusb) $(use_with gphoto2)"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--host=${CHOST} ${myconf} || die
-	make || die
-	if use usb; then
-		cd tools/hotplug
-		grep < libsane.usermap -v '^$' > libsane.usermap.new
-		mv libsane.usermap.new libsane.usermap
-	fi
-}
-
-src_install () {
-
-
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		mandir=${D}/usr/share/man \
-		docdir=${D}/usr/share/doc/${PF} \
-		install || die
-
-	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
-}
-
-pkg_postinst() {
-	if use usb; then
-		einfo "There are some problems with the hotplug script when"
-		einfo "restarting hotplug with some kernel versions."
-		einfo "If you have trouble, please edit"
-		einfo "/etc/hotplug/usb/libusbscanner"
-		einfo "and see bug #50934 for details."
-	fi
-}
diff --git a/media-gfx/sane-backends/sane-backends-1.0.14-r6.ebuild b/media-gfx/sane-backends/sane-backends-1.0.14-r6.ebuild
deleted file mode 100644
index 4c04f86d476f..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.14-r6.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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.14-r6.ebuild,v 1.7 2005/01/10 09:47:04 phosphan Exp $
-
-inherit eutils
-
-IUSE="usb gphoto2 ipv6"
-
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.sane-project.org/"
-
-DEPEND=">=media-libs/jpeg-6b
-	x86? ( sys-libs/libieee1284 )
-	=sys-apps/sed-4*
-	usb? ( dev-libs/libusb )
-	gphoto2? ( media-gfx/gphoto2 )"
-
-BROTHERMFCDRIVER="sane-backends-1.0.13-brothermfc-r1.patch"
-
-SRC_URI="ftp://ftp.mostang.com/pub/sane/${P}/${P}.tar.gz
-	ftp://ftp.mostang.com/pub/sane/old-versions/${P}/${P}.tar.gz
-	usb? ( mirror://sourceforge/hp3300backend/backend-20040723_1.tar.gz )
-	usb? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2 )"
-SLOT="0"
-LICENSE="GPL-2 public-domain"
-KEYWORDS="x86 sparc ~ppc ~ppc64 amd64"
-
-
-src_unpack() {
-	unpack ${A}
-	use usb && unpack ${BROTHERMFCDRIVER}.bz2
-	cp ${FILESDIR}/linux_sg3_err.h ${S}/sanei
-
-	cd ${S}
-
-	epatch ${FILESDIR}/canoscan-focus.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
-	use usb && epatch ${WORKDIR}/${BROTHERMFCDRIVER}
-	use usb && epatch ${FILESDIR}/libusbscanner-device-r1.patch
-
-	if use usb; then
-		#patch sane-backends for NIASH chip support
-		einfo "Applying NIASH chip support patch"
-		cd ${WORKDIR}/backend
-		chmod +x patch-sane.sh
-		./patch-sane.sh ${S}
-	fi
-}
-
-src_compile() {
-	local myconf
-	myconf="$(use_enable usb libusb) $(use_with gphoto2) $(use_enable ipv6)"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--host=${CHOST} ${myconf} || die
-	make || die
-	if use usb; then
-		cd tools/hotplug
-		grep < libsane.usermap -v '^$' > libsane.usermap.new
-		mv libsane.usermap.new libsane.usermap
-	fi
-}
-
-src_install () {
-
-
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		mandir=${D}/usr/share/man \
-		docdir=${D}/usr/share/doc/${PF} \
-		install || die
-
-	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
-}
-
-pkg_postinst() {
-	if use usb; then
-		einfo "There are some problems with the hotplug script when"
-		einfo "restarting hotplug with some kernel versions."
-		einfo "If you have trouble, please edit"
-		einfo "/etc/hotplug/usb/libusbscanner"
-		einfo "and see bug #50934 for details."
-	fi
-}
diff --git a/media-gfx/sane-backends/sane-backends-1.0.15-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.15-r2.ebuild
new file mode 100644
index 000000000000..621b98147fc1
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.15-r2.ebuild
@@ -0,0 +1,139 @@
+# 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.15-r2.ebuild,v 1.1 2005/05/09 09:45:49 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-gfx/gphoto2 )
+	v4l? ( sys-kernel/linux-headers )"
+
+BROTHERMFCDRIVER="sane-backends-1.0.15-brothermfc.patch"
+
+SRC_URI="ftp://ftp.mostang.com/pub/sane/${P}/${P}.tar.gz
+	ftp://ftp.mostang.com/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"
+
+# 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 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 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 ${FILESDIR}/sane-backend-1.0.15-gt68xx-update67.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
+
+	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
+}
+
+pkg_postinst() {
+	if use usb; then
+		einfo "There are some problems with the hotplug script when"
+		einfo "restarting hotplug with some kernel versions."
+		einfo "If you have trouble, please edit"
+		einfo "/etc/hotplug/usb/libusbscanner"
+		einfo "and see bug #50934 for details."
+	fi
+}