public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/
Date: Thu, 16 Jan 2020 06:39:15 +0000 (UTC)	[thread overview]
Message-ID: <1579154982.6239799ea9a410047ee324758ed6f5423626cbfc.mgorny@gentoo> (raw)

commit:     6239799ea9a410047ee324758ed6f5423626cbfc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 16 06:09:42 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 06:09:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6239799e

media-gfx/mypaint: Permit numpy-python2

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-gfx/mypaint/mypaint-1.2.1-r3.ebuild | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild b/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild
index a557d74eb68..d30ef32ed43 100644
--- a/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild
+++ b/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,10 @@ LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk z
 
 RDEPEND="${PYTHON_DEPS}
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
+	|| (
+		dev-python/numpy-python2[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
 	>=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
 	>=dev-libs/json-c-0.11:=


             reply	other threads:[~2020-01-16  6:39 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-16  6:39 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-07-17  5:54 [gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/ Sam James
2024-03-06 19:47 Arthur Zamarin
2023-12-28  3:43 Sam James
2023-06-04 15:49 Arthur Zamarin
2023-03-10  8:21 Arthur Zamarin
2023-03-09  8:54 Sam James
2022-01-04 20:45 Sam James
2020-10-20  9:07 Sam James
2020-09-25  8:46 Agostino Sarubbo
2020-09-19 21:29 Sam James
2020-09-18 13:56 Sam James
2020-08-16 19:48 Sam James
2020-02-09 16:29 Michał Górny
2020-01-22 21:50 Michał Górny
2019-04-01 17:21 Thomas Deutschmann
2019-03-17 18:13 Agostino Sarubbo
2018-10-13 17:36 Pacho Ramos
2018-10-13 17:36 Pacho Ramos
2018-08-08 17:22 Sebastian Pipping
2018-07-31 22:05 Michał Górny
2018-04-30 15:58 Mike Gilbert
2018-01-05 22:02 Ulrich Müller
2017-09-21 21:06 Mike Gilbert
2017-01-22  0:18 Lars Wendler
2016-12-20 15:51 Tobias Klausmann
2016-03-06 11:45 Markos Chandras

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1579154982.6239799ea9a410047ee324758ed6f5423626cbfc.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox