1 |
commit: 57f73e115eebaeed31ce3ec385bbe1e4397bddaa |
2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
3 |
AuthorDate: Thu Sep 21 05:09:15 2017 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 21 21:03:55 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57f73e11 |
7 |
|
8 |
net-misc/electrum: Depend on || ( dev-python/protobuf-python dev-libs/protobuf[python] ). |
9 |
|
10 |
net-misc/electrum/electrum-2.7.15.ebuild | 5 ++++- |
11 |
net-misc/electrum/electrum-2.8.0-r1.ebuild | 5 ++++- |
12 |
net-misc/electrum/electrum-2.8.2.ebuild | 5 ++++- |
13 |
net-misc/electrum/electrum-2.8.3.ebuild | 5 ++++- |
14 |
net-misc/electrum/electrum-2.9.3.ebuild | 5 ++++- |
15 |
5 files changed, 20 insertions(+), 5 deletions(-) |
16 |
|
17 |
diff --git a/net-misc/electrum/electrum-2.7.15.ebuild b/net-misc/electrum/electrum-2.7.15.ebuild |
18 |
index 5b06f8837de..536d54d9c39 100644 |
19 |
--- a/net-misc/electrum/electrum-2.7.15.ebuild |
20 |
+++ b/net-misc/electrum/electrum-2.7.15.ebuild |
21 |
@@ -46,7 +46,10 @@ RDEPEND=" |
22 |
dev-python/slowaes[${PYTHON_USEDEP}] |
23 |
dev-python/six[${PYTHON_USEDEP}] |
24 |
dev-python/tlslite[${PYTHON_USEDEP}] |
25 |
- dev-libs/protobuf[python,${PYTHON_USEDEP}] |
26 |
+ || ( |
27 |
+ dev-python/protobuf-python[${PYTHON_USEDEP}] |
28 |
+ dev-libs/protobuf[python,${PYTHON_USEDEP}] |
29 |
+ ) |
30 |
virtual/python-dnspython[${PYTHON_USEDEP}] |
31 |
qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] ) |
32 |
qt4? ( |
33 |
|
34 |
diff --git a/net-misc/electrum/electrum-2.8.0-r1.ebuild b/net-misc/electrum/electrum-2.8.0-r1.ebuild |
35 |
index f5702a969e5..b0058483217 100644 |
36 |
--- a/net-misc/electrum/electrum-2.8.0-r1.ebuild |
37 |
+++ b/net-misc/electrum/electrum-2.8.0-r1.ebuild |
38 |
@@ -48,7 +48,10 @@ RDEPEND=" |
39 |
dev-python/setuptools[${PYTHON_USEDEP}] |
40 |
dev-python/six[${PYTHON_USEDEP}] |
41 |
dev-python/tlslite[${PYTHON_USEDEP}] |
42 |
- dev-libs/protobuf[python,${PYTHON_USEDEP}] |
43 |
+ || ( |
44 |
+ dev-python/protobuf-python[${PYTHON_USEDEP}] |
45 |
+ dev-libs/protobuf[python,${PYTHON_USEDEP}] |
46 |
+ ) |
47 |
virtual/python-dnspython[${PYTHON_USEDEP}] |
48 |
qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] ) |
49 |
qt4? ( |
50 |
|
51 |
diff --git a/net-misc/electrum/electrum-2.8.2.ebuild b/net-misc/electrum/electrum-2.8.2.ebuild |
52 |
index d6fe7a859a4..82aa0e5d8a4 100644 |
53 |
--- a/net-misc/electrum/electrum-2.8.2.ebuild |
54 |
+++ b/net-misc/electrum/electrum-2.8.2.ebuild |
55 |
@@ -48,7 +48,10 @@ RDEPEND=" |
56 |
dev-python/setuptools[${PYTHON_USEDEP}] |
57 |
dev-python/six[${PYTHON_USEDEP}] |
58 |
dev-python/tlslite[${PYTHON_USEDEP}] |
59 |
- dev-libs/protobuf[python,${PYTHON_USEDEP}] |
60 |
+ || ( |
61 |
+ dev-python/protobuf-python[${PYTHON_USEDEP}] |
62 |
+ dev-libs/protobuf[python,${PYTHON_USEDEP}] |
63 |
+ ) |
64 |
virtual/python-dnspython[${PYTHON_USEDEP}] |
65 |
qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] ) |
66 |
qt4? ( |
67 |
|
68 |
diff --git a/net-misc/electrum/electrum-2.8.3.ebuild b/net-misc/electrum/electrum-2.8.3.ebuild |
69 |
index d6fe7a859a4..82aa0e5d8a4 100644 |
70 |
--- a/net-misc/electrum/electrum-2.8.3.ebuild |
71 |
+++ b/net-misc/electrum/electrum-2.8.3.ebuild |
72 |
@@ -48,7 +48,10 @@ RDEPEND=" |
73 |
dev-python/setuptools[${PYTHON_USEDEP}] |
74 |
dev-python/six[${PYTHON_USEDEP}] |
75 |
dev-python/tlslite[${PYTHON_USEDEP}] |
76 |
- dev-libs/protobuf[python,${PYTHON_USEDEP}] |
77 |
+ || ( |
78 |
+ dev-python/protobuf-python[${PYTHON_USEDEP}] |
79 |
+ dev-libs/protobuf[python,${PYTHON_USEDEP}] |
80 |
+ ) |
81 |
virtual/python-dnspython[${PYTHON_USEDEP}] |
82 |
qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] ) |
83 |
qt4? ( |
84 |
|
85 |
diff --git a/net-misc/electrum/electrum-2.9.3.ebuild b/net-misc/electrum/electrum-2.9.3.ebuild |
86 |
index d6fe7a859a4..82aa0e5d8a4 100644 |
87 |
--- a/net-misc/electrum/electrum-2.9.3.ebuild |
88 |
+++ b/net-misc/electrum/electrum-2.9.3.ebuild |
89 |
@@ -48,7 +48,10 @@ RDEPEND=" |
90 |
dev-python/setuptools[${PYTHON_USEDEP}] |
91 |
dev-python/six[${PYTHON_USEDEP}] |
92 |
dev-python/tlslite[${PYTHON_USEDEP}] |
93 |
- dev-libs/protobuf[python,${PYTHON_USEDEP}] |
94 |
+ || ( |
95 |
+ dev-python/protobuf-python[${PYTHON_USEDEP}] |
96 |
+ dev-libs/protobuf[python,${PYTHON_USEDEP}] |
97 |
+ ) |
98 |
virtual/python-dnspython[${PYTHON_USEDEP}] |
99 |
qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] ) |
100 |
qt4? ( |