aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2011-06-02 10:44:51 +0200
committerJustin Lecher <jlec@gentoo.org>2011-06-02 10:44:51 +0200
commitb39098ce755dff73d9a6427441bc56aed6847e66 (patch)
tree21fa14b92a6c034b688ad8e83e5e9299e62235a7 /sci-chemistry/pymol/files
parentFixes for latest HEAD (diff)
downloadsci-b39098ce755dff73d9a6427441bc56aed6847e66.tar.gz
sci-b39098ce755dff73d9a6427441bc56aed6847e66.tar.bz2
sci-b39098ce755dff73d9a6427441bc56aed6847e66.zip
Fix collision with dev-python/webpy, #368947
(Portage version: 2.2.0_alpha37/git/Linux x86_64, signed Manifest commit with key 70EB7916)
Diffstat (limited to 'sci-chemistry/pymol/files')
-rw-r--r--sci-chemistry/pymol/files/9999-web.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/sci-chemistry/pymol/files/9999-web.patch b/sci-chemistry/pymol/files/9999-web.patch
new file mode 100644
index 000000000..2d6957df5
--- /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 = [
+ Extension("pymol._cmd", [
+ "modules/cealign/src/ccealignmodule.cpp",