[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-15 Thread Michał Górny
commit: 5e05953f22d35b253fa30af22f19c5ccc9474297
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:37:17 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e05953f

sci-chemistry/relax: Use HTTPS

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/relax-4.0.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r1.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
index da182eead0a..606c454f1b1 100644
--- a/sci-chemistry/relax/relax-4.0.0-r1.ebuild
+++ b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
@@ -10,7 +10,7 @@ WX_GTK_VER="3.0"
 inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
 
 DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
+HOMEPAGE="https://www.nmr-relax.com/";
 SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
 
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-15 Thread Michał Górny
commit: 71c0b83f8d859141d2a39179fc9989386b0089f2
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:27:57 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:06 2020 +
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}]



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-22 Thread Michał Górny
commit: 0a231d17891be9aad3b52e03d50deac43d95d8c0
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jan 22 21:43:43 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jan 22 21:49:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a231d17

sci-chemistry/relax: Revbump post dep change

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/{relax-4.0.0-r1.ebuild => relax-4.0.0-r2.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r1.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r2.ebuild
similarity index 100%
rename from sci-chemistry/relax/relax-4.0.0-r1.ebuild
rename to sci-chemistry/relax/relax-4.0.0-r2.ebuild



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-28 Thread Michał Górny
commit: 4c65641141322dc73d3e6cc0224d745deea1ee19
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 28 20:22:26 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 28 20:40:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c656411

sci-chemistry/relax: Permit matplotlib-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/relax-4.0.0-r2.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r2.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r2.ebuild
index 606c454f1b1..8ded6d34d21 100644
--- a/sci-chemistry/relax/relax-4.0.0-r2.ebuild
+++ b/sci-chemistry/relax/relax-4.0.0-r2.ebuild
@@ -24,7 +24,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
${PYTHON_DEPS}
dev-python/Numdifftools[${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
+   || (
+   dev-python/matplotlib-python2[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   )
|| (
dev-python/numpy-python2[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-28 Thread Michał Górny
commit: 8a5044bf514cf5610f275ec6514770c1f7ceb681
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 28 20:57:40 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 28 21:30:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a5044bf

sci-chemistry/relax: Permit scipy-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/{relax-4.0.0-r2.ebuild => relax-4.0.0-r3.ebuild} | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r2.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r3.ebuild
similarity index 95%
rename from sci-chemistry/relax/relax-4.0.0-r2.ebuild
rename to sci-chemistry/relax/relax-4.0.0-r3.ebuild
index 8ded6d34d21..28b0f5d9da6 100644
--- a/sci-chemistry/relax/relax-4.0.0-r2.ebuild
+++ b/sci-chemistry/relax/relax-4.0.0-r3.ebuild
@@ -38,7 +38,10 @@ RDEPEND="
sci-chemistry/vmd
>=sci-libs/bmrblib-1.0.3[${PYTHON_USEDEP}]
>=sci-libs/minfx-1.0.11[${PYTHON_USEDEP}]
-   sci-libs/scipy[${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]"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-02-09 Thread Michał Górny
commit: b3b95491e29af254135e028d65c5cfc560efa608
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Feb  7 18:01:01 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb  9 16:35:20 2020 +
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]"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2015-10-25 Thread Pacho Ramos
commit: 0976e9cfcde80f655c375a8499124a979df97332
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Oct 25 16:36:24 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct 25 16:36:35 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0976e9cf

sci-chemistry/relax: Support wxGTK:3.0

Package-Manager: portage-2.2.23

 sci-chemistry/relax/relax-4.0.0-r1.ebuild | 72 +++
 1 file changed, 72 insertions(+)

diff --git a/sci-chemistry/relax/relax-4.0.0-r1.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
new file mode 100644
index 000..b5950de
--- /dev/null
+++ b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="3.0"
+
+inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
+
+DESCRIPTION="Molecular dynamics by NMR data analysis"
+HOMEPAGE="http://www.nmr-relax.com/";
+SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-python/Numdifftools[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
+   sci-visualization/grace
+   sci-visualization/opendx
+   x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}
+   media-gfx/pngcrush
+   test? ( ${RDEPEND} )
+   "
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   rm -rf minfx bmrblib extern/numdifftools || die
+   tc-export CC
+   need-wxwidgets unicode
+}
+
+src_compile() {
+   escons
+}
+
+src_test() {
+   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
+   virtualmake
+}
+
+src_install() {
+   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
+
+   python_moduleinto ${PN}
+   python_domodule *
+
+   rm ${PN} README || die
+
+   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
+}



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2015-10-16 Thread Justin Lecher
commit: 41450445b1ed716105272105bdb4e9d2e8c4f42d
Author: Justin Lecher  gentoo  org>
AuthorDate: Fri Oct 16 09:20:29 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Fri Oct 16 09:21:15 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41450445

sci-chemistry/relax: Version Bump

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 sci-chemistry/relax/Manifest   |  1 +
 sci-chemistry/relax/relax-4.0.0.ebuild | 71 ++
 2 files changed, 72 insertions(+)

diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 42f7f7f..8953087 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1,2 +1,3 @@
 DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 
176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 
ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9
 WHIRLPOOL 
1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e
 DIST relax-3.3.9.src.tar.bz2 93403953 SHA256 
5bfa0fc774cfafd30e9f593f6b5f368b6bd79faf0ca2e7ae064a8bd3b6923685 SHA512 
0af93497acd91e6e4be0cf07efe09198c1234e70641835668a94714d58ad225d5ef94df3225d4d6809aa456e340c05829520f4aa6215cb83f7315ccca2053461
 WHIRLPOOL 
4ea5bb6582a020df902b9ac28cf5e025456607ddb50b1a6c1915db421ac6ea415781cb9d361fd34b2240500e7d0b74af131984dddcea6b0548dfb76d8b2be378
+DIST relax-4.0.0.src.tar.bz2 105659752 SHA256 
4bd27341196d7bf963b269ef41d89b9ac1e1a21200f7911e7c27900d2c0f16d9 SHA512 
28b5ddab2c83f95d7e1a502d05b5d3c93337fece68a1fef95ec8978f61fccf24cb37528cfef27cb20d132033535f4120b23cc76a75f34f52b27df17116351f8e
 WHIRLPOOL 
438859c8970f4f16fa9fdf59f7630e3cb07eb0279971b53fa29f6da081c8b3965db0e3f9000efa47d285e44579641222fd74d04b837e453847a1b4dd72acf479

diff --git a/sci-chemistry/relax/relax-4.0.0.ebuild 
b/sci-chemistry/relax/relax-4.0.0.ebuild
new file mode 100644
index 000..5ffdf92
--- /dev/null
+++ b/sci-chemistry/relax/relax-4.0.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="2.9"
+
+inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
+
+DESCRIPTION="Molecular dynamics by NMR data analysis"
+HOMEPAGE="http://www.nmr-relax.com/";
+SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-python/Numdifftools[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
+   sci-visualization/grace
+   sci-visualization/opendx
+   x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}
+   media-gfx/pngcrush
+   test? ( ${RDEPEND} )
+   "
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   rm -rf minfx bmrblib extern/numdifftools || die
+   tc-export CC
+}
+
+src_compile() {
+   escons
+}
+
+src_test() {
+   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
+   virtualmake
+}
+
+src_install() {
+   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
+
+   python_moduleinto ${PN}
+   python_domodule *
+
+   rm ${PN} README || die
+
+   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
+}



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2015-10-12 Thread Justin Lecher
commit: b19786e91df196c3adbbeeaeae701ff09bba
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Oct 12 09:25:19 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Oct 12 09:35:28 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b197

sci-chemistry/relax: Drop old

Package-Manager: portage-2.2.22
Signed-off-by: Justin Lecher  gentoo.org>

 sci-chemistry/relax/Manifest   |  4 --
 sci-chemistry/relax/relax-3.3.4.ebuild | 69 
 sci-chemistry/relax/relax-3.3.5.ebuild | 69 
 sci-chemistry/relax/relax-3.3.6.ebuild | 73 --
 sci-chemistry/relax/relax-3.3.7.ebuild | 73 --
 5 files changed, 288 deletions(-)

diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 789564f..30af534 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1,5 +1 @@
-DIST relax-3.3.4.src.tar.bz2 89206485 SHA256 
03ecc20353126d155c7d5c9ab45e3bb146a87243472711c937befced2db333c0 SHA512 
78ae5778ef0fe84fc3a26648dd2192d529fb1e5241728f7c06a5a2cec2ce849a2c75c19a931123a17d5c210acc4f4c2401574b10a1fbbe0307d2d9867567352d
 WHIRLPOOL 
4fcdec36e8df412091ab1a99a6b017ebc72f8e5c400429e698221f22e4ef7ae35713a6e2a05f6f1b573e5223f8eccc7cb0d2a20b1171e5bc483fd3ef1a0242bc
-DIST relax-3.3.5.src.tar.bz2 90164368 SHA256 
d9e3668221dba7589ba1d12ab40df517b5b6f742ee413864cc87ab636546e2ef SHA512 
c8c248abf0edb54af631c11b102b641d41a106036bbdb88d8f1563c9750d3c7d402ee150d7afd770b845d3a421e431afcf95e6222197f9dc1afec61ddcd0bf37
 WHIRLPOOL 
d9070bed833ef063c22fec5e55b1968c65b672ee100247b1af9a25d3149eb57475aeb94a4f125fc3cd278d97ac248e7826b083c840b47f9db83bae7e1aaae710
-DIST relax-3.3.6.src.tar.bz2 90005292 SHA256 
2b1994626a910036c63d67c609c49b3bde8c754b60763de62c2ac8f6c3f589c3 SHA512 
cda773a4af259d25550e4e4dbd8500594afd9df051ba06130355058347f308b804726acafaa76957e062c78d1d8fb26f843b3ac97d5aecd534b53c1a5155cafb
 WHIRLPOOL 
0bf0f51664a132653fbd981ee6776cb16dd6371504df2167658027325d632cda8a6f4a21d4a530c46dc75c93b3ffb87f5189d4986acadb344154cd7420361e0b
-DIST relax-3.3.7.src.tar.bz2 90268061 SHA256 
a32508bd55fa124f6472e08d89ec0fa9f3837efcceb2be681404eb998457381f SHA512 
3724a51ef9177f9bd78b3c92add7b88d559f21f5166eaf62b865586c061d17ce0a1af61a794db324d0f792eece04d8f1d037f9e982c858768da1d3fc208e9270
 WHIRLPOOL 
e4446c7ccbe1e8f3caa450a3d747fb8dfcc33d9d336386572b72481544101199150e7938b0e5319a70ef3a5a7f4ad53c143d4a6c01cc7553f435fbc0d00fe952
 DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 
176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 
ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9
 WHIRLPOOL 
1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e

diff --git a/sci-chemistry/relax/relax-3.3.4.ebuild 
b/sci-chemistry/relax/relax-3.3.4.ebuild
deleted file mode 100644
index e394217..000
--- a/sci-chemistry/relax/relax-3.3.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-python/Numdifftools[${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
-   sci-visualization/grace
-   sci-visualization/opendx
-   x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
-   media-gfx/pngcrush"
-
-pkg_setup() {
-   python-single-r1_pkg_setup
-}
-
-src_prepare() {
-   rm -rf minfx bmrblib extern/numdifftools || die
-   tc-export CC
-}
-
-src_compile() {
-   escons
-}
-
-src_test() {
-   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
-   virtualmake
-}
-
-src_install() {
-   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
-
-   python_moduleinto ${PN}
-   python_domodule *
-
-   rm ${PN} README || die
-
-   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
-}

diff --git a/sci-chemistry/relax/relax-3.3.5.ebuild 
b/sci-chemistry/relax/relax-3.3.5.ebui

[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2015-10-12 Thread Justin Lecher
commit: f661362f60a3734991fe0c24ad9b775626982a01
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Oct 12 11:39:49 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Oct 12 11:40:15 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f661362f

sci-chemistry/relax: Version Bump

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 sci-chemistry/relax/Manifest   |  1 +
 sci-chemistry/relax/relax-3.3.9.ebuild | 71 ++
 2 files changed, 72 insertions(+)

diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 30af534..42f7f7f 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1 +1,2 @@
 DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 
176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 
ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9
 WHIRLPOOL 
1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e
+DIST relax-3.3.9.src.tar.bz2 93403953 SHA256 
5bfa0fc774cfafd30e9f593f6b5f368b6bd79faf0ca2e7ae064a8bd3b6923685 SHA512 
0af93497acd91e6e4be0cf07efe09198c1234e70641835668a94714d58ad225d5ef94df3225d4d6809aa456e340c05829520f4aa6215cb83f7315ccca2053461
 WHIRLPOOL 
4ea5bb6582a020df902b9ac28cf5e025456607ddb50b1a6c1915db421ac6ea415781cb9d361fd34b2240500e7d0b74af131984dddcea6b0548dfb76d8b2be378

diff --git a/sci-chemistry/relax/relax-3.3.9.ebuild 
b/sci-chemistry/relax/relax-3.3.9.ebuild
new file mode 100644
index 000..5ffdf92
--- /dev/null
+++ b/sci-chemistry/relax/relax-3.3.9.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="2.9"
+
+inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
+
+DESCRIPTION="Molecular dynamics by NMR data analysis"
+HOMEPAGE="http://www.nmr-relax.com/";
+SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-python/Numdifftools[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
+   sci-visualization/grace
+   sci-visualization/opendx
+   x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}
+   media-gfx/pngcrush
+   test? ( ${RDEPEND} )
+   "
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   rm -rf minfx bmrblib extern/numdifftools || die
+   tc-export CC
+}
+
+src_compile() {
+   escons
+}
+
+src_test() {
+   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
+   virtualmake
+}
+
+src_install() {
+   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
+
+   python_moduleinto ${PN}
+   python_domodule *
+
+   rm ${PN} README || die
+
+   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
+}



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2017-02-23 Thread Mart Raudsepp
commit: e364277e3edad35fae066521930a8494714b5b07
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Feb 23 23:12:31 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Feb 23 23:13:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e364277e

sci-chemistry/relax: remove old that use wxGTK:2.9

Acked-by: David Seifert  gentoo.org>
Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-chemistry/relax/Manifest   |  2 -
 sci-chemistry/relax/relax-3.3.8.ebuild | 71 --
 sci-chemistry/relax/relax-3.3.9.ebuild | 71 --
 sci-chemistry/relax/relax-4.0.0.ebuild | 71 --
 4 files changed, 215 deletions(-)

diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 8953087ac7..fd8baba862 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1,3 +1 @@
-DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 
176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 
ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9
 WHIRLPOOL 
1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e
-DIST relax-3.3.9.src.tar.bz2 93403953 SHA256 
5bfa0fc774cfafd30e9f593f6b5f368b6bd79faf0ca2e7ae064a8bd3b6923685 SHA512 
0af93497acd91e6e4be0cf07efe09198c1234e70641835668a94714d58ad225d5ef94df3225d4d6809aa456e340c05829520f4aa6215cb83f7315ccca2053461
 WHIRLPOOL 
4ea5bb6582a020df902b9ac28cf5e025456607ddb50b1a6c1915db421ac6ea415781cb9d361fd34b2240500e7d0b74af131984dddcea6b0548dfb76d8b2be378
 DIST relax-4.0.0.src.tar.bz2 105659752 SHA256 
4bd27341196d7bf963b269ef41d89b9ac1e1a21200f7911e7c27900d2c0f16d9 SHA512 
28b5ddab2c83f95d7e1a502d05b5d3c93337fece68a1fef95ec8978f61fccf24cb37528cfef27cb20d132033535f4120b23cc76a75f34f52b27df17116351f8e
 WHIRLPOOL 
438859c8970f4f16fa9fdf59f7630e3cb07eb0279971b53fa29f6da081c8b3965db0e3f9000efa47d285e44579641222fd74d04b837e453847a1b4dd72acf479

diff --git a/sci-chemistry/relax/relax-3.3.8.ebuild 
b/sci-chemistry/relax/relax-3.3.8.ebuild
deleted file mode 100644
index 5ffdf92275..00
--- a/sci-chemistry/relax/relax-3.3.8.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-python/Numdifftools[${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
-   sci-visualization/grace
-   sci-visualization/opendx
-   x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
-   media-gfx/pngcrush
-   test? ( ${RDEPEND} )
-   "
-
-pkg_setup() {
-   python-single-r1_pkg_setup
-}
-
-src_prepare() {
-   rm -rf minfx bmrblib extern/numdifftools || die
-   tc-export CC
-}
-
-src_compile() {
-   escons
-}
-
-src_test() {
-   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
-   virtualmake
-}
-
-src_install() {
-   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
-
-   python_moduleinto ${PN}
-   python_domodule *
-
-   rm ${PN} README || die
-
-   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
-}

diff --git a/sci-chemistry/relax/relax-3.3.9.ebuild 
b/sci-chemistry/relax/relax-3.3.9.ebuild
deleted file mode 100644
index 5ffdf92275..00
--- a/sci-chemistry/relax/relax-3.3.9.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-python/Numdifftools[${PYTHON

[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2015-10-12 Thread Justin Lecher
commit: b19786e91df196c3adbbeeaeae701ff09bba
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Oct 12 09:25:19 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Oct 12 09:35:28 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b197

sci-chemistry/relax: Drop old

Package-Manager: portage-2.2.22
Signed-off-by: Justin Lecher  gentoo.org>

 sci-chemistry/relax/Manifest   |  4 --
 sci-chemistry/relax/relax-3.3.4.ebuild | 69 
 sci-chemistry/relax/relax-3.3.5.ebuild | 69 
 sci-chemistry/relax/relax-3.3.6.ebuild | 73 --
 sci-chemistry/relax/relax-3.3.7.ebuild | 73 --
 5 files changed, 288 deletions(-)

diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 789564f..30af534 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1,5 +1 @@
-DIST relax-3.3.4.src.tar.bz2 89206485 SHA256 
03ecc20353126d155c7d5c9ab45e3bb146a87243472711c937befced2db333c0 SHA512 
78ae5778ef0fe84fc3a26648dd2192d529fb1e5241728f7c06a5a2cec2ce849a2c75c19a931123a17d5c210acc4f4c2401574b10a1fbbe0307d2d9867567352d
 WHIRLPOOL 
4fcdec36e8df412091ab1a99a6b017ebc72f8e5c400429e698221f22e4ef7ae35713a6e2a05f6f1b573e5223f8eccc7cb0d2a20b1171e5bc483fd3ef1a0242bc
-DIST relax-3.3.5.src.tar.bz2 90164368 SHA256 
d9e3668221dba7589ba1d12ab40df517b5b6f742ee413864cc87ab636546e2ef SHA512 
c8c248abf0edb54af631c11b102b641d41a106036bbdb88d8f1563c9750d3c7d402ee150d7afd770b845d3a421e431afcf95e6222197f9dc1afec61ddcd0bf37
 WHIRLPOOL 
d9070bed833ef063c22fec5e55b1968c65b672ee100247b1af9a25d3149eb57475aeb94a4f125fc3cd278d97ac248e7826b083c840b47f9db83bae7e1aaae710
-DIST relax-3.3.6.src.tar.bz2 90005292 SHA256 
2b1994626a910036c63d67c609c49b3bde8c754b60763de62c2ac8f6c3f589c3 SHA512 
cda773a4af259d25550e4e4dbd8500594afd9df051ba06130355058347f308b804726acafaa76957e062c78d1d8fb26f843b3ac97d5aecd534b53c1a5155cafb
 WHIRLPOOL 
0bf0f51664a132653fbd981ee6776cb16dd6371504df2167658027325d632cda8a6f4a21d4a530c46dc75c93b3ffb87f5189d4986acadb344154cd7420361e0b
-DIST relax-3.3.7.src.tar.bz2 90268061 SHA256 
a32508bd55fa124f6472e08d89ec0fa9f3837efcceb2be681404eb998457381f SHA512 
3724a51ef9177f9bd78b3c92add7b88d559f21f5166eaf62b865586c061d17ce0a1af61a794db324d0f792eece04d8f1d037f9e982c858768da1d3fc208e9270
 WHIRLPOOL 
e4446c7ccbe1e8f3caa450a3d747fb8dfcc33d9d336386572b72481544101199150e7938b0e5319a70ef3a5a7f4ad53c143d4a6c01cc7553f435fbc0d00fe952
 DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 
176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 
ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9
 WHIRLPOOL 
1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e

diff --git a/sci-chemistry/relax/relax-3.3.4.ebuild 
b/sci-chemistry/relax/relax-3.3.4.ebuild
deleted file mode 100644
index e394217..000
--- a/sci-chemistry/relax/relax-3.3.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-python/Numdifftools[${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
-   sci-visualization/grace
-   sci-visualization/opendx
-   x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
-   media-gfx/pngcrush"
-
-pkg_setup() {
-   python-single-r1_pkg_setup
-}
-
-src_prepare() {
-   rm -rf minfx bmrblib extern/numdifftools || die
-   tc-export CC
-}
-
-src_compile() {
-   escons
-}
-
-src_test() {
-   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
-   virtualmake
-}
-
-src_install() {
-   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
-
-   python_moduleinto ${PN}
-   python_domodule *
-
-   rm ${PN} README || die
-
-   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
-}

diff --git a/sci-chemistry/relax/relax-3.3.5.ebuild 
b/sci-chemistry/relax/relax-3.3.5.ebui

[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2015-10-12 Thread Justin Lecher
commit: f661362f60a3734991fe0c24ad9b775626982a01
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Oct 12 11:39:49 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Oct 12 11:40:15 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f661362f

sci-chemistry/relax: Version Bump

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 sci-chemistry/relax/Manifest   |  1 +
 sci-chemistry/relax/relax-3.3.9.ebuild | 71 ++
 2 files changed, 72 insertions(+)

diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 30af534..42f7f7f 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1 +1,2 @@
 DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 
176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 
ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9
 WHIRLPOOL 
1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e
+DIST relax-3.3.9.src.tar.bz2 93403953 SHA256 
5bfa0fc774cfafd30e9f593f6b5f368b6bd79faf0ca2e7ae064a8bd3b6923685 SHA512 
0af93497acd91e6e4be0cf07efe09198c1234e70641835668a94714d58ad225d5ef94df3225d4d6809aa456e340c05829520f4aa6215cb83f7315ccca2053461
 WHIRLPOOL 
4ea5bb6582a020df902b9ac28cf5e025456607ddb50b1a6c1915db421ac6ea415781cb9d361fd34b2240500e7d0b74af131984dddcea6b0548dfb76d8b2be378

diff --git a/sci-chemistry/relax/relax-3.3.9.ebuild 
b/sci-chemistry/relax/relax-3.3.9.ebuild
new file mode 100644
index 000..5ffdf92
--- /dev/null
+++ b/sci-chemistry/relax/relax-3.3.9.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="2.9"
+
+inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
+
+DESCRIPTION="Molecular dynamics by NMR data analysis"
+HOMEPAGE="http://www.nmr-relax.com/";
+SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-python/Numdifftools[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
+   sci-visualization/grace
+   sci-visualization/opendx
+   x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}
+   media-gfx/pngcrush
+   test? ( ${RDEPEND} )
+   "
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   rm -rf minfx bmrblib extern/numdifftools || die
+   tc-export CC
+}
+
+src_compile() {
+   escons
+}
+
+src_test() {
+   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
+   virtualmake
+}
+
+src_install() {
+   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
+
+   python_moduleinto ${PN}
+   python_domodule *
+
+   rm ${PN} README || die
+
+   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
+}



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2015-10-16 Thread Justin Lecher
commit: 41450445b1ed716105272105bdb4e9d2e8c4f42d
Author: Justin Lecher  gentoo  org>
AuthorDate: Fri Oct 16 09:20:29 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Fri Oct 16 09:21:15 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41450445

sci-chemistry/relax: Version Bump

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 sci-chemistry/relax/Manifest   |  1 +
 sci-chemistry/relax/relax-4.0.0.ebuild | 71 ++
 2 files changed, 72 insertions(+)

diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 42f7f7f..8953087 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1,2 +1,3 @@
 DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 
176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 
ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9
 WHIRLPOOL 
1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e
 DIST relax-3.3.9.src.tar.bz2 93403953 SHA256 
5bfa0fc774cfafd30e9f593f6b5f368b6bd79faf0ca2e7ae064a8bd3b6923685 SHA512 
0af93497acd91e6e4be0cf07efe09198c1234e70641835668a94714d58ad225d5ef94df3225d4d6809aa456e340c05829520f4aa6215cb83f7315ccca2053461
 WHIRLPOOL 
4ea5bb6582a020df902b9ac28cf5e025456607ddb50b1a6c1915db421ac6ea415781cb9d361fd34b2240500e7d0b74af131984dddcea6b0548dfb76d8b2be378
+DIST relax-4.0.0.src.tar.bz2 105659752 SHA256 
4bd27341196d7bf963b269ef41d89b9ac1e1a21200f7911e7c27900d2c0f16d9 SHA512 
28b5ddab2c83f95d7e1a502d05b5d3c93337fece68a1fef95ec8978f61fccf24cb37528cfef27cb20d132033535f4120b23cc76a75f34f52b27df17116351f8e
 WHIRLPOOL 
438859c8970f4f16fa9fdf59f7630e3cb07eb0279971b53fa29f6da081c8b3965db0e3f9000efa47d285e44579641222fd74d04b837e453847a1b4dd72acf479

diff --git a/sci-chemistry/relax/relax-4.0.0.ebuild 
b/sci-chemistry/relax/relax-4.0.0.ebuild
new file mode 100644
index 000..5ffdf92
--- /dev/null
+++ b/sci-chemistry/relax/relax-4.0.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="2.9"
+
+inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
+
+DESCRIPTION="Molecular dynamics by NMR data analysis"
+HOMEPAGE="http://www.nmr-relax.com/";
+SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-python/Numdifftools[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
+   sci-visualization/grace
+   sci-visualization/opendx
+   x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}
+   media-gfx/pngcrush
+   test? ( ${RDEPEND} )
+   "
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   rm -rf minfx bmrblib extern/numdifftools || die
+   tc-export CC
+}
+
+src_compile() {
+   escons
+}
+
+src_test() {
+   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
+   virtualmake
+}
+
+src_install() {
+   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
+
+   python_moduleinto ${PN}
+   python_domodule *
+
+   rm ${PN} README || die
+
+   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
+}



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2015-10-25 Thread Pacho Ramos
commit: 0976e9cfcde80f655c375a8499124a979df97332
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Oct 25 16:36:24 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct 25 16:36:35 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0976e9cf

sci-chemistry/relax: Support wxGTK:3.0

Package-Manager: portage-2.2.23

 sci-chemistry/relax/relax-4.0.0-r1.ebuild | 72 +++
 1 file changed, 72 insertions(+)

diff --git a/sci-chemistry/relax/relax-4.0.0-r1.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
new file mode 100644
index 000..b5950de
--- /dev/null
+++ b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="3.0"
+
+inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
+
+DESCRIPTION="Molecular dynamics by NMR data analysis"
+HOMEPAGE="http://www.nmr-relax.com/";
+SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-python/Numdifftools[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
+   sci-visualization/grace
+   sci-visualization/opendx
+   x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}
+   media-gfx/pngcrush
+   test? ( ${RDEPEND} )
+   "
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   rm -rf minfx bmrblib extern/numdifftools || die
+   tc-export CC
+   need-wxwidgets unicode
+}
+
+src_compile() {
+   escons
+}
+
+src_test() {
+   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
+   virtualmake
+}
+
+src_install() {
+   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
+
+   python_moduleinto ${PN}
+   python_domodule *
+
+   rm ${PN} README || die
+
+   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
+}



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2017-02-23 Thread Mart Raudsepp
commit: e364277e3edad35fae066521930a8494714b5b07
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Feb 23 23:12:31 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Feb 23 23:13:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e364277e

sci-chemistry/relax: remove old that use wxGTK:2.9

Acked-by: David Seifert  gentoo.org>
Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-chemistry/relax/Manifest   |  2 -
 sci-chemistry/relax/relax-3.3.8.ebuild | 71 --
 sci-chemistry/relax/relax-3.3.9.ebuild | 71 --
 sci-chemistry/relax/relax-4.0.0.ebuild | 71 --
 4 files changed, 215 deletions(-)

diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 8953087ac7..fd8baba862 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1,3 +1 @@
-DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 
176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 
ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9
 WHIRLPOOL 
1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e
-DIST relax-3.3.9.src.tar.bz2 93403953 SHA256 
5bfa0fc774cfafd30e9f593f6b5f368b6bd79faf0ca2e7ae064a8bd3b6923685 SHA512 
0af93497acd91e6e4be0cf07efe09198c1234e70641835668a94714d58ad225d5ef94df3225d4d6809aa456e340c05829520f4aa6215cb83f7315ccca2053461
 WHIRLPOOL 
4ea5bb6582a020df902b9ac28cf5e025456607ddb50b1a6c1915db421ac6ea415781cb9d361fd34b2240500e7d0b74af131984dddcea6b0548dfb76d8b2be378
 DIST relax-4.0.0.src.tar.bz2 105659752 SHA256 
4bd27341196d7bf963b269ef41d89b9ac1e1a21200f7911e7c27900d2c0f16d9 SHA512 
28b5ddab2c83f95d7e1a502d05b5d3c93337fece68a1fef95ec8978f61fccf24cb37528cfef27cb20d132033535f4120b23cc76a75f34f52b27df17116351f8e
 WHIRLPOOL 
438859c8970f4f16fa9fdf59f7630e3cb07eb0279971b53fa29f6da081c8b3965db0e3f9000efa47d285e44579641222fd74d04b837e453847a1b4dd72acf479

diff --git a/sci-chemistry/relax/relax-3.3.8.ebuild 
b/sci-chemistry/relax/relax-3.3.8.ebuild
deleted file mode 100644
index 5ffdf92275..00
--- a/sci-chemistry/relax/relax-3.3.8.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-python/Numdifftools[${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
-   sci-visualization/grace
-   sci-visualization/opendx
-   x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
-   media-gfx/pngcrush
-   test? ( ${RDEPEND} )
-   "
-
-pkg_setup() {
-   python-single-r1_pkg_setup
-}
-
-src_prepare() {
-   rm -rf minfx bmrblib extern/numdifftools || die
-   tc-export CC
-}
-
-src_compile() {
-   escons
-}
-
-src_test() {
-   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
-   virtualmake
-}
-
-src_install() {
-   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
-
-   python_moduleinto ${PN}
-   python_domodule *
-
-   rm ${PN} README || die
-
-   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
-}

diff --git a/sci-chemistry/relax/relax-3.3.9.ebuild 
b/sci-chemistry/relax/relax-3.3.9.ebuild
deleted file mode 100644
index 5ffdf92275..00
--- a/sci-chemistry/relax/relax-3.3.9.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-python/Numdifftools[${PYTHON

[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2015-10-25 Thread Pacho Ramos
commit: 0976e9cfcde80f655c375a8499124a979df97332
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Oct 25 16:36:24 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct 25 16:36:35 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0976e9cf

sci-chemistry/relax: Support wxGTK:3.0

Package-Manager: portage-2.2.23

 sci-chemistry/relax/relax-4.0.0-r1.ebuild | 72 +++
 1 file changed, 72 insertions(+)

diff --git a/sci-chemistry/relax/relax-4.0.0-r1.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
new file mode 100644
index 000..b5950de
--- /dev/null
+++ b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="3.0"
+
+inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
+
+DESCRIPTION="Molecular dynamics by NMR data analysis"
+HOMEPAGE="http://www.nmr-relax.com/";
+SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-python/Numdifftools[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
+   sci-visualization/grace
+   sci-visualization/opendx
+   x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}
+   media-gfx/pngcrush
+   test? ( ${RDEPEND} )
+   "
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   rm -rf minfx bmrblib extern/numdifftools || die
+   tc-export CC
+   need-wxwidgets unicode
+}
+
+src_compile() {
+   escons
+}
+
+src_test() {
+   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
+   virtualmake
+}
+
+src_install() {
+   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
+
+   python_moduleinto ${PN}
+   python_domodule *
+
+   rm ${PN} README || die
+
+   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
+}



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2015-10-16 Thread Justin Lecher
commit: 41450445b1ed716105272105bdb4e9d2e8c4f42d
Author: Justin Lecher  gentoo  org>
AuthorDate: Fri Oct 16 09:20:29 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Fri Oct 16 09:21:15 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41450445

sci-chemistry/relax: Version Bump

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 sci-chemistry/relax/Manifest   |  1 +
 sci-chemistry/relax/relax-4.0.0.ebuild | 71 ++
 2 files changed, 72 insertions(+)

diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 42f7f7f..8953087 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1,2 +1,3 @@
 DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 
176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 
ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9
 WHIRLPOOL 
1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e
 DIST relax-3.3.9.src.tar.bz2 93403953 SHA256 
5bfa0fc774cfafd30e9f593f6b5f368b6bd79faf0ca2e7ae064a8bd3b6923685 SHA512 
0af93497acd91e6e4be0cf07efe09198c1234e70641835668a94714d58ad225d5ef94df3225d4d6809aa456e340c05829520f4aa6215cb83f7315ccca2053461
 WHIRLPOOL 
4ea5bb6582a020df902b9ac28cf5e025456607ddb50b1a6c1915db421ac6ea415781cb9d361fd34b2240500e7d0b74af131984dddcea6b0548dfb76d8b2be378
+DIST relax-4.0.0.src.tar.bz2 105659752 SHA256 
4bd27341196d7bf963b269ef41d89b9ac1e1a21200f7911e7c27900d2c0f16d9 SHA512 
28b5ddab2c83f95d7e1a502d05b5d3c93337fece68a1fef95ec8978f61fccf24cb37528cfef27cb20d132033535f4120b23cc76a75f34f52b27df17116351f8e
 WHIRLPOOL 
438859c8970f4f16fa9fdf59f7630e3cb07eb0279971b53fa29f6da081c8b3965db0e3f9000efa47d285e44579641222fd74d04b837e453847a1b4dd72acf479

diff --git a/sci-chemistry/relax/relax-4.0.0.ebuild 
b/sci-chemistry/relax/relax-4.0.0.ebuild
new file mode 100644
index 000..5ffdf92
--- /dev/null
+++ b/sci-chemistry/relax/relax-4.0.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="2.9"
+
+inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
+
+DESCRIPTION="Molecular dynamics by NMR data analysis"
+HOMEPAGE="http://www.nmr-relax.com/";
+SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-python/Numdifftools[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
+   sci-visualization/grace
+   sci-visualization/opendx
+   x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}
+   media-gfx/pngcrush
+   test? ( ${RDEPEND} )
+   "
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   rm -rf minfx bmrblib extern/numdifftools || die
+   tc-export CC
+}
+
+src_compile() {
+   escons
+}
+
+src_test() {
+   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
+   virtualmake
+}
+
+src_install() {
+   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
+
+   python_moduleinto ${PN}
+   python_domodule *
+
+   rm ${PN} README || die
+
+   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
+}



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2015-10-12 Thread Justin Lecher
commit: b19786e91df196c3adbbeeaeae701ff09bba
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Oct 12 09:25:19 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Oct 12 09:35:28 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b197

sci-chemistry/relax: Drop old

Package-Manager: portage-2.2.22
Signed-off-by: Justin Lecher  gentoo.org>

 sci-chemistry/relax/Manifest   |  4 --
 sci-chemistry/relax/relax-3.3.4.ebuild | 69 
 sci-chemistry/relax/relax-3.3.5.ebuild | 69 
 sci-chemistry/relax/relax-3.3.6.ebuild | 73 --
 sci-chemistry/relax/relax-3.3.7.ebuild | 73 --
 5 files changed, 288 deletions(-)

diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 789564f..30af534 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1,5 +1 @@
-DIST relax-3.3.4.src.tar.bz2 89206485 SHA256 
03ecc20353126d155c7d5c9ab45e3bb146a87243472711c937befced2db333c0 SHA512 
78ae5778ef0fe84fc3a26648dd2192d529fb1e5241728f7c06a5a2cec2ce849a2c75c19a931123a17d5c210acc4f4c2401574b10a1fbbe0307d2d9867567352d
 WHIRLPOOL 
4fcdec36e8df412091ab1a99a6b017ebc72f8e5c400429e698221f22e4ef7ae35713a6e2a05f6f1b573e5223f8eccc7cb0d2a20b1171e5bc483fd3ef1a0242bc
-DIST relax-3.3.5.src.tar.bz2 90164368 SHA256 
d9e3668221dba7589ba1d12ab40df517b5b6f742ee413864cc87ab636546e2ef SHA512 
c8c248abf0edb54af631c11b102b641d41a106036bbdb88d8f1563c9750d3c7d402ee150d7afd770b845d3a421e431afcf95e6222197f9dc1afec61ddcd0bf37
 WHIRLPOOL 
d9070bed833ef063c22fec5e55b1968c65b672ee100247b1af9a25d3149eb57475aeb94a4f125fc3cd278d97ac248e7826b083c840b47f9db83bae7e1aaae710
-DIST relax-3.3.6.src.tar.bz2 90005292 SHA256 
2b1994626a910036c63d67c609c49b3bde8c754b60763de62c2ac8f6c3f589c3 SHA512 
cda773a4af259d25550e4e4dbd8500594afd9df051ba06130355058347f308b804726acafaa76957e062c78d1d8fb26f843b3ac97d5aecd534b53c1a5155cafb
 WHIRLPOOL 
0bf0f51664a132653fbd981ee6776cb16dd6371504df2167658027325d632cda8a6f4a21d4a530c46dc75c93b3ffb87f5189d4986acadb344154cd7420361e0b
-DIST relax-3.3.7.src.tar.bz2 90268061 SHA256 
a32508bd55fa124f6472e08d89ec0fa9f3837efcceb2be681404eb998457381f SHA512 
3724a51ef9177f9bd78b3c92add7b88d559f21f5166eaf62b865586c061d17ce0a1af61a794db324d0f792eece04d8f1d037f9e982c858768da1d3fc208e9270
 WHIRLPOOL 
e4446c7ccbe1e8f3caa450a3d747fb8dfcc33d9d336386572b72481544101199150e7938b0e5319a70ef3a5a7f4ad53c143d4a6c01cc7553f435fbc0d00fe952
 DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 
176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 
ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9
 WHIRLPOOL 
1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e

diff --git a/sci-chemistry/relax/relax-3.3.4.ebuild 
b/sci-chemistry/relax/relax-3.3.4.ebuild
deleted file mode 100644
index e394217..000
--- a/sci-chemistry/relax/relax-3.3.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-python/Numdifftools[${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
-   sci-visualization/grace
-   sci-visualization/opendx
-   x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
-   media-gfx/pngcrush"
-
-pkg_setup() {
-   python-single-r1_pkg_setup
-}
-
-src_prepare() {
-   rm -rf minfx bmrblib extern/numdifftools || die
-   tc-export CC
-}
-
-src_compile() {
-   escons
-}
-
-src_test() {
-   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
-   virtualmake
-}
-
-src_install() {
-   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
-
-   python_moduleinto ${PN}
-   python_domodule *
-
-   rm ${PN} README || die
-
-   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
-}

diff --git a/sci-chemistry/relax/relax-3.3.5.ebuild 
b/sci-chemistry/relax/relax-3.3.5.ebui

[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2015-10-12 Thread Justin Lecher
commit: f661362f60a3734991fe0c24ad9b775626982a01
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Oct 12 11:39:49 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Oct 12 11:40:15 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f661362f

sci-chemistry/relax: Version Bump

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 sci-chemistry/relax/Manifest   |  1 +
 sci-chemistry/relax/relax-3.3.9.ebuild | 71 ++
 2 files changed, 72 insertions(+)

diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 30af534..42f7f7f 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1 +1,2 @@
 DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 
176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 
ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9
 WHIRLPOOL 
1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e
+DIST relax-3.3.9.src.tar.bz2 93403953 SHA256 
5bfa0fc774cfafd30e9f593f6b5f368b6bd79faf0ca2e7ae064a8bd3b6923685 SHA512 
0af93497acd91e6e4be0cf07efe09198c1234e70641835668a94714d58ad225d5ef94df3225d4d6809aa456e340c05829520f4aa6215cb83f7315ccca2053461
 WHIRLPOOL 
4ea5bb6582a020df902b9ac28cf5e025456607ddb50b1a6c1915db421ac6ea415781cb9d361fd34b2240500e7d0b74af131984dddcea6b0548dfb76d8b2be378

diff --git a/sci-chemistry/relax/relax-3.3.9.ebuild 
b/sci-chemistry/relax/relax-3.3.9.ebuild
new file mode 100644
index 000..5ffdf92
--- /dev/null
+++ b/sci-chemistry/relax/relax-3.3.9.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="2.9"
+
+inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
+
+DESCRIPTION="Molecular dynamics by NMR data analysis"
+HOMEPAGE="http://www.nmr-relax.com/";
+SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-python/Numdifftools[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
+   sci-visualization/grace
+   sci-visualization/opendx
+   x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}
+   media-gfx/pngcrush
+   test? ( ${RDEPEND} )
+   "
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   rm -rf minfx bmrblib extern/numdifftools || die
+   tc-export CC
+}
+
+src_compile() {
+   escons
+}
+
+src_test() {
+   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
+   virtualmake
+}
+
+src_install() {
+   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
+
+   python_moduleinto ${PN}
+   python_domodule *
+
+   rm ${PN} README || die
+
+   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
+}



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-22 Thread Michał Górny
commit: 0a231d17891be9aad3b52e03d50deac43d95d8c0
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jan 22 21:43:43 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jan 22 21:49:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a231d17

sci-chemistry/relax: Revbump post dep change

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/{relax-4.0.0-r1.ebuild => relax-4.0.0-r2.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r1.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r2.ebuild
similarity index 100%
rename from sci-chemistry/relax/relax-4.0.0-r1.ebuild
rename to sci-chemistry/relax/relax-4.0.0-r2.ebuild



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-28 Thread Michał Górny
commit: 4c65641141322dc73d3e6cc0224d745deea1ee19
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 28 20:22:26 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 28 20:40:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c656411

sci-chemistry/relax: Permit matplotlib-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/relax-4.0.0-r2.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r2.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r2.ebuild
index 606c454f1b1..8ded6d34d21 100644
--- a/sci-chemistry/relax/relax-4.0.0-r2.ebuild
+++ b/sci-chemistry/relax/relax-4.0.0-r2.ebuild
@@ -24,7 +24,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
${PYTHON_DEPS}
dev-python/Numdifftools[${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
+   || (
+   dev-python/matplotlib-python2[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   )
|| (
dev-python/numpy-python2[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-28 Thread Michał Górny
commit: 8a5044bf514cf5610f275ec6514770c1f7ceb681
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 28 20:57:40 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 28 21:30:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a5044bf

sci-chemistry/relax: Permit scipy-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/{relax-4.0.0-r2.ebuild => relax-4.0.0-r3.ebuild} | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r2.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r3.ebuild
similarity index 95%
rename from sci-chemistry/relax/relax-4.0.0-r2.ebuild
rename to sci-chemistry/relax/relax-4.0.0-r3.ebuild
index 8ded6d34d21..28b0f5d9da6 100644
--- a/sci-chemistry/relax/relax-4.0.0-r2.ebuild
+++ b/sci-chemistry/relax/relax-4.0.0-r3.ebuild
@@ -38,7 +38,10 @@ RDEPEND="
sci-chemistry/vmd
>=sci-libs/bmrblib-1.0.3[${PYTHON_USEDEP}]
>=sci-libs/minfx-1.0.11[${PYTHON_USEDEP}]
-   sci-libs/scipy[${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]"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-15 Thread Michał Górny
commit: 5e05953f22d35b253fa30af22f19c5ccc9474297
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:37:17 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e05953f

sci-chemistry/relax: Use HTTPS

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/relax-4.0.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r1.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
index da182eead0a..606c454f1b1 100644
--- a/sci-chemistry/relax/relax-4.0.0-r1.ebuild
+++ b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
@@ -10,7 +10,7 @@ WX_GTK_VER="3.0"
 inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
 
 DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
+HOMEPAGE="https://www.nmr-relax.com/";
 SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
 
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-15 Thread Michał Górny
commit: 71c0b83f8d859141d2a39179fc9989386b0089f2
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:27:57 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:06 2020 +
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}]



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-15 Thread Michał Górny
commit: 5e05953f22d35b253fa30af22f19c5ccc9474297
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:37:17 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e05953f

sci-chemistry/relax: Use HTTPS

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/relax-4.0.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r1.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
index da182eead0a..606c454f1b1 100644
--- a/sci-chemistry/relax/relax-4.0.0-r1.ebuild
+++ b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
@@ -10,7 +10,7 @@ WX_GTK_VER="3.0"
 inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
 
 DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
+HOMEPAGE="https://www.nmr-relax.com/";
 SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
 
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-15 Thread Michał Górny
commit: 71c0b83f8d859141d2a39179fc9989386b0089f2
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:27:57 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:06 2020 +
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}]



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-22 Thread Michał Górny
commit: 0a231d17891be9aad3b52e03d50deac43d95d8c0
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jan 22 21:43:43 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jan 22 21:49:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a231d17

sci-chemistry/relax: Revbump post dep change

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/{relax-4.0.0-r1.ebuild => relax-4.0.0-r2.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r1.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r2.ebuild
similarity index 100%
rename from sci-chemistry/relax/relax-4.0.0-r1.ebuild
rename to sci-chemistry/relax/relax-4.0.0-r2.ebuild



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-28 Thread Michał Górny
commit: 4c65641141322dc73d3e6cc0224d745deea1ee19
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 28 20:22:26 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 28 20:40:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c656411

sci-chemistry/relax: Permit matplotlib-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/relax-4.0.0-r2.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r2.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r2.ebuild
index 606c454f1b1..8ded6d34d21 100644
--- a/sci-chemistry/relax/relax-4.0.0-r2.ebuild
+++ b/sci-chemistry/relax/relax-4.0.0-r2.ebuild
@@ -24,7 +24,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
${PYTHON_DEPS}
dev-python/Numdifftools[${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
+   || (
+   dev-python/matplotlib-python2[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   )
|| (
dev-python/numpy-python2[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-28 Thread Michał Górny
commit: 8a5044bf514cf5610f275ec6514770c1f7ceb681
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 28 20:57:40 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 28 21:30:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a5044bf

sci-chemistry/relax: Permit scipy-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/{relax-4.0.0-r2.ebuild => relax-4.0.0-r3.ebuild} | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r2.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r3.ebuild
similarity index 95%
rename from sci-chemistry/relax/relax-4.0.0-r2.ebuild
rename to sci-chemistry/relax/relax-4.0.0-r3.ebuild
index 8ded6d34d21..28b0f5d9da6 100644
--- a/sci-chemistry/relax/relax-4.0.0-r2.ebuild
+++ b/sci-chemistry/relax/relax-4.0.0-r3.ebuild
@@ -38,7 +38,10 @@ RDEPEND="
sci-chemistry/vmd
>=sci-libs/bmrblib-1.0.3[${PYTHON_USEDEP}]
>=sci-libs/minfx-1.0.11[${PYTHON_USEDEP}]
-   sci-libs/scipy[${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]"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-02-09 Thread Michał Górny
commit: b3b95491e29af254135e028d65c5cfc560efa608
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Feb  7 18:01:01 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb  9 16:35:20 2020 +
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]"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2017-02-23 Thread Mart Raudsepp
commit: e364277e3edad35fae066521930a8494714b5b07
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Feb 23 23:12:31 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Feb 23 23:13:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e364277e

sci-chemistry/relax: remove old that use wxGTK:2.9

Acked-by: David Seifert  gentoo.org>
Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-chemistry/relax/Manifest   |  2 -
 sci-chemistry/relax/relax-3.3.8.ebuild | 71 --
 sci-chemistry/relax/relax-3.3.9.ebuild | 71 --
 sci-chemistry/relax/relax-4.0.0.ebuild | 71 --
 4 files changed, 215 deletions(-)

diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 8953087ac7..fd8baba862 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1,3 +1 @@
-DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 
176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 
ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9
 WHIRLPOOL 
1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e
-DIST relax-3.3.9.src.tar.bz2 93403953 SHA256 
5bfa0fc774cfafd30e9f593f6b5f368b6bd79faf0ca2e7ae064a8bd3b6923685 SHA512 
0af93497acd91e6e4be0cf07efe09198c1234e70641835668a94714d58ad225d5ef94df3225d4d6809aa456e340c05829520f4aa6215cb83f7315ccca2053461
 WHIRLPOOL 
4ea5bb6582a020df902b9ac28cf5e025456607ddb50b1a6c1915db421ac6ea415781cb9d361fd34b2240500e7d0b74af131984dddcea6b0548dfb76d8b2be378
 DIST relax-4.0.0.src.tar.bz2 105659752 SHA256 
4bd27341196d7bf963b269ef41d89b9ac1e1a21200f7911e7c27900d2c0f16d9 SHA512 
28b5ddab2c83f95d7e1a502d05b5d3c93337fece68a1fef95ec8978f61fccf24cb37528cfef27cb20d132033535f4120b23cc76a75f34f52b27df17116351f8e
 WHIRLPOOL 
438859c8970f4f16fa9fdf59f7630e3cb07eb0279971b53fa29f6da081c8b3965db0e3f9000efa47d285e44579641222fd74d04b837e453847a1b4dd72acf479

diff --git a/sci-chemistry/relax/relax-3.3.8.ebuild 
b/sci-chemistry/relax/relax-3.3.8.ebuild
deleted file mode 100644
index 5ffdf92275..00
--- a/sci-chemistry/relax/relax-3.3.8.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-python/Numdifftools[${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
-   sci-visualization/grace
-   sci-visualization/opendx
-   x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
-   media-gfx/pngcrush
-   test? ( ${RDEPEND} )
-   "
-
-pkg_setup() {
-   python-single-r1_pkg_setup
-}
-
-src_prepare() {
-   rm -rf minfx bmrblib extern/numdifftools || die
-   tc-export CC
-}
-
-src_compile() {
-   escons
-}
-
-src_test() {
-   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
-   virtualmake
-}
-
-src_install() {
-   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
-
-   python_moduleinto ${PN}
-   python_domodule *
-
-   rm ${PN} README || die
-
-   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
-}

diff --git a/sci-chemistry/relax/relax-3.3.9.ebuild 
b/sci-chemistry/relax/relax-3.3.9.ebuild
deleted file mode 100644
index 5ffdf92275..00
--- a/sci-chemistry/relax/relax-3.3.9.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-python/Numdifftools[${PYTHON

[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-15 Thread Michał Górny
commit: 5e05953f22d35b253fa30af22f19c5ccc9474297
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:37:17 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e05953f

sci-chemistry/relax: Use HTTPS

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/relax-4.0.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r1.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
index da182eead0a..606c454f1b1 100644
--- a/sci-chemistry/relax/relax-4.0.0-r1.ebuild
+++ b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
@@ -10,7 +10,7 @@ WX_GTK_VER="3.0"
 inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
 
 DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
+HOMEPAGE="https://www.nmr-relax.com/";
 SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
 
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-15 Thread Michał Górny
commit: 71c0b83f8d859141d2a39179fc9989386b0089f2
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:27:57 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:06 2020 +
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}]



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-22 Thread Michał Górny
commit: 0a231d17891be9aad3b52e03d50deac43d95d8c0
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jan 22 21:43:43 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jan 22 21:49:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a231d17

sci-chemistry/relax: Revbump post dep change

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/{relax-4.0.0-r1.ebuild => relax-4.0.0-r2.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r1.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r2.ebuild
similarity index 100%
rename from sci-chemistry/relax/relax-4.0.0-r1.ebuild
rename to sci-chemistry/relax/relax-4.0.0-r2.ebuild



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-28 Thread Michał Górny
commit: 4c65641141322dc73d3e6cc0224d745deea1ee19
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 28 20:22:26 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 28 20:40:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c656411

sci-chemistry/relax: Permit matplotlib-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/relax-4.0.0-r2.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r2.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r2.ebuild
index 606c454f1b1..8ded6d34d21 100644
--- a/sci-chemistry/relax/relax-4.0.0-r2.ebuild
+++ b/sci-chemistry/relax/relax-4.0.0-r2.ebuild
@@ -24,7 +24,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
${PYTHON_DEPS}
dev-python/Numdifftools[${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
+   || (
+   dev-python/matplotlib-python2[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   )
|| (
dev-python/numpy-python2[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-28 Thread Michał Górny
commit: 8a5044bf514cf5610f275ec6514770c1f7ceb681
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 28 20:57:40 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 28 21:30:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a5044bf

sci-chemistry/relax: Permit scipy-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/{relax-4.0.0-r2.ebuild => relax-4.0.0-r3.ebuild} | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r2.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r3.ebuild
similarity index 95%
rename from sci-chemistry/relax/relax-4.0.0-r2.ebuild
rename to sci-chemistry/relax/relax-4.0.0-r3.ebuild
index 8ded6d34d21..28b0f5d9da6 100644
--- a/sci-chemistry/relax/relax-4.0.0-r2.ebuild
+++ b/sci-chemistry/relax/relax-4.0.0-r3.ebuild
@@ -38,7 +38,10 @@ RDEPEND="
sci-chemistry/vmd
>=sci-libs/bmrblib-1.0.3[${PYTHON_USEDEP}]
>=sci-libs/minfx-1.0.11[${PYTHON_USEDEP}]
-   sci-libs/scipy[${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]"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-02-09 Thread Michał Górny
commit: b3b95491e29af254135e028d65c5cfc560efa608
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Feb  7 18:01:01 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb  9 16:35:20 2020 +
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]"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2015-10-25 Thread Pacho Ramos
commit: 0976e9cfcde80f655c375a8499124a979df97332
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Oct 25 16:36:24 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct 25 16:36:35 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0976e9cf

sci-chemistry/relax: Support wxGTK:3.0

Package-Manager: portage-2.2.23

 sci-chemistry/relax/relax-4.0.0-r1.ebuild | 72 +++
 1 file changed, 72 insertions(+)

diff --git a/sci-chemistry/relax/relax-4.0.0-r1.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
new file mode 100644
index 000..b5950de
--- /dev/null
+++ b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="3.0"
+
+inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
+
+DESCRIPTION="Molecular dynamics by NMR data analysis"
+HOMEPAGE="http://www.nmr-relax.com/";
+SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-python/Numdifftools[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
+   sci-visualization/grace
+   sci-visualization/opendx
+   x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}
+   media-gfx/pngcrush
+   test? ( ${RDEPEND} )
+   "
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   rm -rf minfx bmrblib extern/numdifftools || die
+   tc-export CC
+   need-wxwidgets unicode
+}
+
+src_compile() {
+   escons
+}
+
+src_test() {
+   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
+   virtualmake
+}
+
+src_install() {
+   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
+
+   python_moduleinto ${PN}
+   python_domodule *
+
+   rm ${PN} README || die
+
+   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
+}



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2015-10-16 Thread Justin Lecher
commit: 41450445b1ed716105272105bdb4e9d2e8c4f42d
Author: Justin Lecher  gentoo  org>
AuthorDate: Fri Oct 16 09:20:29 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Fri Oct 16 09:21:15 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41450445

sci-chemistry/relax: Version Bump

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 sci-chemistry/relax/Manifest   |  1 +
 sci-chemistry/relax/relax-4.0.0.ebuild | 71 ++
 2 files changed, 72 insertions(+)

diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 42f7f7f..8953087 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1,2 +1,3 @@
 DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 
176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 
ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9
 WHIRLPOOL 
1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e
 DIST relax-3.3.9.src.tar.bz2 93403953 SHA256 
5bfa0fc774cfafd30e9f593f6b5f368b6bd79faf0ca2e7ae064a8bd3b6923685 SHA512 
0af93497acd91e6e4be0cf07efe09198c1234e70641835668a94714d58ad225d5ef94df3225d4d6809aa456e340c05829520f4aa6215cb83f7315ccca2053461
 WHIRLPOOL 
4ea5bb6582a020df902b9ac28cf5e025456607ddb50b1a6c1915db421ac6ea415781cb9d361fd34b2240500e7d0b74af131984dddcea6b0548dfb76d8b2be378
+DIST relax-4.0.0.src.tar.bz2 105659752 SHA256 
4bd27341196d7bf963b269ef41d89b9ac1e1a21200f7911e7c27900d2c0f16d9 SHA512 
28b5ddab2c83f95d7e1a502d05b5d3c93337fece68a1fef95ec8978f61fccf24cb37528cfef27cb20d132033535f4120b23cc76a75f34f52b27df17116351f8e
 WHIRLPOOL 
438859c8970f4f16fa9fdf59f7630e3cb07eb0279971b53fa29f6da081c8b3965db0e3f9000efa47d285e44579641222fd74d04b837e453847a1b4dd72acf479

diff --git a/sci-chemistry/relax/relax-4.0.0.ebuild 
b/sci-chemistry/relax/relax-4.0.0.ebuild
new file mode 100644
index 000..5ffdf92
--- /dev/null
+++ b/sci-chemistry/relax/relax-4.0.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="2.9"
+
+inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
+
+DESCRIPTION="Molecular dynamics by NMR data analysis"
+HOMEPAGE="http://www.nmr-relax.com/";
+SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-python/Numdifftools[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
+   sci-visualization/grace
+   sci-visualization/opendx
+   x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}
+   media-gfx/pngcrush
+   test? ( ${RDEPEND} )
+   "
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   rm -rf minfx bmrblib extern/numdifftools || die
+   tc-export CC
+}
+
+src_compile() {
+   escons
+}
+
+src_test() {
+   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
+   virtualmake
+}
+
+src_install() {
+   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
+
+   python_moduleinto ${PN}
+   python_domodule *
+
+   rm ${PN} README || die
+
+   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
+}



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2015-10-12 Thread Justin Lecher
commit: b19786e91df196c3adbbeeaeae701ff09bba
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Oct 12 09:25:19 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Oct 12 09:35:28 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b197

sci-chemistry/relax: Drop old

Package-Manager: portage-2.2.22
Signed-off-by: Justin Lecher  gentoo.org>

 sci-chemistry/relax/Manifest   |  4 --
 sci-chemistry/relax/relax-3.3.4.ebuild | 69 
 sci-chemistry/relax/relax-3.3.5.ebuild | 69 
 sci-chemistry/relax/relax-3.3.6.ebuild | 73 --
 sci-chemistry/relax/relax-3.3.7.ebuild | 73 --
 5 files changed, 288 deletions(-)

diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 789564f..30af534 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1,5 +1 @@
-DIST relax-3.3.4.src.tar.bz2 89206485 SHA256 
03ecc20353126d155c7d5c9ab45e3bb146a87243472711c937befced2db333c0 SHA512 
78ae5778ef0fe84fc3a26648dd2192d529fb1e5241728f7c06a5a2cec2ce849a2c75c19a931123a17d5c210acc4f4c2401574b10a1fbbe0307d2d9867567352d
 WHIRLPOOL 
4fcdec36e8df412091ab1a99a6b017ebc72f8e5c400429e698221f22e4ef7ae35713a6e2a05f6f1b573e5223f8eccc7cb0d2a20b1171e5bc483fd3ef1a0242bc
-DIST relax-3.3.5.src.tar.bz2 90164368 SHA256 
d9e3668221dba7589ba1d12ab40df517b5b6f742ee413864cc87ab636546e2ef SHA512 
c8c248abf0edb54af631c11b102b641d41a106036bbdb88d8f1563c9750d3c7d402ee150d7afd770b845d3a421e431afcf95e6222197f9dc1afec61ddcd0bf37
 WHIRLPOOL 
d9070bed833ef063c22fec5e55b1968c65b672ee100247b1af9a25d3149eb57475aeb94a4f125fc3cd278d97ac248e7826b083c840b47f9db83bae7e1aaae710
-DIST relax-3.3.6.src.tar.bz2 90005292 SHA256 
2b1994626a910036c63d67c609c49b3bde8c754b60763de62c2ac8f6c3f589c3 SHA512 
cda773a4af259d25550e4e4dbd8500594afd9df051ba06130355058347f308b804726acafaa76957e062c78d1d8fb26f843b3ac97d5aecd534b53c1a5155cafb
 WHIRLPOOL 
0bf0f51664a132653fbd981ee6776cb16dd6371504df2167658027325d632cda8a6f4a21d4a530c46dc75c93b3ffb87f5189d4986acadb344154cd7420361e0b
-DIST relax-3.3.7.src.tar.bz2 90268061 SHA256 
a32508bd55fa124f6472e08d89ec0fa9f3837efcceb2be681404eb998457381f SHA512 
3724a51ef9177f9bd78b3c92add7b88d559f21f5166eaf62b865586c061d17ce0a1af61a794db324d0f792eece04d8f1d037f9e982c858768da1d3fc208e9270
 WHIRLPOOL 
e4446c7ccbe1e8f3caa450a3d747fb8dfcc33d9d336386572b72481544101199150e7938b0e5319a70ef3a5a7f4ad53c143d4a6c01cc7553f435fbc0d00fe952
 DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 
176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 
ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9
 WHIRLPOOL 
1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e

diff --git a/sci-chemistry/relax/relax-3.3.4.ebuild 
b/sci-chemistry/relax/relax-3.3.4.ebuild
deleted file mode 100644
index e394217..000
--- a/sci-chemistry/relax/relax-3.3.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-python/Numdifftools[${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
-   sci-visualization/grace
-   sci-visualization/opendx
-   x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
-   media-gfx/pngcrush"
-
-pkg_setup() {
-   python-single-r1_pkg_setup
-}
-
-src_prepare() {
-   rm -rf minfx bmrblib extern/numdifftools || die
-   tc-export CC
-}
-
-src_compile() {
-   escons
-}
-
-src_test() {
-   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
-   virtualmake
-}
-
-src_install() {
-   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
-
-   python_moduleinto ${PN}
-   python_domodule *
-
-   rm ${PN} README || die
-
-   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
-}

diff --git a/sci-chemistry/relax/relax-3.3.5.ebuild 
b/sci-chemistry/relax/relax-3.3.5.ebui

[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2015-10-12 Thread Justin Lecher
commit: f661362f60a3734991fe0c24ad9b775626982a01
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Oct 12 11:39:49 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Oct 12 11:40:15 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f661362f

sci-chemistry/relax: Version Bump

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 sci-chemistry/relax/Manifest   |  1 +
 sci-chemistry/relax/relax-3.3.9.ebuild | 71 ++
 2 files changed, 72 insertions(+)

diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 30af534..42f7f7f 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1 +1,2 @@
 DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 
176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 
ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9
 WHIRLPOOL 
1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e
+DIST relax-3.3.9.src.tar.bz2 93403953 SHA256 
5bfa0fc774cfafd30e9f593f6b5f368b6bd79faf0ca2e7ae064a8bd3b6923685 SHA512 
0af93497acd91e6e4be0cf07efe09198c1234e70641835668a94714d58ad225d5ef94df3225d4d6809aa456e340c05829520f4aa6215cb83f7315ccca2053461
 WHIRLPOOL 
4ea5bb6582a020df902b9ac28cf5e025456607ddb50b1a6c1915db421ac6ea415781cb9d361fd34b2240500e7d0b74af131984dddcea6b0548dfb76d8b2be378

diff --git a/sci-chemistry/relax/relax-3.3.9.ebuild 
b/sci-chemistry/relax/relax-3.3.9.ebuild
new file mode 100644
index 000..5ffdf92
--- /dev/null
+++ b/sci-chemistry/relax/relax-3.3.9.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="2.9"
+
+inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
+
+DESCRIPTION="Molecular dynamics by NMR data analysis"
+HOMEPAGE="http://www.nmr-relax.com/";
+SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-python/Numdifftools[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
+   sci-visualization/grace
+   sci-visualization/opendx
+   x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}
+   media-gfx/pngcrush
+   test? ( ${RDEPEND} )
+   "
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   rm -rf minfx bmrblib extern/numdifftools || die
+   tc-export CC
+}
+
+src_compile() {
+   escons
+}
+
+src_test() {
+   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
+   virtualmake
+}
+
+src_install() {
+   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
+
+   python_moduleinto ${PN}
+   python_domodule *
+
+   rm ${PN} README || die
+
+   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
+}



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2017-02-23 Thread Mart Raudsepp
commit: e364277e3edad35fae066521930a8494714b5b07
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Feb 23 23:12:31 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Feb 23 23:13:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e364277e

sci-chemistry/relax: remove old that use wxGTK:2.9

Acked-by: David Seifert  gentoo.org>
Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-chemistry/relax/Manifest   |  2 -
 sci-chemistry/relax/relax-3.3.8.ebuild | 71 --
 sci-chemistry/relax/relax-3.3.9.ebuild | 71 --
 sci-chemistry/relax/relax-4.0.0.ebuild | 71 --
 4 files changed, 215 deletions(-)

diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 8953087ac7..fd8baba862 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1,3 +1 @@
-DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 
176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 
ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9
 WHIRLPOOL 
1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e
-DIST relax-3.3.9.src.tar.bz2 93403953 SHA256 
5bfa0fc774cfafd30e9f593f6b5f368b6bd79faf0ca2e7ae064a8bd3b6923685 SHA512 
0af93497acd91e6e4be0cf07efe09198c1234e70641835668a94714d58ad225d5ef94df3225d4d6809aa456e340c05829520f4aa6215cb83f7315ccca2053461
 WHIRLPOOL 
4ea5bb6582a020df902b9ac28cf5e025456607ddb50b1a6c1915db421ac6ea415781cb9d361fd34b2240500e7d0b74af131984dddcea6b0548dfb76d8b2be378
 DIST relax-4.0.0.src.tar.bz2 105659752 SHA256 
4bd27341196d7bf963b269ef41d89b9ac1e1a21200f7911e7c27900d2c0f16d9 SHA512 
28b5ddab2c83f95d7e1a502d05b5d3c93337fece68a1fef95ec8978f61fccf24cb37528cfef27cb20d132033535f4120b23cc76a75f34f52b27df17116351f8e
 WHIRLPOOL 
438859c8970f4f16fa9fdf59f7630e3cb07eb0279971b53fa29f6da081c8b3965db0e3f9000efa47d285e44579641222fd74d04b837e453847a1b4dd72acf479

diff --git a/sci-chemistry/relax/relax-3.3.8.ebuild 
b/sci-chemistry/relax/relax-3.3.8.ebuild
deleted file mode 100644
index 5ffdf92275..00
--- a/sci-chemistry/relax/relax-3.3.8.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-python/Numdifftools[${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
-   sci-visualization/grace
-   sci-visualization/opendx
-   x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
-   media-gfx/pngcrush
-   test? ( ${RDEPEND} )
-   "
-
-pkg_setup() {
-   python-single-r1_pkg_setup
-}
-
-src_prepare() {
-   rm -rf minfx bmrblib extern/numdifftools || die
-   tc-export CC
-}
-
-src_compile() {
-   escons
-}
-
-src_test() {
-   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
-   virtualmake
-}
-
-src_install() {
-   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
-
-   python_moduleinto ${PN}
-   python_domodule *
-
-   rm ${PN} README || die
-
-   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
-}

diff --git a/sci-chemistry/relax/relax-3.3.9.ebuild 
b/sci-chemistry/relax/relax-3.3.9.ebuild
deleted file mode 100644
index 5ffdf92275..00
--- a/sci-chemistry/relax/relax-3.3.9.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-python/Numdifftools[${PYTHON

[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-02-09 Thread Michał Górny
commit: b3b95491e29af254135e028d65c5cfc560efa608
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Feb  7 18:01:01 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb  9 16:35:20 2020 +
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]"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-15 Thread Michał Górny
commit: 5e05953f22d35b253fa30af22f19c5ccc9474297
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:37:17 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e05953f

sci-chemistry/relax: Use HTTPS

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/relax-4.0.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r1.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
index da182eead0a..606c454f1b1 100644
--- a/sci-chemistry/relax/relax-4.0.0-r1.ebuild
+++ b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
@@ -10,7 +10,7 @@ WX_GTK_VER="3.0"
 inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
 
 DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
+HOMEPAGE="https://www.nmr-relax.com/";
 SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
 
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-15 Thread Michał Górny
commit: 71c0b83f8d859141d2a39179fc9989386b0089f2
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:27:57 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:06 2020 +
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}]



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-22 Thread Michał Górny
commit: 0a231d17891be9aad3b52e03d50deac43d95d8c0
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jan 22 21:43:43 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jan 22 21:49:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a231d17

sci-chemistry/relax: Revbump post dep change

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/{relax-4.0.0-r1.ebuild => relax-4.0.0-r2.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r1.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r2.ebuild
similarity index 100%
rename from sci-chemistry/relax/relax-4.0.0-r1.ebuild
rename to sci-chemistry/relax/relax-4.0.0-r2.ebuild



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-28 Thread Michał Górny
commit: 4c65641141322dc73d3e6cc0224d745deea1ee19
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 28 20:22:26 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 28 20:40:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c656411

sci-chemistry/relax: Permit matplotlib-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/relax-4.0.0-r2.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r2.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r2.ebuild
index 606c454f1b1..8ded6d34d21 100644
--- a/sci-chemistry/relax/relax-4.0.0-r2.ebuild
+++ b/sci-chemistry/relax/relax-4.0.0-r2.ebuild
@@ -24,7 +24,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
${PYTHON_DEPS}
dev-python/Numdifftools[${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
+   || (
+   dev-python/matplotlib-python2[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   )
|| (
dev-python/numpy-python2[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-28 Thread Michał Górny
commit: 8a5044bf514cf5610f275ec6514770c1f7ceb681
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 28 20:57:40 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 28 21:30:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a5044bf

sci-chemistry/relax: Permit scipy-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/{relax-4.0.0-r2.ebuild => relax-4.0.0-r3.ebuild} | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r2.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r3.ebuild
similarity index 95%
rename from sci-chemistry/relax/relax-4.0.0-r2.ebuild
rename to sci-chemistry/relax/relax-4.0.0-r3.ebuild
index 8ded6d34d21..28b0f5d9da6 100644
--- a/sci-chemistry/relax/relax-4.0.0-r2.ebuild
+++ b/sci-chemistry/relax/relax-4.0.0-r3.ebuild
@@ -38,7 +38,10 @@ RDEPEND="
sci-chemistry/vmd
>=sci-libs/bmrblib-1.0.3[${PYTHON_USEDEP}]
>=sci-libs/minfx-1.0.11[${PYTHON_USEDEP}]
-   sci-libs/scipy[${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]"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-02-09 Thread Michał Górny
commit: b3b95491e29af254135e028d65c5cfc560efa608
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Feb  7 18:01:01 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb  9 16:35:20 2020 +
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]"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2015-10-25 Thread Pacho Ramos
commit: 0976e9cfcde80f655c375a8499124a979df97332
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Oct 25 16:36:24 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct 25 16:36:35 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0976e9cf

sci-chemistry/relax: Support wxGTK:3.0

Package-Manager: portage-2.2.23

 sci-chemistry/relax/relax-4.0.0-r1.ebuild | 72 +++
 1 file changed, 72 insertions(+)

diff --git a/sci-chemistry/relax/relax-4.0.0-r1.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
new file mode 100644
index 000..b5950de
--- /dev/null
+++ b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="3.0"
+
+inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
+
+DESCRIPTION="Molecular dynamics by NMR data analysis"
+HOMEPAGE="http://www.nmr-relax.com/";
+SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-python/Numdifftools[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
+   sci-visualization/grace
+   sci-visualization/opendx
+   x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}
+   media-gfx/pngcrush
+   test? ( ${RDEPEND} )
+   "
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   rm -rf minfx bmrblib extern/numdifftools || die
+   tc-export CC
+   need-wxwidgets unicode
+}
+
+src_compile() {
+   escons
+}
+
+src_test() {
+   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
+   virtualmake
+}
+
+src_install() {
+   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
+
+   python_moduleinto ${PN}
+   python_domodule *
+
+   rm ${PN} README || die
+
+   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
+}



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2015-10-16 Thread Justin Lecher
commit: 41450445b1ed716105272105bdb4e9d2e8c4f42d
Author: Justin Lecher  gentoo  org>
AuthorDate: Fri Oct 16 09:20:29 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Fri Oct 16 09:21:15 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41450445

sci-chemistry/relax: Version Bump

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 sci-chemistry/relax/Manifest   |  1 +
 sci-chemistry/relax/relax-4.0.0.ebuild | 71 ++
 2 files changed, 72 insertions(+)

diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 42f7f7f..8953087 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1,2 +1,3 @@
 DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 
176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 
ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9
 WHIRLPOOL 
1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e
 DIST relax-3.3.9.src.tar.bz2 93403953 SHA256 
5bfa0fc774cfafd30e9f593f6b5f368b6bd79faf0ca2e7ae064a8bd3b6923685 SHA512 
0af93497acd91e6e4be0cf07efe09198c1234e70641835668a94714d58ad225d5ef94df3225d4d6809aa456e340c05829520f4aa6215cb83f7315ccca2053461
 WHIRLPOOL 
4ea5bb6582a020df902b9ac28cf5e025456607ddb50b1a6c1915db421ac6ea415781cb9d361fd34b2240500e7d0b74af131984dddcea6b0548dfb76d8b2be378
+DIST relax-4.0.0.src.tar.bz2 105659752 SHA256 
4bd27341196d7bf963b269ef41d89b9ac1e1a21200f7911e7c27900d2c0f16d9 SHA512 
28b5ddab2c83f95d7e1a502d05b5d3c93337fece68a1fef95ec8978f61fccf24cb37528cfef27cb20d132033535f4120b23cc76a75f34f52b27df17116351f8e
 WHIRLPOOL 
438859c8970f4f16fa9fdf59f7630e3cb07eb0279971b53fa29f6da081c8b3965db0e3f9000efa47d285e44579641222fd74d04b837e453847a1b4dd72acf479

diff --git a/sci-chemistry/relax/relax-4.0.0.ebuild 
b/sci-chemistry/relax/relax-4.0.0.ebuild
new file mode 100644
index 000..5ffdf92
--- /dev/null
+++ b/sci-chemistry/relax/relax-4.0.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="2.9"
+
+inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
+
+DESCRIPTION="Molecular dynamics by NMR data analysis"
+HOMEPAGE="http://www.nmr-relax.com/";
+SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-python/Numdifftools[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
+   sci-visualization/grace
+   sci-visualization/opendx
+   x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}
+   media-gfx/pngcrush
+   test? ( ${RDEPEND} )
+   "
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   rm -rf minfx bmrblib extern/numdifftools || die
+   tc-export CC
+}
+
+src_compile() {
+   escons
+}
+
+src_test() {
+   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
+   virtualmake
+}
+
+src_install() {
+   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
+
+   python_moduleinto ${PN}
+   python_domodule *
+
+   rm ${PN} README || die
+
+   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
+}



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2015-10-12 Thread Justin Lecher
commit: b19786e91df196c3adbbeeaeae701ff09bba
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Oct 12 09:25:19 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Oct 12 09:35:28 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b197

sci-chemistry/relax: Drop old

Package-Manager: portage-2.2.22
Signed-off-by: Justin Lecher  gentoo.org>

 sci-chemistry/relax/Manifest   |  4 --
 sci-chemistry/relax/relax-3.3.4.ebuild | 69 
 sci-chemistry/relax/relax-3.3.5.ebuild | 69 
 sci-chemistry/relax/relax-3.3.6.ebuild | 73 --
 sci-chemistry/relax/relax-3.3.7.ebuild | 73 --
 5 files changed, 288 deletions(-)

diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 789564f..30af534 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1,5 +1 @@
-DIST relax-3.3.4.src.tar.bz2 89206485 SHA256 
03ecc20353126d155c7d5c9ab45e3bb146a87243472711c937befced2db333c0 SHA512 
78ae5778ef0fe84fc3a26648dd2192d529fb1e5241728f7c06a5a2cec2ce849a2c75c19a931123a17d5c210acc4f4c2401574b10a1fbbe0307d2d9867567352d
 WHIRLPOOL 
4fcdec36e8df412091ab1a99a6b017ebc72f8e5c400429e698221f22e4ef7ae35713a6e2a05f6f1b573e5223f8eccc7cb0d2a20b1171e5bc483fd3ef1a0242bc
-DIST relax-3.3.5.src.tar.bz2 90164368 SHA256 
d9e3668221dba7589ba1d12ab40df517b5b6f742ee413864cc87ab636546e2ef SHA512 
c8c248abf0edb54af631c11b102b641d41a106036bbdb88d8f1563c9750d3c7d402ee150d7afd770b845d3a421e431afcf95e6222197f9dc1afec61ddcd0bf37
 WHIRLPOOL 
d9070bed833ef063c22fec5e55b1968c65b672ee100247b1af9a25d3149eb57475aeb94a4f125fc3cd278d97ac248e7826b083c840b47f9db83bae7e1aaae710
-DIST relax-3.3.6.src.tar.bz2 90005292 SHA256 
2b1994626a910036c63d67c609c49b3bde8c754b60763de62c2ac8f6c3f589c3 SHA512 
cda773a4af259d25550e4e4dbd8500594afd9df051ba06130355058347f308b804726acafaa76957e062c78d1d8fb26f843b3ac97d5aecd534b53c1a5155cafb
 WHIRLPOOL 
0bf0f51664a132653fbd981ee6776cb16dd6371504df2167658027325d632cda8a6f4a21d4a530c46dc75c93b3ffb87f5189d4986acadb344154cd7420361e0b
-DIST relax-3.3.7.src.tar.bz2 90268061 SHA256 
a32508bd55fa124f6472e08d89ec0fa9f3837efcceb2be681404eb998457381f SHA512 
3724a51ef9177f9bd78b3c92add7b88d559f21f5166eaf62b865586c061d17ce0a1af61a794db324d0f792eece04d8f1d037f9e982c858768da1d3fc208e9270
 WHIRLPOOL 
e4446c7ccbe1e8f3caa450a3d747fb8dfcc33d9d336386572b72481544101199150e7938b0e5319a70ef3a5a7f4ad53c143d4a6c01cc7553f435fbc0d00fe952
 DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 
176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 
ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9
 WHIRLPOOL 
1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e

diff --git a/sci-chemistry/relax/relax-3.3.4.ebuild 
b/sci-chemistry/relax/relax-3.3.4.ebuild
deleted file mode 100644
index e394217..000
--- a/sci-chemistry/relax/relax-3.3.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-python/Numdifftools[${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
-   sci-visualization/grace
-   sci-visualization/opendx
-   x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
-   media-gfx/pngcrush"
-
-pkg_setup() {
-   python-single-r1_pkg_setup
-}
-
-src_prepare() {
-   rm -rf minfx bmrblib extern/numdifftools || die
-   tc-export CC
-}
-
-src_compile() {
-   escons
-}
-
-src_test() {
-   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
-   virtualmake
-}
-
-src_install() {
-   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
-
-   python_moduleinto ${PN}
-   python_domodule *
-
-   rm ${PN} README || die
-
-   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
-}

diff --git a/sci-chemistry/relax/relax-3.3.5.ebuild 
b/sci-chemistry/relax/relax-3.3.5.ebui

[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2015-10-12 Thread Justin Lecher
commit: f661362f60a3734991fe0c24ad9b775626982a01
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Oct 12 11:39:49 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Oct 12 11:40:15 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f661362f

sci-chemistry/relax: Version Bump

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 sci-chemistry/relax/Manifest   |  1 +
 sci-chemistry/relax/relax-3.3.9.ebuild | 71 ++
 2 files changed, 72 insertions(+)

diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 30af534..42f7f7f 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1 +1,2 @@
 DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 
176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 
ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9
 WHIRLPOOL 
1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e
+DIST relax-3.3.9.src.tar.bz2 93403953 SHA256 
5bfa0fc774cfafd30e9f593f6b5f368b6bd79faf0ca2e7ae064a8bd3b6923685 SHA512 
0af93497acd91e6e4be0cf07efe09198c1234e70641835668a94714d58ad225d5ef94df3225d4d6809aa456e340c05829520f4aa6215cb83f7315ccca2053461
 WHIRLPOOL 
4ea5bb6582a020df902b9ac28cf5e025456607ddb50b1a6c1915db421ac6ea415781cb9d361fd34b2240500e7d0b74af131984dddcea6b0548dfb76d8b2be378

diff --git a/sci-chemistry/relax/relax-3.3.9.ebuild 
b/sci-chemistry/relax/relax-3.3.9.ebuild
new file mode 100644
index 000..5ffdf92
--- /dev/null
+++ b/sci-chemistry/relax/relax-3.3.9.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="2.9"
+
+inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
+
+DESCRIPTION="Molecular dynamics by NMR data analysis"
+HOMEPAGE="http://www.nmr-relax.com/";
+SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-python/Numdifftools[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
+   sci-visualization/grace
+   sci-visualization/opendx
+   x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}
+   media-gfx/pngcrush
+   test? ( ${RDEPEND} )
+   "
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   rm -rf minfx bmrblib extern/numdifftools || die
+   tc-export CC
+}
+
+src_compile() {
+   escons
+}
+
+src_test() {
+   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
+   virtualmake
+}
+
+src_install() {
+   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
+
+   python_moduleinto ${PN}
+   python_domodule *
+
+   rm ${PN} README || die
+
+   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
+}



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-15 Thread Michał Górny
commit: 5e05953f22d35b253fa30af22f19c5ccc9474297
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:37:17 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e05953f

sci-chemistry/relax: Use HTTPS

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/relax-4.0.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r1.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
index da182eead0a..606c454f1b1 100644
--- a/sci-chemistry/relax/relax-4.0.0-r1.ebuild
+++ b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
@@ -10,7 +10,7 @@ WX_GTK_VER="3.0"
 inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
 
 DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
+HOMEPAGE="https://www.nmr-relax.com/";
 SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
 
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-15 Thread Michał Górny
commit: 71c0b83f8d859141d2a39179fc9989386b0089f2
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:27:57 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:06 2020 +
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}]



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-22 Thread Michał Górny
commit: 0a231d17891be9aad3b52e03d50deac43d95d8c0
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jan 22 21:43:43 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jan 22 21:49:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a231d17

sci-chemistry/relax: Revbump post dep change

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/{relax-4.0.0-r1.ebuild => relax-4.0.0-r2.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r1.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r2.ebuild
similarity index 100%
rename from sci-chemistry/relax/relax-4.0.0-r1.ebuild
rename to sci-chemistry/relax/relax-4.0.0-r2.ebuild



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-28 Thread Michał Górny
commit: 4c65641141322dc73d3e6cc0224d745deea1ee19
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 28 20:22:26 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 28 20:40:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c656411

sci-chemistry/relax: Permit matplotlib-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/relax-4.0.0-r2.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r2.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r2.ebuild
index 606c454f1b1..8ded6d34d21 100644
--- a/sci-chemistry/relax/relax-4.0.0-r2.ebuild
+++ b/sci-chemistry/relax/relax-4.0.0-r2.ebuild
@@ -24,7 +24,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
${PYTHON_DEPS}
dev-python/Numdifftools[${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
+   || (
+   dev-python/matplotlib-python2[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   )
|| (
dev-python/numpy-python2[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-28 Thread Michał Górny
commit: 8a5044bf514cf5610f275ec6514770c1f7ceb681
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 28 20:57:40 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 28 21:30:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a5044bf

sci-chemistry/relax: Permit scipy-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/{relax-4.0.0-r2.ebuild => relax-4.0.0-r3.ebuild} | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r2.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r3.ebuild
similarity index 95%
rename from sci-chemistry/relax/relax-4.0.0-r2.ebuild
rename to sci-chemistry/relax/relax-4.0.0-r3.ebuild
index 8ded6d34d21..28b0f5d9da6 100644
--- a/sci-chemistry/relax/relax-4.0.0-r2.ebuild
+++ b/sci-chemistry/relax/relax-4.0.0-r3.ebuild
@@ -38,7 +38,10 @@ RDEPEND="
sci-chemistry/vmd
>=sci-libs/bmrblib-1.0.3[${PYTHON_USEDEP}]
>=sci-libs/minfx-1.0.11[${PYTHON_USEDEP}]
-   sci-libs/scipy[${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]"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-02-09 Thread Michał Górny
commit: b3b95491e29af254135e028d65c5cfc560efa608
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Feb  7 18:01:01 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb  9 16:35:20 2020 +
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]"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2017-02-23 Thread Mart Raudsepp
commit: e364277e3edad35fae066521930a8494714b5b07
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Feb 23 23:12:31 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Feb 23 23:13:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e364277e

sci-chemistry/relax: remove old that use wxGTK:2.9

Acked-by: David Seifert  gentoo.org>
Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-chemistry/relax/Manifest   |  2 -
 sci-chemistry/relax/relax-3.3.8.ebuild | 71 --
 sci-chemistry/relax/relax-3.3.9.ebuild | 71 --
 sci-chemistry/relax/relax-4.0.0.ebuild | 71 --
 4 files changed, 215 deletions(-)

diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 8953087ac7..fd8baba862 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1,3 +1 @@
-DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 
176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 
ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9
 WHIRLPOOL 
1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e
-DIST relax-3.3.9.src.tar.bz2 93403953 SHA256 
5bfa0fc774cfafd30e9f593f6b5f368b6bd79faf0ca2e7ae064a8bd3b6923685 SHA512 
0af93497acd91e6e4be0cf07efe09198c1234e70641835668a94714d58ad225d5ef94df3225d4d6809aa456e340c05829520f4aa6215cb83f7315ccca2053461
 WHIRLPOOL 
4ea5bb6582a020df902b9ac28cf5e025456607ddb50b1a6c1915db421ac6ea415781cb9d361fd34b2240500e7d0b74af131984dddcea6b0548dfb76d8b2be378
 DIST relax-4.0.0.src.tar.bz2 105659752 SHA256 
4bd27341196d7bf963b269ef41d89b9ac1e1a21200f7911e7c27900d2c0f16d9 SHA512 
28b5ddab2c83f95d7e1a502d05b5d3c93337fece68a1fef95ec8978f61fccf24cb37528cfef27cb20d132033535f4120b23cc76a75f34f52b27df17116351f8e
 WHIRLPOOL 
438859c8970f4f16fa9fdf59f7630e3cb07eb0279971b53fa29f6da081c8b3965db0e3f9000efa47d285e44579641222fd74d04b837e453847a1b4dd72acf479

diff --git a/sci-chemistry/relax/relax-3.3.8.ebuild 
b/sci-chemistry/relax/relax-3.3.8.ebuild
deleted file mode 100644
index 5ffdf92275..00
--- a/sci-chemistry/relax/relax-3.3.8.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-python/Numdifftools[${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
-   sci-visualization/grace
-   sci-visualization/opendx
-   x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
-   media-gfx/pngcrush
-   test? ( ${RDEPEND} )
-   "
-
-pkg_setup() {
-   python-single-r1_pkg_setup
-}
-
-src_prepare() {
-   rm -rf minfx bmrblib extern/numdifftools || die
-   tc-export CC
-}
-
-src_compile() {
-   escons
-}
-
-src_test() {
-   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
-   virtualmake
-}
-
-src_install() {
-   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
-
-   python_moduleinto ${PN}
-   python_domodule *
-
-   rm ${PN} README || die
-
-   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
-}

diff --git a/sci-chemistry/relax/relax-3.3.9.ebuild 
b/sci-chemistry/relax/relax-3.3.9.ebuild
deleted file mode 100644
index 5ffdf92275..00
--- a/sci-chemistry/relax/relax-3.3.9.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-python/Numdifftools[${PYTHON

[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2015-10-25 Thread Pacho Ramos
commit: 0976e9cfcde80f655c375a8499124a979df97332
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Oct 25 16:36:24 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct 25 16:36:35 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0976e9cf

sci-chemistry/relax: Support wxGTK:3.0

Package-Manager: portage-2.2.23

 sci-chemistry/relax/relax-4.0.0-r1.ebuild | 72 +++
 1 file changed, 72 insertions(+)

diff --git a/sci-chemistry/relax/relax-4.0.0-r1.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
new file mode 100644
index 000..b5950de
--- /dev/null
+++ b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="3.0"
+
+inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
+
+DESCRIPTION="Molecular dynamics by NMR data analysis"
+HOMEPAGE="http://www.nmr-relax.com/";
+SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-python/Numdifftools[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
+   sci-visualization/grace
+   sci-visualization/opendx
+   x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}
+   media-gfx/pngcrush
+   test? ( ${RDEPEND} )
+   "
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   rm -rf minfx bmrblib extern/numdifftools || die
+   tc-export CC
+   need-wxwidgets unicode
+}
+
+src_compile() {
+   escons
+}
+
+src_test() {
+   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
+   virtualmake
+}
+
+src_install() {
+   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
+
+   python_moduleinto ${PN}
+   python_domodule *
+
+   rm ${PN} README || die
+
+   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
+}



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2015-10-16 Thread Justin Lecher
commit: 41450445b1ed716105272105bdb4e9d2e8c4f42d
Author: Justin Lecher  gentoo  org>
AuthorDate: Fri Oct 16 09:20:29 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Fri Oct 16 09:21:15 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41450445

sci-chemistry/relax: Version Bump

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 sci-chemistry/relax/Manifest   |  1 +
 sci-chemistry/relax/relax-4.0.0.ebuild | 71 ++
 2 files changed, 72 insertions(+)

diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 42f7f7f..8953087 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1,2 +1,3 @@
 DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 
176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 
ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9
 WHIRLPOOL 
1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e
 DIST relax-3.3.9.src.tar.bz2 93403953 SHA256 
5bfa0fc774cfafd30e9f593f6b5f368b6bd79faf0ca2e7ae064a8bd3b6923685 SHA512 
0af93497acd91e6e4be0cf07efe09198c1234e70641835668a94714d58ad225d5ef94df3225d4d6809aa456e340c05829520f4aa6215cb83f7315ccca2053461
 WHIRLPOOL 
4ea5bb6582a020df902b9ac28cf5e025456607ddb50b1a6c1915db421ac6ea415781cb9d361fd34b2240500e7d0b74af131984dddcea6b0548dfb76d8b2be378
+DIST relax-4.0.0.src.tar.bz2 105659752 SHA256 
4bd27341196d7bf963b269ef41d89b9ac1e1a21200f7911e7c27900d2c0f16d9 SHA512 
28b5ddab2c83f95d7e1a502d05b5d3c93337fece68a1fef95ec8978f61fccf24cb37528cfef27cb20d132033535f4120b23cc76a75f34f52b27df17116351f8e
 WHIRLPOOL 
438859c8970f4f16fa9fdf59f7630e3cb07eb0279971b53fa29f6da081c8b3965db0e3f9000efa47d285e44579641222fd74d04b837e453847a1b4dd72acf479

diff --git a/sci-chemistry/relax/relax-4.0.0.ebuild 
b/sci-chemistry/relax/relax-4.0.0.ebuild
new file mode 100644
index 000..5ffdf92
--- /dev/null
+++ b/sci-chemistry/relax/relax-4.0.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="2.9"
+
+inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
+
+DESCRIPTION="Molecular dynamics by NMR data analysis"
+HOMEPAGE="http://www.nmr-relax.com/";
+SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-python/Numdifftools[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
+   sci-visualization/grace
+   sci-visualization/opendx
+   x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}
+   media-gfx/pngcrush
+   test? ( ${RDEPEND} )
+   "
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   rm -rf minfx bmrblib extern/numdifftools || die
+   tc-export CC
+}
+
+src_compile() {
+   escons
+}
+
+src_test() {
+   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
+   virtualmake
+}
+
+src_install() {
+   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
+
+   python_moduleinto ${PN}
+   python_domodule *
+
+   rm ${PN} README || die
+
+   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
+}



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2015-10-12 Thread Justin Lecher
commit: b19786e91df196c3adbbeeaeae701ff09bba
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Oct 12 09:25:19 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Oct 12 09:35:28 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b197

sci-chemistry/relax: Drop old

Package-Manager: portage-2.2.22
Signed-off-by: Justin Lecher  gentoo.org>

 sci-chemistry/relax/Manifest   |  4 --
 sci-chemistry/relax/relax-3.3.4.ebuild | 69 
 sci-chemistry/relax/relax-3.3.5.ebuild | 69 
 sci-chemistry/relax/relax-3.3.6.ebuild | 73 --
 sci-chemistry/relax/relax-3.3.7.ebuild | 73 --
 5 files changed, 288 deletions(-)

diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 789564f..30af534 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1,5 +1 @@
-DIST relax-3.3.4.src.tar.bz2 89206485 SHA256 
03ecc20353126d155c7d5c9ab45e3bb146a87243472711c937befced2db333c0 SHA512 
78ae5778ef0fe84fc3a26648dd2192d529fb1e5241728f7c06a5a2cec2ce849a2c75c19a931123a17d5c210acc4f4c2401574b10a1fbbe0307d2d9867567352d
 WHIRLPOOL 
4fcdec36e8df412091ab1a99a6b017ebc72f8e5c400429e698221f22e4ef7ae35713a6e2a05f6f1b573e5223f8eccc7cb0d2a20b1171e5bc483fd3ef1a0242bc
-DIST relax-3.3.5.src.tar.bz2 90164368 SHA256 
d9e3668221dba7589ba1d12ab40df517b5b6f742ee413864cc87ab636546e2ef SHA512 
c8c248abf0edb54af631c11b102b641d41a106036bbdb88d8f1563c9750d3c7d402ee150d7afd770b845d3a421e431afcf95e6222197f9dc1afec61ddcd0bf37
 WHIRLPOOL 
d9070bed833ef063c22fec5e55b1968c65b672ee100247b1af9a25d3149eb57475aeb94a4f125fc3cd278d97ac248e7826b083c840b47f9db83bae7e1aaae710
-DIST relax-3.3.6.src.tar.bz2 90005292 SHA256 
2b1994626a910036c63d67c609c49b3bde8c754b60763de62c2ac8f6c3f589c3 SHA512 
cda773a4af259d25550e4e4dbd8500594afd9df051ba06130355058347f308b804726acafaa76957e062c78d1d8fb26f843b3ac97d5aecd534b53c1a5155cafb
 WHIRLPOOL 
0bf0f51664a132653fbd981ee6776cb16dd6371504df2167658027325d632cda8a6f4a21d4a530c46dc75c93b3ffb87f5189d4986acadb344154cd7420361e0b
-DIST relax-3.3.7.src.tar.bz2 90268061 SHA256 
a32508bd55fa124f6472e08d89ec0fa9f3837efcceb2be681404eb998457381f SHA512 
3724a51ef9177f9bd78b3c92add7b88d559f21f5166eaf62b865586c061d17ce0a1af61a794db324d0f792eece04d8f1d037f9e982c858768da1d3fc208e9270
 WHIRLPOOL 
e4446c7ccbe1e8f3caa450a3d747fb8dfcc33d9d336386572b72481544101199150e7938b0e5319a70ef3a5a7f4ad53c143d4a6c01cc7553f435fbc0d00fe952
 DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 
176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 
ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9
 WHIRLPOOL 
1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e

diff --git a/sci-chemistry/relax/relax-3.3.4.ebuild 
b/sci-chemistry/relax/relax-3.3.4.ebuild
deleted file mode 100644
index e394217..000
--- a/sci-chemistry/relax/relax-3.3.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-python/Numdifftools[${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
-   sci-visualization/grace
-   sci-visualization/opendx
-   x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
-   media-gfx/pngcrush"
-
-pkg_setup() {
-   python-single-r1_pkg_setup
-}
-
-src_prepare() {
-   rm -rf minfx bmrblib extern/numdifftools || die
-   tc-export CC
-}
-
-src_compile() {
-   escons
-}
-
-src_test() {
-   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
-   virtualmake
-}
-
-src_install() {
-   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
-
-   python_moduleinto ${PN}
-   python_domodule *
-
-   rm ${PN} README || die
-
-   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
-}

diff --git a/sci-chemistry/relax/relax-3.3.5.ebuild 
b/sci-chemistry/relax/relax-3.3.5.ebui

[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2015-10-12 Thread Justin Lecher
commit: f661362f60a3734991fe0c24ad9b775626982a01
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Oct 12 11:39:49 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Oct 12 11:40:15 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f661362f

sci-chemistry/relax: Version Bump

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 sci-chemistry/relax/Manifest   |  1 +
 sci-chemistry/relax/relax-3.3.9.ebuild | 71 ++
 2 files changed, 72 insertions(+)

diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 30af534..42f7f7f 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1 +1,2 @@
 DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 
176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 
ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9
 WHIRLPOOL 
1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e
+DIST relax-3.3.9.src.tar.bz2 93403953 SHA256 
5bfa0fc774cfafd30e9f593f6b5f368b6bd79faf0ca2e7ae064a8bd3b6923685 SHA512 
0af93497acd91e6e4be0cf07efe09198c1234e70641835668a94714d58ad225d5ef94df3225d4d6809aa456e340c05829520f4aa6215cb83f7315ccca2053461
 WHIRLPOOL 
4ea5bb6582a020df902b9ac28cf5e025456607ddb50b1a6c1915db421ac6ea415781cb9d361fd34b2240500e7d0b74af131984dddcea6b0548dfb76d8b2be378

diff --git a/sci-chemistry/relax/relax-3.3.9.ebuild 
b/sci-chemistry/relax/relax-3.3.9.ebuild
new file mode 100644
index 000..5ffdf92
--- /dev/null
+++ b/sci-chemistry/relax/relax-3.3.9.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="2.9"
+
+inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
+
+DESCRIPTION="Molecular dynamics by NMR data analysis"
+HOMEPAGE="http://www.nmr-relax.com/";
+SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-python/Numdifftools[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
+   sci-visualization/grace
+   sci-visualization/opendx
+   x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}
+   media-gfx/pngcrush
+   test? ( ${RDEPEND} )
+   "
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   rm -rf minfx bmrblib extern/numdifftools || die
+   tc-export CC
+}
+
+src_compile() {
+   escons
+}
+
+src_test() {
+   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
+   virtualmake
+}
+
+src_install() {
+   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
+
+   python_moduleinto ${PN}
+   python_domodule *
+
+   rm ${PN} README || die
+
+   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
+}



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2017-02-23 Thread Mart Raudsepp
commit: e364277e3edad35fae066521930a8494714b5b07
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Feb 23 23:12:31 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Feb 23 23:13:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e364277e

sci-chemistry/relax: remove old that use wxGTK:2.9

Acked-by: David Seifert  gentoo.org>
Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-chemistry/relax/Manifest   |  2 -
 sci-chemistry/relax/relax-3.3.8.ebuild | 71 --
 sci-chemistry/relax/relax-3.3.9.ebuild | 71 --
 sci-chemistry/relax/relax-4.0.0.ebuild | 71 --
 4 files changed, 215 deletions(-)

diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 8953087ac7..fd8baba862 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1,3 +1 @@
-DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 
176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 
ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9
 WHIRLPOOL 
1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e
-DIST relax-3.3.9.src.tar.bz2 93403953 SHA256 
5bfa0fc774cfafd30e9f593f6b5f368b6bd79faf0ca2e7ae064a8bd3b6923685 SHA512 
0af93497acd91e6e4be0cf07efe09198c1234e70641835668a94714d58ad225d5ef94df3225d4d6809aa456e340c05829520f4aa6215cb83f7315ccca2053461
 WHIRLPOOL 
4ea5bb6582a020df902b9ac28cf5e025456607ddb50b1a6c1915db421ac6ea415781cb9d361fd34b2240500e7d0b74af131984dddcea6b0548dfb76d8b2be378
 DIST relax-4.0.0.src.tar.bz2 105659752 SHA256 
4bd27341196d7bf963b269ef41d89b9ac1e1a21200f7911e7c27900d2c0f16d9 SHA512 
28b5ddab2c83f95d7e1a502d05b5d3c93337fece68a1fef95ec8978f61fccf24cb37528cfef27cb20d132033535f4120b23cc76a75f34f52b27df17116351f8e
 WHIRLPOOL 
438859c8970f4f16fa9fdf59f7630e3cb07eb0279971b53fa29f6da081c8b3965db0e3f9000efa47d285e44579641222fd74d04b837e453847a1b4dd72acf479

diff --git a/sci-chemistry/relax/relax-3.3.8.ebuild 
b/sci-chemistry/relax/relax-3.3.8.ebuild
deleted file mode 100644
index 5ffdf92275..00
--- a/sci-chemistry/relax/relax-3.3.8.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-python/Numdifftools[${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
-   sci-visualization/grace
-   sci-visualization/opendx
-   x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
-   media-gfx/pngcrush
-   test? ( ${RDEPEND} )
-   "
-
-pkg_setup() {
-   python-single-r1_pkg_setup
-}
-
-src_prepare() {
-   rm -rf minfx bmrblib extern/numdifftools || die
-   tc-export CC
-}
-
-src_compile() {
-   escons
-}
-
-src_test() {
-   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
-   virtualmake
-}
-
-src_install() {
-   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
-
-   python_moduleinto ${PN}
-   python_domodule *
-
-   rm ${PN} README || die
-
-   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
-}

diff --git a/sci-chemistry/relax/relax-3.3.9.ebuild 
b/sci-chemistry/relax/relax-3.3.9.ebuild
deleted file mode 100644
index 5ffdf92275..00
--- a/sci-chemistry/relax/relax-3.3.9.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-python/Numdifftools[${PYTHON

[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-22 Thread Michał Górny
commit: 0a231d17891be9aad3b52e03d50deac43d95d8c0
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jan 22 21:43:43 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jan 22 21:49:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a231d17

sci-chemistry/relax: Revbump post dep change

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/{relax-4.0.0-r1.ebuild => relax-4.0.0-r2.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r1.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r2.ebuild
similarity index 100%
rename from sci-chemistry/relax/relax-4.0.0-r1.ebuild
rename to sci-chemistry/relax/relax-4.0.0-r2.ebuild



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-28 Thread Michał Górny
commit: 4c65641141322dc73d3e6cc0224d745deea1ee19
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 28 20:22:26 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 28 20:40:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c656411

sci-chemistry/relax: Permit matplotlib-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/relax-4.0.0-r2.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r2.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r2.ebuild
index 606c454f1b1..8ded6d34d21 100644
--- a/sci-chemistry/relax/relax-4.0.0-r2.ebuild
+++ b/sci-chemistry/relax/relax-4.0.0-r2.ebuild
@@ -24,7 +24,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
${PYTHON_DEPS}
dev-python/Numdifftools[${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
+   || (
+   dev-python/matplotlib-python2[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   )
|| (
dev-python/numpy-python2[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-28 Thread Michał Górny
commit: 8a5044bf514cf5610f275ec6514770c1f7ceb681
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 28 20:57:40 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 28 21:30:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a5044bf

sci-chemistry/relax: Permit scipy-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/{relax-4.0.0-r2.ebuild => relax-4.0.0-r3.ebuild} | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r2.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r3.ebuild
similarity index 95%
rename from sci-chemistry/relax/relax-4.0.0-r2.ebuild
rename to sci-chemistry/relax/relax-4.0.0-r3.ebuild
index 8ded6d34d21..28b0f5d9da6 100644
--- a/sci-chemistry/relax/relax-4.0.0-r2.ebuild
+++ b/sci-chemistry/relax/relax-4.0.0-r3.ebuild
@@ -38,7 +38,10 @@ RDEPEND="
sci-chemistry/vmd
>=sci-libs/bmrblib-1.0.3[${PYTHON_USEDEP}]
>=sci-libs/minfx-1.0.11[${PYTHON_USEDEP}]
-   sci-libs/scipy[${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]"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-15 Thread Michał Górny
commit: 5e05953f22d35b253fa30af22f19c5ccc9474297
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:37:17 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e05953f

sci-chemistry/relax: Use HTTPS

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/relax-4.0.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r1.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
index da182eead0a..606c454f1b1 100644
--- a/sci-chemistry/relax/relax-4.0.0-r1.ebuild
+++ b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
@@ -10,7 +10,7 @@ WX_GTK_VER="3.0"
 inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
 
 DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
+HOMEPAGE="https://www.nmr-relax.com/";
 SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
 
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-15 Thread Michał Górny
commit: 71c0b83f8d859141d2a39179fc9989386b0089f2
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:27:57 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:06 2020 +
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}]



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-02-09 Thread Michał Górny
commit: b3b95491e29af254135e028d65c5cfc560efa608
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Feb  7 18:01:01 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb  9 16:35:20 2020 +
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]"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-22 Thread Michał Górny
commit: 0a231d17891be9aad3b52e03d50deac43d95d8c0
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jan 22 21:43:43 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jan 22 21:49:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a231d17

sci-chemistry/relax: Revbump post dep change

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/{relax-4.0.0-r1.ebuild => relax-4.0.0-r2.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r1.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r2.ebuild
similarity index 100%
rename from sci-chemistry/relax/relax-4.0.0-r1.ebuild
rename to sci-chemistry/relax/relax-4.0.0-r2.ebuild



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-28 Thread Michał Górny
commit: 4c65641141322dc73d3e6cc0224d745deea1ee19
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 28 20:22:26 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 28 20:40:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c656411

sci-chemistry/relax: Permit matplotlib-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/relax-4.0.0-r2.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r2.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r2.ebuild
index 606c454f1b1..8ded6d34d21 100644
--- a/sci-chemistry/relax/relax-4.0.0-r2.ebuild
+++ b/sci-chemistry/relax/relax-4.0.0-r2.ebuild
@@ -24,7 +24,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
${PYTHON_DEPS}
dev-python/Numdifftools[${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
+   || (
+   dev-python/matplotlib-python2[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   )
|| (
dev-python/numpy-python2[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-28 Thread Michał Górny
commit: 8a5044bf514cf5610f275ec6514770c1f7ceb681
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 28 20:57:40 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 28 21:30:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a5044bf

sci-chemistry/relax: Permit scipy-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/{relax-4.0.0-r2.ebuild => relax-4.0.0-r3.ebuild} | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r2.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r3.ebuild
similarity index 95%
rename from sci-chemistry/relax/relax-4.0.0-r2.ebuild
rename to sci-chemistry/relax/relax-4.0.0-r3.ebuild
index 8ded6d34d21..28b0f5d9da6 100644
--- a/sci-chemistry/relax/relax-4.0.0-r2.ebuild
+++ b/sci-chemistry/relax/relax-4.0.0-r3.ebuild
@@ -38,7 +38,10 @@ RDEPEND="
sci-chemistry/vmd
>=sci-libs/bmrblib-1.0.3[${PYTHON_USEDEP}]
>=sci-libs/minfx-1.0.11[${PYTHON_USEDEP}]
-   sci-libs/scipy[${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]"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-15 Thread Michał Górny
commit: 5e05953f22d35b253fa30af22f19c5ccc9474297
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:37:17 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e05953f

sci-chemistry/relax: Use HTTPS

Signed-off-by: Michał Górny  gentoo.org>

 sci-chemistry/relax/relax-4.0.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-chemistry/relax/relax-4.0.0-r1.ebuild 
b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
index da182eead0a..606c454f1b1 100644
--- a/sci-chemistry/relax/relax-4.0.0-r1.ebuild
+++ b/sci-chemistry/relax/relax-4.0.0-r1.ebuild
@@ -10,7 +10,7 @@ WX_GTK_VER="3.0"
 inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
 
 DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
+HOMEPAGE="https://www.nmr-relax.com/";
 SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
 
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-01-15 Thread Michał Górny
commit: 71c0b83f8d859141d2a39179fc9989386b0089f2
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:27:57 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:06 2020 +
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}]



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2020-02-09 Thread Michał Górny
commit: b3b95491e29af254135e028d65c5cfc560efa608
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Feb  7 18:01:01 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb  9 16:35:20 2020 +
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]"



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2017-02-23 Thread Mart Raudsepp
commit: e364277e3edad35fae066521930a8494714b5b07
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Feb 23 23:12:31 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Feb 23 23:13:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e364277e

sci-chemistry/relax: remove old that use wxGTK:2.9

Acked-by: David Seifert  gentoo.org>
Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-chemistry/relax/Manifest   |  2 -
 sci-chemistry/relax/relax-3.3.8.ebuild | 71 --
 sci-chemistry/relax/relax-3.3.9.ebuild | 71 --
 sci-chemistry/relax/relax-4.0.0.ebuild | 71 --
 4 files changed, 215 deletions(-)

diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 8953087ac7..fd8baba862 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1,3 +1 @@
-DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 
176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 
ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9
 WHIRLPOOL 
1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e
-DIST relax-3.3.9.src.tar.bz2 93403953 SHA256 
5bfa0fc774cfafd30e9f593f6b5f368b6bd79faf0ca2e7ae064a8bd3b6923685 SHA512 
0af93497acd91e6e4be0cf07efe09198c1234e70641835668a94714d58ad225d5ef94df3225d4d6809aa456e340c05829520f4aa6215cb83f7315ccca2053461
 WHIRLPOOL 
4ea5bb6582a020df902b9ac28cf5e025456607ddb50b1a6c1915db421ac6ea415781cb9d361fd34b2240500e7d0b74af131984dddcea6b0548dfb76d8b2be378
 DIST relax-4.0.0.src.tar.bz2 105659752 SHA256 
4bd27341196d7bf963b269ef41d89b9ac1e1a21200f7911e7c27900d2c0f16d9 SHA512 
28b5ddab2c83f95d7e1a502d05b5d3c93337fece68a1fef95ec8978f61fccf24cb37528cfef27cb20d132033535f4120b23cc76a75f34f52b27df17116351f8e
 WHIRLPOOL 
438859c8970f4f16fa9fdf59f7630e3cb07eb0279971b53fa29f6da081c8b3965db0e3f9000efa47d285e44579641222fd74d04b837e453847a1b4dd72acf479

diff --git a/sci-chemistry/relax/relax-3.3.8.ebuild 
b/sci-chemistry/relax/relax-3.3.8.ebuild
deleted file mode 100644
index 5ffdf92275..00
--- a/sci-chemistry/relax/relax-3.3.8.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-python/Numdifftools[${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
-   sci-visualization/grace
-   sci-visualization/opendx
-   x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
-   media-gfx/pngcrush
-   test? ( ${RDEPEND} )
-   "
-
-pkg_setup() {
-   python-single-r1_pkg_setup
-}
-
-src_prepare() {
-   rm -rf minfx bmrblib extern/numdifftools || die
-   tc-export CC
-}
-
-src_compile() {
-   escons
-}
-
-src_test() {
-   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
-   virtualmake
-}
-
-src_install() {
-   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
-
-   python_moduleinto ${PN}
-   python_domodule *
-
-   rm ${PN} README || die
-
-   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
-}

diff --git a/sci-chemistry/relax/relax-3.3.9.ebuild 
b/sci-chemistry/relax/relax-3.3.9.ebuild
deleted file mode 100644
index 5ffdf92275..00
--- a/sci-chemistry/relax/relax-3.3.9.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-python/Numdifftools[${PYTHON

[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/relax/

2017-02-23 Thread Mart Raudsepp
commit: e364277e3edad35fae066521930a8494714b5b07
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Feb 23 23:12:31 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Feb 23 23:13:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e364277e

sci-chemistry/relax: remove old that use wxGTK:2.9

Acked-by: David Seifert  gentoo.org>
Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-chemistry/relax/Manifest   |  2 -
 sci-chemistry/relax/relax-3.3.8.ebuild | 71 --
 sci-chemistry/relax/relax-3.3.9.ebuild | 71 --
 sci-chemistry/relax/relax-4.0.0.ebuild | 71 --
 4 files changed, 215 deletions(-)

diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 8953087ac7..fd8baba862 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1,3 +1 @@
-DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 
176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 
ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9
 WHIRLPOOL 
1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e
-DIST relax-3.3.9.src.tar.bz2 93403953 SHA256 
5bfa0fc774cfafd30e9f593f6b5f368b6bd79faf0ca2e7ae064a8bd3b6923685 SHA512 
0af93497acd91e6e4be0cf07efe09198c1234e70641835668a94714d58ad225d5ef94df3225d4d6809aa456e340c05829520f4aa6215cb83f7315ccca2053461
 WHIRLPOOL 
4ea5bb6582a020df902b9ac28cf5e025456607ddb50b1a6c1915db421ac6ea415781cb9d361fd34b2240500e7d0b74af131984dddcea6b0548dfb76d8b2be378
 DIST relax-4.0.0.src.tar.bz2 105659752 SHA256 
4bd27341196d7bf963b269ef41d89b9ac1e1a21200f7911e7c27900d2c0f16d9 SHA512 
28b5ddab2c83f95d7e1a502d05b5d3c93337fece68a1fef95ec8978f61fccf24cb37528cfef27cb20d132033535f4120b23cc76a75f34f52b27df17116351f8e
 WHIRLPOOL 
438859c8970f4f16fa9fdf59f7630e3cb07eb0279971b53fa29f6da081c8b3965db0e3f9000efa47d285e44579641222fd74d04b837e453847a1b4dd72acf479

diff --git a/sci-chemistry/relax/relax-3.3.8.ebuild 
b/sci-chemistry/relax/relax-3.3.8.ebuild
deleted file mode 100644
index 5ffdf92275..00
--- a/sci-chemistry/relax/relax-3.3.8.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-python/Numdifftools[${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/wxpython:${WX_GTK_VER}[${PYTHON_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[${PYTHON_USEDEP}]
-   sci-visualization/grace
-   sci-visualization/opendx
-   x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
-   media-gfx/pngcrush
-   test? ( ${RDEPEND} )
-   "
-
-pkg_setup() {
-   python-single-r1_pkg_setup
-}
-
-src_prepare() {
-   rm -rf minfx bmrblib extern/numdifftools || die
-   tc-export CC
-}
-
-src_compile() {
-   escons
-}
-
-src_test() {
-   VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
-   virtualmake
-}
-
-src_install() {
-   dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
-
-   python_moduleinto ${PN}
-   python_domodule *
-
-   rm ${PN} README || die
-
-   make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py 
$@"
-}

diff --git a/sci-chemistry/relax/relax-3.3.9.ebuild 
b/sci-chemistry/relax/relax-3.3.9.ebuild
deleted file mode 100644
index 5ffdf92275..00
--- a/sci-chemistry/relax/relax-3.3.9.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs 
wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/";
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-python/Numdifftools[${PYTHON