virtualize udev by using udev.eclass to find udevdir

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

4 files changed, 17 insertions, 21 deletions

diff --git a/media-tv/v4l-utils/ChangeLog b/media-tv/v4l-utils/ChangeLog
index 7573ac7db6b1..e2cd4d44f2fe 100644
--- a/media-tv/v4l-utils/ChangeLog
+++ b/media-tv/v4l-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/v4l-utils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-utils/ChangeLog,v 1.28 2012/12/05 21:05:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-utils/ChangeLog,v 1.29 2012/12/11 16:44:17 axs Exp $
+
+  11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> v4l-utils-0.8.8-r1.ebuild,
+  v4l-utils-0.8.9.ebuild:
+  virtualize udev by using udev.eclass to find udevdir
 
   05 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   v4l-utils-0.8.9.ebuild:
diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index 87915cbc09d3..8973baab0a7a 100644
--- a/media-tv/v4l-utils/Manifest
+++ b/media-tv/v4l-utils/Manifest
@@ -3,18 +3,14 @@ Hash: SHA256
 
 DIST v4l-utils-0.8.8.tar.bz2 420888 SHA256 5fa4c6f4b6f5410de57271a03cc9a15f15195ef3fc05a8e42ecf507d6d70a87f SHA512 4bc103e8431fa237612fcaa6addd63a03186ade64e306e83384192f0051e6c0f36b22771e66875062a984e1b0e0e255a945afe6dc0d1356560c140293c8d11c4 WHIRLPOOL bcfac96bf78ee9da822ece69ad8f0a2da534ad3103170e07dd192f22c04cf48421769c9f62c6ab1ba8dc2894827e98dd2c1c1fc04b762063dab0f8f5a027f88a
 DIST v4l-utils-0.8.9.tar.bz2 460681 SHA256 3e5511c252b3c320d0b03418f7ee19b42d00ed0871c6b525779007416e46d08e SHA512 3778dbd4d0bb44c6f4762a8551625c1f5bfcf7a10de33c71c2442483d496bc177aef979b747b327f4eca3229fc22eec484de7308588acf9fc48ae6d1d5edee40 WHIRLPOOL 346d2c23c5e8b8ac3128100cf660b1f4880ec5fffd3fa107accf7f536adeacc945cb9aadd61f2f99a6fd32bd7a44912680d2cf867f0a84f28c949707634c676f
-EBUILD v4l-utils-0.8.8-r1.ebuild 1344 SHA256 f58db420f3f06db7b5ef9c4b8e7c15eeaf2a97fa56d8cfb337bf6ca1f8903774 SHA512 827b6947f8ce91cef535d7c91d5d57c428e05f29ba6b02970707331a5a156e66933e092187a8488de83018fe00652696ac3b08d25d854ae9e8babd1b6357be24 WHIRLPOOL 544797d8f98a6c4306b49154f6c6408ecdb4b08aca252c00184ec46bd96e14111007186ca6937fd56489d31ebc3e022c345e2aed3fde2a737064e19998e6aa33
-EBUILD v4l-utils-0.8.9.ebuild 1357 SHA256 b40ed1cb4b9f97335dd9541b883e2da7b86d15d74ed209aaf7261517ee1f2ed3 SHA512 4af6f373ff027f59fbffcb53fc0608f23618441953c85d7c7304f12b9d4830ae5d42eebea5f28d02bd0bf2f2d07707d0b3d9a69520057fb4a118444287d6ab0d WHIRLPOOL 262423096c0cb2054b5aebfca149a940977ab2a4f1e74320a6585c1837561ff2e6c7dfe72091831182ec64e6452f48d9302b2d880b50bf2f313ba618ad5e6528
-MISC ChangeLog 4178 SHA256 96f19bd9542f1b845b756d8fea17323186ed40c2e1bf5ddc9d93530ecd79b5de SHA512 96ae925d023f20e2d183f6fee946e87ff80be5ebf8659b4fd4686597fccbb275e14c1a2545da031d4215464f3e4627586e0b2796db8279d6f652912e81c05f74 WHIRLPOOL e9898217cf6d7f18e57e61a504d3875e35dedf1ddb14e98996648c7bffd916a2ac85da15f5774008f9cac5bcc948be24a145a6cd273fe8c5cd27e8811525c573
+EBUILD v4l-utils-0.8.8-r1.ebuild 1248 SHA256 bd483bbfceae34a0c26ae10b09980e7d8857603e5f245d70f441fd727c7f3099 SHA512 30cc067cb89f8c0cba3613a4cbb650254628026cfae30f0cedf9e6744d5dd784f4ee95e7879e111d4f1d405f76049b977461e61716075c5e4b164851ab0441ae WHIRLPOOL 36dfbf95cc8793fe9bdefd549868bd35ea9a3aa7a9249894a3f360a20398ba8dcf2afb4f9d8643167366ab8da3421b1f5d335ade830af81fb91db69e2dc4c970
+EBUILD v4l-utils-0.8.9.ebuild 1255 SHA256 2a4d8084b9e2822502caf81b9937ef7cc14fb432a89ba994199cba10d69dd847 SHA512 64b2a62342a094f3edd116835c412e328bfaa8e335439d5c8aab2967b9c6cffce3dcd3d31403b586076f686930695a2495cec70bc90ce0b692216c3889efa679 WHIRLPOOL 27f73f489d30eb22f3b7b155e1eff8365aea31debe3339029579c842bd0a8d5381edfa5472fa0e1a44088c363517e6391b59f4d60b255917a2bbc01e2ef48194
+MISC ChangeLog 4330 SHA256 2cdb58e82188b76f5b13356aef053a09431cb16fca884ddfc0b82cba2e4d2d45 SHA512 e0bf07b6b4f143d353c04cdb96ff7e868ce937702a2ffc043a3c995d4b56b0b280cc19c6e1bf676200a4a5d72c3108bf5d6f26cf2d4ca06e7c6018fa543da0c3 WHIRLPOOL 63fd233a30e9d9a7afd18d53bcbecfc271c957b686501a08732913c10cdf5f19f188ce790cece189bae0e63d1b1f7ef5e579cb5ed4f8882a4b8b01a4fbb82572
 MISC metadata.xml 361 SHA256 078f4e19677d5ca6b0187f99a25756cc06c6a7349a028c858b1931f90ce8a24e SHA512 b5026499e4aa38ed5c42c7f690b1081b90b9cff1f41ea8764dd8a01c0ddaf949a52c83915d9091ede5092e3fcf83d40867e63ddf4349d38744cb8b8b90c53748 WHIRLPOOL d21c42b4a600f1a896c47f1df82c98a9b72d9058bc048c8fa5b78bc5a9a206cd960fe2a69bd144a000ec65613c397461ddff3d3948b1c625f5bd5aad8ad42bed
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQv7cnAAoJEJ0WA1zPCt1hT1EH/0iXfNys+dAaNotIh5CE8P6j
-x9o7XzzCmLJbxy6ghnGqjjBVDstiZJBIzAfz1IlLn1B4FjlSwZPP8nO7DRyAfGAg
-YUc+QGY4sxDHdy8OFjomrMbid4/v2NE9iA1Low/SRcKSZszXyBpMNBfXC7g3t+PE
-bai5QQVrc8BlVCdo8OJtyvEMd3lHq/km68E6Yn2fB5ygRwkIdHDfkO44XLqJLlZl
-F4qeyYje7eM5l/FJN3a0jglDWzz9lxT+F1gyzAasmn5fEcP6mNfNayig+/3sWRGM
-rezOfVB4XnxTk3qxrVRpmgH2h3a5eQA0+BuDIa8c6TnWCEL28zG76eP3vzs5qNM=
-=ObxF
+iF4EAREIAAYFAlDHYvAACgkQ2ugaI38ACPB24gD/RsHEqOWSEBkHiEa5RO2M9q1Y
+6DX9vn9thix8TmJW6jwA/0zh0IIh+vMyD/3jNfSHGcWl1Vlh+AJxyTFo+YrCBUpt
+=/5aG
 -----END PGP SIGNATURE-----
diff --git a/media-tv/v4l-utils/v4l-utils-0.8.8-r1.ebuild b/media-tv/v4l-utils/v4l-utils-0.8.8-r1.ebuild
index af9ed754b8ae..e541ecde6fc5 100644
--- a/media-tv/v4l-utils/v4l-utils-0.8.8-r1.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-0.8.8-r1.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/media-tv/v4l-utils/v4l-utils-0.8.8-r1.ebuild,v 1.6 2012/11/20 20:44:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-utils/v4l-utils-0.8.8-r1.ebuild,v 1.7 2012/12/11 16:44:17 axs Exp $
 
 EAPI=4
-inherit toolchain-funcs qt4-r2
+inherit toolchain-funcs udev qt4-r2
 
 DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package"
 HOMEPAGE="http://git.linuxtv.org/v4l-utils.git"
@@ -26,9 +26,7 @@ S=${WORKDIR}/${P}/utils
 src_prepare() {
 	use qt4 || sed -i -e 's:which $$QMAKE:which dISaBlEd:' Makefile
 
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	sed -i -e "s:/lib/udev:${udevdir}:" keytable/Makefile || die
+	sed -i -e "s:/lib/udev:$(udev_get_udevdir):" keytable/Makefile || die
 }
 
 src_configure() {
diff --git a/media-tv/v4l-utils/v4l-utils-0.8.9.ebuild b/media-tv/v4l-utils/v4l-utils-0.8.9.ebuild
index 875572248305..815b46f39281 100644
--- a/media-tv/v4l-utils/v4l-utils-0.8.9.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-0.8.9.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/media-tv/v4l-utils/v4l-utils-0.8.9.ebuild,v 1.3 2012/12/05 21:05:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-utils/v4l-utils-0.8.9.ebuild,v 1.4 2012/12/11 16:44:17 axs Exp $
 
 EAPI=4
-inherit toolchain-funcs qt4-r2
+inherit toolchain-funcs udev qt4-r2
 
 DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package"
 HOMEPAGE="http://git.linuxtv.org/v4l-utils.git"
@@ -26,9 +26,7 @@ S=${WORKDIR}/${P}/utils
 src_prepare() {
 	use qt4 || sed -i -e 's:which $$QMAKE:which dISaBlEd:' Makefile || die
 
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	sed -i -e "s:/lib/udev:${udevdir}:" keytable/Makefile || die
+	sed -i -e "s:/lib/udev:$(udev_get_udevdir):" keytable/Makefile || die
 }
 
 src_configure() {