Use id-matching instead of string-matching in the udev-rule

(Portage version: 2.1_pre10-r2)
 (Signed Manifest commit)

3 files changed, 18 insertions, 102 deletions

diff --git a/net-print/foo2zjs/Manifest b/net-print/foo2zjs/Manifest
index c9f571c33482..885c13a31cd0 100644
--- a/net-print/foo2zjs/Manifest
+++ b/net-print/foo2zjs/Manifest
@@ -9,10 +9,10 @@ AUX foo2zjs-Makefile.patch 3324 RMD160 e507ec81dd2bf7587c70c2c0a8204816fa9e58f2
 MD5 e5f349ce9616aa37a291ae69beefc357 files/foo2zjs-Makefile.patch 3324
 RMD160 e507ec81dd2bf7587c70c2c0a8204816fa9e58f2 files/foo2zjs-Makefile.patch 3324
 SHA256 aa346d86973a900387b2eda63412d8ec30f2ea001ae998b8a20e947566ce7b4a files/foo2zjs-Makefile.patch 3324
-AUX foo2zjs-udevfwld-20060501.diff 6474 RMD160 626f6821ff6ff98d3370da47b4432d0f25194e91 SHA1 c27af2395c88643fb7416c4da816a00d23670aa4 SHA256 434a000e4f57fd6c204cf9fd90866abb82c49479009275f98e645889a1a7df17 size 6474
-MD5 45f0cba9a41ab267752bfde8e634c31c files/foo2zjs-udevfwld-20060501.diff 6474
-RMD160 626f6821ff6ff98d3370da47b4432d0f25194e91 files/foo2zjs-udevfwld-20060501.diff 6474
-SHA256 434a000e4f57fd6c204cf9fd90866abb82c49479009275f98e645889a1a7df17 files/foo2zjs-udevfwld-20060501.diff 6474
+AUX foo2zjs-udevfwld-20060501.diff 6434 RMD160 447a59c789dc3adf1290739379a875592a3cb4b9 SHA1 ce4faa7a9d77dcfd6c112172d87ff5293049f770 SHA256 8aff48612ebed81d1618fcb44f14db62b45382fe4e0c632afbb93b4fa997e440 size 6434
+MD5 df742c3e72c50e6e9647daa2580e7b2b files/foo2zjs-udevfwld-20060501.diff 6434
+RMD160 447a59c789dc3adf1290739379a875592a3cb4b9 files/foo2zjs-udevfwld-20060501.diff 6434
+SHA256 8aff48612ebed81d1618fcb44f14db62b45382fe4e0c632afbb93b4fa997e440 files/foo2zjs-udevfwld-20060501.diff 6434
 AUX hp-printer-udev.patch 767 RMD160 de03125248e084187e93c8657b7bc6866f8dc2db SHA1 dd2e7d44ea85378687fcf0d70b3893b6ba09f538 SHA256 543865bf58c721e747bd9a38d95f5b477fd37b93bef05b2fa1df79c8cafe7e71 size 767
 MD5 379e40f8651bfdf8764f4afbc9594b41 files/hp-printer-udev.patch 767
 RMD160 de03125248e084187e93c8657b7bc6866f8dc2db files/hp-printer-udev.patch 767
@@ -26,14 +26,14 @@ EBUILD foo2zjs-20050319.ebuild 1569 RMD160 57aee4bd87cc7000b8421f71891b97eb00ba8
 MD5 dd5a53f7b7c08325d45369e7c377f992 foo2zjs-20050319.ebuild 1569
 RMD160 57aee4bd87cc7000b8421f71891b97eb00ba8225 foo2zjs-20050319.ebuild 1569
 SHA256 4411b1ecfd3ebb4ea803cd9983ff810708ba871cda6c682707099bb8e982856f foo2zjs-20050319.ebuild 1569
-EBUILD foo2zjs-20060501.ebuild 1896 RMD160 43baa13258b1805bb94f237cb5afac719e5584ef SHA1 1d89ccd1d99bbf6c440f5af73bbe50a40e8f3fbf SHA256 a6d72f0146e3b674dd1bf7199c4f0c90a675b489082890c7cb78fbe96c59273d size 1896
-MD5 4b4fbc9232beda8e5fb01ec99244ede8 foo2zjs-20060501.ebuild 1896
-RMD160 43baa13258b1805bb94f237cb5afac719e5584ef foo2zjs-20060501.ebuild 1896
-SHA256 a6d72f0146e3b674dd1bf7199c4f0c90a675b489082890c7cb78fbe96c59273d foo2zjs-20060501.ebuild 1896
-MISC ChangeLog 2789 RMD160 2aa592b5e54fc95018d0c2525ba4a68ee691eaa2 SHA1 4fbfad7a31a7e936fea9e3f40104c5b47d809fd1 SHA256 00e9929d27828656ef96422b5800509d85727aa0d6f85145f22c557a41270f7b size 2789
-MD5 fbbe5d7d4f385fdb21316c0c968e0049 ChangeLog 2789
-RMD160 2aa592b5e54fc95018d0c2525ba4a68ee691eaa2 ChangeLog 2789
-SHA256 00e9929d27828656ef96422b5800509d85727aa0d6f85145f22c557a41270f7b ChangeLog 2789
+EBUILD foo2zjs-20060501-r1.ebuild 1899 RMD160 52dd4ec487a7d8fc798d88c1d6b3e80f925d9690 SHA1 62e6214e183b383e671d32a4d63f447f55f22e50 SHA256 5445ed6e9b90ff11d5f93d029c7e70d50c68d94b026328fe7abdecb6cc0c78c5 size 1899
+MD5 a4a2fd7e46cb373338a7d170b07b7dd0 foo2zjs-20060501-r1.ebuild 1899
+RMD160 52dd4ec487a7d8fc798d88c1d6b3e80f925d9690 foo2zjs-20060501-r1.ebuild 1899
+SHA256 5445ed6e9b90ff11d5f93d029c7e70d50c68d94b026328fe7abdecb6cc0c78c5 foo2zjs-20060501-r1.ebuild 1899
+MISC ChangeLog 3038 RMD160 96495b0d3225fed3e2bde9361a9494cf95b458aa SHA1 8811f9799c0569599eee5db261ed154ae1e0628b SHA256 b6d3695d51a1b2aa9f4c5ca0bdf504d06c3cee896415fd3777e5941e6acb2970 size 3038
+MD5 b17133dbd465211adbe9f1a29af55c53 ChangeLog 3038
+RMD160 96495b0d3225fed3e2bde9361a9494cf95b458aa ChangeLog 3038
+SHA256 b6d3695d51a1b2aa9f4c5ca0bdf504d06c3cee896415fd3777e5941e6acb2970 ChangeLog 3038
 MISC metadata.xml 266 RMD160 71124c3803fd7ba3370f1b9b55b78d56c5e49201 SHA1 12efa221e1a3580f557896136ccece543c4dca39 SHA256 27d69d00958eb408ac3c397767f9104d5e85c85a977c094140a8169fc6750df7 size 266
 MD5 6062bcaf60fde68c2418376f4cd91f3e metadata.xml 266
 RMD160 71124c3803fd7ba3370f1b9b55b78d56c5e49201 metadata.xml 266
@@ -41,13 +41,13 @@ SHA256 27d69d00958eb408ac3c397767f9104d5e85c85a977c094140a8169fc6750df7 metadata
 MD5 dd27fb250c558455c90417663cc08326 files/digest-foo2zjs-20050319 716
 RMD160 47b7beefdab4a00c93773b0412bfeecb03391715 files/digest-foo2zjs-20050319 716
 SHA256 adf24cf35e477ec7eb82b210c5b7d35bf833be6dc21e9eebb94930e740333d38 files/digest-foo2zjs-20050319 716
-MD5 421b1789b380fe599c86d0d7ced4c5c1 files/digest-foo2zjs-20060501 901
-RMD160 4d7a06a6acc4fc6c8f4db82269d6f123f51f44d9 files/digest-foo2zjs-20060501 901
-SHA256 d994493b84fabaab6f49a7a80566f4f0d4cba77511b0deb7b397f33457291e8e files/digest-foo2zjs-20060501 901
+MD5 421b1789b380fe599c86d0d7ced4c5c1 files/digest-foo2zjs-20060501-r1 901
+RMD160 4d7a06a6acc4fc6c8f4db82269d6f123f51f44d9 files/digest-foo2zjs-20060501-r1 901
+SHA256 d994493b84fabaab6f49a7a80566f4f0d4cba77511b0deb7b397f33457291e8e files/digest-foo2zjs-20060501-r1 901
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEWJm4NJowsmZ/PzARAhI3AKDB/lLADfPC/8I9CCmHHwDJErJMjgCeOUUh
-Aakjw96j32fR/ksz+glsOss=
-=KYCo
+iD8DBQFEWfi4NJowsmZ/PzARAi50AKCza8sIryNYq/6v8y/mTCXtgEJhYwCg0eQy
+uZqh7Yird6FNwHLvWvtsQyA=
+=kUY6
 -----END PGP SIGNATURE-----
diff --git a/net-print/foo2zjs/files/digest-foo2zjs-20060501 b/net-print/foo2zjs/files/digest-foo2zjs-20060501
deleted file mode 100644
index 90734e68c873..000000000000
--- a/net-print/foo2zjs/files/digest-foo2zjs-20060501
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 cae0d20d3c1d57cd3953d9b335014294 cpplxp.exe 4799488
-RMD160 bcd5ceecca248c90a0d3e99dd55c6e1eedd4de6d cpplxp.exe 4799488
-SHA256 5f4c8b6f20ccf2d525f683847f5dc24bb4c7f58131d6704047d6c9a90d6895af cpplxp.exe 4799488
-MD5 d3968d03f17cf514fc98c4a0a00c2497 foo2zjs-20060501.tar.gz 2127232
-RMD160 39854302ad5ec6e0f0a60c51623a62f7294ef263 foo2zjs-20060501.tar.gz 2127232
-SHA256 160ee980736eb65daebc90c8fa79fe3648084b82375ea6dfb1d01dd0d7391800 foo2zjs-20060501.tar.gz 2127232
-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
diff --git a/net-print/foo2zjs/foo2zjs-20060501.ebuild b/net-print/foo2zjs/foo2zjs-20060501.ebuild
deleted file mode 100644
index d0848e4a2133..000000000000
--- a/net-print/foo2zjs/foo2zjs-20060501.ebuild
+++ /dev/null
@@ -1,72 +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-20060501.ebuild,v 1.1 2006/05/03 11:36:52 genstef Exp $
-
-inherit eutils flag-o-matic
-
-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://dev.gentoo.org/~genstef/files/dist/${P}.tar.gz"
-RESTRICT="nomirror"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="cups foomaticdb usb"
-DEPEND="app-arch/unzip
-	dev-lang/perl"
-RDEPEND="cups? ( net-print/cups )
-	foomaticdb? ( net-print/foomatic )
-	usb? ( || ( sys-fs/udev sys-apps/hotplug ) )"
-KEYWORDS="~x86 ~amd64"
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	# link getweb files in ${S} to get unpacked
-	for i in m23dlicc.exe m22dlicc.exe cpplxp.exe
-	do
-		ln -s ${DISTDIR}/${i} ${S}
-	done
-
-	cd ${S}
-	epatch ${FILESDIR}/foo2zjs-Makefile-20060501.diff
-	epatch ${FILESDIR}/foo2zjs-udevfwld-20060501.diff
-}
-
-src_compile() {
-	emake getweb || die "Failed building getweb script"
-
-	# 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
-
-	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 ${ROOT}/etc/udev/rules.d/58-foo2zjs.rules
-}