Version bump

4 files changed, 123 insertions, 7 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index d9427e053cca..5c49cccb8d6d 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.53 2004/11/02 20:52:09 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.54 2004/11/16 14:41:59 phosphan Exp $
+
+*sane-backends-1.0.15 (16 Nov 2004)
+
+  16 Nov 2004; Patrick Kursawe <phosphan@gentoo.org>
+  +sane-backends-1.0.15.ebuild:
+  Version bump.
+  Niash support has been added upstream, removing the patch.
+  Brothermfc-Patch needed slight changes.
 
   02 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org>
   sane-backends-1.0.14-r6.ebuild:
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index c92733d204d2..686cab52cc71 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,12 +1,14 @@
-MD5 129137ea3468725df0fd35e98c533cd7 ChangeLog 9350
-MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
+MD5 20cde7a5bd0bf123faeb76d8f7a32df4 sane-backends-1.0.14-r6.ebuild 2806
 MD5 d66d87b38fbf69a3e5901270dc1c9b05 sane-backends-1.0.14-r3.ebuild 2482
+MD5 017f93a13a825047c9149a18345f6729 sane-backends-1.0.15.ebuild 2559
 MD5 41ccd3ca88b24476e6d95ef32d5f5111 sane-backends-1.0.13-r3.ebuild 1717
-MD5 20cde7a5bd0bf123faeb76d8f7a32df4 sane-backends-1.0.14-r6.ebuild 2806
+MD5 129137ea3468725df0fd35e98c533cd7 ChangeLog 9350
+MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
+MD5 365f695ec2c079ac06dd5bbf495f87ce files/linux_sg3_err.h 4894
+MD5 820e842ff4247de984a89752ac129ceb files/libusbscanner-device.patch 582
 MD5 026dc517ef9d45268cd506ec83519a0e files/canoscan-focus.patch 472
-MD5 38efb4d762b212d339caa112194dbf56 files/digest-sane-backends-1.0.14-r3 160
 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 820e842ff4247de984a89752ac129ceb files/libusbscanner-device.patch 582
-MD5 365f695ec2c079ac06dd5bbf495f87ce files/linux_sg3_err.h 4894
+MD5 83640d1e7caa2aa50c676d40b64866c7 files/digest-sane-backends-1.0.15 157
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.15 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.15
new file mode 100644
index 000000000000..4ce538aa12b2
--- /dev/null
+++ b/media-gfx/sane-backends/files/digest-sane-backends-1.0.15
@@ -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.15.ebuild b/media-gfx/sane-backends/sane-backends-1.0.15.ebuild
new file mode 100644
index 000000000000..11efa69feb83
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.15.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2004 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.ebuild,v 1.1 2004/11/16 14:41:59 phosphan Exp $
+
+inherit eutils
+
+IUSE="usb gphoto2 ipv6"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.mostang.com/sane/"
+
+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.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"
+
+
+src_unpack() {
+	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
+
+	#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) $(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
+}