From: Stefan Schweizer Date: Sun, 3 Dec 2006 15:25:36 +0000 (+0000) Subject: version bump thanks to roger in bug 156875 and Francisco Lloret... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=23a3173a259c9e857ac2a988a4ec5561beff1c52;p=gentoo.git version bump thanks to roger in bug 156875 and Francisco Lloret in bug 154794 and permission fix thanks to Sergey Zolotorev in bug 154237 Package-Manager: portage-2.1.2_rc2-r4 --- diff --git a/net-print/foo2zjs/ChangeLog b/net-print/foo2zjs/ChangeLog index 1a6638a85869..376dd4fb92f0 100644 --- a/net-print/foo2zjs/ChangeLog +++ b/net-print/foo2zjs/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-print/foo2zjs # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/ChangeLog,v 1.17 2006/09/01 11:19:02 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/ChangeLog,v 1.18 2006/12/03 15:25:36 genstef Exp $ + +*foo2zjs-20061130 (03 Dec 2006) + + 03 Dec 2006; Stefan Schweizer + +files/foo2zjs-Makefile-20061130.diff, + +files/foo2zjs-udevfwld-20061130.diff, +foo2zjs-20061130.ebuild: + version bump thanks to roger in bug 156875 and Francisco + Lloret in bug 154794 and permission fix thanks to + Sergey Zolotorev in bug 154237 01 Sep 2006; Stefan Schweizer foo2zjs-20060607.ebuild: diff --git a/net-print/foo2zjs/Manifest b/net-print/foo2zjs/Manifest index ef3efd697fd6..5529e4d138a9 100644 --- a/net-print/foo2zjs/Manifest +++ b/net-print/foo2zjs/Manifest @@ -2,12 +2,21 @@ AUX foo2zjs-Makefile-20060523.diff 4539 RMD160 453da58f4288667a41b4b941a8bd6d8ab MD5 e622afc7fc99b74f555b3e3841a3f360 files/foo2zjs-Makefile-20060523.diff 4539 RMD160 453da58f4288667a41b4b941a8bd6d8ab2642551 files/foo2zjs-Makefile-20060523.diff 4539 SHA256 d8329187d8840d6b686beb2801ab5cf273cbffdbcf2eb6e4d70257c9030947ef files/foo2zjs-Makefile-20060523.diff 4539 +AUX foo2zjs-Makefile-20061130.diff 4592 RMD160 d9124c2f0e031a74d4ace18de659afcbd4d00cbe SHA1 95b1edb0d9d7b79c20b1a5efe1825fa22026ba7a SHA256 1b5889226dced4cde65b74444ae9154eb6405518b3d6ae6313c3e46a0ad341fc +MD5 eb7db68b483cb50f19d57fa0ac6525e5 files/foo2zjs-Makefile-20061130.diff 4592 +RMD160 d9124c2f0e031a74d4ace18de659afcbd4d00cbe files/foo2zjs-Makefile-20061130.diff 4592 +SHA256 1b5889226dced4cde65b74444ae9154eb6405518b3d6ae6313c3e46a0ad341fc files/foo2zjs-Makefile-20061130.diff 4592 AUX foo2zjs-udevfwld-20060607.diff 6321 RMD160 c60883a1fce6217c30b2f6b72b9bffbdd6afb32d SHA1 a32b0a81e9c55fd7ac5307e48fbeca2f032e74ba SHA256 daffa98e5714e739d4ffdb766e1fde2bfb4d84b99f5e65c2d14e9bfb4dde030a MD5 80dc7b23f6555968f1bdad6a4fdc5e0f files/foo2zjs-udevfwld-20060607.diff 6321 RMD160 c60883a1fce6217c30b2f6b72b9bffbdd6afb32d files/foo2zjs-udevfwld-20060607.diff 6321 SHA256 daffa98e5714e739d4ffdb766e1fde2bfb4d84b99f5e65c2d14e9bfb4dde030a files/foo2zjs-udevfwld-20060607.diff 6321 +AUX foo2zjs-udevfwld-20061130.diff 6369 RMD160 1c8eac08b701099875e95b0b42cfb246d4bf9f46 SHA1 7a7ee523be2763af85c1c34c8692fb485782d120 SHA256 cf0ffb97af06841eb2ee94901422771192fe292856a5093d53dad2dcebfe367c +MD5 5c6e41cfb57974913b86614528e96990 files/foo2zjs-udevfwld-20061130.diff 6369 +RMD160 1c8eac08b701099875e95b0b42cfb246d4bf9f46 files/foo2zjs-udevfwld-20061130.diff 6369 +SHA256 cf0ffb97af06841eb2ee94901422771192fe292856a5093d53dad2dcebfe367c files/foo2zjs-udevfwld-20061130.diff 6369 DIST cpplxp.exe 4799488 RMD160 bcd5ceecca248c90a0d3e99dd55c6e1eedd4de6d SHA1 952ad6557f2a78ec30e9786f52e95f012e39ac1c SHA256 5f4c8b6f20ccf2d525f683847f5dc24bb4c7f58131d6704047d6c9a90d6895af DIST foo2zjs-20060607.tar.gz 917862 RMD160 6cc9c46164dad2d2e0f9bcd8c0ce783a095cb825 SHA1 613c8d32773ae690e8b401df9026eaa8197f3139 SHA256 5f292d3a7cd87afd2a764cc42815bfe88ef1ebd8d153ef2756edc982ab965d80 +DIST foo2zjs-20061130.tar.gz 929018 RMD160 dd3adf5f1bfa73deb22815456aca2f2f3167e472 SHA1 1470b2ea19c2d09284a63b2e51cbfccdc5f65f95 SHA256 0cf0f078be511d5798c67949cd23faf7a9750b0ba892b7db17e9bd329ee07a2b DIST hpclj2600n.tar.gz 573671 RMD160 1fe753ff90babd57d6f5eb289a13fba2359494a2 SHA1 1acd29e423c0b0d8315f254190a02821c766e21f SHA256 54aa4648e986717f816a92f90d7c614924243c9279b9eec9246e94e0c539ee9c DIST km2430.tar.gz 929120 RMD160 cc33cd6da46d2484f9fb4119aa52fcfd867af749 SHA1 b68c60612dd206d4a4e8d61f5db8e2a2e3485781 SHA256 8c3b4ed1f4a582442cb3c64f4b9a94fe52fef19b999c860a6694fde87de30c9b DIST m22dlicc.exe 634368 RMD160 392922135a3f517a76a2b5e8b7200c83e6104ef6 SHA1 4f2de3e9e5418361763805b76722cd5284543110 SHA256 1d57413f4c36941c64599dae2ac2b1f8a397e128796c2796a108be5b8fd282b3 @@ -20,10 +29,14 @@ EBUILD foo2zjs-20060607.ebuild 4347 RMD160 df5a37e15f22e44f21a1a413c00b6ac0ba564 MD5 564d0c9f62c46468da6dd0d36dd8553a foo2zjs-20060607.ebuild 4347 RMD160 df5a37e15f22e44f21a1a413c00b6ac0ba564dfc foo2zjs-20060607.ebuild 4347 SHA256 f7f24e94b2bddc2f5c12ff0039e80b33c8d0bddc257b53bd0536e38a8581ddc1 foo2zjs-20060607.ebuild 4347 -MISC ChangeLog 4336 RMD160 6aa8085a72b5c2d9087aaad2d17ec1017874e838 SHA1 b99d44cd20c61e3d59cb7e6845ff941facdaae0b SHA256 9270d9ca98c0ed868b38b712147bda3733c80cbe88f43f3bb9211f2f1325b987 -MD5 50da1ac0346f70623d5566a978ea6fa0 ChangeLog 4336 -RMD160 6aa8085a72b5c2d9087aaad2d17ec1017874e838 ChangeLog 4336 -SHA256 9270d9ca98c0ed868b38b712147bda3733c80cbe88f43f3bb9211f2f1325b987 ChangeLog 4336 +EBUILD foo2zjs-20061130.ebuild 4345 RMD160 47c4d0d272dbbcf4d5d5edb140b3cf52db809e68 SHA1 ebe52706dfe8f1d96a63b11b5be022ca480c0619 SHA256 d36312e424d2d79559660df79986d524ff336879c3582354d8fffd51e348b44f +MD5 86df41d04d5b10ba804d78bc452993df foo2zjs-20061130.ebuild 4345 +RMD160 47c4d0d272dbbcf4d5d5edb140b3cf52db809e68 foo2zjs-20061130.ebuild 4345 +SHA256 d36312e424d2d79559660df79986d524ff336879c3582354d8fffd51e348b44f foo2zjs-20061130.ebuild 4345 +MISC ChangeLog 4744 RMD160 02f4421c8bc3ad74f6ce3dfe49b9a6dba1eac03c SHA1 eff0a9a2a9342424829e0942e8b1e878414fac24 SHA256 8a21adc63cb1d546f9b3587092e1f2e5821eca944670f0dcce610c8b747e9e85 +MD5 def9e241b5dc2190828e7b355b9cb873 ChangeLog 4744 +RMD160 02f4421c8bc3ad74f6ce3dfe49b9a6dba1eac03c ChangeLog 4744 +SHA256 8a21adc63cb1d546f9b3587092e1f2e5821eca944670f0dcce610c8b747e9e85 ChangeLog 4744 MISC metadata.xml 266 RMD160 71124c3803fd7ba3370f1b9b55b78d56c5e49201 SHA1 12efa221e1a3580f557896136ccece543c4dca39 SHA256 27d69d00958eb408ac3c397767f9104d5e85c85a977c094140a8169fc6750df7 MD5 6062bcaf60fde68c2418376f4cd91f3e metadata.xml 266 RMD160 71124c3803fd7ba3370f1b9b55b78d56c5e49201 metadata.xml 266 @@ -31,3 +44,6 @@ SHA256 27d69d00958eb408ac3c397767f9104d5e85c85a977c094140a8169fc6750df7 metadata MD5 18527eed3e1c30ea833dfe4cb235db27 files/digest-foo2zjs-20060607 2242 RMD160 c2722808532c3583ba72132fd9cc1addc2447f80 files/digest-foo2zjs-20060607 2242 SHA256 fb20aec0c1c60f18a9d57177181d667a7578f0e9ef6a33ac04cc74a5ccc36532 files/digest-foo2zjs-20060607 2242 +MD5 4350f17f5b9c69f32e9822c199db3ab8 files/digest-foo2zjs-20061130 2242 +RMD160 23390ef95eb924d07c52a76ac21929d7423bc1d5 files/digest-foo2zjs-20061130 2242 +SHA256 d0aa3933bb45e8b786300352c590eb5b55396ead996d111fb7997e825812abcd files/digest-foo2zjs-20061130 2242 diff --git a/net-print/foo2zjs/files/digest-foo2zjs-20061130 b/net-print/foo2zjs/files/digest-foo2zjs-20061130 new file mode 100644 index 000000000000..ec06f2927bf3 --- /dev/null +++ b/net-print/foo2zjs/files/digest-foo2zjs-20061130 @@ -0,0 +1,30 @@ +MD5 cae0d20d3c1d57cd3953d9b335014294 cpplxp.exe 4799488 +RMD160 bcd5ceecca248c90a0d3e99dd55c6e1eedd4de6d cpplxp.exe 4799488 +SHA256 5f4c8b6f20ccf2d525f683847f5dc24bb4c7f58131d6704047d6c9a90d6895af cpplxp.exe 4799488 +MD5 78c8bbcd4047c6611dc9a11877d56ea9 foo2zjs-20061130.tar.gz 929018 +RMD160 dd3adf5f1bfa73deb22815456aca2f2f3167e472 foo2zjs-20061130.tar.gz 929018 +SHA256 0cf0f078be511d5798c67949cd23faf7a9750b0ba892b7db17e9bd329ee07a2b foo2zjs-20061130.tar.gz 929018 +MD5 8e6b7cd62e411fb3333f33712c0cc954 hpclj2600n.tar.gz 573671 +RMD160 1fe753ff90babd57d6f5eb289a13fba2359494a2 hpclj2600n.tar.gz 573671 +SHA256 54aa4648e986717f816a92f90d7c614924243c9279b9eec9246e94e0c539ee9c hpclj2600n.tar.gz 573671 +MD5 5118c4c83c560f023786e42420310ee8 km2430.tar.gz 929120 +RMD160 cc33cd6da46d2484f9fb4119aa52fcfd867af749 km2430.tar.gz 929120 +SHA256 8c3b4ed1f4a582442cb3c64f4b9a94fe52fef19b999c860a6694fde87de30c9b km2430.tar.gz 929120 +MD5 3b78a08aa968b4c1ed591947721d3e47 m22dlicc.exe 634368 +RMD160 392922135a3f517a76a2b5e8b7200c83e6104ef6 m22dlicc.exe 634368 +SHA256 1d57413f4c36941c64599dae2ac2b1f8a397e128796c2796a108be5b8fd282b3 m22dlicc.exe 634368 +MD5 d680f447a416c5f9041f27c0a1df57a0 m23dlicc.exe 170496 +RMD160 f72be93dfc5c8c9159c75d7204820f1305f47905 m23dlicc.exe 170496 +SHA256 1416cda7e2e3496ff1d121c87dd8984ad1d16ed3396096f05f4919dafd445ae4 m23dlicc.exe 170496 +MD5 5d47d54f9cc19225c6ad07763bd02801 sihp1000.tar.gz 50423 +RMD160 5cd97ca6944d421df213420fc5d1e1572f85ec84 sihp1000.tar.gz 50423 +SHA256 7bdb5387419a880e32c9280b8d3878b08eb8fbd614237f164a9ae1e81bc2cff6 sihp1000.tar.gz 50423 +MD5 10937cc743b03ea9776a9f6eb35159a0 sihp1005.tar.gz 52301 +RMD160 5ebc04fadafb2033cba9665840897c48eb0d0f70 sihp1005.tar.gz 52301 +SHA256 55820298cc441893b19d28ff82ff1c8438fb53bad24c2db40b06f24c356cb320 sihp1005.tar.gz 52301 +MD5 89bc9a1199abc2bd304694f0273a248a sihp1018.tar.gz 70547 +RMD160 f358ae6be52395070d7eea6aa2b0d3d6baf2d7ea sihp1018.tar.gz 70547 +SHA256 d95f26f302e4a6580aa83fd13b99911fe8ad7a1de88fd1545c1f2e384b1d2af7 sihp1018.tar.gz 70547 +MD5 290c2a03d665ceb4dfbbd60b471ebb3d sihp1020.tar.gz 68877 +RMD160 39e998123ad074231c6333ff70ccabbe513ea90f sihp1020.tar.gz 68877 +SHA256 c69504fa7a96f63a71fb507f5d61a846db60a9ed000abb4cb04b32cfe7c23704 sihp1020.tar.gz 68877 diff --git a/net-print/foo2zjs/files/foo2zjs-Makefile-20061130.diff b/net-print/foo2zjs/files/foo2zjs-Makefile-20061130.diff new file mode 100644 index 000000000000..1ccf9a40327a --- /dev/null +++ b/net-print/foo2zjs/files/foo2zjs-Makefile-20061130.diff @@ -0,0 +1,145 @@ +diff -Nupr foo2zjs.orig/Makefile foo2zjs/Makefile +--- foo2zjs.orig/Makefile 2006-11-29 13:24:02.000000000 -0800 ++++ foo2zjs/Makefile 2006-12-02 00:17:04.000000000 -0800 +@@ -7,7 +7,7 @@ VERSION=0.0 + + # Installation prefix... + PREFIX=/usr/local +-PREFIX=/usr ++PREFIX=$(DESTDIR)/usr + + # Pathnames for this package... + BIN=$(PREFIX)/bin +@@ -20,7 +20,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 +@@ -179,7 +179,7 @@ ifeq ($(UNAME),Linux) + endif + + # Compiler flags +-CFLAGS += -O2 -Wall ++CFLAGS ?= -O2 -Wall + + # + # Rules to create test documents +@@ -367,12 +367,14 @@ install-test: + + + install-prog: ++ [ -d $(BIN) ] || install -d -m 755 $(BIN)/ ++ [ -d $(DESTDIR)/bin/ ] || install -d -m 755 $(DESTDIR)/bin/ + # + # Install driver, wrapper, and development tools + # + install -c $(PROGS) $(SHELLS) $(BIN)/ + if [ "$(BINPROGS)" != "" ]; then \ +- install -c $(BINPROGS) /bin/; \ ++ install -c $(BINPROGS) $(DESTDIR)/bin/; \ + fi + # + # Install gamma correction files. These are just templates, +@@ -400,6 +402,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 \ +@@ -417,10 +420,10 @@ install-foo: + # + # Clear foomatic cache and rebuild database if needed + # +- rm -rf /var/cache/foomatic/*/* +- rm -f /var/cache/foomatic/printconf.pickle +- if [ -d /var/cache/foomatic/compiled ]; then \ +- cd /var/cache/foomatic/compiled; \ ++ rm -rf $(DESTDIR)/var/cache/foomatic/*/* ++ rm -f $(DESTDIR)/var/cache/foomatic/printconf.pickle ++ if [ -d $(DESTDIR)/var/cache/foomatic/compiled ]; then \ ++ cd $(DESTDIR)/var/cache/foomatic/compiled; \ + foomatic-combo-xml -O >overview.xml; \ + fi + +@@ -491,8 +494,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 +@@ -515,9 +518,7 @@ install-ppd: + done; \ + fi + +-USBDIR=/etc/hotplug/usb +-UDEVDIR=/etc/udev/rules.d +-RULES=hplj10xx.rules ++USBDIR=$(DESTDIR)/etc/hotplug/usb + install-hotplug: install-hotplug-test install-hotplug-prog + + install-hotplug-test: +@@ -541,14 +542,14 @@ install-hotplug-prog: + ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1005 + ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1018 + ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1020 +- $(USBDIR)/hplj1000 install-usermap +- $(USBDIR)/hplj1005 install-usermap +- $(USBDIR)/hplj1018 install-usermap +- $(USBDIR)/hplj1020 install-usermap +- if [ -d $(UDEVDIR) ]; then \ +- install -c -m 644 $(RULES) $(UDEVDIR)/11-$(RULES); \ +- fi ++ install -c -m 644 hplj.usermap $(USBDIR)/ + ++UDEVDIR=$(DESTDIR)/etc/udev/rules.d ++RULES=hplj10xx.rules ++install-udev: ++ [ -d $(UDEVDIR) ] || install -d -m 755 $(UDEVDIR)/ ++ install -c -m 644 $(RULES) $(UDEVDIR)/11-$(RULES) ++ + cups: FRC + if [ -x /etc/init.d/cups ]; then \ + /etc/init.d/cups restart; \ +@@ -860,7 +861,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 -Nupr foo2zjs.orig/hplj.usermap foo2zjs/hplj.usermap +--- foo2zjs.orig/hplj.usermap 1969-12-31 16:00:00.000000000 -0800 ++++ foo2zjs/hplj.usermap 2006-12-02 00:12:53.000000000 -0800 +@@ -0,0 +1,4 @@ ++hplj1000 0x0003 0x03f0 0x0517 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 ++hplj1005 0x0003 0x03f0 0x1317 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 ++hplj1018 0x0003 0x03f0 0x4117 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 ++hplj1020 0x0003 0x03f0 0x2b17 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +diff -Nupr foo2zjs.orig/icc2ps/Makefile foo2zjs/icc2ps/Makefile +--- foo2zjs.orig/icc2ps/Makefile 2005-12-23 22:53:35.000000000 -0800 ++++ foo2zjs/icc2ps/Makefile 2006-12-02 00:12:53.000000000 -0800 +@@ -1,10 +1,10 @@ +-PREFIX= /usr ++PREFIX= $(DESTDIR)/usr + BIN= $(PREFIX)/bin + SRC= icc2ps.c xgetopt.c + LIB= cmscam97.c cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \ + cmslut.c cmsmatsh.c cmsmtrx.c cmsnamed.c cmspack.c cmspcs.c cmsps2.c \ + cmssamp.c cmswtpnt.c cmsxform.c cmsio0.c cmsvirt.c +-CFLAGS= -O3 ++CFLAGS?= -O3 + + all: foo2zjs-icc2ps + diff --git a/net-print/foo2zjs/files/foo2zjs-udevfwld-20061130.diff b/net-print/foo2zjs/files/foo2zjs-udevfwld-20061130.diff new file mode 100644 index 000000000000..b1f7690cbb8c --- /dev/null +++ b/net-print/foo2zjs/files/foo2zjs-udevfwld-20061130.diff @@ -0,0 +1,191 @@ +diff -Nupr foo2zjs.orig/foo2zjs-loadfw foo2zjs/foo2zjs-loadfw +--- foo2zjs.orig/foo2zjs-loadfw 1970-01-01 01:00:00.000000000 +0100 ++++ foo2zjs/foo2zjs-loadfw 2006-06-14 21:17:24.000000000 +0200 +@@ -0,0 +1,121 @@ ++#!/bin/sh ++ ++# foo2zjs-loadfw: ++# ++# Hotplug script for HP1000/1005/1020 USB laser printers. The model number ++# that this script deals with is determined from the udev env. ++# ++# Used to download firmware automatically into the printer when it ++# is powered up or plugged into the USB port. ++# ++# The inspiration fo this script is from: ++# Oscar Santacreu. Alicante-Spain (2002) ++# Mike Morgan (2004) ++# Modified by Stefan Schweizer (2005) to work as a udev-RUN-script ++ ++# ++# Directory to find downloadable HP firmware files sihpMMMM.dl ++# ++FWDIR=/lib/firmware ++ ++# ++# Program used to determine USB id information ++# ++USBID=/bin/usb_printerid ++ ++# ++# Figure out how to log our messages ++# ++if [ -t 1 ]; then ++ # Running from a tty... ++ log() { ++ echo "$0: $@" ++ } ++elif [ -x /usr/bin/logger ]; then ++ # Have logger... ++ log() { ++ logger -t "$0" -- "$@" ++ } ++else ++ # No logger... ++ log() { ++ echo "$0: $@" >> /var/log/messages ++ } ++fi ++ ++# ++# Figure out the model number from the name of this script ++# ++case "$1" in ++1000) ++ MODEL=1000 ++ MODELNAME="hp LaserJet $MODEL" ++ ;; ++1005) ++ MODEL=1005 ++ MODELNAME="hp LaserJet $MODEL" ++ ;; ++1018) ++ MODEL=1018 ++ MODELNAME="HP LaserJet $MODEL" ++ ;; ++1020) ++ MODEL=1020 ++ MODELNAME="HP LaserJet $MODEL" ++ ;; ++*) ++ log "Only HP LaserJet 1000, 1005, 1018 and 1020 are supported" ++ log "You need to supply one of these on the cmdline: $0 10**" ++ exit ++ ;; ++esac ++ ++if [ -z "$DEVNAME" ]; then ++ if [ -n "$2" ]; then ++ DEVNAME=$2 ++ else ++ log "You need to either have $DEVNAME set in the environment or supply it on the cmdline, like:" ++ log "$0 10** /dev/usb/lp0" ++ exit 1 ++ fi ++fi ++ ++# ++# Procedure to load a single device with firmware ++# ++load1() { ++ fw="$FWDIR/sihp$MODEL.dl" ++ if [ ! -f "$fw" ]; then ++ log "Missing HP LaserJet $MODEL firmware file $fw" ++ log "...read foo2zjs installation instructions and run ./getweb $MODEL" ++ return 1 ++ fi ++ ++ log "loading HP LaserJet $MODEL firmware $fw to $DEVNAME ..." ++ if cat $fw > $DEVNAME; then ++ log "... download successful." ++ else ++ log "... download failed." ++ fi ++ return 0 ++} ++ ++# ++# OK, now download firmware to any printers that need it ++# ++if [ -x $USBID ]; then ++ if $USBID $DEVNAME | grep "$MODELNAME" 2> /dev/null; then ++ # This is a LaserJet 100x ++ if $USBID $DEVNAME | grep 'FWVER' 2> /dev/null; then ++ log "HP LaserJet $MODEL firmware already loaded into $DEVNAME" ++ else ++ # Firmware is not yet loaded ++ load1 "$DEVNAME" ++ fi ++ else ++ log "No supported printer found." ++ fi ++else ++ log "HP LaserJet $MODEL firmware was not downloaded..." ++ log "...couldn't find $USBID" ++fi +diff -Nupr foo2zjs.orig/hplj1000 foo2zjs/hplj1000 +--- foo2zjs.orig/hplj1000 2006-06-14 21:17:18.000000000 +0200 ++++ foo2zjs/hplj1000 2006-06-14 21:17:24.000000000 +0200 +@@ -35,7 +35,7 @@ DEV="" + # + # Directory to find downloadable HP firmware files sihpMMMM.dl + # +-FWDIR=/usr/share/foo2zjs/firmware ++FWDIR=/lib/firmware + + # + # Program used to determine USB id information +diff -Nupr foo2zjs.orig/hplj10xx.rules foo2zjs/hplj10xx.rules +--- foo2zjs.orig/hplj10xx.rules 2006-06-14 21:17:18.000000000 +0200 ++++ foo2zjs/hplj10xx.rules 2006-06-14 21:20:24.000000000 +0200 +@@ -1,8 +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%e", MODE="0666", RUN+="/etc/hotplug/usb/hplj1000" ++KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="0517", NAME="usb/%k", SYMLINK="hplj1000%e", MODE="0660", GROUP="lp", RUN+="/sbin/foo2zjs-loadfw 1000" + #Own udev rule for HP Laserjet 1005 +-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{product}=="hp LaserJet 1005 series", NAME="usb/%k", SYMLINK="hplj1005%e", MODE="0666", RUN+="/etc/hotplug/usb/hplj1005" ++KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1317", NAME="usb/%k", SYMLINK="hplj1005%e", MODE="0660", GROUP="lp", RUN+="/sbin/foo2zjs-loadfw 1005" + #Own udev rule for HP Laserjet 1018 +-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{product}=="HP LaserJet 1018", NAME="usb/%k", SYMLINK="hplj1018%e", MODE="0666", RUN+="/etc/hotplug/usb/hplj1018" ++KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="4117", NAME="usb/%k", SYMLINK="hplj1018%e", MODE="0660", GROUP="lp", RUN+="/sbin/foo2zjs-loadfw 1018" + #Own udev rule for HP Laserjet 1020 +-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{product}=="HP LaserJet 1020", NAME="usb/%k", SYMLINK="hplj1020%e", MODE="0666", RUN+="/etc/hotplug/usb/hplj1020" ++KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2b17", NAME="usb/%k", SYMLINK="hplj1020%e", MODE="0660", GROUP="lp", RUN+="/sbin/foo2zjs-loadfw 1020" +diff -Nupr foo2zjs.orig/Makefile foo2zjs/Makefile +--- foo2zjs.orig/Makefile 2006-06-14 21:17:18.000000000 +0200 ++++ foo2zjs/Makefile 2006-06-14 21:17:24.000000000 +0200 +@@ -9,6 +9,10 @@ VERSION=0.0 + PREFIX=/usr/local + PREFIX=$(DESTDIR)/usr + ++# USB_PRINTERID is also installed there because it is needed by the FWloader ++FWLOADERDIR=$(DESTDIR)/sbin ++FIRMWAREDIR=$(DESTDIR)/lib/firmware ++ + # Pathnames for this package... + BIN=$(PREFIX)/bin + SHAREZJS=$(PREFIX)/share/foo2zjs +@@ -416,12 +420,12 @@ install-extra: + fi; \ + done + # foo2zjs Firmware files (if any) +- install $(LPuid) $(LPgid) -m 775 -d $(SHAREZJS)/firmware/ ++ install $(LPuid) $(LPgid) -m 775 -d $(FIRMWAREDIR)/ + for i in sihp*.img; do \ + if [ -f $$i ]; then \ + base=`basename $$i .img`; \ + ./arm2hpdl $$i >$$base.dl; \ +- install -c -m 644 $$base.dl $(SHAREZJS)/firmware/; \ ++ install -c -m 644 $$base.dl $(FIRMWAREDIR)/; \ + fi; \ + done + # foo2oak ICM files (if any) +@@ -464,6 +468,8 @@ install-hotplug: + UDEVDIR=$(DESTDIR)/etc/udev/rules.d + RULES=hplj10xx.rules + install-udev: ++ [ -d $(FWLOADERDIR) ] || install -d -m 755 $(FWLOADERDIR)/ ++ install -c -m 755 foo2zjs-loadfw $(FWLOADERDIR)/ + [ -d $(UDEVDIR) ] || install -d -m 755 $(UDEVDIR)/ + install -c -m 644 $(RULES) $(UDEVDIR)/11-$(RULES) + diff --git a/net-print/foo2zjs/foo2zjs-20061130.ebuild b/net-print/foo2zjs/foo2zjs-20061130.ebuild new file mode 100644 index 000000000000..c61814a45e47 --- /dev/null +++ b/net-print/foo2zjs/foo2zjs-20061130.ebuild @@ -0,0 +1,115 @@ +# 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-20061130.ebuild,v 1.1 2006/12/03 15:25:36 genstef Exp $ + +inherit eutils + +DESCRIPTION="Support for printing to ZjStream-based printers" +HOMEPAGE="http://foo2zjs.rkkda.com/" +SRC_URI=" + http://gentooexperimental.org/~genstef/dist/${P}.tar.gz + foo2zjs_devices_hp2600n? ( http://foo2zjs.rkkda.com/km2430.tar.gz http://foo2hp.rkkda.com/hpclj2600n.tar.gz ) + foo2zjs_devices_hp1600? ( http://foo2zjs.rkkda.com/km2430.tar.gz http://foo2hp.rkkda.com/hpclj2600n.tar.gz ) + foo2zjs_devices_km2430? ( http://foo2zjs.rkkda.com/km2430.tar.gz ) + foo2zjs_devices_km2300? ( http://foo2zjs.rkkda.com/km2430.tar.gz ftp://ftp.minolta-qms.com/pub/crc/out_going/win/m23dlicc.exe ) + foo2zjs_devices_km2200? ( ftp://ftp.minolta-qms.com/pub/crc/out_going/win2000/m22dlicc.exe ) + foo2zjs_devices_kmcpwl? ( ftp://ftp.minolta-qms.com/pub/crc/out_going/windows/cpplxp.exe ) + foo2zjs_devices_hp1020? ( http://foo2zjs.rkkda.com/sihp1020.tar.gz ) + foo2zjs_devices_hp1018? ( http://foo2zjs.rkkda.com/sihp1018.tar.gz ) + foo2zjs_devices_hp1005? ( http://foo2zjs.rkkda.com/sihp1005.tar.gz ) + foo2zjs_devices_hp1000? ( http://foo2zjs.rkkda.com/sihp1000.tar.gz ) + !foo2zjs_devices_hp2600n? ( !foo2zjs_devices_hp1600? ( + !foo2zjs_devices_km2430? ( !foo2zjs_devices_km2300? ( + !foo2zjs_devices_km2200? ( !foo2zjs_devices_kmcpwl? ( + !foo2zjs_devices_hp1020? ( !foo2zjs_devices_hp1018? ( + !foo2zjs_devices_hp1005? ( !foo2zjs_devices_hp1000? ( + http://foo2zjs.rkkda.com/km2430.tar.gz + http://foo2hp.rkkda.com/hpclj2600n.tar.gz + 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://foo2zjs.rkkda.com/sihp1020.tar.gz + http://foo2zjs.rkkda.com/sihp1018.tar.gz + http://foo2zjs.rkkda.com/sihp1005.tar.gz + http://foo2zjs.rkkda.com/sihp1000.tar.gz ) ) ) ) ) ) ) ) ) ) + " +RESTRICT="nomirror" +LICENSE="GPL-2" +SLOT="0" +IUSE="cups foomaticdb udev usb + foo2zjs_devices_hp2600n foo2zjs_devices_hp1600 + foo2zjs_devices_km2430 foo2zjs_devices_km2300 + foo2zjs_devices_km2200 foo2zjs_devices_kmcpwl + foo2zjs_devices_hp1020 foo2zjs_devices_hp1018 + foo2zjs_devices_hp1005 foo2zjs_devices_hp1000" +DEPEND="app-arch/unzip" +RDEPEND="cups? ( net-print/cups ) + foomaticdb? ( net-print/foomatic-db-engine ) + net-print/foomatic-filters + udev? ( sys-fs/udev ) + usb? ( || ( sys-fs/udev sys-apps/hotplug ) )" +KEYWORDS="~x86 ~amd64 ~ppc" +S=${WORKDIR}/${PN} + +src_unpack() { + unpack ${P}.tar.gz + + # link getweb files in ${S} to get unpacked + for i in ${A} + do + ln -s ${DISTDIR}/${i} ${S} + done + + cd ${S} + epatch ${FILESDIR}/foo2zjs-Makefile-20061130.diff + epatch ${FILESDIR}/foo2zjs-udevfwld-20061130.diff +} + +src_compile() { + emake getweb || die "Failed building getweb script" + + # remove wget as we got the firmware with portage + sed -i -e "s/.*wget.*//" \ + -e "s/error \"Couldn't dow.*//" getweb + # unpack files + use foo2zjs_devices_hp2600n && ./getweb 2600n + use foo2zjs_devices_hp1600 && ./getweb 1600 + use foo2zjs_devices_km2430 && ./getweb 2430 + use foo2zjs_devices_km2300 && ./getweb 2300 + use foo2zjs_devices_km2200 && ./getweb 2200 + use foo2zjs_devices_kmcpwl && ./getweb cpwl + + use foo2zjs_devices_hp1020 && ./getweb 1020 + use foo2zjs_devices_hp1018 && ./getweb 1018 + use foo2zjs_devices_hp1005 && ./getweb 1005 + use foo2zjs_devices_hp1000 && ./getweb 1000 + use foo2zjs_devices_hp2600n || use foo2zjs_devices_hp1600 || use \ + foo2zjs_devices_km2430 || use foo2zjs_devices_km2430 || use \ + foo2zjs_devices_km2300 || use foo2zjs_devices_km2200 || use \ + foo2zjs_devices_kmcpwl || use foo2zjs_devices_hp1020 || use \ + foo2zjs_devices_hp1018 || use foo2zjs_devices_hp1005 || use \ + foo2zjs_devices_hp1000 || ./getweb all + + 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 \ + || die "make install failed" + + if use udev; then + emake DESTDIR=${D} install-udev \ + || die "make install-udev failed" + elif use usb; then + emake DESTDIR=${D} install-hotplug \ + || die "make install-hotplug failed" + fi +} + +pkg_postinst() { + rm -f ${ROOT}/etc/udev/rules.d/58-foo2zjs.rules +}