Version bump; qv4l2 and v4l-ctl have been updated (bug #438244, thanks to Wojciech Myrda). Update license. Drop old.

Package-Manager: portage-2.2.0_alpha137/cvs/Linux x86_64

6 files changed, 37 insertions, 24 deletions

diff --git a/media-tv/v4l-utils/ChangeLog b/media-tv/v4l-utils/ChangeLog
index 66c65312d006..395328a53b81 100644
--- a/media-tv/v4l-utils/ChangeLog
+++ b/media-tv/v4l-utils/ChangeLog
@@ -1,6 +1,14 @@
 # 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.21 2012/08/08 08:03:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-utils/ChangeLog,v 1.22 2012/10/20 07:16:00 tetromino Exp $
+
+*v4l-utils-0.8.9 (20 Oct 2012)
+
+  20 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  v4l-utils-0.8.5.ebuild, -v4l-utils-0.8.6.ebuild, v4l-utils-0.8.8.ebuild,
+  v4l-utils-0.8.8-r1.ebuild, +v4l-utils-0.8.9.ebuild:
+  Version bump; qv4l2 and v4l-ctl have been updated (bug #438244, thanks to
+  Wojciech Myrda). Update license. Drop old.
 
 *v4l-utils-0.8.8-r1 (08 Aug 2012)
 
diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index 8a9e70d8138f..48121764984c 100644
--- a/media-tv/v4l-utils/Manifest
+++ b/media-tv/v4l-utils/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA256
 
 DIST v4l-utils-0.8.5.tar.bz2 373882 SHA256 c205848fbaf3489b97519dae04da31be4998bbc170a2ca9791357a8a549e594c SHA512 d84bea5658b350447741e2aae36458c2ba29f4d6beb8dd4965626a1f60ea1f0b7d12751cab9501c1c5cb3ba9872fc7ac237553e452b3c348f907c4a8274f954a WHIRLPOOL fa941a7e30792993144e7b55dc88cd10c09100e94142ed8c0c0f68bcaf8d12a0c57511f5698225ff9f057c0eb4696d0eff6d0d55fa46673c3db10f5bb9b4b6ca
-DIST v4l-utils-0.8.6.tar.bz2 375254 SHA256 3a53ac6348363bbdc94ea11ca48dadc0342a579384a910f6c956b6a185f0c20f SHA512 ab3a5637309a97b30afbe73c1025095a7a99355a6ff732a7e3f6e6a98862ced5fb95e5336f72acee41b11d8e9a2a1770e376b8791760369d102940394c074f71 WHIRLPOOL 2ccbda32c9a8989b33ffc7e8647cbf1060a0a49c9ff6936ada5e6b5d2945cf223308f8af094b7c0b2ee0451aeb815946d4fd3aca3ce4bf8a51da947fe33662ad
 DIST v4l-utils-0.8.8.tar.bz2 420888 SHA256 5fa4c6f4b6f5410de57271a03cc9a15f15195ef3fc05a8e42ecf507d6d70a87f SHA512 4bc103e8431fa237612fcaa6addd63a03186ade64e306e83384192f0051e6c0f36b22771e66875062a984e1b0e0e255a945afe6dc0d1356560c140293c8d11c4 WHIRLPOOL bcfac96bf78ee9da822ece69ad8f0a2da534ad3103170e07dd192f22c04cf48421769c9f62c6ab1ba8dc2894827e98dd2c1c1fc04b762063dab0f8f5a027f88a
-EBUILD v4l-utils-0.8.5.ebuild 1150 SHA256 e5c476b90921780bcc8a462ba9d3d09a6a5cb6e38987f6ba1068c1b5ccbc24b1 SHA512 a100392ba9be91f9d98b38103c470958522885b3c0dd83be0e49521cb36dc84939b18e9fc25e549cec6407cd390a3b607b222595ae65d9d699d615b0ce4179be WHIRLPOOL 548ddbab723061ea412080727424a9ccd417d87b85cba6a786b3925fccb278f754174d018b1027c46718d397759bee4844f112511b73466d19d98633850b6c11
-EBUILD v4l-utils-0.8.6.ebuild 1152 SHA256 eb1504f893fddd4640c607236e3bf5999fefe8d98ee1ea0d92a9df4e3a42cb54 SHA512 6193383be50a6108008524cdc4cdcef5e8dd7d83ad6d69f04e360b62c13e6603bc06dbea11f91e8f22a7b3565aa12c2176e4582ef05b692aec2a359473aa3412 WHIRLPOOL f4834cae33ad9c095d5081d04aa5d055ee83c0bc701952fb5a1554feac5860289e55527405c3f81fd705778154f3bd8e1aa2249dd9594359ac044af4c64998ed
-EBUILD v4l-utils-0.8.8-r1.ebuild 1348 SHA256 b71cd990b51ef64e2b4d5627443b93cce5829a24ca1ea3b7dc24e723f9607c03 SHA512 b0d337cd6a08d5ef3f976266452c45630d25c99a6b0a87fec7eed3af212c4569a5f755d16dac3b1bfb7c124145225fd214b1d1926f5953a27e1b0f1a8500bd65 WHIRLPOOL 51d316c2b4c522fa7fde208da163168750e75738e177e5a9ecb21754a2c80f962f3a6ed280c65815e9568f61b80e71beba2878947f72f300d04be14c1e30a173
-EBUILD v4l-utils-0.8.8.ebuild 1150 SHA256 d79958981206b08864425663817cbb002f1f81ed9c34c1e7687ca0fca232fc4f SHA512 b8ee011aaacfda5e0c598f073720430408db369f5a34a655a6d105dc14ba1eab190ce0b827b43a4b7de540a6449de96e36d3047eeee66ad29696d6d5539c2465 WHIRLPOOL ac2511f1c8c6ce488031abec895e06c5e70fecf486b63b71db4c0d6fc3369225ec7714739da09f438912ef2215ec2cf374fed6c20bf9a607e42c7697986f4c9d
-MISC ChangeLog 2945 SHA256 523de06946b3fd90ae4e4f6f40667f9b139efb0eb9b53220bca94d017671b42b SHA512 61723e52855fb71dc9c46cea1721c22042784476c53e105a274768e857f70caa6c4469e891b9c7d33d69a6551ae2e1408c59b9aad44491e591fe73e63d16480d WHIRLPOOL 05f1cce2eb1265a0a02f34ccfad64fbf79a05378e7430c4c71aa2372bd3b680c6732d945392cf0d3f3f08f60a73c6e52f8ea6f923fde12b19693a552ec844873
+DIST v4l-utils-0.8.9.tar.bz2 460681 SHA256 3e5511c252b3c320d0b03418f7ee19b42d00ed0871c6b525779007416e46d08e SHA512 3778dbd4d0bb44c6f4762a8551625c1f5bfcf7a10de33c71c2442483d496bc177aef979b747b327f4eca3229fc22eec484de7308588acf9fc48ae6d1d5edee40 WHIRLPOOL 346d2c23c5e8b8ac3128100cf660b1f4880ec5fffd3fa107accf7f536adeacc945cb9aadd61f2f99a6fd32bd7a44912680d2cf867f0a84f28c949707634c676f
+EBUILD v4l-utils-0.8.5.ebuild 1152 SHA256 24d97226fa0d922935cbfb459a3a642956bb56669484094f85b778dfaed79b81 SHA512 50e8afa47577e06678c059e3666be2ecbd90ce9887d49a52ea28cb39bd5a5a770edbe46a39cc7db5f06006ad013ed14be63ae3515b1e599f1e7a84fe416f18c3 WHIRLPOOL 762d86378a6a8f0cd6daf9acefe47084e300fad87a4d443614d3417407052975a00b24f30332ee21ef4158233059453c75be2d5adac1893044b7fa14f3d01986
+EBUILD v4l-utils-0.8.8-r1.ebuild 1350 SHA256 2444c6b572698ca523b4b1316348550fb0218c33f41784c48f99a2bafc0956e0 SHA512 4e72c2ff3c496698454fc55ba5e7ec9a019ef4fd3b0b01fe4c127478f573c1b5cc574d0b73ecf5d86aeffda53c507008e06a91a99b85d0f9cbb3dbf562f8b2f7 WHIRLPOOL 3719b66d39152aa54227ee2dc9bd0f017b792190e0273a3bc1e10f631878b8d9b069fb6bdc2c7c1b837c514dfcaba87a13b652bfcc5f912539c81292d984ed2d
+EBUILD v4l-utils-0.8.8.ebuild 1153 SHA256 0b1ea53a8041b2c3e77c36d859e5029706b8a27ae2f49c22349cb5d80fd8e4a0 SHA512 021938c237a1306fce5cd6a805aa93c48565f772efb4b39f481b7e6f8941090464eb3ded5d01192614f9269a8d6f7e61d62d7bfce37d3af162a77f06b9817b23 WHIRLPOOL 62115b088582c135da507fd8d455a84b313d4063360a19a121c89488d466579a63489322767bf62488f32f76272a13de1ff91ecb9fc1871e012ff7e9f7e91719
+EBUILD v4l-utils-0.8.9.ebuild 1347 SHA256 400b59ccfcd763b60c74fc18fb422f793bc93b3e5e62c4cd9288e72f43d82bfb SHA512 32c9373f013f32aedb667bca604dc9cc8a4e4bce22138733a9e8bc8665e2922e95dcebe009fc50d1c1d8b29b05e8842c33ae0f31dfc9726ab539a2489159910b WHIRLPOOL 592b3b3655aceb5f649ad72844fe521d0e7154c1e2627b42852d44ff2788815e0b13fb80acf93562b7ddf18b6d3a41f0f66746444053df4e314e12a464244704
+MISC ChangeLog 3287 SHA256 33eaad2a51d1688b433920de235863ef4d5555582e7c7008227b2eb97f8edbde SHA512 fff2d80a1c1784cc1bf89faa2bdff4bb53cf055546a4d9ef6b39faebbac641da0b6f580eb17aaf431a96ab6f5a597d33e53a71475b394713b1a1e00f0237be10 WHIRLPOOL 4d67e8cd3c8b5c5ded0ed3fbd02adc0c8f06b242659ffaf4d861f8cc211cee3036c63c7324b76eb313649d74318ea25caaa42d6b81c0cb8a359700a8498c1c7d
 MISC metadata.xml 361 SHA256 078f4e19677d5ca6b0187f99a25756cc06c6a7349a028c858b1931f90ce8a24e SHA512 b5026499e4aa38ed5c42c7f690b1081b90b9cff1f41ea8764dd8a01c0ddaf949a52c83915d9091ede5092e3fcf83d40867e63ddf4349d38744cb8b8b90c53748 WHIRLPOOL d21c42b4a600f1a896c47f1df82c98a9b72d9058bc048c8fa5b78bc5a9a206cd960fe2a69bd144a000ec65613c397461ddff3d3948b1c625f5bd5aad8ad42bed
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQIh09AAoJEEdUh39IaPFNqroH/iZHA5HeCupMYQbEM9tHuXLC
-4xwdm899HJBWb6fzyGyHElxmjN/ywUBGyGs0wG0XNg+TWmvRuuDsgkyb9Obriyw2
-Cbobe1lJFnVNskS/YvFFZTT9ItxwH9MkAE51NGhZVbXt2fGdwJOzyfx7f+vC9JJE
-j4GH3VdCiJqcFzO0CkfDtunAXqk7962Xn/BBKCd/A3vr7rBOlUH0mHvYlVENA9Eb
-Z7CJ0WEYF3EnQJdDTxAoZElXvFMCnviYqJ7wIU+EYeQunSWwik08513DAyvI5vly
-Tfh52T5hF/GW/WK+0YFOBBEBSemi3nM+U0JnK0j2q1KU6UgpnxJede7wczZzy/o=
-=tbxP
+iQEcBAEBCAAGBQJQgk+xAAoJEJ0WA1zPCt1hvqsIAKKXigGEh/CYqMKgKJRRR8gY
+mh21oPrIT3kLOtWBaXZaQWsy5tE5U+tz3bfVNTanyxpCgyhhXE6S+AZU7PFOsdDz
+kcpm6SWcwBszrg6gvlDVC5C5mfOsYajhotliZyYAEQYCp+l2Qlvwt+ZSQq7tbNr5
+qRKXqakIJuO0aQnbQH3Twy/+9DQyxPKJdjYgp8bzXnwWgfrNv3p7A9lKN7FXLTtM
+iabnZnR0avqEccd8KJVMtTz9hJaMUQIQbPcqenxNXX1MwFY9/jA4O46Iu+C+eaeK
+Xc3RhRlIxAPPEOKyhNWdTUtbE9B5DS6vFcEMdelsgMaJ9Puz33uYuprN89SBIfY=
+=KBzA
 -----END PGP SIGNATURE-----
diff --git a/media-tv/v4l-utils/v4l-utils-0.8.5.ebuild b/media-tv/v4l-utils/v4l-utils-0.8.5.ebuild
index 1c5a0553ff4a..51e4c4e88b82 100644
--- a/media-tv/v4l-utils/v4l-utils-0.8.5.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-0.8.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.5.ebuild,v 1.4 2011/12/30 13:16:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-utils/v4l-utils-0.8.5.ebuild,v 1.5 2012/10/20 07:16:00 tetromino Exp $
 
 EAPI=4
 inherit toolchain-funcs qt4-r2
@@ -9,7 +9,7 @@ DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package"
 HOMEPAGE="http://git.linuxtv.org/v4l-utils.git"
 SRC_URI="http://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
 
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="qt4"
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 1dffa18a80cd..2262962a632f 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,6 +1,6 @@
 # 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.1 2012/08/08 08:03:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-utils/v4l-utils-0.8.8-r1.ebuild,v 1.2 2012/10/20 07:16:00 tetromino Exp $
 
 EAPI=4
 inherit toolchain-funcs qt4-r2
@@ -9,7 +9,7 @@ DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package"
 HOMEPAGE="http://git.linuxtv.org/v4l-utils.git"
 SRC_URI="http://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
 
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="qt4"
diff --git a/media-tv/v4l-utils/v4l-utils-0.8.8.ebuild b/media-tv/v4l-utils/v4l-utils-0.8.8.ebuild
index af9c739ae07e..3f6eaab778c1 100644
--- a/media-tv/v4l-utils/v4l-utils-0.8.8.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-0.8.8.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/media-tv/v4l-utils/v4l-utils-0.8.8.ebuild,v 1.3 2012/07/24 21:17:03 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-utils/v4l-utils-0.8.8.ebuild,v 1.4 2012/10/20 07:16:00 tetromino Exp $
 
 EAPI=4
 inherit toolchain-funcs qt4-r2
@@ -9,7 +9,7 @@ DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package"
 HOMEPAGE="http://git.linuxtv.org/v4l-utils.git"
 SRC_URI="http://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
 
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="qt4"
diff --git a/media-tv/v4l-utils/v4l-utils-0.8.6.ebuild b/media-tv/v4l-utils/v4l-utils-0.8.9.ebuild
index 361a45a21320..bcc04120f9f1 100644
--- a/media-tv/v4l-utils/v4l-utils-0.8.6.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-0.8.9.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/media-tv/v4l-utils/v4l-utils-0.8.6.ebuild,v 1.1 2012/02/19 14:14:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-utils/v4l-utils-0.8.9.ebuild,v 1.1 2012/10/20 07:16:00 tetromino Exp $
 
 EAPI=4
 inherit toolchain-funcs qt4-r2
@@ -9,7 +9,7 @@ DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package"
 HOMEPAGE="http://git.linuxtv.org/v4l-utils.git"
 SRC_URI="http://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
 
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="qt4"
@@ -18,12 +18,17 @@ RDEPEND=">=media-libs/libv4l-${PV}
 	qt4? ( x11-libs/qt-gui:4 )
 	!media-tv/v4l2-ctl
 	!<media-tv/ivtv-utils-1.4.0-r2"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 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
 }
 
 src_configure() {