diff options
author | Justin Lecher <jlec@gentoo.org> | 2013-11-27 09:47:42 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2013-11-27 09:47:42 +0000 |
commit | 0894c521dba5652dbb01eee79c298703d8ee3157 (patch) | |
tree | 32e85a1ca1fecb7d89d400ac7b052540e5288f75 /sci-chemistry/relax | |
parent | Stable for amd64 wrt bug #490102 (diff) | |
download | historical-0894c521dba5652dbb01eee79c298703d8ee3157.tar.gz historical-0894c521dba5652dbb01eee79c298703d8ee3157.tar.bz2 historical-0894c521dba5652dbb01eee79c298703d8ee3157.zip |
sci-chemistry/relax: Fix wxpython-2.8 usage
Package-Manager: portage-2.2.7/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xB9D4F231BD1558AB!
Diffstat (limited to 'sci-chemistry/relax')
-rw-r--r-- | sci-chemistry/relax/ChangeLog | 8 | ||||
-rw-r--r-- | sci-chemistry/relax/Manifest | 31 | ||||
-rw-r--r-- | sci-chemistry/relax/files/relax-3.0.2-wxpython.patch | 954 | ||||
-rw-r--r-- | sci-chemistry/relax/relax-3.0.2-r1.ebuild (renamed from sci-chemistry/relax/relax-3.0.2.ebuild) | 8 |
4 files changed, 982 insertions, 19 deletions
diff --git a/sci-chemistry/relax/ChangeLog b/sci-chemistry/relax/ChangeLog index e8562b1c1e52..cb974a0f4bc9 100644 --- a/sci-chemistry/relax/ChangeLog +++ b/sci-chemistry/relax/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-chemistry/relax # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/ChangeLog,v 1.8 2013/11/27 07:58:28 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/ChangeLog,v 1.9 2013/11/27 09:47:41 jlec Exp $ + +*relax-3.0.2-r1 (27 Nov 2013) + + 27 Nov 2013; Justin Lecher <jlec@gentoo.org> -relax-3.0.2.ebuild, + +relax-3.0.2-r1.ebuild, +files/relax-3.0.2-wxpython.patch: + Fix wxpython-2.8 usage *relax-3.0.2 (27 Nov 2013) diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest index 1868f6427560..35a7dde70337 100644 --- a/sci-chemistry/relax/Manifest +++ b/sci-chemistry/relax/Manifest @@ -4,6 +4,7 @@ Hash: SHA512 AUX relax-2.1.0-gentoo.patch 910 SHA256 2e85e979fa61e950def08e5a71e0d61662d5d8755a50fa6f4210000760778dbe SHA512 45c537b69b84e67fbadfcc30ae51f8f2d86d897c6187a1008b974899e8464cc638ad21b7e43eb2395887a962dcd6a751e24e4d46fec3639413a90de7fbfb98e6 WHIRLPOOL fd3ffa8d5926586b2d8ff56e3e3e20cf816987a23358e823c39ed4217d53fbea43185c5bcc1abb9bbcb0703e84f1243cbca5db7cb26d432755b488950db72171 AUX relax-2.2.1-gentoo.patch 1676 SHA256 8c31035e6d9abbca876a5d29ce25abe2a6daf6efb55c23a6436cf687d92e49bb SHA512 9e11f5a802b0b9ed8353fd7125e17b6e14d05495d0951bc7536f652ce39ec8baa57acd6574ff6319dd2a6b6938a5bd0a51b95540e22d907675c3cac5e47b8e6d WHIRLPOOL ccd635d5724c7d2db784d457ef126f424f26bb854bc1b85c8b214aaf0e8589a557dc951354c95961968521c6b536663ff78afdf397fac5e18b6143ab4e86a6be AUX relax-3.0.1-gentoo.patch 1645 SHA256 266faa00ccfae77171785800825ec16ad518e0e22ac2ade74154ab01d547fa17 SHA512 6869b5dca42d7428ab177ee3134feded9788d61cf0fe870dd1198039b9f520b4e7e745feae0ba01189f832fd21a6141ca53f8929694d25207f08667b2744606c WHIRLPOOL c74adb00570006e0c515d4b88234044d76ac7ca15e0c1224ed626d05efd71b114abdc8d14196921cf022db55f67fc250bf95a86d339c2052f99672724c1f1366 +AUX relax-3.0.2-wxpython.patch 26526 SHA256 e027848934357fabe880bf99792cfebbbe9285c5a62bf806e1b547158b3f7f7f SHA512 1c98220c4eda426fac0c8b463e9360bff74ab9b5923c3c068c90b02971860a267ded2b39e7f41ddc71fd15bd92fab911ab5b879b66715bc0953b3a4184901b22 WHIRLPOOL 5db39eaf6219faa48efe4609c45f0cf22f333a499032e2ec03a33c4afe64c9153629b25379a72853e83ee4a0457e172a963a358a4e2497a9d020992aa2d2ec93 DIST relax-2.1.0.src.tar.bz2 22054720 SHA256 e7908dbf774e1eb866f45fc222d14935624ce9fe4453da979d1b6cb7e1204dd4 SHA512 e42fb050097de6c79751477e1b9e8ff76f8d495fae446380785d8bf8a0e384df4837b283d95c6988e9e5a2aec9af54369a53cc5584d233c58448882f07235dd0 WHIRLPOOL 51b62e2515780248345c14e1fd11511e8dba1832c69178dca1afb0784b2d411ddb21d3f305e04216ef8e041ea1ce560a40135617f91a5bb5e94d19c76ec0cab6 DIST relax-2.2.1.src.tar.bz2 58950056 SHA256 532fabd9f8e3c7503ee9b75f690869898f639526e0b36c858f66faddba6d3831 SHA512 d6bc574d9ff0baed5f08599df585354b2e0aec263adb33773aeec5392bb26efe43d8626cea13e789b2d1346bfe763511882dfe2c3ee8935ae4c9c0955f76ba79 WHIRLPOOL a561c0c25e0642aa9190233e4ed7fb045f7f891c690d662a559cc3e6f1f7da27977fc8e27c0cc27ab3c0b9624ac9bd606ffa6f7cb77e77bef8dae7b88430116d DIST relax-2.2.5.src.tar.bz2 59081139 SHA256 1f62d5e3294accab2baee912216d1651d9ec43b8b33d7f8d434c125c200991fe SHA512 bffdde3fd4644e730d41b1a67e1f43f07f6a9426bd9f714aea59a92c2868e5467adc5bc57326e1c8904708b13b13482867e040fc28373d1b5029b577b400895f WHIRLPOOL d3e5817e7de0d9bae830cb195be1d90a83020c544bdb06b31958f07e7b0309189ae48a3f21a12955f457fa86a21c8764b619a62a6d8a966be46bcdd4b5c52a90 @@ -13,23 +14,23 @@ EBUILD relax-2.1.0.ebuild 1128 SHA256 2d49d317cc424da9f9f2bf86ec802dae614952d506 EBUILD relax-2.2.1.ebuild 1337 SHA256 4c65b74e17d1928bfc0f42230e1ccbc6abd5963901a751a7782f3c19bf25008c SHA512 70c78139ba9a9a08404673fc970082f9e3c868b2651b80d9f7cac4c5680bec846c69d3c65e68240139dfe37957607845b0ac66f595151ee7051b745d500d095e WHIRLPOOL 219ca572d15297a779da98b2a9f7a12edd80bec89710be07d0d2b02716534c831893a0bc14a0a9f177e6cebc0283c4d25872c4265a7f6f20610c0b17feafd236 EBUILD relax-2.2.5.ebuild 1521 SHA256 f9192d970b2e70dcebdfc6ebd4658459cf5ac88a1b74886cf456108633ccf2c3 SHA512 7a4f13a4be29ef48082e82e6ec7bc6f6b3e1da72ed32e914b9f202c83f61868d850f3c4f2410407ad4c1be5ce5939fb16330d403bcdbdea12fc69e0070a15007 WHIRLPOOL ba6768c596b799456d18f85450520b7de81b5688df9ec3762023b54bf82f3398ed9eea862d242a064ffd3f71f8f73315b15d8734ace7a0196e4fc0b82be8ad99 EBUILD relax-3.0.1.ebuild 1510 SHA256 640d9964245a7c7b42db8e31f59cbb33c6c136481f9cedc46ad80e425e05d1df SHA512 773004e05d60024ba2b793cbe1cc0b95e9f2b788d5cd2a667e4d182598662181e82b03ca084f7690a6755b8bb6926a81b19190b8343f6e2b70ab7e781dd5b683 WHIRLPOOL d2eac52a53b0f7f6389b128ab4433aead2394e64ff1a10006b73a6633a407030918030e859d64657bd139d326cd38faba05f86094f7a684660dc08f48a761cb9 -EBUILD relax-3.0.2.ebuild 1531 SHA256 347e75f0230b88c5b4e761e190f9c5ab97f32b1401e197b7428d31fd6f88f427 SHA512 0f2a1b067aba288dbb1fed35c75ec5835a55140ae0b137ef999e16d2c83587233a2f1379c1fdbf9d4f771af01c0079c16700468148490b934a5599bbf14e5915 WHIRLPOOL 1443ed8d485ff31ff69aef6811521991bb0210abc0a4fd0a02ef6dd195b3bb5ac80d77de9df09086fbae7352b456047ab546abdc5d429cb6c7545ce84426f6e6 -MISC ChangeLog 1401 SHA256 caef0c95d72eb7bfbbf3d2c3d3cedc61204dddbc79ad5801c7f6e6939bcf1be7 SHA512 8ce52b1e4aba24daf733387343f6486c6f9390f18b04c724862a29473f68fb400c90529c5a6feeffb7b07f1ed50e69896911205ab7ddc9265c2e8b74b1f4fe80 WHIRLPOOL 7e536d8c40a7134f3eec267a2bcdb11dfef8738d307ed27cd6050ff6d444ba91051a7dd4c4415bc7ed6627f3aa11f34c2907afa708b49d7147d2eac5ab8e5a9b +EBUILD relax-3.0.2-r1.ebuild 1590 SHA256 c0fb4d5f82bd7c8abcd543cf94e6754fda73142820849b30580766c131bac34c SHA512 d38ef41fa96370a619d4e3a09b154da80723ee3f91e26e9e30e11af8122a04349b6c309751465feb6538a8ae4482b3b01715001a3aaeae8392ad39dac5f4ac0b WHIRLPOOL 0345bdb836910d3169372135e69cc1d473df132e78c7d482db18034c40c29ef91602387221b6a51147e1a4a80194c087b3d3c53f46d0793ac74135de7b6593da +MISC ChangeLog 1587 SHA256 91cdae65bcdc0b90214f76dff7642fdf452fe885aeefbb14fa5e54680b0ddf33 SHA512 2e129aa34247387180b2921687fb90816848d3822da566cb44876d26507284cbe383c1ae71bfd9087591d7982f585c099c822efde13d3a8ab6ac3c5725ad1ac7 WHIRLPOOL 841fe002f7b9fa8bfb92f1814f4ccbe367d1f199c4d29ae1ec17511142972902239ef9bd6855455a07243824fd8db7dbbd4bf4cbcfb7319b97b80aa3afa8847e MISC metadata.xml 1315 SHA256 58aef1b2b940b7211a85032dfc7212025aca6a3cd313b1a6e203854bbd3dd03e SHA512 dcb1d935782546693b79aa74dc37d55701ff4cb1756860a7f0d9919534ad2ae6f1dcad20cace867b10297c577cb6444dd5e212b13f57c3d81b30b382d8458c04 WHIRLPOOL e2de7c85fb3494a98c2ee1b08dd06d28676f43f64367ad29a8723f712e12e9052daa82794bb6626506de568701b1ea09efe059a8d3a13f6aee5fd607a913e441 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCgAGBQJSlaYlAAoJELnU8jG9FViraq0P/1MNnz9+otalIMd8DqM0wgyv -VmC6qf7LBE9UaH1jv4Z99d1cY5C2Dz89px0bjBn7BTs7RU+YLm2qHl2rJ0wZ2z2j -QIveGh13qY8myNeKqjwbyb/PRZqdHGtb13S3oWZtU6Ln9h4VP6Ne31I+t3QXjKZ7 -X8a+wZdUnR81zRh72CJigc+mLki3VxdvQWH9i8nF4Bl4LfwDhSKpPqS0hTIyKbZ3 -rrI3hEIRzg9E3bLoThUCCKV933HdsX0vOzwvAmcs7fq2foaa/4qEJ+bzaHVgnDW3 -1AUZr6p3YZUdE3NOpKH580XkVvba8f0SbYtrkrTIhH0mnifVPr/sPzJ27dJjvHjh -goEg70ss0HeOcuoimK0XkCI/YTeahbKSsu4/sxxYOmHYdKH67PuWwCkW2L6EuE/v -mIgoKR1wXFgIyt0DRYbehNAhs55hTTi55vw8Q2nuV4veOCQVOrWf4X8ssCKS/K/i -onyZ9TLv/ZThFe2KOelo2nGJj3ldPN/A2eUG7X17wVG2/gfU1HKRuE+K3/sv/pPX -YlFzpL6C+2YY8B8pfwGAcUqmxxQdSH90ufeUX/BYtbDNeKVv0u3FUFpdqFKWZgjV -aQj/gsp0AU/68V53rcjXLTsy4kQ6mZ96JOE80rUz3PIKionOtVy9BML+WoLXM2Di -7gS7FVQ1FWx1XSmaYx36 -=EKd9 +iQIcBAEBCgAGBQJSlb++AAoJELnU8jG9FVirpSsP/37vCuPezHyWw7VUXVrWTfWR +Fy4L1MkddOlJsq8e8xqXYrfLKRAViLdPyj63raSSJBKrtcGleN9M46/37h2jVJDL +X+NgTJGLsXYo3VRShvNH7tQyg4HVJMzufWWKm4PEWZF0PsT0q4Ca/Bu5G6i2m4P/ +4kZt4uBE0d8sKWYUqgcGYtSw4EyDwbiLVmsX1F0LB5Wckpfz1IVz63LT+NUdSybr +MhLdzvPfytkeEh/b3Cy/JiEm4PwRUVL7t4wUYQRKhm9TrEcWqrAfPyFK6QMiDcaS ++MGKiSsPAF0baDszMRnb0ktRXALUuKMM2V/xu+uX0Ba0f54l3o82ZAC4+FDcRJI8 +4oXfYZnmJLXTo9y74ubMMdkdg8a9tJEYiVilBMhnzC7iHa2HTxM+XAZygaNRjFb+ +YTRaHs4CiiG9Feb1K0N+nec/KxeAC1uwxNmYZCat72sy0/kj63DrNeRbO5Prk3Dd +6717bKgOUfHZSlJ9aku0GIRm3FXKhjyhYtBzmnuOWuxNHysVBLqZi8pmMQbkBn+A +OIFiI3W9hDjHQiwLRqZ0iUmNubVr8M7ASpqjRbThGjwMCY85dqDM+rufZI1Jin66 +6OzCXUz+p7UweuN71a2QD6mI/JOLRNF0gQcb1NXa+xG1jaxXKpMEOAFioQcVWMly +ApwwEffIqF0bb9HLVEvb +=XGBB -----END PGP SIGNATURE----- diff --git a/sci-chemistry/relax/files/relax-3.0.2-wxpython.patch b/sci-chemistry/relax/files/relax-3.0.2-wxpython.patch new file mode 100644 index 000000000000..857498e199f8 --- /dev/null +++ b/sci-chemistry/relax/files/relax-3.0.2-wxpython.patch @@ -0,0 +1,954 @@ + 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/relax-3.0.2.ebuild b/sci-chemistry/relax/relax-3.0.2-r1.ebuild index eda95f4bc01f..2bf35b9378e9 100644 --- a/sci-chemistry/relax/relax-3.0.2.ebuild +++ b/sci-chemistry/relax/relax-3.0.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/relax-3.0.2.ebuild,v 1.1 2013/11/27 07:58:28 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/relax-3.0.2-r1.ebuild,v 1.1 2013/11/27 09:47:41 jlec Exp $ EAPI=5 @@ -24,7 +24,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] - dev-python/wxpython[${PYTHON_USEDEP}] + dev-python/wxpython:${WX_GTK_VER}[${PYTHON_USEDEP}] sci-chemistry/molmol sci-chemistry/pymol[${PYTHON_USEDEP}] sci-chemistry/vmd @@ -42,7 +42,9 @@ pkg_setup() { src_prepare() { rm -rf minfx bmrblib || die - epatch "${FILESDIR}"/${PN}-3.0.1-gentoo.patch + epatch \ + "${FILESDIR}"/${PN}-3.0.1-gentoo.patch \ + "${FILESDIR}"/${P}-wxpython.patch tc-export CC } |