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
commit69055c0b9029eb0a948ee4261d4ecd161111a287 (patch)
treee565a6ecb66a373ed18a293d9194aa844f65caf0 /media-gfx/zbar
parentAdd dev-perl/Data-Hexify-1.00, thanks to slepnoga (diff)
downloadhistorical-69055c0b9029eb0a948ee4261d4ecd161111a287.tar.gz
historical-69055c0b9029eb0a948ee4261d4ecd161111a287.tar.bz2
historical-69055c0b9029eb0a948ee4261d4ecd161111a287.zip
Remove usage of obsolete USE="v4l2" wrt #385241
Package-Manager: portage-2.2.0_alpha71_p73/cvs/Linux x86_64
Diffstat (limited to 'media-gfx/zbar')
-rw-r--r--media-gfx/zbar/ChangeLog5
-rw-r--r--media-gfx/zbar/Manifest18
-rw-r--r--media-gfx/zbar/zbar-0.10.ebuild14
3 files changed, 20 insertions, 17 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/Manifest b/media-gfx/zbar/Manifest
index 3e0cb1aafc63..11b23492558a 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,14 +1,18 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
DIST zbar-0.10.tar.bz2 592602 RMD160 a68db3e81d596a506e50e797c3540a05b8b84a9f SHA1 273b47c26788faba4325baecc34063e27a012963 SHA256 234efb39dbbe5cef4189cc76f37afbe3cfcfb45ae52493bfe8e191318bdbadc6
-EBUILD zbar-0.10.ebuild 1356 RMD160 0b19b7353b871f7df65823bd624415cb119f476c SHA1 dadfe787a2dae43449c608d96aa2caf602c7666c SHA256 9335a964117000d743f2b672bf8ebdbdf5b2e63c46140fa6a52b48046c2146a1
-MISC ChangeLog 390 RMD160 788bb3345a3f5febfbbde265cfa7ffaf2baf47e9 SHA1 db0bcc9582d2eecd05aad9dd4f1b0aef1891aadb SHA256 820a6915bcdf4576d121e9aabac382f84e1b35ab1b0f495caed15cd3d0967e81
+EBUILD zbar-0.10.ebuild 1287 RMD160 75e51e811db9ba3e734568e93e763014f8b57fd8 SHA1 1b361ef635054c2892435eb95ab23f49a3c166d0 SHA256 8b110af173f32f6cbc9bb29e500fcd39f9f3143adf13a13035cdc3309b40c66e
+MISC ChangeLog 519 RMD160 39964d8af9a03dbace1528840b45f6ef928013da SHA1 ac4db8989db97c7a924ffe006103fc7d30b343e3 SHA256 6b2c45194e60e8ec7b06116203f00ff5c06aca942cc1e6bcd5fc3f4d1d178e8e
MISC metadata.xml 245 RMD160 6b03982a4d5f32d9fa6b9259ae36f9fcb07c8404 SHA1 fb16c7b4c5ab071dd979f761b8bb075f5396b737 SHA256 375a1da02cd2c393ce2378a73c1ce08134bc030b3bb378c6a4d6ca9cd5be1f8d
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
-iF4EAREIAAYFAk6J30QACgkQknrdDGLu8JD5UgD/Q5cvX3lvJuEPwNCM3XM/uTd+
-3aNAQAMsJY/jcfJmJUQA/AunDUwdTQhhqo25VEDdyv0YHWVJ01Sh39CkCpFvAo4J
-=eCPM
+iQEcBAEBAgAGBQJOrXMUAAoJEEdUh39IaPFN1AAH/1LAv8WXvfTmrjtJ/TzBUCzv
+5gd5bL7GsRmIJqfm7odoL3cKiaDY2jdNb+ol+q0YcwfGpWcgA20O6VZHW7EL7nck
+Ap9VjY/zBIdTC+N3smjdp3cNuRAnNRPwN+WyWEPdWZASY/pV5FJNhEgH7cBmUJzv
+uCSmtDzP2teoB1/bL5KD58DugAqiex3g5PfDnqhqMv+d3K7mL+E1D3VS+hVY7FAF
+FlMbiWkMiIiAtFtbMgiWWfSLhZRKLp7w3AjsIJv47Z14xT4Jr3S8D9LlhA7rHPeB
+UM8JvFQxnjO5TkTYGUEtJsCG/n8a6RuTXBzcPCO21wQsMdDBUyR3WC0SgETT9rQ=
+=j8pr
-----END PGP SIGNATURE-----
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() {