diff options
author | Michał Górny <mgorny@gentoo.org> | 2015-02-14 11:57:17 +0000 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2015-02-14 11:57:17 +0000 |
commit | 950c98eae3e1eda5c1444805edb6c03b99c69e0d (patch) | |
tree | f263b1d7cb8f9d787bd294b364bb1673942cbfda | |
parent | Fix SRC_URI, add missing ||die. Bug #460312 with PR by Michael Mair-Keimberger. (diff) | |
download | gentoo-2-950c98eae3e1eda5c1444805edb6c03b99c69e0d.tar.gz gentoo-2-950c98eae3e1eda5c1444805edb6c03b99c69e0d.tar.bz2 gentoo-2-950c98eae3e1eda5c1444805edb6c03b99c69e0d.zip |
USE=qrcode requires zbar[v4l], bug #539984 with PR by Michael Mair-Keimberger.
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
-rw-r--r-- | net-misc/electrum/ChangeLog | 8 | ||||
-rw-r--r-- | net-misc/electrum/electrum-1.9.7.ebuild | 6 | ||||
-rw-r--r-- | net-misc/electrum/electrum-1.9.8.ebuild | 6 |
3 files changed, 12 insertions, 8 deletions
diff --git a/net-misc/electrum/ChangeLog b/net-misc/electrum/ChangeLog index 04eb99b52ff8..0b00a5897ceb 100644 --- a/net-misc/electrum/ChangeLog +++ b/net-misc/electrum/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/electrum -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/ChangeLog,v 1.24 2014/11/30 16:43:05 mgorny Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/ChangeLog,v 1.25 2015/02/14 11:57:17 mgorny Exp $ + + 14 Feb 2015; Michał Górny <mgorny@gentoo.org> electrum-1.9.7.ebuild, + electrum-1.9.8.ebuild: + USE=qrcode requires zbar[v4l], bug #539984 with PR by Michael Mair-Keimberger. 30 Nov 2014; Michał Górny <mgorny@gentoo.org> electrum-1.9.7.ebuild, electrum-1.9.8.ebuild: diff --git a/net-misc/electrum/electrum-1.9.7.ebuild b/net-misc/electrum/electrum-1.9.7.ebuild index 192bf066bcf4..b8725248746e 100644 --- a/net-misc/electrum/electrum-1.9.7.ebuild +++ b/net-misc/electrum/electrum-1.9.7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/electrum-1.9.7.ebuild,v 1.3 2014/11/30 16:43:05 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/electrum-1.9.7.ebuild,v 1.4 2015/02/14 11:57:17 mgorny Exp $ EAPI="5" @@ -32,7 +32,7 @@ RDEPEND=" >=dev-python/ecdsa-0.9[${PYTHON_USEDEP}] dev-python/slowaes[${PYTHON_USEDEP}] gtk? ( dev-python/pygtk:2[${PYTHON_USEDEP}] ) - qrcode? ( media-gfx/zbar[python,${PYTHON_USEDEP}] ) + qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] ) qt4? ( webkit? ( dev-python/PyQt4[webkit] ) dev-python/PyQt4[${PYTHON_USEDEP}] diff --git a/net-misc/electrum/electrum-1.9.8.ebuild b/net-misc/electrum/electrum-1.9.8.ebuild index b3957aab0d9e..645d53db276f 100644 --- a/net-misc/electrum/electrum-1.9.8.ebuild +++ b/net-misc/electrum/electrum-1.9.8.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/electrum-1.9.8.ebuild,v 1.2 2014/11/30 16:43:05 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/electrum-1.9.8.ebuild,v 1.3 2015/02/14 11:57:17 mgorny Exp $ EAPI="5" @@ -32,7 +32,7 @@ RDEPEND=" >=dev-python/ecdsa-0.9[${PYTHON_USEDEP}] dev-python/slowaes[${PYTHON_USEDEP}] gtk? ( dev-python/pygtk:2[${PYTHON_USEDEP}] ) - qrcode? ( media-gfx/zbar[python,${PYTHON_USEDEP}] ) + qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] ) qt4? ( webkit? ( dev-python/PyQt4[webkit] ) dev-python/PyQt4[${PYTHON_USEDEP}] |