From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-974210-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 27B421396D2
for <garchives@archives.gentoo.org>; Thu, 21 Sep 2017 21:06:09 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 2C823E0BC7;
Thu, 21 Sep 2017 21:06:08 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 0288BE0BC7
for <gentoo-commits@lists.gentoo.org>; Thu, 21 Sep 2017 21:06:08 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 0E5293402FE
for <gentoo-commits@lists.gentoo.org>; Thu, 21 Sep 2017 21:06:07 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id BE5039086
for <gentoo-commits@lists.gentoo.org>; Thu, 21 Sep 2017 21:06:05 +0000 (UTC)
From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" <floppym@gentoo.org>
Message-ID: <1506027835.1ef264f46c776ec2913a5bea05bd1563c73e6d7b.floppym@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-gfx/mypaint/mypaint-1.1.0-r2.ebuild media-gfx/mypaint/mypaint-1.2.0.ebuild media-gfx/mypaint/mypaint-1.2.1.ebuild
X-VCS-Directories: media-gfx/mypaint/
X-VCS-Committer: floppym
X-VCS-Committer-Name: Mike Gilbert
X-VCS-Revision: 1ef264f46c776ec2913a5bea05bd1563c73e6d7b
X-VCS-Branch: master
Date: Thu, 21 Sep 2017 21:06:05 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 80a0d392-97da-49c3-8652-4559dc31a1f0
X-Archives-Hash: a11b475d9098345d0d8b41a90e3744aa
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