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 78C0A138350 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 18AAAE08FC; 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 DF136E08C9 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 7BDFF34E10E 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 D2205BD 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: <1579156684.d1a502c6076dba392a82e7a3a476f65f4ac8cf55.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/pymol/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-chemistry/pymol/pymol-1.8.4.0-r1.ebuild sci-chemistry/pymol/pymol-2.3.0-r1.ebuild X-VCS-Directories: sci-chemistry/pymol/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: d1a502c6076dba392a82e7a3a476f65f4ac8cf55 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: 7001b897-1cf3-4fc7-bc77-2df5d24ba527 X-Archives-Hash: 7f4388b4b7f4d397818895b4e9e32e88 commit: d1a502c6076dba392a82e7a3a476f65f4ac8cf55 Author: Michał Górny gentoo org> AuthorDate: Thu Jan 16 06:27:31 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jan 16 06:38:04 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1a502c6 sci-chemistry/pymol: Permit numpy-python2 Signed-off-by: Michał Górny gentoo.org> sci-chemistry/pymol/pymol-1.8.4.0-r1.ebuild | 5 ++++- sci-chemistry/pymol/pymol-2.3.0-r1.ebuild | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sci-chemistry/pymol/pymol-1.8.4.0-r1.ebuild b/sci-chemistry/pymol/pymol-1.8.4.0-r1.ebuild index 0bcafb2e322..d6864f00a97 100644 --- a/sci-chemistry/pymol/pymol-1.8.4.0-r1.ebuild +++ b/sci-chemistry/pymol/pymol-1.8.4.0-r1.ebuild @@ -22,7 +22,10 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="web" DEPEND=" - dev-python/numpy[${PYTHON_USEDEP}] + || ( + dev-python/numpy-python2[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + ) dev-python/pmw:py2[${PYTHON_USEDEP}] dev-python/pyopengl[${PYTHON_USEDEP}] media-libs/freeglut diff --git a/sci-chemistry/pymol/pymol-2.3.0-r1.ebuild b/sci-chemistry/pymol/pymol-2.3.0-r1.ebuild index b84c2769806..7591fe38393 100644 --- a/sci-chemistry/pymol/pymol-2.3.0-r1.ebuild +++ b/sci-chemistry/pymol/pymol-2.3.0-r1.ebuild @@ -22,7 +22,10 @@ IUSE="web" DEPEND=" dev-libs/msgpack[cxx] dev-libs/mmtf-cpp - dev-python/numpy[${PYTHON_USEDEP}] + || ( + dev-python/numpy-python2[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + ) dev-python/pmw:py2[${PYTHON_USEDEP}] dev-python/pyopengl[${PYTHON_USEDEP}] dev-python/PyQt5[opengl,${PYTHON_USEDEP}]