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: sci-chemistry/relax/
Date: Sun,  9 Feb 2020 16:36:32 +0000 (UTC)	[thread overview]
Message-ID: <1581266120.b3b95491e29af254135e028d65c5cfc560efa608.mgorny@gentoo> (raw)

commit:     b3b95491e29af254135e028d65c5cfc560efa608
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  7 18:01:01 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> 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 <mgorny <AT> 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]"


             reply	other threads:[~2020-02-09 16:36 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-09 16:36 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-01-28 21:30 [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/ Michał Górny
2020-01-28 20:40 Michał Górny
2020-01-22 21:50 Michał Górny
2020-01-16  6:39 Michał Górny
2020-01-16  6:39 Michał Górny
2017-02-23 23:14 Mart Raudsepp
2015-10-25 16:36 Pacho Ramos
2015-10-16  9:21 Justin Lecher
2015-10-12 11:40 Justin Lecher
2015-10-12  9:35 Justin Lecher

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=1581266120.b3b95491e29af254135e028d65c5cfc560efa608.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