version bump thanks to roger in bug 159270, remove old

(Portage version: 2.1.2-r7)

3 files changed, 90 insertions, 84 deletions

diff --git a/net-print/foo2zjs/files/digest-foo2zjs-20061130 b/net-print/foo2zjs/files/digest-foo2zjs-20070204
index 5bd01eecdb5e..0672f8acec3b 100644
--- a/net-print/foo2zjs/files/digest-foo2zjs-20061130
+++ b/net-print/foo2zjs/files/digest-foo2zjs-20070204
@@ -1,9 +1,9 @@
 MD5 cae0d20d3c1d57cd3953d9b335014294 cpplxp.exe 4799488
 RMD160 bcd5ceecca248c90a0d3e99dd55c6e1eedd4de6d cpplxp.exe 4799488
 SHA256 5f4c8b6f20ccf2d525f683847f5dc24bb4c7f58131d6704047d6c9a90d6895af cpplxp.exe 4799488
-MD5 78c8bbcd4047c6611dc9a11877d56ea9 foo2zjs-20061130.tar.gz 929018
-RMD160 dd3adf5f1bfa73deb22815456aca2f2f3167e472 foo2zjs-20061130.tar.gz 929018
-SHA256 0cf0f078be511d5798c67949cd23faf7a9750b0ba892b7db17e9bd329ee07a2b foo2zjs-20061130.tar.gz 929018
+MD5 29530f6815fe3268e00ebe2a3523de43 foo2zjs-20070204.tar.gz 936419
+RMD160 4e6160fed4e642106ff62bff64e5a4cf637d9f0b foo2zjs-20070204.tar.gz 936419
+SHA256 9dc978b208ee7762b6b16ff445103722f45c341457014fa9b3bad7dd2a0bd5d3 foo2zjs-20070204.tar.gz 936419
 MD5 72179915334290762193db0be09fceff hpclj2600n.tar.gz 573660
 RMD160 a0c03c901cb722bbc61347e9159b0a4faa72329d hpclj2600n.tar.gz 573660
 SHA256 b5ed74e50b88152a09d9ad17bca94e2299d348ed6d343ff015344757b72d390a hpclj2600n.tar.gz 573660
diff --git a/net-print/foo2zjs/files/foo2zjs-Makefile-20061130.diff b/net-print/foo2zjs/files/foo2zjs-Makefile-20070204.diff
index 1ccf9a40327a..c58ac17e740f 100644
--- a/net-print/foo2zjs/files/foo2zjs-Makefile-20061130.diff
+++ b/net-print/foo2zjs/files/foo2zjs-Makefile-20070204.diff
@@ -1,7 +1,7 @@
-diff -Nupr foo2zjs.orig/Makefile foo2zjs/Makefile
---- foo2zjs.orig/Makefile	2006-11-29 13:24:02.000000000 -0800
-+++ foo2zjs/Makefile	2006-12-02 00:17:04.000000000 -0800
-@@ -7,7 +7,7 @@ VERSION=0.0
+diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
+--- foo2zjs.orig/Makefile	2007-02-11 11:08:24.000000000 +0100
++++ foo2zjs/Makefile	2007-02-11 11:07:08.000000000 +0100
+@@ -7,7 +7,7 @@
  
  # Installation prefix...
  PREFIX=/usr/local
@@ -10,7 +10,7 @@ diff -Nupr foo2zjs.orig/Makefile foo2zjs/Makefile
  
  # Pathnames for this package...
  BIN=$(PREFIX)/bin
-@@ -20,7 +20,7 @@ MANDIR=$(PREFIX)/share/man
+@@ -20,7 +20,7 @@
  DOCDIR=$(PREFIX)/share/doc/foo2zjs/
  
  # Pathnames for referenced packages...
@@ -19,7 +19,7 @@ diff -Nupr foo2zjs.orig/Makefile foo2zjs/Makefile
  
  # User ID's
  LPuid=-olp
-@@ -179,7 +179,7 @@ ifeq ($(UNAME),Linux)
+@@ -180,7 +180,7 @@
  endif
  
  # Compiler flags
@@ -28,7 +28,7 @@ diff -Nupr foo2zjs.orig/Makefile foo2zjs/Makefile
  
  #
  # Rules to create test documents
-@@ -367,12 +367,14 @@ install-test:
+@@ -368,12 +368,14 @@
      
  
  install-prog:
@@ -44,7 +44,7 @@ diff -Nupr foo2zjs.orig/Makefile foo2zjs/Makefile
  	fi
  	#
  	# Install gamma correction files.  These are just templates,
-@@ -400,6 +402,7 @@ install-foo:
+@@ -401,6 +403,7 @@
  	#
  	@if [ -d $(FOODB) ]; then \
  	    for dir in driver printer opt; do \
@@ -52,7 +52,7 @@ diff -Nupr foo2zjs.orig/Makefile foo2zjs/Makefile
  		echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
  		install -c -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
  	    done \
-@@ -417,10 +420,10 @@ install-foo:
+@@ -418,10 +421,10 @@
  	#
  	# Clear foomatic cache and rebuild database if needed
  	#
@@ -67,7 +67,7 @@ diff -Nupr foo2zjs.orig/Makefile foo2zjs/Makefile
  	    foomatic-combo-xml -O >overview.xml; \
  	fi
  
-@@ -491,8 +494,8 @@ install-extra:
+@@ -492,8 +495,8 @@
  	    fi; \
  	done
  
@@ -78,18 +78,28 @@ diff -Nupr foo2zjs.orig/Makefile foo2zjs/Makefile
  install-ppd:
  	#
  	# Install PPD files for CUPS
-@@ -515,9 +518,7 @@ install-ppd:
+@@ -516,10 +519,8 @@
  	    done; \
  	fi
  
 -USBDIR=/etc/hotplug/usb
 -UDEVDIR=/etc/udev/rules.d
 -RULES=hplj10xx.rules
+-install-hotplug: install-hotplug-test install-hotplug-prog
 +USBDIR=$(DESTDIR)/etc/hotplug/usb
- install-hotplug: install-hotplug-test install-hotplug-prog
++install-hotplug: install-hotplug-test install-udev
  
  install-hotplug-test:
-@@ -541,14 +542,14 @@ install-hotplug-prog:
+ 	#
+@@ -537,18 +538,18 @@
+ 	#
+ 
+ install-hotplug-prog:
+-	if [ -d $(UDEVDIR) ]; then \
+-	    install -c -m 644 $(RULES) $(UDEVDIR)/11-$(RULES); \
+-	fi
+ 	[ -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
@@ -97,21 +107,17 @@ diff -Nupr foo2zjs.orig/Makefile foo2zjs/Makefile
 -	$(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 \
- 	    /etc/init.d/cups restart; \
-@@ -860,7 +861,6 @@ install-doc: doc
+@@ -862,7 +863,6 @@
  	install -c -m 644 README $(DOCDIR)
  	install -c -m 644 ChangeLog $(DOCDIR)
  
@@ -119,17 +125,17 @@ diff -Nupr foo2zjs.orig/Makefile foo2zjs/Makefile
  GROFF=groff
  manual.pdf: $(MANPAGES)
  	-$(GROFF) -t -man $(MANPAGES) | ps2pdf - $@
-diff -Nupr foo2zjs.orig/hplj.usermap foo2zjs/hplj.usermap
---- foo2zjs.orig/hplj.usermap	1969-12-31 16:00:00.000000000 -0800
-+++ foo2zjs/hplj.usermap	2006-12-02 00:12:53.000000000 -0800
+diff -Nur foo2zjs.orig/hplj.usermap foo2zjs/hplj.usermap
+--- foo2zjs.orig/hplj.usermap	1970-01-01 01:00:00.000000000 +0100
++++ foo2zjs/hplj.usermap	2007-02-11 11:03:10.000000000 +0100
 @@ -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 -Nupr foo2zjs.orig/icc2ps/Makefile foo2zjs/icc2ps/Makefile
---- foo2zjs.orig/icc2ps/Makefile	2005-12-23 22:53:35.000000000 -0800
-+++ foo2zjs/icc2ps/Makefile	2006-12-02 00:12:53.000000000 -0800
+diff -Nur foo2zjs.orig/icc2ps/Makefile foo2zjs/icc2ps/Makefile
+--- foo2zjs.orig/icc2ps/Makefile	2007-02-11 11:08:24.000000000 +0100
++++ foo2zjs/icc2ps/Makefile	2007-02-11 11:03:10.000000000 +0100
 @@ -1,10 +1,10 @@
 -PREFIX=	/usr
 +PREFIX=	$(DESTDIR)/usr
diff --git a/net-print/foo2zjs/files/foo2zjs-udevfwld-20061130.diff b/net-print/foo2zjs/files/foo2zjs-udevfwld-20070204.diff
index b1f7690cbb8c..5935d5ea0707 100644
--- a/net-print/foo2zjs/files/foo2zjs-udevfwld-20061130.diff
+++ b/net-print/foo2zjs/files/foo2zjs-udevfwld-20070204.diff
@@ -1,6 +1,44 @@
-diff -Nupr foo2zjs.orig/foo2zjs-loadfw foo2zjs/foo2zjs-loadfw
+diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
+--- foo2zjs.orig/Makefile	2007-02-11 11:08:50.000000000 +0100
++++ foo2zjs/Makefile	2007-02-11 11:12:11.000000000 +0100
+@@ -9,6 +9,10 @@
+ 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
+@@ -470,12 +474,12 @@
+ 	    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)
+@@ -548,6 +552,8 @@
+ 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 -Nur foo2zjs.orig/foo2zjs-loadfw foo2zjs/foo2zjs-loadfw
 --- foo2zjs.orig/foo2zjs-loadfw	1970-01-01 01:00:00.000000000 +0100
-+++ foo2zjs/foo2zjs-loadfw	2006-06-14 21:17:24.000000000 +0200
++++ foo2zjs/foo2zjs-loadfw	2007-02-11 11:12:11.000000000 +0100
 @@ -0,0 +1,121 @@
 +#!/bin/sh
 +
@@ -123,10 +161,10 @@ diff -Nupr foo2zjs.orig/foo2zjs-loadfw foo2zjs/foo2zjs-loadfw
 +    log "HP LaserJet $MODEL firmware was not downloaded..."
 +    log "...couldn't find $USBID"
 +fi
-diff -Nupr foo2zjs.orig/hplj1000 foo2zjs/hplj1000
---- foo2zjs.orig/hplj1000	2006-06-14 21:17:18.000000000 +0200
-+++ foo2zjs/hplj1000	2006-06-14 21:17:24.000000000 +0200
-@@ -35,7 +35,7 @@ DEV=""
+diff -Nur foo2zjs.orig/hplj1000 foo2zjs/hplj1000
+--- foo2zjs.orig/hplj1000	2007-02-11 11:02:46.000000000 +0100
++++ foo2zjs/hplj1000	2007-02-11 11:12:11.000000000 +0100
+@@ -35,7 +35,7 @@
  #
  # Directory to find downloadable HP firmware files sihpMMMM.dl
  #
@@ -135,57 +173,19 @@ diff -Nupr foo2zjs.orig/hplj1000 foo2zjs/hplj1000
  
  #
  # Program used to determine USB id information
-diff -Nupr foo2zjs.orig/hplj10xx.rules foo2zjs/hplj10xx.rules
---- foo2zjs.orig/hplj10xx.rules	2006-06-14 21:17:18.000000000 +0200
-+++ foo2zjs/hplj10xx.rules	2006-06-14 21:20:24.000000000 +0200
+diff -Nur foo2zjs.orig/hplj10xx.rules foo2zjs/hplj10xx.rules
+--- foo2zjs.orig/hplj10xx.rules	2007-02-11 11:02:46.000000000 +0100
++++ foo2zjs/hplj10xx.rules	2007-02-11 11:12:11.000000000 +0100
 @@ -1,8 +1,8 @@
  #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" 
-+KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="0517", NAME="usb/%k", SYMLINK="hplj1000%e", MODE="0660", GROUP="lp", RUN+="/sbin/foo2zjs-loadfw 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" 
++KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="0517", NAME="usb/%k", SYMLINK+="hplj1000%e", MODE="0660", GROUP="lp", RUN+="/sbin/foo2zjs-loadfw 1000"
  #Own udev rule for HP Laserjet 1005
--KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{product}=="hp LaserJet 1005 series", NAME="usb/%k", SYMLINK="hplj1005%e", MODE="0666", RUN+="/etc/hotplug/usb/hplj1005" 
-+KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1317", NAME="usb/%k", SYMLINK="hplj1005%e", MODE="0660", GROUP="lp", RUN+="/sbin/foo2zjs-loadfw 1005"
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{product}=="hp LaserJet 1005 series", NAME="usb/%k", SYMLINK+="hplj1005%e", MODE="0666", RUN+="/etc/hotplug/usb/hplj1005" 
++KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1317", NAME="usb/%k", SYMLINK+="hplj1005%e", MODE="0660", GROUP="lp", RUN+="/sbin/foo2zjs-loadfw 1005"
  #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" 
-+KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="4117", NAME="usb/%k", SYMLINK="hplj1018%e", MODE="0660", GROUP="lp", RUN+="/sbin/foo2zjs-loadfw 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" 
++KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="4117", NAME="usb/%k", SYMLINK+="hplj1018%e", MODE="0660", GROUP="lp", RUN+="/sbin/foo2zjs-loadfw 1018"
  #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}=="2b17", NAME="usb/%k", SYMLINK="hplj1020%e", MODE="0660", GROUP="lp", RUN+="/sbin/foo2zjs-loadfw 1020"
-diff -Nupr foo2zjs.orig/Makefile foo2zjs/Makefile
---- foo2zjs.orig/Makefile	2006-06-14 21:17:18.000000000 +0200
-+++ foo2zjs/Makefile	2006-06-14 21:17:24.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
-@@ -416,12 +420,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)
-@@ -464,6 +468,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)
- 
+-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}=="2b17", NAME="usb/%k", SYMLINK+="hplj1020%e", MODE="0660", GROUP="lp", RUN+="/sbin/foo2zjs-loadfw 1020"