Remove non-live ebuilds, they are broken by design. Discussion: <http://archives.gentoo.org/gentoo-dev/msg_9ff2c9974486981d84816f74c7eea0d9.xml>

Package-Manager: portage-2.1.9.42/cvs/Linux i686

8 files changed, 14 insertions, 1078 deletions

diff --git a/net-print/foo2zjs/ChangeLog b/net-print/foo2zjs/ChangeLog
index 71b13c7b8f1f..1ca68c572469 100644
--- a/net-print/foo2zjs/ChangeLog
+++ b/net-print/foo2zjs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-print/foo2zjs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/ChangeLog,v 1.42 2011/06/02 15:15:55 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/ChangeLog,v 1.43 2011/06/08 14:08:23 phajdan.jr Exp $
+
+  08 Jun 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -foo2zjs-20080225.ebuild, -files/foo2zjs-Makefile-20080225.diff,
+  -files/foo2zjs-udevfwld-20080225.diff, -foo2zjs-20081129.ebuild,
+  -files/foo2zjs-20081129-Makefile.patch,
+  -files/foo2zjs-20081129-udevfwld.patch:
+  Remove non-live ebuilds, they are broken by design. Discussion:
+  <http://archives.gentoo.org/gentoo-dev/msg_9ff2c9974486981d84816f74c7eea0d9.x
+  ml>
 
   02 Jun 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> foo2zjs-99999999.ebuild:
   Install missing ppd files, bug #356695 comment #5 by Mads <mads@ab3.no>. Bump
diff --git a/net-print/foo2zjs/Manifest b/net-print/foo2zjs/Manifest
index 736569a280b9..1b47f8c3a906 100644
--- a/net-print/foo2zjs/Manifest
+++ b/net-print/foo2zjs/Manifest
@@ -1,39 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX foo2zjs-20081129-Makefile.patch 4709 RMD160 670d88781bd13e6a63be3983c46ef25dd28db6b5 SHA1 197601abfed199f38b1c3588b0d37f2e0f9daf5e SHA256 d093d2cc2501fa7d84397e12b0085c18747134934540236f072919767edc3b56
-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-20080225.diff 7408 RMD160 32780df42edb60c4449ee7a397809a24dddec4a9 SHA1 572b11a275adf70e0155a1480547094633cba9fa SHA256 c7fa47847cb5250796ae8cb363da89a80a2ee7b6fe895b22e8fc8259488c6f4f
-DIST cpplxp.exe 4799488 RMD160 bcd5ceecca248c90a0d3e99dd55c6e1eedd4de6d SHA1 952ad6557f2a78ec30e9786f52e95f012e39ac1c SHA256 5f4c8b6f20ccf2d525f683847f5dc24bb4c7f58131d6704047d6c9a90d6895af
-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 9a06114299186e45f6e29a9b22a585786da8389a SHA1 6cd86149f16ef05284e716408f107f9c38c976f5 SHA256 1f2c92055f22a7a6526b84b2c31e36ce1a6de003f66b31eb60cd400b84e213b6
-DIST km2430.tar.gz 929112 RMD160 fd30d0a26cbb3e8dbe90c83f98994d50345ab3bc SHA1 ccd1015a1b082081cbd448f77156e9c8ff54ae97 SHA256 88e21cc7f5c124223a6e4baea9d18dfae4a74f28f500dfae8e035495434ff572
-DIST km2530.tar.gz 2045958 RMD160 208f3f12435ab1dc4ef9350ff95c8235aa223151 SHA1 fd25c9cee4df205c4bedff14f381c520acb29ca4 SHA256 36226589e899f5d79476f5a718575eed51e81a81632ea11ba5db9e289572fb9b
-DIST lexc500.tar.gz 239577 RMD160 740be7d84e691c52f9c4e1b00786969184984827 SHA1 bd1cfef05ac0fb2a579ddcb7030f5de4dfe34e4f SHA256 823fd57b2e1b5aa6ed7a07055616238ed9b02e324b9d1c5f4f281e5ae4b0a667
-DIST m22dlicc.exe 634368 RMD160 392922135a3f517a76a2b5e8b7200c83e6104ef6 SHA1 4f2de3e9e5418361763805b76722cd5284543110 SHA256 1d57413f4c36941c64599dae2ac2b1f8a397e128796c2796a108be5b8fd282b3
-DIST m23dlicc.exe 170496 RMD160 f72be93dfc5c8c9159c75d7204820f1305f47905 SHA1 d1c28538f15f0e4564eeb81d53a8cb35fe08109c SHA256 1416cda7e2e3496ff1d121c87dd8984ad1d16ed3396096f05f4919dafd445ae4
-DIST okic3200.tar.gz 527532 RMD160 714319872e34805df277379ffa2c1d20222a95ad SHA1 fbbfe04c19532e0272bce014c0c2011ac772e3ad SHA256 f5503854d4537868d24a797912b2fa70c1fb5e0f097fc61a45f100725a064521
-DIST okic3400.tar.gz 453326 RMD160 442d981476b83c37a7c4f36717fbec07f9fab224 SHA1 fe53ac41a8f83e2afa7214a75a42010014c9e3ef SHA256 5f64ac0002c6f2f25d481bada150121d7d77e29e616de0639446903904043a70
-DIST okic5600.tar.gz 674998 RMD160 e24839f8ed8502ce9d01a7b1a8dfc6784c553c83 SHA1 848e9a74ccde0552ee1ef57a9c3464829d1e636b SHA256 7b2d59d54ecefecd053766bdb1d81db08c9d32979031cb8c4e2d5162d7d8f6bd
-DIST samclp300.tar.gz 427584 RMD160 f7c84ae04375d264db81c3115d86c077b811b526 SHA1 4c7b42b213b8269a62f55cc76d2c98267c760994 SHA256 cf7eaca16a6a1892e13cd87825dcb57060c4c50815a52b0f2cb09b27304ec140
-DIST sihp1000.tar.gz 50416 RMD160 f4246d6d02dc403ba8fabf1816debd7b2b75c5ea SHA1 21dbb550d7eb6432a774df84e77027e72f11624f SHA256 28ee34195a976212800c6abd29047c297c4367aaf727f279e16de297f13562f5
-DIST sihp1005.tar.gz 52297 RMD160 9780cc7d6e6661488cd42124ab003467a12415cb SHA1 fa16b87fbea5f402f320b5b080ec27c07a974bb5 SHA256 fb044ea77cbe3c5e2f86d00db02733ab1f8bdf102fcbfc55ba4eb2bee94535ee
-DIST sihp1018.tar.gz 70544 RMD160 b48999c1e16e72771ddb709a84b1178b80dd1aa6 SHA1 3c198e9db2c9e61b3af45c025b0aa8622c0f521c SHA256 95505c88af25d0c2130077af68e0404d88fc8dfb0a58943bdb9313f3e6c10f10
-DIST sihp1020.tar.gz 70139 RMD160 c09d7ee5f672d68ae6c35fd9cd955f42fdce3167 SHA1 83df3134cb9c7bfac08a2ba6c2fabb35143cfcb9 SHA256 c6117961ff9a4a1a880093daea52d800636f6c1002e4cf4fda2009f08f652751
-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-20080225.ebuild 4105 RMD160 93819faf425cf4fe58a73f0797bb8be7dc299108 SHA1 c9761da96951ee19b100e3406908827d17f73fab SHA256 08097a4b38c5050bc92d618c476718681dfc3b66e07a29dfa2bc440f2c44d1c7
-EBUILD foo2zjs-20081129.ebuild 4499 RMD160 f1c1f469b080eb61c1cb8fde45b2061c871de3ec SHA1 1097b8bac0d77fc3a9088e577bae3c0c2cc6a652 SHA256 298b474e2a8b0031c69ff4c7396e446f3e984dfc47ab0aa9e97a4cb577c08e59
 EBUILD foo2zjs-99999999.ebuild 1249 RMD160 0c806eb88eed1e338b0b726dc89642cd310b45a0 SHA1 b326da4c8a2169a05f9faf6b1292f0124851a6eb SHA256 740bc28eb0cd5f0c7dea4cf4f8691e0039aa234a34fb535d56df5bd2ee2b7379
-MISC ChangeLog 9467 RMD160 207979fa86cf55c66cea841a6743ae500f56276d SHA1 432190cca0ba3656272809b88f84e61621a907b2 SHA256 6c9e5fb94ac14001a1670db13a3af5b4a923ad05cd62361102733f1f06b15980
+MISC ChangeLog 9893 RMD160 4f991eae58438969576a1f8e15b498a5c4f9ca34 SHA1 fcc10e0abe5391b7cab369b79d15084d59e418fa SHA256 77637adf25fe04a8a06d974e177cd344ddc91efdc0d5c274f943f9e7dc750ccd
 MISC metadata.xml 163 RMD160 ba353b61c2868f08c1a5ab7fd17ba07e23803ada SHA1 2c739f5b77738ff409261fc42afe98d34184dd59 SHA256 594509291d2b412ff651880da503140d0e9a954ecf778878edabb1875682b6b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3nqTcACgkQuUQtlDBCeQLGYgCghoNA9DiLDsbpl5WtUgoadv9A
-Z94AnRGm4byWB8DWVNwiFlyZ8Pwa6ADf
-=n4cs
+iEYEARECAAYFAk3vgmAACgkQuUQtlDBCeQK9iACePZrxKPVE3dre24+CipPyXeAx
+HBEAn0N4ft76QBVl7aifPw3wlSgLhqhJ
+=x9aA
 -----END PGP SIGNATURE-----
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 8391dad872c3..000000000000
--- 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 d0280364afea..000000000000
--- a/net-print/foo2zjs/files/foo2zjs-20081129-udevfwld.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-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
-+
-+#	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 -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-%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}=="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 -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-20080225.diff b/net-print/foo2zjs/files/foo2zjs-Makefile-20080225.diff
deleted file mode 100644
index e528f0e0da46..000000000000
--- a/net-print/foo2zjs/files/foo2zjs-Makefile-20080225.diff
+++ /dev/null
@@ -1,185 +0,0 @@
-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
deleted file mode 100644
index d5c1e5ee87b1..000000000000
--- a/net-print/foo2zjs/files/foo2zjs-udevfwld-20080225.diff
+++ /dev/null
@@ -1,232 +0,0 @@
-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
deleted file mode 100644
index a7f436d71f8c..000000000000
--- a/net-print/foo2zjs/foo2zjs-20080225.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2011 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.5 2011/06/02 10:36:52 dilfridge 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"
-"oki3200" "oki3300" "oki3400" "oki5100" "oki5200" "oki5500" "oki5600" "oki5800"
-"hp1020" "hp1018" "hp1005" "hp1000" "hpp1505" "hpp1006" "hpp1005" )
-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/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://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/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"
-)
-
-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
-	app-text/ghostscript-gpl"
-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"
-}
diff --git a/net-print/foo2zjs/foo2zjs-20081129.ebuild b/net-print/foo2zjs/foo2zjs-20081129.ebuild
deleted file mode 100644
index e5e48a702280..000000000000
--- a/net-print/foo2zjs/foo2zjs-20081129.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/foo2zjs-20081129.ebuild,v 1.3 2011/06/02 10:36:52 dilfridge 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" "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
-	app-text/ghostscript-gpl"
-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}"/${P}-Makefile.patch
-	epatch "${FILESDIR}"/${P}-udevfwld.patch
-}
-
-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"
-}