summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-10-30 15:53:55 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-10-30 15:53:55 +0000
commit0f54e48bcf67bf15b67cdb2f8b2969207958b51e (patch)
treed1ce2836f278779e1d22f962cbd216f37f83a214 /media-gfx
parentalpha/ia64/sh/sparc stable wrt #385699 (diff)
downloadgentoo-2-0f54e48bcf67bf15b67cdb2f8b2969207958b51e.tar.gz
gentoo-2-0f54e48bcf67bf15b67cdb2f8b2969207958b51e.tar.bz2
gentoo-2-0f54e48bcf67bf15b67cdb2f8b2969207958b51e.zip
Remove usage of obsolete USE="v4l2" wrt #385241
(Portage version: 2.2.0_alpha71_p73/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/zbar/ChangeLog5
-rw-r--r--media-gfx/zbar/zbar-0.10.ebuild14
2 files changed, 9 insertions, 10 deletions
diff --git a/media-gfx/zbar/ChangeLog b/media-gfx/zbar/ChangeLog
index d909af45a13d..d6e5196f110a 100644
--- a/media-gfx/zbar/ChangeLog
+++ b/media-gfx/zbar/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-gfx/zbar
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.1 2011/10/03 16:13:50 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.2 2011/10/30 15:53:55 ssuominen Exp $
+
+ 30 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> zbar-0.10.ebuild:
+ Remove usage of obsolete USE="v4l2" wrt #385241
*zbar-0.10 (03 Oct 2011)
diff --git a/media-gfx/zbar/zbar-0.10.ebuild b/media-gfx/zbar/zbar-0.10.ebuild
index 2c13b2a735b3..f82ad023aa3a 100644
--- a/media-gfx/zbar/zbar-0.10.ebuild
+++ b/media-gfx/zbar/zbar-0.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10.ebuild,v 1.1 2011/10/03 16:13:50 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10.ebuild,v 1.2 2011/10/30 15:53:55 ssuominen Exp $
EAPI="2"
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/zbar/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="gtk imagemagick jpeg python qt4 static-libs +threads v4l v4l2 X xv"
+IUSE="gtk imagemagick jpeg python qt4 static-libs +threads v4l X xv"
RDEPEND="gtk? ( =dev-libs/glib-2* =x11-libs/gtk+-2* )
imagemagick? ( >=media-gfx/imagemagick-6.2.6 )
@@ -27,12 +27,7 @@ RDEPEND="gtk? ( =dev-libs/glib-2* =x11-libs/gtk+-2* )
DEPEND="${RDEPEND}"
src_configure() {
- local conf="--disable-video"
- if use v4l || use v4l2 ; then
- conf="--enable-video"
- fi
-
- econf ${conf} \
+ econf \
$(use_with jpeg) \
$(use_with gtk) \
$(use_with imagemagick) \
@@ -41,7 +36,8 @@ src_configure() {
$(use_enable static-libs static) \
$(use_enable threads pthread) \
$(use_with X x) \
- $(use_with xv xv)
+ $(use_with xv xv) \
+ $(use_enable v4l video)
}
src_install() {