Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/zbar: ChangeLog zbar-0.10.ebuild
Date: Sun, 30 Oct 2011 15:54:05
Message-Id: 20111030155355.42F232004B@flycatcher.gentoo.org
1 ssuominen 11/10/30 15:53:55
2
3 Modified: ChangeLog zbar-0.10.ebuild
4 Log:
5 Remove usage of obsolete USE="v4l2" wrt #385241
6
7 (Portage version: 2.2.0_alpha71_p73/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 media-gfx/zbar/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/ChangeLog?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/ChangeLog?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/ChangeLog?r1=1.1&r2=1.2
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- ChangeLog 3 Oct 2011 16:13:50 -0000 1.1
23 +++ ChangeLog 30 Oct 2011 15:53:55 -0000 1.2
24 @@ -1,6 +1,9 @@
25 # ChangeLog for media-gfx/zbar
26 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.1 2011/10/03 16:13:50 xmw Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/ChangeLog,v 1.2 2011/10/30 15:53:55 ssuominen Exp $
29 +
30 + 30 Oct 2011; Samuli Suominen <ssuominen@g.o> zbar-0.10.ebuild:
31 + Remove usage of obsolete USE="v4l2" wrt #385241
32
33 *zbar-0.10 (03 Oct 2011)
34
35
36
37
38 1.2 media-gfx/zbar/zbar-0.10.ebuild
39
40 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/zbar-0.10.ebuild?rev=1.2&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/zbar-0.10.ebuild?rev=1.2&content-type=text/plain
42 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/zbar/zbar-0.10.ebuild?r1=1.1&r2=1.2
43
44 Index: zbar-0.10.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10.ebuild,v
47 retrieving revision 1.1
48 retrieving revision 1.2
49 diff -u -r1.1 -r1.2
50 --- zbar-0.10.ebuild 3 Oct 2011 16:13:50 -0000 1.1
51 +++ zbar-0.10.ebuild 30 Oct 2011 15:53:55 -0000 1.2
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2011 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10.ebuild,v 1.1 2011/10/03 16:13:50 xmw Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/zbar/zbar-0.10.ebuild,v 1.2 2011/10/30 15:53:55 ssuominen Exp $
57
58 EAPI="2"
59
60 @@ -14,7 +14,7 @@
61 LICENSE="LGPL-2.1"
62 SLOT="0"
63 KEYWORDS="~amd64 ~x86"
64 -IUSE="gtk imagemagick jpeg python qt4 static-libs +threads v4l v4l2 X xv"
65 +IUSE="gtk imagemagick jpeg python qt4 static-libs +threads v4l X xv"
66
67 RDEPEND="gtk? ( =dev-libs/glib-2* =x11-libs/gtk+-2* )
68 imagemagick? ( >=media-gfx/imagemagick-6.2.6 )
69 @@ -27,12 +27,7 @@
70 DEPEND="${RDEPEND}"
71
72 src_configure() {
73 - local conf="--disable-video"
74 - if use v4l || use v4l2 ; then
75 - conf="--enable-video"
76 - fi
77 -
78 - econf ${conf} \
79 + econf \
80 $(use_with jpeg) \
81 $(use_with gtk) \
82 $(use_with imagemagick) \
83 @@ -41,7 +36,8 @@
84 $(use_enable static-libs static) \
85 $(use_enable threads pthread) \
86 $(use_with X x) \
87 - $(use_with xv xv)
88 + $(use_with xv xv) \
89 + $(use_enable v4l video)
90 }
91
92 src_install() {