brothermfc-patch added again

(Portage version: 2.0.51.22-r2)

4 files changed, 144 insertions, 2 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index 18dbb7fccf4e..ec88bee71e94 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,13 @@
 # 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.71 2005/08/22 07:26:48 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.72 2005/08/22 08:55:12 phosphan Exp $
+
+*sane-backends-1.0.16-r1 (22 Aug 2005)
+
+  22 Aug 2005; Patrick Kursawe <phosphan@gentoo.org>
+  +sane-backends-1.0.16-r1.ebuild:
+  Adding again the BrotherMFC-Patch from sourceforge, adapted for .16 by Joachim
+  Feise.
 
   22 Aug 2005; Patrick Kursawe <phosphan@gentoo.org>
   sane-backends-1.0.16.ebuild:
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 107d100722d5..f6aebaabab8f 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,9 +1,10 @@
 MD5 ebd00143bfe66f76d0d0da95cbc84923 sane-backends-1.0.15.ebuild 2598
 MD5 544c2bc7c5a23b2ae8280b879eac1fbb sane-backends-1.0.15-r2.ebuild 3912
 MD5 4c8053c87e31c8209998ba49c07d60a5 sane-backends-1.0.13-r3.ebuild 1717
+MD5 7e429a05342bf4244b3d31ec57ab18fa sane-backends-1.0.16-r1.ebuild 3701
 MD5 e73a3bf54c049342701898a62ea3b301 sane-backends-1.0.15-r1.ebuild 2674
 MD5 63791870c63ed2fd6abebe7d7b3ebc85 sane-backends-1.0.16.ebuild 3672
-MD5 05d79b8adc46d6a11a26fb62c6074cd9 ChangeLog 12689
+MD5 0554f088a7ffa5ce26002a8c604f2cf5 ChangeLog 12908
 MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
 MD5 79980449d94fb97178178bef2a1c7443 sane-backends-1.0.15-r3.ebuild 3975
 MD5 365f695ec2c079ac06dd5bbf495f87ce files/linux_sg3_err.h 4894
@@ -15,5 +16,6 @@ MD5 01607471a4380f74f7b9da650e5ca5ad files/digest-sane-backends-1.0.13-r3 160
 MD5 83640d1e7caa2aa50c676d40b64866c7 files/digest-sane-backends-1.0.15-r1 157
 MD5 83640d1e7caa2aa50c676d40b64866c7 files/digest-sane-backends-1.0.15-r2 157
 MD5 d16f7594dad0db0c268e143c3676041e files/digest-sane-backends-1.0.15-r3 220
+MD5 d5d1e4a4c8d3839c16329c105f2580d3 files/digest-sane-backends-1.0.16-r1 151
 MD5 83640d1e7caa2aa50c676d40b64866c7 files/digest-sane-backends-1.0.15 157
 MD5 f6aabb0fd7dcc3cbec039d7774a038b0 files/digest-sane-backends-1.0.16 73
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.16-r1 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.16-r1
new file mode 100644
index 000000000000..c28bef8f1d50
--- /dev/null
+++ b/media-gfx/sane-backends/files/digest-sane-backends-1.0.16-r1
@@ -0,0 +1,2 @@
+MD5 bec9b9262246316b4ebfe2bc7451aa28 sane-backends-1.0.16.tar.gz 3409799
+MD5 321ec37f7229dda4dc86b06301cfad8e sane-1.0.16-brother-driver.diff.bz2 8224
diff --git a/media-gfx/sane-backends/sane-backends-1.0.16-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.16-r1.ebuild
new file mode 100644
index 000000000000..622a388db64c
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.16-r1.ebuild
@@ -0,0 +1,131 @@
+# 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.16-r1.ebuild,v 1.1 2005/08/22 08:55:12 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-libs/libgphoto2 )
+	v4l? ( sys-kernel/linux-headers )"
+
+BROTHERMFCDRIVER="sane-${PV}-brother-driver.diff"
+
+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
+	usb? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2
+		http://dev.gentoo.org/~phosphan/${BROTHERMFCDRIVER}.bz2 )"
+SLOT="0"
+LICENSE="GPL-2 public-domain"
+KEYWORDS="~x86 ~sparc ~ppc ~ppc64 ~amd64 ~alpha ~ia64"
+
+# 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 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 sm3840 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
+
+	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 \
+		|| die "function_name fix failed"
+
+	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"
+		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
+}
+