sci-chemistry/pymol: Adapt to current HEAD

Package-Manager: portage-2.2.0_alpha163

2 files changed, 0 insertions, 60 deletions

diff --git a/sci-chemistry/pymol/files/pymol-9999-flags.patch b/sci-chemistry/pymol/files/pymol-9999-flags.patch
deleted file mode 100644
index 528e220b0..000000000
--- a/sci-chemistry/pymol/files/pymol-9999-flags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
- pymol/setup.py | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/pymol/setup.py b/pymol/setup.py
-index b8d7070..7fc11fb 100644
---- a/pymol/setup.py
-+++ b/pymol/setup.py
-@@ -252,10 +252,7 @@ else: # linux or other unix
-                    ("_PYMOL_GL_CALLLISTS",None),
-                    ("OPENGL_ES_2",None),
-                    ]
--    ext_comp_args = [ "-ffast-math",
--                      "-funroll-loops",
--                      "-O3",
--                      "-g" ]
-+    ext_comp_args = []
- 
- def get_pymol_version():
-     return re.findall(r'_PyMOL_VERSION "(.*)"', open('layer0/Version.h').read())[0]
diff --git a/sci-chemistry/pymol/files/pymol-9999-prefix.patch b/sci-chemistry/pymol/files/pymol-9999-prefix.patch
deleted file mode 100644
index 0334845ca..000000000
--- a/sci-chemistry/pymol/files/pymol-9999-prefix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
- pymol/setup.py | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/pymol/setup.py b/pymol/setup.py
-index b8d7070..378bbf6 100644
---- a/pymol/setup.py
-+++ b/pymol/setup.py
-@@ -185,12 +185,12 @@ elif sys.platform=='darwin':
-                   "/sw/include/freetype2/freetype",
-                   "/sw/include/freetype2",
-                   "/sw/include",
--                  "/usr/X11/include",
-+                  "@GENTOO_PORTAGE_EPREFIX@/usr/X11/include",
-                   ]
-         ext_link_args=[
-                        "-L/sw/lib", "-lpng",
--                       "/usr/X11/lib/libGL.dylib",
--                       "/usr/X11/lib/libGLU.dylib",
-+                       "@GENTOO_PORTAGE_EPREFIX@/usr/X11/lib/libGL.dylib",
-+                       "@GENTOO_PORTAGE_EPREFIX@/usr/X11/lib/libGLU.dylib",
-                        "-lfreeglut",
-                        "-lglew",
-                        "-L/sw/lib/freetype219/lib", "-lfreetype"
-@@ -220,7 +220,7 @@ elif sys.platform=='darwin':
- else: # linux or other unix
- 
-     inc_dirs += [
--                 "/usr/include/freetype2",
-+                 "@GENTOO_PORTAGE_EPREFIX@/usr/include/freetype2",
-                  ]
-     libs = [ "GL",
-              "GLU",
-@@ -235,7 +235,7 @@ else: # linux or other unix
-                    "GLU",
-                    "glut",
-                    "GLEW"]
--    lib_dirs = [ "/usr/X11R6/lib64", ]
-+    lib_dirs = [ "@GENTOO_PORTAGE_EPREFIX@/usr/X11R6/lib64", ]
-     def_macros += [
-                    ("_PYMOL_INLINE",None),
-                    ("_PYMOL_FREETYPE",None),