sci-chemistry/relax: Version Bump

Package-Manager: portage-2.2.7/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 95 insertions, 14 deletions

diff --git a/sci-chemistry/relax/ChangeLog b/sci-chemistry/relax/ChangeLog
index ff459b9e4414..e8562b1c1e52 100644
--- a/sci-chemistry/relax/ChangeLog
+++ b/sci-chemistry/relax/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/relax
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/ChangeLog,v 1.7 2013/11/16 08:25:43 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/ChangeLog,v 1.8 2013/11/27 07:58:28 jlec Exp $
+
+*relax-3.0.2 (27 Nov 2013)
+
+  27 Nov 2013; Justin Lecher <jlec@gentoo.org> relax-2.2.5.ebuild,
+  +relax-3.0.2.ebuild:
+  Version Bump
 
   16 Nov 2013; Ryan Hill <dirtyepic@gentoo.org> relax-2.1.0.ebuild,
   relax-2.2.1.ebuild, relax-2.2.5.ebuild, relax-3.0.1.ebuild:
diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 9c292b5dc632..1868f6427560 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX relax-2.1.0-gentoo.patch 910 SHA256 2e85e979fa61e950def08e5a71e0d61662d5d8755a50fa6f4210000760778dbe SHA512 45c537b69b84e67fbadfcc30ae51f8f2d86d897c6187a1008b974899e8464cc638ad21b7e43eb2395887a962dcd6a751e24e4d46fec3639413a90de7fbfb98e6 WHIRLPOOL fd3ffa8d5926586b2d8ff56e3e3e20cf816987a23358e823c39ed4217d53fbea43185c5bcc1abb9bbcb0703e84f1243cbca5db7cb26d432755b488950db72171
 AUX relax-2.2.1-gentoo.patch 1676 SHA256 8c31035e6d9abbca876a5d29ce25abe2a6daf6efb55c23a6436cf687d92e49bb SHA512 9e11f5a802b0b9ed8353fd7125e17b6e14d05495d0951bc7536f652ce39ec8baa57acd6574ff6319dd2a6b6938a5bd0a51b95540e22d907675c3cac5e47b8e6d WHIRLPOOL ccd635d5724c7d2db784d457ef126f424f26bb854bc1b85c8b214aaf0e8589a557dc951354c95961968521c6b536663ff78afdf397fac5e18b6143ab4e86a6be
@@ -8,20 +8,28 @@ DIST relax-2.1.0.src.tar.bz2 22054720 SHA256 e7908dbf774e1eb866f45fc222d14935624
 DIST relax-2.2.1.src.tar.bz2 58950056 SHA256 532fabd9f8e3c7503ee9b75f690869898f639526e0b36c858f66faddba6d3831 SHA512 d6bc574d9ff0baed5f08599df585354b2e0aec263adb33773aeec5392bb26efe43d8626cea13e789b2d1346bfe763511882dfe2c3ee8935ae4c9c0955f76ba79 WHIRLPOOL a561c0c25e0642aa9190233e4ed7fb045f7f891c690d662a559cc3e6f1f7da27977fc8e27c0cc27ab3c0b9624ac9bd606ffa6f7cb77e77bef8dae7b88430116d
 DIST relax-2.2.5.src.tar.bz2 59081139 SHA256 1f62d5e3294accab2baee912216d1651d9ec43b8b33d7f8d434c125c200991fe SHA512 bffdde3fd4644e730d41b1a67e1f43f07f6a9426bd9f714aea59a92c2868e5467adc5bc57326e1c8904708b13b13482867e040fc28373d1b5029b577b400895f WHIRLPOOL d3e5817e7de0d9bae830cb195be1d90a83020c544bdb06b31958f07e7b0309189ae48a3f21a12955f457fa86a21c8764b619a62a6d8a966be46bcdd4b5c52a90
 DIST relax-3.0.1.src.tar.bz2 60536002 SHA256 472b0446c3611a06c4f5bbc338e7986e31993f31a4289a2c211fa0510a0566b1 SHA512 0e1cf46324a52363c4ceb18c2817e0d57cf38ea781a213822156601c05aecd56af0fdb39a1e7ff996dd6c20b5d8c8cc6aa27fcbd6082f51d712d5fc843e3fdc6 WHIRLPOOL d9445e76fc70fb57384ea7aa86a672575ca702dd098fe3b37fd494744d75187a62827a72c3ad5253069be4d6e00ea47443e6a13123a911d599bb0ae57713e175
+DIST relax-3.0.2.src.tar.bz2 60546216 SHA256 647fa4b05ae4e7f5072ee1c3c88af5b6eaf7a81a32d1b9a506d69ae8e37c865b SHA512 e90f97ee62ae56b899e0d70a2272c9411a56e71a0f14032985870a781a2fac530bdbff1669b46faae599a047141904a6718d351513b1f2d1afed8b92709d9501 WHIRLPOOL ec93521174c34357a06e82ee1ac5fdf3af5b341e951f5c263451a2bc90e9067f99e689455a4b3c966cb128661cb69bfd7aa355d7ca3fad7686139d8c1deea835
 EBUILD relax-2.1.0.ebuild 1128 SHA256 2d49d317cc424da9f9f2bf86ec802dae614952d506e385a60fa95e262b0c0da3 SHA512 fa76e538545bb5a2d520d3b063ba255f2d4c0279332631f061444a697528f78c6709f3d91a946289bf80828059ff7423b0d3d5374117bf89625f360212540614 WHIRLPOOL 4e0686ab5f70ddd7243c53437978b617ee2a9be55da1eb78022863babeafffae80536048471526e6076553761ea968129e7100c960d6fc7f970b281911d4ba09
 EBUILD relax-2.2.1.ebuild 1337 SHA256 4c65b74e17d1928bfc0f42230e1ccbc6abd5963901a751a7782f3c19bf25008c SHA512 70c78139ba9a9a08404673fc970082f9e3c868b2651b80d9f7cac4c5680bec846c69d3c65e68240139dfe37957607845b0ac66f595151ee7051b745d500d095e WHIRLPOOL 219ca572d15297a779da98b2a9f7a12edd80bec89710be07d0d2b02716534c831893a0bc14a0a9f177e6cebc0283c4d25872c4265a7f6f20610c0b17feafd236
-EBUILD relax-2.2.5.ebuild 1516 SHA256 a48863587c0744c088c78f51f4a0c3b5bd222af11e6771fb794f787fbc4c06b9 SHA512 be4163015d2db7d44c0e26ed46090a3465f88f12da22f65abba85665fdbdb6cc1573e4f21b9492f39da9895688d5e3efa82c142003fb86f66c05ee07bb4e7da9 WHIRLPOOL 1ef06810a3db9bbeb38dede38f6b7ef28aa6e7e754ec92ac1f5199592747b4aa0773d105c0198789ae16050a0642383a711b612254fd5825a46f1e83ee63fc12
+EBUILD relax-2.2.5.ebuild 1521 SHA256 f9192d970b2e70dcebdfc6ebd4658459cf5ac88a1b74886cf456108633ccf2c3 SHA512 7a4f13a4be29ef48082e82e6ec7bc6f6b3e1da72ed32e914b9f202c83f61868d850f3c4f2410407ad4c1be5ce5939fb16330d403bcdbdea12fc69e0070a15007 WHIRLPOOL ba6768c596b799456d18f85450520b7de81b5688df9ec3762023b54bf82f3398ed9eea862d242a064ffd3f71f8f73315b15d8734ace7a0196e4fc0b82be8ad99
 EBUILD relax-3.0.1.ebuild 1510 SHA256 640d9964245a7c7b42db8e31f59cbb33c6c136481f9cedc46ad80e425e05d1df SHA512 773004e05d60024ba2b793cbe1cc0b95e9f2b788d5cd2a667e4d182598662181e82b03ca084f7690a6755b8bb6926a81b19190b8343f6e2b70ab7e781dd5b683 WHIRLPOOL d2eac52a53b0f7f6389b128ab4433aead2394e64ff1a10006b73a6633a407030918030e859d64657bd139d326cd38faba05f86094f7a684660dc08f48a761cb9
-MISC ChangeLog 1272 SHA256 5f48aa2d20b155045d92589b14ae11bebf661c4d0eed7507375954749769cd58 SHA512 efb0dd0cfced1c849f08b7dc26db1a3e4d768e7ee8ae587c79bda8b8e8e4bf73481e8a5442cd0466d66a7ab3f9b0049ed5cbc2a92e5010885eafa7d84b52f126 WHIRLPOOL f7e94719e908ba52fa8d5511a18518c74ca25a7428c8c1e310998143b8b2b7599228e5a4310abf9a098e588111d120e4b4c9379cc8ad7dc211c53f025d88e20c
+EBUILD relax-3.0.2.ebuild 1531 SHA256 347e75f0230b88c5b4e761e190f9c5ab97f32b1401e197b7428d31fd6f88f427 SHA512 0f2a1b067aba288dbb1fed35c75ec5835a55140ae0b137ef999e16d2c83587233a2f1379c1fdbf9d4f771af01c0079c16700468148490b934a5599bbf14e5915 WHIRLPOOL 1443ed8d485ff31ff69aef6811521991bb0210abc0a4fd0a02ef6dd195b3bb5ac80d77de9df09086fbae7352b456047ab546abdc5d429cb6c7545ce84426f6e6
+MISC ChangeLog 1401 SHA256 caef0c95d72eb7bfbbf3d2c3d3cedc61204dddbc79ad5801c7f6e6939bcf1be7 SHA512 8ce52b1e4aba24daf733387343f6486c6f9390f18b04c724862a29473f68fb400c90529c5a6feeffb7b07f1ed50e69896911205ab7ddc9265c2e8b74b1f4fe80 WHIRLPOOL 7e536d8c40a7134f3eec267a2bcdb11dfef8738d307ed27cd6050ff6d444ba91051a7dd4c4415bc7ed6627f3aa11f34c2907afa708b49d7147d2eac5ab8e5a9b
 MISC metadata.xml 1315 SHA256 58aef1b2b940b7211a85032dfc7212025aca6a3cd313b1a6e203854bbd3dd03e SHA512 dcb1d935782546693b79aa74dc37d55701ff4cb1756860a7f0d9919534ad2ae6f1dcad20cace867b10297c577cb6444dd5e212b13f57c3d81b30b382d8458c04 WHIRLPOOL e2de7c85fb3494a98c2ee1b08dd06d28676f43f64367ad29a8723f712e12e9052daa82794bb6626506de568701b1ea09efe059a8d3a13f6aee5fd607a913e441
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJShy5iAAoJEO04vUmVeoRjmkEH/RsPtnNbJyqgnc3AzgD9hT1m
-wLxCV7X2APha+C/Vsr1VmFkjAtW/wjhqv7dEWjnPYhhukstBsAQPy8QncgaH8w89
-XkT19eq/hQmUUv1oZB0Qfs4d4SETXo6Npk1J32Uun/3A4uTNx+fxSdUToNWDuiyK
-BBEE3Ht96GCt0q4HGju7llU+9vOsgXD1ahsNK7d4IJgEwVSOv1x7SmYzvZC4vekG
-b/9qHH0k0p6mhp6BekrEmx2ran/Mcv7U/y5Ql643Yu9RFG0GunxBxy2K7Ld3pXd9
-M2UYerqSqPt4L1ckl71mOcVywsO4ocaC6jMxAbh4I8TDejev9iQJo0Avgvh0+TA=
-=FX1Q
+iQIcBAEBCgAGBQJSlaYlAAoJELnU8jG9FViraq0P/1MNnz9+otalIMd8DqM0wgyv
+VmC6qf7LBE9UaH1jv4Z99d1cY5C2Dz89px0bjBn7BTs7RU+YLm2qHl2rJ0wZ2z2j
+QIveGh13qY8myNeKqjwbyb/PRZqdHGtb13S3oWZtU6Ln9h4VP6Ne31I+t3QXjKZ7
+X8a+wZdUnR81zRh72CJigc+mLki3VxdvQWH9i8nF4Bl4LfwDhSKpPqS0hTIyKbZ3
+rrI3hEIRzg9E3bLoThUCCKV933HdsX0vOzwvAmcs7fq2foaa/4qEJ+bzaHVgnDW3
+1AUZr6p3YZUdE3NOpKH580XkVvba8f0SbYtrkrTIhH0mnifVPr/sPzJ27dJjvHjh
+goEg70ss0HeOcuoimK0XkCI/YTeahbKSsu4/sxxYOmHYdKH67PuWwCkW2L6EuE/v
+mIgoKR1wXFgIyt0DRYbehNAhs55hTTi55vw8Q2nuV4veOCQVOrWf4X8ssCKS/K/i
+onyZ9TLv/ZThFe2KOelo2nGJj3ldPN/A2eUG7X17wVG2/gfU1HKRuE+K3/sv/pPX
+YlFzpL6C+2YY8B8pfwGAcUqmxxQdSH90ufeUX/BYtbDNeKVv0u3FUFpdqFKWZgjV
+aQj/gsp0AU/68V53rcjXLTsy4kQ6mZ96JOE80rUz3PIKionOtVy9BML+WoLXM2Di
+7gS7FVQ1FWx1XSmaYx36
+=EKd9
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/relax/relax-2.2.5.ebuild b/sci-chemistry/relax/relax-2.2.5.ebuild
index b1382483f56f..0bfb6d253f44 100644
--- a/sci-chemistry/relax/relax-2.2.5.ebuild
+++ b/sci-chemistry/relax/relax-2.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/relax-2.2.5.ebuild,v 1.4 2013/11/16 08:25:43 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/relax-2.2.5.ebuild,v 1.5 2013/11/27 07:58:28 jlec Exp $
 
 EAPI=5
 
@@ -50,8 +50,8 @@ src_compile() {
 }
 
 src_test() {
-	${EPYTHON} ./${PN}.py -s || die
-	${EPYTHON} ./${PN}.py -x || die
+#	${EPYTHON} ./${PN}.py -s || die
+	${EPYTHON} ./${PN}.py --gui-tests || die
 }
 
 src_install() {
diff --git a/sci-chemistry/relax/relax-3.0.2.ebuild b/sci-chemistry/relax/relax-3.0.2.ebuild
new file mode 100644
index 000000000000..eda95f4bc01f
--- /dev/null
+++ b/sci-chemistry/relax/relax-3.0.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/relax-3.0.2.ebuild,v 1.1 2013/11/27 07:58:28 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="2.8"
+
+inherit eutils python-single-r1 scons-utils toolchain-funcs wxwidgets
+
+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/numpy[${PYTHON_USEDEP}]
+	dev-python/wxpython[${PYTHON_USEDEP}]
+	sci-chemistry/molmol
+	sci-chemistry/pymol[${PYTHON_USEDEP}]
+	sci-chemistry/vmd
+	>=sci-libs/bmrblib-1.0.1_pre198[${PYTHON_USEDEP}]
+	>=sci-libs/minfx-1.0.4_pre98[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	sci-visualization/grace
+	sci-visualization/opendx
+	x11-libs/wxGTK:2.8[X]"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	rm -rf minfx bmrblib || die
+	epatch "${FILESDIR}"/${PN}-3.0.1-gentoo.patch
+	tc-export CC
+}
+
+src_compile() {
+	escons
+}
+
+src_test() {
+	${EPYTHON} ./${PN}.py -s || die
+#	${EPYTHON} ./${PN}.py -x || die
+}
+
+src_install() {
+	dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf,prompt_screenshot.txt}
+
+	python_moduleinto ${PN}
+	python_domodule *
+
+	rm ${PN} README || die
+
+	make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py $@"
+}