version bump, adds hplj 1018 support, remove old

Package-Manager: portage-2.1_pre10-r2

13 files changed, 49 insertions, 1250 deletions

diff --git a/net-print/foo2zjs/Manifest b/net-print/foo2zjs/Manifest
index c0ff43f351f2..c9f571c33482 100644
--- a/net-print/foo2zjs/Manifest
+++ b/net-print/foo2zjs/Manifest
@@ -1,18 +1,53 @@
-MD5 ac7b16942f21c8fe86c4535dfcc6495b ChangeLog 2214
-MD5 156dfe6cef969d11cc59957ad027a51e files/digest-foo2zjs-20050319 238
-MD5 0dbc389eaf50f7d1f92fdd46c45dc26d files/digest-foo2zjs-20050925 317
-MD5 552c81ada51c69a1225e74d757688516 files/digest-foo2zjs-20051228 239
-MD5 4de85878d1df09753c4bb935925002ba files/digest-foo2zjs-20060118 239
-MD5 bb79f8d34c72525b9f37bcc8860173a8 files/foo2zjs-Makefile-20050925.diff 3673
-MD5 35226356e8eb1fb1fc9716ede19cbf63 files/foo2zjs-Makefile-20051228.diff 4085
-MD5 21dacb2afe4ea80c4ad95af7d98d1644 files/foo2zjs-Makefile-20060118.diff 4136
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX foo2zjs-Makefile-20060501.diff 4631 RMD160 7571da22ed892ab76c0c5ce17f3ff10f322669b6 SHA1 6194fe2b88d23d9d4b2d4a231243a73c6b38137a SHA256 4aba21c6eef4d4ff5ad5a485b022c962de24b5d1815e0aa9c0ba8c80c59f99f0 size 4631
+MD5 715e206502dc8d92d7cf07fd692c4bd5 files/foo2zjs-Makefile-20060501.diff 4631
+RMD160 7571da22ed892ab76c0c5ce17f3ff10f322669b6 files/foo2zjs-Makefile-20060501.diff 4631
+SHA256 4aba21c6eef4d4ff5ad5a485b022c962de24b5d1815e0aa9c0ba8c80c59f99f0 files/foo2zjs-Makefile-20060501.diff 4631
+AUX foo2zjs-Makefile.patch 3324 RMD160 e507ec81dd2bf7587c70c2c0a8204816fa9e58f2 SHA1 6558f182487a4b936b0ca7ffe8b1fc633f2a5466 SHA256 aa346d86973a900387b2eda63412d8ec30f2ea001ae998b8a20e947566ce7b4a size 3324
 MD5 e5f349ce9616aa37a291ae69beefc357 files/foo2zjs-Makefile.patch 3324
-MD5 14a3e6feed6e8247a8591a48c2b0e447 files/foo2zjs-udevfwld-20050925.diff 8465
-MD5 a4229df6ff9857c14bac32e2dc7cef7a files/foo2zjs-udevfwld-20051228.diff 5181
-MD5 1872118ef310661786e580827d3ab7fb files/foo2zjs-udevfwld-20060118.diff 5267
+RMD160 e507ec81dd2bf7587c70c2c0a8204816fa9e58f2 files/foo2zjs-Makefile.patch 3324
+SHA256 aa346d86973a900387b2eda63412d8ec30f2ea001ae998b8a20e947566ce7b4a files/foo2zjs-Makefile.patch 3324
+AUX foo2zjs-udevfwld-20060501.diff 6474 RMD160 626f6821ff6ff98d3370da47b4432d0f25194e91 SHA1 c27af2395c88643fb7416c4da816a00d23670aa4 SHA256 434a000e4f57fd6c204cf9fd90866abb82c49479009275f98e645889a1a7df17 size 6474
+MD5 45f0cba9a41ab267752bfde8e634c31c files/foo2zjs-udevfwld-20060501.diff 6474
+RMD160 626f6821ff6ff98d3370da47b4432d0f25194e91 files/foo2zjs-udevfwld-20060501.diff 6474
+SHA256 434a000e4f57fd6c204cf9fd90866abb82c49479009275f98e645889a1a7df17 files/foo2zjs-udevfwld-20060501.diff 6474
+AUX hp-printer-udev.patch 767 RMD160 de03125248e084187e93c8657b7bc6866f8dc2db SHA1 dd2e7d44ea85378687fcf0d70b3893b6ba09f538 SHA256 543865bf58c721e747bd9a38d95f5b477fd37b93bef05b2fa1df79c8cafe7e71 size 767
 MD5 379e40f8651bfdf8764f4afbc9594b41 files/hp-printer-udev.patch 767
+RMD160 de03125248e084187e93c8657b7bc6866f8dc2db files/hp-printer-udev.patch 767
+SHA256 543865bf58c721e747bd9a38d95f5b477fd37b93bef05b2fa1df79c8cafe7e71 files/hp-printer-udev.patch 767
+DIST cpplxp.exe 4799488 RMD160 bcd5ceecca248c90a0d3e99dd55c6e1eedd4de6d SHA256 5f4c8b6f20ccf2d525f683847f5dc24bb4c7f58131d6704047d6c9a90d6895af size 4799488
+DIST foo2zjs-20050319.tar.gz 972297 size 972297
+DIST foo2zjs-20060501.tar.gz 2127232 RMD160 39854302ad5ec6e0f0a60c51623a62f7294ef263 SHA256 160ee980736eb65daebc90c8fa79fe3648084b82375ea6dfb1d01dd0d7391800 size 2127232
+DIST m22dlicc.exe 634368 RMD160 392922135a3f517a76a2b5e8b7200c83e6104ef6 SHA256 1d57413f4c36941c64599dae2ac2b1f8a397e128796c2796a108be5b8fd282b3 size 634368
+DIST m23dlicc.exe 170496 RMD160 f72be93dfc5c8c9159c75d7204820f1305f47905 SHA256 1416cda7e2e3496ff1d121c87dd8984ad1d16ed3396096f05f4919dafd445ae4 size 170496
+EBUILD foo2zjs-20050319.ebuild 1569 RMD160 57aee4bd87cc7000b8421f71891b97eb00ba8225 SHA1 6919749684c5a12a33010f63a47e71c32bc17bee SHA256 4411b1ecfd3ebb4ea803cd9983ff810708ba871cda6c682707099bb8e982856f size 1569
 MD5 dd5a53f7b7c08325d45369e7c377f992 foo2zjs-20050319.ebuild 1569
-MD5 87559f5f87f2ad396e043be0e0140d8c foo2zjs-20050925.ebuild 2072
-MD5 afc9897aef83855914893682ff4b9fd6 foo2zjs-20051228.ebuild 1825
-MD5 cb2c6b396152e563e675c27760681d5f foo2zjs-20060118.ebuild 1825
+RMD160 57aee4bd87cc7000b8421f71891b97eb00ba8225 foo2zjs-20050319.ebuild 1569
+SHA256 4411b1ecfd3ebb4ea803cd9983ff810708ba871cda6c682707099bb8e982856f foo2zjs-20050319.ebuild 1569
+EBUILD foo2zjs-20060501.ebuild 1896 RMD160 43baa13258b1805bb94f237cb5afac719e5584ef SHA1 1d89ccd1d99bbf6c440f5af73bbe50a40e8f3fbf SHA256 a6d72f0146e3b674dd1bf7199c4f0c90a675b489082890c7cb78fbe96c59273d size 1896
+MD5 4b4fbc9232beda8e5fb01ec99244ede8 foo2zjs-20060501.ebuild 1896
+RMD160 43baa13258b1805bb94f237cb5afac719e5584ef foo2zjs-20060501.ebuild 1896
+SHA256 a6d72f0146e3b674dd1bf7199c4f0c90a675b489082890c7cb78fbe96c59273d foo2zjs-20060501.ebuild 1896
+MISC ChangeLog 2789 RMD160 2aa592b5e54fc95018d0c2525ba4a68ee691eaa2 SHA1 4fbfad7a31a7e936fea9e3f40104c5b47d809fd1 SHA256 00e9929d27828656ef96422b5800509d85727aa0d6f85145f22c557a41270f7b size 2789
+MD5 fbbe5d7d4f385fdb21316c0c968e0049 ChangeLog 2789
+RMD160 2aa592b5e54fc95018d0c2525ba4a68ee691eaa2 ChangeLog 2789
+SHA256 00e9929d27828656ef96422b5800509d85727aa0d6f85145f22c557a41270f7b ChangeLog 2789
+MISC metadata.xml 266 RMD160 71124c3803fd7ba3370f1b9b55b78d56c5e49201 SHA1 12efa221e1a3580f557896136ccece543c4dca39 SHA256 27d69d00958eb408ac3c397767f9104d5e85c85a977c094140a8169fc6750df7 size 266
 MD5 6062bcaf60fde68c2418376f4cd91f3e metadata.xml 266
+RMD160 71124c3803fd7ba3370f1b9b55b78d56c5e49201 metadata.xml 266
+SHA256 27d69d00958eb408ac3c397767f9104d5e85c85a977c094140a8169fc6750df7 metadata.xml 266
+MD5 dd27fb250c558455c90417663cc08326 files/digest-foo2zjs-20050319 716
+RMD160 47b7beefdab4a00c93773b0412bfeecb03391715 files/digest-foo2zjs-20050319 716
+SHA256 adf24cf35e477ec7eb82b210c5b7d35bf833be6dc21e9eebb94930e740333d38 files/digest-foo2zjs-20050319 716
+MD5 421b1789b380fe599c86d0d7ced4c5c1 files/digest-foo2zjs-20060501 901
+RMD160 4d7a06a6acc4fc6c8f4db82269d6f123f51f44d9 files/digest-foo2zjs-20060501 901
+SHA256 d994493b84fabaab6f49a7a80566f4f0d4cba77511b0deb7b397f33457291e8e files/digest-foo2zjs-20060501 901
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEWJm4NJowsmZ/PzARAhI3AKDB/lLADfPC/8I9CCmHHwDJErJMjgCeOUUh
+Aakjw96j32fR/ksz+glsOss=
+=KYCo
+-----END PGP SIGNATURE-----
diff --git a/net-print/foo2zjs/files/digest-foo2zjs-20050925 b/net-print/foo2zjs/files/digest-foo2zjs-20050925
deleted file mode 100644
index ed4f556a48c8..000000000000
--- a/net-print/foo2zjs/files/digest-foo2zjs-20050925
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 d680f447a416c5f9041f27c0a1df57a0 m23dlicc.exe 170496
-MD5 3b78a08aa968b4c1ed591947721d3e47 m22dlicc.exe 634368
-MD5 cae0d20d3c1d57cd3953d9b335014294 cpplxp.exe 4799488
-MD5 36ca0680a7b22c9b5cd1f8b34ab48cd8 foo2zjs-20050319.tar.gz 972297
-MD5 7242e44d7c863ffe7aae98639868209b foo2zjs-hplj1020-20050426.diff.bz2 124846
diff --git a/net-print/foo2zjs/files/digest-foo2zjs-20051228 b/net-print/foo2zjs/files/digest-foo2zjs-20051228
deleted file mode 100644
index 2431e5d53b07..000000000000
--- a/net-print/foo2zjs/files/digest-foo2zjs-20051228
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 cae0d20d3c1d57cd3953d9b335014294 cpplxp.exe 4799488
-MD5 8f0d3c704203d10e5b475836c14cff75 foo2zjs-20051228.tar.gz 1143435
-MD5 3b78a08aa968b4c1ed591947721d3e47 m22dlicc.exe 634368
-MD5 d680f447a416c5f9041f27c0a1df57a0 m23dlicc.exe 170496
diff --git a/net-print/foo2zjs/files/digest-foo2zjs-20060118 b/net-print/foo2zjs/files/digest-foo2zjs-20060118
deleted file mode 100644
index 2207b268e915..000000000000
--- a/net-print/foo2zjs/files/digest-foo2zjs-20060118
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 cae0d20d3c1d57cd3953d9b335014294 cpplxp.exe 4799488
-MD5 516899d94f718e1c5d2f3b2f16ec09bf foo2zjs-20060118.tar.gz 2029712
-MD5 3b78a08aa968b4c1ed591947721d3e47 m22dlicc.exe 634368
-MD5 d680f447a416c5f9041f27c0a1df57a0 m23dlicc.exe 170496
diff --git a/net-print/foo2zjs/files/foo2zjs-Makefile-20050925.diff b/net-print/foo2zjs/files/foo2zjs-Makefile-20050925.diff
deleted file mode 100644
index 81eafe050fb7..000000000000
--- a/net-print/foo2zjs/files/foo2zjs-Makefile-20050925.diff
+++ /dev/null
@@ -1,119 +0,0 @@
-diff -Nuarp foo2zjs.orig/Makefile foo2zjs/Makefile
---- foo2zjs.orig/Makefile	2005-09-25 11:44:11.000000000 +0200
-+++ foo2zjs/Makefile	2005-09-25 12:13:55.000000000 +0200
-@@ -6,8 +6,8 @@ EUID := $(shell id -u)
- VERSION=0.0
- 
- # Installation prefix...
--PREFIX=/usr/local
--PREFIX=/usr
-+PREFIX=$(DESTDIR)/usr/local
-+PREFIX=$(DESTDIR)/usr
- 
- # Pathnames for this package...
- BIN=$(PREFIX)/bin
-@@ -17,7 +17,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
-@@ -115,9 +115,6 @@ ifeq ($(UNAME),Linux)
- 	endif
- endif
- 
--# Compiler flags
--CFLAGS +=	-O2 -Wall
--
- #
- # Rules to create test documents
- #
-@@ -212,6 +209,7 @@ install: all install-prog install-icc2ps
- 	# On Suse 9.0, run "yast"
- 
- install-prog:
-+	[ -d $(BIN) ] || install -d -m 755 $(BIN)/
- 	#
- 	# Install driver, wrapper, and development tools
- 	#
-@@ -239,6 +237,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 \
-@@ -256,9 +255,9 @@ install-foo:
- 	#
- 	# Clear foomatic cache and rebuild database if needed
- 	#
--	rm -rf /var/cache/foomatic/*/*
--	if [ -d /var/cache/foomatic/compiled ]; then \
--	    cd /var/cache/foomatic/compiled; \
-+	rm -rf $(DESTDIR)/var/cache/foomatic/*/*
-+	if [ -d $(DESTDIR)/var/cache/foomatic/compiled ]; then \
-+	    cd $(DESTDIR)/var/cache/foomatic/compiled; \
- 	    foomatic-combo-xml -O >overview.xml; \
- 	fi
- 
-@@ -306,15 +305,13 @@ install-extra:
- 	# foo2oak ICM files (if any)
- 	install $(LPuid) $(LPgid) -m 775 -d $(SHAREOAK)/icm/
- 
--USBDIR=/etc/hotplug/usb
-+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)/hplj1020
--	$(USBDIR)/hplj1000 install-usermap
--	$(USBDIR)/hplj1005 install-usermap
--	$(USBDIR)/hplj1020 install-usermap
-+	install -c -m 755 hplj.usermap $(USBDIR)/
- 
- clean:
- 	-rm -f foo2zjs zjsdecode
-@@ -466,7 +463,7 @@ xxx.zm: FRC
- ppd:
- 	./getweb ppd
- 
--MODEL=/usr/share/cups/model
-+MODEL=$(PREFIX)/share/cups/model
- install-ppd:
- 	#
- 	# Install PPD files for CUPS
-@@ -523,7 +520,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 -Nuarp foo2zjs.orig/hplj.usermap foo2zjs/hplj.usermap
---- foo2zjs.orig/hplj.usermap	1970-01-01 01:00:00.000000000 +0100
-+++ foo2zjs/hplj.usermap	2005-09-25 12:13:45.000000000 +0200
-@@ -0,0 +1,3 @@
-+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
-+hplj1020 0x0003 0x03f0 0x2B17 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
-diff -Nuarp foo2zjs.orig/icc2ps/Makefile foo2zjs/icc2ps/Makefile
---- foo2zjs.orig/icc2ps/Makefile	2003-08-08 03:38:13.000000000 +0200
-+++ foo2zjs/icc2ps/Makefile	2005-09-25 12:05:47.000000000 +0200
-@@ -1,10 +1,9 @@
--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
--CFLAGS=	-O3
- 
- all: foo2zjs-icc2ps
- 
diff --git a/net-print/foo2zjs/files/foo2zjs-Makefile-20051228.diff b/net-print/foo2zjs/files/foo2zjs-Makefile-20051228.diff
deleted file mode 100644
index 38a07e9c3949..000000000000
--- a/net-print/foo2zjs/files/foo2zjs-Makefile-20051228.diff
+++ /dev/null
@@ -1,131 +0,0 @@
-diff -Naupr foo2zjs.orig/hplj.usermap foo2zjs/hplj.usermap
---- foo2zjs.orig/hplj.usermap	1970-01-01 01:00:00.000000000 +0100
-+++ foo2zjs/hplj.usermap	2005-12-28 19:33:22.000000000 +0100
-@@ -0,0 +1,3 @@
-+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
-+hplj1020 0x0003 0x03f0 0x2B17 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
-diff -Naupr foo2zjs.orig/icc2ps/Makefile foo2zjs/icc2ps/Makefile
---- foo2zjs.orig/icc2ps/Makefile	2005-12-28 19:32:58.000000000 +0100
-+++ foo2zjs/icc2ps/Makefile	2005-12-28 19:33:22.000000000 +0100
-@@ -1,10 +1,9 @@
--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
--CFLAGS=	-O3
- 
- all: foo2zjs-icc2ps
- 
-diff -Naupr foo2zjs.orig/Makefile foo2zjs/Makefile
---- foo2zjs.orig/Makefile	2005-12-28 19:32:58.000000000 +0100
-+++ foo2zjs/Makefile	2005-12-28 19:36:03.000000000 +0100
-@@ -6,8 +6,8 @@ EUID := $(shell id -u)
- VERSION=0.0
- 
- # Installation prefix...
--PREFIX=/usr/local
--PREFIX=/usr
-+PREFIX=$(DESTDIR)/usr/local
-+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
-@@ -126,9 +126,6 @@ ifeq ($(UNAME),Linux)
- 	endif
- endif
- 
--# Compiler flags
--CFLAGS +=	-O2 -Wall
--
- #
- # Rules to create test documents
- #
-@@ -245,11 +242,13 @@ install: all install-prog install-icc2ps
- 	# On Ubunto 5.10, run "gnome-cups-manager"
- 
- 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)/
--	install -c $(BINPROGS) /bin/
-+	install -c $(BINPROGS) $(DESTDIR)/bin/
- 	#
- 	# Install gamma correction files.  These are just templates,
- 	# and don't actually do anything right now.  If anybody wants
-@@ -274,6 +273,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 \
-@@ -291,9 +291,9 @@ install-foo:
- 	#
- 	# Clear foomatic cache and rebuild database if needed
- 	#
--	rm -rf /var/cache/foomatic/*/*
--	if [ -d /var/cache/foomatic/compiled ]; then \
--	    cd /var/cache/foomatic/compiled; \
-+	rm -rf $(DESTDIR)/var/cache/foomatic/*/*
-+	if [ -d $(DESTDIR)/var/cache/foomatic/compiled ]; then \
-+	    cd $(DESTDIR)/var/cache/foomatic/compiled; \
- 	    foomatic-combo-xml -O >overview.xml; \
- 	fi
- 
-@@ -357,7 +357,7 @@ install-extra:
- 	    fi; \
- 	done
- 
--MODEL=/usr/share/cups/model
-+MODEL=$(PREFIX)/share/cups/model
- install-ppd:
- 	#
- 	# Install PPD files for CUPS
-@@ -369,20 +369,13 @@ 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)/hplj1020
--	$(USBDIR)/hplj1000 install-usermap
--	$(USBDIR)/hplj1005 install-usermap
--	$(USBDIR)/hplj1020 install-usermap
--	if [ -d $(UDEVDIR) ]; then \
--	    install -c -m 644 $(RULES) $(UDEVDIR)/11-$(RULES); \
--	fi
-+	install -c -m 755 hplj.usermap $(USBDIR)/
- 
- uninstall:
- 	-rm -f /etc/hotplug/usb/hplj1000
-@@ -606,7 +599,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-Makefile-20060118.diff b/net-print/foo2zjs/files/foo2zjs-Makefile-20060118.diff
deleted file mode 100644
index 9af984830336..000000000000
--- a/net-print/foo2zjs/files/foo2zjs-Makefile-20060118.diff
+++ /dev/null
@@ -1,132 +0,0 @@
-diff -Naupr foo2zjs.orig/hplj.usermap foo2zjs/hplj.usermap
---- foo2zjs.orig/hplj.usermap	1970-01-01 01:00:00.000000000 +0100
-+++ foo2zjs/hplj.usermap	2006-01-21 10:41:45.000000000 +0100
-@@ -0,0 +1,3 @@
-+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
-+hplj1020 0x0003 0x03f0 0x2b17 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
-diff -Naupr foo2zjs.orig/icc2ps/Makefile foo2zjs/icc2ps/Makefile
---- foo2zjs.orig/icc2ps/Makefile	2006-01-21 10:41:35.000000000 +0100
-+++ foo2zjs/icc2ps/Makefile	2006-01-21 10:41:45.000000000 +0100
-@@ -1,10 +1,10 @@
--PREFIX=	/usr
-+PREFIX=	$(DESTDIR)/usr
- BIN=	$(PREFIX)/bin
- SRC=	icc2ps.c xgetopt.c
- LIB=	cmscam97.c cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \
- 	cmslut.c cmsmatsh.c cmsmtrx.c cmsnamed.c cmspack.c cmspcs.c cmsps2.c \
- 	cmssamp.c cmswtpnt.c cmsxform.c
--CFLAGS=	-O3
-+CFLAGS?=	-O3
- 
- all: foo2zjs-icc2ps
- 
-diff -Naupr foo2zjs.orig/Makefile foo2zjs/Makefile
---- foo2zjs.orig/Makefile	2006-01-21 10:41:35.000000000 +0100
-+++ foo2zjs/Makefile	2006-01-21 10:48:37.000000000 +0100
-@@ -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
-@@ -148,7 +148,7 @@ ifeq ($(UNAME),Linux)
- endif
- 
- # Compiler flags
--CFLAGS +=	-O2 -Wall
-+CFLAGS ?=      -O2 -Wall
- 
- #
- # Rules to create test documents
-@@ -277,12 +277,14 @@ install: all install-prog install-icc2ps
- 	# On Ubunto 5.10, run "gnome-cups-manager"
- 
- 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,
-@@ -308,6 +310,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 \
-@@ -325,9 +328,9 @@ install-foo:
- 	#
- 	# Clear foomatic cache and rebuild database if needed
- 	#
--	rm -rf /var/cache/foomatic/*/*
--	if [ -d /var/cache/foomatic/compiled ]; then \
--	    cd /var/cache/foomatic/compiled; \
-+	rm -rf $(DESTDIR)/var/cache/foomatic/*/*
-+	if [ -d $(DESTDIR)/var/cache/foomatic/compiled ]; then \
-+	    cd $(DESTDIR)/var/cache/foomatic/compiled; \
- 	    foomatic-combo-xml -O >overview.xml; \
- 	fi
- 
-@@ -391,8 +394,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
-@@ -409,20 +412,13 @@ 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)/hplj1020
--	$(USBDIR)/hplj1000 install-usermap
--	$(USBDIR)/hplj1005 install-usermap
--	$(USBDIR)/hplj1020 install-usermap
--	if [ -d $(UDEVDIR) ]; then \
--	    install -c -m 644 $(RULES) $(UDEVDIR)/11-$(RULES); \
--	fi
-+	install -c -m 755 hplj.usermap $(USBDIR)/
- 
- cups:	FRC
- 	if [ -x /etc/init.d/cups ]; then \
-@@ -667,7 +663,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-20050925.diff b/net-print/foo2zjs/files/foo2zjs-udevfwld-20050925.diff
deleted file mode 100644
index ae4b3f954a76..000000000000
--- a/net-print/foo2zjs/files/foo2zjs-udevfwld-20050925.diff
+++ /dev/null
@@ -1,265 +0,0 @@
-diff -Nuarp foo2zjs.orig/58-foo2zjs.rules foo2zjs/58-foo2zjs.rules
---- foo2zjs.orig/58-foo2zjs.rules	1970-01-01 01:00:00.000000000 +0100
-+++ foo2zjs/58-foo2zjs.rules	2005-09-25 12:56:11.000000000 +0200
-@@ -0,0 +1,3 @@
-+BUS=="usb", KERNEL=="lp[0-9]*", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="0517", RUN+="/sbin/foo2zjs-loadfw 1000"
-+BUS=="usb", KERNEL=="lp[0-9]*", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1317", RUN+="/sbin/foo2zjs-loadfw 1005"
-+BUS=="usb", KERNEL=="lp[0-9]*", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2b17", RUN+="/sbin/foo2zjs-loadfw 1020"
-diff -Nuarp foo2zjs.orig/INSTALL foo2zjs/INSTALL
---- foo2zjs.orig/INSTALL	2005-09-25 12:16:59.000000000 +0200
-+++ foo2zjs/INSTALL	2005-09-25 12:53:05.000000000 +0200
-@@ -86,15 +86,23 @@ HP LASERJET 1000/1005 NOTES
- 
- 	    # make install-hotplug
- 
-+	On Linux with USB connected printer and udev:
-+	    If you are running Linux and the printer is connected via USB, you
-+	    can arrange for the firmware to be automatically downloaded to the
-+	    printer by performing one more installation step:
-+
-+	    # make install-udev
-+	    This udev-loading is more reliable than the hotplug-loading
-+
- 	On another OS or with a parallel port connected printer:
- 
- 	    You must send a firmware file to the printer each time you power it
- 	    up.  If you downloaded the extra files for the HP above, a typical
- 	    command line to load the firmware would be:
- 
--		cat /usr/share/foo2zjs/firmware/sihp1000.dl > /dev/usb/lp0
-+		cat /lib/firmware/sihp1000.dl > /dev/lp0
- 	    or:
--		cat /usr/share/foo2zjs/firmware/sihp1005.dl > /dev/usb/lp0
-+		cat /lib/firmware/sihp1005.dl > /dev/lp0
- 
-     NOTE: The original HP files are named '*.img'.  Sometimes HP supplies
-     these files ready-to-download to the printer, sometimes they are raw
-diff -Nuarp foo2zjs.orig/INSTALL.in foo2zjs/INSTALL.in
---- foo2zjs.orig/INSTALL.in	2005-09-25 12:16:59.000000000 +0200
-+++ foo2zjs/INSTALL.in	2005-09-25 12:52:50.000000000 +0200
-@@ -86,15 +86,23 @@ HP LASERJET 1000/1005 NOTES
- 
- 	    # make install-hotplug
- 
-+	On Linux with USB connected printer and udev:
-+	    If you are running Linux and the printer is connected via USB, you
-+	    can arrange for the firmware to be automatically downloaded to the
-+	    printer by performing one more installation step:
-+
-+	    # make install-udev
-+	    This udev-loading is more reliable than the hotplug-loading
-+
- 	On another OS or with a parallel port connected printer:
- 
- 	    You must send a firmware file to the printer each time you power it
- 	    up.  If you downloaded the extra files for the HP above, a typical
- 	    command line to load the firmware would be:
- 
--		cat /usr/share/foo2zjs/firmware/sihp1000.dl > /dev/usb/lp0
-+		cat /lib/firmware/sihp1000.dl > /dev/lp0
- 	    or:
--		cat /usr/share/foo2zjs/firmware/sihp1005.dl > /dev/usb/lp0
-+		cat /lib/firmware/sihp1005.dl > /dev/lp0
- 
-     NOTE: The original HP files are named '*.img'.  Sometimes HP supplies
-     these files ready-to-download to the printer, sometimes they are raw
-diff -Nuarp foo2zjs.orig/Makefile foo2zjs/Makefile
---- foo2zjs.orig/Makefile	2005-09-25 12:16:59.000000000 +0200
-+++ foo2zjs/Makefile	2005-09-25 13:39:35.000000000 +0200
-@@ -9,6 +9,10 @@ VERSION=0.0
- PREFIX=$(DESTDIR)/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
-@@ -214,6 +218,13 @@ install-prog:
- 	# Install driver, wrapper, and development tools
- 	#
- 	install -c $(PROGS) $(SHELLS) $(BIN)/
-+
-+	[ -d $(FWLOADERDIR) ] || install -d -m 755 $(FWLOADERDIR)/
-+	#
-+	# We need usb_printerid before /usr is mounted.
-+	#
-+	[ -x $(BIN)/usb_printerid ] && mv $(BIN)/usb_printerid $(FWLOADERDIR)/usb_printerid
-+
- 	#
- 	# Install gamma correction files.  These are just templates,
- 	# and don't actually do anything right now.  If anybody wants
-@@ -293,15 +304,15 @@ 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
--	install -c -m 644 hp1020.img $(SHAREZJS)/firmware/sihp1020.dl
-+	install -c -m 644 hp1020.img $(FIRMWAREDIR)/sihp1020.dl
- 	# foo2oak ICM files (if any)
- 	install $(LPuid) $(LPgid) -m 775 -d $(SHAREOAK)/icm/
- 
-@@ -313,6 +324,13 @@ install-hotplug:
- 	ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1020
- 	install -c -m 755 hplj.usermap $(USBDIR)/
- 
-+UDEVDIR=$(DESTDIR)/etc/udev/rules.d
-+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 755 58-foo2zjs.rules $(UDEVDIR)
-+
- clean:
- 	-rm -f foo2zjs zjsdecode
- 	-rm -f *.zc *.zm
-diff -Nuarp foo2zjs.orig/foo2zjs-loadfw foo2zjs/foo2zjs-loadfw
---- foo2zjs.orig/foo2zjs-loadfw	1970-01-01 01:00:00.000000000 +0100
-+++ foo2zjs/foo2zjs-loadfw	2005-09-25 12:57:45.000000000 +0200
-@@ -0,0 +1,117 @@
-+#!/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=/sbin/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"
-+    ;;
-+1020)
-+    MODEL=1020
-+    MODELNAME="HP LaserJet $MODEL"
-+    ;;
-+*)
-+    log "Only HP LaserJet 1000, 1005 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 -Nuarp foo2zjs.orig/hplj1000 foo2zjs/hplj1000
---- foo2zjs.orig/hplj1000	2005-09-25 12:16:59.000000000 +0200
-+++ foo2zjs/hplj1000	2005-09-25 12:47:29.000000000 +0200
-@@ -30,12 +30,12 @@ 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
- #
--USBID=/usr/bin/usb_printerid
-+USBID=/sbin/usb_printerid
- 
- #
- #	Figure out how to log our messages
diff --git a/net-print/foo2zjs/files/foo2zjs-udevfwld-20051228.diff b/net-print/foo2zjs/files/foo2zjs-udevfwld-20051228.diff
deleted file mode 100644
index 7498c6cf4695..000000000000
--- a/net-print/foo2zjs/files/foo2zjs-udevfwld-20051228.diff
+++ /dev/null
@@ -1,183 +0,0 @@
-diff -Nuarp foo2zjs.orig/58-foo2zjs.rules foo2zjs/58-foo2zjs.rules
---- foo2zjs.orig/58-foo2zjs.rules	1970-01-01 01:00:00.000000000 +0100
-+++ foo2zjs/58-foo2zjs.rules	2005-09-25 12:56:11.000000000 +0200
-@@ -0,0 +1,3 @@
-+BUS=="usb", KERNEL=="lp[0-9]*", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="0517", RUN+="/sbin/foo2zjs-loadfw 1000"
-+BUS=="usb", KERNEL=="lp[0-9]*", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1317", RUN+="/sbin/foo2zjs-loadfw 1005"
-+BUS=="usb", KERNEL=="lp[0-9]*", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2b17", RUN+="/sbin/foo2zjs-loadfw 1020"
-diff -Nuarp foo2zjs.orig/foo2zjs-loadfw foo2zjs/foo2zjs-loadfw
---- foo2zjs.orig/foo2zjs-loadfw	1970-01-01 01:00:00.000000000 +0100
-+++ foo2zjs/foo2zjs-loadfw	2005-09-25 12:57:45.000000000 +0200
-@@ -0,0 +1,117 @@
-+#!/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"
-+    ;;
-+1020)
-+    MODEL=1020
-+    MODELNAME="HP LaserJet $MODEL"
-+    ;;
-+*)
-+    log "Only HP LaserJet 1000, 1005 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 -ur foo2zjs.orig/hplj1000 foo2zjs/hplj1000
---- foo2zjs.orig/hplj1000	2005-12-28 17:56:27.000000000 +0100
-+++ foo2zjs/hplj1000	2005-12-28 18:30:13.000000000 +0100
-@@ -35,7 +35,7 @@
- #
- # Directory to find downloadable HP firmware files sihpMMMM.dl
- #
--FWDIR=/usr/share/foo2zjs/firmware
-+FWDIR=/lib/firmware
- 
- #
- # Program used to determine USB id information
-diff -ur foo2zjs.orig/Makefile foo2zjs/Makefile
---- foo2zjs.orig/Makefile	2005-12-28 17:56:27.000000000 +0100
-+++ foo2zjs/Makefile	2005-12-28 18:28:23.000000000 +0100
-@@ -9,6 +9,10 @@
- PREFIX=$(DESTDIR)/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
-@@ -338,12 +342,12 @@
- 	    fi; \
- 	done
- 	# foo2zjs Firmware files (if any)
--	install $(LPuid) $(LPgid) -m 775 -d $(SHAREZJS)/firmware/
-+	install $(LPuid) $(LPgid) -m 775 -d $(FIRMWAREDIR)/
- 	for i in sihp*.img; do \
- 	    if [ -f $$i ]; then \
- 		base=`basename $$i .img`; \
- 		./arm2hpdl $$i >$$base.dl; \
--		install -c -m 644 $$base.dl $(SHAREZJS)/firmware/; \
-+		install -c -m 644 $$base.dl $(FIRMWAREDIR)/; \
- 	    fi; \
- 	done
- 	# foo2oak ICM files (if any)
-@@ -397,6 +401,13 @@
- 	-rm -f /usr/bin/foo2hp2600-wrapper
- 	-rm -f /usr/bin/foo2zjs-icc2ps
- 
-+UDEVDIR=$(DESTDIR)/etc/udev/rules.d
-+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 755 58-foo2zjs.rules $(UDEVDIR)
-+
- clean:
- 	-rm -f $(PROGS) $(BINPROGS) $(SHELLS)
- 	-rm -f *.zc *.zm
diff --git a/net-print/foo2zjs/files/foo2zjs-udevfwld-20060118.diff b/net-print/foo2zjs/files/foo2zjs-udevfwld-20060118.diff
deleted file mode 100644
index efd01c165bf3..000000000000
--- a/net-print/foo2zjs/files/foo2zjs-udevfwld-20060118.diff
+++ /dev/null
@@ -1,183 +0,0 @@
-diff -Naupr foo2zjs.orig/58-foo2zjs.rules foo2zjs/58-foo2zjs.rules
---- foo2zjs.orig/58-foo2zjs.rules	1970-01-01 01:00:00.000000000 +0100
-+++ foo2zjs/58-foo2zjs.rules	2006-01-21 10:52:12.000000000 +0100
-@@ -0,0 +1,3 @@
-+BUS=="usb", KERNEL=="lp[0-9]*", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="0517", RUN+="/sbin/foo2zjs-loadfw 1000"
-+BUS=="usb", KERNEL=="lp[0-9]*", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1317", RUN+="/sbin/foo2zjs-loadfw 1005"
-+BUS=="usb", KERNEL=="lp[0-9]*", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2b17", RUN+="/sbin/foo2zjs-loadfw 1020"
-diff -Naupr foo2zjs.orig/foo2zjs-loadfw foo2zjs/foo2zjs-loadfw
---- foo2zjs.orig/foo2zjs-loadfw	1970-01-01 01:00:00.000000000 +0100
-+++ foo2zjs/foo2zjs-loadfw	2006-01-21 10:52:12.000000000 +0100
-@@ -0,0 +1,117 @@
-+#!/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"
-+    ;;
-+1020)
-+    MODEL=1020
-+    MODELNAME="HP LaserJet $MODEL"
-+    ;;
-+*)
-+    log "Only HP LaserJet 1000, 1005 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 -Naupr foo2zjs.orig/hplj1000 foo2zjs/hplj1000
---- foo2zjs.orig/hplj1000	2006-01-21 10:41:35.000000000 +0100
-+++ foo2zjs/hplj1000	2006-01-21 10:52:12.000000000 +0100
-@@ -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 -Naupr foo2zjs.orig/Makefile foo2zjs/Makefile
---- foo2zjs.orig/Makefile	2006-01-21 10:56:01.000000000 +0100
-+++ foo2zjs/Makefile	2006-01-21 10:55:20.000000000 +0100
-@@ -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
-@@ -376,12 +380,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)
-@@ -420,6 +424,13 @@ install-hotplug:
- 	ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1020
- 	install -c -m 755 hplj.usermap $(USBDIR)/
- 
-+UDEVDIR=$(DESTDIR)/etc/udev/rules.d
-+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 755 58-foo2zjs.rules $(UDEVDIR)/
-+
- cups:	FRC
- 	if [ -x /etc/init.d/cups ]; then \
- 	    /etc/init.d/cups restart; \
diff --git a/net-print/foo2zjs/foo2zjs-20050925.ebuild b/net-print/foo2zjs/foo2zjs-20050925.ebuild
deleted file mode 100644
index 139934ccf424..000000000000
--- a/net-print/foo2zjs/foo2zjs-20050925.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/foo2zjs-20050925.ebuild,v 1.1 2005/09/27 12:37:14 genstef Exp $
-
-inherit eutils flag-o-matic
-
-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/foo2zjs-20050319.tar.gz
-		http://dev.gentoo.org/~genstef/files/foo2zjs-hplj1020-20050426.diff.bz2"
-RESTRICT="nomirror"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="cups foomaticdb usb"
-DEPEND="app-arch/unzip
-	dev-lang/perl"
-RDEPEND="cups? ( net-print/cups )
-	foomaticdb? ( net-print/foomatic )
-	usb? ( || ( sys-fs/udev sys-apps/hotplug ) )"
-KEYWORDS="~x86 ~amd64"
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack foo2zjs-20050319.tar.gz foo2zjs-hplj1020-20050426.diff.bz2
-
-	# link getweb files in ${S} to get unpacked
-	for i in m23dlicc.exe m22dlicc.exe cpplxp.exe
-	do
-		ln -s ${DISTDIR}/${i} ${S}
-	done
-
-	cd ${S}
-
-	epatch ${WORKDIR}/foo2zjs-hplj1020-20050426.diff
-	epatch ${FILESDIR}/foo2zjs-Makefile-20050925.diff
-	epatch ${FILESDIR}/foo2zjs-udevfwld-20050925.diff
-
-	# Why are these present in the tarball?
-	rm arm2hpdl foo2oak
-}
-
-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
-	# 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
-}
diff --git a/net-print/foo2zjs/foo2zjs-20051228.ebuild b/net-print/foo2zjs/foo2zjs-20051228.ebuild
deleted file mode 100644
index 0a264d0a3441..000000000000
--- a/net-print/foo2zjs/foo2zjs-20051228.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/foo2zjs-20051228.ebuild,v 1.1 2005/12/28 19:36:23 genstef Exp $
-
-inherit eutils flag-o-matic
-
-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/${P}.tar.gz"
-RESTRICT="nomirror"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="cups foomaticdb usb"
-DEPEND="app-arch/unzip
-	dev-lang/perl"
-RDEPEND="cups? ( net-print/cups )
-	foomaticdb? ( net-print/foomatic )
-	usb? ( || ( sys-fs/udev sys-apps/hotplug ) )"
-KEYWORDS="~x86 ~amd64"
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	# link getweb files in ${S} to get unpacked
-	for i in m23dlicc.exe m22dlicc.exe cpplxp.exe
-	do
-		ln -s ${DISTDIR}/${i} ${S}
-	done
-
-	cd ${S}
-	epatch ${FILESDIR}/foo2zjs-Makefile-20051228.diff
-	epatch ${FILESDIR}/foo2zjs-udevfwld-20051228.diff
-}
-
-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
-	# 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
-}
diff --git a/net-print/foo2zjs/foo2zjs-20060118.ebuild b/net-print/foo2zjs/foo2zjs-20060118.ebuild
deleted file mode 100644
index 683a9c3dcc7d..000000000000
--- a/net-print/foo2zjs/foo2zjs-20060118.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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-20060118.ebuild,v 1.1 2006/01/22 07:59:06 genstef Exp $
-
-inherit eutils flag-o-matic
-
-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/${P}.tar.gz"
-RESTRICT="nomirror"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="cups foomaticdb usb"
-DEPEND="app-arch/unzip
-	dev-lang/perl"
-RDEPEND="cups? ( net-print/cups )
-	foomaticdb? ( net-print/foomatic )
-	usb? ( || ( sys-fs/udev sys-apps/hotplug ) )"
-KEYWORDS="~x86 ~amd64"
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	# link getweb files in ${S} to get unpacked
-	for i in m23dlicc.exe m22dlicc.exe cpplxp.exe
-	do
-		ln -s ${DISTDIR}/${i} ${S}
-	done
-
-	cd ${S}
-	epatch ${FILESDIR}/foo2zjs-Makefile-20060118.diff
-	epatch ${FILESDIR}/foo2zjs-udevfwld-20060118.diff
-}
-
-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
-	# 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
-}