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

[Justin Lecher]

commit:     61e0c3c7f9266ad55e969fa6aac83f4c2ad1a823
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 07:56:54 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 07:56:54 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=61e0c3c7

sci-chemistry/pymol: Sync with tree

Package-Manager: portage-2.2.0_alpha169

---
 sci-chemistry/pymol/ChangeLog         |    3 +++
 sci-chemistry/pymol/metadata.xml      |    1 +
 sci-chemistry/pymol/pymol-9999.ebuild |   33 +++++++++++++++++++++++++++------
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index dad76a9..f5e0f9b 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Mar 2013; Justin Lecher <jlec@g.o> pymol-9999.ebuild, metadata.xml:
+  Sync with tree
+
   03 Mar 2013; Justin Lecher <jlec@g.o> metadata.xml:
   Fix missing DOCTYPE
 

diff --git a/sci-chemistry/pymol/metadata.xml b/sci-chemistry/pymol/metadata.xml
index 0ced419..bca2106 100644
--- a/sci-chemistry/pymol/metadata.xml
+++ b/sci-chemistry/pymol/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <use>
     <flag name="apbs">Pymol supprt for sci-chemistry/apbs</flag>
+    <flag name="web">Install Pymodule needed for web app support</flag>
   </use>
 </pkgmetadata>

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index 6f6c5f7..564732c 100644
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ b/sci-chemistry/pymol/pymol-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="tk"
 
-inherit distutils-r1 fdo-mime prefix subversion versionator
+inherit distutils-r1 fdo-mime subversion versionator
 
 DESCRIPTION="A Python-extensible molecular graphics system"
 HOMEPAGE="http://pymol.sourceforge.net/"
@@ -17,10 +17,10 @@ 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"
+IUSE="apbs web"
 
 DEPEND="
-	dev-python/numpy
+	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/pmw[${PYTHON_USEDEP}]
 	media-libs/freetype:2
 	media-libs/glew
@@ -34,7 +34,7 @@ DEPEND="
 		sci-chemistry/pdb2pqr
 		sci-chemistry/pymol-apbs-plugin
 	)
-	!dev-python/webpy"
+	web? ( !dev-python/webpy )"
 RDEPEND="${DEPEND}"
 
 src_unpack() {
@@ -50,9 +50,12 @@ python_prepare_all() {
 
 	rm ./modules/pmg_tk/startup/apbs_tools.py || die
 
-	distutils-r1_python_prepare_all
+	sed \
+		-e "s:/opt/local:${EPREFIX}/usr:g" \
+		-e '/ext_comp_args/s:\[.*\]:[]:g' \
+		-i setup.py || die
 
-	eprefixify setup.py
+	distutils-r1_python_prepare_all
 }
 
 src_prepare() {
@@ -67,8 +70,26 @@ python_install() {
 python_install_all() {
 	distutils-r1_python_install_all
 
+	python_export python2_7 EPYTHON
+
+	# These environment variables should not go in the wrapper script, or else
+	# it will be impossible to use the PyMOL libraries from Python.
+	cat >> "${T}"/20pymol <<- EOF
+		PYMOL_PATH="$(python_get_sitedir)/${PN}"
+		PYMOL_DATA="${EPREFIX}/usr/share/pymol/data"
+		PYMOL_SCRIPTS="${EPREFIX}/usr/share/pymol/scripts"
+	EOF
+
+	doenvd "${T}"/20pymol
+
 	doicon "${WORKDIR}"/${PN}.{xpm,png}
 	make_desktop_entry pymol PyMol ${PN} "Graphics;Education;Science;Chemistry" "MimeType=chemical/x-pdb;"
+
+	if ! use web; then
+		rm -rvf "${D}/$(python_get_sitedir)/web" || die
+	fi
+
+	rm -f "${ED}"/usr/share/${PN}/LICENSE || die
 }
 
 pkg_postinst() {