Some cosmetic fixes and version bump

(Portage version: 2.1_rc3-r4)

6 files changed, 458 insertions, 10 deletions

diff --git a/net-print/foo2zjs/ChangeLog b/net-print/foo2zjs/ChangeLog
index bb37ac05198f..64370a217733 100644
--- a/net-print/foo2zjs/ChangeLog
+++ b/net-print/foo2zjs/ChangeLog
@@ -1,6 +1,14 @@
 # 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.12 2006/05/23 01:50:45 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/ChangeLog,v 1.13 2006/06/01 16:45:38 genstef Exp $
+
+*foo2zjs-20060523 (01 Jun 2006)
+
+  01 Jun 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/foo2zjs-Makefile-20060523.diff,
+  +files/foo2zjs-udevfwld-20060523.diff, foo2zjs-20060501-r1.ebuild,
+  +foo2zjs-20060523.ebuild:
+  Some cosmetic fixes and version bump
 
   23 May 2006; Robin H. Johnson <robbat2@gentoo.org>
   foo2zjs-20060501-r1.ebuild:
diff --git a/net-print/foo2zjs/files/digest-foo2zjs-20060523 b/net-print/foo2zjs/files/digest-foo2zjs-20060523
new file mode 100644
index 000000000000..85bece499a3b
--- /dev/null
+++ b/net-print/foo2zjs/files/digest-foo2zjs-20060523
@@ -0,0 +1,30 @@
+MD5 cae0d20d3c1d57cd3953d9b335014294 cpplxp.exe 4799488
+RMD160 bcd5ceecca248c90a0d3e99dd55c6e1eedd4de6d cpplxp.exe 4799488
+SHA256 5f4c8b6f20ccf2d525f683847f5dc24bb4c7f58131d6704047d6c9a90d6895af cpplxp.exe 4799488
+MD5 9da58d08fe63b2a79c39223e51680e5a foo2zjs-20060523.tar.gz 917839
+RMD160 f306e9cdafb9a388e3100e68c881fb14f9c515bc foo2zjs-20060523.tar.gz 917839
+SHA256 f1b87ff6bc441a1f6d684010fa455085ff4c8792274f9cce3a34d800c68257dc foo2zjs-20060523.tar.gz 917839
+MD5 102f999ad780acdb9d1da8f31f004aba hpclj2600n.tar.gz 686898
+RMD160 f635ec5d92a515f495bdad16921d48b4a8824f9e hpclj2600n.tar.gz 686898
+SHA256 bf04d1805049c658a4e267aad0c0f25929b6012085296a796645114639dd8201 hpclj2600n.tar.gz 686898
+MD5 304e9fd69db04a2f32b72178792cc2af km2430.tar.gz 929120
+RMD160 2ec7981ab8df6cd7f5fbe20d589066a282af03cf km2430.tar.gz 929120
+SHA256 13c2ed97edf9e1e50521924639f4bcc18322759a30d75ee52c9a78aaf1a22162 km2430.tar.gz 929120
+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
+MD5 5d47d54f9cc19225c6ad07763bd02801 sihp1000.tar.gz 50423
+RMD160 5cd97ca6944d421df213420fc5d1e1572f85ec84 sihp1000.tar.gz 50423
+SHA256 7bdb5387419a880e32c9280b8d3878b08eb8fbd614237f164a9ae1e81bc2cff6 sihp1000.tar.gz 50423
+MD5 10937cc743b03ea9776a9f6eb35159a0 sihp1005.tar.gz 52301
+RMD160 5ebc04fadafb2033cba9665840897c48eb0d0f70 sihp1005.tar.gz 52301
+SHA256 55820298cc441893b19d28ff82ff1c8438fb53bad24c2db40b06f24c356cb320 sihp1005.tar.gz 52301
+MD5 89bc9a1199abc2bd304694f0273a248a sihp1018.tar.gz 70547
+RMD160 f358ae6be52395070d7eea6aa2b0d3d6baf2d7ea sihp1018.tar.gz 70547
+SHA256 d95f26f302e4a6580aa83fd13b99911fe8ad7a1de88fd1545c1f2e384b1d2af7 sihp1018.tar.gz 70547
+MD5 290c2a03d665ceb4dfbbd60b471ebb3d sihp1020.tar.gz 68877
+RMD160 39e998123ad074231c6333ff70ccabbe513ea90f sihp1020.tar.gz 68877
+SHA256 c69504fa7a96f63a71fb507f5d61a846db60a9ed000abb4cb04b32cfe7c23704 sihp1020.tar.gz 68877
diff --git a/net-print/foo2zjs/files/foo2zjs-Makefile-20060523.diff b/net-print/foo2zjs/files/foo2zjs-Makefile-20060523.diff
new file mode 100644
index 000000000000..66bbd6f58889
--- /dev/null
+++ b/net-print/foo2zjs/files/foo2zjs-Makefile-20060523.diff
@@ -0,0 +1,143 @@
+diff -Nupr foo2zjs.orig/hplj.usermap foo2zjs/hplj.usermap
+--- foo2zjs.orig/hplj.usermap	1970-01-01 01:00:00.000000000 +0100
++++ foo2zjs/hplj.usermap	2006-06-01 17:19:51.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 -Nupr foo2zjs.orig/icc2ps/Makefile foo2zjs/icc2ps/Makefile
+--- foo2zjs.orig/icc2ps/Makefile	2006-06-01 17:22:44.000000000 +0200
++++ foo2zjs/icc2ps/Makefile	2006-06-01 17:20:26.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 cmsio0.c cmsvirt.c
+-CFLAGS=	-O3
++CFLAGS?=	-O3
+ 
+ all: foo2zjs-icc2ps
+ 
+diff -Nupr foo2zjs.orig/Makefile foo2zjs/Makefile
+--- foo2zjs.orig/Makefile	2006-06-01 17:22:44.000000000 +0200
++++ foo2zjs/Makefile	2006-06-01 17:19:51.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
+@@ -150,7 +150,7 @@ ifeq ($(UNAME),Linux)
+ endif
+ 
+ # Compiler flags
+-CFLAGS +=	-O2 -Wall
++CFLAGS ?=      -O2 -Wall
+ 
+ #
+ # Rules to create test documents
+@@ -316,12 +316,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,
+@@ -347,6 +349,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 \
+@@ -364,10 +367,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
+ 
+@@ -431,8 +434,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
+@@ -449,22 +452,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 \
+@@ -757,7 +758,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 --git a/net-print/foo2zjs/files/foo2zjs-udevfwld-20060523.diff b/net-print/foo2zjs/files/foo2zjs-udevfwld-20060523.diff
new file mode 100644
index 000000000000..2e72238c764b
--- /dev/null
+++ b/net-print/foo2zjs/files/foo2zjs-udevfwld-20060523.diff
@@ -0,0 +1,191 @@
+diff -Nupr foo2zjs.orig/foo2zjs-loadfw foo2zjs/foo2zjs-loadfw
+--- foo2zjs.orig/foo2zjs-loadfw	1970-01-01 01:00:00.000000000 +0100
++++ foo2zjs/foo2zjs-loadfw	2006-06-01 17:23:50.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 -Nupr foo2zjs.orig/hplj1000 foo2zjs/hplj1000
+--- foo2zjs.orig/hplj1000	2006-06-01 17:19:43.000000000 +0200
++++ foo2zjs/hplj1000	2006-06-01 17:23:50.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 -Nupr foo2zjs.orig/hplj10xx.rules foo2zjs/hplj10xx.rules
+--- foo2zjs.orig/hplj10xx.rules	2006-06-01 17:19:43.000000000 +0200
++++ foo2zjs/hplj10xx.rules	2006-06-01 17:26:00.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 series", 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 -Nupr foo2zjs.orig/Makefile foo2zjs/Makefile
+--- foo2zjs.orig/Makefile	2006-06-01 17:23:05.000000000 +0200
++++ foo2zjs/Makefile	2006-06-01 17:23:50.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)
+ 
diff --git a/net-print/foo2zjs/foo2zjs-20060501-r1.ebuild b/net-print/foo2zjs/foo2zjs-20060501-r1.ebuild
index f9fe4f8acb57..d5b9f8b1d450 100644
--- a/net-print/foo2zjs/foo2zjs-20060501-r1.ebuild
+++ b/net-print/foo2zjs/foo2zjs-20060501-r1.ebuild
@@ -1,21 +1,20 @@
 # 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.2 2006/05/23 01:50:45 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/foo2zjs-20060501-r1.ebuild,v 1.3 2006/06/01 16:45:38 genstef Exp $
 
-inherit eutils flag-o-matic
+inherit eutils
 
 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"
+		http://gentooexperimental.org/~genstef/dist/${P}.tar.gz"
 RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="cups foomaticdb usb"
-DEPEND="app-arch/unzip
-	dev-lang/perl"
+DEPEND="app-arch/unzip"
 RDEPEND="cups? ( net-print/cups )
 	foomaticdb? ( net-print/foomatic )
 	usb? ( || ( sys-fs/udev sys-apps/hotplug ) )"
@@ -26,7 +25,7 @@ src_unpack() {
 	unpack ${P}.tar.gz
 
 	# link getweb files in ${S} to get unpacked
-	for i in m23dlicc.exe m22dlicc.exe cpplxp.exe
+	for i in ${A}
 	do
 		ln -s ${DISTDIR}/${i} ${S}
 	done
@@ -40,8 +39,8 @@ 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
+	sed -i -e "s/.*wget.*//" \
+		-e "s/error \"Couldn't dow.*//" getweb
 	# unpack files
 	./getweb all
 
@@ -68,5 +67,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	rm ${ROOT}/etc/udev/rules.d/58-foo2zjs.rules
+	rm -f ${ROOT}/etc/udev/rules.d/58-foo2zjs.rules
 }
diff --git a/net-print/foo2zjs/foo2zjs-20060523.ebuild b/net-print/foo2zjs/foo2zjs-20060523.ebuild
new file mode 100644
index 000000000000..d820a7d4fc03
--- /dev/null
+++ b/net-print/foo2zjs/foo2zjs-20060523.ebuild
@@ -0,0 +1,77 @@
+# 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-20060523.ebuild,v 1.1 2006/06/01 16:45:38 genstef Exp $
+
+inherit eutils
+
+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://gentooexperimental.org/~genstef/dist/${P}.tar.gz
+		http://foo2zjs.rkkda.com/sihp1000.tar.gz
+		http://foo2zjs.rkkda.com/sihp1005.tar.gz
+		http://foo2zjs.rkkda.com/sihp1018.tar.gz
+		http://foo2zjs.rkkda.com/sihp1020.tar.gz
+		http://foo2zjs.rkkda.com/km2430.tar.gz
+		http://foo2hp.rkkda.com/hpclj2600n.tar.gz"
+RESTRICT="nomirror"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="cups foomaticdb usb"
+DEPEND="app-arch/unzip"
+RDEPEND="cups? ( net-print/cups )
+	foomaticdb? ( net-print/foomatic )
+	usb? ( || ( sys-fs/udev sys-apps/hotplug ) )"
+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-20060523.diff
+	epatch ${FILESDIR}/foo2zjs-udevfwld-20060523.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/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 -f ${ROOT}/etc/udev/rules.d/58-foo2zjs.rules
+}