commit: 57f73e115eebaeed31ce3ec385bbe1e4397bddaa Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> AuthorDate: Thu Sep 21 05:09:15 2017 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Thu Sep 21 21:03:55 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57f73e11
net-misc/electrum: Depend on || ( dev-python/protobuf-python dev-libs/protobuf[python] ). net-misc/electrum/electrum-2.7.15.ebuild | 5 ++++- net-misc/electrum/electrum-2.8.0-r1.ebuild | 5 ++++- net-misc/electrum/electrum-2.8.2.ebuild | 5 ++++- net-misc/electrum/electrum-2.8.3.ebuild | 5 ++++- net-misc/electrum/electrum-2.9.3.ebuild | 5 ++++- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/net-misc/electrum/electrum-2.7.15.ebuild b/net-misc/electrum/electrum-2.7.15.ebuild index 5b06f8837de..536d54d9c39 100644 --- a/net-misc/electrum/electrum-2.7.15.ebuild +++ b/net-misc/electrum/electrum-2.7.15.ebuild @@ -46,7 +46,10 @@ RDEPEND=" dev-python/slowaes[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] dev-python/tlslite[${PYTHON_USEDEP}] - dev-libs/protobuf[python,${PYTHON_USEDEP}] + || ( + dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-libs/protobuf[python,${PYTHON_USEDEP}] + ) virtual/python-dnspython[${PYTHON_USEDEP}] qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] ) qt4? ( diff --git a/net-misc/electrum/electrum-2.8.0-r1.ebuild b/net-misc/electrum/electrum-2.8.0-r1.ebuild index f5702a969e5..b0058483217 100644 --- a/net-misc/electrum/electrum-2.8.0-r1.ebuild +++ b/net-misc/electrum/electrum-2.8.0-r1.ebuild @@ -48,7 +48,10 @@ RDEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] dev-python/tlslite[${PYTHON_USEDEP}] - dev-libs/protobuf[python,${PYTHON_USEDEP}] + || ( + dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-libs/protobuf[python,${PYTHON_USEDEP}] + ) virtual/python-dnspython[${PYTHON_USEDEP}] qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] ) qt4? ( diff --git a/net-misc/electrum/electrum-2.8.2.ebuild b/net-misc/electrum/electrum-2.8.2.ebuild index d6fe7a859a4..82aa0e5d8a4 100644 --- a/net-misc/electrum/electrum-2.8.2.ebuild +++ b/net-misc/electrum/electrum-2.8.2.ebuild @@ -48,7 +48,10 @@ RDEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] dev-python/tlslite[${PYTHON_USEDEP}] - dev-libs/protobuf[python,${PYTHON_USEDEP}] + || ( + dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-libs/protobuf[python,${PYTHON_USEDEP}] + ) virtual/python-dnspython[${PYTHON_USEDEP}] qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] ) qt4? ( diff --git a/net-misc/electrum/electrum-2.8.3.ebuild b/net-misc/electrum/electrum-2.8.3.ebuild index d6fe7a859a4..82aa0e5d8a4 100644 --- a/net-misc/electrum/electrum-2.8.3.ebuild +++ b/net-misc/electrum/electrum-2.8.3.ebuild @@ -48,7 +48,10 @@ RDEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] dev-python/tlslite[${PYTHON_USEDEP}] - dev-libs/protobuf[python,${PYTHON_USEDEP}] + || ( + dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-libs/protobuf[python,${PYTHON_USEDEP}] + ) virtual/python-dnspython[${PYTHON_USEDEP}] qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] ) qt4? ( diff --git a/net-misc/electrum/electrum-2.9.3.ebuild b/net-misc/electrum/electrum-2.9.3.ebuild index d6fe7a859a4..82aa0e5d8a4 100644 --- a/net-misc/electrum/electrum-2.9.3.ebuild +++ b/net-misc/electrum/electrum-2.9.3.ebuild @@ -48,7 +48,10 @@ RDEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] dev-python/tlslite[${PYTHON_USEDEP}] - dev-libs/protobuf[python,${PYTHON_USEDEP}] + || ( + dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-libs/protobuf[python,${PYTHON_USEDEP}] + ) virtual/python-dnspython[${PYTHON_USEDEP}] qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] ) qt4? (