From 6c4a919cb263461d070662d1b54474093aae4616 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Fri, 20 Apr 2007 23:41:31 +0000 Subject: net-print/foo2zjs: patched thing --- diff --git a/net-print/foo2zjs/Manifest b/net-print/foo2zjs/Manifest index a0f035e..566df81 100644 --- a/net-print/foo2zjs/Manifest +++ b/net-print/foo2zjs/Manifest @@ -1,13 +1,9 @@ -AUX foo2zjs-Makefile-20070204.diff 4934 RMD160 2b320f76c6b1625f01040bc03bb4e5784d02e353 SHA1 524cb9e4398a120f7755952ec5c099778a362a52 SHA256 6a14093f5ee6f4a2d39bdbbc44a5d44ae2a1033df6dad15a0236b7b7ada3c85d -MD5 46bb57d642637a31389577cb3780af92 files/foo2zjs-Makefile-20070204.diff 4934 -RMD160 2b320f76c6b1625f01040bc03bb4e5784d02e353 files/foo2zjs-Makefile-20070204.diff 4934 -SHA256 6a14093f5ee6f4a2d39bdbbc44a5d44ae2a1033df6dad15a0236b7b7ada3c85d files/foo2zjs-Makefile-20070204.diff 4934 -AUX foo2zjs-udevfwld-20070204.diff 6322 RMD160 ef0cdef133664fd191dab5efbe60e0a63c90ccd6 SHA1 6473adb9c22e29b19218185e51ea042af233925c SHA256 d8518ed1c0ee9e90adedd7f1cde11429c989c8b0420648bcb50a1a4f267df527 -MD5 a127931b51f376647ce0b58e9323e440 files/foo2zjs-udevfwld-20070204.diff 6322 -RMD160 ef0cdef133664fd191dab5efbe60e0a63c90ccd6 files/foo2zjs-udevfwld-20070204.diff 6322 -SHA256 d8518ed1c0ee9e90adedd7f1cde11429c989c8b0420648bcb50a1a4f267df527 files/foo2zjs-udevfwld-20070204.diff 6322 +AUX foo2zjs-20070419-gentoo.patch 10901 RMD160 f47de4debdc60a34d9b3652d92f78836aac94119 SHA1 03be5cbead0bb6c40919d338265202f690fe0270 SHA256 1aa1729202ea99409e1d8577602be3960dbb9787467e50745f77eedcbd7e4f4a +MD5 a4be2a959e4e18531e0e50a6d9390930 files/foo2zjs-20070419-gentoo.patch 10901 +RMD160 f47de4debdc60a34d9b3652d92f78836aac94119 files/foo2zjs-20070419-gentoo.patch 10901 +SHA256 1aa1729202ea99409e1d8577602be3960dbb9787467e50745f77eedcbd7e4f4a files/foo2zjs-20070419-gentoo.patch 10901 DIST cpplxp.exe 4799488 RMD160 bcd5ceecca248c90a0d3e99dd55c6e1eedd4de6d SHA1 952ad6557f2a78ec30e9786f52e95f012e39ac1c SHA256 5f4c8b6f20ccf2d525f683847f5dc24bb4c7f58131d6704047d6c9a90d6895af -DIST foo2zjs-20070204.tar.gz 936419 RMD160 4e6160fed4e642106ff62bff64e5a4cf637d9f0b SHA1 df40152952a0d9d27bfebaddf33e2fd39faa0ac6 SHA256 9dc978b208ee7762b6b16ff445103722f45c341457014fa9b3bad7dd2a0bd5d3 +DIST foo2zjs-20070419.tar.gz 1444560 RMD160 6901fe67c7ba8581138acd3cf51e915ad5fd57af SHA1 20d2fa4eec6c8259945c5434fee49dfc93bedf73 SHA256 37f7403759806f3d6029e665b8763b59ad036a605760c71ac3dd0c68e6733043 DIST hpclj2600n.tar.gz 573660 RMD160 a0c03c901cb722bbc61347e9159b0a4faa72329d SHA1 9157061f8796f6f5e0038baa26b9882e875b758b SHA256 b5ed74e50b88152a09d9ad17bca94e2299d348ed6d343ff015344757b72d390a DIST km2430.tar.gz 929112 RMD160 ddd2d5375611a41d62e436ed6f3b3d62356b90a5 SHA1 353b86223d35d73de60231e32a8fb840e4a02823 SHA256 59b559d5f885e0e8870148795674366b527782a062c6cac1dc2048c2759a356b DIST m22dlicc.exe 634368 RMD160 392922135a3f517a76a2b5e8b7200c83e6104ef6 SHA1 4f2de3e9e5418361763805b76722cd5284543110 SHA256 1d57413f4c36941c64599dae2ac2b1f8a397e128796c2796a108be5b8fd282b3 @@ -16,10 +12,10 @@ DIST sihp1000.tar.gz 50423 RMD160 5cd97ca6944d421df213420fc5d1e1572f85ec84 SHA1 DIST sihp1005.tar.gz 52301 RMD160 5ebc04fadafb2033cba9665840897c48eb0d0f70 SHA1 99e5e0d2f9c953c605264023d804d1ca22ae7220 SHA256 55820298cc441893b19d28ff82ff1c8438fb53bad24c2db40b06f24c356cb320 DIST sihp1018.tar.gz 70547 RMD160 f358ae6be52395070d7eea6aa2b0d3d6baf2d7ea SHA1 eea4f2f0f79989349885603940da3345d1c84397 SHA256 d95f26f302e4a6580aa83fd13b99911fe8ad7a1de88fd1545c1f2e384b1d2af7 DIST sihp1020.tar.gz 68877 RMD160 39e998123ad074231c6333ff70ccabbe513ea90f SHA1 6a2ec861838601303d406107b668955b32e89265 SHA256 c69504fa7a96f63a71fb507f5d61a846db60a9ed000abb4cb04b32cfe7c23704 -EBUILD foo2zjs-20070204.ebuild 4096 RMD160 e41d450654e26401421e579fdd579cb6100c3953 SHA1 ecf1fa9693a926e5f2feff94c49d286d6241fea7 SHA256 258bb8ba74b13a91a07e66bf957252c795483f90663b7f36c28f5d7986ec3066 -MD5 2aa1a4b0f99e3b183417cf3b0f2e1469 foo2zjs-20070204.ebuild 4096 -RMD160 e41d450654e26401421e579fdd579cb6100c3953 foo2zjs-20070204.ebuild 4096 -SHA256 258bb8ba74b13a91a07e66bf957252c795483f90663b7f36c28f5d7986ec3066 foo2zjs-20070204.ebuild 4096 +EBUILD foo2zjs-20070419.ebuild 4002 RMD160 97c124155edda33e63995a65719bd50c958f4ac6 SHA1 96b4a8d256708496f375c1623fc2d725fdb2edac SHA256 65f1cc886c2436fd1525791eda27f644a0801e1ed23ceb736d4d114bf7dacca7 +MD5 3253a4f8d7cecc7314c32ec6a902b853 foo2zjs-20070419.ebuild 4002 +RMD160 97c124155edda33e63995a65719bd50c958f4ac6 foo2zjs-20070419.ebuild 4002 +SHA256 65f1cc886c2436fd1525791eda27f644a0801e1ed23ceb736d4d114bf7dacca7 foo2zjs-20070419.ebuild 4002 MISC ChangeLog 5777 RMD160 0a60f078df798a878a8fb6245d3390efec196cad SHA1 1d64eaefe8b28e98863fd0838195fdcdd0ddc877 SHA256 5ecc4645166ddfa171428079ec0b12cc0e9bc7bc2a163612420e82a5b24c1354 MD5 cdf80444a704a10ae90b5d3dcecdc4bd ChangeLog 5777 RMD160 0a60f078df798a878a8fb6245d3390efec196cad ChangeLog 5777 @@ -28,6 +24,6 @@ MISC metadata.xml 266 RMD160 71124c3803fd7ba3370f1b9b55b78d56c5e49201 SHA1 12efa MD5 6062bcaf60fde68c2418376f4cd91f3e metadata.xml 266 RMD160 71124c3803fd7ba3370f1b9b55b78d56c5e49201 metadata.xml 266 SHA256 27d69d00958eb408ac3c397767f9104d5e85c85a977c094140a8169fc6750df7 metadata.xml 266 -MD5 9ba1c2e1af7adcf6e8f534fd02698843 files/digest-foo2zjs-20070204 2242 -RMD160 ee55960880a1a73a729c81bc9fcd37f2978dc8c4 files/digest-foo2zjs-20070204 2242 -SHA256 5c224ebc4dd8ddc7336c8b0d805d481018f0b9b7d5835ca52507940aedcdeced files/digest-foo2zjs-20070204 2242 +MD5 43999b3e8d8acdd050128825b3c5f775 files/digest-foo2zjs-20070419 2245 +RMD160 dcbe62a73dcafb1bc567e26b3c480688d7306273 files/digest-foo2zjs-20070419 2245 +SHA256 f5400799a8bf957857003430a42488170d5c17d171651bd43e7763a0817b3fd1 files/digest-foo2zjs-20070419 2245 diff --git a/net-print/foo2zjs/files/digest-foo2zjs-20070419 b/net-print/foo2zjs/files/digest-foo2zjs-20070419 new file mode 100644 index 0000000..a978b8a --- a/dev/null +++ b/net-print/foo2zjs/files/digest-foo2zjs-20070419 @@ -0,0 +1,30 @@ +MD5 cae0d20d3c1d57cd3953d9b335014294 cpplxp.exe 4799488 +RMD160 bcd5ceecca248c90a0d3e99dd55c6e1eedd4de6d cpplxp.exe 4799488 +SHA256 5f4c8b6f20ccf2d525f683847f5dc24bb4c7f58131d6704047d6c9a90d6895af cpplxp.exe 4799488 +MD5 c7c131945cada9d03f1e463e72e9542e foo2zjs-20070419.tar.gz 1444560 +RMD160 6901fe67c7ba8581138acd3cf51e915ad5fd57af foo2zjs-20070419.tar.gz 1444560 +SHA256 37f7403759806f3d6029e665b8763b59ad036a605760c71ac3dd0c68e6733043 foo2zjs-20070419.tar.gz 1444560 +MD5 72179915334290762193db0be09fceff hpclj2600n.tar.gz 573660 +RMD160 a0c03c901cb722bbc61347e9159b0a4faa72329d hpclj2600n.tar.gz 573660 +SHA256 b5ed74e50b88152a09d9ad17bca94e2299d348ed6d343ff015344757b72d390a hpclj2600n.tar.gz 573660 +MD5 f15687042e468cabed2e277bf313bbc8 km2430.tar.gz 929112 +RMD160 ddd2d5375611a41d62e436ed6f3b3d62356b90a5 km2430.tar.gz 929112 +SHA256 59b559d5f885e0e8870148795674366b527782a062c6cac1dc2048c2759a356b km2430.tar.gz 929112 +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-20070419-gentoo.patch b/net-print/foo2zjs/files/foo2zjs-20070419-gentoo.patch new file mode 100644 index 0000000..aa6de8c --- a/dev/null +++ b/net-print/foo2zjs/files/foo2zjs-20070419-gentoo.patch @@ -0,0 +1,360 @@ +diff --git a/Makefile b/Makefile +index ce510c4..b4171d8 100644 +--- a/Makefile ++++ b/Makefile +@@ -8,7 +8,11 @@ VERSION=0.0 + + # Installation prefix... + PREFIX=/usr/local +-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 +@@ -22,7 +26,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 +@@ -192,7 +196,7 @@ ifeq ($(UNAME),Linux) + endif + + # Compiler flags +-CFLAGS += -O2 -Wall ++CFLAGS ?= -O2 -Wall + #CFLAGS += -g + + # +@@ -396,12 +400,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, +@@ -429,6 +435,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 \ +@@ -446,10 +453,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 + +@@ -503,12 +510,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) +@@ -528,35 +535,26 @@ install-extra: + fi; \ + done + +-MODEL=/usr/share/cups/model +-LOCALMODEL=/usr/local/share/cups/model ++MODEL=${PREFIX}/usr/share/cups/model ++#LOCALMODEL=/usr/local/share/cups/model + install-ppd: + # + # Install PPD files for CUPS + # +- if [ -d /usr/share/ppd/ ]; then \ +- find /usr/share/ppd/ -name '*foo2zjs*' | xargs rm -f; \ +- find /usr/share/ppd/ -name '*foo2hp*' | xargs rm -f; \ +- find /usr/share/ppd/ -name '*foo2xqx*' | xargs rm -f; \ +- find /usr/share/ppd/ -name '*foo2lava*' | xargs rm -f; \ +- find /usr/share/ppd/ -name '*foo2qpdl*' | xargs rm -f; \ +- fi + if [ -d $(MODEL) ]; then \ + cd PPD; \ + for ppd in *.ppd; do \ + gzip < $$ppd > $(MODEL)/$$ppd.gz; \ + done; \ +- elif [ -d $(LOCALMODEL) ]; then \ ++ elif [ -n "${LOCALMODEL}" -a -d $(LOCALMODEL) ]; then \ + cd PPD; \ + for ppd in *.ppd; do \ + gzip < $$ppd > $(LOCALMODEL)/$$ppd.gz; \ + done; \ + fi + +-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: + # +@@ -574,18 +572,20 @@ install-hotplug-test: + # + + 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 + 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 ++ install -c -m 644 hplj.usermap ${USBDIR}/ ++ ++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} + + cups: FRC + if [ -x /etc/init.d/cups ]; then \ +@@ -910,7 +910,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/foo2zjs-loadfw b/foo2zjs-loadfw +new file mode 100644 +index 0000000..c748b1a +--- /dev/null ++++ b/foo2zjs-loadfw +@@ -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 --git a/getweb.in b/getweb.in +index 1841a3a..f17d084 100755 +--- a/getweb.in ++++ b/getweb.in +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + WGETOPTS=--passive-ftp + +diff --git a/hplj.usermap b/hplj.usermap +new file mode 100644 +index 0000000..0e8b64d +--- /dev/null ++++ b/hplj.usermap +@@ -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 --git a/hplj1000 b/hplj1000 +index ca57960..89fb2b6 100755 +--- a/hplj1000 ++++ b/hplj1000 +@@ -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 --git a/hplj10xx.rules b/hplj10xx.rules +index 2929a6d..b9dcde4 100644 +--- a/hplj10xx.rules ++++ b/hplj10xx.rules +@@ -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 --git a/icc2ps/Makefile b/icc2ps/Makefile +index e899212..97fa971 100644 +--- a/icc2ps/Makefile ++++ b/icc2ps/Makefile +@@ -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/foo2zjs-20070419.ebuild b/net-print/foo2zjs/foo2zjs-20070419.ebuild new file mode 100644 index 0000000..c6d836e --- a/dev/null +++ b/net-print/foo2zjs/foo2zjs-20070419.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/foo2zjs-20070204.ebuild,v 1.2 2007/02/19 20:58:34 genstef Exp $ + +inherit eutils + +DESCRIPTION="Support for printing to ZjStream-based printers" +HOMEPAGE="http://foo2zjs.rkkda.com/" +SRC_URI=" + http://hacker.klever.net/files/${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 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 + 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}-gentoo.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/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 install-udev \ + || die "emake install failed" +} + +pkg_postinst() { + udevcontrol reload_rules +} -- cgit v0.9.0.2