summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2006-06-02 16:01:23 +0000
committerStefan Schweizer <genstef@gentoo.org>2006-06-02 16:01:23 +0000
commit7ac958f604615da6c944557eb905e678e00e8b79 (patch)
tree4378948c4428fbd28895c57a2bccfbcde905f09a /net-print/foo2zjs/files
parentRemove old broken releases. This package is ~arch only because upstream does ... (diff)
downloadgentoo-2-7ac958f604615da6c944557eb905e678e00e8b79.tar.gz
gentoo-2-7ac958f604615da6c944557eb905e678e00e8b79.tar.bz2
gentoo-2-7ac958f604615da6c944557eb905e678e00e8b79.zip
Remove old broken releases. This package is ~arch only because upstream does not liek the idea of users using old releases. Thanks to Asfand Yar Qazi <ayqazi@yahoo.co.uk> in bug 135155
(Portage version: 2.1_rc3-r5) (Unsigned Manifest commit)
Diffstat (limited to 'net-print/foo2zjs/files')
-rw-r--r--net-print/foo2zjs/files/digest-foo2zjs-2005031910
-rw-r--r--net-print/foo2zjs/files/digest-foo2zjs-20060501-r112
-rw-r--r--net-print/foo2zjs/files/foo2zjs-Makefile-20060501.diff143
-rw-r--r--net-print/foo2zjs/files/foo2zjs-Makefile.patch116
-rw-r--r--net-print/foo2zjs/files/foo2zjs-udevfwld-20060501.diff191
-rw-r--r--net-print/foo2zjs/files/hp-printer-udev.patch27
6 files changed, 0 insertions, 499 deletions
diff --git a/net-print/foo2zjs/files/digest-foo2zjs-20050319 b/net-print/foo2zjs/files/digest-foo2zjs-20050319
deleted file mode 100644
index 7258d9dce065..000000000000
--- a/net-print/foo2zjs/files/digest-foo2zjs-20050319
+++ /dev/null
@@ -1,10 +0,0 @@
-MD5 cae0d20d3c1d57cd3953d9b335014294 cpplxp.exe 4799488
-RMD160 bcd5ceecca248c90a0d3e99dd55c6e1eedd4de6d cpplxp.exe 4799488
-SHA256 5f4c8b6f20ccf2d525f683847f5dc24bb4c7f58131d6704047d6c9a90d6895af cpplxp.exe 4799488
-MD5 36ca0680a7b22c9b5cd1f8b34ab48cd8 foo2zjs-20050319.tar.gz 972297
-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/digest-foo2zjs-20060501-r1 b/net-print/foo2zjs/files/digest-foo2zjs-20060501-r1
deleted file mode 100644
index 90734e68c873..000000000000
--- a/net-print/foo2zjs/files/digest-foo2zjs-20060501-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-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-Makefile-20060501.diff b/net-print/foo2zjs/files/foo2zjs-Makefile-20060501.diff
deleted file mode 100644
index 0c68c7240dd6..000000000000
--- a/net-print/foo2zjs/files/foo2zjs-Makefile-20060501.diff
+++ /dev/null
@@ -1,143 +0,0 @@
-diff -Naupr foo2zjs-20060501.orig/Makefile foo2zjs-20060501/Makefile
---- foo2zjs-20060501.orig/Makefile 2006-05-03 10:35:10.000000000 +0200
-+++ foo2zjs-20060501/Makefile 2006-05-03 10:35:58.000000000 +0200
-@@ -7,7 +7,7 @@ VERSION=0.0
-
- # Installation prefix...
- PREFIX=/usr/local
--PREFIX=/usr
-+PREFIX=$(DESTDIR)/usr
-
- # Pathnames for this package...
- BIN=$(PREFIX)/bin
-@@ -18,7 +18,7 @@ MANDIR=$(PREFIX)/share/man
- DOCDIR=$(PREFIX)/share/doc/foo2zjs/
-
- # Pathnames for referenced packages...
--FOODB=/usr/share/foomatic/db/source
-+FOODB=$(PREFIX)/share/foomatic/db/source
-
- # User ID's
- LPuid=-olp
-@@ -155,7 +155,7 @@ ifeq ($(UNAME),Linux)
- endif
-
- # Compiler flags
--CFLAGS += -O2 -Wall
-+CFLAGS ?= -O2 -Wall
-
- #
- # Rules to create test documents
-@@ -306,12 +306,14 @@ install-test:
-
-
- install-prog:
-+ [ -d $(BIN) ] || install -d -m 755 $(BIN)/
-+ [ -d $(DESTDIR)/bin/ ] || install -d -m 755 $(DESTDIR)/bin/
- #
- # Install driver, wrapper, and development tools
- #
- install -c $(PROGS) $(SHELLS) $(BIN)/
- if [ "$(BINPROGS)" != "" ]; then \
-- install -c $(BINPROGS) /bin/; \
-+ install -c $(BINPROGS) $(DESTDIR)/bin/; \
- fi
- #
- # Install gamma correction files. These are just templates,
-@@ -337,6 +339,7 @@ install-foo:
- #
- @if [ -d $(FOODB) ]; then \
- for dir in driver printer opt; do \
-+ [ -d $(FOODB)/$$dir/ ] || install -d -m 755 $(FOODB)/$$dir/; \
- echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
- install -c -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
- done \
-@@ -354,10 +357,10 @@ install-foo:
- #
- # Clear foomatic cache and rebuild database if needed
- #
-- rm -rf /var/cache/foomatic/*/*
-- rm -f /var/cache/foomatic/printconf.pickle
-- if [ -d /var/cache/foomatic/compiled ]; then \
-- cd /var/cache/foomatic/compiled; \
-+ rm -rf $(DESTDIR)/var/cache/foomatic/*/*
-+ rm -f $(DESTDIR)/var/cache/foomatic/printconf.pickle
-+ if [ -d $(DESTDIR)/var/cache/foomatic/compiled ]; then \
-+ cd $(DESTDIR)/var/cache/foomatic/compiled; \
- foomatic-combo-xml -O >overview.xml; \
- fi
-
-@@ -421,8 +424,8 @@ install-extra:
- fi; \
- done
-
--MODEL=/usr/share/cups/model
--LOCALMODEL=/usr/local/share/cups/model
-+MODEL=$(PREFIX)/share/cups/model
-+#LOCALMODEL=/usr/local/share/cups/model
- install-ppd:
- #
- # Install PPD files for CUPS
-@@ -439,22 +442,20 @@ install-ppd:
- done; \
- fi
-
--USBDIR=/etc/hotplug/usb
--UDEVDIR=/etc/udev/rules.d
--RULES=hplj10xx.rules
-+USBDIR=$(DESTDIR)/etc/hotplug/usb
- install-hotplug:
- [ -d $(USBDIR) ] || install -d -m 755 $(USBDIR)/
- install -c -m 755 hplj1000 $(USBDIR)/
- ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1005
- ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1018
- ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1020
-- $(USBDIR)/hplj1000 install-usermap
-- $(USBDIR)/hplj1005 install-usermap
-- $(USBDIR)/hplj1018 install-usermap
-- $(USBDIR)/hplj1020 install-usermap
-- if [ -d $(UDEVDIR) ]; then \
-- install -c -m 644 $(RULES) $(UDEVDIR)/11-$(RULES); \
-- fi
-+ install -c -m 644 hplj.usermap $(USBDIR)/
-+
-+UDEVDIR=$(DESTDIR)/etc/udev/rules.d
-+RULES=hplj10xx.rules
-+install-udev:
-+ [ -d $(UDEVDIR) ] || install -d -m 755 $(UDEVDIR)/
-+ install -c -m 644 $(RULES) $(UDEVDIR)/11-$(RULES)
-
- cups: FRC
- if [ -x /etc/init.d/cups ]; then \
-@@ -747,7 +748,6 @@ install-doc: doc
- install -c -m 644 README $(DOCDIR)
- install -c -m 644 ChangeLog $(DOCDIR)
-
--GROFF=/usr/local/test/bin/groff
- GROFF=groff
- manual.pdf: $(MANPAGES)
- -$(GROFF) -t -man $(MANPAGES) | ps2pdf - $@
-diff -Naupr foo2zjs-20060501.orig/hplj.usermap foo2zjs-20060501/hplj.usermap
---- foo2zjs-20060501.orig/hplj.usermap 1970-01-01 01:00:00.000000000 +0100
-+++ foo2zjs-20060501/hplj.usermap 2006-05-03 10:34:07.000000000 +0200
-@@ -0,0 +1,4 @@
-+hplj1000 0x0003 0x03f0 0x0517 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
-+hplj1005 0x0003 0x03f0 0x1317 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
-+hplj1018 0x0003 0x03f0 0x4117 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
-+hplj1020 0x0003 0x03f0 0x2b17 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
-diff -Naupr foo2zjs-20060501.orig/icc2ps/Makefile foo2zjs-20060501/icc2ps/Makefile
---- foo2zjs-20060501.orig/icc2ps/Makefile 2006-05-03 10:35:10.000000000 +0200
-+++ foo2zjs-20060501/icc2ps/Makefile 2006-05-03 10:34:04.000000000 +0200
-@@ -1,10 +1,10 @@
--PREFIX= /usr
-+PREFIX= $(DESTDIR)/usr
- BIN= $(PREFIX)/bin
- SRC= icc2ps.c xgetopt.c
- LIB= cmscam97.c cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \
- cmslut.c cmsmatsh.c cmsmtrx.c cmsnamed.c cmspack.c cmspcs.c cmsps2.c \
- cmssamp.c cmswtpnt.c cmsxform.c
--CFLAGS= -O3
-+CFLAGS?= -O3
-
- all: foo2zjs-icc2ps
-
diff --git a/net-print/foo2zjs/files/foo2zjs-Makefile.patch b/net-print/foo2zjs/files/foo2zjs-Makefile.patch
deleted file mode 100644
index 4575b2d50db7..000000000000
--- a/net-print/foo2zjs/files/foo2zjs-Makefile.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff -Naur foo2zjs.orig/hplj.usermap foo2zjs/hplj.usermap
---- foo2zjs.orig/hplj.usermap 1970-01-01 01:00:00.000000000 +0100
-+++ foo2zjs/hplj.usermap 2004-11-17 13:17:17.897613136 +0100
-@@ -0,0 +1,2 @@
-+hplj1000 0x0003 0x03f0 0x0517 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
-+hplj1005 0x0003 0x03f0 0x1317 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
-diff -Naur foo2zjs.orig/Makefile foo2zjs/Makefile
---- foo2zjs.orig/Makefile 2004-09-24 18:41:29.000664696 +0200
-+++ foo2zjs/Makefile 2004-09-24 18:43:35.552425904 +0200
-@@ -6,8 +6,8 @@
- VERSION=0.0
-
- # Installation prefix...
--PREFIX=/usr/local
--PREFIX=/usr
-+PREFIX=$(DESTDIR)/usr/local
-+PREFIX=$(DESTDIR)/usr
-
- # Pathnames for this package...
- BIN=$(PREFIX)/bin
-@@ -17,7 +17,7 @@
- DOCDIR=$(PREFIX)/share/doc/foo2zjs/
-
- # Pathnames for referenced packages...
--FOODB=/usr/share/foomatic/db/source
-+FOODB=$(PREFIX)/share/foomatic/db/source
-
- # User ID's
- LPuid=-olp
-@@ -113,9 +113,6 @@
- endif
- endif
-
--# Compiler flags
--CFLAGS += -O2 -Wall
--
- #
- # Rules to create test documents
- #
-@@ -210,6 +207,7 @@
- # On Suse 9.0, run "yast"
-
- install-prog:
-+ [ -d $(BIN) ] || install -d -m 755 $(BIN)/
- #
- # Install driver, wrapper, and development tools
- #
-@@ -237,6 +235,7 @@
- #
- @if [ -d $(FOODB) ]; then \
- for dir in driver printer opt; do \
-+ [ -d $(FOODB)/$$dir/ ] || install -d -m 755 $(FOODB)/$$dir/; \
- echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
- install -c -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
- done \
-@@ -254,9 +253,9 @@
- #
- # Clear foomatic cache and rebuild database if needed
- #
-- rm -rf /var/cache/foomatic/*/*
-- if [ -d /var/cache/foomatic/compiled ]; then \
-- cd /var/cache/foomatic/compiled; \
-+ rm -rf $(DESTDIR)/var/cache/foomatic/*/*
-+ if [ -d $(DESTDIR)/var/cache/foomatic/compiled ]; then \
-+ cd $(DESTDIR)/var/cache/foomatic/compiled; \
- foomatic-combo-xml -O >overview.xml; \
- fi
-
-@@ -303,13 +302,12 @@
- # foo2oak ICM files (if any)
- install $(LPuid) $(LPgid) -m 775 -d $(SHAREOAK)/icm/
-
--USBDIR=/etc/hotplug/usb
-+USBDIR=$(DESTDIR)/etc/hotplug/usb
- install-hotplug:
- [ -d $(USBDIR) ] || install -d -m 755 $(USBDIR)/
- install -c -m 755 hplj1000 $(USBDIR)/
- ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1005
-- $(USBDIR)/hplj1000 install-usermap
-- $(USBDIR)/hplj1005 install-usermap
-+ install -c -m 755 hplj.usermap $(USBDIR)/
-
- clean:
- -rm -f foo2zjs zjsdecode
-@@ -461,7 +459,7 @@
- ppd:
- ./getweb ppd
-
--MODEL=/usr/share/cups/model
-+MODEL=$(PREFIX)/share/cups/model
- install-ppd:
- #
- # Install PPD files for CUPS
-@@ -518,7 +516,6 @@
- install -c -m 644 README $(DOCDIR)
- install -c -m 644 ChangeLog $(DOCDIR)
-
--GROFF=/usr/local/test/bin/groff
- GROFF=groff
- manual.pdf: $(MANPAGES)
- -$(GROFF) -t -man $(MANPAGES) | ps2pdf - $@
-diff -Naur foo2zjs.org/icc2ps/Makefile foo2zjs/icc2ps/Makefile
---- foo2zjs.org/icc2ps/Makefile 2004-09-23 23:24:36.592184368 +0200
-+++ foo2zjs/icc2ps/Makefile 2004-09-23 22:54:18.264612176 +0200
-@@ -1,10 +1,9 @@
--PREFIX= /usr
-+PREFIX= $(DESTDIR)/usr
- BIN= $(PREFIX)/bin
- SRC= icc2ps.c xgetopt.c
- LIB= cmscam97.c cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \
- cmslut.c cmsmatsh.c cmsmtrx.c cmsnamed.c cmspack.c cmspcs.c cmsps2.c \
- cmssamp.c cmswtpnt.c cmsxform.c
--CFLAGS= -O3
-
- all: foo2zjs-icc2ps
-
diff --git a/net-print/foo2zjs/files/foo2zjs-udevfwld-20060501.diff b/net-print/foo2zjs/files/foo2zjs-udevfwld-20060501.diff
deleted file mode 100644
index 36e1dcd49c27..000000000000
--- a/net-print/foo2zjs/files/foo2zjs-udevfwld-20060501.diff
+++ /dev/null
@@ -1,191 +0,0 @@
-diff -Naupr foo2zjs-20060501.orig/Makefile foo2zjs-20060501/Makefile
---- foo2zjs-20060501.orig/Makefile 2006-05-03 10:36:21.000000000 +0200
-+++ foo2zjs-20060501/Makefile 2006-05-03 10:38:19.000000000 +0200
-@@ -9,6 +9,10 @@ VERSION=0.0
- PREFIX=/usr/local
- PREFIX=$(DESTDIR)/usr
-
-+# USB_PRINTERID is also installed there because it is needed by the FWloader
-+FWLOADERDIR=$(DESTDIR)/sbin
-+FIRMWAREDIR=$(DESTDIR)/lib/firmware
-+
- # Pathnames for this package...
- BIN=$(PREFIX)/bin
- SHAREZJS=$(PREFIX)/share/foo2zjs
-@@ -406,12 +410,12 @@ install-extra:
- fi; \
- done
- # foo2zjs Firmware files (if any)
-- install $(LPuid) $(LPgid) -m 775 -d $(SHAREZJS)/firmware/
-+ install $(LPuid) $(LPgid) -m 775 -d $(FIRMWAREDIR)/
- for i in sihp*.img; do \
- if [ -f $$i ]; then \
- base=`basename $$i .img`; \
- ./arm2hpdl $$i >$$base.dl; \
-- install -c -m 644 $$base.dl $(SHAREZJS)/firmware/; \
-+ install -c -m 644 $$base.dl $(FIRMWAREDIR)/; \
- fi; \
- done
- # foo2oak ICM files (if any)
-@@ -454,6 +458,8 @@ install-hotplug:
- UDEVDIR=$(DESTDIR)/etc/udev/rules.d
- RULES=hplj10xx.rules
- install-udev:
-+ [ -d $(FWLOADERDIR) ] || install -d -m 755 $(FWLOADERDIR)/
-+ install -c -m 755 foo2zjs-loadfw $(FWLOADERDIR)/
- [ -d $(UDEVDIR) ] || install -d -m 755 $(UDEVDIR)/
- install -c -m 644 $(RULES) $(UDEVDIR)/11-$(RULES)
-
-diff -Naupr foo2zjs-20060501.orig/foo2zjs-loadfw foo2zjs-20060501/foo2zjs-loadfw
---- foo2zjs-20060501.orig/foo2zjs-loadfw 1970-01-01 01:00:00.000000000 +0100
-+++ foo2zjs-20060501/foo2zjs-loadfw 2006-05-03 10:41:57.000000000 +0200
-@@ -0,0 +1,121 @@
-+#!/bin/sh
-+
-+# foo2zjs-loadfw:
-+#
-+# Hotplug script for HP1000/1005/1020 USB laser printers. The model number
-+# that this script deals with is determined from the udev env.
-+#
-+# Used to download firmware automatically into the printer when it
-+# is powered up or plugged into the USB port.
-+#
-+# The inspiration fo this script is from:
-+# Oscar Santacreu. Alicante-Spain (2002)
-+# Mike Morgan (2004)
-+# Modified by Stefan Schweizer (2005) to work as a udev-RUN-script
-+
-+#
-+# Directory to find downloadable HP firmware files sihpMMMM.dl
-+#
-+FWDIR=/lib/firmware
-+
-+#
-+# Program used to determine USB id information
-+#
-+USBID=/bin/usb_printerid
-+
-+#
-+# Figure out how to log our messages
-+#
-+if [ -t 1 ]; then
-+ # Running from a tty...
-+ log() {
-+ echo "$0: $@"
-+ }
-+elif [ -x /usr/bin/logger ]; then
-+ # Have logger...
-+ log() {
-+ logger -t "$0" -- "$@"
-+ }
-+else
-+ # No logger...
-+ log() {
-+ echo "$0: $@" >> /var/log/messages
-+ }
-+fi
-+
-+#
-+# Figure out the model number from the name of this script
-+#
-+case "$1" in
-+1000)
-+ MODEL=1000
-+ MODELNAME="hp LaserJet $MODEL"
-+ ;;
-+1005)
-+ MODEL=1005
-+ MODELNAME="hp LaserJet $MODEL"
-+ ;;
-+1018)
-+ MODEL=1018
-+ MODELNAME="HP LaserJet $MODEL"
-+ ;;
-+1020)
-+ MODEL=1020
-+ MODELNAME="HP LaserJet $MODEL"
-+ ;;
-+*)
-+ log "Only HP LaserJet 1000, 1005, 1018 and 1020 are supported"
-+ log "You need to supply one of these on the cmdline: $0 10**"
-+ exit
-+ ;;
-+esac
-+
-+if [ -z "$DEVNAME" ]; then
-+ if [ -n "$2" ]; then
-+ DEVNAME=$2
-+ else
-+ log "You need to either have $DEVNAME set in the environment or supply it on the cmdline, like:"
-+ log "$0 10** /dev/usb/lp0"
-+ exit 1
-+ fi
-+fi
-+
-+#
-+# Procedure to load a single device with firmware
-+#
-+load1() {
-+ fw="$FWDIR/sihp$MODEL.dl"
-+ if [ ! -f "$fw" ]; then
-+ log "Missing HP LaserJet $MODEL firmware file $fw"
-+ log "...read foo2zjs installation instructions and run ./getweb $MODEL"
-+ return 1
-+ fi
-+
-+ log "loading HP LaserJet $MODEL firmware $fw to $DEVNAME ..."
-+ if cat $fw > $DEVNAME; then
-+ log "... download successful."
-+ else
-+ log "... download failed."
-+ fi
-+ return 0
-+}
-+
-+#
-+# OK, now download firmware to any printers that need it
-+#
-+if [ -x $USBID ]; then
-+ if $USBID $DEVNAME | grep "$MODELNAME" 2> /dev/null; then
-+ # This is a LaserJet 100x
-+ if $USBID $DEVNAME | grep 'FWVER' 2> /dev/null; then
-+ log "HP LaserJet $MODEL firmware already loaded into $DEVNAME"
-+ else
-+ # Firmware is not yet loaded
-+ load1 "$DEVNAME"
-+ fi
-+ else
-+ log "No supported printer found."
-+ fi
-+else
-+ log "HP LaserJet $MODEL firmware was not downloaded..."
-+ log "...couldn't find $USBID"
-+fi
-diff -Naupr foo2zjs-20060501.orig/hplj1000 foo2zjs-20060501/hplj1000
---- foo2zjs-20060501.orig/hplj1000 2006-05-03 10:36:38.000000000 +0200
-+++ foo2zjs-20060501/hplj1000 2006-05-03 10:37:44.000000000 +0200
-@@ -35,7 +35,7 @@ DEV=""
- #
- # Directory to find downloadable HP firmware files sihpMMMM.dl
- #
--FWDIR=/usr/share/foo2zjs/firmware
-+FWDIR=/lib/firmware
-
- #
- # Program used to determine USB id information
-diff -Naupr foo2zjs-20060501.orig/hplj10xx.rules foo2zjs-20060501/hplj10xx.rules
---- foo2zjs-20060501.orig/hplj10xx.rules 2006-05-03 10:36:56.000000000 +0200
-+++ foo2zjs-20060501/hplj10xx.rules 2006-05-03 10:40:15.000000000 +0200
-@@ -1,8 +1,5 @@
- #Own udev rule for HP Laserjet 1000
--KERNEL="lp*", BUS="usb", SYSFS{idVendor}="03f0", SYSFS{product}="hp LaserJet 1000", NAME="usb/%k", SYMLINK="hplj1000%e", MODE="0666", RUN+="/etc/hotplug/usb/hplj1000"
--#Own udev rule for HP Laserjet 1005
--KERNEL="lp*", BUS="usb", SYSFS{idVendor}="03f0", SYSFS{product}="hp LaserJet 1005", NAME="usb/%k", SYMLINK="hplj1005%e", MODE="0666", RUN+="/etc/hotplug/usb/hplj1005"
--#Own udev rule for HP Laserjet 1018
--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{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/files/hp-printer-udev.patch b/net-print/foo2zjs/files/hp-printer-udev.patch
deleted file mode 100644
index 3387620bbf85..000000000000
--- a/net-print/foo2zjs/files/hp-printer-udev.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- foo2zjs/hplj1000.org 2004-04-11 02:35:04.000000000 +0200
-+++ foo2zjs/hplj1000 2004-09-28 14:18:46.511318136 +0200
-@@ -133,6 +133,24 @@
- #
- # Sniff around for printers that need a firmware download
- #
-+ if [ -e /dev/.udev ]; then
-+ log "Udev detected, waiting for udev to create device nodes"
-+
-+ HPDEV="/dev/usb/lp0"
-+ COUNT=0
-+ while [ ! -c ${HPDEV} -a ${COUNT} -lt 20 ];
-+ do
-+ sleep 1
-+ COUNT=`expr ${COUNT} + 1`
-+ done
-+
-+ if [ ! -c ${HPDEV} ];
-+ then
-+ log "Udev failed to initialise device ${HPDEV}"
-+ else
-+ log "Udev created ${HPDEV} node after ${COUNT} seconds"
-+ fi
-+ fi
- usblps=`find /dev/usb -name lp*`" "`find /dev -name usblp*`
- for dev in $usblps; do
- status=`$USBID $dev 2>/dev/null | grep "hp LaserJet $MODEL"`