USE=qrcode requires zbar[v4l], bug #539984 with PR by Michael Mair-Keimberger.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 29 insertions, 25 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/Manifest b/net-misc/electrum/Manifest
index caba69de7c5b..935dd16155d4 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -9,26 +9,26 @@ DIST Electrum-1.9.7.tar.gz 751357 SHA256 8d4cad6338982a515968425e95f14204ab2ed61
 DIST Electrum-1.9.8.tar.gz 860858 SHA256 8fc144a32013e4a747fea27fff981762a6b9e14cde9ffb405c4c721975d846ff SHA512 b18d0c301efac00b63c0b90a5d7764f02baaefddaf060b5c9b57b38dbd625cc9ac9cd6219b387930ca6da7e63d160e48cd34dc755cdf8eb48478bf327d6839e5 WHIRLPOOL 989f6efd2af8b14ef8e0b76cf687c90c9352bedcdcb9ae99110df2c8ead46078bcf6dc4e7c98b8dfe19eaae08caf05352b7be4cf1b85da6fade396c7816163f0
 EBUILD electrum-1.7.4.ebuild 1883 SHA256 15e56b4d3807c7328af623b9e735325c90e58bc90a3a812dacd146cce6899c11 SHA512 3566207676d012205a539a2e220a311a286167680320b5163e006c9bb5ac8c5b9e400cff8d3d20721b7ff218c3e10ac163cce162e637ba3de8eccef054a7898e WHIRLPOOL 18e0151cbea90b920d4034ac2ae3958e0e15da9f96f611679d1ebb4a7822f89d0cea9518a920d4cb604d22a0146abd63f09bc6dacc9aebc402b7545ab8a9c8f9
 EBUILD electrum-1.8.1.ebuild 1908 SHA256 36df3d9f2ca84f2dcead4e82555a71da7d76c4d065c36229857752964ecb7ba4 SHA512 ea2c9ab814b8238c88068261b2203b2b6f95a0acac544b38924e25b1cdfa902b8e3ea4f389512277eb98c736412c6695dcd8d9eb2798930710ad70ec04d5ec66 WHIRLPOOL 2baf332c7a34c67b9751e2e988a1b8a0a7d7a7ebb69662777b3efc357390ab32f9799f35094160db7c2c7717514c66f1d1d1b9d39ab957b9cfa9892ef4725010
-EBUILD electrum-1.9.7.ebuild 2394 SHA256 e0f13dbf1255703863fd1ce9e49c98e7e92ee6f4bbcca193d899e5123fc45307 SHA512 03414dd1f9eceee11e3854a66e3a5413d8829527e56c25f13a520aea4a08f7af8eca2aaeb7deb73e5791f2c4d47e38d471a73d3ac0f093c2b867f75c9c8f6e1e WHIRLPOOL 2dc8528f5f280e7b368e5969ce17b49f19fb6fce4677b0435562b6db1d2bda510f8c165d373ef66b0143f6999b1ae4a07049c65845125231bc755ca219999312
-EBUILD electrum-1.9.8.ebuild 2394 SHA256 c1e6f10079c8b2bb55bffc88a3a93110a77800509f42b3f1e051afb1d9b20331 SHA512 aed154138cdbc4bba98d4c44097a755b64395c09cadf06916b185bcfe2fcfe42f3518e86e4b4a635de5bc747d1942839864475234b4cd1c98c01893e8002333c WHIRLPOOL a4223b936aecdfbfd81d8013fb81b79b333ff87a38543aa76d5eab78648d9d98def09bc97f91ef0dde00b0f5f1673da5bb24af8e45a1f2c9c511939e5ddc0356
-MISC ChangeLog 3623 SHA256 3dd96ce76a50ccce6b0e7a72fa54ab79861f8965b2ef46296f4ed850e106597e SHA512 722f2cf082d4b3167344616d4ce027bf606eedd17642bbb2746f4e1167efa8d6f068b64c9cd5aa181406af2001525579694592e863e04e0caa119a96761d4f8d WHIRLPOOL 4145b3ae508e6e0509f2e8a62f1092755bda6e5d8cbafe70f4ea685605448daf724d73a2d36740876d57d28ef433ea4fdf626fb630869fbf2461854ebdbc717f
+EBUILD electrum-1.9.7.ebuild 2398 SHA256 29955d53764489a3e1b3dd46044fa6f5cf3b096dd4423e0e409194ac3ea8af71 SHA512 0bf12b96ddb47b325e089d86c067ed82d1f1d89e2312b317f309cc9be077d7be19781ff827d48d6281566c027634da0e2ced518d7802d3572eb6da4c0f14fd98 WHIRLPOOL 06487a1a3c47647ac5a9226c65a71752db7032a8d94272090183ea96628894ee0be044a0f7b8ded5834db8380547599475f8affd7522e4e04abe127cd6bc2f14
+EBUILD electrum-1.9.8.ebuild 2398 SHA256 022e5241148c0cb1db0386d1b3c4ef9f674bbe3b8226e019d9a174ab86a2a004 SHA512 70604cf80391aca2c73b2238249eedad0e38d76d78f5cc4ad16d80425c44d14aafbb33842d6f30ade0dac62bc749f79df9b8952c2c141f6bdf1696ef5f6f81ed WHIRLPOOL 611fb8c8ead679215c3dd5d1be4aa29b0a0ab82bd6a56434fe76e04c8a241666c7814e0ea68004453243186a6fd8c9fc21c7eeb10b55676243e8942b810b1682
+MISC ChangeLog 3803 SHA256 4edc759ea2b32fb6fbeba88366d65ce7eb1e1f90290e95429329b2bf25e9dd72 SHA512 253377c30983d4cff5a746d94216e8bae979b4a7c999e9ed8a52fb4b41013b171ea18dd6c44108a3b003506b1e9631d6b6f2f99db7b2d9fd4b479ae00aab3e37 WHIRLPOOL 08af06cc4376c19071b8323dc44bde9d2ed334953dcd4876ac1eac79b073de87aaa1884e0756cdc6bce2988544b33b633551020c0bf7204dcbd82c8b409164df
 MISC metadata.xml 667 SHA256 9ba9f278da011a3522b1bb8973b501116f123480af5572fb7162faf3cecc0274 SHA512 b661eee1eb5c9baf2404f9b7c215f751f66b362550c8b920578b6dc696e112ab244aa25081178456104076c3289b17b3e4c7d128c638767acfae9e06f0e0c932 WHIRLPOOL 01f23285b706709d6a3571bd63a28aaa744ccb149f370a76b56f80eaa0b0c8392f914422633f9324f240e8aa2a6be360834d16430af942388d985aa88737cfeb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUe0kaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJU3zgfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOa50P/19z0XPA361Cjd/4s1MIhsDE
-0jrpQOxUbWU/eW5o3fNiiMM2cKKQqDHKD55lNd8DFLky/3rC+cLcUGCV0aMDi7/e
-Ws+8VO8ypLho6U4nKdIe/lKK8qJaPA/jxQyYG1F3Iis7BZNvNlenMMvjxcBfcxzO
-9xAaLG+SNZ+bQ5OeODBpim3K+KQbDLYRK2w301oviKtEi902XEgvD42YxCbwJbbD
-SXDHUnErpjT/4Txkj3pHYQ0eqHMMbnf5q2/JCvBRF6buRBlqY71c1GhzudUNtYmQ
-66YbJ6o53iCQpWSpGttRErfdtzVpQpeqgaFd8HbwlFnL8k/jFqsNFI791NmT2ieE
-7GDfp9+Z6xNGd6k2SX4Izd787WWdusxqxse+h5qQPxwjh34I1/TNlwVUEHP6gtP/
-4W2ENgBj9TsLk5oGsG7t+u8oy46J1Um8ml57qyrqmPwg6Twge77K1SNjTIEC888e
-YbNRmKalMVTovQYnNFvGS2TPahPSfGl3QSIBmJFfqIrJT8siKFur6VUb2ft4BnqX
-7cR5iVSKDTSz++uzP1tYnjrI51abGLturjEEM+NF/ViDAjiGrIt8VRtN5RMi7S1f
-zsEhbdnE3gAJvKgHA+lMWEGF2N94m23nP72JobVKbvldW3+/khfMiLts4edfds0j
-Ihmp3o9qb6Byh+CrHCu3
-=hme0
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO7NcQALgEws5tjQlfThRdLHe443CB
+UCv5Fo3ESqoSrp7FCXR6JXwoD0FnrxT1FCR8caTMrGcQWPrYJz6CxJkDULVxZhmc
+G1qQa3Fg5JkkeTPMrSkrrtW0KhIRpPAERc/24Lt2H+uyIaOE2kdTzrHMpWTyeMp1
+0Ho85tTUpNKkvNiMQ2clkTfNaYiGLRAq6NY0b2GOyEc/j/Jt6jruBQTZ8+ixBSUU
+TX/dPb2+ktKpCYHq+CakeNaw8ebOPlb4ksjLNFl9Yb1JbrAA9tPHabCkGpcDoZLq
+TZXdmld6wT4xcLlZm43PEA/LPkgbfv5RjrFSelm6vt75RS/gm4uZlxTkKhzEaODM
+ORd7eYjOmM2yfJERTb1PmoMe7N2lXisO3+ezMaYJONgmz5SDpD2TUociIVbwXGDp
+024XW2LS32e+4jc9aGpE1OV9rM3qxjrRFJnBPh/khE5RQoJ2kDkTXIO7plNBseXu
+gJw1iSgSR1hhrbZuCrVyjmfOH7p36oUvmTKMr9mNoZZHBEClcHEMuC6fwdpNPR0Y
+aTkaqNOXBo/LPu0Pd9P2Coyzwh+CSQf3Ov55HXJa0FWogaL2yD/oTEj+Yp3CoOpC
+Yd1DIThhQCnBje7gRMK70fZqG/esCvf7TLtn0TXUHARAuVWJd0qQUXY4jIhwGPAu
+s1xPJL48a8kYSMQWZBA6
+=xU3S
 -----END PGP SIGNATURE-----
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}]