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 7C6F913873F for ; Tue, 29 Jan 2013 15:20:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5C5D7E0586; Tue, 29 Jan 2013 15:20:34 +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 BBEC5E0586 for ; Tue, 29 Jan 2013 15:20:33 +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 863BA33DB5C for ; Tue, 29 Jan 2013 15:20:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id ED174E4073 for ; Tue, 29 Jan 2013 15:20:29 +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: <1359472476.b61bef4418f124efdf37752805951f79b6572a7a.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/pymol/ChangeLog sci-chemistry/pymol/metadata.xml sci-chemistry/pymol/pymol-9999.ebuild X-VCS-Directories: sci-chemistry/pymol/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: b61bef4418f124efdf37752805951f79b6572a7a X-VCS-Branch: master Date: Tue, 29 Jan 2013 15:20:29 +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: 1a905edc-0f48-4f5d-8400-02d97ef4495c X-Archives-Hash: 2ce6425fc2ac38f2f5076135a8383743 commit: b61bef4418f124efdf37752805951f79b6572a7a Author: Justin Lecher gentoo org> AuthorDate: Tue Jan 29 15:14:36 2013 +0000 Commit: Justin Lecher gentoo org> CommitDate: Tue Jan 29 15:14:36 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b61bef44 sci-chemistry/pymol: Bump python eclass Package-Manager: portage-2.2.0_alpha161 --- sci-chemistry/pymol/ChangeLog | 5 ++- sci-chemistry/pymol/metadata.xml | 20 ++++++------ sci-chemistry/pymol/pymol-9999.ebuild | 57 ++++++++++++++++----------------- 3 files changed, 42 insertions(+), 40 deletions(-) diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog index 83d97e1..c88876a 100644 --- a/sci-chemistry/pymol/ChangeLog +++ b/sci-chemistry/pymol/ChangeLog @@ -1,7 +1,10 @@ # ChangeLog for sci-chemistry/pymol -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 29 Jan 2013; Justin Lecher pymol-9999.ebuild, metadata.xml: + Bump python eclass + 15 Oct 2012; Justin Lecher pymol-9999.ebuild: Add mime type definition diff --git a/sci-chemistry/pymol/metadata.xml b/sci-chemistry/pymol/metadata.xml index 1a70ddc..8ada2f2 100644 --- a/sci-chemistry/pymol/metadata.xml +++ b/sci-chemistry/pymol/metadata.xml @@ -1,13 +1,13 @@ - sci-chemistry - - jlec@gentoo.org - - - Pymol supprt for sci-chemistry/apbs - Enable numpy support for Pymol - Builds molfile plugin support - Install Pymodule needed for web app support - + sci-chemistry + + jlec@gentoo.org + + + Pymol supprt for sci-chemistry/apbs + Enable numpy support for Pymol + Builds molfile plugin support + Install Pymodule needed for web app support + diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild index 932aa80..5cddebf 100644 --- a/sci-chemistry/pymol/pymol-9999.ebuild +++ b/sci-chemistry/pymol/pymol-9999.ebuild @@ -1,16 +1,13 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 -PYTHON_DEPEND="2:2.7" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.* *-jython 2.7-pypy-*" -PYTHON_USE_WITH="tk" -PYTHON_MODNAME="${PN} chempy pmg_tk pmg_wx" +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="tk" -inherit distutils eutils fdo-mime prefix subversion versionator +inherit distutils-r1 fdo-mime prefix subversion versionator DESCRIPTION="A Python-extensible molecular graphics system." HOMEPAGE="http://pymol.sourceforge.net/" @@ -24,7 +21,7 @@ IUSE="apbs numpy vmd web" DEPEND=" dev-python/numpy - dev-python/pmw + dev-python/pmw[${PYTHON_USEDEP}] media-libs/freetype:2 media-libs/glew media-libs/libpng @@ -45,18 +42,16 @@ src_unpack() { subversion_src_unpack } -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-setup.py.patch \ - "${FILESDIR}"/${P}-data-path.patch \ +python_prepare_all() { + local PATCHES=( + "${FILESDIR}"/${P}-setup.py.patch + "${FILESDIR}"/${P}-data-path.patch "${FILESDIR}"/${P}-flags.patch + "${FILESDIR}"/${P}-prefix.patch + ) - use web || epatch "${FILESDIR}"/${P}-web.patch - - epatch "${FILESDIR}"/${P}-prefix.patch && \ - eprefixify setup.py - - use vmd && epatch "${FILESDIR}"/${P}-vmd.patch + use web || PATCHES+=( "${FILESDIR}"/${P}-web.patch ) + use vmd && PATCHES+=( "${FILESDIR}"/${P}-vmd.patch ) if use numpy; then sed \ @@ -66,29 +61,33 @@ src_prepare() { rm ./modules/pmg_tk/startup/apbs_tools.py || die - echo "site_packages = \'$(python_get_sitedir -f)\'" > setup3.py || die + python_export python2_7 EPYTHON PYTHON_SITEDIR + echo "site_packages = \'$(python_get_sitedir)\'" > setup3.py || die sed \ -e "s:/opt/local:${EPREFIX}/usr:g" \ -e '/ext_comp_args/s:\[.*\]:[]:g' \ -i setup.py || die - # python 3.* fix - # sed '452,465d' -i setup.py - distutils_src_prepare + distutils-r1_python_prepare_all + + eprefixify setup.py } -src_configure() { - : +src_prepare() { + subversion_src_prepare + distutils-r1_src_prepare } -src_install() { - distutils_src_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="${EPREFIX}/$(python_get_sitedir -f)/${PN}" + PYMOL_PATH="${EPREFIX}/$(python_get_sitedir)/${PN}" PYMOL_DATA="${EPREFIX}/usr/share/pymol/data" PYMOL_SCRIPTS="${EPREFIX}/usr/share/pymol/scripts" EOF @@ -97,7 +96,7 @@ src_install() { cat >> "${T}"/pymol <<- EOF #!/bin/sh - $(PYTHON -f) -O \${PYMOL_PATH}/__init__.py -q \$* + ${EPYTHON} -O \${PYMOL_PATH}/__init__.py -q \$* EOF dobin "${T}"/pymol