Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/
Date: Thu, 21 Sep 2017 21:06:09
Message-Id: 1506027835.1ef264f46c776ec2913a5bea05bd1563c73e6d7b.floppym@gentoo
1 commit: 1ef264f46c776ec2913a5bea05bd1563c73e6d7b
2 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
3 AuthorDate: Thu Sep 21 04:54:55 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=1ef264f4
7
8 media-gfx/mypaint: Depend on || ( dev-python/protobuf-python dev-libs/protobuf[python] ).
9
10 media-gfx/mypaint/mypaint-1.1.0-r2.ebuild | 5 ++++-
11 media-gfx/mypaint/mypaint-1.2.0.ebuild | 7 +++++--
12 media-gfx/mypaint/mypaint-1.2.1.ebuild | 5 ++++-
13 3 files changed, 13 insertions(+), 4 deletions(-)
14
15 diff --git a/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild b/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild
16 index 0bcf8d438b8..e0a166f92e9 100644
17 --- a/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild
18 +++ b/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild
19 @@ -25,7 +25,10 @@ RDEPEND="
20 dev-python/pygtk:2[${PYTHON_USEDEP}]
21 dev-python/numpy[${PYTHON_USEDEP}]
22 >=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
23 - dev-libs/protobuf[python,${PYTHON_USEDEP}]
24 + || (
25 + dev-python/protobuf-python[${PYTHON_USEDEP}]
26 + dev-libs/protobuf[python,${PYTHON_USEDEP}]
27 + )
28 >=dev-libs/json-c-0.11:=
29 media-libs/lcms:2
30 media-libs/libpng:0=
31
32 diff --git a/media-gfx/mypaint/mypaint-1.2.0.ebuild b/media-gfx/mypaint/mypaint-1.2.0.ebuild
33 index 9405f147f88..f95ce3047df 100644
34 --- a/media-gfx/mypaint/mypaint-1.2.0.ebuild
35 +++ b/media-gfx/mypaint/mypaint-1.2.0.ebuild
36 @@ -1,4 +1,4 @@
37 -# Copyright 1999-2015 Gentoo Foundation
38 +# Copyright 1999-2017 Gentoo Foundation
39 # Distributed under the terms of the GNU General Public License v2
40
41 EAPI=5
42 @@ -25,7 +25,10 @@ RDEPEND="
43 dev-python/pygobject:3[${PYTHON_USEDEP}]
44 dev-python/numpy[${PYTHON_USEDEP}]
45 >=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
46 - dev-libs/protobuf[python,${PYTHON_USEDEP}]
47 + || (
48 + dev-python/protobuf-python[${PYTHON_USEDEP}]
49 + dev-libs/protobuf[python,${PYTHON_USEDEP}]
50 + )
51 >=dev-libs/json-c-0.11:=
52 media-libs/lcms:2
53 media-libs/libpng:0=
54
55 diff --git a/media-gfx/mypaint/mypaint-1.2.1.ebuild b/media-gfx/mypaint/mypaint-1.2.1.ebuild
56 index 616f7a56052..9b65292a4a4 100644
57 --- a/media-gfx/mypaint/mypaint-1.2.1.ebuild
58 +++ b/media-gfx/mypaint/mypaint-1.2.1.ebuild
59 @@ -25,7 +25,10 @@ RDEPEND="
60 dev-python/pygobject:3[${PYTHON_USEDEP}]
61 dev-python/numpy[${PYTHON_USEDEP}]
62 >=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
63 - dev-libs/protobuf[python,${PYTHON_USEDEP}]
64 + || (
65 + dev-python/protobuf-python[${PYTHON_USEDEP}]
66 + dev-libs/protobuf[python,${PYTHON_USEDEP}]
67 + )
68 >=dev-libs/json-c-0.11:=
69 media-libs/lcms:2
70 >=media-libs/libmypaint-1.3.0