From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E0E87138B1A for ; Tue, 19 Feb 2013 19:35:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4707321C058; Tue, 19 Feb 2013 19:35:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 786AD21C057 for ; Tue, 19 Feb 2013 19:35:13 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6021F33DBFF for ; Tue, 19 Feb 2013 19:35:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E7E11E4073 for ; Tue, 19 Feb 2013 19:35:10 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1361218925.e4f5b3533db0f3b40cbcfeee0adbcc8684c37972.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/, sci-chemistry/pymol/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/pymol/ChangeLog sci-chemistry/pymol/files/pymol-9999-flags.patch sci-chemistry/pymol/files/pymol-9999-prefix.patch sci-chemistry/pymol/metadata.xml sci-chemistry/pymol/pymol-9999.ebuild X-VCS-Directories: sci-chemistry/pymol/ sci-chemistry/pymol/files/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: e4f5b3533db0f3b40cbcfeee0adbcc8684c37972 X-VCS-Branch: master Date: Tue, 19 Feb 2013 19:35:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 521cd9b0-14a5-47f4-ad02-4aee2a87db12 X-Archives-Hash: 0ee9488b298d228ca3611522056b8de0 commit: e4f5b3533db0f3b40cbcfeee0adbcc8684c37972 Author: Justin Lecher gentoo org> AuthorDate: Mon Feb 18 20:22:05 2013 +0000 Commit: Justin Lecher gentoo 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 pymol-9999.ebuild, + -files/pymol-9999-flags.patch, -files/pymol-9999-prefix.patch, metadata.xml: + Adapt to current HEAD + 15 Feb 2013; Justin Lecher 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 @@ Pymol supprt for sci-chemistry/apbs - Enable numpy support for Pymol 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