From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QViIj-0001ot-Ia for garchives@archives.gentoo.org; Sun, 12 Jun 2011 10:54:03 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B905D1C013; Sun, 12 Jun 2011 10:53:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 72C841C013 for ; Sun, 12 Jun 2011 10:53:30 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CFD011B403D for ; Sun, 12 Jun 2011 10:53:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id DC3798003C for ; Sun, 12 Jun 2011 10:53:28 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: 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/9999-web.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: b39098ce755dff73d9a6427441bc56aed6847e66 Date: Sun, 12 Jun 2011 10:53:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 1bc002aa4ca24b12121203270104a0af commit: b39098ce755dff73d9a6427441bc56aed6847e66 Author: Justin Lecher gentoo org> AuthorDate: Thu Jun 2 08:44:51 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Thu Jun 2 08:44:51 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Db39098ce Fix collision with dev-python/webpy, #368947 (Portage version: 2.2.0_alpha37/git/Linux x86_64, signed Manifest commit = with key 70EB7916) --- sci-chemistry/pymol/ChangeLog | 8 ++++++++ sci-chemistry/pymol/files/9999-web.patch | 19 +++++++++++++++++++ sci-chemistry/pymol/metadata.xml | 7 ++++--- sci-chemistry/pymol/pymol-9999.ebuild | 7 +++++-- 4 files changed, 36 insertions(+), 5 deletions(-) diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLo= g index d4ba19a..e3f6e08 100644 --- a/sci-chemistry/pymol/ChangeLog +++ b/sci-chemistry/pymol/ChangeLog @@ -2,6 +2,14 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 02 Jun 2011; Justin Lecher +files/9999-web.patch, + pymol-9999.ebuild, metadata.xml: + Fix collision with dev-python/webpy, #368947 + + 02 Jun 2011; Justin Lecher +files/9999-web.patch, + pymol-9999.ebuild: + Fix collision with dev-python/webpy, #368947 + 28 Apr 2011; Justin Lecher files/pymol-9999-shaders.= patch: Fixed patches for current HEAD =20 diff --git a/sci-chemistry/pymol/files/9999-web.patch b/sci-chemistry/pym= ol/files/9999-web.patch new file mode 100644 index 0000000..2d6957d --- /dev/null +++ b/sci-chemistry/pymol/files/9999-web.patch @@ -0,0 +1,19 @@ + setup.py | 5 +---- + 1 files changed, 1 insertions(+), 4 deletions(-) + +diff --git a/setup.py b/setup.py +index b0f4dad..94d292d 100644 +--- a/setup.py ++++ b/setup.py +@@ -180,10 +180,7 @@ setup ( # Distribution meta-data + 'pymol/opengl/gl', + 'pymol/opengl/glu', + 'pymol/opengl/glut', +- 'pymol/wizard', +- 'web', +- 'web/examples', +- 'web/javascript', ], ++ 'pymol/wizard', ], + ext_modules =3D [ + Extension("pymol._cmd", [ + "modules/cealign/src/ccealignmodule.cpp", diff --git a/sci-chemistry/pymol/metadata.xml b/sci-chemistry/pymol/metad= ata.xml index ad86c00..58b73ca 100644 --- a/sci-chemistry/pymol/metadata.xml +++ b/sci-chemistry/pymol/metadata.xml @@ -5,8 +5,9 @@ jlec@gentoo.org - Pymol supprt for sci-chemistry/apbs - Enable numpy support for Pymol - Builds molfile plugin support + 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 14ff467..53f9bb2 100644 --- a/sci-chemistry/pymol/pymol-9999.ebuild +++ b/sci-chemistry/pymol/pymol-9999.ebuild @@ -20,7 +20,7 @@ ESVN_REPO_URI=3D"https://pymol.svn.sourceforge.net/svnr= oot/pymol/trunk/pymol" LICENSE=3D"PSF-2.2" SLOT=3D"0" KEYWORDS=3D"~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE=3D"apbs numpy vmd" +IUSE=3D"apbs numpy vmd web" =20 DEPEND=3D" dev-python/numpy @@ -36,7 +36,8 @@ DEPEND=3D" sci-chemistry/apbs sci-chemistry/pdb2pqr sci-chemistry/pymol-apbs-plugin - )" + ) + web? ( !dev-python/webpy )" RDEPEND=3D"${DEPEND}" =20 src_prepare() { @@ -44,6 +45,8 @@ src_prepare() { "${FILESDIR}"/${P}-data-path.patch \ "${FILESDIR}"/${P}-shaders.patch =20 + use web || epatch "${FILESDIR}"/${PV}-web.patch + epatch "${FILESDIR}"/${P}-prefix.patch && \ eprefixify setup.py =20