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 1FB60138351 for ; Sun, 9 Feb 2020 16:36:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5AF87E085A; Sun, 9 Feb 2020 16:36:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 445D5E085A for ; Sun, 9 Feb 2020 16:36:34 +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 81EBD34E501 for ; Sun, 9 Feb 2020 16:36:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3D5F812D for ; Sun, 9 Feb 2020 16:36:32 +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: <1581266120.b3b95491e29af254135e028d65c5cfc560efa608.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-r3.ebuild sci-chemistry/relax/relax-4.0.0-r4.ebuild X-VCS-Directories: sci-chemistry/relax/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b3b95491e29af254135e028d65c5cfc560efa608 X-VCS-Branch: master Date: Sun, 9 Feb 2020 16:36:32 +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: 7814c4fc-0ceb-47ec-872a-e4267a4988e8 X-Archives-Hash: 2bce80f30221cb40ca8a36574a088d83 commit: b3b95491e29af254135e028d65c5cfc560efa608 Author: Michał Górny gentoo org> AuthorDate: Fri Feb 7 18:01:01 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Feb 9 16:35:20 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3b95491 sci-chemistry/relax: Switch to PYTHON_MULTI_USEDEP API Signed-off-by: Michał Górny gentoo.org> ...relax-4.0.0-r3.ebuild => relax-4.0.0-r4.ebuild} | 36 ++++++++++++---------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/sci-chemistry/relax/relax-4.0.0-r3.ebuild b/sci-chemistry/relax/relax-4.0.0-r4.ebuild similarity index 66% rename from sci-chemistry/relax/relax-4.0.0-r3.ebuild rename to sci-chemistry/relax/relax-4.0.0-r4.ebuild index 28b0f5d9da6..ba03dbad845 100644 --- a/sci-chemistry/relax/relax-4.0.0-r3.ebuild +++ b/sci-chemistry/relax/relax-4.0.0-r4.ebuild @@ -23,25 +23,27 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" ${PYTHON_DEPS} - dev-python/Numdifftools[${PYTHON_USEDEP}] - || ( - dev-python/matplotlib-python2[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - ) - || ( - dev-python/numpy-python2[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - ) - dev-python/wxpython:${WX_GTK_VER}[${PYTHON_USEDEP}] + $(python_gen_cond_dep " + dev-python/Numdifftools[\${PYTHON_MULTI_USEDEP}] + || ( + dev-python/matplotlib-python2[\${PYTHON_MULTI_USEDEP}] + dev-python/matplotlib[\${PYTHON_MULTI_USEDEP}] + ) + || ( + dev-python/numpy-python2[\${PYTHON_MULTI_USEDEP}] + dev-python/numpy[\${PYTHON_MULTI_USEDEP}] + ) + dev-python/wxpython:${WX_GTK_VER}[\${PYTHON_MULTI_USEDEP}] + sci-chemistry/pymol[\${PYTHON_MULTI_USEDEP}] + >=sci-libs/bmrblib-1.0.3[\${PYTHON_MULTI_USEDEP}] + >=sci-libs/minfx-1.0.11[\${PYTHON_MULTI_USEDEP}] + || ( + sci-libs/scipy-python2[\${PYTHON_MULTI_USEDEP}] + sci-libs/scipy[\${PYTHON_MULTI_USEDEP}] + ) + ") sci-chemistry/molmol - sci-chemistry/pymol[${PYTHON_USEDEP}] sci-chemistry/vmd - >=sci-libs/bmrblib-1.0.3[${PYTHON_USEDEP}] - >=sci-libs/minfx-1.0.11[${PYTHON_USEDEP}] - || ( - sci-libs/scipy-python2[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] - ) sci-visualization/grace sci-visualization/opendx x11-libs/wxGTK:${WX_GTK_VER}[X]"