From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 01FA5138350 for ; Thu, 16 Jan 2020 06:39:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1620CE08C9; Thu, 16 Jan 2020 06:39:22 +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 DF126E08FC for ; Thu, 16 Jan 2020 06:39:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 7B15B34E10D for ; Thu, 16 Jan 2020 06:39:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E4A73BE for ; Thu, 16 Jan 2020 06:39:16 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1579156686.71c0b83f8d859141d2a39179fc9989386b0089f2.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-chemistry/relax/relax-4.0.0-r1.ebuild X-VCS-Directories: sci-chemistry/relax/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 71c0b83f8d859141d2a39179fc9989386b0089f2 X-VCS-Branch: master Date: Thu, 16 Jan 2020 06:39:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 45f90606-dfa7-4431-9209-3bec09095cee X-Archives-Hash: e106dfc94dcafbdfcbb472209512130a commit: 71c0b83f8d859141d2a39179fc9989386b0089f2 Author: Michał Górny gentoo org> AuthorDate: Thu Jan 16 06:27:57 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jan 16 06:38:06 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71c0b83f sci-chemistry/relax: Permit numpy-python2 Signed-off-by: Michał Górny gentoo.org> sci-chemistry/relax/relax-4.0.0-r1.ebuild | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sci-chemistry/relax/relax-4.0.0-r1.ebuild b/sci-chemistry/relax/relax-4.0.0-r1.ebuild index 5a99d4554ba..da182eead0a 100644 --- a/sci-chemistry/relax/relax-4.0.0-r1.ebuild +++ b/sci-chemistry/relax/relax-4.0.0-r1.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=5 @@ -25,7 +25,10 @@ RDEPEND=" ${PYTHON_DEPS} dev-python/Numdifftools[${PYTHON_USEDEP}] dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] + || ( + dev-python/numpy-python2[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + ) dev-python/wxpython:${WX_GTK_VER}[${PYTHON_USEDEP}] sci-chemistry/molmol sci-chemistry/pymol[${PYTHON_USEDEP}]