New version of foo2zjs. With this my printer works so hope it will be working for others too :].

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.27-gentoo x86_64

6 files changed, 282 insertions, 247 deletions

diff --git a/net-print/foo2zjs/ChangeLog b/net-print/foo2zjs/ChangeLog
index e963b8e0863e..0d0763f91dd7 100644
--- a/net-print/foo2zjs/ChangeLog
+++ b/net-print/foo2zjs/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-print/foo2zjs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/ChangeLog,v 1.35 2008/08/27 21:44:28 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/ChangeLog,v 1.36 2008/12/01 15:41:09 scarabeus Exp $
+
+*foo2zjs-20081129 (29 Nov 2008)
+
+  29 Nov 2008; Tomas Chvatal <scarabeus@gentoo.org>
+  -files/foo2zjs-Makefile-20071105.diff,
+  -files/foo2zjs-udevfwld-20071105.diff,
+  +files/foo2zjs-20081129-Makefile.patch,
+  +files/foo2zjs-20081129-udevfwld.patch, -foo2zjs-20071103.ebuild,
+  +foo2zjs-20081129.ebuild:
+  Version bump. Remove old.
 
   27 Aug 2008; Timo Gurr <tgurr@gentoo.org> foo2zjs-20080225.ebuild:
   Fixed Manifest again, bug #226737. Removed pkg_postinst.
diff --git a/net-print/foo2zjs/Manifest b/net-print/foo2zjs/Manifest
index 8d63ab4429e6..81e3da48e7af 100644
--- a/net-print/foo2zjs/Manifest
+++ b/net-print/foo2zjs/Manifest
@@ -1,10 +1,10 @@
-AUX foo2zjs-Makefile-20071105.diff 5006 RMD160 726787570eb194511e05e6c8313693a2bd4b213a SHA1 1f2555fa0fe070479650873ea1ffc50a81184795 SHA256 a89d4713572af52f4f5591c1d9d56f4451a547a9f8b2ccae9a5e5af9a7800a9f
+AUX foo2zjs-20081129-Makefile.patch 4463 RMD160 9454eb4f49d4b47ab339b6579931d68d8be117ae SHA1 2d8a0fa66a7e28294836dc1a1a6d7fe2fc8a8083 SHA256 8813779d5381ba310f823659dfa69bc15a689c8a95d862ad1b48d935cf3cca77
+AUX foo2zjs-20081129-udevfwld.patch 7851 RMD160 c4ffc179e248ac759e7d94d4bebabe518c5b02af SHA1 40684cd6daf35d7cfb4fb8780994964dc01ad246 SHA256 f10883053501866e0925ad7953801caaa8bedc10644449aa39c0331f30a10d5c
 AUX foo2zjs-Makefile-20080225.diff 5724 RMD160 4348836658ad0f339b77ba2aff5ac003a28020a6 SHA1 173fbfd9446a9698d651077528216f16a9a30054 SHA256 052e9a385ebd460d9ca5614f02d3167a2314b71759ade19e52b295849c81b129
-AUX foo2zjs-udevfwld-20071105.diff 6304 RMD160 62fac35f80288200db25e7a9e78b430cd8698f62 SHA1 6851be63b8ff249cfe8598886fe4c5eedb0d5131 SHA256 cb572a2262d925d631c650612cf6817b68fe314d847e4d1a0b7d93e13030a3b0
 AUX foo2zjs-udevfwld-20080225.diff 7408 RMD160 32780df42edb60c4449ee7a397809a24dddec4a9 SHA1 572b11a275adf70e0155a1480547094633cba9fa SHA256 c7fa47847cb5250796ae8cb363da89a80a2ee7b6fe895b22e8fc8259488c6f4f
 DIST cpplxp.exe 4799488 RMD160 bcd5ceecca248c90a0d3e99dd55c6e1eedd4de6d SHA1 952ad6557f2a78ec30e9786f52e95f012e39ac1c SHA256 5f4c8b6f20ccf2d525f683847f5dc24bb4c7f58131d6704047d6c9a90d6895af
-DIST foo2zjs-20071103.tar.gz 1517521 RMD160 3dc2cddfea0494b60ebeb3d24957ce303c931b7b SHA1 522596c860d30aedd21d9da81d06ba330643dae2 SHA256 c747a25021c519c77e7a2410857a7d4e09ae6482ca36718e22b8e7a61d46d817
 DIST foo2zjs-20080225.tar.gz 1536507 RMD160 fdbac2039b869bc16a6adcd24de05ad16843dfc2 SHA1 6405af47e1f00583986b22e37a89ad3c089ca4b4 SHA256 830e98366845052aced0c6e3e32a5f43fc2ce7c2ff9c15067e43891bf371f619
+DIST foo2zjs-20081129.tar.gz 1556478 RMD160 5bab9330aa2489adf8547df29883afff445b19da SHA1 bc716affa55e9ab7259d470d2b5fad97b85d820a SHA256 7b372e51a1251445f0150a7160148f4682ca32a2253f8ae9cbb845283b883b97
 DIST hpclj2600n.tar.gz 573660 RMD160 16b9cd3f7d1f2f408766632d2a3f55c0c42a9f3a SHA1 af45a6e4229fd899082a27613266e3a69a8c0a6f SHA256 7e6b7249b65a47dcaacb9136bab54c2905876dc61ea5d8efb85b95e94a18f9ab
 DIST km2430.tar.gz 929112 RMD160 bab8936cffd45622a0bfc46ae29f12b761711109 SHA1 492bce2401570fd2f23f23697fe6af0bbc1b0418 SHA256 0b4ddb81f3160e7f20da042df7293bff7037aca030ae518f42d526bcc4c3afb2
 DIST km2530.tar.gz 2045958 RMD160 598f8956e838b4f8c61898aa473c9aec2b280736 SHA1 67ba66104b685b671dd0adc34ef62d70274d91da SHA256 e0b067f5c3d9b18f5f483a408e5a67bb9f6bbca54485944a2338ac97e7ff0b95
@@ -22,7 +22,7 @@ DIST sihp1020.tar.gz 70139 RMD160 c09d7ee5f672d68ae6c35fd9cd955f42fdce3167 SHA1
 DIST sihpP1005.tar.gz 153447 RMD160 974186b3cf0a99fb8fea3296307b624820082777 SHA1 2837efd65570421f69603f5decd17e3013e1f68e SHA256 9672c09945f4d1b19841187b30832f3afdfbdf0a1e770f41d95c1575fb865c5c
 DIST sihpP1006.tar.gz 153532 RMD160 aa7167b49b24d6fe2f09c6805a2caf45193321a2 SHA1 725044bc5c571605d38c2cf51a8b2efa086cc0c2 SHA256 7974d669cd68a88674e0b6c44c5fa48f7c6625d16714cac6ded7b26024184f50
 DIST sihpP1505.tar.gz 166072 RMD160 3968a33dd8263f73ebad07173bb62d8d186f5511 SHA1 ed2bbeaacb41bb8599bbdb0acd0758596e3ce090 SHA256 f631bce116447af89b1740c3b9732666348579a9dcd96d6f31121d5586332f35
-EBUILD foo2zjs-20071103.ebuild 3452 RMD160 5fda3bb9dc25263ed6e7f37a135f32307a386be1 SHA1 fc01f00e32c585200c6e96dac4482dad3d1ee292 SHA256 1bf8389d031b3ba0e8871dcc77623448bba4c1999466cd495b6e31eb31110400
 EBUILD foo2zjs-20080225.ebuild 4075 RMD160 c442bce04085919eb0f47fa2206c37e1bb73e3cf SHA1 8bcf0e7d5ad359ffb4090e746ae866953f21d503 SHA256 217406a4f37b9020167b89d6d2bc1ed65fe4b3ebce6efb76e17220a4cdc47cd1
-MISC ChangeLog 8260 RMD160 c61b7891e1372e4d6f66e4df603118431847efa3 SHA1 998f2aa57d333b6b8072d4f6345f2c9d5d38bace SHA256 7d4f9b7aba86addb5b5e6fd4828fa6d8e115318403ed297e5abf93183da8063c
+EBUILD foo2zjs-20081129.ebuild 4474 RMD160 a6a828615e73a86b1d0555a0d60e19e64f5c4e36 SHA1 d1d103a9722ae7d806fd7dee00e3dc3fa4bbf78f SHA256 387f628623f9357b4f1853241ad526ca9156a95f31696d7b6093917c5c6d398c
+MISC ChangeLog 8598 RMD160 b24bfc45707d0c8067d987f26a23e40ad9093bad SHA1 9d1449f7c4fbf95db2fc87dbc63b4e60e636e19a SHA256 88c000f9e4fa462a78de5c98a58aa3e501bb342754da6f54a8a886e289d458b8
 MISC metadata.xml 266 RMD160 71124c3803fd7ba3370f1b9b55b78d56c5e49201 SHA1 12efa221e1a3580f557896136ccece543c4dca39 SHA256 27d69d00958eb408ac3c397767f9104d5e85c85a977c094140a8169fc6750df7
diff --git a/net-print/foo2zjs/files/foo2zjs-20081129-Makefile.patch b/net-print/foo2zjs/files/foo2zjs-20081129-Makefile.patch
new file mode 100644
index 000000000000..e625b06ca30e
--- /dev/null
+++ b/net-print/foo2zjs/files/foo2zjs-20081129-Makefile.patch
@@ -0,0 +1,137 @@
+diff -urN foo2zjs/icc2ps/Makefile foo2zjs.new/icc2ps/Makefile
+--- foo2zjs/icc2ps/Makefile	2007-11-27 22:13:53.000000000 +0100
++++ foo2zjs.new/icc2ps/Makefile	2008-11-29 19:13:43.000000000 +0100
+@@ -1,11 +1,11 @@
+ UNAME := $(shell uname)
+-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 cmsio0.c cmsvirt.c
+-CFLAGS=	-O3
++CFLAGS?=	-O3
+ INSTALL=install
+ ifeq ($(UNAME),SunOS)
+     INSTALL=/usr/ucb/install
+diff -urN foo2zjs/Makefile foo2zjs.new/Makefile
+--- foo2zjs/Makefile	2008-09-23 15:56:20.000000000 +0200
++++ foo2zjs.new/Makefile	2008-11-29 19:12:42.000000000 +0100
+@@ -251,7 +251,7 @@
+ endif
+ 
+ # Compiler flags
+-CFLAGS +=	-O2 -Wall
++CFLAGS ?=	-O2 -Wall
+ #CFLAGS +=	-g
+ 
+ #
+@@ -543,14 +543,15 @@
+ UDEVBIN=$(DESTDIR)/bin/
+ 
+ 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) -d $(BIN)
+ 	$(INSTALL) -c $(PROGS) $(SHELLS) $(BIN)/
+ 	if [ "$(BINPROGS)" != "" ]; then \
+-	    $(INSTALL) -d $(UDEVBIN); \
+-	    $(INSTALL) -c $(BINPROGS) $(UDEVBIN); \
++		install -c $(BINPROGS) $(DESTDIR)/bin/; \
+ 	fi
+ 	#
+ 	# Install gamma correction files.  These are just templates,
+@@ -583,6 +584,7 @@
+ 	# Install current database files
+ 	#
+ 	@if [ -d $(FOODB) ]; then \
++		[ -d $(FOODB)/$$dir/ ] || install -d -m 755 $(FOODB)/$$dir/; \
+ 	    for dir in driver printer opt; do \
+ 		echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
+ 		$(INSTALL) -c -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
+@@ -601,10 +603,10 @@
+ 	#
+ 	# 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
+ 
+@@ -736,13 +738,6 @@
+ 	    done; \
+ 	    ppdmgr -u; \
+ 	elif [ -d $(PPD) ]; then \
+-	    find $(PPD) -name '*foo2zjs*' | xargs rm -rf; \
+-	    find $(PPD) -name '*foo2hp*' | xargs rm -rf; \
+-	    find $(PPD) -name '*foo2xqx*' | xargs rm -rf; \
+-	    find $(PPD) -name '*foo2lava*' | xargs rm -rf; \
+-	    find $(PPD) -name '*foo2qpdl*' | xargs rm -rf; \
+-	    find $(PPD) -name '*foo2slx*' | xargs rm -rf; \
+-	    find $(PPD) -name '*foo2hiperc*' | xargs rm -rf; \
+             [ -d $(PPD)/foo2zjs ] || mkdir $(PPD)/foo2zjs; \
+ 	    cd PPD; \
+ 	    for ppd in *.ppd; do \
+@@ -789,10 +784,8 @@
+ 	$(INSTALL) -c -m 755 hplj10xx_gui.tcl $(SHAREZJS)
+ 	
+ 
+-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-udev
+ 
+ install-hotplug-test:
+ 	#
+@@ -810,9 +803,6 @@
+ 	#
+ 
+ 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
+@@ -823,15 +813,12 @@
+ 	ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1007
+ 	ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1008
+ 	ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1505
+-	$(USBDIR)/hplj1000 install-usermap
+-	$(USBDIR)/hplj1005 install-usermap
+-	$(USBDIR)/hplj1018 install-usermap
+-	$(USBDIR)/hplj1020 install-usermap
+-	$(USBDIR)/hpljP1005 install-usermap
+-	$(USBDIR)/hpljP1006 install-usermap
+-	$(USBDIR)/hpljP1007 install-usermap
+-	$(USBDIR)/hpljP1008 install-usermap
+-	$(USBDIR)/hpljP1505 install-usermap
++	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 \
+@@ -1223,7 +1210,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 --git a/net-print/foo2zjs/files/foo2zjs-udevfwld-20071105.diff b/net-print/foo2zjs/files/foo2zjs-20081129-udevfwld.patch
index e83ef1441e99..d0280364afea 100644
--- a/net-print/foo2zjs/files/foo2zjs-udevfwld-20071105.diff
+++ b/net-print/foo2zjs/files/foo2zjs-20081129-udevfwld.patch
@@ -1,44 +1,6 @@
-diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
---- foo2zjs.orig/Makefile	2007-11-05 11:12:09.000000000 +0100
-+++ foo2zjs/Makefile	2007-11-05 11:13:51.000000000 +0100
-@@ -10,6 +10,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
-@@ -588,12 +592,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)
-@@ -687,6 +691,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	2007-11-05 11:13:51.000000000 +0100
+diff -urN foo2zjs/foo2zjs-loadfw foo2zjs.new/foo2zjs-loadfw
+--- foo2zjs/foo2zjs-loadfw	1970-01-01 01:00:00.000000000 +0100
++++ foo2zjs.new/foo2zjs-loadfw	2008-11-29 19:25:48.000000000 +0100
 @@ -0,0 +1,127 @@
 +#!/bin/sh
 +
@@ -167,43 +129,113 @@ diff -Nur foo2zjs.orig/foo2zjs-loadfw foo2zjs/foo2zjs-loadfw
 +    log "HP LaserJet $MODEL firmware was not downloaded..."
 +    log "...couldn't find $USBID"
 +fi
-diff -Nur foo2zjs.orig/hplj1000 foo2zjs/hplj1000
---- foo2zjs.orig/hplj1000	2007-11-05 11:12:09.000000000 +0100
-+++ foo2zjs/hplj1000	2007-11-05 11:13:51.000000000 +0100
-@@ -35,7 +35,7 @@
- #
- # 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 -Nur foo2zjs.orig/hplj10xx.rules foo2zjs/hplj10xx.rules
---- foo2zjs.orig/hplj10xx.rules	2007-11-05 11:12:09.000000000 +0100
-+++ foo2zjs/hplj10xx.rules	2007-11-05 11:13:57.000000000 +0100
-@@ -1,16 +1,8 @@
+diff -urN foo2zjs/hplj10xx.rules foo2zjs.new/hplj10xx.rules
+--- foo2zjs/hplj10xx.rules	2008-06-05 11:50:38.000000000 +0200
++++ foo2zjs.new/hplj10xx.rules	2008-11-29 19:24:04.000000000 +0100
+@@ -1,36 +1,9 @@
 -#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" 
+-	SYMLINK+="hplj1000-%n", 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 series", NAME="usb/%k", \
--	SYMLINK+="hplj1005%e", MODE="0666", RUN+="/etc/hotplug/usb/hplj1005" 
+-	SYMLINK+="hplj1005-%n", 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" 
+-	SYMLINK+="hplj1018-%n", 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" 
+-	SYMLINK+="hplj1020-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1020" 
+-#Own udev rule for HP Laserjet P1005
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+-	SYSFS{product}=="HP LaserJet P1005", NAME="usb/%k", \
+-	SYMLINK+="hpljP1005-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1005" 
+-#Own udev rule for HP Laserjet P1006
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+-	SYSFS{product}=="HP LaserJet P1006", NAME="usb/%k", \
+-	SYMLINK+="hpljP1006-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1006" 
+-#Own udev rule for HP Laserjet P1007
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+-	SYSFS{product}=="HP LaserJet P1007", NAME="usb/%k", \
+-	SYMLINK+="hpljP1007-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1007" 
+-#Own udev rule for HP Laserjet P1008
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+-	SYSFS{product}=="HP LaserJet P1008", NAME="usb/%k", \
+-	SYMLINK+="hpljP1008-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1008" 
+-#Own udev rule for HP Laserjet P1505
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+-	SYSFS{product}=="HP LaserJet P1505", NAME="usb/%k", \
+-	SYMLINK+="hpljP1505-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1505" 
 +ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+	ATTRS{idProduct}=="0517", RUN+="/sbin/foo2zjs-loadfw 1000 $tempnode"
++   ATTRS{idProduct}=="0517", RUN+="/sbin/foo2zjs-loadfw 1000 $tempnode"
 +ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+	ATTRS{idProduct}=="1317", RUN+="/sbin/foo2zjs-loadfw 1005 $tempnode"
++   ATTRS{idProduct}=="1317", RUN+="/sbin/foo2zjs-loadfw 1005 $tempnode"
 +ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+	ATTRS{idProduct}=="4117", RUN+="/sbin/foo2zjs-loadfw 1018 $tempnode"
++   ATTRS{idProduct}=="4117", RUN+="/sbin/foo2zjs-loadfw 1018 $tempnode"
 +ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+	ATTRS{idProduct}=="2b17", RUN+="/sbin/foo2zjs-loadfw 1020 $tempnode"
++   ATTRS{idProduct}=="2b17", RUN+="/sbin/foo2zjs-loadfw 1020 $tempnode"
++
+diff -urN foo2zjs/hplj1000 foo2zjs.new/hplj1000
+--- foo2zjs/hplj1000	2008-06-05 12:02:14.000000000 +0200
++++ foo2zjs.new/hplj1000	2008-11-29 19:22:31.000000000 +0100
+@@ -35,7 +35,7 @@
+ #
+ # Directory to find downloadable HP firmware files sihpMMMM.dl
+ #
+-FWDIR=/usr/share/foo2zjs/firmware
++FWDIR=/lib/firmware
+ 
+ #
+ # Program used to determine USB printer id information
+diff -urN foo2zjs/Makefile foo2zjs.new/Makefile
+--- foo2zjs/Makefile	2008-11-29 19:41:32.000000000 +0100
++++ foo2zjs.new/Makefile	2008-11-29 19:21:11.000000000 +0100
+@@ -20,6 +20,10 @@
+ PREFIX=/usr
+ 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
+@@ -660,21 +664,21 @@
+ 	    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 sihp1*.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
+ 	# foo2xqx Firmware files (if any)
+-	$(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(SHAREXQX)/firmware/
++	$(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(FIRMWAREDIR)/
+ 	for i in sihpP*.img; do \
+ 	    if [ -f $$i ]; then \
+ 		base=`basename $$i .img`; \
+ 		./arm2hpdl $$i >$$base.dl; \
+-		$(INSTALL) -c -m 644 $$base.dl $(SHAREXQX)/firmware/; \
++		$(INSTALL) -c -m 644 $$base.dl $(FIRMWAREDIR)/; \
+ 	    fi; \
+ 	done
+ 	# foo2oak ICM files (if any)
+@@ -817,6 +821,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 --git a/net-print/foo2zjs/files/foo2zjs-Makefile-20071105.diff b/net-print/foo2zjs/files/foo2zjs-Makefile-20071105.diff
deleted file mode 100644
index 7e695c2a7cb3..000000000000
--- a/net-print/foo2zjs/files/foo2zjs-Makefile-20071105.diff
+++ /dev/null
@@ -1,163 +0,0 @@
-diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
---- foo2zjs.orig/Makefile	2007-11-05 11:08:51.000000000 +0100
-+++ foo2zjs/Makefile	2007-11-05 11:10:49.000000000 +0100
-@@ -8,7 +8,7 @@
- 
- # Installation prefix...
- PREFIX=/usr/local
--PREFIX=/usr
-+PREFIX=$(DESTDIR)/usr
- 
- # Pathnames for this package...
- BIN=$(PREFIX)/bin
-@@ -23,7 +23,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
-@@ -210,7 +210,7 @@
- endif
- 
- # Compiler flags
--CFLAGS +=	-O2 -Wall
-+CFLAGS ?=	-O2 -Wall
- #CFLAGS +=	-g
- 
- #
-@@ -478,12 +478,14 @@
-     
- 
- 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,
-@@ -511,6 +513,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 \
-@@ -528,10 +531,10 @@
- 	#
- 	# 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
- 
-@@ -629,20 +632,14 @@
- 	    fi; \
- 	done
- 
--MODEL=/usr/share/cups/model
-+MODEL=$(PREFIX)/share/cups/model
- LOCALMODEL=/usr/local/share/cups/model
--PPD=/usr/share/ppd
-+PPD=$(PREFIX)/share/ppd
- install-ppd:
- 	#
- 	# Install PPD files for CUPS
- 	#
- 	if [ -d $(PPD) ]; then \
--	    find $(PPD) -name '*foo2zjs*' | xargs rm -f; \
--	    find $(PPD) -name '*foo2hp*' | xargs rm -f; \
--	    find $(PPD) -name '*foo2xqx*' | xargs rm -f; \
--	    find $(PPD) -name '*foo2lava*' | xargs rm -f; \
--	    find $(PPD) -name '*foo2qpdl*' | xargs rm -f; \
--	    find $(PPD) -name '*foo2slx*' | xargs rm -f; \
-             [ -d $(PPD)/foo2zjs ] || mkdir $(PPD)/foo2zjs; \
- 	    cd PPD; \
- 	    for ppd in *.ppd; do \
-@@ -661,10 +658,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-udev
- 
- install-hotplug-test:
- 	#
-@@ -682,18 +677,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
--	$(USBDIR)/hplj1000 install-usermap
--	$(USBDIR)/hplj1005 install-usermap
--	$(USBDIR)/hplj1018 install-usermap
--	$(USBDIR)/hplj1020 install-usermap
-+	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 \
-@@ -1033,7 +1028,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 -Nur foo2zjs.orig/hplj.usermap foo2zjs/hplj.usermap
---- foo2zjs.orig/hplj.usermap	1970-01-01 01:00:00.000000000 +0100
-+++ foo2zjs/hplj.usermap	2007-11-05 11:09: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 -Nur foo2zjs.orig/icc2ps/Makefile foo2zjs/icc2ps/Makefile
---- foo2zjs.orig/icc2ps/Makefile	2007-11-05 11:08:51.000000000 +0100
-+++ foo2zjs/icc2ps/Makefile	2007-11-05 11:09:10.000000000 +0100
-@@ -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 cmsio0.c cmsvirt.c
--CFLAGS=	-O3
-+CFLAGS?=	-O3
- 
- all: foo2zjs-icc2ps
- 
diff --git a/net-print/foo2zjs/foo2zjs-20071103.ebuild b/net-print/foo2zjs/foo2zjs-20081129.ebuild
index 7f6120955a4c..1899e53891a5 100644
--- a/net-print/foo2zjs/foo2zjs-20071103.ebuild
+++ b/net-print/foo2zjs/foo2zjs-20081129.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/foo2zjs-20071103.ebuild,v 1.2 2008/03/14 14:39:37 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/foo2zjs-20081129.ebuild,v 1.1 2008/12/01 15:41:09 scarabeus Exp $
 
 inherit eutils
 
@@ -8,9 +8,12 @@ DESCRIPTION="Support for printing to ZjStream-based printers"
 HOMEPAGE="http://foo2zjs.rkkda.com/"
 
 # extracted by http://gentooexperimental.org/~genstef/dist/foo2zjs-helper.sh
-DEVICES=( "hp2600n" "hp1600" "hp1500" "km2530" "km2490" "km2480" "xp6115"
-"km2430" "km2300" "km2200" "kmcpwl" "sa300" "sa2160" "sa3160" "xp6110" "lm500"
-"hp1020" "hp1018" "hp1005" "hp1000" )
+DEVICES=( "hp2600n" "hp1600" "hp1500" "hp1215" "km2530" "km2490" "km2480"
+"xp6115" "km2430" "km2300" "km2200" "kmcpwl" "sa300" "sa315"  "sa2160"
+"sa3160" "xp6110" "lm500" "oki3200" "oki3300" "oki3400" "oki3530" "oki5100"
+"oki5200" "oki5500" "oki5600" "oki5800" "hp1020" "hp1018" "hp1005" "hp1000"
+"hpp1505" "hpp1008" "hpp1007" "hpp1006" "hpp1005" )
+#"sa610" has no file to download
 URIS=(
 "http://foo2hp.rkkda.com/icm/hpclj2600n.tar.gz
 http://foo2zjs.rkkda.com/icm/km2430.tar.gz"
@@ -18,12 +21,14 @@ http://foo2zjs.rkkda.com/icm/km2430.tar.gz"
 http://foo2zjs.rkkda.com/icm/km2430.tar.gz"
 "http://foo2hp.rkkda.com/icm/hpclj2600n.tar.gz
 http://foo2zjs.rkkda.com/icm/km2430.tar.gz"
+"http://foo2hp.rkkda.com/icm/hpclj2600n.tar.gz
+http://foo2zjs.rkkda.com/icm/km2430.tar.gz"
 "http://foo2lava.rkkda.com/icm/km2530.tar.gz"
 "http://foo2lava.rkkda.com/icm/km2530.tar.gz"
 "http://foo2lava.rkkda.com/icm/km2530.tar.gz"
 "http://foo2lava.rkkda.com/icm/km2530.tar.gz"
 "http://foo2zjs.rkkda.com/icm/km2430.tar.gz"
-"ftp://ftp.minolta-qms.com/pub/crc/out_going/win/m23dlicc.exe
+"ftp://ftp.minolta-qms.com/pub/crc/out_going/other/m23dlicc.exe
 http://foo2zjs.rkkda.com/icm/km2430.tar.gz"
 "ftp://ftp.minolta-qms.com/pub/crc/out_going/win2000/m22dlicc.exe"
 "ftp://ftp.minolta-qms.com/pub/crc/out_going/windows/cpplxp.exe"
@@ -31,14 +36,30 @@ http://foo2zjs.rkkda.com/icm/km2430.tar.gz"
 "http://foo2qpdl.rkkda.com/icm/samclp300.tar.gz"
 "http://foo2qpdl.rkkda.com/icm/samclp300.tar.gz"
 "http://foo2qpdl.rkkda.com/icm/samclp300.tar.gz"
+"http://foo2qpdl.rkkda.com/icm/samclp300.tar.gz"
 "http://foo2slx.rkkda.com/icm/lexc500.tar.gz"
+"http://foo2hiperc.rkkda.com/icm/okic3200.tar.gz"
+"http://foo2hiperc.rkkda.com/icm/okic3400.tar.gz"
+"http://foo2hiperc.rkkda.com/icm/okic3400.tar.gz"
+"http://foo2hiperc.rkkda.com/icm/okic3400.tar.gz"
+"http://foo2hiperc.rkkda.com/icm/okic3200.tar.gz"
+"http://foo2hiperc.rkkda.com/icm/okic3200.tar.gz"
+"http://foo2hiperc.rkkda.com/icm/okic5600.tar.gz"
+"http://foo2hiperc.rkkda.com/icm/okic5600.tar.gz"
+"http://foo2hiperc.rkkda.com/icm/okic5600.tar.gz"
 "http://foo2zjs.rkkda.com/firmware/sihp1020.tar.gz"
 "http://foo2zjs.rkkda.com/firmware/sihp1018.tar.gz"
 "http://foo2zjs.rkkda.com/firmware/sihp1005.tar.gz"
 "http://foo2zjs.rkkda.com/firmware/sihp1000.tar.gz"
+"http://foo2zjs.rkkda.com/firmware/sihpP1505.tar.gz"
+"http://foo2zjs.rkkda.com/firmware/sihpP1006.tar.gz"
+"http://foo2zjs.rkkda.com/firmware/sihpP1005.tar.gz"
+"http://foo2zjs.rkkda.com/firmware/sihpP1006.tar.gz"
+"http://foo2zjs.rkkda.com/firmware/sihpP1005.tar.gz"
 )
 
-SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}.tar.gz"
+
+SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.gz"
 IUSE="cups foomaticdb usb"
 for ((DEV=0; DEV < ${#DEVICES[*]}; DEV++)); do
 	SRC_URI="${SRC_URI} foo2zjs_devices_${DEVICES[DEV]}? ( ${URIS[DEV]} )"
@@ -48,8 +69,10 @@ for ((DEV=0; DEV < ${#DEVICES[*]}; DEV++)); do
 	ALL_END="${ALL_END} )"
 done
 SRC_URI="${SRC_URI}${ALL_BEGIN}${ALL_MIDDLE}${ALL_END}"
-RESTRICT="mirror"
+
 LICENSE="GPL-2"
+# due to those firmwares/icms/etc...
+RESTRICT="mirror"
 SLOT="0"
 DEPEND="app-arch/unzip"
 RDEPEND="cups? ( net-print/cups )
@@ -69,8 +92,8 @@ src_unpack() {
 	done
 
 	cd "${S}"
-	epatch "${FILESDIR}"/foo2zjs-Makefile-20071105.diff
-	epatch "${FILESDIR}"/foo2zjs-udevfwld-20071105.diff
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	epatch "${FILESDIR}"/${P}-udevfwld.patch
 }
 
 src_compile() {
@@ -102,7 +125,3 @@ src_install() {
 	emake DESTDIR="${D}" install install-udev \
 		|| die "emake install failed"
 }
-
-pkg_postinst() {
-	udevcontrol reload_rules
-}