media-libs/unicap: Drop v4l2 useflag and make v4l behave like v4l2

svn path=/sunrise/; revision=12548

diff --git a/media-libs/unicap/ChangeLog b/media-libs/unicap/ChangeLog
index b11e9f8467033224453169505b3144a18cc3ba6e..dbc6ba84e7e4ebdfaf37b403e8fab6b558128e8f 100644 (file)
--- a/media-libs/unicap/ChangeLog
+++ b/media-libs/unicap/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for media-libs/unicap
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Dec 2011; Markos Chandras <hwoarang@gentoo.org> ChangeLog:
+  Drop v4l2 useflag and make v4l behave like v4l2
+
   22 May 2010; Matt Whitlock (whitslack) <matt@whitlock.name>
   -unicap-0.9.7.ebuild, +unicap-0.9.8.ebuild, metadata.xml:
   new version: media-libs/unicap-0.9.8 (bug 175881)

diff --git a/media-libs/unicap/Manifest b/media-libs/unicap/Manifest
index 32c99ca9f946ac2fc16e1dbed346c2373ca2909e..019cc6b9aef468342522fbee4a0d0fa9c678dda2 100644 (file)
--- a/media-libs/unicap/Manifest
+++ b/media-libs/unicap/Manifest
@@ -1,4 +1,4 @@
 DIST libunicap-0.9.8.tar.gz 567118 RMD160 ef823e8ee639a3ef1c76e58627dc3b0c4a2af4e9 SHA1 4d3b46c454a362d1894ddb8cfaee4129072f9c60 SHA256 3057867c7259b500c058fe9ee8dd44adebed3241bdaf6ff0114b9627602f7860
-EBUILD unicap-0.9.8.ebuild 1309 RMD160 07e8bb98d6fe554731f3bd83952ecfce7da21ef8 SHA1 d07e7ec9f0f6638c4ed6e1cd945432d27bc8bfdb SHA256 e9f4fc9649ec5000c8ae901f89462648180b9a0ad4aa512acf1e45519444199e
-MISC ChangeLog 790 RMD160 0560715cce2b361da1099a8744b59971067d4155 SHA1 78e1172f765d086e69fff6e855d8f7257ae2ea04 SHA256 c4d6583b402534702a007f74d31fea2ab742c27cf6e8779ca3561ca7cfb5c52c
+EBUILD unicap-0.9.8.ebuild 1240 RMD160 956dff2ea6a8a246dbe62f0539a502340f510040 SHA1 23c83649508b03b1d5c7b03694bdc45c7b330ef4 SHA256 f43963ba01084048f2218309430af18b20d60db2c1af7cbb5a8ecc25ee5ba0c5
+MISC ChangeLog 905 RMD160 e68915b344f2eb6121a6c72caa90f11d937c52ca SHA1 8e59c5460cec9154406b974f19b2cfbdd53366e3 SHA256 00fe65397900feccf16b4b71553def47ae0870127a85dc5321a223c8176bdfa0
 MISC metadata.xml 480 RMD160 457deafee2b775229214b67f6924271d5a3e28ac SHA1 40b98e8db84715d9962556e8f20f31a3e8827621 SHA256 a4df5abe7495193788df715c3e8747796c58085acc5d84dedbfb1ab2d2832cb6

diff --git a/media-libs/unicap/unicap-0.9.8.ebuild b/media-libs/unicap/unicap-0.9.8.ebuild
index e2f9fe56711e668de58c5ad37c84e63f1a2d7419..bff7c82818b9817a61a5c9a04b2b1819d4aa5508 100644 (file)
--- a/media-libs/unicap/unicap-0.9.8.ebuild
+++ b/media-libs/unicap/unicap-0.9.8.ebuild
@@ -11,11 +11,11 @@ SRC_URI="http://unicap-imaging.org/downloads/lib${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug doc ieee1394 libv4l nls threads v4l v4l2"
+IUSE="debug doc ieee1394 libv4l nls threads v4l"
 
 RDEPEND="ieee1394? ( sys-libs/libraw1394 )
        nls? ( virtual/libintl )
-       v4l2? ( libv4l? ( media-libs/libv4l ) )"
+       v4l? ( libv4l? ( media-libs/libv4l ) )"
 DEPEND="${RDEPEND}
        doc? ( dev-util/gtk-doc )"
 
@@ -29,8 +29,7 @@ src_configure() {
                #myconf=( --enable-thing )
                myconf+=( --enable-debug-unicap --enable-debug-ucil --enable-debug-thing )
                use ieee1394 && myconf+=( --enable-debug-dcam --enable-debug-vid21394 )
-               use v4l && myconf+=( --enable-debug-v4l )
-               use v4l2 && myconf+=( --enable-debug-v4l2 )
+               use v4l && myconf+=( --enable-debug-v4l2 )
        fi
 
        econf "${myconf[@]}" \
@@ -40,8 +39,7 @@ src_configure() {
                $(use_enable libv4l ) \
                $(use_enable nls) \
                $(use_enable threads unicap-threads) \
-               $(use_enable v4l) \
-               $(use_enable v4l2)
+               $(use_enable v4l v4l2)
 }
 
 src_install() {