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

Package-Manager: portage-2.1.1_rc1-r2

3 files changed, 65 insertions, 22 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/Manifest b/net-print/foo2zjs/Manifest
index 8186fb4a2a66..28889bebf74a 100644
--- a/net-print/foo2zjs/Manifest
+++ b/net-print/foo2zjs/Manifest
@@ -16,14 +16,14 @@ DIST sihp1000.tar.gz 50423 RMD160 5cd97ca6944d421df213420fc5d1e1572f85ec84 SHA1
 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-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
+EBUILD foo2zjs-20060607.ebuild 4337 RMD160 5384e8e5b907b946444a4ffe3392d31028907cd6 SHA1 4ec07b983b9722ec6846c8dc07d10bde2e0f18ba SHA256 826d0101eb6349b137124169dba100fd3655ff1cbbb419a38e9fbee8e250a33c
+MD5 a637298e9f1dde5ba12d51b9661452e1 foo2zjs-20060607.ebuild 4337
+RMD160 5384e8e5b907b946444a4ffe3392d31028907cd6 foo2zjs-20060607.ebuild 4337
+SHA256 826d0101eb6349b137124169dba100fd3655ff1cbbb419a38e9fbee8e250a33c foo2zjs-20060607.ebuild 4337
+MISC ChangeLog 4336 RMD160 6aa8085a72b5c2d9087aaad2d17ec1017874e838 SHA1 b99d44cd20c61e3d59cb7e6845ff941facdaae0b SHA256 9270d9ca98c0ed868b38b712147bda3733c80cbe88f43f3bb9211f2f1325b987
+MD5 50da1ac0346f70623d5566a978ea6fa0 ChangeLog 4336
+RMD160 6aa8085a72b5c2d9087aaad2d17ec1017874e838 ChangeLog 4336
+SHA256 9270d9ca98c0ed868b38b712147bda3733c80cbe88f43f3bb9211f2f1325b987 ChangeLog 4336
 MISC metadata.xml 266 RMD160 71124c3803fd7ba3370f1b9b55b78d56c5e49201 SHA1 12efa221e1a3580f557896136ccece543c4dca39 SHA256 27d69d00958eb408ac3c397767f9104d5e85c85a977c094140a8169fc6750df7
 MD5 6062bcaf60fde68c2418376f4cd91f3e metadata.xml 266
 RMD160 71124c3803fd7ba3370f1b9b55b78d56c5e49201 metadata.xml 266
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"
 }