summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-07-10 20:11:56 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-07-10 20:11:56 +0000
commitbfe6d9d7eb857140203d61196056c17347e6e15f (patch)
treed82f9c87e3b31506ead713a4d488abb93b90ffdd /media-tv/v4l-utils
parentclean up patch (diff)
downloadgentoo-2-bfe6d9d7eb857140203d61196056c17347e6e15f.tar.gz
gentoo-2-bfe6d9d7eb857140203d61196056c17347e6e15f.tar.bz2
gentoo-2-bfe6d9d7eb857140203d61196056c17347e6e15f.zip
Block media-tv/v4l2-ctl for now.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-tv/v4l-utils')
-rw-r--r--media-tv/v4l-utils/ChangeLog6
-rw-r--r--media-tv/v4l-utils/v4l-utils-0.7.91.ebuild5
2 files changed, 8 insertions, 3 deletions
diff --git a/media-tv/v4l-utils/ChangeLog b/media-tv/v4l-utils/ChangeLog
index 8c1569e57992..fc24055c1b41 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-utils/ChangeLog,v 1.1 2010/07/10 20:07:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-utils/ChangeLog,v 1.2 2010/07/10 20:11:56 ssuominen Exp $
+
+ 10 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+ v4l-utils-0.7.91.ebuild:
+ Block media-tv/v4l2-ctl for now.
*v4l-utils-0.7.91 (10 Jul 2010)
diff --git a/media-tv/v4l-utils/v4l-utils-0.7.91.ebuild b/media-tv/v4l-utils/v4l-utils-0.7.91.ebuild
index 530721c8854e..6e0a0ca79563 100644
--- a/media-tv/v4l-utils/v4l-utils-0.7.91.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-0.7.91.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.7.91.ebuild,v 1.1 2010/07/10 20:07:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-utils/v4l-utils-0.7.91.ebuild,v 1.2 2010/07/10 20:11:56 ssuominen Exp $
EAPI=2
inherit eutils toolchain-funcs qt4-r2
@@ -15,7 +15,8 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND=">=media-libs/libv4l-${PV}
- x11-libs/qt-gui:4"
+ x11-libs/qt-gui:4
+ !media-tv/v4l2-ctl"
S=${WORKDIR}/${P}/utils