Version BUmp

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 105 insertions, 20 deletions

diff --git a/sci-chemistry/relax/ChangeLog b/sci-chemistry/relax/ChangeLog
index da4693fbc94d..26cc8188f833 100644
--- a/sci-chemistry/relax/ChangeLog
+++ b/sci-chemistry/relax/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/relax
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/ChangeLog,v 1.34 2015/02/07 07:58:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/ChangeLog,v 1.35 2015/03/15 09:15:32 jlec Exp $
+
+*relax-3.3.7 (15 Mar 2015)
+
+  15 Mar 2015; Justin Lecher <jlec@gentoo.org> +relax-3.3.7.ebuild,
+  relax-3.3.6.ebuild:
+  Version BUmp
 
   07 Feb 2015; Justin Lecher <jlec@gentoo.org> -files/relax-2.1.0-gentoo.patch,
   -files/relax-2.2.1-gentoo.patch, -files/relax-3.0.1-gentoo.patch,
diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index c0829dbb567b..addef12118bd 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -4,27 +4,29 @@ Hash: SHA512
 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
 EBUILD relax-3.3.4.ebuild 1626 SHA256 b1e6b8c47a00dc9534d062388a3f24647ae16df705ce72d1314275152b42287e SHA512 87c04b683cd44b96c8770eb1ff6ce4985d20b1b3111e2455f1fbdacda5f90fc821878b6530e1040fb4f5e97150cf06b22aa47b02be00f0fc966f87bf711a1214 WHIRLPOOL 329920303bdfefec2583efe39096f6d6d8bff036bafc2bdf802d365bd40b45b09659b3777cc9f84c4475c138563dc403a2ff75df61121b4038f167c7caec8b07
 EBUILD relax-3.3.5.ebuild 1626 SHA256 e3ccbe04dc546d4eb8e0f9655dabf74cb166058e3de7001d6bc4113136a72a68 SHA512 e860a1c3bd71cc4ef3700f1e5d7ef1793cd31deb19d0c27f23c198168e368c8e33cadda000f7bca02dcfc055525dd13498b9dc047d1782318290761bd393de77 WHIRLPOOL b911d22dfa7af2ce560046908a7b0b7b0a184328abfffe8bfb327bf59fbf6a95f984cf7a82211ffeba7b508669c126e7b9750497d1cc0956daf316e5af25ad39
-EBUILD relax-3.3.6.ebuild 1626 SHA256 90de2a1cc5c98fe07cbd6dd3890d7f44dbafb55f53a01a5b8919ff897f464f4e SHA512 de0e02e1775bbc1c04af5decd22571018f237c47e6206b5a3773d878994e19f6761e468ee5217b6fa191597c94b061e7b486fd904b605f0086e2e84780cd2dcc WHIRLPOOL 63ddb15d7d7de226f9020cd29f8b9202a75df70a7ff81fc38d16af5291678a5a28cffd4eaac808fb4f96970e5d081522a75b439858a88727909252aee95e2662
-MISC ChangeLog 5664 SHA256 161ec44f2114bbba876d036b5a30d5e2c3925d436e4748b0abb373498e47b67d SHA512 49ed1a64536cd0c77a712642faf770e64b55609832c6cff002801aee89c89f84ffaf4c73a541a1f6960fb2910b6621d80a7dd04959823479219e34aed11fe536 WHIRLPOOL a8af35aa3a873bf7da9c1691877097cc7003ddc1831d551fc1afc1c1aebcaec5acbd9b8d0dc214bfdaeaf1afb9a8d8aaa0a653f06438ebb746919f3fc29d7c09
+EBUILD relax-3.3.6.ebuild 1657 SHA256 87af36ec25415c0eca3dcc68a8af2bb6a088257b4766387a8a61ad962c7e8c4d SHA512 fd10b8aeaadfa2f89a630cf1d7190c9c951a910db1775f39a859404d0b2bfd5611dd5ce365d7106ca9afc26e9c395123be2aa7fafae3e97d37b88141289df812 WHIRLPOOL 140741b430be29c36f1059917119a6ec5238fbc8cb1d866b2a76312ebba24afe31c05853afa977c236a37caa5cad63537c747213668eb4a499a574d41161fe05
+EBUILD relax-3.3.7.ebuild 1657 SHA256 8d695515705c37280d7cfee84f0a777f052eab10f783bc12bdc6622545f6ca05 SHA512 acfe22a54443be0dbc8b76512ce3b525501b90ccd44b6f0c861d18418041cbf27b59131c0293d57eece4d794e4f1b815d380d11663970562b3e7a5682befe0fc WHIRLPOOL 7935c06bfabd04d8694cfc7cb0822cff907e5528c28e0d2aa351bf407d31953b6811646f39fcf217cca44ac5e6dff906fe2db660e65b2050201ced7e51b2d06f
+MISC ChangeLog 5798 SHA256 a60b544e8a8ca25a24792f4e1b28e6617f14b203e89fab6ab600fedba16ab3f4 SHA512 d3e3e51236139024763a0189d9227448ce677e64146f1721c0c99bd02f653fb7bfef6b8f87c48eec11d397742d12785a5166b402216992c6b43af78f1f3a4432 WHIRLPOOL b0b577594a40e82ef66cd21087c79f44b786248d7cc966cd268525e748467eb89c9853841fae482792c12aec93816f12c8e99dfd1cff7166346c2d7d7356fd03
 MISC metadata.xml 1315 SHA256 58aef1b2b940b7211a85032dfc7212025aca6a3cd313b1a6e203854bbd3dd03e SHA512 dcb1d935782546693b79aa74dc37d55701ff4cb1756860a7f0d9919534ad2ae6f1dcad20cace867b10297c577cb6444dd5e212b13f57c3d81b30b382d8458c04 WHIRLPOOL e2de7c85fb3494a98c2ee1b08dd06d28676f43f64367ad29a8723f712e12e9052daa82794bb6626506de568701b1ea09efe059a8d3a13f6aee5fd607a913e441
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJU1caHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVBU26XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirUC0P/j1sjfKBXhAPXElPY8cUW5nY
-2Gq6MfJsurl4rnYtUKQkLSVkEEo9wKpanwfz7l2DTYRqOlZyqx4/799jyLe2s8gJ
-SuZfnitzYYdaZAg7iN44tQ6AdOT2qpdQg4gUr92bR3MoJZ4pFuwm1ewoXcYUGzgJ
-sab4OBNlOsXhJf7FaT+0nKDR9avbSMSENSPNEx4IERRQnrgUd3oL8kuuPdwtcdYf
-WsoJAPCPnyIJVsb4KC+yMr0cqfuLQyc8ap5xpUcUXUQDg6Bw2LMEUkI68uK5yVrb
-6tCvkzry8AyAQKSR2tMn4lbH4kOVTCgMUxPym44iyw5bCP0Y2uEe0ER2UE7MIJrp
-36uzlLaWHJ3uBs3fvR8MnIjVycKJ0hIEg7OPjICua0GI2a1zT0PnnroNob4mgS9o
-br6FbP1NxpaW9tr/WVrvC0p+jC01j8z/IBFHb+0Hf0jBd4sXDjXe6D6M9tVIs/5j
-7vix910KUEeLOIADe3LKkkKV35Xa9N3exauD4GCy4FfAzJO/ZzEuS1WGhHSRVhJj
-ahzyDlHlxUezujvgsQH+dKgdo2kq/NKp9nHt7bH2xtHZiWYu92rUEobTgClml/GC
-KRKc6o+tb8BIt9C6KpLXYsPTRHBq5oPcsdOvvhZehetywJOWV0g1cRhPw21hKPJc
-yFnb4XnEF/MAtMYwoAF8
-=xtLV
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirDH0P/ReCgFwTdWJ5X6fbIopdPLs6
+drjMS/vUkRyCTC5wD+gVQfbQisLARMWk0p1WDd3IjERLLQbByuZCT6LvNRIECdRS
+iXH9lu3Qfn/yhuo87NlsdpGf9iVsoJf2Xy6dng3PiAcFY1Ul5V1c/L9GQq0SBQiL
+L/Apen/6Dln3/ruyM0qK+WLTYDG15AYGkRqY1J7kRuxuVk9v3/wkyDNZOAZFHj+R
+bcVbU8LD332hwt67N0WuUpETBxz9+Attf5wfr4I6FmtfS66QDAhUsnD7f2WVDOyW
+E3AO/DrdB8+v3BQO557N27qAsh0EKwOtVdjq5V0v+RMDp2zhuKq23EY9mi0wBVXi
+GJy53WuPcoCZ0JT28JlNMq9+0WnBzixYP9EN5MslsMg+2n1hVsTMHfjQI9wst3wB
+DLOA9YzSAPNYNP+eQ5wcbqEA3wY/NyD7dfygJC/VROmPFAUXKc3xIeC74lRe/PLp
+oHMmbVyLy0rLWVA4oBR/NwVhvLt12nIDln6Z6z78rat89B5g8Ox/3IfOijuI+eHw
+6nQKYGBPD8Ssy/TVgGnKwWW91pGfRHI1TOeqLyvtd/INWHwV4LeYbiFX7uJddsAR
+eFvT20mshRlfdRGMwbgrjUTEbFL43tF6uk1iykVhK5ZK1SgPB9UqSEwiIpM1qYCB
+nKAY96i0cuFSM6pblc4y
+=6aNP
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/relax/relax-3.3.6.ebuild b/sci-chemistry/relax/relax-3.3.6.ebuild
index 726d0d2a1a00..ffc93ae9c65f 100644
--- a/sci-chemistry/relax/relax-3.3.6.ebuild
+++ b/sci-chemistry/relax/relax-3.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/relax-3.3.6.ebuild,v 1.1 2015/02/07 07:56:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/relax-3.3.6.ebuild,v 1.2 2015/03/15 09:15:32 jlec Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
+IUSE="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -37,7 +37,11 @@ RDEPEND="
 	sci-visualization/opendx
 	x11-libs/wxGTK:${WX_GTK_VER}[X]"
 DEPEND="${RDEPEND}
-	media-gfx/pngcrush"
+	media-gfx/pngcrush
+	test? (
+		${RDEPEND}
+	)
+	"
 
 pkg_setup() {
 	python-single-r1_pkg_setup
diff --git a/sci-chemistry/relax/relax-3.3.7.ebuild b/sci-chemistry/relax/relax-3.3.7.ebuild
new file mode 100644
index 000000000000..ba28f11f4584
--- /dev/null
+++ b/sci-chemistry/relax/relax-3.3.7.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/relax-3.3.7.ebuild,v 1.1 2015/03/15 09:15:32 jlec Exp $
+
+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 $@"
+}