sci-chemistry/relax: Version BUmp; drop old

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

24 files changed, 16 insertions, 1542 deletions

diff --git a/sci-chemistry/relax/ChangeLog b/sci-chemistry/relax/ChangeLog
index c68403934ab2..b4f4ed18db7e 100644
--- a/sci-chemistry/relax/ChangeLog
+++ b/sci-chemistry/relax/ChangeLog
@@ -1,6 +1,19 @@
 # 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.32 2015/01/29 07:53:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/ChangeLog,v 1.33 2015/02/07 07:56:16 jlec Exp $
+
+*relax-3.3.6 (07 Feb 2015)
+
+  07 Feb 2015; Justin Lecher <jlec@gentoo.org> -relax-2.1.0.ebuild,
+  -relax-2.2.1.ebuild, -relax-2.2.5.ebuild, -relax-3.0.1.ebuild,
+  -relax-3.0.2-r2.ebuild, -relax-3.1.0-r2.ebuild, -relax-3.1.1-r1.ebuild,
+  -relax-3.1.2.ebuild, -relax-3.1.3.ebuild, -relax-3.1.4.ebuild,
+  -relax-3.1.5.ebuild, -relax-3.1.6.ebuild, -relax-3.1.7.ebuild,
+  -relax-3.1.7-r1.ebuild, -relax-3.2.0.ebuild, -relax-3.2.1.ebuild,
+  -relax-3.2.2.ebuild, -relax-3.2.3.ebuild, -relax-3.3.0.ebuild,
+  -relax-3.3.1.ebuild, -relax-3.3.2.ebuild, -relax-3.3.3.ebuild,
+  +relax-3.3.6.ebuild, -relax-9999.ebuild:
+  Version BUmp; drop old
 
 *relax-3.3.5 (29 Jan 2015)
 
diff --git a/sci-chemistry/relax/relax-2.1.0.ebuild b/sci-chemistry/relax/relax-2.1.0.ebuild
deleted file mode 100644
index 35ac2c27e92c..000000000000
--- a/sci-chemistry/relax/relax-2.1.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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.1.0.ebuild,v 1.2 2013/11/16 08:25:43 dirtyepic Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-
-WX_GTK_VER="2.8"
-
-inherit eutils python 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=""
-
-RDEPEND="
-	dev-python/numpy
-	sci-libs/bmrblib
-	sci-libs/minfx
-	sci-libs/scipy
-	x11-libs/wxGTK:2.8[X]"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	python_pkg_setup
-	python_set_active_version 2
-}
-
-src_prepare() {
-	rm -rf minfx bmrblib
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	tc-export CC
-}
-
-src_compile() {
-	escons
-}
-
-src_test() {
-	$(PYTHON) ./${PN}.py -s || die
-	$(PYTHON) ./${PN}.py -x || die
-}
-
-src_install() {
-	dodoc README
-	rm ${PN} README || doe
-
-	insinto $(python_get_sitedir)/${PN}
-	doins -r *
-
-	make_wrapper ${PN} "$(PYTHON) $(python_get_sitedir)/${PN}/${PN}.py $@"
-}
diff --git a/sci-chemistry/relax/relax-2.2.1.ebuild b/sci-chemistry/relax/relax-2.2.1.ebuild
deleted file mode 100644
index 83d0de65b90b..000000000000
--- a/sci-chemistry/relax/relax-2.2.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.1.ebuild,v 1.3 2013/11/16 08:25:43 dirtyepic 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}]
-	>=sci-libs/bmrblib-1.0.1_pre198[${PYTHON_USEDEP}]
-	>=sci-libs/minfx-1.0.4_pre98[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	x11-libs/wxGTK:2.8[X]"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	rm -rf minfx bmrblib || die
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	echo true > devel_scripts/byte_compile || die
-	tc-export CC
-}
-
-src_compile() {
-	escons
-}
-
-src_test() {
-	${EPYTHON} ./${PN}.py -s || die
-	${EPYTHON} ./${PN}.py -x || die
-}
-
-src_install() {
-	dodoc README
-	rm ${PN} README || die
-
-	python_moduleinto ${PN}
-	python_domodule *
-
-	make_wrapper ${PN} "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py $@"
-}
diff --git a/sci-chemistry/relax/relax-2.2.5.ebuild b/sci-chemistry/relax/relax-2.2.5.ebuild
deleted file mode 100644
index 0bfb6d253f44..000000000000
--- a/sci-chemistry/relax/relax-2.2.5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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.5 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-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}-2.2.1-gentoo.patch
-	tc-export CC
-}
-
-src_compile() {
-	escons
-}
-
-src_test() {
-#	${EPYTHON} ./${PN}.py -s || die
-	${EPYTHON} ./${PN}.py --gui-tests || 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 $@"
-}
diff --git a/sci-chemistry/relax/relax-3.0.1.ebuild b/sci-chemistry/relax/relax-3.0.1.ebuild
deleted file mode 100644
index 390ad3ec8c3b..000000000000
--- a/sci-chemistry/relax/relax-3.0.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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.1.ebuild,v 1.2 2013/11/16 08:25:43 dirtyepic 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-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}"/${P}-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 $@"
-}
diff --git a/sci-chemistry/relax/relax-3.0.2-r2.ebuild b/sci-chemistry/relax/relax-3.0.2-r2.ebuild
deleted file mode 100644
index 654d718741fd..000000000000
--- a/sci-chemistry/relax/relax-3.0.2-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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-r2.ebuild,v 1.1 2013/11/27 11:27:08 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.8"
-
-inherit eutils 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/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.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 \
-		"${FILESDIR}"/${P}-wxpython.patch \
-		"${FILESDIR}"/${P}-wxpython-2.patch
-	tc-export CC
-}
-
-src_compile() {
-	escons
-}
-
-src_test() {
-	VIRTUALX_COMMAND="${EPYTHON}"
-#	virtualmake ./${PN}.py -x || die
-	virtualmake ./${PN}.py --gui-tests || 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 $@"
-}
diff --git a/sci-chemistry/relax/relax-3.1.0-r2.ebuild b/sci-chemistry/relax/relax-3.1.0-r2.ebuild
deleted file mode 100644
index e138260b198d..000000000000
--- a/sci-chemistry/relax/relax-3.1.0-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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.1.0-r2.ebuild,v 1.1 2013/11/29 10:58:24 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=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	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.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:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
-	media-gfx/pngcrush"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-fix_png() {
-	pngcrush -q -fix -force ${1} ${1}-fixed &>/dev/null || die
-	mv ${1}-fixed ${1} || die
-	echo -e ".\c"
-}
-src_prepare() {
-	local png
-	rm -rf minfx bmrblib || die
-	epatch \
-		"${FILESDIR}"/${PN}-3.0.1-gentoo.patch \
-		"${FILESDIR}"/${P}-sample-script{,-backport}.patch
-	tc-export CC
-
-	ebegin "Fixing png files"
-	multijob_init
-	for png in $(find -type f -name "*.png"); do
-		multijob_child_init fix_png ${png}
-	done
-	multijob_finish
-	eend
-}
-
-src_compile() {
-	escons
-}
-
-src_test() {
-	VIRTUALX_COMMAND="${EPYTHON}"
-	virtualmake ./${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 $@"
-}
diff --git a/sci-chemistry/relax/relax-3.1.1-r1.ebuild b/sci-chemistry/relax/relax-3.1.1-r1.ebuild
deleted file mode 100644
index 4005868150fe..000000000000
--- a/sci-chemistry/relax/relax-3.1.1-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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.1.1-r1.ebuild,v 1.1 2013/12/11 10:05:58 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=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	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.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:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
-	media-gfx/pngcrush"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-fix_png() {
-	pngcrush -q -fix -force ${1} ${1}-fixed &>/dev/null || die
-	mv ${1}-fixed ${1} || die
-	echo -e ".\c"
-}
-src_prepare() {
-	local png
-	rm -rf minfx bmrblib || die
-	epatch \
-		"${FILESDIR}"/${PN}-3.0.1-gentoo.patch
-	tc-export CC
-
-	ebegin "Fixing png files"
-	multijob_init
-	for png in $(find -type f -name "*.png"); do
-		multijob_child_init fix_png ${png}
-	done
-	multijob_finish
-	eend
-}
-
-src_compile() {
-	escons
-}
-
-src_test() {
-	VIRTUALX_COMMAND="${EPYTHON}"
-	virtualmake ./${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 $@"
-}
diff --git a/sci-chemistry/relax/relax-3.1.2.ebuild b/sci-chemistry/relax/relax-3.1.2.ebuild
deleted file mode 100644
index b684b5e0cb46..000000000000
--- a/sci-chemistry/relax/relax-3.1.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/relax-3.1.2.ebuild,v 1.1 2014/01/14 11:58:39 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=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	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.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:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
-	media-gfx/pngcrush"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	local png
-	rm -rf minfx bmrblib || die
-	epatch \
-		"${FILESDIR}"/${PN}-3.0.1-gentoo.patch
-	tc-export CC
-}
-
-src_compile() {
-	escons
-}
-
-src_test() {
-	VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x"
-	virtualmake
-}
-
-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 $@"
-}
diff --git a/sci-chemistry/relax/relax-3.1.3.ebuild b/sci-chemistry/relax/relax-3.1.3.ebuild
deleted file mode 100644
index 60b39cd7a1ec..000000000000
--- a/sci-chemistry/relax/relax-3.1.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/relax-3.1.3.ebuild,v 1.1 2014/01/17 07:07:54 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=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	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.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:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
-	media-gfx/pngcrush"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	local png
-	rm -rf minfx bmrblib || die
-	epatch \
-		"${FILESDIR}"/${PN}-3.0.1-gentoo.patch
-	tc-export CC
-}
-
-src_compile() {
-	escons
-}
-
-src_test() {
-	VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x"
-	virtualmake
-}
-
-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 $@"
-}
diff --git a/sci-chemistry/relax/relax-3.1.4.ebuild b/sci-chemistry/relax/relax-3.1.4.ebuild
deleted file mode 100644
index 8590bcd9c4cc..000000000000
--- a/sci-chemistry/relax/relax-3.1.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/relax-3.1.4.ebuild,v 1.1 2014/02/03 08:44:29 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=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	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.5[${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() {
-	local png
-	rm -rf minfx bmrblib || die
-	epatch \
-		"${FILESDIR}"/${PN}-3.0.1-gentoo.patch
-	tc-export CC
-}
-
-src_compile() {
-	escons
-}
-
-src_test() {
-	VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x"
-	virtualmake
-}
-
-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 $@"
-}
diff --git a/sci-chemistry/relax/relax-3.1.5.ebuild b/sci-chemistry/relax/relax-3.1.5.ebuild
deleted file mode 100644
index d4f330f18919..000000000000
--- a/sci-chemistry/relax/relax-3.1.5.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/relax-3.1.5.ebuild,v 1.1 2014/02/05 10:59:15 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=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	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.5[${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() {
-	local png
-	rm -rf minfx bmrblib || die
-	epatch \
-		"${FILESDIR}"/${PN}-3.0.1-gentoo.patch
-	tc-export CC
-}
-
-src_compile() {
-	escons
-}
-
-src_test() {
-	VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x"
-	virtualmake
-}
-
-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 $@"
-}
diff --git a/sci-chemistry/relax/relax-3.1.6.ebuild b/sci-chemistry/relax/relax-3.1.6.ebuild
deleted file mode 100644
index 21a4215392d9..000000000000
--- a/sci-chemistry/relax/relax-3.1.6.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/relax-3.1.6.ebuild,v 1.1 2014/03/06 10:26:48 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=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	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.5[${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() {
-	local png
-	rm -rf minfx bmrblib || die
-	epatch \
-		"${FILESDIR}"/${PN}-3.0.1-gentoo.patch
-	tc-export CC
-}
-
-src_compile() {
-	escons
-}
-
-src_test() {
-	VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x"
-	virtualmake
-}
-
-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 $@"
-}
diff --git a/sci-chemistry/relax/relax-3.1.7-r1.ebuild b/sci-chemistry/relax/relax-3.1.7-r1.ebuild
deleted file mode 100644
index 75f94cad2ce1..000000000000
--- a/sci-chemistry/relax/relax-3.1.7-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/relax-3.1.7-r1.ebuild,v 1.1 2014/05/15 11:51:29 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=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	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.5[${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() {
-	local png
-	rm -rf minfx bmrblib || die
-	epatch \
-		"${FILESDIR}"/${PN}-3.0.1-gentoo.patch \
-		"${FILESDIR}"/${P}-dpar.patch
-	tc-export CC
-}
-
-src_compile() {
-	escons
-}
-
-src_test() {
-	VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x"
-	virtualmake
-}
-
-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 $@"
-}
diff --git a/sci-chemistry/relax/relax-3.1.7.ebuild b/sci-chemistry/relax/relax-3.1.7.ebuild
deleted file mode 100644
index 8c616eeb0735..000000000000
--- a/sci-chemistry/relax/relax-3.1.7.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/relax-3.1.7.ebuild,v 1.1 2014/03/18 07:51:51 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=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	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.5[${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() {
-	local png
-	rm -rf minfx bmrblib || die
-	epatch \
-		"${FILESDIR}"/${PN}-3.0.1-gentoo.patch
-	tc-export CC
-}
-
-src_compile() {
-	escons
-}
-
-src_test() {
-	VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x"
-	virtualmake
-}
-
-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 $@"
-}
diff --git a/sci-chemistry/relax/relax-3.2.0.ebuild b/sci-chemistry/relax/relax-3.2.0.ebuild
deleted file mode 100644
index 03cdfcd38826..000000000000
--- a/sci-chemistry/relax/relax-3.2.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/relax-3.2.0.ebuild,v 1.1 2014/05/22 08:48:53 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=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	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.5[${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() {
-	local png
-	rm -rf minfx bmrblib || die
-	epatch \
-		"${FILESDIR}"/${PN}-3.0.1-gentoo.patch
-	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,prompt_screenshot.txt}
-
-	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.2.1.ebuild b/sci-chemistry/relax/relax-3.2.1.ebuild
deleted file mode 100644
index c05f52ec0045..000000000000
--- a/sci-chemistry/relax/relax-3.2.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/relax-3.2.1.ebuild,v 1.1 2014/05/26 07:40:57 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=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	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.5[${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() {
-	local png
-	rm -rf minfx bmrblib || die
-	epatch \
-		"${FILESDIR}"/${PN}-3.0.1-gentoo.patch
-	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,prompt_screenshot.txt}
-
-	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.2.2.ebuild b/sci-chemistry/relax/relax-3.2.2.ebuild
deleted file mode 100644
index 6eab382a73e3..000000000000
--- a/sci-chemistry/relax/relax-3.2.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/relax-3.2.2.ebuild,v 1.1 2014/06/06 08:10:14 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=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	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.5[${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() {
-	local png
-	rm -rf minfx bmrblib || die
-	epatch \
-		"${FILESDIR}"/${P}-gentoo.patch
-	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,prompt_screenshot.txt}
-
-	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.2.3.ebuild b/sci-chemistry/relax/relax-3.2.3.ebuild
deleted file mode 100644
index 7aa1cfbb442c..000000000000
--- a/sci-chemistry/relax/relax-3.2.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/relax-3.2.3.ebuild,v 1.1 2014/07/04 06:52:09 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=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	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.5[${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 || 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,prompt_screenshot.txt}
-
-	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.0.ebuild b/sci-chemistry/relax/relax-3.3.0.ebuild
deleted file mode 100644
index c910b35170e5..000000000000
--- a/sci-chemistry/relax/relax-3.3.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/relax-3.3.0.ebuild,v 1.1 2014/09/15 12:27:07 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=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	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.9[${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 || 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,prompt_screenshot.txt}
-
-	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.2.ebuild b/sci-chemistry/relax/relax-3.3.2.ebuild
deleted file mode 100644
index 84a1e60c9a11..000000000000
--- a/sci-chemistry/relax/relax-3.3.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/relax-3.3.2.ebuild,v 1.1 2014/11/17 08:54:44 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=""
-
-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.3.ebuild b/sci-chemistry/relax/relax-3.3.3.ebuild
deleted file mode 100644
index c9f36d6301ec..000000000000
--- a/sci-chemistry/relax/relax-3.3.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/relax-3.3.3.ebuild,v 1.1 2014/11/25 08:21:39 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=""
-
-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.1.ebuild b/sci-chemistry/relax/relax-3.3.6.ebuild
index af1549b38955..726d0d2a1a00 100644
--- a/sci-chemistry/relax/relax-3.3.1.ebuild
+++ b/sci-chemistry/relax/relax-3.3.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.1.ebuild,v 1.1 2014/10/10 08:19:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/relax-3.3.6.ebuild,v 1.1 2015/02/07 07:56:16 jlec Exp $
 
 EAPI=5
 
diff --git a/sci-chemistry/relax/relax-9999.ebuild b/sci-chemistry/relax/relax-9999.ebuild
deleted file mode 100644
index c8e8914035eb..000000000000
--- a/sci-chemistry/relax/relax-9999.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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-9999.ebuild,v 1.1 2013/11/29 10:58:24 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils python-single-r1 scons-utils subversion toolchain-funcs wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/"
-SRC_URI=""
-ESVN_REPO_URI="svn://svn.gna.org/svn/relax/trunk"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS=""
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	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.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:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	local png
-	rm -rf minfx bmrblib || die
-	epatch \
-		"${FILESDIR}"/${PN}-3.0.1-gentoo.patch
-	tc-export CC
-}
-
-src_compile() {
-	escons
-	escons user_manual_pdf_nofetch
-	escons user_manual_html_nofetch
-}
-
-src_test() {
-	VIRTUALX_COMMAND="${EPYTHON}"
-	virtualmake ./${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 $@"
-}