[gentoo-commits] gentoo-x86 commit in sci-chemistry/pymol: metadata.xml ChangeLog pymol-1.4.1.ebuild

[Justin Lecher (jlec)]

jlec        11/06/02 08:39:41

  Modified:             metadata.xml ChangeLog pymol-1.4.1.ebuild
  Log:
  Fix collision with dev-python/webpy, #368947
  
  (Portage version: 2.2.0_alpha37/cvs/Linux x86_64)

Revision  Changes    Path
1.6                  sci-chemistry/pymol/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/pymol/metadata.xml?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/pymol/metadata.xml?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/pymol/metadata.xml?r1=1.5&r2=1.6

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/metadata.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- metadata.xml	1 Feb 2010 21:48:57 -0000	1.5
+++ metadata.xml	2 Jun 2011 08:39:41 -0000	1.6
@@ -10,5 +10,6 @@
 		<flag name="numpy">Compile numpy support</flag>
 		<flag name="shaders">Build with Shaders support - good for high-end 3D video cards.</flag>
 		<flag name="vmd">Enable vmd module for trajectories</flag>
+		<flag name="web">Install Pymodule needed for web app support</flag>
 </use>
 </pkgmetadata>



1.81                 sci-chemistry/pymol/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/pymol/ChangeLog?rev=1.81&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/pymol/ChangeLog?rev=1.81&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/pymol/ChangeLog?r1=1.80&r2=1.81

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- ChangeLog	24 May 2011 18:44:14 -0000	1.80
+++ ChangeLog	2 Jun 2011 08:39:41 -0000	1.81
@@ -1,432 +1,8 @@
 # ChangeLog for sci-chemistry/pymol
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.80 2011/05/24 18:44:14 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.81 2011/06/02 08:39:41 jlec Exp $
 
-  24 May 2011; Pawel Hajdan jr <phajdan.jr@g.o>
-  pymol-1.3.1_pre3925-r1.ebuild:
-  x86 stable wrt bug #366229
+  02 Jun 2011; Justin Lecher <jlec@g.o> +files/1.4.1-web.patch,
+  pymol-1.4.1.ebuild, metadata.xml:
+  Fix collision with dev-python/webpy, #368947
 
-  11 May 2011; Christoph Mende <angelos@g.o>
-  pymol-1.3.1_pre3925-r1.ebuild:
-  Stable on amd64 wrt bug #366229
-
-*pymol-1.4.1 (06 May 2011)
-
-  06 May 2011; Justin Lecher <jlec@g.o> +files/1.4.1-data-path.patch,
-  -pymol-1.3.0.ebuild, -pymol-1.3.1_pre3924.ebuild, -pymol-1.4_beta1.ebuild,
-  +pymol-1.4.1.ebuild, +files/1.4.1-shaders.patch:
-  Version Bump, notified by euscan; cleaned old
-
-  05 Apr 2011; Justin Lecher <jlec@g.o> pymol-1.4_beta1.ebuild:
-  Cleaned unneeded SRC_URI entries
-
-*pymol-1.4_beta1 (04 Apr 2011)
-
-  04 Apr 2011; Justin Lecher <jlec@g.o> +files/1.4-shaders.patch,
-  +files/1.4-vmd.patch, +pymol-1.4_beta1.ebuild:
-  Version Bump
-
-*pymol-1.3.1_pre3925-r1 (12 Nov 2010)
-
-  12 Nov 2010; Justin Lecher <jlec@g.o> -pymol-1.3.1_pre3925.ebuild,
-  +pymol-1.3.1_pre3925-r1.ebuild:
-  Fixed digests, #345151
-
-*pymol-1.3.1_pre3925 (11 Nov 2010)
-
-  11 Nov 2010; Justin Lecher <jlec@g.o> +pymol-1.3.1_pre3925.ebuild:
-  Version Bump, Python byte-compilation fix
-
-*pymol-1.3.1_pre3924 (22 Oct 2010)
-
-  22 Oct 2010; Justin Lecher <jlec@g.o> -pymol-1.3.1_pre3923.ebuild,
-  +pymol-1.3.1_pre3924.ebuild:
-  Version Bump
-
-  15 Oct 2010; Justin Lecher <jlec@g.o> pymol-1.3.1_pre3923.ebuild:
-  Mirroring the tarball on request of dberkholz
-
-*pymol-1.3.1_pre3923 (13 Oct 2010)
-
-  13 Oct 2010; Justin Lecher <jlec@g.o> +pymol-1.3.1_pre3923.ebuild:
-  Version Bump to pre release
-
-  19 Sep 2010; Justin Lecher <jlec@g.o> pymol-1.2.3-r1.ebuild,
-  pymol-1.3.0.ebuild:
-  rekeyworded for ~ppc, fixes #309007
-
-  19 Sep 2010; Justin Lecher <jlec@g.o> -pymol-0.99_rc10.ebuild,
-  pymol-1.2.3-r1.ebuild, pymol-1.3.0.ebuild:
-  Dropped ppc, #309007; dropped old version which doesn't work with recent
-  python
-
-  16 Sep 2010; Tomáš Chvátal <scarabeus@g.o>
-  pymol-0.99_rc10.ebuild, pymol-1.2.3-r1.ebuild, pymol-1.3.0.ebuild:
-  virtual/glut -> media-libs/glut
-
-  29 Jun 2010; Justin Lecher <jlec@g.o> -pymol-1.2.1.ebuild:
-  Removed unneeded version
-
-  24 Jun 2010; Christoph Mende <angelos@g.o> pymol-1.2.3-r1.ebuild:
-  Stable on amd64 wrt bug #309007
-
-  15 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  pymol-0.99_rc10.ebuild, pymol-1.2.1.ebuild:
-  Delete deprecation warnings.
-
-*pymol-1.3.0 (09 Jun 2010)
-
-  09 Jun 2010; Justin Lecher <jlec@g.o> +files/1.3.0-vmd.patch,
-  pymol-1.2.3-r1.ebuild, +pymol-1.3.0.ebuild:
-  Version Bump, fixes for usage of python.eclass
-
-  09 Jun 2010; Justin Lecher <jlec@g.o> -pymol-1.0-r1.ebuild,
-  -files/pymol-1.0-r1-data-path.patch, -pymol-1.2.2.ebuild,
-  -pymol-1.2.2-r2.ebuild, -pymol-1.2.2-r4.ebuild,
-  -files/nosplash-gentoo.patch:
-  removed old version which having problems with PYTHON ABIs stuff
-
-  16 May 2010; Justin Lecher <jlec@g.o> pymol-1.2.2-r4.ebuild,
-  pymol-1.2.3-r1.ebuild:
-  RESTRICT PY ABI 2.5
-
-  23 Mar 2010; Christian Faulhammer <fauli@g.o>
-  pymol-1.2.3-r1.ebuild:
-  stable x86, bug 309007
-
-  11 Mar 2010; Joseph Jezak <josejx@g.o> pymol-1.2.2-r4.ebuild,
-  pymol-1.2.3-r1.ebuild:
-  Marked ~ppc for bug #299014.
-
-*pymol-1.2.3-r1 (22 Feb 2010)
-
-  22 Feb 2010; Justin Lecher <jlec@g.o>
-  -pymol-1.2.3.ebuild, +pymol-1.2.3-r1.ebuild:
-  Fix the actual revision of version 1.2.3
-
-*pymol-1.2.3 (20 Feb 2010)
-
-  20 Feb 2010; Justin Lecher <jlec@g.o> +pymol-1.2.3.ebuild:
-  Version Bump
-
-*pymol-1.2.2-r4 (19 Feb 2010)
-
-  19 Feb 2010; Justin Lecher <jlec@g.o>
-  -pymol-1.2.2-r1.ebuild, -pymol-1.2.2-r3.ebuild, +pymol-1.2.2-r4.ebuild:
-  Cleaned old revisions, fixed usage of distutils.eclass at EAPI=3, multiple
-  python version support
-
-*pymol-1.2.2-r3 (18 Feb 2010)
-
-  18 Feb 2010; Justin Lecher <jlec@g.o>
-  +files/1.2.2-prefix.patch, +pymol-1.2.2-r3.ebuild:
-  Fixed usage of pathon eclass, EAPI=3 and PREFIX ready fixes, keyworded for
-  amd64-linux & x86-linux
-
-*pymol-1.2.2-r2 (10 Feb 2010)
-
-  10 Feb 2010; Justin Lecher <jlec@g.o>
-  +files/1.2.2-data-path.patch, +pymol-1.2.2-r2.ebuild:
-  Fixing PYMOL_DATA again per 304259
-
-  06 Feb 2010; Peter Volkov <pva@g.o> pymol-1.2.1.ebuild,
-  pymol-1.2.2.ebuild, pymol-1.2.2-r1.ebuild:
-  added missed inherit eutils, bug #303693, thank Christian Becke for
-  report.
-
-*pymol-1.2.2-r1 (01 Feb 2010)
-
-  01 Feb 2010; Justin Lecher <jlec@g.o>
-  +pymol-1.2.2-r1.ebuild, +files/pymol-1.2.2-vmd.patch, metadata.xml:
-  vmd and numpy added to IUSE
-  apbs plugin support now depends on sci-chemistry/pymol-apbs-plugin
-
-  01 Feb 2010; Justin Lecher <jlec@g.o> pymol-1.2.1.ebuild,
-  pymol-1.2.2.ebuild:
-  We don't install the splash window until we have a gentoo community
-  contribution, fixes bug 299020
-
-  31 Jan 2010; Justin Lecher <jlec@g.o>
-  -files/1.1/pymol-1.1-r2-data-path.patch,
-  -files/1.1/pymol-1.1-r2-shaders.patch, -files/1.1/apbs-070604.patch.bz2,
-  -files/1.1/nosplash-gentoo.patch:
-  Cleanup of forgotten files, fixes bug 274865
-  Added myself as maintainer
-
-  31 Jan 2010; Justin Lecher <jlec@g.o> pymol-1.2.1.ebuild,
-  pymol-1.2.2.ebuild, metadata.xml:
-  Needs media-libs/freetype:2, fixes bug 299019
-
-  13 Jan 2010; Diego E. Pettenò <flameeyes@g.o> pymol-1.2.2.ebuild:
-  Fix path to patch, bug #300399, thanks to Priit Laes for reporting and
-  jlec for warning me.
-
-*pymol-1.2.2 (30 Dec 2009)
-
-  30 Dec 2009; Diego E. Pettenò <flameeyes@g.o> pymol-1.2.1.ebuild,
-  +pymol-1.2.2.ebuild, +files/pymol-1.2.2-shaders.patch:
-  Make 1.2.1 not use live subversion, bump to version 1.2.2. Thanks to
-  Justin Lecher who provided the updated ebuilds. Closes bug #282503.
-
-  03 Oct 2009; Petteri Räty <betelgeuse@g.o> -pymol-1.1-r2.ebuild:
-  Remove old version with built_with_use. Fixes bug #285463.
-
-  09 Sep 2009; Markus Meier <maekke@g.o> pymol-1.2.1.ebuild:
-  amd64/x86 stable, bug #283639
-
-  02 Aug 2009; Jeff Gardner <je_fro@g.o>
-  +files/1.2.1/nosplash-gentoo.patch, pymol-1.2.1.ebuild:
-  Fix nosplash patch
-
-*pymol-1.2.1 (02 Aug 2009)
-
-  02 Aug 2009; Jeff Gardner <je_fro@g.o> +pymol-1.2.1.ebuild,
-  +files/1.2.1/pymol-1.2.1-data-path.patch,
-  +files/1.2.1/pymol-1.2.1-shaders.patch:
-  New version, works with python 2.6, closes bug #269119. Many thanks to
-  Justin Lecher for doing the work, and fauli for a kick in the pants :)
-
-  06 May 2009; Markus Meier <maekke@g.o> pymol-1.1-r2.ebuild:
-  amd64/x86 stable, bug #250903
-
-  16 Apr 2009; Sébastien Fabbro <bicatali@g.o>
-  pymol-0.99_rc10.ebuild, pymol-1.1-r2.ebuild:
-  Proxying for jlec: removing numeric dependencies
-
-  19 Dec 2008; Jeff Gardner <je_fro@g.o> ChangeLog:
-  Rename patches
-
-*pymol-1.1-r2 (19 Dec 2008)
-
-  19 Dec 2008; Jeff Gardner <je_fro@g.o> -pymol-1.1-r1.ebuild,
-  +pymol-1.1-r2.ebuild:
-  Bump to fix compilation and use moved svn repository. Thanks to jlec on
-  IRC.
-
-  17 Aug 2008; Jeff Gardner <je_fro@g.o>
-  files/1.1/apbs-070604.patch.bz2:
-  Fix patch
-
-*pymol-1.1-r1 (13 Aug 2008)
-
-  13 Aug 2008; Jeff Gardner <je_fro@g.o>
-  +files/1.1/pymol-1.1-r1-shaders.patch, +files/1.1/nosplash-gentoo.patch,
-  +files/1.1/pymol-1.1-r1-data-path.patch, +files/1.1/apbs-070604.patch.bz2,
-  +pymol-1.1-r1.ebuild:
-  Version bump, thanks to jschmitz and hodak for the kick in the pants :)
-
-  02 Aug 2007; Jeff Gardner <je_fro@g.o> pymol-0.99_rc10.ebuild:
-  Fix ESVN_REPO_URI wrt bug #187462. Thanks to Michael Mysinger.
-
-  11 Jul 2007; Jeff Gardner <je_fro@g.o> pymol-1.0-r1.ebuild:
-  Fix svn path wrt bug 184948. Thanks to Rene Meier.
-
-  04 Jul 2007; Jeff Gardner <je_fro@g.o> ChangeLog:
-  Updating Manifest.
-
-  04 Jul 2007; Jeff Gardner <je_fro@g.o>
-  -files/pymol-0.99_rc6-data-path.patch, -pymol-0.99_rc6-r2.ebuild:
-  Removing unneeded files.
-
-  04 Jul 2007; Christoph Mende <angelos@g.o> pymol-0.99_rc10.ebuild:
-  Stable on amd64 wrt bug #183879
-
-  03 Jul 2007; Jeff Gardner <je_fro@g.o>
-  -files/pymol-0.99_rc8-data-path.patch:
-  Removed unneeded file.
-
-*pymol-1.0-r1 (03 Jul 2007)
-
-  03 Jul 2007; Jeff Gardner <je_fro@g.o>
-  +files/pymol-1.0-r1-data-path.patch, -files/header_order.patch,
-  -files/pymol-gentoo.diff, -files/setup.py-gentoo.patch,
-  -files/setup2.py-gentoo.patch, -pymol-0.98.ebuild, -pymol-0.99_rc8.ebuild,
-  pymol-0.99_rc10.ebuild, +pymol-1.0-r1.ebuild:
-  Adding 1.0 release, changed LICENCE to pymol for the last 2 releases, and
-  cleaned up old files.
-
-  02 Jul 2007; Christian Faulhammer <opfer@g.o>
-  pymol-0.99_rc10.ebuild:
-  stable x86, bug 183879
-
-  02 Jul 2007; Lars Weiler <pylon@g.o> pymol-0.99_rc10.ebuild:
-  Stable on ppc; bug #183879.
-
-  14 Jun 2007; Jeff Gardner <je_fro@g.o> pymol-0.99_rc10.ebuild:
-  Removing dev-python/numeric dependency wrt bug #181653.
-
-*pymol-0.99_rc10 (06 Jun 2007)
-
-  06 Jun 2007; Jeff Gardner <je_fro@g.o>
-  +files/pymol-0.99_rc10-data-path.patch, +pymol-0.99_rc10.ebuild:
-  Adding pymol-0.99_rc10 which now depends on virtual/glut instead of
-  media-libs/glut.
-
-  01 Jun 2007; nixnut <nixnut@g.o> pymol-0.99_rc6-r2.ebuild:
-  Stable on ppc wrt bug 176831
-
-  16 May 2007; Steve Dibb <beandog@g.o> pymol-0.99_rc6-r2.ebuild:
-  amd64 stable, bug 176831
-
-  07 May 2007; Raúl Porcel <armin76@g.o> pymol-0.99_rc6-r2.ebuild:
-  x86 stable wrt #176831
-
-  04 May 2007; Jeff Gardner <je_fro@g.o>
-  +files/pymol-0.99_rc8-data-path.patch:
-  Adding the forgotten pymol-0.99_rc8-data-path.patch.
-
-*pymol-0.99_rc8 (02 May 2007)
-
-  02 May 2007; Jeff Gardner <je_fro@g.o> +pymol-0.99_rc8.ebuild:
-  Version bump to pymol-0.99_rc8, big thanks to hodak at ncsu.
-
-  10 Feb 2007; Steve Dibb <beandog@g.o> pymol-0.98.ebuild:
-  amd64 stable, bug 165712
-
-  07 Jan 2007; Danny van Dyk <kugelfang@g.o> -pymol-0.97.ebuild,
-  -pymol-0.99_rc6.ebuild, -pymol-0.99_rc6-r1.ebuild:
-  QA: Removed unused versions.
-
-  22 Oct 2006; Olivier Fisette <ribosome@g.o> pymol-0.98.ebuild:
-  Backporting Tkinter fix to the stable branch.
-
-  22 Oct 2006; Olivier Fisette <ribosome@g.o>
-  pymol-0.99_rc6-r2.ebuild:
-  Added build-time Python Tkinter dependency check.
-
-  20 Sep 2006; Donnie Berkholz <dberkholz@g.o>; metadata.xml:
-  (#148281) Change herd to sci-chemistry from sci.
-
-  19 Sep 2006; Donnie Berkholz <dberkholz@g.o>; pymol-0.98.ebuild,
-  pymol-0.99_rc6.ebuild, pymol-0.99_rc6-r1.ebuild, pymol-0.99_rc6-r2.ebuild:
-  Switch dep back to media-libs/glut from virtual/glut, pymol works really
-  poorly with freeglut. You get messages about being unable to acquire a
-  direct rendering context (i.e., no accelerated 3D).
-
-*pymol-0.99_rc6-r2 (26 May 2006)
-
-  26 May 2006; Olivier Fisette <ribosome@g.o>
-  +pymol-0.99_rc6-r2.ebuild:
-  Moved path variable declarations from the wrapper to an env.d file
-  (necessary for Python scripting).
-
-*pymol-0.99_rc6-r1 (16 Mar 2006)
-
-  16 Mar 2006; Olivier Fisette <ribosome@g.o>
-  +files/pymol-0.99_rc6-data-path.patch, pymol-0.99_rc6.ebuild,
-  +pymol-0.99_rc6-r1.ebuild:
-  Put the 0.99 series back in the testing branch. This has not been tested for
-  30 days, and is buggy. (It was commited straight to stable.) Fixed
-  references to shared data in the mutagenesis wizard and other modules
-  (0.99_rc6-r1) (thanks to Pierres-Yves Savard <pys@×××××××××××.ca> for
-  reporting).
-
-*pymol-0.99_rc6 (07 Mar 2006)
-
-  07 Mar 2006; Donnie Berkholz <spyderous@g.o>;
-  +pymol-0.99_rc6.ebuild, -pymol-0.99.ebuild:
-  (#124994) Upstream doesn't understand how to tell people when an actual
-  version is released, instead they silently push out a series of release
-  candidates and call them all 0.99.
-
-*pymol-0.99 (03 Mar 2006)
-
-  03 Mar 2006; Donnie Berkholz <spyderous@g.o>; +pymol-0.99.ebuild:
-  (#124611) New version. Based on ebuild from hodak@×××××××××××××××××.edu,
-  with changes to locations as suggested by upstream.
-
-  19 Dec 2005; Donnie Berkholz <spyderous@g.o>; pymol-0.98.ebuild:
-  virtual/glut, not media-libs/glut.
-
-  13 Aug 2005; Michael Hanselmann <hansmi@g.o> pymol-0.98.ebuild:
-  Stable on ppc.
-
-  25 Jun 2005; Olivier Fisette <ribosome@g.o> -pymol-0.88.ebuild,
-  pymol-0.98.ebuild:
-  Added to x86. Removed obsolete version.
-
-  17 Jun 2005; Michael Hanselmann <hansmi@g.o> pymol-0.97.ebuild:
-  Stable on ppc.
-
-*pymol-0.98 (18 May 2005)
-
-  18 May 2005; Olivier Fisette <ribosome@g.o> -pymol-0.90.ebuild,
-  -pymol-0.95.ebuild, +pymol-0.98.ebuild:
-  New version: 0.98. Removed obsolete versions.
-
-  13 May 2005; Olivier Fisette <ribosome@g.o> pymol-0.97.ebuild:
-  Fixed multilib issue (bug #92103).
-
-  04 May 2005; David Holm <dholm@g.o> pymol-0.97.ebuild:
-  Readded to ~ppc. Please don't remove it without filing a proper bug report.
-
-  06 Feb 2005; Simon Stelling <blubb@g.o> pymol-0.97.ebuild:
-  added ~amd64
-
-*pymol-0.97 (24 Dec 2004)
-
-  24 Dec 2004; Olivier Fisette <ribosome@g.o> +metadata.xml,
-  +files/header_order.patch, +files/nosplash-gentoo.patch,
-  +files/pymol-gentoo.diff, +files/setup.py-gentoo.patch,
-  +files/setup2.py-gentoo.patch, +pymol-0.88.ebuild, +pymol-0.90.ebuild,
-  +pymol-0.95.ebuild, +pymol-0.97.ebuild:
-  Moved from app-sci/pymol to sci-chemistry/pymol.
-
-  31 Oct 2004; Olivier Fisette <ribosome@g.o> pymol-0.97.ebuild:
-  Added to x86.
-
-*pymol-0.97 (26 Jul 2004)
-
-  26 Jul 2004; Olivier Fisette <ribosome@g.o> pymol-0.97.ebuild:
-  Version bump suggested by Stéphane Gagné <sgagne@×××××××××××.ca> (bug #58097).
-  Removed header order patch since it is no longer needed.
-
-*pymol-0.95 (20 Apr 2004)
-
-  20 Apr 2004; Patrick Kursawe <phosphan@g.o> pymol-0.95.ebuild,
-  files/header_order.patch:
-  Version bump. Needed a little patch and a change to the setup2.py call (if it
-  does not find the modules, it will create no python.com)
-
-  19 Apr 2004; Patrick Kursawe <phosphan@g.o> pymol-0.82.ebuild,
-  pymol-0.86.ebuild, pymol-0.88.ebuild, pymol-0.90.ebuild:
-  Adding IUSE, cleanup
-
-  03 Mar 2004; Peter Bienstman <pbienst@g.o> pymol-0.90:
-  marked stable on x86
-
-  02 Sep 2003; Alastair Tse <liquidx@g.o> pymol-0.82.ebuild,
-  pymol-0.86.ebuild, pymol-0.88.ebuild, pymol-0.90.ebuild:
-  moved dev-python/Numeric to dev-python/numeric
-
-*pymol-0.90 (23 Jul 2003)
-
-  23 Jul 2003; George Shapovalov <george@g.o> pymol-0.90, files/setup.py-gentoo.patch :
-  new version + fix for setup.py, (#24967)
-  thanks to Ben Cornett <acornet@×××××.edu> for the update
-
-*pymol-0.88 (29 Jun 2003)
-
-  19 Jun 2003; George Shapovalov <george@g.o> pymol-0.88.ebuild, files/{digest-pymol-0.88,nosplash-gentoo.patch,setup2.py-gentoo.patch} :
-  new version (#22235)
-  now uses distutils for python
-  thanks to Todd Geders <geders@××××××.edu> for update notification 
-  and Ben Cornett <acornet@×××××.edu>  for "distutilized" ebuild submission
-
-*pymol-0.86 (05 Feb 2003)
-
-  05 Feb 2003; George Shapovalov <george@g.o> pymol-0.86.ebuild, files/digest-pymol-0.86 :
-  new version, (#13531)
-  removed -funroll-loops from CFLAGS
-
-*pymol-0.82 (17 Jul 2002)
-
-  19 Oct 2002; Daniel Ahlberg <aliz@g.o> pymol-0.82.ebuild :
-  Updated to mirror://sourceforge in SRC_URI.
-
-  17 Jul 2002; George Shapovalov <george@g.o> pymol-0.82.ebuild, files/digest-pymol-0.82, ChangeLog :
-
-  Inital release,
-  molecular visualization package
-  
-  ebuild submitted by Ben Cornett <acornet@×××××.edu>



1.2                  sci-chemistry/pymol/pymol-1.4.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/pymol/pymol-1.4.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/pymol/pymol-1.4.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/pymol/pymol-1.4.1.ebuild?r1=1.1&r2=1.2

Index: pymol-1.4.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.4.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pymol-1.4.1.ebuild	6 May 2011 07:59:31 -0000	1.1
+++ pymol-1.4.1.ebuild	2 Jun 2011 08:39:41 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.4.1.ebuild,v 1.1 2011/05/06 07:59:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.4.1.ebuild,v 1.2 2011/06/02 08:39:41 jlec Exp $
 
 EAPI="3"
 
@@ -19,7 +19,7 @@
 LICENSE="PSF-2.2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="apbs numpy vmd"
+IUSE="apbs numpy vmd web"
 
 DEPEND="
 	dev-python/numpy
@@ -35,7 +35,8 @@
 		sci-chemistry/apbs
 		sci-chemistry/pdb2pqr
 		sci-chemistry/pymol-apbs-plugin
-	)"
+	)
+	web? ( !dev-python/webpy )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
@@ -43,6 +44,8 @@
 		"${FILESDIR}"/${PV}-data-path.patch \
 		"${FILESDIR}"/${PV}-shaders.patch
 
+	use web || epatch "${FILESDIR}"/${PV}-web.patch
+
 	epatch "${FILESDIR}"/1.2.2-prefix.patch && \
 		eprefixify setup.py