Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/electrum/
Date: Mon, 30 Apr 2018 15:58:39
Message-Id: 1525102791.7fc90b33fd72166b25a9d414929a1beaf63ba015.floppym@gentoo
1 commit: 7fc90b33fd72166b25a9d414929a1beaf63ba015
2 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
3 AuthorDate: Mon Apr 30 15:10:25 2018 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 30 15:39:51 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fc90b33
7
8 net-misc/electrum: Clean dev-libs/protobuf dependencies.
9
10 net-misc/electrum/electrum-3.0.5.ebuild | 5 +----
11 net-misc/electrum/electrum-3.0.6.ebuild | 5 +----
12 net-misc/electrum/electrum-3.1.1.ebuild | 5 +----
13 net-misc/electrum/electrum-3.1.2.ebuild | 5 +----
14 4 files changed, 4 insertions(+), 16 deletions(-)
15
16 diff --git a/net-misc/electrum/electrum-3.0.5.ebuild b/net-misc/electrum/electrum-3.0.5.ebuild
17 index 63e1b139bf8..1f796881201 100644
18 --- a/net-misc/electrum/electrum-3.0.5.ebuild
19 +++ b/net-misc/electrum/electrum-3.0.5.ebuild
20 @@ -58,10 +58,7 @@ RDEPEND="${PYTHON_DEPS}
21 dev-python/setuptools[${PYTHON_USEDEP}]
22 dev-python/six[${PYTHON_USEDEP}]
23 dev-python/tlslite[${PYTHON_USEDEP}]
24 - || (
25 - dev-python/protobuf-python[${PYTHON_USEDEP}]
26 - dev-libs/protobuf[python,${PYTHON_USEDEP}]
27 - )
28 + dev-python/protobuf-python[${PYTHON_USEDEP}]
29 virtual/python-dnspython[${PYTHON_USEDEP}]
30 qrcode? ( media-gfx/zbar[v4l] )
31 qt5? (
32
33 diff --git a/net-misc/electrum/electrum-3.0.6.ebuild b/net-misc/electrum/electrum-3.0.6.ebuild
34 index f6c1a77ec4b..dc974d4c43a 100644
35 --- a/net-misc/electrum/electrum-3.0.6.ebuild
36 +++ b/net-misc/electrum/electrum-3.0.6.ebuild
37 @@ -57,10 +57,7 @@ RDEPEND="${PYTHON_DEPS}
38 dev-python/setuptools[${PYTHON_USEDEP}]
39 dev-python/six[${PYTHON_USEDEP}]
40 dev-python/tlslite[${PYTHON_USEDEP}]
41 - || (
42 - dev-python/protobuf-python[${PYTHON_USEDEP}]
43 - dev-libs/protobuf[python,${PYTHON_USEDEP}]
44 - )
45 + dev-python/protobuf-python[${PYTHON_USEDEP}]
46 virtual/python-dnspython[${PYTHON_USEDEP}]
47 qrcode? ( media-gfx/zbar[v4l] )
48 qt5? (
49
50 diff --git a/net-misc/electrum/electrum-3.1.1.ebuild b/net-misc/electrum/electrum-3.1.1.ebuild
51 index 957704e0775..ed1b46dc489 100644
52 --- a/net-misc/electrum/electrum-3.1.1.ebuild
53 +++ b/net-misc/electrum/electrum-3.1.1.ebuild
54 @@ -57,10 +57,7 @@ RDEPEND="${PYTHON_DEPS}
55 dev-python/setuptools[${PYTHON_USEDEP}]
56 dev-python/six[${PYTHON_USEDEP}]
57 dev-python/tlslite[${PYTHON_USEDEP}]
58 - || (
59 - dev-python/protobuf-python[${PYTHON_USEDEP}]
60 - dev-libs/protobuf[python,${PYTHON_USEDEP}]
61 - )
62 + dev-python/protobuf-python[${PYTHON_USEDEP}]
63 virtual/python-dnspython[${PYTHON_USEDEP}]
64 qrcode? ( media-gfx/zbar[v4l] )
65 qt5? (
66
67 diff --git a/net-misc/electrum/electrum-3.1.2.ebuild b/net-misc/electrum/electrum-3.1.2.ebuild
68 index a336ee7a3d3..b10060186b9 100644
69 --- a/net-misc/electrum/electrum-3.1.2.ebuild
70 +++ b/net-misc/electrum/electrum-3.1.2.ebuild
71 @@ -57,10 +57,7 @@ RDEPEND="${PYTHON_DEPS}
72 dev-python/setuptools[${PYTHON_USEDEP}]
73 dev-python/six[${PYTHON_USEDEP}]
74 dev-python/tlslite[${PYTHON_USEDEP}]
75 - || (
76 - dev-python/protobuf-python[${PYTHON_USEDEP}]
77 - dev-libs/protobuf[python,${PYTHON_USEDEP}]
78 - )
79 + dev-python/protobuf-python[${PYTHON_USEDEP}]
80 virtual/python-dnspython[${PYTHON_USEDEP}]
81 qrcode? ( media-gfx/zbar[v4l] )
82 qt5? (