From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1141330-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 4CD9C138350
for <garchives@archives.gentoo.org>; Tue, 28 Jan 2020 21:30:36 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 35072E0866;
Tue, 28 Jan 2020 21:30:33 +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 11794E0866
for <gentoo-commits@lists.gentoo.org>; Tue, 28 Jan 2020 21:30:33 +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 102A434E456
for <gentoo-commits@lists.gentoo.org>; Tue, 28 Jan 2020 21:30:32 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id F0DA610C
for <gentoo-commits@lists.gentoo.org>; Tue, 28 Jan 2020 21:30:28 +0000 (UTC)
From: "Michał Górny" <mgorny@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, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1580247015.db75bd2e8c3456b678a59f48d37385b04d554f69.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/prodecomp/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-chemistry/prodecomp/prodecomp-3.0-r1.ebuild sci-chemistry/prodecomp/prodecomp-3.0-r2.ebuild
X-VCS-Directories: sci-chemistry/prodecomp/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: db75bd2e8c3456b678a59f48d37385b04d554f69
X-VCS-Branch: master
Date: Tue, 28 Jan 2020 21:30:28 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: dfe3f5ce-7e65-4fe1-b3fa-4e23036cd4d8
X-Archives-Hash: 584e627605b2b3fef9379a8c06ebb661
commit: db75bd2e8c3456b678a59f48d37385b04d554f69
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 28 20:57:21 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jan 28 21:30:15 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db75bd2e
sci-chemistry/prodecomp: Permit scipy-python2
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../prodecomp/{prodecomp-3.0-r1.ebuild => prodecomp-3.0-r2.ebuild} | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/sci-chemistry/prodecomp/prodecomp-3.0-r1.ebuild b/sci-chemistry/prodecomp/prodecomp-3.0-r2.ebuild
similarity index 89%
rename from sci-chemistry/prodecomp/prodecomp-3.0-r1.ebuild
rename to sci-chemistry/prodecomp/prodecomp-3.0-r2.ebuild
index ad5fb6271a2..e66cac2b0b4 100644
--- a/sci-chemistry/prodecomp/prodecomp-3.0-r1.ebuild
+++ b/sci-chemistry/prodecomp/prodecomp-3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -20,7 +20,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="${PYTHON_DEPS}"
RDEPEND="${DEPEND}
- sci-libs/scipy[${PYTHON_USEDEP}]"
+ || (
+ sci-libs/scipy-python2[${PYTHON_USEDEP}]
+ sci-libs/scipy[${PYTHON_USEDEP}]
+ )"
S="${WORKDIR}"/NMRProjAnalys