net-misc/electrum: Depend on || ( dev-python/protobuf-python dev-libs/protobuf[python] ).

diff --git a/net-misc/electrum/electrum-2.7.15.ebuild b/net-misc/electrum/electrum-2.7.15.ebuild
index 5b06f8837de084072324fd4284f2e60e31fedb97..536d54d9c3969110173f2812320735d5064a671b 100644 (file)
--- 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 f5702a969e575fb4f98003788cee151023d229a4..b005848321760b85624567a43105412c20c17212 100644 (file)
--- 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 d6fe7a859a481a1c4205c73f5b4a2963a045aba8..82aa0e5d8a49906efa053f878794ce0a434408ee 100644 (file)
--- 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 d6fe7a859a481a1c4205c73f5b4a2963a045aba8..82aa0e5d8a49906efa053f878794ce0a434408ee 100644 (file)
--- 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 d6fe7a859a481a1c4205c73f5b4a2963a045aba8..82aa0e5d8a49906efa053f878794ce0a434408ee 100644 (file)
--- 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? (