[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

[Mike Gilbert]

commit:     1ef264f46c776ec2913a5bea05bd1563c73e6d7b
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Sep 21 04:54:55 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=1ef264f4

media-gfx/mypaint: Depend on || ( dev-python/protobuf-python 
dev-libs/protobuf[python] ).

 media-gfx/mypaint/mypaint-1.1.0-r2.ebuild | 5 ++++-
 media-gfx/mypaint/mypaint-1.2.0.ebuild    | 7 +++++--
 media-gfx/mypaint/mypaint-1.2.1.ebuild    | 5 ++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild 
b/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild
index 0bcf8d438b8..e0a166f92e9 100644
--- a/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild
+++ b/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild
@@ -25,7 +25,10 @@ RDEPEND="
        dev-python/pygtk:2[${PYTHON_USEDEP}]
        dev-python/numpy[${PYTHON_USEDEP}]
        >=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
-       dev-libs/protobuf[python,${PYTHON_USEDEP}]
+       || (
+               dev-python/protobuf-python[${PYTHON_USEDEP}]
+               dev-libs/protobuf[python,${PYTHON_USEDEP}]
+       )
        >=dev-libs/json-c-0.11:=
        media-libs/lcms:2
        media-libs/libpng:0=

diff --git a/media-gfx/mypaint/mypaint-1.2.0.ebuild 
b/media-gfx/mypaint/mypaint-1.2.0.ebuild
index 9405f147f88..f95ce3047df 100644
--- a/media-gfx/mypaint/mypaint-1.2.0.ebuild
+++ b/media-gfx/mypaint/mypaint-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,7 +25,10 @@ RDEPEND="
        dev-python/pygobject:3[${PYTHON_USEDEP}]
        dev-python/numpy[${PYTHON_USEDEP}]
        >=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
-       dev-libs/protobuf[python,${PYTHON_USEDEP}]
+       || (
+               dev-python/protobuf-python[${PYTHON_USEDEP}]
+               dev-libs/protobuf[python,${PYTHON_USEDEP}]
+       )
        >=dev-libs/json-c-0.11:=
        media-libs/lcms:2
        media-libs/libpng:0=

diff --git a/media-gfx/mypaint/mypaint-1.2.1.ebuild 
b/media-gfx/mypaint/mypaint-1.2.1.ebuild
index 616f7a56052..9b65292a4a4 100644
--- a/media-gfx/mypaint/mypaint-1.2.1.ebuild
+++ b/media-gfx/mypaint/mypaint-1.2.1.ebuild
@@ -25,7 +25,10 @@ RDEPEND="
        dev-python/pygobject:3[${PYTHON_USEDEP}]
        dev-python/numpy[${PYTHON_USEDEP}]
        >=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
-       dev-libs/protobuf[python,${PYTHON_USEDEP}]
+       || (
+               dev-python/protobuf-python[${PYTHON_USEDEP}]
+               dev-libs/protobuf[python,${PYTHON_USEDEP}]
+       )
        >=dev-libs/json-c-0.11:=
        media-libs/lcms:2
        >=media-libs/libmypaint-1.3.0