virtualize udev dependency, install rules via udev.eclass

Package-Manager: portage-2.1.11.33/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

5 files changed, 28 insertions, 19 deletions

diff --git a/net-wireless/spectools/ChangeLog b/net-wireless/spectools/ChangeLog
index 4b69cf0f78b1..cc5027d444c5 100644
--- a/net-wireless/spectools/ChangeLog
+++ b/net-wireless/spectools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/spectools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/spectools/ChangeLog,v 1.22 2012/11/21 10:10:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/spectools/ChangeLog,v 1.23 2012/12/11 17:47:41 axs Exp $
+
+  11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> spectools-2009.02.1.ebuild,
+  spectools-2011.08.1-r2.ebuild, spectools-9999.ebuild:
+  virtualize udev dependency, install rules via udev.eclass
 
   21 Nov 2012; Agostino Sarubbo <ago@gentoo.org> spectools-2011.08.1-r2.ebuild:
   Stable for x86, wrt bug #441502
diff --git a/net-wireless/spectools/Manifest b/net-wireless/spectools/Manifest
index 3a759d55214d..4f7ed0378dc0 100644
--- a/net-wireless/spectools/Manifest
+++ b/net-wireless/spectools/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX spectools-2009.02.1-libusb-compat.patch 674 SHA256 68c255cc43fdd00951cea541ae5f9f9de57993a4c311dd5c85b1a20d874f2ea1 SHA512 ba140ab5a3ebff39a9351759975de40f3f802ee72130c123c5d140fede5e48df9efa2534231b4ccb8d8d2ee7d36f3aaeba3907dc40b3aa81999de76e45df21ad WHIRLPOOL 7006815dd97d1f142476dbcabff50a784d19d67a02f645383959fdcbcd171581bcc19862f753b584dd55820b54eda4acc642c432032188a2d53041e0f049215f
 AUX spectools-2009.02.1-udev-rules.patch 1757 SHA256 5207860a766f150057e57dd30f60abb71eda41d6d3a606df9f48e6a5dfd7564f SHA512 bfd9734c8b34545dcc6a5a253522c2918884bfec22050425bf854302779fde71ce70be0207f8bef022bd735ae1278e27cbbef00795c7e4e1abf4eec40dfec09a WHIRLPOOL 7a057aba923edab62bf6a474ce684e85469860deb648a445fd0bc031fa9cbff4663fa080e826a58cd10c84fcc6686c9ef6f622866392cfb9629631c884cf692d
 DIST spectools-2009-02-R1.tar.gz 183877 SHA256 5b4d2dfe5bd1ff79b58ceec83aa9531866a06d7f60a3fd95eb5de7bbd96c48b5
@@ -6,10 +9,17 @@ DIST wispy-tools-2006-03-R1.tar.gz 135030 SHA256 8325850768e55a92b9c77de741c086a
 DIST wispy-tools-2006-09-R1.tar.gz 135474 SHA256 41b25d1d63f01f596925dbd39389668b9d4169b28e5b8a2e00e0ac66574d330f
 EBUILD spectools-2006.03.1.ebuild 1200 SHA256 d733418f162cbc56be0e2c84bf8bccd060c4b6179c8c1bb425c05cb7e57533e2 SHA512 74d484f9f566b89fc3758cfc6b7454bba010195d45ab1bb61f79dba0bc431485dde45c54c422c5c098c7bb19ed79b352a908076a004f94062c93b1dc48dc9bf9 WHIRLPOOL 8d0fa119b907a7f1062739171281035d437a4787432f396cf3fe7351d482fe4e90405b4984fa70bd8dfb7c24666d4258f58a222b427a298309a5bba4bb8fb0df
 EBUILD spectools-2006.09.1.ebuild 1204 SHA256 ee40e1a609bbfe89672dd8252001fd11841d8d8d5b17eee2ef4a573fb67549fc SHA512 c21e2af4c91f67275ffdca5c80464ca15eb2f8174770bbb52501fbae234ec9c294934c0e58c439f4c91c77d3ee6168fe423f037eeef5e3098f108c2564b27103 WHIRLPOOL 9793a58e2961738efd3573ee7ece3d062f65584c31ee87ce1ed03dbf7bb4bc9f2b78bd79c83b62ce61247417df9cbb6043f6a495bfae8570251e317e12230a40
-EBUILD spectools-2009.02.1.ebuild 1658 SHA256 aa9cfb3fede2e213e7863125dd376064a3eff20a5da9702b2bd29507fefc6314 SHA512 1d62bc01c4bf0ee0f0f50fe9634b1a45a782859739e8ae7fd7145a7450cb4650ec8cf107b1d6e8d341579e3df6224c1850f6b336e26f26c86331b8c775b2f251 WHIRLPOOL db6c601007b1de0afa8a69e4a6bf9fa445e62d06943763cd9712f02d40f9d4d35a9657d6e76eebc54a7569c7b5329a4372b4ef95ca8d00b5839725ec830853cd
+EBUILD spectools-2009.02.1.ebuild 1669 SHA256 a84eb895eceb3b00ba077e20341a857f8233a58d86522f4215ce8a7d28762e33 SHA512 97f8fc8a15952ebeaa681007a219b4971e53b8a6bfefb5df5991c238acf50f1f08004b9ea2b78f6ea83746db4f37b1ea70893b966cb5f0bc53cfd445b71fcd3d WHIRLPOOL 09865a5d5b927552171e44353fe66804a659eba3e1ac7bf8c4e4552a55117a57a89888b3e7583c3649954dcd76d2421188cad1969d5a12f3a484d26ba6896937
 EBUILD spectools-2011.08.1-r1.ebuild 1637 SHA256 fbc9115cf7f953cceefb0ac9479ee6f5dbb9d57c89f2e63665615d5e0f2b384c SHA512 93bec680248f1a8c7bf03e6b0cbe16bb824ce4122147693f28342c9c8c205093890c9812b5d8e45fb99f5a565ce235c891ef3f64400dd2f2846fd2153be12133 WHIRLPOOL 0fa4e1c1e3f10ae3edd3d85aa77a148fe867229bbf0a4f143c6713687f45f66f3fbcf1285311deaba04be0d41a274bf218b0d001ded70b15e98272ffea961154
-EBUILD spectools-2011.08.1-r2.ebuild 1762 SHA256 9db9a2e58ddfc20bc724868c37cf585125a96f6a9d7af10b0af27ae2338f7153 SHA512 ea3013255cdb03325479c916d82befb34841407c98b57ca673f6b591dfd2cc09735b2f95dcbd9fda63f17b30eece08f9c11edf8697a8b2268589e5c9bd693f5e WHIRLPOOL 06795bc03821090ff13ef20a69ca3dd399a3de9aa9bd7b41c1792967a7c3421e412cefd6bd39c6fc71601c271da2dc6b6de43ac175878af58182a73ddfd61c8e
+EBUILD spectools-2011.08.1-r2.ebuild 1634 SHA256 39e766c46bee7b983aa828becb884ff8070fa47669be2ff20b53527d7c89cbe4 SHA512 17458472e47d11abd32c684599f13754282fbd9e812930be920909d1700fd392235a6061e055d0dad0f152b8b9f741f714f4131cd9be66c402ff3a14c8123aa7 WHIRLPOOL 738604bfb27abd11ab93d15ed6d046b22a67369aaf307b1445e30ca8a2357c08ab43f6f22651e37e0f29a6008978e6433a720c848aeca23018f209309675e085
 EBUILD spectools-2011.08.1.ebuild 1290 SHA256 9708f8139e5d1eeb4d51915d88b2e8f0ff50d80305720d18b655822ac3c6b5d2 SHA512 b1ad47c20d7ad28193db4fdbe1719575ef47b49e85277864da1ae5fc8fc6a190805cb21c9e50fed05ee5826e42ac55d4a0edac7db3ffcb5c686fe50a0857e97f WHIRLPOOL 20d5f8ea9d1bc68aa11575b964df846c1a4b4a67ebc62a4697fdd696ad9ab9ea57a07318b2499830ea62259d4471a8dd0172a8eb7e8bd1b08e737fc43d54c1fe
-EBUILD spectools-9999.ebuild 1785 SHA256 6103cd153ec69d87f5adae3023252472893965461e8e5a434b2e6b8838df1374 SHA512 a56692253896982d6082b4c25dee1ac0046707cc868ff258e74fc9a3ab1c6ec91fdd3513f0ad8d1945243cc9ec56cf255edef70932f558abaa54a5227b31b1cc WHIRLPOOL 82b16dd2c1d097f7ba6d2d6a7cbaf763f665ce10b41c558efbdd30680e9de05efe1dc5bb080e7f1b9326ddf014e8952e951be387004b371515005a4aecc5004a
-MISC ChangeLog 3672 SHA256 9e989457068f54076696880b76943636a107f0239eadb25ae73d1d516a204de9 SHA512 3b2895fd9f2884c9adf0f256315c52d039fcf3ee62b70497f18112579954be7779a3cb2074099f361c3e2e076d302415cfbd6b7986a3cd32187820442a57bc9c WHIRLPOOL 6d949ddf43badd079b340a1b0c8e6251044c6a5a732888fb6ef16c9a1cc0e38ca16bf46a425c561ae942dbff48696c301e679df925be98a211c84eb00c4fa711
+EBUILD spectools-9999.ebuild 1651 SHA256 ae77b007a2be43645f90fdaaca4aa30df0ef280ef2a4539ba322019ebbc12949 SHA512 cd10d1ea921bb8b4ce7bdc6b8a2017684b0870e64eed13c9bec75919aab4c809ec2316341789e70298f9eab8d7c55ef0a98f7f36cdfb9dd0573c0d506fdf6459 WHIRLPOOL 052966a47dddd172a4895ebf1505a7d49c930a12dbd85b1f28f2bbb2dd197f4bdfc97422332c2f9539bbe390c28e8bac3960026fb3790eae189648eb0824d94d
+MISC ChangeLog 3866 SHA256 5e918bb9a801701520dd32c3d2f48ca1833f231533e193f4f75312dec101e39e SHA512 7f59019c8f82a3d47e3ae8b21a7e65b5dd1962ffdb3f9f50b921573b6de7dd74411f911b2f678a4903698e437751510b94317b2d5d05021b6176fef88d4f5ada WHIRLPOOL 785f611d454d4a2636e2bf392851b46b827115ac59d939bbd655978ad8fb6070c84d082a27ff9ed5ca9efeb25120bf372e85e90baec46519190e30210b6164e9
 MISC metadata.xml 886 SHA256 71597fc30a100f2dcf9fbd3cf7e0aab5eddf577e193bfd435aa79ac37e8d38ea SHA512 647b7c33d82ffb048af410ca2c3fe1c9db46b5aabdf4e6d8755375293439691573c3d6888ba3e49f7790aea0d67447a946d1d61ea33326f6e3a86e0d25b318e0 WHIRLPOOL cdb6252e06a88926b572d159eb8a233659ba64d354ab0ba2a4377d3994a2080a0ebe88908429f6d73de1319217a3538140f2458a9e89679a1e15557bebc04ccc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlDHccwACgkQ2ugaI38ACPAlZAEArShw/m2ZJn9MiwlP6/WDSn5t
+LlSj4d2WmLJgy0RWuXwA/R92kRmnmS3OOYGA1bh61jT4RXgfc6b+qP6XWj/M51y9
+=z+ml
+-----END PGP SIGNATURE-----
diff --git a/net-wireless/spectools/spectools-2009.02.1.ebuild b/net-wireless/spectools/spectools-2009.02.1.ebuild
index 38b3f66108c5..833fcbaf2d65 100644
--- a/net-wireless/spectools/spectools-2009.02.1.ebuild
+++ b/net-wireless/spectools/spectools-2009.02.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/spectools/spectools-2009.02.1.ebuild,v 1.1 2012/02/19 22:27:11 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/spectools/spectools-2009.02.1.ebuild,v 1.2 2012/12/11 17:47:41 axs Exp $
 
 inherit eutils
 
@@ -24,7 +24,8 @@ DEPEND="=virtual/libusb-0*
 		gtk? ( =x11-libs/gtk+-2* )"
 # Maemo: Add hildon and bbus
 RDEPEND="${DEPEND}
-		>=sys-fs/udev-114"
+		virtual/udev
+		!<sys-fs/udev-114"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-wireless/spectools/spectools-2011.08.1-r2.ebuild b/net-wireless/spectools/spectools-2011.08.1-r2.ebuild
index fb1f4e5c0dcb..6b9997c14682 100644
--- a/net-wireless/spectools/spectools-2011.08.1-r2.ebuild
+++ b/net-wireless/spectools/spectools-2011.08.1-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/spectools/spectools-2011.08.1-r2.ebuild,v 1.5 2012/11/21 10:10:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/spectools/spectools-2011.08.1-r2.ebuild,v 1.6 2012/12/11 17:47:41 axs Exp $
 
 EAPI=4
-inherit toolchain-funcs
+inherit udev toolchain-funcs
 
 MY_PN=${PN}
 MY_PV=${PV/\./-}
@@ -61,10 +61,7 @@ src_install() {
 	use ncurses && dobin spectool_curses
 	use gtk && dobin spectool_gtk
 
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	insinto "${udevdir}"/rules.d
-	doins 99-wispy.rules
+	udev_dorules 99-wispy.rules
 	dodoc README
 
 	#if use maemo; then
diff --git a/net-wireless/spectools/spectools-9999.ebuild b/net-wireless/spectools/spectools-9999.ebuild
index ee2aa9076ee6..ee62ce866927 100644
--- a/net-wireless/spectools/spectools-9999.ebuild
+++ b/net-wireless/spectools/spectools-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/spectools/spectools-9999.ebuild,v 1.6 2012/08/12 08:43:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/spectools/spectools-9999.ebuild,v 1.7 2012/12/11 17:47:41 axs Exp $
 
 EAPI=4
-inherit toolchain-funcs
+inherit udev toolchain-funcs
 
 MY_PN=${PN}
 MY_PV=${PV/\./-}
@@ -61,10 +61,7 @@ src_install() {
 	use ncurses && dobin spectool_curses
 	use gtk && dobin spectool_gtk
 
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	insinto "${udevdir}"/rules.d
-	doins 99-wispy.rules
+	udev_dorules 99-wispy.rules
 	dodoc README
 
 	#if use maemo; then