diff options
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/foo2zjs/ChangeLog | 11 | ||||
| -rw-r--r-- | net-print/foo2zjs/Manifest | 6 | ||||
| -rw-r--r-- | net-print/foo2zjs/files/digest-foo2zjs-20060118 | 4 | ||||
| -rw-r--r-- | net-print/foo2zjs/files/foo2zjs-Makefile-20060118.diff | 132 | ||||
| -rw-r--r-- | net-print/foo2zjs/files/foo2zjs-udevfwld-20060118.diff | 183 | ||||
| -rw-r--r-- | net-print/foo2zjs/foo2zjs-20060118.ebuild | 68 |
6 files changed, 401 insertions, 3 deletions
diff --git a/net-print/foo2zjs/ChangeLog b/net-print/foo2zjs/ChangeLog index 259a34192dfc..eb250ef99109 100644 --- a/net-print/foo2zjs/ChangeLog +++ b/net-print/foo2zjs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-print/foo2zjs -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/ChangeLog,v 1.8 2005/12/28 19:36:23 genstef Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/ChangeLog,v 1.9 2006/01/22 07:59:06 genstef Exp $ + +*foo2zjs-20060118 (22 Jan 2006) + + 22 Jan 2006; Stefan Schweizer <genstef@gentoo.org> + +files/foo2zjs-Makefile-20060118.diff, + +files/foo2zjs-udevfwld-20060118.diff, +foo2zjs-20060118.ebuild: + version bump *foo2zjs-20051228 (28 Dec 2005) diff --git a/net-print/foo2zjs/Manifest b/net-print/foo2zjs/Manifest index 7bccac386900..c0ff43f351f2 100644 --- a/net-print/foo2zjs/Manifest +++ b/net-print/foo2zjs/Manifest @@ -1,14 +1,18 @@ -MD5 c67f168b1968276efcfc30cb41006654 ChangeLog 2004 +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 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 MD5 379e40f8651bfdf8764f4afbc9594b41 files/hp-printer-udev.patch 767 MD5 dd5a53f7b7c08325d45369e7c377f992 foo2zjs-20050319.ebuild 1569 MD5 87559f5f87f2ad396e043be0e0140d8c foo2zjs-20050925.ebuild 2072 MD5 afc9897aef83855914893682ff4b9fd6 foo2zjs-20051228.ebuild 1825 +MD5 cb2c6b396152e563e675c27760681d5f foo2zjs-20060118.ebuild 1825 MD5 6062bcaf60fde68c2418376f4cd91f3e metadata.xml 266 diff --git a/net-print/foo2zjs/files/digest-foo2zjs-20060118 b/net-print/foo2zjs/files/digest-foo2zjs-20060118 new file mode 100644 index 000000000000..2207b268e915 --- /dev/null +++ b/net-print/foo2zjs/files/digest-foo2zjs-20060118 @@ -0,0 +1,4 @@ +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-20060118.diff b/net-print/foo2zjs/files/foo2zjs-Makefile-20060118.diff new file mode 100644 index 000000000000..9af984830336 --- /dev/null +++ b/net-print/foo2zjs/files/foo2zjs-Makefile-20060118.diff @@ -0,0 +1,132 @@ +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-20060118.diff b/net-print/foo2zjs/files/foo2zjs-udevfwld-20060118.diff new file mode 100644 index 000000000000..efd01c165bf3 --- /dev/null +++ b/net-print/foo2zjs/files/foo2zjs-udevfwld-20060118.diff @@ -0,0 +1,183 @@ +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-20060118.ebuild b/net-print/foo2zjs/foo2zjs-20060118.ebuild new file mode 100644 index 000000000000..683a9c3dcc7d --- /dev/null +++ b/net-print/foo2zjs/foo2zjs-20060118.ebuild @@ -0,0 +1,68 @@ +# 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 +} |