version bump many thanks to roger <roger@eskimo.com> in bug 211480

Package-Manager: portage-2.1.4.4

5 files changed, 543 insertions, 7 deletions

diff --git a/net-print/foo2zjs/ChangeLog b/net-print/foo2zjs/ChangeLog
index 8a2326c81d34..3c8246b90e54 100644
--- a/net-print/foo2zjs/ChangeLog
+++ b/net-print/foo2zjs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-print/foo2zjs
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/ChangeLog,v 1.31 2007/12/14 17:21:57 kingtaco Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/ChangeLog,v 1.32 2008/03/11 19:44:03 genstef Exp $
+
+*foo2zjs-20080225 (11 Mar 2008)
+
+  11 Mar 2008; Stefan Schweizer <genstef@gentoo.org>
+  +files/foo2zjs-Makefile-20080225.diff,
+  +files/foo2zjs-udevfwld-20080225.diff, +foo2zjs-20080225.ebuild:
+  version bump many thanks to roger <roger@eskimo.com> in bug 211480
 
   14 Dec 2007; Mike Doty <kingtaco@gentoo.org> ChangeLog:
   regen digest, bug 201396
diff --git a/net-print/foo2zjs/Manifest b/net-print/foo2zjs/Manifest
index ca92ac4ea909..4c7847319ecc 100644
--- a/net-print/foo2zjs/Manifest
+++ b/net-print/foo2zjs/Manifest
@@ -1,7 +1,10 @@
 AUX foo2zjs-Makefile-20071105.diff 5006 RMD160 726787570eb194511e05e6c8313693a2bd4b213a SHA1 1f2555fa0fe070479650873ea1ffc50a81184795 SHA256 a89d4713572af52f4f5591c1d9d56f4451a547a9f8b2ccae9a5e5af9a7800a9f
+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 hpclj2600n.tar.gz 573660 RMD160 f646d2cad075231fd1be985911975dcb47fb68ea SHA1 373a63d0f91fe5973954175eacc5b4b9632ff0b8 SHA256 6d2c37fd73c1a247895c58e119927de7ca636df800bec576513f04b325e1667b
 DIST km2430.tar.gz 929112 RMD160 44990f1bb63eec6cbb7fb4f5f1615d5705d8740a SHA1 b672555d8ec4c9bb870ae00ada394647d00cb087 SHA256 bb0151661a37b12496cfe3495dbf473a57a24b496f2b4d0e9221c297059b1ce5
 DIST km2530.tar.gz 2045958 RMD160 708ed0ef48b864823b9c91e0ec975e8bbcb80794 SHA1 e2753c05f4638ba83ed4f39a5ab0927d84a82734 SHA256 8f6d3786061c99ba014376ef8fc81e7954bddb1bdcc105b33488df92787cd2a4
@@ -9,10 +12,11 @@ DIST lexc500.tar.gz 239577 RMD160 4eb7b79cd706024e302c9226b6e8b946b687837c SHA1
 DIST m22dlicc.exe 634368 RMD160 392922135a3f517a76a2b5e8b7200c83e6104ef6 SHA1 4f2de3e9e5418361763805b76722cd5284543110 SHA256 1d57413f4c36941c64599dae2ac2b1f8a397e128796c2796a108be5b8fd282b3
 DIST m23dlicc.exe 170496 RMD160 f72be93dfc5c8c9159c75d7204820f1305f47905 SHA1 d1c28538f15f0e4564eeb81d53a8cb35fe08109c SHA256 1416cda7e2e3496ff1d121c87dd8984ad1d16ed3396096f05f4919dafd445ae4
 DIST samclp300.tar.gz 427584 RMD160 d82e0ee3c2b7989ef8524a35cc03129cdd9a8a1a SHA1 92f45569bc995d5f5b403647cf766572acfa0900 SHA256 515de8c844ed7310b79f6ec2b5424cda2ba09b3584c9975b2957bc95d4d3520e
-DIST sihp1000.tar.gz 50416 RMD160 4487790c5c8fcddd23dccb0c487904a5e53ba761 SHA1 24ef1aa8f966503a322991e285a15afe41617bc5 SHA256 9bbed946b038e8c69a67c4a3cb9a82695e470cff853e6c4b92b18820ba94a8b5
-DIST sihp1005.tar.gz 52297 RMD160 a01c8a424d344e45d8f065d5bed0b945a016ef54 SHA1 ea89f0ec6e4a81548483d93e55ae00bb7c82693a SHA256 85f6c95e19c0542c89c647d029510d19686ea02ed9572b1872bdba7aa6271904
-DIST sihp1018.tar.gz 70544 RMD160 19d7a8715e07414d599cccbb23ec63cc231af8d2 SHA1 cd7b3b5d830d43946c6d7a71aaeb9b18025decd0 SHA256 0c1b9592a35a72f083940c86d34cce7ee24c92094295878a8b5c0c4dd82faf65
-DIST sihp1020.tar.gz 70139 RMD160 2ac0deb08acdf547a8cf93380a73c39f2205ea10 SHA1 fe7665b415ee3e8bcab30e8771812579cb0daab1 SHA256 22c9a193130df897636a828b125f59de014dde4003bebadbbce6b1e5f24f085d
+DIST sihp1000.tar.gz 50416 RMD160 971a6342986b23e464b6ae7649c0fd6b0c12729f SHA1 158dfea4395bacfc1f9f0899046e01574f0250a6 SHA256 72d10197a005a595ef2e963f15e0fb34d850f7f064d1da9cc9ae30bcec8fb233
+DIST sihp1005.tar.gz 52297 RMD160 96cb431d55b69245fcb9ece3e1f6757eac46c7e5 SHA1 f674b72a19191a01c4a152c22a5992c01cbfca59 SHA256 7947ba980f223e216566ec5af25e302ae279251bdf3f6e34df5775ab4c76e8aa
+DIST sihp1018.tar.gz 70544 RMD160 0a814be797047129ae0d67cd316c8cdb5007a7dc SHA1 3886caa5bafd029d8faa4428721afc7061753d6a SHA256 c772930cae4fc5c0b2a796d709e2df37aac6b3d03202372161ee3feae8d84d81
+DIST sihp1020.tar.gz 70139 RMD160 7dc8c68ecaf736b5a3029eeb8891485b5d7d3654 SHA1 7902fa7e8b0eada383b6e7e320f943ad949a60d7 SHA256 7982f476d72247a7e3f0bcd1939e0b4e80a1e2ed45a970477bdf19c9063ee856
 EBUILD foo2zjs-20071103.ebuild 3440 RMD160 0a864d54e69b0b403a05e22ec45acf871b92faab SHA1 0586c74da0576507f1609fb47aee539bb3a71262 SHA256 7b200a5aadb869f308bfa8a9a51aa4d0e85902367e7a27f63286e7aeff0cb91f
-MISC ChangeLog 7574 RMD160 4878d737c04e61188285a4ec7595d57ee131d8bd SHA1 1505723dd52b536fe9b9780946a07b83bd8cb199 SHA256 08d3b18608c5d13caa46770de6d3e16fbdb7ca90001f1da7a8e518a77caba0f4
+EBUILD foo2zjs-20080225.ebuild 3440 RMD160 7b9c10635fd602ea863a3c8710f91206b6df356a SHA1 31c7a1dca381196ff4a22baa80a87caed41c9930 SHA256 0481a932f5c9b82b4d906407af4b46e409c9bf6559e9180d07839f20d313026b
+MISC ChangeLog 7837 RMD160 eedccfe08a5cbd062cfcc23fcd31110234c95a93 SHA1 a55e96bde759cdae00b676ff292e5f5254093f1d SHA256 54c7b9891a9bbe1a7be3825e910077373225e192da9ea3d7a469c03d336d24cf
 MISC metadata.xml 266 RMD160 71124c3803fd7ba3370f1b9b55b78d56c5e49201 SHA1 12efa221e1a3580f557896136ccece543c4dca39 SHA256 27d69d00958eb408ac3c397767f9104d5e85c85a977c094140a8169fc6750df7
diff --git a/net-print/foo2zjs/files/foo2zjs-Makefile-20080225.diff b/net-print/foo2zjs/files/foo2zjs-Makefile-20080225.diff
new file mode 100644
index 000000000000..e528f0e0da46
--- /dev/null
+++ b/net-print/foo2zjs/files/foo2zjs-Makefile-20080225.diff
@@ -0,0 +1,185 @@
+diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
+--- foo2zjs.orig/Makefile	2008-02-16 05:58:26.000000000 -0900
++++ foo2zjs/Makefile	2008-02-25 20:50:15.000000000 -0900
+@@ -17,7 +17,7 @@
+ 
+ # Installation prefix...
+ PREFIX=/usr/local
+-PREFIX=/usr
++PREFIX=$(DESTDIR)/usr
+ 
+ # Pathnames for this package...
+ BIN=$(PREFIX)/bin
+@@ -34,7 +34,7 @@
+ INSTALL=install
+ 
+ # Pathnames for referenced packages...
+-FOODB=/usr/share/foomatic/db/source
++FOODB=$(PREFIX)/share/foomatic/db/source
+ 
+ # User ID's
+ LPuid=-olp
+@@ -245,7 +245,7 @@
+ endif
+ 
+ # Compiler flags
+-CFLAGS +=	-O2 -Wall
++CFLAGS ?=	-O2 -Wall
+ #CFLAGS +=	-g
+ 
+ #
+@@ -537,12 +537,14 @@
+ UDEVBIN=/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) -c $(PROGS) $(SHELLS) $(BIN)/
+ 	if [ "$(BINPROGS)" != "" ]; then \
+-	    $(INSTALL) -c $(BINPROGS) $(UDEVBIN); \
++		install -c $(BINPROGS) $(DESTDIR)/bin/; \
+ 	fi
+ 	#
+ 	# Install gamma correction files.  These are just templates,
+@@ -575,6 +577,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 \
+@@ -592,10 +595,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
+ 
+@@ -709,9 +712,9 @@
+ 	    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
+ VARPPD=/var/lp/ppd
+ install-ppd:
+ 	#
+@@ -727,13 +730,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 \
+@@ -752,9 +748,9 @@
+ 	    done; \
+ 	fi
+ 
+-APPL=/usr/share/applications
+-OLDAPPL=/usr/share/gnome/apps/System
+-PIXMAPS=/usr/share/pixmaps
++APPL=$(PREFIX)/usr/share/applications
++OLDAPPL=$(PREFIX)/usr/share/gnome/apps/System
++PIXMAPS=$(PREFIX)/usr/share/pixmaps
+ install-desktop:
+ 	#
+ 	# Install GNOME desktop
+@@ -777,10 +773,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:
+ 	#
+@@ -798,9 +792,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
+@@ -809,13 +800,13 @@
+ 	ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1005
+ 	ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1006
+ 	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)/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 \
+@@ -1169,7 +1160,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	1969-12-31 14:00:00.000000000 -1000
++++ foo2zjs/hplj.usermap	2008-02-25 20:49:33.000000000 -0900
+@@ -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-27 12:13:53.000000000 -0900
++++ foo2zjs/icc2ps/Makefile	2008-02-25 20:49:33.000000000 -0900
+@@ -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 --git a/net-print/foo2zjs/files/foo2zjs-udevfwld-20080225.diff b/net-print/foo2zjs/files/foo2zjs-udevfwld-20080225.diff
new file mode 100644
index 000000000000..d5c1e5ee87b1
--- /dev/null
+++ b/net-print/foo2zjs/files/foo2zjs-udevfwld-20080225.diff
@@ -0,0 +1,232 @@
+diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
+--- foo2zjs.orig/Makefile	2008-02-25 20:10:06.000000000 -0900
++++ foo2zjs/Makefile	2008-02-25 20:17:15.000000000 -0900
+@@ -19,6 +19,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
+@@ -652,21 +656,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)
+@@ -805,6 +809,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	1969-12-31 14:00:00.000000000 -1000
++++ foo2zjs/foo2zjs-loadfw	2008-02-25 20:09:13.000000000 -0900
+@@ -0,0 +1,127 @@
++#!/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
++
++#
++# Timeout to load firmware
++#
++TIMEOUT=6
++
++#
++#	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 [ -n "$2" ]; then
++    DEVNAME=$2
++elif [ -n "$DEVNAME" ]; then
++    log 'using $DEVNAME'
++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
++
++#
++#	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
++	sleep $TIMEOUT
++	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 -Nur foo2zjs.orig/hplj1000 foo2zjs/hplj1000
+--- foo2zjs.orig/hplj1000	2007-11-25 02:55:09.000000000 -0900
++++ foo2zjs/hplj1000	2008-02-25 20:09:13.000000000 -0900
+@@ -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 -Nur foo2zjs.orig/hplj10xx.rules foo2zjs/hplj10xx.rules
+--- foo2zjs.orig/hplj10xx.rules	2007-11-24 22:15:34.000000000 -0900
++++ foo2zjs/hplj10xx.rules	2008-02-25 20:18:19.000000000 -0900
+@@ -1,28 +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-%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-%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-%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-%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 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"
++ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
++	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"
++ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
++	ATTRS{idProduct}=="2b17", RUN+="/sbin/foo2zjs-loadfw 1020 $tempnode"
diff --git a/net-print/foo2zjs/foo2zjs-20080225.ebuild b/net-print/foo2zjs/foo2zjs-20080225.ebuild
new file mode 100644
index 000000000000..da2befd822a1
--- /dev/null
+++ b/net-print/foo2zjs/foo2zjs-20080225.ebuild
@@ -0,0 +1,108 @@
+# 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-20080225.ebuild,v 1.1 2008/03/11 19:44:03 genstef Exp $
+
+inherit eutils
+
+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" )
+URIS=(
+"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://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
+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"
+"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://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"
+)
+
+SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}.tar.gz"
+IUSE="cups foomaticdb usb"
+for ((DEV=0; DEV < ${#DEVICES[*]}; DEV++)); do
+	SRC_URI="${SRC_URI} foo2zjs_devices_${DEVICES[DEV]}? ( ${URIS[DEV]} )"
+	IUSE="${IUSE} foo2zjs_devices_${DEVICES[DEV]}"
+	ALL_BEGIN="${ALL_BEGIN} !foo2zjs_devices_${DEVICES[DEV]}? ("
+	ALL_MIDDLE="${ALL_MIDDLE} ${URIS[DEV]}"
+	ALL_END="${ALL_END} )"
+done
+SRC_URI="${SRC_URI}${ALL_BEGIN}${ALL_MIDDLE}${ALL_END}"
+RESTRICT="mirror"
+LICENSE="GPL-2"
+SLOT="0"
+DEPEND="app-arch/unzip"
+RDEPEND="cups? ( net-print/cups )
+	foomaticdb? ( net-print/foomatic-db-engine )
+	net-print/foomatic-filters
+	sys-fs/udev"
+KEYWORDS="~x86 ~amd64 ~ppc"
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	# link getweb files in ${S} to get unpacked
+	for i in ${A}
+	do
+		ln -s ${DISTDIR}/${i} ${S}
+	done
+
+	cd ${S}
+	epatch ${FILESDIR}/foo2zjs-Makefile-20080225.diff
+	epatch ${FILESDIR}/foo2zjs-udevfwld-20080225.diff
+}
+
+src_compile() {
+	emake getweb || die "Failed building getweb script"
+
+	# remove wget as we got the firmware with portage
+	sed -i -e "s/.*wget .*//" \
+		-e 's/.*rm $.*//' \
+		-e "s/error \"Couldn't dow.*//" getweb
+
+	# unpack files
+	GOT=0;
+	for ((DEV=0; DEV < ${#DEVICES[*]}; DEV++)); do
+		if use foo2zjs_devices_${DEVICES[DEV]}; then
+			./getweb ${DEVICES[DEV]:2}
+			GOT=1
+		fi
+	done
+	if [ ${GOT} == 0 ]; then ./getweb all; fi
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	use foomaticdb && dodir /usr/share/foomatic/db/source
+
+	use cups && dodir /usr/share/cups/model
+
+	emake DESTDIR=${D} install install-udev \
+		|| die "emake install failed"
+}
+
+pkg_postinst() {
+	udevcontrol reload_rules
+}