Block media-tv/v4l2-ctl for now.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-tv/v4l-utils/ChangeLog b/media-tv/v4l-utils/ChangeLog
index 8c1569e579926617fb05c6c1be54c55c5901d92c..fc24055c1b41e88b95a2f7533eb2647df696d5c6 100644 (file)
--- 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/Manifest b/media-tv/v4l-utils/Manifest
index 0a445f1f6889e0d465004f22f9705cc569d5372d..aa1f91c23d93b4eb99c47209be0a3217fd77055d 100644 (file)
--- a/media-tv/v4l-utils/Manifest
+++ b/media-tv/v4l-utils/Manifest
@@ -1,5 +1,5 @@
 AUX v4l-utils-0.7.91-respect_make.patch 879 RMD160 713e392bb3eb0c0325c0e1849facb9c29edeaf57 SHA1 009e8cd2d42038f76e3c42a7f3bf0c4cb766eb91 SHA256 ac2852326c576f3a9bd9bcbfb42d132db2484b279d494adf013511d2645d2364
 DIST v4l-utils-0.7.91.tar.bz2 269686 RMD160 018cd65d7a4b381331a78abeb8355834499fa155 SHA1 93e3330659f6683858fff64012061414acd9a659 SHA256 f9c4ea0174b5b9f48178e2a47e449ef9374c3c793844b0f90ce821ce9b6b8e9e
-EBUILD v4l-utils-0.7.91.ebuild 1019 RMD160 7d1bcac7c22652adcb405da85d473747bba6debe SHA1 ec76920c1d60111c8548e6b4850ed5fd2d595a49 SHA256 035a66e8c9fde8f3877300fd16362481f51a4939bc165f82ed951dc5cfabab92
-MISC ChangeLog 430 RMD160 a88376a7b0d1113473a0065c1eae0c0596c507fd SHA1 bd3093e7670bb58287888aaf34a5e10d1ba3bd67 SHA256 a1812862be8e4a93fbc752f3123081bc2492c3254910f47d5b81857f7b17439a
+EBUILD v4l-utils-0.7.91.ebuild 1039 RMD160 2562ad5eb306312a8aebc14192a9682c9019899c SHA1 95dbc155a847f896963f5b5d08118ad62c67868c SHA256 35a9b05d3bee87e389899f49ce4886844f8bb288226dad20c8292aee714c91c1
+MISC ChangeLog 547 RMD160 e3df0ed3e4d39871e99c52a63159ed05e7287c03 SHA1 dd21df2aae118e7df2d53acebb65ca406c12f8c0 SHA256 b6826874b0d3e243dac4aa59fff4d15ba45ab43566592a5cf3ce9318f599d32e
 MISC metadata.xml 360 RMD160 fa3501f183813ea6cc44b10ce4cb06018d9b97ed SHA1 67fe58dd3abe7f528c99c72ad8d33ca4fc6cee24 SHA256 ed09c3963ff7dcdc94c80722a083df866812415ad59bb2561f62830c4f943482

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 530721c8854e5f28dc7a67392030572bb4f47747..6e0a0ca79563867c2fbae3356d0299167215758e 100644 (file)
--- 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