Fix collision with dev-python/webpy, #368947

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

5 files changed, 37 insertions, 437 deletions

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index e1c81953d04a..adab98470532 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -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@gentoo.org>
-  pymol-1.3.1_pre3925-r1.ebuild:
-  x86 stable wrt bug #366229
+  02 Jun 2011; Justin Lecher <jlec@gentoo.org> +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@gentoo.org>
-  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@gentoo.org> +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@gentoo.org> pymol-1.4_beta1.ebuild:
-  Cleaned unneeded SRC_URI entries
-
-*pymol-1.4_beta1 (04 Apr 2011)
-
-  04 Apr 2011; Justin Lecher <jlec@gentoo.org> +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@gentoo.org> -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@gentoo.org> +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@gentoo.org> -pymol-1.3.1_pre3923.ebuild,
-  +pymol-1.3.1_pre3924.ebuild:
-  Version Bump
-
-  15 Oct 2010; Justin Lecher <jlec@gentoo.org> 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@gentoo.org> +pymol-1.3.1_pre3923.ebuild:
-  Version Bump to pre release
-
-  19 Sep 2010; Justin Lecher <jlec@gentoo.org> pymol-1.2.3-r1.ebuild,
-  pymol-1.3.0.ebuild:
-  rekeyworded for ~ppc, fixes #309007
-
-  19 Sep 2010; Justin Lecher <jlec@gentoo.org> -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@gentoo.org>
-  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@gentoo.org> -pymol-1.2.1.ebuild:
-  Removed unneeded version
-
-  24 Jun 2010; Christoph Mende <angelos@gentoo.org> pymol-1.2.3-r1.ebuild:
-  Stable on amd64 wrt bug #309007
-
-  15 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-  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@gentoo.org> +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@gentoo.org> -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@gentoo.org> pymol-1.2.2-r4.ebuild,
-  pymol-1.2.3-r1.ebuild:
-  RESTRICT PY ABI 2.5
-
-  23 Mar 2010; Christian Faulhammer <fauli@gentoo.org>
-  pymol-1.2.3-r1.ebuild:
-  stable x86, bug 309007
-
-  11 Mar 2010; Joseph Jezak <josejx@gentoo.org> 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@gentoo.org>
-  -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@gentoo.org> +pymol-1.2.3.ebuild:
-  Version Bump
-
-*pymol-1.2.2-r4 (19 Feb 2010)
-
-  19 Feb 2010; Justin Lecher <jlec@gentoo.org>
-  -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@gentoo.org>
-  +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@gentoo.org>
-  +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@gentoo.org> 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@gentoo.org>
-  +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@gentoo.org> 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@gentoo.org>
-  -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@gentoo.org> 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@gentoo.org> 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@gentoo.org> 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@gentoo.org> -pymol-1.1-r2.ebuild:
-  Remove old version with built_with_use. Fixes bug #285463.
-
-  09 Sep 2009; Markus Meier <maekke@gentoo.org> pymol-1.2.1.ebuild:
-  amd64/x86 stable, bug #283639
-
-  02 Aug 2009; Jeff Gardner <je_fro@gentoo.org>
-  +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@gentoo.org> +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@gentoo.org> pymol-1.1-r2.ebuild:
-  amd64/x86 stable, bug #250903
-
-  16 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org>
-  pymol-0.99_rc10.ebuild, pymol-1.1-r2.ebuild:
-  Proxying for jlec: removing numeric dependencies
-
-  19 Dec 2008; Jeff Gardner <je_fro@gentoo.org> ChangeLog:
-  Rename patches
-
-*pymol-1.1-r2 (19 Dec 2008)
-
-  19 Dec 2008; Jeff Gardner <je_fro@gentoo.org> -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@gentoo.org>
-  files/1.1/apbs-070604.patch.bz2:
-  Fix patch
-
-*pymol-1.1-r1 (13 Aug 2008)
-
-  13 Aug 2008; Jeff Gardner <je_fro@gentoo.org>
-  +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@gentoo.org> pymol-0.99_rc10.ebuild:
-  Fix ESVN_REPO_URI wrt bug #187462. Thanks to Michael Mysinger.
-
-  11 Jul 2007; Jeff Gardner <je_fro@gentoo.org> pymol-1.0-r1.ebuild:
-  Fix svn path wrt bug 184948. Thanks to Rene Meier.
-
-  04 Jul 2007; Jeff Gardner <je_fro@gentoo.org> ChangeLog:
-  Updating Manifest.
-
-  04 Jul 2007; Jeff Gardner <je_fro@gentoo.org>
-  -files/pymol-0.99_rc6-data-path.patch, -pymol-0.99_rc6-r2.ebuild:
-  Removing unneeded files.
-
-  04 Jul 2007; Christoph Mende <angelos@gentoo.org> pymol-0.99_rc10.ebuild:
-  Stable on amd64 wrt bug #183879
-
-  03 Jul 2007; Jeff Gardner <je_fro@gentoo.org>
-  -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@gentoo.org>
-  +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@gentoo.org>
-  pymol-0.99_rc10.ebuild:
-  stable x86, bug 183879
-
-  02 Jul 2007; Lars Weiler <pylon@gentoo.org> pymol-0.99_rc10.ebuild:
-  Stable on ppc; bug #183879.
-
-  14 Jun 2007; Jeff Gardner <je_fro@gentoo.org> 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@gentoo.org>
-  +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@gentoo.org> pymol-0.99_rc6-r2.ebuild:
-  Stable on ppc wrt bug 176831
-
-  16 May 2007; Steve Dibb <beandog@gentoo.org> pymol-0.99_rc6-r2.ebuild:
-  amd64 stable, bug 176831
-
-  07 May 2007; Raúl Porcel <armin76@gentoo.org> pymol-0.99_rc6-r2.ebuild:
-  x86 stable wrt #176831
-
-  04 May 2007; Jeff Gardner <je_fro@gentoo.org>
-  +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@gentoo.org> +pymol-0.99_rc8.ebuild:
-  Version bump to pymol-0.99_rc8, big thanks to hodak at ncsu.
-
-  10 Feb 2007; Steve Dibb <beandog@gentoo.org> pymol-0.98.ebuild:
-  amd64 stable, bug 165712
-
-  07 Jan 2007; Danny van Dyk <kugelfang@gentoo.org> -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@gentoo.org> pymol-0.98.ebuild:
-  Backporting Tkinter fix to the stable branch.
-
-  22 Oct 2006; Olivier Fisette <ribosome@gentoo.org>
-  pymol-0.99_rc6-r2.ebuild:
-  Added build-time Python Tkinter dependency check.
-
-  20 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; metadata.xml:
-  (#148281) Change herd to sci-chemistry from sci.
-
-  19 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; 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@gentoo.org>
-  +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@gentoo.org>
-  +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@rsvs.ulaval.ca> for
-  reporting).
-
-*pymol-0.99_rc6 (07 Mar 2006)
-
-  07 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>;
-  +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@gentoo.org>; +pymol-0.99.ebuild:
-  (#124611) New version. Based on ebuild from hodak@nemo.physics.ncsu.edu,
-  with changes to locations as suggested by upstream.
-
-  19 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; pymol-0.98.ebuild:
-  virtual/glut, not media-libs/glut.
-
-  13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> pymol-0.98.ebuild:
-  Stable on ppc.
-
-  25 Jun 2005; Olivier Fisette <ribosome@gentoo.org> -pymol-0.88.ebuild,
-  pymol-0.98.ebuild:
-  Added to x86. Removed obsolete version.
-
-  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> pymol-0.97.ebuild:
-  Stable on ppc.
-
-*pymol-0.98 (18 May 2005)
-
-  18 May 2005; Olivier Fisette <ribosome@gentoo.org> -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@gentoo.org> pymol-0.97.ebuild:
-  Fixed multilib issue (bug #92103).
-
-  04 May 2005; David Holm <dholm@gentoo.org> pymol-0.97.ebuild:
-  Readded to ~ppc. Please don't remove it without filing a proper bug report.
-
-  06 Feb 2005; Simon Stelling <blubb@gentoo.org> pymol-0.97.ebuild:
-  added ~amd64
-
-*pymol-0.97 (24 Dec 2004)
-
-  24 Dec 2004; Olivier Fisette <ribosome@gentoo.org> +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@gentoo.org> pymol-0.97.ebuild:
-  Added to x86.
-
-*pymol-0.97 (26 Jul 2004)
-
-  26 Jul 2004; Olivier Fisette <ribosome@gentoo.org> pymol-0.97.ebuild:
-  Version bump suggested by Stéphane Gagné <sgagne@rsvs.ulaval.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@gentoo.org> 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@gentoo.org> 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@gentoo.org> pymol-0.90:
-  marked stable on x86
-
-  02 Sep 2003; Alastair Tse <liquidx@gentoo.org> 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@gentoo.org> pymol-0.90, files/setup.py-gentoo.patch :
-  new version + fix for setup.py, (#24967)
-  thanks to Ben Cornett <acornet@emory.edu> for the update
-
-*pymol-0.88 (29 Jun 2003)
-
-  19 Jun 2003; George Shapovalov <george@gentoo.org> 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@purdue.edu> for update notification 
-  and Ben Cornett <acornet@emory.edu>  for "distutilized" ebuild submission
-
-*pymol-0.86 (05 Feb 2003)
-
-  05 Feb 2003; George Shapovalov <george@gentoo.org> 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@gentoo.org> pymol-0.82.ebuild :
-  Updated to mirror://sourceforge in SRC_URI.
-
-  17 Jul 2002; George Shapovalov <george@gentoo.org> pymol-0.82.ebuild, files/digest-pymol-0.82, ChangeLog :
-
-  Inital release,
-  molecular visualization package
-  
-  ebuild submitted by Ben Cornett <acornet@emory.edu>
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index 07ad323dafe8..aaed1a9ed2c0 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -11,6 +11,7 @@ AUX 1.4-shaders.patch 2851 RMD160 3e2f6e8a3c930d1e11e99760e619767ed4d71718 SHA1
 AUX 1.4-vmd.patch 1414 RMD160 c7de92c73a0f91e6f95a7208b912cb6105f6d972 SHA1 51515e11cbaed06407238c0e900091174db1ff26 SHA256 320436783d1cfa4f94bd4fe57af4bdf7d3d200c951938d127d77b75d77bef7f0
 AUX 1.4.1-data-path.patch 3898 RMD160 842548be0710bb4f80791fdb98654b36cb777e84 SHA1 f3dedae4a97ee4916ca7ce4733506d6b8221e79f SHA256 911f69cb428f91a284102580b73f771648f6a1a059a53c1bcc31c51ab492b010
 AUX 1.4.1-shaders.patch 2507 RMD160 2dea0805fcc8a993d7f5fa8668257be860c7d5e8 SHA1 4548f93fbe92a511dc0d2425c86402a776567cb4 SHA256 b0cbb5bc81bb8f85bef8cbb6cd76f91b02b076ef5798075e152626becf3b5ae5
+AUX 1.4.1-web.patch 550 RMD160 fc15b0e428b9376a9d7f2e87d06035555ceab2fe SHA1 06db70ef92ce981715cde9ac1578291b653341d9 SHA256 2545245c4c18c96faf76e0ba4a754402cb2081e56f945da1732b63fddda4fb2b
 AUX pymol-0.99_rc10-data-path.patch 2969 RMD160 608e0e936fccf0860f6b5269e6739c839fcd32ea SHA1 7a3585d14431b7840eff8f6ee0a5d8324049ff77 SHA256 10c97c3d4d2f620a2884a812a6997f2cf8472f2e0c589c2630a4d0bcf67656de
 AUX pymol-1.2.2-shaders.patch 441 RMD160 c0d9e177f701a015aec192b2bdf6b1df31e8de16 SHA1 5651438459920b74040330ec0b7d9ea14e63818c SHA256 c15e5c5d2a6b53b96c6a7fe0b717ac0f7d85c90aca3e5b02c8d8c34b9038cb68
 AUX pymol-1.2.2-vmd.patch 1250 RMD160 fa5064d842099cd43e951278220b80fba170c5ec SHA1 2381931650169a841cf41fd38a1b870c0a896745 SHA256 d3688f57f32912ace20a3344dc49530a48963454dcc5a9aafe45d4b6be269525
@@ -19,13 +20,13 @@ DIST pymol-1.3.1_pre3925-r1.tar.gz 8185909 RMD160 fcd6bdcedda369af7d51c41fc708c6
 DIST pymol-1.4.1.tar.xz 6831544 RMD160 6478b14215d0c502bff3bdec0cae3c903a9004e0 SHA1 d4da217ebf2c059f4712f564b55daa81a839b259 SHA256 af020e3103360defa3749ed31c16938a00032d4c2bf40f8455c746919aeaffd6
 EBUILD pymol-1.2.3-r1.ebuild 2640 RMD160 4bcb32f90a2bf09989eb26cac13ad3721ceb75ee SHA1 ea316d2d72403eb25a42fee514f9c071f6d56ded SHA256 b8f23630086279243568e51c847823f7067f7004db1bea7d06f9c9b1202e7147
 EBUILD pymol-1.3.1_pre3925-r1.ebuild 2669 RMD160 299d49ebe4982c9a49a86666050b66b8ecaae081 SHA1 a7b4c84ea4bc6fb62e2c553fda8f1c2c5ea3c97b SHA256 ea03bdb373644f5d1e5c07659699cd27127f1db7e7273afb1e803dee77f7b8b6
-EBUILD pymol-1.4.1.ebuild 2694 RMD160 97b604c297e2bca39c5a0d045c65f60bb3e1cfa9 SHA1 d9ff8675900ca3a0347e43c0c01ec956b9189ca9 SHA256 fdbec8147b9c2284f2ab1b75b67d2a4cbd293dc21ba477f2df0b10c672ecc799
-MISC ChangeLog 15656 RMD160 2119b093523e6a35110a25ba96ff902104a6bd7f SHA1 7c60202b31c5b446fb6e4c962342fa17414d933c SHA256 c5146ad770b0738063f3001701b7c92e2a98e08aa7a12e2b4849bca998865b4d
-MISC metadata.xml 494 RMD160 0aec5d84b0aaa7666af93962827613e9b4c7487b SHA1 84282f439939e0fbb2f7ec55c128a92442aa016e SHA256 22ac79b0f91926fe2e275ad46ec31994a0523fd196b3d82e8279d0f3d4250300
+EBUILD pymol-1.4.1.ebuild 2776 RMD160 971f76d309bb8f947b00f92ba356f1cb6675151b SHA1 238785f471947c606624eb12ed62e0e7bced1156 SHA256 a052173856bb283cefdb1bc11ab1cbc959ff59433de936271a35e86f139743d3
+MISC ChangeLog 365 RMD160 7e92122533ba27a74b2a6a5fb896942e6af9f46b SHA1 c8351ec6aeef475604719c615f2c707371f67af7 SHA256 07ff7156ca6f37fbc8a2fabceb20710ed64b8edfa32c5bde77478fe1678aa9ae
+MISC metadata.xml 564 RMD160 4fe4285d22edbd5b83021ff1f05d3a487fa8e6b2 SHA1 d3282e321144e2f741a91ac39fdbcfcff326a92d SHA256 ff58b5f1bc713939fec5fd635bc944ff310967c4e4ba40f83d458bbb2600c511
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3b/IQACgkQuUQtlDBCeQJqcgCffjHbGLbJkMaIV5ryAa1E2FAK
-wxEAnifaxNMAixqf0f/ZONSmIBtkad0v
-=u33n
+iEYEARECAAYFAk3nTFMACgkQgAnW8HDreRbfNACfdam4Wpy43+C72VatNJjGkxwG
+45cAnRRiPPDP66xxWpK4y3YDtldlLWo1
+=30Ik
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pymol/files/1.4.1-web.patch b/sci-chemistry/pymol/files/1.4.1-web.patch
new file mode 100644
index 000000000000..2d6957df594d
--- /dev/null
+++ b/sci-chemistry/pymol/files/1.4.1-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 = [
+     Extension("pymol._cmd", [
+     "modules/cealign/src/ccealignmodule.cpp",
diff --git a/sci-chemistry/pymol/metadata.xml b/sci-chemistry/pymol/metadata.xml
index 4a1b6bfe8bb6..bf11e08cfb39 100644
--- a/sci-chemistry/pymol/metadata.xml
+++ b/sci-chemistry/pymol/metadata.xml
@@ -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>
diff --git a/sci-chemistry/pymol/pymol-1.4.1.ebuild b/sci-chemistry/pymol/pymol-1.4.1.ebuild
index c2a37b37235d..e52f29d26142 100644
--- a/sci-chemistry/pymol/pymol-1.4.1.ebuild
+++ b/sci-chemistry/pymol/pymol-1.4.1.ebuild
@@ -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 @@ SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 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 @@ DEPEND="
 		sci-chemistry/apbs
 		sci-chemistry/pdb2pqr
 		sci-chemistry/pymol-apbs-plugin
-	)"
+	)
+	web? ( !dev-python/webpy )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
@@ -43,6 +44,8 @@ src_prepare() {
 		"${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