[gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/, sci-chemistry/pymol/files/

["Justin Lecher" <jlec@gentoo.org>]

commit:     e4f5b3533db0f3b40cbcfeee0adbcc8684c37972
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 18 20:22:05 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Feb 18 20:22:05 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e4f5b353

sci-chemistry/pymol: Adapt to current HEAD

Package-Manager: portage-2.2.0_alpha163

---
 sci-chemistry/pymol/ChangeLog                     |    4 ++
 sci-chemistry/pymol/files/pymol-9999-flags.patch  |   19 ----------
 sci-chemistry/pymol/files/pymol-9999-prefix.patch |   41 ---------------------
 sci-chemistry/pymol/metadata.xml                  |    1 -
 sci-chemistry/pymol/pymol-9999.ebuild             |   20 +++--------
 5 files changed, 9 insertions(+), 76 deletions(-)

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index fe1b0b7..9652f4b 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Feb 2013; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild,
+  -files/pymol-9999-flags.patch, -files/pymol-9999-prefix.patch, metadata.xml:
+  Adapt to current HEAD
+
   15 Feb 2013; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild,
   -files/pymol-9999-data-path.patch, files/pymol-9999-flags.patch,
   -files/pymol-9999-nosplash.patch, files/pymol-9999-prefix.patch,

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 528e220..0000000
--- 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 0334845..0000000
--- 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),

diff --git a/sci-chemistry/pymol/metadata.xml b/sci-chemistry/pymol/metadata.xml
index 388b22d..e2aa7cd 100644
--- a/sci-chemistry/pymol/metadata.xml
+++ b/sci-chemistry/pymol/metadata.xml
@@ -6,6 +6,5 @@
   </maintainer>
   <use>
     <flag name="apbs">Pymol supprt for sci-chemistry/apbs</flag>
-    <flag name="numpy">Enable numpy support for Pymol</flag>
   </use>
 </pkgmetadata>

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index 12bf73d..cd05037 100644
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ b/sci-chemistry/pymol/pymol-9999.ebuild
@@ -17,7 +17,7 @@ ESVN_REPO_URI="https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol"
 LICENSE="PSF-2.2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="apbs +numpy"
+IUSE="apbs"
 
 DEPEND="
 	dev-python/numpy
@@ -43,23 +43,13 @@ src_unpack() {
 }
 
 python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/${P}-flags.patch
-		"${FILESDIR}"/${P}-prefix.patch
-		)
-
-	if use numpy; then
-		sed \
-			-e '/PYMOL_NUMPY/s:^#::g' \
-			-i setup.py || die
-	fi
-
-	rm ./modules/pmg_tk/startup/apbs_tools.py || die
-
 	sed \
-		-e "s:/opt/local:${EPREFIX}/usr:g" \
+		-e "s:\"/usr:\"${EPREFIX}/usr:g" \
+		-e "/ext_comp_args/s:=.*$:=:g" \
 		-i setup.py || die
 
+	rm ./modules/pmg_tk/startup/apbs_tools.py || die
+
 	distutils-r1_python_prepare_all
 
 	eprefixify setup.py