Fixing the LaTeX mess (I hope), see bug #199303

Package-Manager: portage-2.1.3.19

4 files changed, 173 insertions, 6 deletions

diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 45304952dde2..d78d812c8155 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -38,10 +38,14 @@ EBUILD sane-backends-1.0.18-r4.ebuild 4179 RMD160 e9e7bb76c4dd362dc4fc4db9f384b7
 MD5 d0d7b6d0cb26742fe30b815c9633fab3 sane-backends-1.0.18-r4.ebuild 4179
 RMD160 e9e7bb76c4dd362dc4fc4db9f384b706f1d3f3ba sane-backends-1.0.18-r4.ebuild 4179
 SHA256 d40e025b2712f5cbf512479fd29820a0936a505b306b3eabfe36db2e2be20437 sane-backends-1.0.18-r4.ebuild 4179
-EBUILD sane-backends-1.0.18-r5.ebuild 4196 RMD160 08d61a509a3a7cb722b529a85c125bbf9ed57343 SHA1 0fa41e0997e4b4198855396ab7da72a90024cc6d SHA256 1c5999bfa7192bf75bda5ef092a8ec086796cf63ebe7ed8acedca0927d27ec9b
-MD5 728b5a513468d0b14b3f195fdb4cca78 sane-backends-1.0.18-r5.ebuild 4196
-RMD160 08d61a509a3a7cb722b529a85c125bbf9ed57343 sane-backends-1.0.18-r5.ebuild 4196
-SHA256 1c5999bfa7192bf75bda5ef092a8ec086796cf63ebe7ed8acedca0927d27ec9b sane-backends-1.0.18-r5.ebuild 4196
+EBUILD sane-backends-1.0.18-r5.ebuild 4200 RMD160 70ce6ea4a28421d2fa85ce641a44b71317c742a2 SHA1 0662aecdcadc70aa2472a8fdf41e5539d9524adc SHA256 f33e430d113799625991cd8b137e10bae46801c4cd9074c5eaf1cda29b063f23
+MD5 3aca79b03d02abae1156d2e3a9f43adf sane-backends-1.0.18-r5.ebuild 4200
+RMD160 70ce6ea4a28421d2fa85ce641a44b71317c742a2 sane-backends-1.0.18-r5.ebuild 4200
+SHA256 f33e430d113799625991cd8b137e10bae46801c4cd9074c5eaf1cda29b063f23 sane-backends-1.0.18-r5.ebuild 4200
+EBUILD sane-backends-1.0.18-r6.ebuild 4376 RMD160 6e8d86b795bc1d39847733e1578de3a4298aa6a4 SHA1 be371c01a4a4ef8ebaaa39509b9bfe2cc501cbb7 SHA256 05d5f3fa1e4be271d5dbaabfdb1f471b57de48417640a51147106a8e86aa01ff
+MD5 2b3b0d1ac231240ee74f70f3481150a7 sane-backends-1.0.18-r6.ebuild 4376
+RMD160 6e8d86b795bc1d39847733e1578de3a4298aa6a4 sane-backends-1.0.18-r6.ebuild 4376
+SHA256 05d5f3fa1e4be271d5dbaabfdb1f471b57de48417640a51147106a8e86aa01ff sane-backends-1.0.18-r6.ebuild 4376
 MISC ChangeLog 21529 RMD160 cc6894f8b42fc4371fb72ab72ccbcba1706860d3 SHA1 dd7ffac799095170b859f9703e01d493be4bbd74 SHA256 7f1fb75d9a97602bfad23465113cc3143538cd21715814b654d21216a29d1407
 MD5 e688606997d89e78c450574e6139b9d5 ChangeLog 21529
 RMD160 cc6894f8b42fc4371fb72ab72ccbcba1706860d3 ChangeLog 21529
@@ -65,3 +69,6 @@ SHA256 64854e40d74b4a1b27aea1b2f5b5accdd348b8a835e9d8898b6f3dc5904f19a8 files/di
 MD5 a5adbad07b9aed2a03f518664e2d94e6 files/digest-sane-backends-1.0.18-r5 545
 RMD160 b2327e4254ffcf2074c21f2b1c629014ab83ed14 files/digest-sane-backends-1.0.18-r5 545
 SHA256 64854e40d74b4a1b27aea1b2f5b5accdd348b8a835e9d8898b6f3dc5904f19a8 files/digest-sane-backends-1.0.18-r5 545
+MD5 a5adbad07b9aed2a03f518664e2d94e6 files/digest-sane-backends-1.0.18-r6 545
+RMD160 b2327e4254ffcf2074c21f2b1c629014ab83ed14 files/digest-sane-backends-1.0.18-r6 545
+SHA256 64854e40d74b4a1b27aea1b2f5b5accdd348b8a835e9d8898b6f3dc5904f19a8 files/digest-sane-backends-1.0.18-r6 545
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.18-r6 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.18-r6
new file mode 100644
index 000000000000..5242a0c5bacf
--- /dev/null
+++ b/media-gfx/sane-backends/files/digest-sane-backends-1.0.18-r6
@@ -0,0 +1,6 @@
+MD5 69b18ea038b8cd0e289c04c512b43b8e sane-1.0.18-brother-driver.diff.bz2 8335
+RMD160 8d86dccca4054699e367412c25d80d8641de42ca sane-1.0.18-brother-driver.diff.bz2 8335
+SHA256 4a2eceb222f6cd55979fd150c4a7c365a9a83f2beab15045852f8859404de23b sane-1.0.18-brother-driver.diff.bz2 8335
+MD5 7ca7e2908e24721471de92cf40c75e60 sane-backends-1.0.18.tar.gz 3789493
+RMD160 aa863adff417d7c33cbb85c193878aa54a056100 sane-backends-1.0.18.tar.gz 3789493
+SHA256 d7876a78c5676b0c4bc29091c7a7e1287b5c0be5ff5bb61ef033fbffc73d66f3 sane-backends-1.0.18.tar.gz 3789493
diff --git a/media-gfx/sane-backends/sane-backends-1.0.18-r5.ebuild b/media-gfx/sane-backends/sane-backends-1.0.18-r5.ebuild
index 1f7d9cc37b8f..9e3320dd0bc8 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.18-r5.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.18-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.18-r5.ebuild,v 1.1 2007/10/05 07:32:03 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.18-r5.ebuild,v 1.2 2008/01/18 14:24:56 phosphan Exp $
 
 inherit eutils
 
diff --git a/media-gfx/sane-backends/sane-backends-1.0.18-r6.ebuild b/media-gfx/sane-backends/sane-backends-1.0.18-r6.ebuild
new file mode 100644
index 000000000000..a4745bcb98d0
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.18-r6.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2008 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.18-r6.ebuild,v 1.1 2008/01/18 14:24:56 phosphan Exp $
+
+inherit eutils
+
+IUSE="usb gphoto2 ipv6 v4l doc"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/"
+
+RDEPEND=">=media-libs/jpeg-6b
+	amd64? ( sys-libs/libieee1284 )
+	x86? ( sys-libs/libieee1284 )
+	usb? ( >=dev-libs/libusb-0.1.8 )
+	gphoto2? ( media-libs/libgphoto2 )
+	v4l? ( sys-kernel/linux-headers )"
+
+DEPEND="${RDEPEND}
+	doc? (
+		|| ( app-text/tetex
+				(
+					app-text/texlive
+					dev-texlive/texlive-latexextra
+				)
+			)
+	)
+	>=sys-apps/sed-4"
+
+# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device)
+RDEPEND="${RDEPEND}
+	!<sys-fs/udev-114"
+
+BROTHERMFCPATCHVER="1.0.18"
+BROTHERMFCDRIVER="sane-${BROTHERMFCPATCHVER}-brother-driver.diff"
+
+# Could not access via ftp on 2006-07-20
+SRC_URI="http://alioth.debian.org/download.php/1669/sane-backends-1.0.18.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
+	usb? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2
+		http://dev.gentoo.org/~phosphan/${BROTHERMFCDRIVER}.bz2 )"
+SLOT="0"
+LICENSE="GPL-2 public-domain"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# To enable specific backends, define SANE_BACKENDS with the backends you want
+# in those:
+#
+# abaton agfafocus apple artec as6e avision bh brother canon
+# canon630u coolscan coolscan2 dc25 dmc
+# epson fujitsu genesys gt68xx hp leo lexmark matsushita microtek
+# microtek2 mustek mustek_usb nec pie pixma 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 sm3840 hp4200
+# sm3600 hp3500 stv680"
+
+# Note that some backends has specific dependencies which make the compilation
+# fail because not supported on your current platform.
+
+pkg_setup() {
+	enewgroup scanner
+
+	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
+		elog "You can use the variable SANE_BACKENDS to pick backends"
+		elog "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
+
+	if ! use doc; then
+		sed -i -e 's:@USE_LATEX@:no:' doc/Makefile.in
+	fi
+
+	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"
+	fi
+	epatch "${FILESDIR}"/udev-rule-4.patch
+	epatch "${FILESDIR}"/broken_coolscan.patch
+}
+
+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 () {
+	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
+}