summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2006-06-14 23:14:30 +0000
committerStefan Schweizer <genstef@gentoo.org>2006-06-14 23:14:30 +0000
commitb8440ecd006efea30f823027702f2145a3a7557d (patch)
tree3e3716945a2038017fa6c50735fa413608ce8e7c /net-print
parentNew version, digest fix, udev fix thanks to Kai Blaschke <webmaster@thw-theor... (diff)
downloadgentoo-2-b8440ecd006efea30f823027702f2145a3a7557d.tar.gz
gentoo-2-b8440ecd006efea30f823027702f2145a3a7557d.tar.bz2
gentoo-2-b8440ecd006efea30f823027702f2145a3a7557d.zip
New version, digest fix, udev fix thanks to Kai Blaschke <webmaster@thw-theorie.de> and Ian Stakenvicius <ian@syndicated-productions.com> in bug 136550
(Portage version: 2.1) (Unsigned Manifest commit)
Diffstat (limited to 'net-print')
-rw-r--r--net-print/foo2zjs/Manifest34
-rw-r--r--net-print/foo2zjs/files/digest-foo2zjs-2006052330
-rw-r--r--net-print/foo2zjs/files/foo2zjs-udevfwld-20060523.diff191
-rw-r--r--net-print/foo2zjs/foo2zjs-20060523.ebuild78
4 files changed, 17 insertions, 316 deletions
diff --git a/net-print/foo2zjs/Manifest b/net-print/foo2zjs/Manifest
index 465c7b1745c1..8186fb4a2a66 100644
--- a/net-print/foo2zjs/Manifest
+++ b/net-print/foo2zjs/Manifest
@@ -2,32 +2,32 @@ 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-udevfwld-20060523.diff 6301 RMD160 c3eaea8f786db538a59aee91998fc7f0090548dd SHA1 98fc5712b298f4f8a8daff893493d4e8f5067c3e SHA256 0d2ec97c4a99bff0d7055e0d141407b5e01cde9fa95ec638111af77daf4eb637
-MD5 80ee1d3068c7c53618d570cd1079c4d8 files/foo2zjs-udevfwld-20060523.diff 6301
-RMD160 c3eaea8f786db538a59aee91998fc7f0090548dd files/foo2zjs-udevfwld-20060523.diff 6301
-SHA256 0d2ec97c4a99bff0d7055e0d141407b5e01cde9fa95ec638111af77daf4eb637 files/foo2zjs-udevfwld-20060523.diff 6301
+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
DIST cpplxp.exe 4799488 RMD160 bcd5ceecca248c90a0d3e99dd55c6e1eedd4de6d SHA1 952ad6557f2a78ec30e9786f52e95f012e39ac1c SHA256 5f4c8b6f20ccf2d525f683847f5dc24bb4c7f58131d6704047d6c9a90d6895af
-DIST foo2zjs-20060523.tar.gz 917839 RMD160 f306e9cdafb9a388e3100e68c881fb14f9c515bc SHA1 7ace0e47bc2640d8f5a9ae58605fd10c5746bef0 SHA256 f1b87ff6bc441a1f6d684010fa455085ff4c8792274f9cce3a34d800c68257dc
+DIST foo2zjs-20060607.tar.gz 917862 RMD160 6cc9c46164dad2d2e0f9bcd8c0ce783a095cb825 SHA1 613c8d32773ae690e8b401df9026eaa8197f3139 SHA256 5f292d3a7cd87afd2a764cc42815bfe88ef1ebd8d153ef2756edc982ab965d80
DIST hpclj2600n.tar.gz 573671 RMD160 1fe753ff90babd57d6f5eb289a13fba2359494a2 SHA1 1acd29e423c0b0d8315f254190a02821c766e21f SHA256 54aa4648e986717f816a92f90d7c614924243c9279b9eec9246e94e0c539ee9c
-DIST km2430.tar.gz 929120 RMD160 2ec7981ab8df6cd7f5fbe20d589066a282af03cf SHA1 54690c45c60e088acd6c7a65ca3fa4c6885db992 SHA256 13c2ed97edf9e1e50521924639f4bcc18322759a30d75ee52c9a78aaf1a22162
+DIST km2430.tar.gz 929120 RMD160 cc33cd6da46d2484f9fb4119aa52fcfd867af749 SHA1 b68c60612dd206d4a4e8d61f5db8e2a2e3485781 SHA256 8c3b4ed1f4a582442cb3c64f4b9a94fe52fef19b999c860a6694fde87de30c9b
DIST m22dlicc.exe 634368 RMD160 392922135a3f517a76a2b5e8b7200c83e6104ef6 SHA1 4f2de3e9e5418361763805b76722cd5284543110 SHA256 1d57413f4c36941c64599dae2ac2b1f8a397e128796c2796a108be5b8fd282b3
DIST m23dlicc.exe 170496 RMD160 f72be93dfc5c8c9159c75d7204820f1305f47905 SHA1 d1c28538f15f0e4564eeb81d53a8cb35fe08109c SHA256 1416cda7e2e3496ff1d121c87dd8984ad1d16ed3396096f05f4919dafd445ae4
DIST sihp1000.tar.gz 50423 RMD160 5cd97ca6944d421df213420fc5d1e1572f85ec84 SHA1 edbcf61bf4071017be9dcc577e8fe6170de995a2 SHA256 7bdb5387419a880e32c9280b8d3878b08eb8fbd614237f164a9ae1e81bc2cff6
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-20060523.ebuild 2134 RMD160 12217934e02009bfef0f38d5ee8cc8b0696037bc SHA1 3ba25609ad04c5f6cba62b2bd6d8b2ede666c298 SHA256 ff4681817a0d4f1b7118f3b2ec9cb75895459770fb75a96c7e32920739f02fe5
-MD5 8c2ae61a592ab676a810662249427060 foo2zjs-20060523.ebuild 2134
-RMD160 12217934e02009bfef0f38d5ee8cc8b0696037bc foo2zjs-20060523.ebuild 2134
-SHA256 ff4681817a0d4f1b7118f3b2ec9cb75895459770fb75a96c7e32920739f02fe5 foo2zjs-20060523.ebuild 2134
-MISC ChangeLog 3860 RMD160 33fc747eccaa07356b224ed8eea5789e06331b4a SHA1 609e81db1c43dd1e78cef0e5bce0ea5ab763d954 SHA256 56fdabd854a855befc4b65fa7d5c6068c665a3074d6d81295da0f279ea7db11b
-MD5 1a9dc3ed2031286dee20e345b35e6ea5 ChangeLog 3860
-RMD160 33fc747eccaa07356b224ed8eea5789e06331b4a ChangeLog 3860
-SHA256 56fdabd854a855befc4b65fa7d5c6068c665a3074d6d81295da0f279ea7db11b ChangeLog 3860
+EBUILD foo2zjs-20060607.ebuild 2130 RMD160 24ee99567fcce3ca5393b981393ce59a45c81499 SHA1 5a6efa11ece37dcfccbb2160774b139e4759a54a SHA256 9e525bcc298e14a06fa752a465af455f489c7601d21f9cd20b6071489beb06e8
+MD5 c2819bbf21798438ff669e21a8cb7bb2 foo2zjs-20060607.ebuild 2130
+RMD160 24ee99567fcce3ca5393b981393ce59a45c81499 foo2zjs-20060607.ebuild 2130
+SHA256 9e525bcc298e14a06fa752a465af455f489c7601d21f9cd20b6071489beb06e8 foo2zjs-20060607.ebuild 2130
+MISC ChangeLog 4154 RMD160 eceeab9098ab645262d5150acbf720e0fe868b8c SHA1 dee4c6cb8759cf102966edbfc98efce4ffe0c3c3 SHA256 f1cc678896935d5201e3b5eaa9e577f06c234063d680c551bade425cd7580237
+MD5 b52b33b4a40966605186d9599ac181d5 ChangeLog 4154
+RMD160 eceeab9098ab645262d5150acbf720e0fe868b8c ChangeLog 4154
+SHA256 f1cc678896935d5201e3b5eaa9e577f06c234063d680c551bade425cd7580237 ChangeLog 4154
MISC metadata.xml 266 RMD160 71124c3803fd7ba3370f1b9b55b78d56c5e49201 SHA1 12efa221e1a3580f557896136ccece543c4dca39 SHA256 27d69d00958eb408ac3c397767f9104d5e85c85a977c094140a8169fc6750df7
MD5 6062bcaf60fde68c2418376f4cd91f3e metadata.xml 266
RMD160 71124c3803fd7ba3370f1b9b55b78d56c5e49201 metadata.xml 266
SHA256 27d69d00958eb408ac3c397767f9104d5e85c85a977c094140a8169fc6750df7 metadata.xml 266
-MD5 c603fb73806474f7e8b775eb33f83dc5 files/digest-foo2zjs-20060523 2242
-RMD160 eb6a55d6275dadc7911ea68a51799109e53048cd files/digest-foo2zjs-20060523 2242
-SHA256 099e1afdd1277eb725473d95740061046adabe91b26f90db2a693a1d0f397286 files/digest-foo2zjs-20060523 2242
+MD5 18527eed3e1c30ea833dfe4cb235db27 files/digest-foo2zjs-20060607 2242
+RMD160 c2722808532c3583ba72132fd9cc1addc2447f80 files/digest-foo2zjs-20060607 2242
+SHA256 fb20aec0c1c60f18a9d57177181d667a7578f0e9ef6a33ac04cc74a5ccc36532 files/digest-foo2zjs-20060607 2242
diff --git a/net-print/foo2zjs/files/digest-foo2zjs-20060523 b/net-print/foo2zjs/files/digest-foo2zjs-20060523
deleted file mode 100644
index ce7c248d86a9..000000000000
--- a/net-print/foo2zjs/files/digest-foo2zjs-20060523
+++ /dev/null
@@ -1,30 +0,0 @@
-MD5 cae0d20d3c1d57cd3953d9b335014294 cpplxp.exe 4799488
-RMD160 bcd5ceecca248c90a0d3e99dd55c6e1eedd4de6d cpplxp.exe 4799488
-SHA256 5f4c8b6f20ccf2d525f683847f5dc24bb4c7f58131d6704047d6c9a90d6895af cpplxp.exe 4799488
-MD5 9da58d08fe63b2a79c39223e51680e5a foo2zjs-20060523.tar.gz 917839
-RMD160 f306e9cdafb9a388e3100e68c881fb14f9c515bc foo2zjs-20060523.tar.gz 917839
-SHA256 f1b87ff6bc441a1f6d684010fa455085ff4c8792274f9cce3a34d800c68257dc foo2zjs-20060523.tar.gz 917839
-MD5 8e6b7cd62e411fb3333f33712c0cc954 hpclj2600n.tar.gz 573671
-RMD160 1fe753ff90babd57d6f5eb289a13fba2359494a2 hpclj2600n.tar.gz 573671
-SHA256 54aa4648e986717f816a92f90d7c614924243c9279b9eec9246e94e0c539ee9c hpclj2600n.tar.gz 573671
-MD5 304e9fd69db04a2f32b72178792cc2af km2430.tar.gz 929120
-RMD160 2ec7981ab8df6cd7f5fbe20d589066a282af03cf km2430.tar.gz 929120
-SHA256 13c2ed97edf9e1e50521924639f4bcc18322759a30d75ee52c9a78aaf1a22162 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-udevfwld-20060523.diff b/net-print/foo2zjs/files/foo2zjs-udevfwld-20060523.diff
deleted file mode 100644
index 2e72238c764b..000000000000
--- a/net-print/foo2zjs/files/foo2zjs-udevfwld-20060523.diff
+++ /dev/null
@@ -1,191 +0,0 @@
-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-01 17:23:50.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-01 17:19:43.000000000 +0200
-+++ foo2zjs/hplj1000 2006-06-01 17:23:50.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-01 17:19:43.000000000 +0200
-+++ foo2zjs/hplj10xx.rules 2006-06-01 17:26:00.000000000 +0200
-@@ -1,8 +1,5 @@
- #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"
--#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"
--#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"
--#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}="0517", NAME="usb/%k", SYMLINK="hplj1000%e", MODE="0666", RUN+="/sbin/foo2zjs-loadfw 1000"
-+KERNEL=="lp*", BUS="usb", SYSFS{idVendor}="03f0", SYSFS{idProduct}="1317", NAME="usb/%k", SYMLINK="hplj1005%e", MODE="0666", RUN+="/sbin/foo2zjs-loadfw 1005"
-+KERNEL=="lp*", BUS="usb", SYSFS{idVendor}="03f0", SYSFS{idProduct}="4117", NAME="usb/%k", SYMLINK="hplj1018%e", MODE="0666", RUN+="/sbin/foo2zjs-loadfw 1018"
-+KERNEL=="lp*", BUS="usb", SYSFS{idVendor}="03f0", SYSFS{idProduct}="2b17", NAME="usb/%k", SYMLINK="hplj1020%e", MODE="0666", RUN+="/sbin/foo2zjs-loadfw 1020"
-diff -Nupr foo2zjs.orig/Makefile foo2zjs/Makefile
---- foo2zjs.orig/Makefile 2006-06-01 17:23:05.000000000 +0200
-+++ foo2zjs/Makefile 2006-06-01 17:23:50.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-20060523.ebuild b/net-print/foo2zjs/foo2zjs-20060523.ebuild
deleted file mode 100644
index 1e3c2abc9255..000000000000
--- a/net-print/foo2zjs/foo2zjs-20060523.ebuild
+++ /dev/null
@@ -1,78 +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-20060523.ebuild,v 1.3 2006/06/04 13:57:44 genstef Exp $
-
-inherit eutils
-
-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://gentooexperimental.org/~genstef/dist/${P}.tar.gz
- http://foo2zjs.rkkda.com/sihp1000.tar.gz
- http://foo2zjs.rkkda.com/sihp1005.tar.gz
- http://foo2zjs.rkkda.com/sihp1018.tar.gz
- http://foo2zjs.rkkda.com/sihp1020.tar.gz
- http://foo2zjs.rkkda.com/km2430.tar.gz
- http://foo2hp.rkkda.com/hpclj2600n.tar.gz"
-RESTRICT="nomirror"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="cups foomaticdb usb"
-DEPEND="app-arch/unzip"
-RDEPEND="cups? ( net-print/cups )
- foomaticdb? ( net-print/foomatic-db-engine )
- net-print/foomatic-filters
- 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-20060523.diff
- epatch ${FILESDIR}/foo2zjs-udevfwld-20060523.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
- ./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
-}
-
-pkg_postinst() {
- rm -f ${ROOT}/etc/udev/rules.d/58-foo2zjs.rules
-}