Version bump and removing old version because of digest failure thanks to psk31 in the forums, Markus Rothe <corsair@gentoo.org> and Erik Reimann for testing and thanks to Seth Robertson <in-gentoo@baka.org> for reporting in bug 87351

(Portage version: 1.585-cvs)

5 files changed, 26 insertions, 19 deletions

diff --git a/net-print/foo2zjs/ChangeLog b/net-print/foo2zjs/ChangeLog
index 22a65d2648e2..c22b529faa71 100644
--- a/net-print/foo2zjs/ChangeLog
+++ b/net-print/foo2zjs/ChangeLog
@@ -1,6 +1,15 @@
 # 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.3 2005/02/02 20:25:12 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/ChangeLog,v 1.4 2005/04/05 19:26:10 genstef Exp $
+
+*foo2zjs-20050319 (05 Apr 2005)
+
+  05 Apr 2005; Stefan Schweizer <genstef@gentoo.org>
+  -foo2zjs-20041030.ebuild, +foo2zjs-20050319.ebuild:
+  Version bump and removing old version because of digest failure thanks to
+  psk31 in the forums, Markus Rothe <corsair@gentoo.org> and Erik Reimann for
+  testing and thanks to Seth Robertson <in-gentoo@baka.org> for reporting in
+  bug 87351
 
   02 Feb 2005; Stefan Schweizer <genstef@gentoo.org>
   foo2zjs-20041030.ebuild:
diff --git a/net-print/foo2zjs/Manifest b/net-print/foo2zjs/Manifest
index 88af4d9a5c5d..2d715a7fa63d 100644
--- a/net-print/foo2zjs/Manifest
+++ b/net-print/foo2zjs/Manifest
@@ -1,6 +1,6 @@
-MD5 d60f7f4ed3eadb3322065f2fb16c4e41 foo2zjs-20041030.ebuild 1673
-MD5 b8750ccb65fdb77815100c6194f8e0d3 ChangeLog 736
+MD5 eb92a44042f87e504a745baa0e16afea foo2zjs-20050319.ebuild 1569
+MD5 cb2d5b1730dd21a79f30c49f1c2400d9 ChangeLog 1120
 MD5 6062bcaf60fde68c2418376f4cd91f3e metadata.xml 266
-MD5 1992ccc4c1cd2c3886e8f2eab0984ad9 files/digest-foo2zjs-20041030 365
+MD5 156dfe6cef969d11cc59957ad027a51e files/digest-foo2zjs-20050319 238
 MD5 e5f349ce9616aa37a291ae69beefc357 files/foo2zjs-Makefile.patch 3324
 MD5 379e40f8651bfdf8764f4afbc9594b41 files/hp-printer-udev.patch 767
diff --git a/net-print/foo2zjs/files/digest-foo2zjs-20041030 b/net-print/foo2zjs/files/digest-foo2zjs-20041030
deleted file mode 100644
index df7ef7211768..000000000000
--- a/net-print/foo2zjs/files/digest-foo2zjs-20041030
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 31fe018b4c5e258aff60cbd320a42f02 foo2zjs-20041030.tar.gz 867707
-MD5 d680f447a416c5f9041f27c0a1df57a0 m23dlicc.exe 170496
-MD5 3b78a08aa968b4c1ed591947721d3e47 m22dlicc.exe 634368
-MD5 cae0d20d3c1d57cd3953d9b335014294 cpplxp.exe 4799488
-MD5 428274e8060e830aeaf1acf06f10a398 lj1005hostbased-en.exe 3014659
-MD5 70bc3dce0cfca0e85d2bb618c9075103 lj1488en.exe 12447260
diff --git a/net-print/foo2zjs/files/digest-foo2zjs-20050319 b/net-print/foo2zjs/files/digest-foo2zjs-20050319
new file mode 100644
index 000000000000..63deb6177369
--- /dev/null
+++ b/net-print/foo2zjs/files/digest-foo2zjs-20050319
@@ -0,0 +1,4 @@
+MD5 36ca0680a7b22c9b5cd1f8b34ab48cd8 foo2zjs-20050319.tar.gz 972297
+MD5 d680f447a416c5f9041f27c0a1df57a0 m23dlicc.exe 170496
+MD5 3b78a08aa968b4c1ed591947721d3e47 m22dlicc.exe 634368
+MD5 cae0d20d3c1d57cd3953d9b335014294 cpplxp.exe 4799488
diff --git a/net-print/foo2zjs/foo2zjs-20041030.ebuild b/net-print/foo2zjs/foo2zjs-20050319.ebuild
index 8e85fefcf7fd..1573f6bb382d 100644
--- a/net-print/foo2zjs/foo2zjs-20041030.ebuild
+++ b/net-print/foo2zjs/foo2zjs-20050319.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/foo2zjs-20041030.ebuild,v 1.3 2005/02/02 20:25:12 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/foo2zjs-20050319.ebuild,v 1.1 2005/04/05 19:26:10 genstef Exp $
 
 inherit eutils flag-o-matic
 
@@ -9,9 +9,7 @@ HOMEPAGE="http://foo2zjs.rkkda.com/"
 SRC_URI="mirror://gentoo/${P}.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
-		ftp://192.151.53.86/pub/softlib/software2/COL2222/lj-10067-2/lj1005hostbased-en.exe
-		ftp://ftp.hp.com/pub/softlib/software1/lj1488/lj-1145-2/lj1488en.exe"
+		ftp://ftp.minolta-qms.com/pub/crc/out_going/windows/cpplxp.exe"
 RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
@@ -42,6 +40,7 @@ src_compile() {
 
 	# 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
 
@@ -49,14 +48,15 @@ src_compile() {
 }
 
 src_install() {
-	use foomaticdb && dodir /usr/share/foomatic/db/source
+	useq foomaticdb && dodir /usr/share/foomatic/db/source
 
-	use cups && dodir /usr/share/cups/model
+	useq cups && dodir /usr/share/cups/model
 
 	make DESTDIR=${D} install \
 		|| die "make install failed"
 
-	use usb && \
-		( make DESTDIR=${D} install-hotplug \
-		|| die "make install-hotplug failed" )
+	if useq usb; then
+		make DESTDIR=${D} install-hotplug \
+			|| die "make install-hotplug failed"
+	fi
 }