Drop hotplug support in favour of udev, bug 158114, also add missing vim depend thanks to Patrice Bouvard <p.bouvard@myown.be> in bug 157316 and fix digest, thanks to Slawomir Gasiorowski <sgasiorowski@gmail.com> in bug 157411

(Portage version: 2.1.2_rc3-r5)

3 files changed, 23 insertions, 26 deletions

diff --git a/net-print/foo2zjs/ChangeLog b/net-print/foo2zjs/ChangeLog
index 376dd4fb92f0..3f50aa694eef 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.18 2006/12/03 15:25:36 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/ChangeLog,v 1.19 2006/12/14 18:50:28 genstef Exp $
+
+  14 Dec 2006; Stefan Schweizer <genstef@gentoo.org>
+  -files/foo2zjs-Makefile-20060523.diff,
+  -files/foo2zjs-udevfwld-20060607.diff, -foo2zjs-20060607.ebuild,
+  foo2zjs-20061130.ebuild:
+  Drop hotplug support in favour of udev, bug 158114, also add missing vim
+  depend thanks to Patrice Bouvard <p.bouvard@myown.be> in bug 157316 and fix
+  digest, thanks to Slawomir Gasiorowski <sgasiorowski@gmail.com> in bug
+  157411
 
 *foo2zjs-20061130 (03 Dec 2006)
 
diff --git a/net-print/foo2zjs/files/digest-foo2zjs-20061130 b/net-print/foo2zjs/files/digest-foo2zjs-20061130
index ec06f2927bf3..5bd01eecdb5e 100644
--- a/net-print/foo2zjs/files/digest-foo2zjs-20061130
+++ b/net-print/foo2zjs/files/digest-foo2zjs-20061130
@@ -4,12 +4,12 @@ SHA256 5f4c8b6f20ccf2d525f683847f5dc24bb4c7f58131d6704047d6c9a90d6895af cpplxp.e
 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 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
diff --git a/net-print/foo2zjs/foo2zjs-20061130.ebuild b/net-print/foo2zjs/foo2zjs-20061130.ebuild
index c61814a45e47..b06524b92e98 100644
--- a/net-print/foo2zjs/foo2zjs-20061130.ebuild
+++ b/net-print/foo2zjs/foo2zjs-20061130.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/foo2zjs-20061130.ebuild,v 1.2 2006/12/14 18:50:28 genstef Exp $
 
 inherit eutils
 
@@ -36,18 +36,18 @@ SRC_URI="
 RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="cups foomaticdb udev usb
+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"
+DEPEND="app-arch/unzip
+	app-editors/vim"
 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 ) )"
+	sys-fs/udev"
 KEYWORDS="~x86 ~amd64 ~ppc"
 S=${WORKDIR}/${PN}
 
@@ -98,18 +98,6 @@ src_install() {
 
 	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
+	emake DESTDIR=${D} install install-udev \
+		|| die "emake install failed"
 }