Add FOO2ZJS_DEVICES variable support thanks to Thomas Kear <thomas.kear@gmail.com> in bug 139987

(Portage version: 2.1.1_rc1-r2)

2 files changed, 57 insertions, 14 deletions

diff --git a/net-print/foo2zjs/ChangeLog b/net-print/foo2zjs/ChangeLog
index b6e2509e2402..1a6638a85869 100644
--- a/net-print/foo2zjs/ChangeLog
+++ b/net-print/foo2zjs/ChangeLog
@@ -1,6 +1,11 @@
 # 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.16 2006/06/14 23:14:18 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/ChangeLog,v 1.17 2006/09/01 11:19:02 genstef Exp $
+
+  01 Sep 2006; Stefan Schweizer <genstef@gentoo.org>
+  foo2zjs-20060607.ebuild:
+  Add FOO2ZJS_DEVICES variable support thanks to Thomas Kear
+  <thomas.kear@gmail.com> in bug 139987
 
   14 Jun 2006; Stefan Schweizer <genstef@gentoo.org>
   -files/foo2zjs-udevfwld-20060523.diff,
diff --git a/net-print/foo2zjs/foo2zjs-20060607.ebuild b/net-print/foo2zjs/foo2zjs-20060607.ebuild
index 0a85852a5e18..040f0de7fbd2 100644
--- a/net-print/foo2zjs/foo2zjs-20060607.ebuild
+++ b/net-print/foo2zjs/foo2zjs-20060607.ebuild
@@ -1,25 +1,47 @@
 # 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-20060607.ebuild,v 1.1 2006/06/14 23:14:18 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/foo2zjs-20060607.ebuild,v 1.2 2006/09/01 11:19:02 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"
+SRC_URI="
+	http://gentooexperimental.org/~genstef/dist/${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 udev usb"
+IUSE="cups foomaticdb udev 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 )
@@ -50,7 +72,23 @@ src_compile() {
 	sed -i -e "s/.*wget.*//" \
 		-e "s/error \"Couldn't dow.*//" getweb
 	# unpack files
-	./getweb all
+	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"
 }