net-print/foo2zjs: Version bump

7 files changed, 314 insertions, 596 deletions

diff --git a/net-print/foo2zjs/Manifest b/net-print/foo2zjs/Manifest
index 0a74a3a3..8f0b69ab 100644
--- a/net-print/foo2zjs/Manifest
+++ b/net-print/foo2zjs/Manifest
@@ -1,19 +1,25 @@
-DIST cpplxp.exe 4799488 SHA256 5f4c8b6f20ccf2d525f683847f5dc24bb4c7f58131d6704047d6c9a90d6895af
-DIST foo2zjs-20081129.tar.gz 1556478 SHA256 7b372e51a1251445f0150a7160148f4682ca32a2253f8ae9cbb845283b883b97
-DIST hpclj2600n.tar.gz 573660 SHA256 1f2c92055f22a7a6526b84b2c31e36ce1a6de003f66b31eb60cd400b84e213b6
-DIST km2430.tar.gz 929112 SHA256 88e21cc7f5c124223a6e4baea9d18dfae4a74f28f500dfae8e035495434ff572
-DIST km2530.tar.gz 2045958 SHA256 36226589e899f5d79476f5a718575eed51e81a81632ea11ba5db9e289572fb9b
-DIST lexc500.tar.gz 239577 SHA256 823fd57b2e1b5aa6ed7a07055616238ed9b02e324b9d1c5f4f281e5ae4b0a667
-DIST m22dlicc.exe 634368 SHA256 1d57413f4c36941c64599dae2ac2b1f8a397e128796c2796a108be5b8fd282b3
-DIST m23dlicc.exe 170496 SHA256 1416cda7e2e3496ff1d121c87dd8984ad1d16ed3396096f05f4919dafd445ae4
-DIST okic3200.tar.gz 527532 SHA256 f5503854d4537868d24a797912b2fa70c1fb5e0f097fc61a45f100725a064521
-DIST okic3400.tar.gz 453326 SHA256 5f64ac0002c6f2f25d481bada150121d7d77e29e616de0639446903904043a70
-DIST okic5600.tar.gz 674998 SHA256 7b2d59d54ecefecd053766bdb1d81db08c9d32979031cb8c4e2d5162d7d8f6bd
-DIST samclp300.tar.gz 427584 SHA256 cf7eaca16a6a1892e13cd87825dcb57060c4c50815a52b0f2cb09b27304ec140
-DIST sihp1000.tar.gz 50416 SHA256 28ee34195a976212800c6abd29047c297c4367aaf727f279e16de297f13562f5
-DIST sihp1005.tar.gz 52297 SHA256 fb044ea77cbe3c5e2f86d00db02733ab1f8bdf102fcbfc55ba4eb2bee94535ee
-DIST sihp1018.tar.gz 70544 SHA256 95505c88af25d0c2130077af68e0404d88fc8dfb0a58943bdb9313f3e6c10f10
-DIST sihp1020.tar.gz 70139 SHA256 c6117961ff9a4a1a880093daea52d800636f6c1002e4cf4fda2009f08f652751
-DIST sihpP1005.tar.gz 153447 SHA256 9672c09945f4d1b19841187b30832f3afdfbdf0a1e770f41d95c1575fb865c5c
-DIST sihpP1006.tar.gz 153532 SHA256 7974d669cd68a88674e0b6c44c5fa48f7c6625d16714cac6ded7b26024184f50
-DIST sihpP1505.tar.gz 166072 SHA256 f631bce116447af89b1740c3b9732666348579a9dcd96d6f31121d5586332f35
+DIST dl2300-20130105.tar.gz 1205154 SHA256 e0234217bfd84fec0404d2a90ad09c8269e3f7c263708ccd6d872b1f8e6858ab
+DIST foo2zjs-20160603.tar.gz 1712760 SHA256 69f0b9baa94470a8936002fb0d46c37980b7654eb1e21292e22e2cbbb13ca650
+DIST hp-cp1025-20130105.tar.gz 122026 SHA256 f3784a3c297c37ae3f2404c7fe9a359a1171131d57bd0e4d2c7d7ce814664c6a
+DIST hp1215-20130105.tar.gz 112237 SHA256 c3d2262d0c37a3246fd51ca075808f9e97693fbcf623c5f689976809c5433617
+DIST hpclj2500-20130105.tar.gz 52571 SHA256 28f3641472d50e713aaa7476954fef5b677901aef126ea0ac7958dfe7462bf10
+DIST hpclj2600n-20130105.tar.gz 573660 SHA256 5ebb4cdcbc99d049a611cc398e4fbe35152e287e743b21b70a138d3b462479b9
+DIST km-1600-20130105.tar.gz 121230 SHA256 25a8bee2c02dbd659d3bdacb2e8aa2a2a0ee611af5bd157d3a6feaea6731bc01
+DIST km2430-20130105.tar.gz 929112 SHA256 3b4701d2309aca006fd295c0a208b72136591ccee812181429795e405991f04f
+DIST km2530-20130105.tar.gz 2046286 SHA256 03bf4153665162ab001096d70291a9657022e388ce7e6f347d859b41aa73bedd
+DIST lexc500-20130105.tar.gz 239577 SHA256 774ccbfef108bec708bf71e15299a1120aa82d3bc39a921062dc76ee3d866ff2
+DIST okic310-20130105.tar.gz 674661 SHA256 362017f58a9bde0cb677c363969f8c9694c878fbc883ee20940933d0bc273fd0
+DIST okic3200-20130105.tar.gz 527532 SHA256 5ceaf5e67efdca086c873b570eee1de397e114c1cdcfed1f2c3500c90a9e7608
+DIST okic3400-20130105.tar.gz 453326 SHA256 38533c32155ee7f3288289fcb306929c5badba19ff2f493167077252d500f41a
+DIST okic511-20150212.tar.gz 674664 SHA256 733e1a7b117a06d078ac3fa7420a67aad66a2d3a8ff834ba8c0950ece4adba0a
+DIST okic5600-20130105.tar.gz 674998 SHA256 cb8db01f18433d54cbddc466a2a6260d2c13fd8e1e100dde396e410231a65135
+DIST okic810-20131118.tar.gz 674963 SHA256 e13fd19b492a938ea8d955ea56653eeabdc97c2ad7409a368f6bc511943e4877
+DIST samclp300-20130105.tar.gz 427584 SHA256 32ca771dd35b1fc3e753ff00f30aa3ce406f66059a591a5f8179f798a0c9ddbe
+DIST samclp315-20130105.tar.gz 99680 SHA256 7f64829348482561853a805ec1b3655fdc1976a028a95761c031f5d6bf975989
+DIST sihp1000-20100501.tar.gz 50416 SHA256 61a4ac9f94e9749a4e3c8971a7bb8d610608bea6bd2aedcb98a4f307553955f6
+DIST sihp1005-20100501.tar.gz 52297 SHA256 42d6ab614d998a274ac3b8a4520595dcb251a9b051ba9f1e2a70e6ad54cce7b3
+DIST sihp1018-20100501.tar.gz 70544 SHA256 1c24a8ab5c9921a1982387f52685779a5a7c911a54119352bcaa64f01830ec82
+DIST sihp1020-20100501.tar.gz 70139 SHA256 ec4665c6704c2db3cfaeb71bb06f1bbc9449c030504b04f533a84bdfae89f966
+DIST sihpP1005-20100501.tar.gz 153804 SHA256 a20e4b550a418b99a28a320d7834f50ae0b126f0cbc3b0e84ba0e0bf5de872a0
+DIST sihpP1006-20100501.tar.gz 153940 SHA256 b9efe6926fc4cac578b18b5ef8adab13e87c80a25430309110e3f61ace5bcf8f
+DIST sihpP1505-20100501.tar.gz 166199 SHA256 2700916d01ebb693a9a4e34a1858fe44229a1bd3bc7abe08ce0e32be3659e58b
diff --git a/net-print/foo2zjs/files/foo2zjs-20081129-Makefile.patch b/net-print/foo2zjs/files/foo2zjs-20081129-Makefile.patch
deleted file mode 100644
index 8391dad8..00000000
--- a/net-print/foo2zjs/files/foo2zjs-20081129-Makefile.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-diff -urN foo2zjs.orig/icc2ps/Makefile foo2zjs/icc2ps/Makefile
---- foo2zjs.orig/icc2ps/Makefile	2007-11-27 22:13:53.000000000 +0100
-+++ foo2zjs/icc2ps/Makefile	2008-12-02 13:51:12.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.orig/Makefile foo2zjs/Makefile
---- foo2zjs.orig/Makefile	2008-09-23 15:56:20.000000000 +0200
-+++ foo2zjs/Makefile	2008-12-02 14:00: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,
-@@ -570,6 +571,7 @@
- 	#
- 	# Remove obsolete foomatic database files from previous versions
- 	#
-+	mkdir -p $(FOODB)/opt/
- 	rm -f $(FOODB)/opt/foo2zjs-Media.xml
- 	rm -f $(FOODB)/opt/foo2zjs-PaperSize.xml
- 	rm -f $(FOODB)/opt/foo2zjs-Source.xml
-@@ -583,6 +585,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 +604,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 +739,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 +785,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 +804,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 +814,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 +1211,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-20081129-udevfwld.patch b/net-print/foo2zjs/files/foo2zjs-20081129-udevfwld.patch
deleted file mode 100644
index 808b32f1..00000000
--- a/net-print/foo2zjs/files/foo2zjs-20081129-udevfwld.patch
+++ /dev/null
@@ -1,273 +0,0 @@
---- 1/Makefile
-+++ 1/Makefile
-@@ -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
-@@ -661,21 +665,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)
-@@ -818,6 +822,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)
- 
---- foo2zjs-loadfw
-+++ foo2zjs-loadfw
-@@ -0,0 +1,151 @@
-+#!/bin/sh
-+
-+#	foo2zjs-loadfw:
-+#
-+#	Hotplug script for 100[05],1018,1020,P100[5678],P1505,P1505n
-+#	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 printer 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 argument of this script
-+#
-+MODELNAME=''
-+FWMODEL=''
-+case "$1" in
-+P1005)
-+	MODEL=P1005
-+	;;
-+P1006)
-+	MODEL=P1006
-+	;;
-+P1007)
-+	MODEL=P1007
-+	FWMODEL=P1005
-+	;;
-+P1008)
-+	MODEL=P1008
-+	FWMODEL=P1006
-+	;;
-+P1505)
-+	MODEL=P1505
-+	;;
-+P1505n)
-+	MODEL=P1505n
-+	FWMODEL=P1505
-+	;;
-+1000)
-+	MODEL=1000
-+	MODELNAME="hp LaserJet $MODEL"
-+	;;
-+1005)
-+	MODEL=1005
-+	MODELNAME="hp LaserJet $MODEL"
-+	;;
-+1018)
-+	MODEL=1018
-+	;;
-+1020)
-+	MODEL=1020
-+	;;
-+*)
-+	log "Only HP LaserJet 100[05],1018,1020,P100[5678],P1505,P1505n are supported"
-+	log "You need to supply one of these on the cmdline: $0 10**"
-+	exit
-+	;;
-+esac
-+: ${MODELNAME:="HP LaserJet $MODEL"}
-+: ${FWMODEL:="$MODEL"}
-+
-+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$FWMODEL.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
---- hplj1000
-+++ hplj1000
-@@ -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
---- hplj10xx.rules
-+++ hplj10xx.rules
-@@ -1,36 +1,21 @@
--#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 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}=="3d17", RUN+="/sbin/foo2zjs-loadfw P1005 $tempnode"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+   ATTRS{idProduct}=="3e17", RUN+="/sbin/foo2zjs-loadfw P1006 $tempnode"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+   ATTRS{idProduct}=="4817", RUN+="/sbin/foo2zjs-loadfw P1007 $tempnode"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+   ATTRS{idProduct}=="4917", RUN+="/sbin/foo2zjs-loadfw P1008 $tempnode"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+   ATTRS{idProduct}=="3f17", RUN+="/sbin/foo2zjs-loadfw P1505 $tempnode"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
-+   ATTRS{idProduct}=="4017", RUN+="/sbin/foo2zjs-loadfw P1505n $tempnode"
-+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/files/foreground.patch b/net-print/foo2zjs/files/foreground.patch
new file mode 100644
index 00000000..ec4a69c5
--- /dev/null
+++ b/net-print/foo2zjs/files/foreground.patch
@@ -0,0 +1,18 @@
+--- 1/hplj1000
++++ 1/hplj1000
+@@ -220,14 +220,12 @@
+     fi
+ 
+     log "loading HP LaserJet $MODEL firmware $fw to $_dev ..."
+-    # There is a timeout problem with udev and FC4, so spin it off.
+-    (
+ 	if cat $fw > $_dev; then
+ 	    log "... download successful."
+ 	else
+ 	    log "... download failed."
++	    return 1
+ 	fi
+-    ) &
+     return 0
+ }
+ 
diff --git a/net-print/foo2zjs/foo2zjs-20081129-r1.ebuild b/net-print/foo2zjs/foo2zjs-20081129-r1.ebuild
deleted file mode 100644
index 3806bdb6..00000000
--- a/net-print/foo2zjs/foo2zjs-20081129-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-DESCRIPTION="Support for printing to ZjStream-based printers. Fixes bug 271079"
-HOMEPAGE="http://foo2zjs.rkkda.com/"
-
-# extracted by http://gentooexperimental.org/~genstef/dist/foo2zjs-helper.sh
-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"
-"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/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"
-"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://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://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]} )"
-	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}"
-
-LICENSE="GPL-2"
-# due to those firmwares/icms/etc...
-RESTRICT="mirror"
-SLOT="0"
-DEPEND="app-arch/unzip"
-RDEPEND="cups? ( net-print/cups )
-	foomaticdb? ( net-print/foomatic-db-engine )
-	net-print/foomatic-filters
-	virtual/udev"
-KEYWORDS="~x86 ~amd64 ~ppc"
-S="${WORKDIR}/${PN}"
-
-PATCHES=("${FILESDIR}"/${P}-Makefile.patch "${FILESDIR}"/${P}-udevfwld.patch)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	# link getweb files in ${S} to get unpacked
-	local i
-	for i in ${A}
-	do	ln -s "${DISTDIR}"/${i} "${S}"
-	done
-}
-
-src_compile() {
-	emake getweb
-
-	# 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
-}
-
-src_install() {
-	use foomaticdb && dodir /usr/share/foomatic/db/source
-
-	use cups && dodir /usr/share/cups/model
-
-	emake DESTDIR="${ED}" install install-udev
-}
diff --git a/net-print/foo2zjs/foo2zjs-20160603.ebuild b/net-print/foo2zjs/foo2zjs-20160603.ebuild
new file mode 100644
index 00000000..6aa8e720
--- /dev/null
+++ b/net-print/foo2zjs/foo2zjs-20160603.ebuild
@@ -0,0 +1,217 @@
+# Copyright 2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Support for printing to ZjStream-based printers"
+HOMEPAGE="http://foo2zjs.rkkda.com/"
+SRC_URI="http://foo2zjs.rkkda.com/${PN}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="+cups"
+IUSE_LATER="foomaticdb test"
+# due to those firmwares/icms/etc...
+RESTRICT="mirror"
+
+PATCHES=("${FILESDIR}/foreground.patch")
+
+COMMON="foomaticdb? ( net-print/foomatic-db-engine )"
+RDEPEND="${COMMON}
+	cups? (
+		net-print/cups
+		|| ( >=net-print/cups-filters-1.0.43 net-print/foomatic-filters )
+	)
+	virtual/udev"
+DEPEND="${COMMON}
+	app-arch/unzip
+	app-editors/vim
+	sys-apps/ed
+	sys-devel/bc
+	test? ( sys-process/time )"
+
+S="${WORKDIR}/${PN}"
+
+print_url() {
+	local i curr verdata usual
+	usual='20130105'
+	curr=
+	verdata=false
+	for i
+	do	if ${verdata}
+		then	verdata=false
+			print_url_sub "${curr}" "${i}"
+			curr=
+		elif [ "$i" = '->' ]
+		then	verdata=:
+		else	print_url_sub "${curr}" "${usual}"
+			curr=${i}
+		fi
+	done
+	print_url_sub "${curr}" "${usual}"
+}
+
+print_url_sub() {
+	local base ext
+	[ -z "${1:++}" ] && return
+	if [ -z "${2:++}" ]
+	then	printf '%s\n' "${1}"
+		return
+	fi
+	base=${1##*/}
+	ext=${base##*.}
+	base=${base%.*}
+	case ${base} in
+	*.[!.][!.][!.])
+		ext=${base##*.}.${ext}
+		base=${base%.*}
+	;;
+	esac
+	printf '%s %s %s\n' "${1}" '->' "${base}-${2}.${ext}"
+}
+
+init_data() {
+	local i flag url readflag sihp most
+	sihp='-> 20100501'
+	readflag=:
+	# see getweb or getweb.in
+	for i in \
+	'hp1000' "http://foo2zjs.rkkda.com/firmware/sihp1000.tar.gz ${sihp}" \
+	'hp1005' "http://foo2zjs.rkkda.com/firmware/sihp1005.tar.gz ${sihp}
+http://foo2zjs.rkkda.com/firmware/sihpP1005.tar.gz ${sihp}" \
+	'hp1018' "http://foo2zjs.rkkda.com/firmware/sihp1018.tar.gz ${sihp}" \
+	'hp1020' "http://foo2zjs.rkkda.com/firmware/sihp1020.tar.gz ${sihp}" \
+	'hpp1005' "http://foo2zjs.rkkda.com/firmware/sihpP1005.tar.gz ${sihp}" \
+	'hpp1007' \" \
+	'hpp1006' "http://foo2zjs.rkkda.com/firmware/sihpP1006.tar.gz ${sihp}" \
+	'hpp1008' \" \
+	'hpp1505' "http://foo2zjs.rkkda.com/firmware/sihpP1505.tar.gz ${sihp}" \
+	'km2200' "http://foo2zjs.rkkda.com/icm/dl2300.tar.gz" \
+	'km2300' "http://foo2zjs.rkkda.com/icm/dl2300.tar.gz
+http://foo2zjs.rkkda.com/icm/km2430.tar.gz" \
+	'kmcpwl' "http://foo2zjs.rkkda.com/icm/dl2300.tar.gz" \
+	'km2430' "http://foo2zjs.rkkda.com/icm/km2430.tar.gz" \
+	'km2530' "http://foo2lava.rkkda.com/icm/km2530.tar.gz
+http://foo2lava.rkkda.com/icm/km-1600.tar.gz" \
+	'km2490' \" \
+	'km2480' \" \
+	'xp6115' \" \
+	'hp1500' "http://foo2hp.rkkda.com/icm/hpclj2500.tar.gz
+http://foo2hp.rkkda.com/icm/hpclj2600n.tar.gz" \
+	'hp1025' "http://foo2zjs.rkkda.com/icm/hp-cp1025.tar.gz" \
+	'hp1215' "http://foo2hp.rkkda.com/icm/hpclj2600n.tar.gz
+http://foo2zjs.rkkda.com/icm/km2430.tar.gz
+http://foo2hp.rkkda.com/icm/hp1215.tar.gz" \
+	'hp1600' \" \
+	'hp2600n' \" \
+	'sa300' "http://foo2qpdl.rkkda.com/icm/samclp300.tar.gz
+http://foo2qpdl.rkkda.com/icm/samclp315.tar.gz" \
+	'sa310' \" \
+	'sa315' \" \
+	'sa325' \" \
+	'sa360' \" \
+	'sa365' \" \
+	'sa2160' \" \
+	'sa3160' \" \
+	'sa3175' \" \
+	'sa3185' \" \
+	'xp6110' \" \
+	'sa600' '' \
+	'sa610' \" \
+	'lm500' "http://foo2slx.rkkda.com/icm/lexc500.tar.gz" \
+	'oki301' "http://foo2hiperc.rkkda.com/icm/okic310.tar.gz" \
+	'oki310' "http://foo2hiperc.rkkda.com/icm/okic310.tar.gz" \
+	'oki511' "http://foo2hiperc.rkkda.com/icm/okic511.tar.gz -> 20150212" \
+	'oki810' "http://foo2hiperc.rkkda.com/icm/okic810.tar.gz -> 20131118" \
+	'oki3100' "http://foo2hiperc.rkkda.com/icm/okic3200.tar.gz" \
+	'oki3200' \" \
+	'oki5100' \" \
+	'oki5150' \" \
+	'oki5200' \" \
+	'oki5250' \" \
+	'oki3300' "http://foo2hiperc.rkkda.com/icm/okic3400.tar.gz" \
+	'oki3400' \" \
+	'oki3530' \" \
+	'oki5500' "http://foo2hiperc.rkkda.com/icm/okic5600.tar.gz" \
+	'oki5600' \" \
+	'oki5800' \" \
+	'oli160' \"
+	do	if ${readflag}
+		then	readflag=false
+			flag=${i}
+			IUSE=${IUSE-}${IUSE:+\ }"+foo2zjs_devices_${flag}"
+		else	readflag=:
+			if [ -n "${i}" ]
+			then	[ "${i}" = \" ] || url='? ( '$(print_url ${i})' )'
+				SRC_URI="${SRC_URI}
+foo2zjs_devices_${flag}${url}"
+			fi
+		fi
+	done
+	${readlag} || \
+		die "internal ebuild error: odd number of args in init_data()"
+	[ -z "${IUSE_LATER:++}" ] || IUSE=${IUSE-}${IUSE:+\ }${IUSE_LATER-}
+}
+init_data
+
+src_unpack() {
+	local i
+	default
+	for i in *
+	do	case "${S}" in
+		*/"${i}") continue;;
+		esac
+		if test -d "${i}"
+		then	chmod 755 -- "${i}" || die "chmod dir ${i} failed"
+		else	chmod 644 -- "${i}" || die "chmod file ${i} failed"
+		fi
+		mv -- "${i}" "${S}" || die "Move failed"
+	done
+}
+
+src_prepare() {
+	sed \
+		-e 's/$(MAKE)/$(MAKE) CFLAGS="$(CFLAGS)"/' \
+		-e 's~-x /sbin/udevd~-z ""~' \
+		-e 's~/sbin/udevd --version~echo 200~' \
+		-e 's~^CFLAGS~#CFLAGS~' \
+		-e 's~/usr/local~/usr~' \
+		-i Makefile
+#		-e "s~/lib/udev~${ED%/}/lib/udev~g" \
+#		-e "s~/etc~${ED%/}/etc~g" \
+#		-e 's/ install-filter / /g' \
+	sed -e "s~/etc~${ED%/}/etc~g" \
+		-e "s~/lib/udev~${ED%/}/lib/udev~g" \
+		-i hplj1000
+	sed -e 's/chmod -w/sleep 2; chmod -w/' \
+		-i osx-hotplug/Makefile
+	eapply_user
+}
+
+src_compile() {
+	CFLAGS="${CFLAGS-} ${LDFLAGS-}"
+	default
+}
+
+src_install() {
+	# ppd files are installed automagically. We have to create a directory
+	# for them.
+	dodir /usr/share/ppd
+
+	# Also for the udev rules we have to create a directory to install them.
+	dodir /lib/udev/rules.d
+
+	# directories we have to create if we want foomaticdb support
+	use foomaticdb && dodir /usr/share/foomatic/db/source
+
+	# Directories we have to create if we want filters
+	use cups && dodir /usr/libexec/cups/filter
+
+	emake DESTDIR="${ED%/}" \
+		USBDIR="${ED%/}/etc/hotplug/usb" \
+		UDEVDIR="${ED%/}/lib/udev/rules.d" \
+		LIBUDEVDIR="${ED%/}/lib/udev/rules.d" \
+		-j1 install install-hotplug
+}
diff --git a/net-print/foo2zjs/metadata.xml b/net-print/foo2zjs/metadata.xml
index 94756c2b..a77d6717 100644
--- a/net-print/foo2zjs/metadata.xml
+++ b/net-print/foo2zjs/metadata.xml
@@ -11,41 +11,59 @@
 	<name>Gentoo Printing Project</name>
 </maintainer>
 <use>
-	<flag name="foo2zjs_devices_hp1000">Support for hp1000</flag>
-	<flag name="foo2zjs_devices_hp1005">Support for hp1005</flag>
-	<flag name="foo2zjs_devices_hp1018">Support for hp1018</flag>
-	<flag name="foo2zjs_devices_hp1020">Support for hp1020</flag>
-	<flag name="foo2zjs_devices_hp1215">Support for hp1215</flag>
-	<flag name="foo2zjs_devices_hp1500">Support for hp1500</flag>
-	<flag name="foo2zjs_devices_hp1600">Support for hp1600</flag>
-	<flag name="foo2zjs_devices_hp2600n">Support for hp2600n</flag>
-	<flag name="foo2zjs_devices_hpp1005">Support for hpp1005</flag>
-	<flag name="foo2zjs_devices_hpp1006">Support for hpp1006</flag>
-	<flag name="foo2zjs_devices_hpp1007">Support for hpp1007</flag>
-	<flag name="foo2zjs_devices_hpp1008">Support for hpp1008</flag>
-	<flag name="foo2zjs_devices_hpp1505">Support for hpp1505</flag>
-	<flag name="foo2zjs_devices_km2200">Support for km2200</flag>
-	<flag name="foo2zjs_devices_km2300">Support for km2300</flag>
-	<flag name="foo2zjs_devices_km2430">Support for km2430</flag>
-	<flag name="foo2zjs_devices_km2480">Support for km2480</flag>
-	<flag name="foo2zjs_devices_km2490">Support for km2490</flag>
-	<flag name="foo2zjs_devices_km2530">Support for km2530</flag>
-	<flag name="foo2zjs_devices_kmcpwl">Support for kmcpwl</flag>
-	<flag name="foo2zjs_devices_lm500">Support for lm500</flag>
-	<flag name="foo2zjs_devices_oki3200">Support for oki3200</flag>
-	<flag name="foo2zjs_devices_oki3300">Support for oki3300</flag>
-	<flag name="foo2zjs_devices_oki3400">Support for oki3400</flag>
-	<flag name="foo2zjs_devices_oki3530">Support for oki3530</flag>
-	<flag name="foo2zjs_devices_oki5100">Support for oki5100</flag>
-	<flag name="foo2zjs_devices_oki5200">Support for oki5200</flag>
-	<flag name="foo2zjs_devices_oki5500">Support for oki5500</flag>
-	<flag name="foo2zjs_devices_oki5600">Support for oki5600</flag>
-	<flag name="foo2zjs_devices_oki5800">Support for oki5800</flag>
-	<flag name="foo2zjs_devices_sa2160">Support for sa2160</flag>
-	<flag name="foo2zjs_devices_sa300">Support for sa300</flag>
-	<flag name="foo2zjs_devices_sa315">Support for sa315</flag>
-	<flag name="foo2zjs_devices_sa3160">Support for sa3160</flag>
-	<flag name="foo2zjs_devices_xp6110">Support for xp6110</flag>
-	<flag name="foo2zjs_devices_xp6115">Support for xp6115</flag>
+	<flag name="cups">Add support for CUPS (Common Unix Printing System)</flag>
+	<flag name="foo2zjs_devices_hp1000">HP LJ 1000 firmware</flag>
+	<flag name="foo2zjs_devices_hp1005">HP LJ 1005 firmware</flag>
+	<flag name="foo2zjs_devices_hp1018">HP LJ 1018 firmware</flag>
+	<flag name="foo2zjs_devices_hp1020">HP LJ 1020 firmware</flag>
+	<flag name="foo2zjs_devices_hpp1005">HP LJ P1005 firmware</flag>
+	<flag name="foo2zjs_devices_hpp1006">HP LJ P1006 firmware</flag>
+	<flag name="foo2zjs_devices_hpp1007">HP LJ P1007 firmware</flag>
+	<flag name="foo2zjs_devices_hpp1008">HP LJ P1008 firmware</flag>
+	<flag name="foo2zjs_devices_hpp1505">HP LJ P1505 firmware</flag>
+	<flag name="foo2zjs_devices_km2200">Minolta 2200 DL ICM</flag>
+	<flag name="foo2zjs_devices_km2300">Minolta 2300 DL ICM</flag>
+	<flag name="foo2zjs_devices_kmcpwl">Minolta Color PageWorks/Pro L ICM</flag>
+	<flag name="foo2zjs_devices_km2430">Konica Minolta 2430 DL ICM</flag>
+	<flag name="foo2zjs_devices_km2530">Konica Minolta 2530 DL ICM</flag>
+	<flag name="foo2zjs_devices_km2490">Konica Minolta 2490 DL ICM</flag>
+	<flag name="foo2zjs_devices_km2480">Konica Minolta 2480 DL ICM</flag>
+	<flag name="foo2zjs_devices_xp6115">Xerox Phaser 6115MFP ICM</flag>
+	<flag name="foo2zjs_devices_hp1500">HP Color LaserJet 1500 ICM</flag>
+	<flag name="foo2zjs_devices_hp1025">HP LaserJet Pro CP1025nw ICM</flag>
+	<flag name="foo2zjs_devices_hp1215">HP Color LaserJet CP1215 ICM</flag>
+	<flag name="foo2zjs_devices_hp1600">HP Color LaserJet 1600 ICM</flag>
+	<flag name="foo2zjs_devices_hp2600n">HP Color LaserJet 2600n ICM</flag>
+	<flag name="foo2zjs_devices_sa300">Samsung CLP-300 ICM</flag>
+	<flag name="foo2zjs_devices_sa315">Samsung CLP-315 ICM</flag>
+	<flag name="foo2zjs_devices_sa325">Samsung CLP-325 ICM</flag>
+	<flag name="foo2zjs_devices_sa360">Samsung CLP-360 ICM</flag>
+	<flag name="foo2zjs_devices_sa365">Samsung CLP-365 ICM</flag>
+	<flag name="foo2zjs_devices_sa2160">Samsung CLX-2160 ICM</flag>
+	<flag name="foo2zjs_devices_sa3160">Samsung CLX-3160 ICM</flag>
+	<flag name="foo2zjs_devices_sa3175">Samsung CLX-3175 ICM</flag>
+	<flag name="foo2zjs_devices_sa3185">Samsung CLX-3185 ICM</flag>
+	<flag name="foo2zjs_devices_xp6110">Xerox Phaser 6110 and 6110MFP ICM</flag>
+	<flag name="foo2zjs_devices_sa600">Samsung CLP-600 ICM</flag>
+	<flag name="foo2zjs_devices_sa610">Samsung CLP-610 ICM</flag>
+	<flag name="foo2zjs_devices_lm500">Lexmark C500 ICM</flag>
+	<flag name="foo2zjs_devices_oki301">Oki C301dn ICM</flag>
+	<flag name="foo2zjs_devices_oki310">Oki C310dn ICM</flag>
+	<flag name="foo2zjs_devices_oki511">Oki C511dn ICM</flag>
+	<flag name="foo2zjs_devices_oki810">Oki C810 ICM</flag>
+	<flag name="foo2zjs_devices_oki3100">Oki C3100 ICM</flag>
+	<flag name="foo2zjs_devices_oki3200">Oki C3200 ICM</flag>
+	<flag name="foo2zjs_devices_oki5100">Oki C5100 ICM</flag>
+	<flag name="foo2zjs_devices_oki5150">Oki C5150n ICM</flag>
+	<flag name="foo2zjs_devices_oki5200">Oki C5200 ICM</flag>
+	<flag name="foo2zjs_devices_oki5250">Oki C5250n ICM</flag>
+	<flag name="foo2zjs_devices_oki3300">Oki C3300 ICM</flag>
+	<flag name="foo2zjs_devices_oki3400">Oki C3400 ICM</flag>
+	<flag name="foo2zjs_devices_oki3530">Oki C3530 MFP ICM</flag>
+	<flag name="foo2zjs_devices_oki5500">Oki C5500 ICM</flag>
+	<flag name="foo2zjs_devices_oki5600">Oki C5600 ICM</flag>
+	<flag name="foo2zjs_devices_oki5800">Oki C5800 ICM</flag>
+	<flag name="foo2zjs_devices_oli160">Olivetti d-Color P160W ICM</flag>
+	<flag name="foomaticdb">Add support for the foomatic printing driver database</flag>
 </use>
 </pkgmetadata>