sci-chemistry/relax: Drop old patches

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

10 files changed, 9 insertions, 1293 deletions

diff --git a/sci-chemistry/relax/ChangeLog b/sci-chemistry/relax/ChangeLog
index b4f4ed18db7e..da4693fbc94d 100644
--- a/sci-chemistry/relax/ChangeLog
+++ b/sci-chemistry/relax/ChangeLog
@@ -1,6 +1,14 @@
 # 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.33 2015/02/07 07:56:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/ChangeLog,v 1.34 2015/02/07 07:58:05 jlec Exp $
+
+  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,
+  -files/relax-3.0.2-wxpython.patch, -files/relax-3.0.2-wxpython-2.patch,
+  -files/relax-3.1.0-sample-script.patch,
+  -files/relax-3.1.0-sample-script-backport.patch,
+  -files/relax-3.1.7-dpar.patch, -files/relax-3.2.2-gentoo.patch:
+  Drop old patches
 
 *relax-3.3.6 (07 Feb 2015)
 
diff --git a/sci-chemistry/relax/files/relax-2.1.0-gentoo.patch b/sci-chemistry/relax/files/relax-2.1.0-gentoo.patch
deleted file mode 100644
index 3edbfb287a1b..000000000000
--- a/sci-chemistry/relax/files/relax-2.1.0-gentoo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
- sconstruct |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/sconstruct b/sconstruct
-index c0fab95..c9d5e2c 100644
---- a/sconstruct
-+++ b/sconstruct
-@@ -26,7 +26,7 @@
- 
- # Import statements.
- from numpy import get_include
--from os import getcwd, path, remove, sep, walk
-+from os import getcwd, path, remove, sep, walk, environ
- import platform
- from re import search
- from shutil import rmtree
-@@ -586,6 +586,10 @@ class Main:
-         for file in files:
-             nodes.append(env.SharedObject(dir + path.sep + file, CCFLAGS=cflags))
- 
-+        env.Append(LINKFLAGS = environ['LDFLAGS'])
-+        env.Append(CFLAGS = environ['CFLAGS'])
-+        env.Replace(CC = environ['CC'])
-+
-         # Build the relaxation curve fitting module.
-         self.relax_fit_object = env.SharedLibrary(target=dir + path.sep + 'relax_fit', source=nodes, SHLIBPREFIX=prefix, SHLIBSUFFIX=suffix)
- 
diff --git a/sci-chemistry/relax/files/relax-2.2.1-gentoo.patch b/sci-chemistry/relax/files/relax-2.2.1-gentoo.patch
deleted file mode 100644
index 073a46eb386d..000000000000
--- a/sci-chemistry/relax/files/relax-2.2.1-gentoo.patch
+++ /dev/null
@@ -1,49 +0,0 @@
- scons/install.py | 10 ----------
- sconstruct       |  6 +++++-
- 2 files changed, 5 insertions(+), 11 deletions(-)
-
-diff --git a/scons/install.py b/scons/install.py
-index b2d355a..d7c7911 100644
---- a/scons/install.py
-+++ b/scons/install.py
-@@ -109,16 +109,6 @@ def install(target, source, env):
-         symlink(env['RELAX_PATH'] + sep + 'relax', env['SYMLINK'])
- 
- 
--    # Byte compile.
--    ###############
--
--    # Run relax to create the *.pyc files.
--    print("\nCreating the byte-compiled *.pyc files.")
--    python_path = sys.prefix + path.sep + 'bin' + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]`
--    cmd = "cd %s; %s -m compileall . ; %s -O -m compileall ." % (env['RELAX_PATH'], python_path, python_path)
--    print(cmd)
--    system(cmd)
--
-     # Final printout.
-     print("\n\n\n")
- 
-diff --git a/sconstruct b/sconstruct
-index 8e968cd..8e7d949 100644
---- a/sconstruct
-+++ b/sconstruct
-@@ -26,7 +26,7 @@
- 
- # Import statements.
- from numpy import get_include
--from os import getcwd, path, remove, rmdir, sep, walk
-+from os import getcwd, path, remove, rmdir, sep, walk, environ
- import platform
- from re import search
- from shutil import rmtree
-@@ -596,6 +596,10 @@ class Main:
-         for file in files:
-             nodes.append(env.SharedObject(dir + path.sep + file, CCFLAGS=cflags))
- 
-+        env.Append(LINKFLAGS = environ['LDFLAGS'])
-+        env.Append(CFLAGS = environ['CFLAGS'])
-+        env.Replace(CC = environ['CC'])
-+
-         # Build the relaxation curve fitting module.
-         self.relax_fit_object = env.SharedLibrary(target=dir + path.sep + 'relax_fit', source=nodes, SHLIBPREFIX=prefix, SHLIBSUFFIX=suffix)
- 
diff --git a/sci-chemistry/relax/files/relax-3.0.1-gentoo.patch b/sci-chemistry/relax/files/relax-3.0.1-gentoo.patch
deleted file mode 100644
index c9678792544b..000000000000
--- a/sci-chemistry/relax/files/relax-3.0.1-gentoo.patch
+++ /dev/null
@@ -1,48 +0,0 @@
- scons/install.py | 10 ----------
- sconstruct       |  6 +++++-
- 2 files changed, 5 insertions(+), 11 deletions(-)
-
-diff --git a/scons/install.py b/scons/install.py
-index b2d355a..d7c7911 100644
---- a/scons/install.py
-+++ b/scons/install.py
-@@ -109,16 +109,6 @@ def install(target, source, env):
-         symlink(env['RELAX_PATH'] + sep + 'relax', env['SYMLINK'])
- 
- 
--    # Byte compile.
--    ###############
--
--    # Run relax to create the *.pyc files.
--    print("\nCreating the byte-compiled *.pyc files.")
--    python_path = sys.prefix + path.sep + 'bin' + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]`
--    cmd = "cd %s; %s -m compileall . ; %s -O -m compileall ." % (env['RELAX_PATH'], python_path, python_path)
--    print(cmd)
--    system(cmd)
--
-     # Final printout.
-     print("\n\n\n")
- 
-diff --git a/sconstruct b/sconstruct
-index 8e968cd..8e7d949 100644
---- a/sconstruct
-+++ b/sconstruct
-@@ -26,6 +26,6 @@
- 
- # Import statements.
--from os import getcwd, path, remove, rmdir, sep, walk
-+from os import getcwd, path, remove, rmdir, sep, walk, environ
- import platform
- from re import search
- from shutil import rmtree
-@@ -596,6 +596,10 @@ class Main:
-         for file in files:
-             nodes.append(env.SharedObject(dir + path.sep + file, CCFLAGS=cflags))
- 
-+        env.Append(LINKFLAGS = environ['LDFLAGS'])
-+        env.Append(CFLAGS = environ['CFLAGS'])
-+        env.Replace(CC = environ['CC'])
-+
-         # Build the relaxation curve fitting module.
-         self.relax_fit_object = env.SharedLibrary(target=dir + path.sep + 'relax_fit', source=nodes, SHLIBPREFIX=prefix, SHLIBSUFFIX=suffix)
- 
diff --git a/sci-chemistry/relax/files/relax-3.0.2-wxpython-2.patch b/sci-chemistry/relax/files/relax-3.0.2-wxpython-2.patch
deleted file mode 100644
index a8318a1a1229..000000000000
--- a/sci-chemistry/relax/files/relax-3.0.2-wxpython-2.patch
+++ /dev/null
@@ -1,39 +0,0 @@
- gui/components/free_file_format.py | 2 +-
- gui/input_elements/sequence.py     | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gui/components/free_file_format.py b/gui/components/free_file_format.py
-index 61c2783..f4bd7ba 100644
---- a/gui/components/free_file_format.py
-+++ b/gui/components/free_file_format.py
-@@ -610,7 +610,7 @@ class Free_file_format_window(wx.Dialog, Wiz_page):
- 
-         # The reset button.
-         button = wx.lib.buttons.ThemedGenBitmapTextButton(self, -1, None, "  Reset")
--        button.SetBitmapLabel(wx.Bitmap(fetch_icon('oxygen.actions.edit_delete', "22x22"), wx.BITMAP_TYPE_ANY))
-+        button.SetBitmapLabel(wx.Bitmap(fetch_icon('oxygen.actions.edit-delete', "22x22"), wx.BITMAP_TYPE_ANY))
-         button.SetFont(font.normal)
-         button.SetToolTipString("Reset the free file format settings to the original values.")
-         button.SetMinSize(self.SIZE_BUTTON)
-diff --git a/gui/input_elements/sequence.py b/gui/input_elements/sequence.py
-index b719a21..7883da5 100644
---- a/gui/input_elements/sequence.py
-+++ b/gui/input_elements/sequence.py
-@@ -175,7 +175,7 @@ class Sequence:
-             sub_sizer.AddSpacer(5)
- 
-             # The edit button.
--            button = wx.BitmapButton(parent, -1, wx.Bitmap(fetch_icon('oxygen.actions.edit_rename', "16x16"), wx.BITMAP_TYPE_ANY))
-+            button = wx.BitmapButton(parent, -1, wx.Bitmap(fetch_icon('oxygen.actions.edit-rename', "16x16"), wx.BITMAP_TYPE_ANY))
-             button.SetMinSize((height_element, height_element))
-             button.SetToolTipString("Edit the values.")
-             sub_sizer.Add(button, 0, wx.ADJUST_MINSIZE|wx.ALIGN_CENTER_VERTICAL, 0)
-@@ -565,7 +565,7 @@ class Sequence_window(wx.Dialog):
- 
-             # The delete all button.
-             button = wx.lib.buttons.ThemedGenBitmapTextButton(self, -1, None, "  Delete all")
--            button.SetBitmapLabel(wx.Bitmap(fetch_icon('oxygen.actions.edit_delete', "22x22"), wx.BITMAP_TYPE_ANY))
-+            button.SetBitmapLabel(wx.Bitmap(fetch_icon('oxygen.actions.edit-delete', "22x22"), wx.BITMAP_TYPE_ANY))
-             button.SetFont(font.normal)
-             button.SetToolTipString("Delete all items.")
-             button.SetMinSize(self.SIZE_BUTTON)
diff --git a/sci-chemistry/relax/files/relax-3.0.2-wxpython.patch b/sci-chemistry/relax/files/relax-3.0.2-wxpython.patch
deleted file mode 100644
index 857498e199f8..000000000000
--- a/sci-chemistry/relax/files/relax-3.0.2-wxpython.patch
+++ /dev/null
@@ -1,954 +0,0 @@
- dep_check.py                           | 2 ++
- devel_scripts/gui/about_gui.py         | 2 ++
- devel_scripts/gui/about_model_free.py  | 2 ++
- devel_scripts/gui/about_relax.py       | 2 ++
- devel_scripts/gui/refs.py              | 2 ++
- devel_scripts/gui/spin_create.py       | 2 ++
- devel_scripts/gui/uf_sequence_read.py  | 2 ++
- devel_scripts/python_seek.py           | 2 ++
- gui/__init__.py                        | 2 ++
- gui/about.py                           | 2 ++
- gui/analyses/__init__.py               | 2 ++
- gui/analyses/auto_model_free.py        | 2 ++
- gui/analyses/auto_noe.py               | 2 ++
- gui/analyses/auto_rx_base.py           | 2 ++
- gui/analyses/base.py                   | 2 ++
- gui/analyses/elements/bool_element.py  | 2 ++
- gui/analyses/elements/float_element.py | 2 ++
- gui/analyses/elements/model_list.py    | 2 ++
- gui/analyses/elements/spin_element.py  | 2 ++
- gui/analyses/elements/text_element.py  | 2 ++
- gui/analyses/wizard.py                 | 2 ++
- gui/components/base_list.py            | 2 ++
- gui/components/free_file_format.py     | 2 ++
- gui/components/grid.py                 | 2 ++
- gui/components/menu.py                 | 2 ++
- gui/components/molecule.py             | 2 ++
- gui/components/relax_data.py           | 2 ++
- gui/components/relax_data_meta.py      | 2 ++
- gui/components/spectrum.py             | 2 ++
- gui/controller.py                      | 2 ++
- gui/errors.py                          | 2 ++
- gui/export_bmrb.py                     | 2 ++
- gui/filedialog.py                      | 2 ++
- gui/fonts.py                           | 2 ++
- gui/icons.py                           | 2 ++
- gui/input_elements/bool.py             | 2 ++
- gui/input_elements/combo_list.py       | 2 ++
- gui/input_elements/dir.py              | 2 ++
- gui/input_elements/file.py             | 2 ++
- gui/input_elements/sequence.py         | 2 ++
- gui/input_elements/sequence_2D.py      | 2 ++
- gui/input_elements/spin_id.py          | 2 ++
- gui/input_elements/value.py            | 2 ++
- gui/interpreter.py                     | 2 ++
- gui/menu.py                            | 2 ++
- gui/message.py                         | 2 ++
- gui/misc.py                            | 2 ++
- gui/pipe_editor.py                     | 2 ++
- gui/references.py                      | 2 ++
- gui/relax_gui.py                       | 2 ++
- gui/relax_prompt.py                    | 2 ++
- gui/results_viewer.py                  | 2 ++
- gui/spin_viewer/containers.py          | 2 ++
- gui/spin_viewer/frame.py               | 2 ++
- gui/spin_viewer/splitter.py            | 2 ++
- gui/spin_viewer/tree.py                | 2 ++
- gui/uf_objects.py                      | 2 ++
- gui/wizards/peak_intensity.py          | 2 ++
- gui/wizards/wiz_objects.py             | 2 ++
- pipe_control/reset.py                  | 2 ++
- test_suite/gui_tests/__init__.py       | 2 ++
- test_suite/gui_tests/base_classes.py   | 2 ++
- test_suite/gui_tests/model_free.py     | 2 ++
- test_suite/gui_tests/noe.py            | 2 ++
- test_suite/gui_tests/rx.py             | 2 ++
- test_suite/gui_tests/state.py          | 2 ++
- test_suite/relax_test_runner.py        | 2 ++
- test_suite/test_suite_runner.py        | 2 ++
- 68 files changed, 136 insertions(+)
-
-diff --git a/dep_check.py b/dep_check.py
-index cc9a781..29d0dd5 100644
---- a/dep_check.py
-+++ b/dep_check.py
-@@ -67,6 +67,8 @@ except ImportError:
- 
- # wx module.
- try:
-+    import wxversion
-+    wxversion.select("2.8")
-     import wx
-     wx_module = True
- except ImportError:
-diff --git a/devel_scripts/gui/about_gui.py b/devel_scripts/gui/about_gui.py
-index 2255b12..e32da8b 100644
---- a/devel_scripts/gui/about_gui.py
-+++ b/devel_scripts/gui/about_gui.py
-@@ -20,6 +20,8 @@
- ###############################################################################
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # GUI module imports.
-diff --git a/devel_scripts/gui/about_model_free.py b/devel_scripts/gui/about_model_free.py
-index ff39906..2b608fe 100644
---- a/devel_scripts/gui/about_model_free.py
-+++ b/devel_scripts/gui/about_model_free.py
-@@ -20,6 +20,8 @@
- ###############################################################################
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # GUI module imports.
-diff --git a/devel_scripts/gui/about_relax.py b/devel_scripts/gui/about_relax.py
-index d3c6bfa..e9c4e77 100644
---- a/devel_scripts/gui/about_relax.py
-+++ b/devel_scripts/gui/about_relax.py
-@@ -20,6 +20,8 @@
- ###############################################################################
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # GUI module imports.
-diff --git a/devel_scripts/gui/refs.py b/devel_scripts/gui/refs.py
-index e23a252..6620ad7 100644
---- a/devel_scripts/gui/refs.py
-+++ b/devel_scripts/gui/refs.py
-@@ -20,6 +20,8 @@
- ###############################################################################
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # GUI module imports.
-diff --git a/devel_scripts/gui/spin_create.py b/devel_scripts/gui/spin_create.py
-index 2dcccda..5a7cbbc 100644
---- a/devel_scripts/gui/spin_create.py
-+++ b/devel_scripts/gui/spin_create.py
-@@ -20,6 +20,8 @@
- ###############################################################################
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # GUI module imports.
-diff --git a/devel_scripts/gui/uf_sequence_read.py b/devel_scripts/gui/uf_sequence_read.py
-index a1659cb..dc384df 100644
---- a/devel_scripts/gui/uf_sequence_read.py
-+++ b/devel_scripts/gui/uf_sequence_read.py
-@@ -20,6 +20,8 @@
- ###############################################################################
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # GUI module imports.
-diff --git a/devel_scripts/python_seek.py b/devel_scripts/python_seek.py
-index 9e2eeb0..079dbb6 100755
---- a/devel_scripts/python_seek.py
-+++ b/devel_scripts/python_seek.py
-@@ -240,6 +240,8 @@ class Python_info:
-         # The commands.
-         commands = [
-             "try:\n",
-+            "    import wxversion\n",
-+            "    wxversion.select('2.8')\n",
-             "    import wx\n",
-             "    version = wx.version()\n",
-             "except:\n",
-diff --git a/gui/__init__.py b/gui/__init__.py
-index 7c7b89c..9be9834 100644
---- a/gui/__init__.py
-+++ b/gui/__init__.py
-@@ -32,6 +32,8 @@ import dep_check
- import sys
- from time import sleep
- if dep_check.wx_module:
-+    import wxversion
-+    wxversion.select("2.8")
-     import wx
- 
- # relax module imports.
-diff --git a/gui/about.py b/gui/about.py
-index 91512ac..0bafd78 100644
---- a/gui/about.py
-+++ b/gui/about.py
-@@ -24,6 +24,8 @@
- from copy import deepcopy
- from numpy import zeros
- import webbrowser
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.html
- from wx.lib.wordwrap import wordwrap
-diff --git a/gui/analyses/__init__.py b/gui/analyses/__init__.py
-index 863a78d..5e3ba00 100644
---- a/gui/analyses/__init__.py
-+++ b/gui/analyses/__init__.py
-@@ -25,6 +25,8 @@
- # Python module imports.
- import inspect
- import sys
-+import wxversion
-+wxversion.select("2.8")
- import wx
- from types import ListType
- 
-diff --git a/gui/analyses/auto_model_free.py b/gui/analyses/auto_model_free.py
-index aa38030..b63689c 100644
---- a/gui/analyses/auto_model_free.py
-+++ b/gui/analyses/auto_model_free.py
-@@ -26,6 +26,8 @@
- # Python module imports.
- from math import ceil
- from os import sep
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.lib.buttons
- import wx.lib.mixins.listctrl
-diff --git a/gui/analyses/auto_noe.py b/gui/analyses/auto_noe.py
-index 05b28e1..8dff7e6 100644
---- a/gui/analyses/auto_noe.py
-+++ b/gui/analyses/auto_noe.py
-@@ -25,6 +25,8 @@
- 
- # Python module imports.
- from os import sep
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # relax module imports.
-diff --git a/gui/analyses/auto_rx_base.py b/gui/analyses/auto_rx_base.py
-index f953104..a547e9e 100644
---- a/gui/analyses/auto_rx_base.py
-+++ b/gui/analyses/auto_rx_base.py
-@@ -24,6 +24,8 @@
- """Module containing the base class for the automatic R1 and R2 analysis frames."""
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # relax module imports.
-diff --git a/gui/analyses/base.py b/gui/analyses/base.py
-index 0ef26f4..00da057 100644
---- a/gui/analyses/base.py
-+++ b/gui/analyses/base.py
-@@ -24,6 +24,8 @@
- """Module containing the base class for all frames."""
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- from wx.lib import buttons
- from wx.lib import scrolledpanel
-diff --git a/gui/analyses/elements/bool_element.py b/gui/analyses/elements/bool_element.py
-index e4a1bd8..fa2258f 100644
---- a/gui/analyses/elements/bool_element.py
-+++ b/gui/analyses/elements/bool_element.py
-@@ -24,6 +24,8 @@
- """Module containing the base class for all frames."""
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.lib.buttons
- 
-diff --git a/gui/analyses/elements/float_element.py b/gui/analyses/elements/float_element.py
-index 78e152d..bb938bf 100644
---- a/gui/analyses/elements/float_element.py
-+++ b/gui/analyses/elements/float_element.py
-@@ -24,6 +24,8 @@
- """Module containing the base class for all frames."""
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.lib.buttons
- 
-diff --git a/gui/analyses/elements/model_list.py b/gui/analyses/elements/model_list.py
-index 990e8c3..79862cd 100644
---- a/gui/analyses/elements/model_list.py
-+++ b/gui/analyses/elements/model_list.py
-@@ -23,6 +23,8 @@
- """Auto-analysis GUI element for the control of lists of models."""
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- from wx.lib import scrolledpanel
- import wx.lib.mixins.listctrl
-diff --git a/gui/analyses/elements/spin_element.py b/gui/analyses/elements/spin_element.py
-index a662d07..b06872e 100644
---- a/gui/analyses/elements/spin_element.py
-+++ b/gui/analyses/elements/spin_element.py
-@@ -24,6 +24,8 @@
- """Module containing the base class for all frames."""
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.lib.buttons
- 
-diff --git a/gui/analyses/elements/text_element.py b/gui/analyses/elements/text_element.py
-index 895671f..5dfa19b 100644
---- a/gui/analyses/elements/text_element.py
-+++ b/gui/analyses/elements/text_element.py
-@@ -24,6 +24,8 @@
- """Module containing the base class for all frames."""
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.lib.buttons
- 
-diff --git a/gui/analyses/wizard.py b/gui/analyses/wizard.py
-index ca83f7c..3d0ebc5 100644
---- a/gui/analyses/wizard.py
-+++ b/gui/analyses/wizard.py
-@@ -25,6 +25,8 @@
- # Python module imports.
- from os import sep
- from time import asctime, localtime
-+import wxversion
-+wxversion.select("2.8")
- import wx
- from wx.lib import buttons
- 
-diff --git a/gui/components/base_list.py b/gui/components/base_list.py
-index bba25e4..1fbf9df 100644
---- a/gui/components/base_list.py
-+++ b/gui/components/base_list.py
-@@ -24,6 +24,8 @@
- """Module containing the base GUI element for listing things."""
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.lib.buttons
- 
-diff --git a/gui/components/free_file_format.py b/gui/components/free_file_format.py
-index 61c2783..3106945 100644
---- a/gui/components/free_file_format.py
-+++ b/gui/components/free_file_format.py
-@@ -21,6 +21,8 @@
- ###############################################################################
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- from wx.lib import buttons
- 
-diff --git a/gui/components/grid.py b/gui/components/grid.py
-index 30a2a4a..aa64d14 100644
---- a/gui/components/grid.py
-+++ b/gui/components/grid.py
-@@ -25,6 +25,8 @@
- 
- # Python module imports.
- from re import search
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.lib.buttons
- 
-diff --git a/gui/components/menu.py b/gui/components/menu.py
-index 8a408b8..cf04f46 100644
---- a/gui/components/menu.py
-+++ b/gui/components/menu.py
-@@ -24,6 +24,8 @@
- """Module for the main relax menu bar."""
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- 
-diff --git a/gui/components/molecule.py b/gui/components/molecule.py
-index e74fc0a..f4a29a7 100644
---- a/gui/components/molecule.py
-+++ b/gui/components/molecule.py
-@@ -24,6 +24,8 @@
- """Module containing the classes for GUI components involving molecules."""
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.lib.buttons
- 
-diff --git a/gui/components/relax_data.py b/gui/components/relax_data.py
-index 3a68f20..dad36d7 100644
---- a/gui/components/relax_data.py
-+++ b/gui/components/relax_data.py
-@@ -24,6 +24,8 @@
- """Module containing the classes for GUI components involving relaxation data."""
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.lib.buttons
- 
-diff --git a/gui/components/relax_data_meta.py b/gui/components/relax_data_meta.py
-index 2c80815..1952911 100644
---- a/gui/components/relax_data_meta.py
-+++ b/gui/components/relax_data_meta.py
-@@ -24,6 +24,8 @@
- """Module containing the classes for GUI components involving relaxation data."""
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # relax module imports.
-diff --git a/gui/components/spectrum.py b/gui/components/spectrum.py
-index 8c7bc65..b9036c5 100644
---- a/gui/components/spectrum.py
-+++ b/gui/components/spectrum.py
-@@ -24,6 +24,8 @@
- """Module containing the classes for GUI components involving spectral data."""
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.lib.buttons
- 
-diff --git a/gui/controller.py b/gui/controller.py
-index dea6c9b..847c828 100644
---- a/gui/controller.py
-+++ b/gui/controller.py
-@@ -25,6 +25,8 @@
- 
- # Python module imports.
- import sys
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.stc
- 
-diff --git a/gui/errors.py b/gui/errors.py
-index 8f6b5c1..4d95ee2 100644
---- a/gui/errors.py
-+++ b/gui/errors.py
-@@ -24,6 +24,8 @@
- 
- # Python module imports.
- import sys
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # relax module imports.
-diff --git a/gui/export_bmrb.py b/gui/export_bmrb.py
-index 806c75a..827ce13 100644
---- a/gui/export_bmrb.py
-+++ b/gui/export_bmrb.py
-@@ -23,6 +23,8 @@
- """The BMRB export wizard."""
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # relax module imports.
-diff --git a/gui/filedialog.py b/gui/filedialog.py
-index 6301b9e..13bf8f3 100644
---- a/gui/filedialog.py
-+++ b/gui/filedialog.py
-@@ -25,6 +25,8 @@
- 
- # Python module imports.
- from os import chdir, getcwd
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # relax module imports.
-diff --git a/gui/fonts.py b/gui/fonts.py
-index 4a5cb32..7674d1a 100644
---- a/gui/fonts.py
-+++ b/gui/fonts.py
-@@ -23,6 +23,8 @@
- """A standard set of font definitions for consistency throughout the GUI."""
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # relax module imports.
-diff --git a/gui/icons.py b/gui/icons.py
-index 43bc885..53639ff 100644
---- a/gui/icons.py
-+++ b/gui/icons.py
-@@ -25,6 +25,8 @@
- # Python module imports.
- from os import sep
- import sys
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # relax module imports.
-diff --git a/gui/input_elements/bool.py b/gui/input_elements/bool.py
-index 4fbe165..cb0df2d 100644
---- a/gui/input_elements/bool.py
-+++ b/gui/input_elements/bool.py
-@@ -23,6 +23,8 @@
- """Module containing a set of special GUI elements to be used in the relax wizards."""
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # relax module imports.
-diff --git a/gui/input_elements/combo_list.py b/gui/input_elements/combo_list.py
-index 456bf3b..13fc006 100644
---- a/gui/input_elements/combo_list.py
-+++ b/gui/input_elements/combo_list.py
-@@ -24,6 +24,8 @@
- 
- # Python module imports.
- from copy import deepcopy
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # relax module imports.
-diff --git a/gui/input_elements/dir.py b/gui/input_elements/dir.py
-index 18476cb..f705e8b 100644
---- a/gui/input_elements/dir.py
-+++ b/gui/input_elements/dir.py
-@@ -23,6 +23,8 @@
- """Module containing a set of special GUI elements to be used in the relax wizards."""
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # relax module imports.
-diff --git a/gui/input_elements/file.py b/gui/input_elements/file.py
-index 9dbc0c6..3e78914 100644
---- a/gui/input_elements/file.py
-+++ b/gui/input_elements/file.py
-@@ -23,6 +23,8 @@
- """Module containing a set of special GUI elements to be used in the relax wizards."""
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # relax module imports.
-diff --git a/gui/input_elements/sequence.py b/gui/input_elements/sequence.py
-index b719a21..db72993 100644
---- a/gui/input_elements/sequence.py
-+++ b/gui/input_elements/sequence.py
-@@ -23,6 +23,8 @@
- """Module containing a set of special GUI elements to be used in the relax wizards."""
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.lib.mixins.listctrl
- 
-diff --git a/gui/input_elements/sequence_2D.py b/gui/input_elements/sequence_2D.py
-index 140d762..5103675 100644
---- a/gui/input_elements/sequence_2D.py
-+++ b/gui/input_elements/sequence_2D.py
-@@ -24,6 +24,8 @@
- 
- # Python module imports.
- import sys
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.lib.mixins.listctrl
- 
-diff --git a/gui/input_elements/spin_id.py b/gui/input_elements/spin_id.py
-index f8114c3..40cd905 100644
---- a/gui/input_elements/spin_id.py
-+++ b/gui/input_elements/spin_id.py
-@@ -24,6 +24,8 @@
- 
- # Python module imports.
- from copy import deepcopy
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # relax module imports.
-diff --git a/gui/input_elements/value.py b/gui/input_elements/value.py
-index c3b6c0a..16e7c03 100644
---- a/gui/input_elements/value.py
-+++ b/gui/input_elements/value.py
-@@ -24,6 +24,8 @@
- 
- # Python module imports.
- from copy import deepcopy
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # relax module imports.
-diff --git a/gui/interpreter.py b/gui/interpreter.py
-index 7587669..a2c7298 100644
---- a/gui/interpreter.py
-+++ b/gui/interpreter.py
-@@ -27,6 +27,8 @@ import sys
- from threading import Thread
- from time import sleep
- from traceback import print_exc
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # relax module imports.
-diff --git a/gui/menu.py b/gui/menu.py
-index 958b6e4..74cf867 100644
---- a/gui/menu.py
-+++ b/gui/menu.py
-@@ -25,6 +25,8 @@
- 
- # Python module imports.
- import sys
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # relax module imports.
-diff --git a/gui/message.py b/gui/message.py
-index cbeffb4..25cc012 100644
---- a/gui/message.py
-+++ b/gui/message.py
-@@ -22,6 +22,8 @@
- 
- # Python module imports
- import sys
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.lib.buttons
- import wx.lib.scrolledpanel
-diff --git a/gui/misc.py b/gui/misc.py
-index 1416b1b..0387317 100644
---- a/gui/misc.py
-+++ b/gui/misc.py
-@@ -29,6 +29,8 @@ import os
- import platform
- import sys
- from textwrap import wrap
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # relax module imports.
-diff --git a/gui/pipe_editor.py b/gui/pipe_editor.py
-index 41472da..3266314 100644
---- a/gui/pipe_editor.py
-+++ b/gui/pipe_editor.py
-@@ -23,6 +23,8 @@
- """The pipe editor GUI element."""
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.grid
- 
-diff --git a/gui/references.py b/gui/references.py
-index e9619ac..38d0e81 100644
---- a/gui/references.py
-+++ b/gui/references.py
-@@ -24,6 +24,8 @@
- 
- # Python module imports.
- import webbrowser
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.html
- 
-diff --git a/gui/relax_gui.py b/gui/relax_gui.py
-index b452c01..778ac7c 100644
---- a/gui/relax_gui.py
-+++ b/gui/relax_gui.py
-@@ -31,6 +31,8 @@ import sys
- from textwrap import wrap
- from time import sleep
- import webbrowser
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # relax module imports.
-diff --git a/gui/relax_prompt.py b/gui/relax_prompt.py
-index bd27cea..f47ab97 100644
---- a/gui/relax_prompt.py
-+++ b/gui/relax_prompt.py
-@@ -24,6 +24,8 @@
- 
- # Python module imports.
- import sys
-+import wxversion
-+wxversion.select("2.8")
- import wx
- import wx.py
- import wx.stc as stc
-diff --git a/gui/results_viewer.py b/gui/results_viewer.py
-index 7938c74..80e4171 100644
---- a/gui/results_viewer.py
-+++ b/gui/results_viewer.py
-@@ -24,6 +24,8 @@
- """Module containing the base class for the results frame."""
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- from wx.lib import buttons
- 
-diff --git a/gui/spin_viewer/containers.py b/gui/spin_viewer/containers.py
-index 58a6da9..4e104cd 100644
---- a/gui/spin_viewer/containers.py
-+++ b/gui/spin_viewer/containers.py
-@@ -25,6 +25,8 @@
- 
- # Python module imports.
- from re import search
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # relax module imports.
-diff --git a/gui/spin_viewer/frame.py b/gui/spin_viewer/frame.py
-index c22be26..3538939 100644
---- a/gui/spin_viewer/frame.py
-+++ b/gui/spin_viewer/frame.py
-@@ -23,6 +23,8 @@
- """The spin viewer frame."""
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # relax module imports.
-diff --git a/gui/spin_viewer/splitter.py b/gui/spin_viewer/splitter.py
-index 3366813..f899b30 100644
---- a/gui/spin_viewer/splitter.py
-+++ b/gui/spin_viewer/splitter.py
-@@ -24,6 +24,8 @@
- 
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # relax module imports.
-diff --git a/gui/spin_viewer/tree.py b/gui/spin_viewer/tree.py
-index d8a8323..a719c58 100644
---- a/gui/spin_viewer/tree.py
-+++ b/gui/spin_viewer/tree.py
-@@ -24,6 +24,8 @@
- 
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # relax module imports.
-diff --git a/gui/uf_objects.py b/gui/uf_objects.py
-index 254e1b0..0aec336 100644
---- a/gui/uf_objects.py
-+++ b/gui/uf_objects.py
-@@ -24,6 +24,8 @@
- 
- # Python module imports.
- from re import search
-+import wxversion
-+wxversion.select("2.8")
- import wx
- from wx.lib import scrolledpanel
- import sys
-diff --git a/gui/wizards/peak_intensity.py b/gui/wizards/peak_intensity.py
-index a44d13f..ee84247 100644
---- a/gui/wizards/peak_intensity.py
-+++ b/gui/wizards/peak_intensity.py
-@@ -25,6 +25,8 @@
- 
- # Python module imports.
- from os import sep
-+import wxversion
-+wxversion.select("2.8")
- import wx
- from wx.lib import scrolledpanel
- 
-diff --git a/gui/wizards/wiz_objects.py b/gui/wizards/wiz_objects.py
-index a6e7f8b..16a180a 100644
---- a/gui/wizards/wiz_objects.py
-+++ b/gui/wizards/wiz_objects.py
-@@ -23,6 +23,8 @@
- """Base class module for the wizard GUI elements."""
- 
- # Python module imports.
-+import wxversion
-+wxversion.select("2.8")
- import wx
- from wx.lib import buttons, scrolledpanel
- 
-diff --git a/pipe_control/reset.py b/pipe_control/reset.py
-index d79872d..f778eb5 100644
---- a/pipe_control/reset.py
-+++ b/pipe_control/reset.py
-@@ -24,6 +24,8 @@ import dep_check
- 
- # Python module imports.
- if dep_check.wx_module:
-+    import wxversion
-+    wxversion.select("2.8")
-     import wx
- 
- # relax module imports.
-diff --git a/test_suite/gui_tests/__init__.py b/test_suite/gui_tests/__init__.py
-index e79e796..48f4050 100644
---- a/test_suite/gui_tests/__init__.py
-+++ b/test_suite/gui_tests/__init__.py
-@@ -25,6 +25,8 @@
- # Python module imports.
- from re import search
- from unittest import TestSuite
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # relax module imports.
-diff --git a/test_suite/gui_tests/base_classes.py b/test_suite/gui_tests/base_classes.py
-index c976bc1..787d8f6 100644
---- a/test_suite/gui_tests/base_classes.py
-+++ b/test_suite/gui_tests/base_classes.py
-@@ -27,6 +27,8 @@ from math import pi    # This is needed for relax scripts as pi is located in th
- from os import sep
- from tempfile import mktemp, mkdtemp
- from unittest import TestCase
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # relax module imports.
-diff --git a/test_suite/gui_tests/model_free.py b/test_suite/gui_tests/model_free.py
-index acf17e8..f3db394 100644
---- a/test_suite/gui_tests/model_free.py
-+++ b/test_suite/gui_tests/model_free.py
-@@ -21,6 +21,8 @@
- 
- # Python module imports.
- from os import sep
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # relax module imports.
-diff --git a/test_suite/gui_tests/noe.py b/test_suite/gui_tests/noe.py
-index 54c1e67..defc414 100644
---- a/test_suite/gui_tests/noe.py
-+++ b/test_suite/gui_tests/noe.py
-@@ -21,6 +21,8 @@
- 
- # Python module imports.
- from os import F_OK, access, sep
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # relax module imports.
-diff --git a/test_suite/gui_tests/rx.py b/test_suite/gui_tests/rx.py
-index c5ce2a3..cc8ac4d 100644
---- a/test_suite/gui_tests/rx.py
-+++ b/test_suite/gui_tests/rx.py
-@@ -21,6 +21,8 @@
- 
- # Python module imports.
- from os import F_OK, access, sep
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # relax module imports.
-diff --git a/test_suite/gui_tests/state.py b/test_suite/gui_tests/state.py
-index 3d96f43..4342950 100644
---- a/test_suite/gui_tests/state.py
-+++ b/test_suite/gui_tests/state.py
-@@ -21,6 +21,8 @@
- 
- # Python module imports.
- from os import sep
-+import wxversion
-+wxversion.select("2.8")
- import wx
- 
- # relax module imports.
-diff --git a/test_suite/relax_test_runner.py b/test_suite/relax_test_runner.py
-index 7154576..3ed921e 100644
---- a/test_suite/relax_test_runner.py
-+++ b/test_suite/relax_test_runner.py
-@@ -25,6 +25,8 @@ import sys
- from time import time
- from unittest import TextTestRunner
- if dep_check.wx_module:
-+    import wxversion
-+    wxversion.select("2.8")
-     import wx
- 
- # relax module imports.
-diff --git a/test_suite/test_suite_runner.py b/test_suite/test_suite_runner.py
-index b010e8f..23e8c66 100644
---- a/test_suite/test_suite_runner.py
-+++ b/test_suite/test_suite_runner.py
-@@ -26,6 +26,8 @@ import dep_check
- import os
- import sys
- if dep_check.wx_module:
-+    import wxversion
-+    wxversion.select("2.8")
-     import wx
- 
- # Formatting.
diff --git a/sci-chemistry/relax/files/relax-3.1.0-sample-script-backport.patch b/sci-chemistry/relax/files/relax-3.1.0-sample-script-backport.patch
deleted file mode 100644
index 7c82da50aaa0..000000000000
--- a/sci-chemistry/relax/files/relax-3.1.0-sample-script-backport.patch
+++ /dev/null
@@ -1,111 +0,0 @@
---- trunk/sample_scripts/relax_disp/R1rho_analysis.py	2013/11/29 09:40:25	21705
-+++ trunk/sample_scripts/relax_disp/R1rho_analysis.py	2013/11/29 09:42:22	21706
-@@ -58,16 +58,16 @@
- # Set up the data pipe.
- #######################
- 
-+# The path to the data files.
-+DATA_PATH = '../../test_suite/shared_data/dispersion/r1rho_off_res_tp02'
-+
- # Create the data pipe.
- pipe_name = 'base pipe'
- pipe_bundle = 'relax_disp'
- pipe.create(pipe_name=pipe_name, bundle=pipe_bundle, pipe_type='relax_disp')
- 
--# The path to the data files.
--data_path = 'r1rho_off_res_tp02'
--
- # Load the sequence.
--sequence.read('fake_sequence.in', res_num_col=1, res_name_col=2)
-+sequence.read('fake_sequence.in', dir=DATA_PATH, res_num_col=1, res_name_col=2)
- 
- # Name the spins so they can be matched to the assignments.
- spin.name(name='N')
-@@ -77,37 +77,37 @@
- 
- # The spectral data - spectrum ID, peak list file name, spin-lock field strength (Hz), the spin-lock offset (ppm), the relaxation time (s), spectrometer frequency (Hz), and experimental error (RMSD of the base plane noise for each spectrum).
- data = [
--    ['ref_500MHz',       'ref_500MHz.list',         None, 110.0, 0.1, 500e6, 200000.0]
--    ['nu_1000.0_500MHz', 'nu_1000.0_500MHz.list', 1000.0, 110.0, 0.1, 500e6, 200000.0]
--    ['nu_1500.0_500MHz', 'nu_1500.0_500MHz.list', 1500.0, 110.0, 0.1, 500e6, 200000.0]
--    ['nu_2000.0_500MHz', 'nu_2000.0_500MHz.list', 2000.0, 110.0, 0.1, 500e6, 200000.0]
--    ['nu_2500.0_500MHz', 'nu_2500.0_500MHz.list', 2500.0, 110.0, 0.1, 500e6, 200000.0]
--    ['nu_3000.0_500MHz', 'nu_3000.0_500MHz.list', 3000.0, 110.0, 0.1, 500e6, 200000.0]
--    ['nu_3500.0_500MHz', 'nu_3500.0_500MHz.list', 3500.0, 110.0, 0.1, 500e6, 200000.0]
--    ['nu_4000.0_500MHz', 'nu_4000.0_500MHz.list', 4000.0, 110.0, 0.1, 500e6, 200000.0]
--    ['nu_4500.0_500MHz', 'nu_4500.0_500MHz.list', 4500.0, 110.0, 0.1, 500e6, 200000.0]
--    ['nu_5000.0_500MHz', 'nu_5000.0_500MHz.list', 5000.0, 110.0, 0.1, 500e6, 200000.0]
--    ['nu_5500.0_500MHz', 'nu_5500.0_500MHz.list', 5500.0, 110.0, 0.1, 500e6, 200000.0]
--    ['nu_6000.0_500MHz', 'nu_6000.0_500MHz.list', 6000.0, 110.0, 0.1, 500e6, 200000.0]
--    ['ref_800MHz',       'ref_800MHz.list',         None, 110.0, 0.1, 800e6, 200000.0]
--    ['nu_1000.0_800MHz', 'nu_1000.0_800MHz.list', 1000.0, 110.0, 0.1, 800e6, 200000.0]
--    ['nu_1500.0_800MHz', 'nu_1500.0_800MHz.list', 1500.0, 110.0, 0.1, 800e6, 200000.0]
--    ['nu_2000.0_800MHz', 'nu_2000.0_800MHz.list', 2000.0, 110.0, 0.1, 800e6, 200000.0]
--    ['nu_2500.0_800MHz', 'nu_2500.0_800MHz.list', 2500.0, 110.0, 0.1, 800e6, 200000.0]
--    ['nu_3000.0_800MHz', 'nu_3000.0_800MHz.list', 3000.0, 110.0, 0.1, 800e6, 200000.0]
--    ['nu_3500.0_800MHz', 'nu_3500.0_800MHz.list', 3500.0, 110.0, 0.1, 800e6, 200000.0]
--    ['nu_4000.0_800MHz', 'nu_4000.0_800MHz.list', 4000.0, 110.0, 0.1, 800e6, 200000.0]
--    ['nu_4500.0_800MHz', 'nu_4500.0_800MHz.list', 4500.0, 110.0, 0.1, 800e6, 200000.0]
--    ['nu_5000.0_800MHz', 'nu_5000.0_800MHz.list', 5000.0, 110.0, 0.1, 800e6, 200000.0]
--    ['nu_5500.0_800MHz', 'nu_5500.0_800MHz.list', 5500.0, 110.0, 0.1, 800e6, 200000.0]
-+    ['ref_500MHz',       'ref_500MHz.list',         None, 110.0, 0.1, 500e6, 200000.0],
-+    ['nu_1000.0_500MHz', 'nu_1000.0_500MHz.list', 1000.0, 110.0, 0.1, 500e6, 200000.0],
-+    ['nu_1500.0_500MHz', 'nu_1500.0_500MHz.list', 1500.0, 110.0, 0.1, 500e6, 200000.0],
-+    ['nu_2000.0_500MHz', 'nu_2000.0_500MHz.list', 2000.0, 110.0, 0.1, 500e6, 200000.0],
-+    ['nu_2500.0_500MHz', 'nu_2500.0_500MHz.list', 2500.0, 110.0, 0.1, 500e6, 200000.0],
-+    ['nu_3000.0_500MHz', 'nu_3000.0_500MHz.list', 3000.0, 110.0, 0.1, 500e6, 200000.0],
-+    ['nu_3500.0_500MHz', 'nu_3500.0_500MHz.list', 3500.0, 110.0, 0.1, 500e6, 200000.0],
-+    ['nu_4000.0_500MHz', 'nu_4000.0_500MHz.list', 4000.0, 110.0, 0.1, 500e6, 200000.0],
-+    ['nu_4500.0_500MHz', 'nu_4500.0_500MHz.list', 4500.0, 110.0, 0.1, 500e6, 200000.0],
-+    ['nu_5000.0_500MHz', 'nu_5000.0_500MHz.list', 5000.0, 110.0, 0.1, 500e6, 200000.0],
-+    ['nu_5500.0_500MHz', 'nu_5500.0_500MHz.list', 5500.0, 110.0, 0.1, 500e6, 200000.0],
-+    ['nu_6000.0_500MHz', 'nu_6000.0_500MHz.list', 6000.0, 110.0, 0.1, 500e6, 200000.0],
-+    ['ref_800MHz',       'ref_800MHz.list',         None, 110.0, 0.1, 800e6, 200000.0],
-+    ['nu_1000.0_800MHz', 'nu_1000.0_800MHz.list', 1000.0, 110.0, 0.1, 800e6, 200000.0],
-+    ['nu_1500.0_800MHz', 'nu_1500.0_800MHz.list', 1500.0, 110.0, 0.1, 800e6, 200000.0],
-+    ['nu_2000.0_800MHz', 'nu_2000.0_800MHz.list', 2000.0, 110.0, 0.1, 800e6, 200000.0],
-+    ['nu_2500.0_800MHz', 'nu_2500.0_800MHz.list', 2500.0, 110.0, 0.1, 800e6, 200000.0],
-+    ['nu_3000.0_800MHz', 'nu_3000.0_800MHz.list', 3000.0, 110.0, 0.1, 800e6, 200000.0],
-+    ['nu_3500.0_800MHz', 'nu_3500.0_800MHz.list', 3500.0, 110.0, 0.1, 800e6, 200000.0],
-+    ['nu_4000.0_800MHz', 'nu_4000.0_800MHz.list', 4000.0, 110.0, 0.1, 800e6, 200000.0],
-+    ['nu_4500.0_800MHz', 'nu_4500.0_800MHz.list', 4500.0, 110.0, 0.1, 800e6, 200000.0],
-+    ['nu_5000.0_800MHz', 'nu_5000.0_800MHz.list', 5000.0, 110.0, 0.1, 800e6, 200000.0],
-+    ['nu_5500.0_800MHz', 'nu_5500.0_800MHz.list', 5500.0, 110.0, 0.1, 800e6, 200000.0],
-     ['nu_6000.0_800MHz', 'nu_6000.0_800MHz.list', 6000.0, 110.0, 0.1, 800e6, 200000.0]
- ]
- 
- # Loop over the spectra.
- for id, file, field, offset, relax_time, H_frq, rmsd in data:
-     # Load the peak intensities and set the errors.
--    spectrum.read_intensities(file=file, dir=data_path, spectrum_id=id, int_method='height')
--    spectrum.baseplane_rmsd(spectrum_id=id, error=error)
-+    spectrum.read_intensities(file=file, dir=DATA_PATH, spectrum_id=id, int_method='height')
-+    spectrum.baseplane_rmsd(spectrum_id=id, error=rmsd)
- 
-     # Set the relaxation dispersion experiment type.
-     relax_disp.exp_type(spectrum_id=id, exp_type='R1rho')
-@@ -125,18 +125,17 @@
-     spectrometer.frequency(id=id, frq=H_frq)
- 
- # Load the R1 data.
--relax_data.read(ri_id='500MHz', ri_type='R1', frq=500e6, file='R1_500MHz.out', dir=data_path, mol_name_col=1, res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6, error_col=7)
--relax_data.read(ri_id='800MHz', ri_type='R1', frq=800e6, file='R1_800MHz.out', dir=data_path, mol_name_col=1, res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6, error_col=7)
-+relax_data.read(ri_id='500MHz', ri_type='R1', frq=500e6, file='R1_500MHz.out', dir=DATA_PATH, mol_name_col=1, res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6, error_col=7)
-+relax_data.read(ri_id='800MHz', ri_type='R1', frq=800e6, file='R1_800MHz.out', dir=DATA_PATH, mol_name_col=1, res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6, error_col=7)
- 
--# Clustering.
--relax_disp.cluster(cluster_id='cluster', spin_id=':1-50')
-+# Clustering (only to be activated after an initial analysis without clustering).
-+#relax_disp.cluster(cluster_id='cluster', spin_id=':1-50')
- 
- # Read the chemical shift data.
--chemical_shift.read(file='ref_500MHz.list', dir=data_path)
-+chemical_shift.read(file='ref_500MHz.list', dir=DATA_PATH)
- 
- # Deselect unresolved spins.
--deselect.read(file='unresolved', dir='500_MHz', res_num_col=1)
--deselect.read(file='unresolved', dir='800_MHz', res_num_col=1)
-+deselect.read(file='unresolved', dir=DATA_PATH, res_num_col=1)
- 
- 
- 
diff --git a/sci-chemistry/relax/files/relax-3.1.0-sample-script.patch b/sci-chemistry/relax/files/relax-3.1.0-sample-script.patch
deleted file mode 100644
index c1eefd2cb736..000000000000
--- a/sci-chemistry/relax/files/relax-3.1.0-sample-script.patch
+++ /dev/null
@@ -1,25 +0,0 @@
- sample_scripts/relax_disp/R1rho_analysis.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/sample_scripts/relax_disp/R1rho_analysis.py b/sample_scripts/relax_disp/R1rho_analysis.py
-index 1dcbf68..11d6f97 100644
---- a/sample_scripts/relax_disp/R1rho_analysis.py
-+++ b/sample_scripts/relax_disp/R1rho_analysis.py
-@@ -77,7 +77,7 @@ spin.isotope(isotope='15N')
- 
- # The spectral data - spectrum ID, peak list file name, spin-lock field strength (Hz), the spin-lock offset (ppm), the relaxation time (s), spectrometer frequency (Hz), and experimental error (RMSD of the base plane noise for each spectrum).
- data = [
--    ['ref_500MHz',       'ref_500MHz.list',     ,   None, 110.0, 0.1, 500e6, 200000.0]
-+    ['ref_500MHz',       'ref_500MHz.list',         None, 110.0, 0.1, 500e6, 200000.0]
-     ['nu_1000.0_500MHz', 'nu_1000.0_500MHz.list', 1000.0, 110.0, 0.1, 500e6, 200000.0]
-     ['nu_1500.0_500MHz', 'nu_1500.0_500MHz.list', 1500.0, 110.0, 0.1, 500e6, 200000.0]
-     ['nu_2000.0_500MHz', 'nu_2000.0_500MHz.list', 2000.0, 110.0, 0.1, 500e6, 200000.0]
-@@ -89,7 +89,7 @@ data = [
-     ['nu_5000.0_500MHz', 'nu_5000.0_500MHz.list', 5000.0, 110.0, 0.1, 500e6, 200000.0]
-     ['nu_5500.0_500MHz', 'nu_5500.0_500MHz.list', 5500.0, 110.0, 0.1, 500e6, 200000.0]
-     ['nu_6000.0_500MHz', 'nu_6000.0_500MHz.list', 6000.0, 110.0, 0.1, 500e6, 200000.0]
--    ['ref_800MHz',       'ref_800MHz.list',     ,   None, 110.0, 0.1, 800e6, 200000.0]
-+    ['ref_800MHz',       'ref_800MHz.list',         None, 110.0, 0.1, 800e6, 200000.0]
-     ['nu_1000.0_800MHz', 'nu_1000.0_800MHz.list', 1000.0, 110.0, 0.1, 800e6, 200000.0]
-     ['nu_1500.0_800MHz', 'nu_1500.0_800MHz.list', 1500.0, 110.0, 0.1, 800e6, 200000.0]
-     ['nu_2000.0_800MHz', 'nu_2000.0_800MHz.list', 2000.0, 110.0, 0.1, 800e6, 200000.0]
diff --git a/sci-chemistry/relax/files/relax-3.1.7-dpar.patch b/sci-chemistry/relax/files/relax-3.1.7-dpar.patch
deleted file mode 100644
index 1afb2ff1fe1e..000000000000
--- a/sci-chemistry/relax/files/relax-3.1.7-dpar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trunk/pipe_control/diffusion_tensor.py	2014/05/14 09:36:17	23171
-+++ trunk/pipe_control/diffusion_tensor.py	2014/05/14 16:32:29	23172
-@@ -364,7 +364,7 @@
-     if cdp.diff_tensor.type == 'sphere':
-         tensor_info_table(type='sphere', tm=cdp.diff_tensor.tm, Diso=cdp.diff_tensor.Diso, fixed=cdp.diff_tensor.fixed)
-     elif cdp.diff_tensor.type == 'spheroid':
--        tensor_info_table(type='spheroid', tm=cdp.diff_tensor.tm, Diso=cdp.diff_tensor.Diso, Da=cdp.diff_tensor.Da, Dpar=cdp.diff_tensor.Dpar, Dper=cdp.diff_tensor.Dpar, Dratio=cdp.diff_tensor.Dratio, theta=cdp.diff_tensor.theta, phi=cdp.diff_tensor.phi, fixed=cdp.diff_tensor.fixed)
-+        tensor_info_table(type='spheroid', tm=cdp.diff_tensor.tm, Diso=cdp.diff_tensor.Diso, Da=cdp.diff_tensor.Da, Dpar=cdp.diff_tensor.Dpar, Dper=cdp.diff_tensor.Dper, Dratio=cdp.diff_tensor.Dratio, theta=cdp.diff_tensor.theta, phi=cdp.diff_tensor.phi, fixed=cdp.diff_tensor.fixed)
-     elif cdp.diff_tensor.type == 'ellipsoid':
-         tensor_info_table(type='ellipsoid', tm=cdp.diff_tensor.tm, Diso=cdp.diff_tensor.Diso, Da=cdp.diff_tensor.Da, Dr=cdp.diff_tensor.Dr, Dx=cdp.diff_tensor.Dx, Dy=cdp.diff_tensor.Dy, Dz=cdp.diff_tensor.Dz, alpha=cdp.diff_tensor.alpha, beta=cdp.diff_tensor.beta, gamma=cdp.diff_tensor.gamma, fixed=cdp.diff_tensor.fixed)
- 
diff --git a/sci-chemistry/relax/files/relax-3.2.2-gentoo.patch b/sci-chemistry/relax/files/relax-3.2.2-gentoo.patch
deleted file mode 100644
index bfe7a26be096..000000000000
--- a/sci-chemistry/relax/files/relax-3.2.2-gentoo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
- sconstruct | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/sconstruct b/sconstruct
-index 511a6dd..fc2d6de 100644
---- a/sconstruct
-+++ b/sconstruct
-@@ -25,7 +25,7 @@
- 
- 
- # Import statements.
--from os import F_OK, access, getcwd, path, remove, rmdir, sep, walk
-+from os import F_OK, access, getcwd, path, remove, rmdir, sep, walk, environ
- import platform
- from re import search
- from shutil import rmtree
-@@ -630,6 +630,11 @@ class Main:
-         for file in files:
-             nodes.append(env.SharedObject(dir + path.sep + file, CCFLAGS=cflags))
- 
-+        env.Append(LINKFLAGS = environ['LDFLAGS'])
-+        env.Append(CFLAGS = environ['CFLAGS'])
-+        env.Replace(CC = environ['CC'])
-+
-+
-         # Build the relaxation curve fitting module.
-         self.relax_fit_object = env.SharedLibrary(target=dir + path.sep + 'relax_fit', source=nodes, SHLIBPREFIX=prefix, SHLIBSUFFIX=suffix)
-