summaryrefslogtreecommitdiff
authorMichael Krelin <hacker@klever.net>2007-04-20 23:41:31 (UTC)
committer Michael Krelin <hacker@klever.net>2007-04-22 23:41:40 (UTC)
commit6c4a919cb263461d070662d1b54474093aae4616 (patch) (unidiff)
tree22c72571620230fae697bfb66b6d5859196338bc
parentce0f4181dbecc877171c818a2facc91c88c5f419 (diff)
downloadmisc-6c4a919cb263461d070662d1b54474093aae4616.zip
misc-6c4a919cb263461d070662d1b54474093aae4616.tar.gz
misc-6c4a919cb263461d070662d1b54474093aae4616.tar.bz2
net-print/foo2zjs: patched thing
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--net-print/foo2zjs/Manifest28
-rw-r--r--net-print/foo2zjs/files/digest-foo2zjs-2007041930
-rw-r--r--net-print/foo2zjs/files/foo2zjs-20070419-gentoo.patch360
-rw-r--r--net-print/foo2zjs/foo2zjs-20070419.ebuild105
4 files changed, 507 insertions, 16 deletions
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,11 +1,7 @@
1AUX foo2zjs-Makefile-20070204.diff 4934 RMD160 2b320f76c6b1625f01040bc03bb4e5784d02e353 SHA1 524cb9e4398a120f7755952ec5c099778a362a52 SHA256 6a14093f5ee6f4a2d39bdbbc44a5d44ae2a1033df6dad15a0236b7b7ada3c85d 1AUX foo2zjs-20070419-gentoo.patch 10901 RMD160 f47de4debdc60a34d9b3652d92f78836aac94119 SHA1 03be5cbead0bb6c40919d338265202f690fe0270 SHA256 1aa1729202ea99409e1d8577602be3960dbb9787467e50745f77eedcbd7e4f4a
2MD5 46bb57d642637a31389577cb3780af92 files/foo2zjs-Makefile-20070204.diff 4934 2MD5 a4be2a959e4e18531e0e50a6d9390930 files/foo2zjs-20070419-gentoo.patch 10901
3RMD160 2b320f76c6b1625f01040bc03bb4e5784d02e353 files/foo2zjs-Makefile-20070204.diff 4934 3RMD160 f47de4debdc60a34d9b3652d92f78836aac94119 files/foo2zjs-20070419-gentoo.patch 10901
4SHA256 6a14093f5ee6f4a2d39bdbbc44a5d44ae2a1033df6dad15a0236b7b7ada3c85d files/foo2zjs-Makefile-20070204.diff 4934 4SHA256 1aa1729202ea99409e1d8577602be3960dbb9787467e50745f77eedcbd7e4f4a files/foo2zjs-20070419-gentoo.patch 10901
5AUX foo2zjs-udevfwld-20070204.diff 6322 RMD160 ef0cdef133664fd191dab5efbe60e0a63c90ccd6 SHA1 6473adb9c22e29b19218185e51ea042af233925c SHA256 d8518ed1c0ee9e90adedd7f1cde11429c989c8b0420648bcb50a1a4f267df527
6MD5 a127931b51f376647ce0b58e9323e440 files/foo2zjs-udevfwld-20070204.diff 6322
7RMD160 ef0cdef133664fd191dab5efbe60e0a63c90ccd6 files/foo2zjs-udevfwld-20070204.diff 6322
8SHA256 d8518ed1c0ee9e90adedd7f1cde11429c989c8b0420648bcb50a1a4f267df527 files/foo2zjs-udevfwld-20070204.diff 6322
9DIST cpplxp.exe 4799488 RMD160 bcd5ceecca248c90a0d3e99dd55c6e1eedd4de6d SHA1 952ad6557f2a78ec30e9786f52e95f012e39ac1c SHA256 5f4c8b6f20ccf2d525f683847f5dc24bb4c7f58131d6704047d6c9a90d6895af 5DIST cpplxp.exe 4799488 RMD160 bcd5ceecca248c90a0d3e99dd55c6e1eedd4de6d SHA1 952ad6557f2a78ec30e9786f52e95f012e39ac1c SHA256 5f4c8b6f20ccf2d525f683847f5dc24bb4c7f58131d6704047d6c9a90d6895af
10DIST foo2zjs-20070204.tar.gz 936419 RMD160 4e6160fed4e642106ff62bff64e5a4cf637d9f0b SHA1 df40152952a0d9d27bfebaddf33e2fd39faa0ac6 SHA256 9dc978b208ee7762b6b16ff445103722f45c341457014fa9b3bad7dd2a0bd5d3 6DIST foo2zjs-20070419.tar.gz 1444560 RMD160 6901fe67c7ba8581138acd3cf51e915ad5fd57af SHA1 20d2fa4eec6c8259945c5434fee49dfc93bedf73 SHA256 37f7403759806f3d6029e665b8763b59ad036a605760c71ac3dd0c68e6733043
11DIST hpclj2600n.tar.gz 573660 RMD160 a0c03c901cb722bbc61347e9159b0a4faa72329d SHA1 9157061f8796f6f5e0038baa26b9882e875b758b SHA256 b5ed74e50b88152a09d9ad17bca94e2299d348ed6d343ff015344757b72d390a 7DIST hpclj2600n.tar.gz 573660 RMD160 a0c03c901cb722bbc61347e9159b0a4faa72329d SHA1 9157061f8796f6f5e0038baa26b9882e875b758b SHA256 b5ed74e50b88152a09d9ad17bca94e2299d348ed6d343ff015344757b72d390a
@@ -18,6 +14,6 @@ DIST sihp1018.tar.gz 70547 RMD160 f358ae6be52395070d7eea6aa2b0d3d6baf2d7ea SHA1
18DIST sihp1020.tar.gz 68877 RMD160 39e998123ad074231c6333ff70ccabbe513ea90f SHA1 6a2ec861838601303d406107b668955b32e89265 SHA256 c69504fa7a96f63a71fb507f5d61a846db60a9ed000abb4cb04b32cfe7c23704 14DIST sihp1020.tar.gz 68877 RMD160 39e998123ad074231c6333ff70ccabbe513ea90f SHA1 6a2ec861838601303d406107b668955b32e89265 SHA256 c69504fa7a96f63a71fb507f5d61a846db60a9ed000abb4cb04b32cfe7c23704
19EBUILD foo2zjs-20070204.ebuild 4096 RMD160 e41d450654e26401421e579fdd579cb6100c3953 SHA1 ecf1fa9693a926e5f2feff94c49d286d6241fea7 SHA256 258bb8ba74b13a91a07e66bf957252c795483f90663b7f36c28f5d7986ec3066 15EBUILD foo2zjs-20070419.ebuild 4002 RMD160 97c124155edda33e63995a65719bd50c958f4ac6 SHA1 96b4a8d256708496f375c1623fc2d725fdb2edac SHA256 65f1cc886c2436fd1525791eda27f644a0801e1ed23ceb736d4d114bf7dacca7
20MD5 2aa1a4b0f99e3b183417cf3b0f2e1469 foo2zjs-20070204.ebuild 4096 16MD5 3253a4f8d7cecc7314c32ec6a902b853 foo2zjs-20070419.ebuild 4002
21RMD160 e41d450654e26401421e579fdd579cb6100c3953 foo2zjs-20070204.ebuild 4096 17RMD160 97c124155edda33e63995a65719bd50c958f4ac6 foo2zjs-20070419.ebuild 4002
22SHA256 258bb8ba74b13a91a07e66bf957252c795483f90663b7f36c28f5d7986ec3066 foo2zjs-20070204.ebuild 4096 18SHA256 65f1cc886c2436fd1525791eda27f644a0801e1ed23ceb736d4d114bf7dacca7 foo2zjs-20070419.ebuild 4002
23MISC ChangeLog 5777 RMD160 0a60f078df798a878a8fb6245d3390efec196cad SHA1 1d64eaefe8b28e98863fd0838195fdcdd0ddc877 SHA256 5ecc4645166ddfa171428079ec0b12cc0e9bc7bc2a163612420e82a5b24c1354 19MISC ChangeLog 5777 RMD160 0a60f078df798a878a8fb6245d3390efec196cad SHA1 1d64eaefe8b28e98863fd0838195fdcdd0ddc877 SHA256 5ecc4645166ddfa171428079ec0b12cc0e9bc7bc2a163612420e82a5b24c1354
@@ -30,4 +26,4 @@ RMD160 71124c3803fd7ba3370f1b9b55b78d56c5e49201 metadata.xml 266
30SHA256 27d69d00958eb408ac3c397767f9104d5e85c85a977c094140a8169fc6750df7 metadata.xml 266 26SHA256 27d69d00958eb408ac3c397767f9104d5e85c85a977c094140a8169fc6750df7 metadata.xml 266
31MD5 9ba1c2e1af7adcf6e8f534fd02698843 files/digest-foo2zjs-20070204 2242 27MD5 43999b3e8d8acdd050128825b3c5f775 files/digest-foo2zjs-20070419 2245
32RMD160 ee55960880a1a73a729c81bc9fcd37f2978dc8c4 files/digest-foo2zjs-20070204 2242 28RMD160 dcbe62a73dcafb1bc567e26b3c480688d7306273 files/digest-foo2zjs-20070419 2245
33SHA256 5c224ebc4dd8ddc7336c8b0d805d481018f0b9b7d5835ca52507940aedcdeced files/digest-foo2zjs-20070204 2242 29SHA256 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 @@
1MD5 cae0d20d3c1d57cd3953d9b335014294 cpplxp.exe 4799488
2RMD160 bcd5ceecca248c90a0d3e99dd55c6e1eedd4de6d cpplxp.exe 4799488
3SHA256 5f4c8b6f20ccf2d525f683847f5dc24bb4c7f58131d6704047d6c9a90d6895af cpplxp.exe 4799488
4MD5 c7c131945cada9d03f1e463e72e9542e foo2zjs-20070419.tar.gz 1444560
5RMD160 6901fe67c7ba8581138acd3cf51e915ad5fd57af foo2zjs-20070419.tar.gz 1444560
6SHA256 37f7403759806f3d6029e665b8763b59ad036a605760c71ac3dd0c68e6733043 foo2zjs-20070419.tar.gz 1444560
7MD5 72179915334290762193db0be09fceff hpclj2600n.tar.gz 573660
8RMD160 a0c03c901cb722bbc61347e9159b0a4faa72329d hpclj2600n.tar.gz 573660
9SHA256 b5ed74e50b88152a09d9ad17bca94e2299d348ed6d343ff015344757b72d390a hpclj2600n.tar.gz 573660
10MD5 f15687042e468cabed2e277bf313bbc8 km2430.tar.gz 929112
11RMD160 ddd2d5375611a41d62e436ed6f3b3d62356b90a5 km2430.tar.gz 929112
12SHA256 59b559d5f885e0e8870148795674366b527782a062c6cac1dc2048c2759a356b km2430.tar.gz 929112
13MD5 3b78a08aa968b4c1ed591947721d3e47 m22dlicc.exe 634368
14RMD160 392922135a3f517a76a2b5e8b7200c83e6104ef6 m22dlicc.exe 634368
15SHA256 1d57413f4c36941c64599dae2ac2b1f8a397e128796c2796a108be5b8fd282b3 m22dlicc.exe 634368
16MD5 d680f447a416c5f9041f27c0a1df57a0 m23dlicc.exe 170496
17RMD160 f72be93dfc5c8c9159c75d7204820f1305f47905 m23dlicc.exe 170496
18SHA256 1416cda7e2e3496ff1d121c87dd8984ad1d16ed3396096f05f4919dafd445ae4 m23dlicc.exe 170496
19MD5 5d47d54f9cc19225c6ad07763bd02801 sihp1000.tar.gz 50423
20RMD160 5cd97ca6944d421df213420fc5d1e1572f85ec84 sihp1000.tar.gz 50423
21SHA256 7bdb5387419a880e32c9280b8d3878b08eb8fbd614237f164a9ae1e81bc2cff6 sihp1000.tar.gz 50423
22MD5 10937cc743b03ea9776a9f6eb35159a0 sihp1005.tar.gz 52301
23RMD160 5ebc04fadafb2033cba9665840897c48eb0d0f70 sihp1005.tar.gz 52301
24SHA256 55820298cc441893b19d28ff82ff1c8438fb53bad24c2db40b06f24c356cb320 sihp1005.tar.gz 52301
25MD5 89bc9a1199abc2bd304694f0273a248a sihp1018.tar.gz 70547
26RMD160 f358ae6be52395070d7eea6aa2b0d3d6baf2d7ea sihp1018.tar.gz 70547
27SHA256 d95f26f302e4a6580aa83fd13b99911fe8ad7a1de88fd1545c1f2e384b1d2af7 sihp1018.tar.gz 70547
28MD5 290c2a03d665ceb4dfbbd60b471ebb3d sihp1020.tar.gz 68877
29RMD160 39e998123ad074231c6333ff70ccabbe513ea90f sihp1020.tar.gz 68877
30SHA256 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 @@
1diff --git a/Makefile b/Makefile
2index ce510c4..b4171d8 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -8,7 +8,11 @@ VERSION=0.0
6
7 # Installation prefix...
8 PREFIX=/usr/local
9-PREFIX=/usr
10+PREFIX=${DESTDIR}/usr
11+
12+# USB_PRINTERID is also installed there because it is needed by the FWloader
13+FWLOADERDIR=$(DESTDIR)/sbin
14+FIRMWAREDIR=$(DESTDIR)/lib/firmware
15
16 # Pathnames for this package...
17 BIN=$(PREFIX)/bin
18@@ -22,7 +26,7 @@ MANDIR=$(PREFIX)/share/man
19 DOCDIR=$(PREFIX)/share/doc/foo2zjs/
20
21 # Pathnames for referenced packages...
22-FOODB=/usr/share/foomatic/db/source
23+FOODB=${PREFIX}/share/foomatic/db/source
24
25 # User ID's
26 LPuid=-olp
27@@ -192,7 +196,7 @@ ifeq ($(UNAME),Linux)
28 endif
29
30 # Compiler flags
31 -CFLAGS +=-O2 -Wall
32 +CFLAGS ?=-O2 -Wall
33 #CFLAGS +=-g
34
35 #
36@@ -396,12 +400,14 @@ install-test:
37
38
39 install-prog:
40 +[ -d ${BIN} ] || install -d -m 755 ${BIN}/
41 +[ -d ${DESTDIR}/bin/ ] || install -d -m 755 ${DESTDIR}/bin/
42 #
43 # Install driver, wrapper, and development tools
44 #
45 install -c $(PROGS) $(SHELLS) $(BIN)/
46 if [ "$(BINPROGS)" != "" ]; then \
47 - install -c $(BINPROGS) /bin/; \
48 + install -c $(BINPROGS) ${DESTDIR}/bin/; \
49 fi
50 #
51 # Install gamma correction files. These are just templates,
52@@ -429,6 +435,7 @@ install-foo:
53 #
54 @if [ -d $(FOODB) ]; then \
55 for dir in driver printer opt; do \
56 + [ -d ${FOODB}/$$dir/ ] || install -d -m 755 ${FOODB}/$$dir/; \
57 echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
58 install -c -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
59 done \
60@@ -446,10 +453,10 @@ install-foo:
61 #
62 # Clear foomatic cache and rebuild database if needed
63 #
64 -rm -rf /var/cache/foomatic/*/*
65 -rm -f /var/cache/foomatic/printconf.pickle
66 -if [ -d /var/cache/foomatic/compiled ]; then \
67 - cd /var/cache/foomatic/compiled; \
68 +rm -rf ${DESTDIR}/var/cache/foomatic/*/*
69 +rm -f ${DESTDIR}/var/cache/foomatic/printconf.pickle
70 +if [ -d ${DESTDIR}/var/cache/foomatic/compiled ]; then \
71 + cd ${DESTDIR}/var/cache/foomatic/compiled; \
72 foomatic-combo-xml -O >overview.xml; \
73 fi
74
75@@ -503,12 +510,12 @@ install-extra:
76 fi; \
77 done
78 # foo2zjs Firmware files (if any)
79 -install $(LPuid) $(LPgid) -m 775 -d $(SHAREZJS)/firmware/
80 +install $(LPuid) $(LPgid) -m 775 -d $(FIRMWAREDIR)/
81 for i in sihp*.img; do \
82 if [ -f $$i ]; then \
83 base=`basename $$i .img`; \
84 ./arm2hpdl $$i >$$base.dl; \
85 - install -c -m 644 $$base.dl $(SHAREZJS)/firmware/; \
86 + install -c -m 644 $$base.dl $(FIRMWAREDIR)/; \
87 fi; \
88 done
89 # foo2oak ICM files (if any)
90@@ -528,35 +535,26 @@ install-extra:
91 fi; \
92 done
93
94-MODEL=/usr/share/cups/model
95-LOCALMODEL=/usr/local/share/cups/model
96+MODEL=${PREFIX}/usr/share/cups/model
97+#LOCALMODEL=/usr/local/share/cups/model
98 install-ppd:
99 #
100 # Install PPD files for CUPS
101 #
102 -if [ -d /usr/share/ppd/ ]; then \
103 - find /usr/share/ppd/ -name '*foo2zjs*' | xargs rm -f; \
104 - find /usr/share/ppd/ -name '*foo2hp*' | xargs rm -f; \
105 - find /usr/share/ppd/ -name '*foo2xqx*' | xargs rm -f; \
106 - find /usr/share/ppd/ -name '*foo2lava*' | xargs rm -f; \
107 - find /usr/share/ppd/ -name '*foo2qpdl*' | xargs rm -f; \
108 -fi
109 if [ -d $(MODEL) ]; then \
110 cd PPD; \
111 for ppd in *.ppd; do \
112 gzip < $$ppd > $(MODEL)/$$ppd.gz; \
113 done; \
114 -elif [ -d $(LOCALMODEL) ]; then \
115 +elif [ -n "${LOCALMODEL}" -a -d $(LOCALMODEL) ]; then \
116 cd PPD; \
117 for ppd in *.ppd; do \
118 gzip < $$ppd > $(LOCALMODEL)/$$ppd.gz; \
119 done; \
120 fi
121
122-USBDIR=/etc/hotplug/usb
123-UDEVDIR=/etc/udev/rules.d
124-RULES=hplj10xx.rules
125-install-hotplug: install-hotplug-test install-hotplug-prog
126+USBDIR=${DESTDIR}/etc/hotplug/usb
127+install-hotplug: install-hotplug-test install-udev
128
129 install-hotplug-test:
130 #
131@@ -574,18 +572,20 @@ install-hotplug-test:
132 #
133
134 install-hotplug-prog:
135 -if [ -d $(UDEVDIR) ]; then \
136 - install -c -m 644 $(RULES) $(UDEVDIR)/11-$(RULES); \
137 -fi
138 [ -d $(USBDIR) ] || install -d -m 755 $(USBDIR)/
139 install -c -m 755 hplj1000 $(USBDIR)/
140 ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1005
141 ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1018
142 ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1020
143 -$(USBDIR)/hplj1000 install-usermap
144 -$(USBDIR)/hplj1005 install-usermap
145 -$(USBDIR)/hplj1018 install-usermap
146 -$(USBDIR)/hplj1020 install-usermap
147 +install -c -m 644 hplj.usermap ${USBDIR}/
148+
149+UDEVDIR=${DESTDIR}/etc/udev/rules.d
150+RULES=hplj10xx.rules
151+install-udev:
152 +[ -d $(FWLOADERDIR) ] || install -d -m 755 $(FWLOADERDIR)/
153 +install -c -m 755 foo2zjs-loadfw $(FWLOADERDIR)/
154 +[ -d ${UDEVDIR} ] || install -d -m 755 ${UDEVDIR}/
155 +install -c -m 644 ${RULES} ${UDEVDIR}/11-${RULES}
156
157 cups:FRC
158 if [ -x /etc/init.d/cups ]; then \
159@@ -910,7 +910,6 @@ install-doc: doc
160 install -c -m 644 README $(DOCDIR)
161 install -c -m 644 ChangeLog $(DOCDIR)
162
163-GROFF=/usr/local/test/bin/groff
164 GROFF=groff
165 manual.pdf: $(MANPAGES)
166 -$(GROFF) -t -man $(MANPAGES) | ps2pdf - $@
167diff --git a/foo2zjs-loadfw b/foo2zjs-loadfw
168new file mode 100644
169index 0000000..c748b1a
170--- /dev/null
171+++ b/foo2zjs-loadfw
172@@ -0,0 +1,121 @@
173+#!/bin/sh
174+
175 +#foo2zjs-loadfw:
176+#
177 +#Hotplug script for HP1000/1005/1020 USB laser printers. The model number
178 +#that this script deals with is determined from the udev env.
179+#
180 +#Used to download firmware automatically into the printer when it
181 +#is powered up or plugged into the USB port.
182+#
183 +#The inspiration fo this script is from:
184 +# Oscar Santacreu. Alicante-Spain (2002)
185 +# Mike Morgan (2004)
186 +#Modified by Stefan Schweizer (2005) to work as a udev-RUN-script
187+
188+#
189+# Directory to find downloadable HP firmware files sihpMMMM.dl
190+#
191+FWDIR=/lib/firmware
192+
193+#
194+# Program used to determine USB id information
195+#
196+USBID=/bin/usb_printerid
197+
198+#
199 +#Figure out how to log our messages
200+#
201+if [ -t 1 ]; then
202+ # Running from a tty...
203+ log() {
204 +echo "$0: $@"
205+ }
206+elif [ -x /usr/bin/logger ]; then
207+ # Have logger...
208+ log() {
209 +logger -t "$0" -- "$@"
210+ }
211+else
212+ # No logger...
213+ log() {
214 +echo "$0: $@" >> /var/log/messages
215+ }
216+fi
217+
218+#
219 +#Figure out the model number from the name of this script
220+#
221+case "$1" in
222+1000)
223+ MODEL=1000
224+ MODELNAME="hp LaserJet $MODEL"
225+ ;;
226+1005)
227+ MODEL=1005
228+ MODELNAME="hp LaserJet $MODEL"
229+ ;;
230+1018)
231+ MODEL=1018
232+ MODELNAME="HP LaserJet $MODEL"
233+ ;;
234+1020)
235+ MODEL=1020
236+ MODELNAME="HP LaserJet $MODEL"
237+ ;;
238+*)
239+ log "Only HP LaserJet 1000, 1005, 1018 and 1020 are supported"
240+ log "You need to supply one of these on the cmdline: $0 10**"
241+ exit
242+ ;;
243+esac
244+
245+if [ -z "$DEVNAME" ]; then
246+ if [ -n "$2" ]; then
247+ DEVNAME=$2
248+ else
249+ log "You need to either have $DEVNAME set in the environment or supply it on the cmdline, like:"
250+ log "$0 10** /dev/usb/lp0"
251+ exit 1
252+ fi
253+fi
254+
255+#
256 +#Procedure to load a single device with firmware
257+#
258+load1() {
259+ fw="$FWDIR/sihp$MODEL.dl"
260+ if [ ! -f "$fw" ]; then
261 +log "Missing HP LaserJet $MODEL firmware file $fw"
262 +log "...read foo2zjs installation instructions and run ./getweb $MODEL"
263 +return 1
264+ fi
265+
266+ log "loading HP LaserJet $MODEL firmware $fw to $DEVNAME ..."
267+ if cat $fw > $DEVNAME; then
268 +log "... download successful."
269+ else
270 +log "... download failed."
271+ fi
272+ return 0
273+}
274+
275+#
276 +#OK, now download firmware to any printers that need it
277+#
278+if [ -x $USBID ]; then
279 +if $USBID $DEVNAME | grep "$MODELNAME" 2> /dev/null; then
280 + # This is a LaserJet 100x
281 + if $USBID $DEVNAME | grep 'FWVER' 2> /dev/null; then
282 + log "HP LaserJet $MODEL firmware already loaded into $DEVNAME"
283 + else
284 + # Firmware is not yet loaded
285 + load1 "$DEVNAME"
286 + fi
287 +else
288 + log "No supported printer found."
289 +fi
290+else
291+ log "HP LaserJet $MODEL firmware was not downloaded..."
292+ log "...couldn't find $USBID"
293+fi
294diff --git a/getweb.in b/getweb.in
295index 1841a3a..f17d084 100755
296--- a/getweb.in
297+++ b/getweb.in
298@@ -1,4 +1,4 @@
299-#!/bin/sh
300+#!/bin/bash
301
302 WGETOPTS=--passive-ftp
303
304diff --git a/hplj.usermap b/hplj.usermap
305new file mode 100644
306index 0000000..0e8b64d
307--- /dev/null
308+++ b/hplj.usermap
309@@ -0,0 +1,4 @@
310+hplj1000 0x0003 0x03f0 0x0517 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
311+hplj1005 0x0003 0x03f0 0x1317 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
312+hplj1018 0x0003 0x03f0 0x4117 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
313+hplj1020 0x0003 0x03f0 0x2b17 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
314diff --git a/hplj1000 b/hplj1000
315index ca57960..89fb2b6 100755
316--- a/hplj1000
317+++ b/hplj1000
318@@ -35,7 +35,7 @@ DEV=""
319 #
320 # Directory to find downloadable HP firmware files sihpMMMM.dl
321 #
322-FWDIR=/usr/share/foo2zjs/firmware
323+FWDIR=/lib/firmware
324
325 #
326 # Program used to determine USB id information
327diff --git a/hplj10xx.rules b/hplj10xx.rules
328index 2929a6d..b9dcde4 100644
329--- a/hplj10xx.rules
330+++ b/hplj10xx.rules
331@@ -1,8 +1,8 @@
332 #Own udev rule for HP Laserjet 1000
333-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"
334+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"
335 #Own udev rule for HP Laserjet 1005
336-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"
337+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"
338 #Own udev rule for HP Laserjet 1018
339-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"
340+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"
341 #Own udev rule for HP Laserjet 1020
342-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"
343+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"
344diff --git a/icc2ps/Makefile b/icc2ps/Makefile
345index e899212..97fa971 100644
346--- a/icc2ps/Makefile
347+++ b/icc2ps/Makefile
348@@ -1,10 +1,10 @@
349 -PREFIX=/usr
350 +PREFIX=${DESTDIR}/usr
351 BIN=$(PREFIX)/bin
352 SRC=icc2ps.c xgetopt.c
353 LIB=cmscam97.c cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \
354 cmslut.c cmsmatsh.c cmsmtrx.c cmsnamed.c cmspack.c cmspcs.c cmsps2.c \
355 cmssamp.c cmswtpnt.c cmsxform.c cmsio0.c cmsvirt.c
356 -CFLAGS=-O3
357 +CFLAGS?=-O3
358
359 all: foo2zjs-icc2ps
360
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 @@
1# Copyright 1999-2007 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/foo2zjs-20070204.ebuild,v 1.2 2007/02/19 20:58:34 genstef Exp $
4
5inherit eutils
6
7DESCRIPTION="Support for printing to ZjStream-based printers"
8HOMEPAGE="http://foo2zjs.rkkda.com/"
9SRC_URI="
10 http://hacker.klever.net/files/${P}.tar.gz
11 foo2zjs_devices_hp2600n? ( http://foo2zjs.rkkda.com/km2430.tar.gz http://foo2hp.rkkda.com/hpclj2600n.tar.gz )
12 foo2zjs_devices_hp1600? ( http://foo2zjs.rkkda.com/km2430.tar.gz http://foo2hp.rkkda.com/hpclj2600n.tar.gz )
13 foo2zjs_devices_km2430? ( http://foo2zjs.rkkda.com/km2430.tar.gz )
14 foo2zjs_devices_km2300? ( http://foo2zjs.rkkda.com/km2430.tar.gz ftp://ftp.minolta-qms.com/pub/crc/out_going/win/m23dlicc.exe )
15 foo2zjs_devices_km2200? ( ftp://ftp.minolta-qms.com/pub/crc/out_going/win2000/m22dlicc.exe )
16 foo2zjs_devices_kmcpwl? ( ftp://ftp.minolta-qms.com/pub/crc/out_going/windows/cpplxp.exe )
17 foo2zjs_devices_hp1020? ( http://foo2zjs.rkkda.com/sihp1020.tar.gz )
18 foo2zjs_devices_hp1018? ( http://foo2zjs.rkkda.com/sihp1018.tar.gz )
19 foo2zjs_devices_hp1005? ( http://foo2zjs.rkkda.com/sihp1005.tar.gz )
20 foo2zjs_devices_hp1000? ( http://foo2zjs.rkkda.com/sihp1000.tar.gz )
21 !foo2zjs_devices_hp2600n? ( !foo2zjs_devices_hp1600? (
22 !foo2zjs_devices_km2430? ( !foo2zjs_devices_km2300? (
23 !foo2zjs_devices_km2200? ( !foo2zjs_devices_kmcpwl? (
24 !foo2zjs_devices_hp1020? ( !foo2zjs_devices_hp1018? (
25 !foo2zjs_devices_hp1005? ( !foo2zjs_devices_hp1000? (
26 http://foo2zjs.rkkda.com/km2430.tar.gz
27 http://foo2hp.rkkda.com/hpclj2600n.tar.gz
28 ftp://ftp.minolta-qms.com/pub/crc/out_going/win/m23dlicc.exe
29 ftp://ftp.minolta-qms.com/pub/crc/out_going/win2000/m22dlicc.exe
30 ftp://ftp.minolta-qms.com/pub/crc/out_going/windows/cpplxp.exe
31 http://foo2zjs.rkkda.com/sihp1020.tar.gz
32 http://foo2zjs.rkkda.com/sihp1018.tar.gz
33 http://foo2zjs.rkkda.com/sihp1005.tar.gz
34 http://foo2zjs.rkkda.com/sihp1000.tar.gz ) ) ) ) ) ) ) ) ) )
35 "
36RESTRICT="nomirror"
37LICENSE="GPL-2"
38SLOT="0"
39IUSE="cups foomaticdb usb
40 foo2zjs_devices_hp2600n foo2zjs_devices_hp1600
41 foo2zjs_devices_km2430 foo2zjs_devices_km2300
42 foo2zjs_devices_km2200 foo2zjs_devices_kmcpwl
43 foo2zjs_devices_hp1020 foo2zjs_devices_hp1018
44 foo2zjs_devices_hp1005 foo2zjs_devices_hp1000"
45DEPEND="app-arch/unzip"
46RDEPEND="cups? ( net-print/cups )
47 foomaticdb? ( net-print/foomatic-db-engine )
48 net-print/foomatic-filters
49 sys-fs/udev"
50KEYWORDS="~x86 ~amd64 ~ppc"
51S=${WORKDIR}/${PN}
52
53src_unpack() {
54 unpack ${P}.tar.gz
55
56 # link getweb files in ${S} to get unpacked
57 for i in ${A}
58 do
59 ln -s ${DISTDIR}/${i} ${S}
60 done
61
62 cd ${S}
63 epatch ${FILESDIR}/${P}-gentoo.patch
64}
65
66src_compile() {
67 emake getweb || die "Failed building getweb script"
68
69 # remove wget as we got the firmware with portage
70 sed -i -e "s/.*wget.*//" \
71 -e "s/error \"Couldn't dow.*//" getweb
72 # unpack files
73 use foo2zjs_devices_hp2600n && ./getweb 2600n
74 use foo2zjs_devices_hp1600 && ./getweb 1600
75 use foo2zjs_devices_km2430 && ./getweb 2430
76 use foo2zjs_devices_km2300 && ./getweb 2300
77 use foo2zjs_devices_km2200 && ./getweb 2200
78 use foo2zjs_devices_kmcpwl && ./getweb cpwl
79
80 use foo2zjs_devices_hp1020 && ./getweb 1020
81 use foo2zjs_devices_hp1018 && ./getweb 1018
82 use foo2zjs_devices_hp1005 && ./getweb 1005
83 use foo2zjs_devices_hp1000 && ./getweb 1000
84 use foo2zjs_devices_hp2600n || use foo2zjs_devices_hp1600 || use \
85 foo2zjs_devices_km2430 || use foo2zjs_devices_km2430 || use \
86 foo2zjs_devices_km2300 || use foo2zjs_devices_km2200 || use \
87 foo2zjs_devices_kmcpwl || use foo2zjs_devices_hp1020 || use \
88 foo2zjs_devices_hp1018 || use foo2zjs_devices_hp1005 || use \
89 foo2zjs_devices_hp1000 || ./getweb all
90
91 emake || die "emake failed"
92}
93
94src_install() {
95 use foomaticdb && dodir /usr/share/foomatic/db/source
96
97 use cups && dodir /usr/share/cups/model
98
99 emake DESTDIR=${D} install install-udev \
100 || die "emake install failed"
101}
102
103pkg_postinst() {
104 udevcontrol reload_rules
105}