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

(Portage version: 2.2.0_alpha137/cvs/Linux x86_64)

5 files changed, 24 insertions, 11 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/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() {