Use id-matching instead of string-matching in the udev-rule

(Portage version: 2.1_pre10-r2)

4 files changed, 96 insertions, 5 deletions

diff --git a/net-print/foo2zjs/ChangeLog b/net-print/foo2zjs/ChangeLog
index 6ea6df9d71da..61239168fc1b 100644
--- a/net-print/foo2zjs/ChangeLog
+++ b/net-print/foo2zjs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-print/foo2zjs
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/ChangeLog,v 1.10 2006/05/03 11:36:51 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/ChangeLog,v 1.11 2006/05/04 12:50:47 genstef Exp $
+
+*foo2zjs-20060501-r1 (04 May 2006)
+
+  04 May 2006; Stefan Schweizer <genstef@gentoo.org>
+  files/foo2zjs-udevfwld-20060501.diff, -foo2zjs-20060501.ebuild,
+  +foo2zjs-20060501-r1.ebuild:
+  Use id-matching instead of string-matching in the udev-rule
 
 *foo2zjs-20060501 (03 May 2006)
 
diff --git a/net-print/foo2zjs/files/digest-foo2zjs-20060501-r1 b/net-print/foo2zjs/files/digest-foo2zjs-20060501-r1
new file mode 100644
index 000000000000..90734e68c873
--- /dev/null
+++ b/net-print/foo2zjs/files/digest-foo2zjs-20060501-r1
@@ -0,0 +1,12 @@
+MD5 cae0d20d3c1d57cd3953d9b335014294 cpplxp.exe 4799488
+RMD160 bcd5ceecca248c90a0d3e99dd55c6e1eedd4de6d cpplxp.exe 4799488
+SHA256 5f4c8b6f20ccf2d525f683847f5dc24bb4c7f58131d6704047d6c9a90d6895af cpplxp.exe 4799488
+MD5 d3968d03f17cf514fc98c4a0a00c2497 foo2zjs-20060501.tar.gz 2127232
+RMD160 39854302ad5ec6e0f0a60c51623a62f7294ef263 foo2zjs-20060501.tar.gz 2127232
+SHA256 160ee980736eb65daebc90c8fa79fe3648084b82375ea6dfb1d01dd0d7391800 foo2zjs-20060501.tar.gz 2127232
+MD5 3b78a08aa968b4c1ed591947721d3e47 m22dlicc.exe 634368
+RMD160 392922135a3f517a76a2b5e8b7200c83e6104ef6 m22dlicc.exe 634368
+SHA256 1d57413f4c36941c64599dae2ac2b1f8a397e128796c2796a108be5b8fd282b3 m22dlicc.exe 634368
+MD5 d680f447a416c5f9041f27c0a1df57a0 m23dlicc.exe 170496
+RMD160 f72be93dfc5c8c9159c75d7204820f1305f47905 m23dlicc.exe 170496
+SHA256 1416cda7e2e3496ff1d121c87dd8984ad1d16ed3396096f05f4919dafd445ae4 m23dlicc.exe 170496
diff --git a/net-print/foo2zjs/files/foo2zjs-udevfwld-20060501.diff b/net-print/foo2zjs/files/foo2zjs-udevfwld-20060501.diff
index 05bfa243c7b9..36e1dcd49c27 100644
--- a/net-print/foo2zjs/files/foo2zjs-udevfwld-20060501.diff
+++ b/net-print/foo2zjs/files/foo2zjs-udevfwld-20060501.diff
@@ -185,7 +185,7 @@ diff -Naupr foo2zjs-20060501.orig/hplj10xx.rules foo2zjs-20060501/hplj10xx.rules
 -KERNEL="lp*", BUS="usb", SYSFS{idVendor}="03f0", SYSFS{product}="HP LaserJet 1018", NAME="usb/%k", SYMLINK="hplj1018%e", MODE="0666", RUN+="/etc/hotplug/usb/hplj1018" 
 -#Own udev rule for HP Laserjet 1020
 -KERNEL="lp*", BUS="usb", SYSFS{idVendor}="03f0", SYSFS{product}="HP LaserJet 1020", NAME="usb/%k", SYMLINK="hplj1020%e", MODE="0666", RUN+="/etc/hotplug/usb/hplj1020" 
-+KERNEL="lp*", BUS="usb", SYSFS{idVendor}="03f0", SYSFS{product}="hp LaserJet 1000", NAME="usb/%k", SYMLINK="hplj1000%e", MODE="0666", RUN+="/sbin/foo2zjs-loadfw 1000" 
-+KERNEL="lp*", BUS="usb", SYSFS{idVendor}="03f0", SYSFS{product}="hp LaserJet 1005", NAME="usb/%k", SYMLINK="hplj1005%e", MODE="0666", RUN+="/sbin/foo2zjs-loadfw 1005" 
-+KERNEL="lp*", BUS="usb", SYSFS{idVendor}="03f0", SYSFS{product}="HP LaserJet 1018", NAME="usb/%k", SYMLINK="hplj1018%e", MODE="0666", RUN+="/sbin/foo2zjs-loadfw 1018" 
-+KERNEL="lp*", BUS="usb", SYSFS{idVendor}="03f0", SYSFS{product}="HP LaserJet 1020", NAME="usb/%k", SYMLINK="hplj1020%e", MODE="0666", RUN+="/sbin/foo2zjs-loadfw 1020" 
++KERNEL="lp*", BUS="usb", SYSFS{idVendor}="03f0", SYSFS{idProduct}="0517", NAME="usb/%k", SYMLINK="hplj1000%e", MODE="0666", RUN+="/sbin/foo2zjs-loadfw 1000" 
++KERNEL="lp*", BUS="usb", SYSFS{idVendor}="03f0", SYSFS{idProduct}="1317", NAME="usb/%k", SYMLINK="hplj1005%e", MODE="0666", RUN+="/sbin/foo2zjs-loadfw 1005" 
++KERNEL="lp*", BUS="usb", SYSFS{idVendor}="03f0", SYSFS{idProduct}="4117", NAME="usb/%k", SYMLINK="hplj1018%e", MODE="0666", RUN+="/sbin/foo2zjs-loadfw 1018" 
++KERNEL="lp*", BUS="usb", SYSFS{idVendor}="03f0", SYSFS{idProduct}="2b17", NAME="usb/%k", SYMLINK="hplj1020%e", MODE="0666", RUN+="/sbin/foo2zjs-loadfw 1020" 
diff --git a/net-print/foo2zjs/foo2zjs-20060501-r1.ebuild b/net-print/foo2zjs/foo2zjs-20060501-r1.ebuild
new file mode 100644
index 000000000000..1ee5d44a25b1
--- /dev/null
+++ b/net-print/foo2zjs/foo2zjs-20060501-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/foo2zjs-20060501-r1.ebuild,v 1.1 2006/05/04 12:50:47 genstef Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Support for printing to ZjStream-based printers"
+HOMEPAGE="http://foo2zjs.rkkda.com/"
+SRC_URI="ftp://ftp.minolta-qms.com/pub/crc/out_going/win/m23dlicc.exe
+		ftp://ftp.minolta-qms.com/pub/crc/out_going/win2000/m22dlicc.exe
+		ftp://ftp.minolta-qms.com/pub/crc/out_going/windows/cpplxp.exe
+		http://dev.gentoo.org/~genstef/files/dist/${P}.tar.gz"
+RESTRICT="nomirror"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="cups foomaticdb usb"
+DEPEND="app-arch/unzip
+	dev-lang/perl"
+RDEPEND="cups? ( net-print/cups )
+	foomaticdb? ( net-print/foomatic )
+	usb? ( || ( sys-fs/udev sys-apps/hotplug ) )"
+KEYWORDS="~x86 ~amd64"
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	# link getweb files in ${S} to get unpacked
+	for i in m23dlicc.exe m22dlicc.exe cpplxp.exe
+	do
+		ln -s ${DISTDIR}/${i} ${S}
+	done
+
+	cd ${S}
+	epatch ${FILESDIR}/foo2zjs-Makefile-20060501.diff
+	epatch ${FILESDIR}/foo2zjs-udevfwld-20060501.diff
+}
+
+src_compile() {
+	emake getweb || die "Failed building getweb script"
+
+	# remove wget as we got the firmware with portage
+	sed -si "s/.*wget.*//" getweb
+	sed -si "s/error \"Couldn't dow.*//" getweb
+	# unpack files
+	./getweb all
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	use foomaticdb && dodir /usr/share/foomatic/db/source
+
+	use cups && dodir /usr/share/cups/model
+
+	make DESTDIR=${D} install \
+		|| die "make install failed"
+
+	if use usb; then
+		if [ -x ${ROOT}/sbin/udevsend ]; then
+			make DESTDIR=${D} install-udev \
+				|| die "make install-udev failed"
+		else
+			make DESTDIR=${D} install-hotplug \
+				|| die "make install-hotplug failed"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	rm ${ROOT}/etc/udev/rules.d/58-foo2zjs.rules
+}