Adding 1.0 release, changed LICENCE to pymol for the last 2 releases, and cleaned up old files and patches.

Package-Manager: portage-2.1.2.9

12 files changed, 107 insertions, 227 deletions

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index ce824982519d..ddbc44677eee 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-chemistry/pymol
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.29 2007/07/02 19:05:52 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.30 2007/07/03 00:12:04 je_fro Exp $
+
+*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:
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index c3ee4bcd141e..436604a04f68 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -1,10 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX header_order.patch 905 RMD160 0a4e2b2f95e2ace2ad21d27740bef5308a4990d5 SHA1 e64d7041acf83bd6c0673e334b52b7d4c24bdc45 SHA256 1f181350c2d99e31c59baea2f31b5ce27b16bae61ce6c9438d2f0e1e903b4cce
-MD5 1a6ba582a7928c370c8dfe44c8867e7c files/header_order.patch 905
-RMD160 0a4e2b2f95e2ace2ad21d27740bef5308a4990d5 files/header_order.patch 905
-SHA256 1f181350c2d99e31c59baea2f31b5ce27b16bae61ce6c9438d2f0e1e903b4cce files/header_order.patch 905
 AUX nosplash-gentoo.patch 332 RMD160 2280fbe9daba8a0d3ca81a3aacfcc55bd06fc7d3 SHA1 275a325f7a9bb076bea72897fd6dd5ed1b014390 SHA256 5e0761591eeea90bcaa06a72c210a80ba46f2542ff985f8dd893af112254a890
 MD5 929741dc2da6577e6e99c5542d68dbd5 files/nosplash-gentoo.patch 332
 RMD160 2280fbe9daba8a0d3ca81a3aacfcc55bd06fc7d3 files/nosplash-gentoo.patch 332
@@ -21,60 +14,37 @@ AUX pymol-0.99_rc8-data-path.patch 2969 RMD160 608e0e936fccf0860f6b5269e6739c839
 MD5 ef6d1169828c5bfdab08ddd59bb6dcf6 files/pymol-0.99_rc8-data-path.patch 2969
 RMD160 608e0e936fccf0860f6b5269e6739c839fcd32ea files/pymol-0.99_rc8-data-path.patch 2969
 SHA256 10c97c3d4d2f620a2884a812a6997f2cf8472f2e0c589c2630a4d0bcf67656de files/pymol-0.99_rc8-data-path.patch 2969
-AUX pymol-gentoo.diff 1566 RMD160 6a566cd0105ba94f9b06be8219c5fbe644281ab9 SHA1 8ba5a779fc06158933115fa7cd0048fbad01507f SHA256 15bdd116551022045c57743f21337c14ca368211a68a2a9763a1a7950f9af9d3
-MD5 34d172ef31b5038e071b634d4e645cf1 files/pymol-gentoo.diff 1566
-RMD160 6a566cd0105ba94f9b06be8219c5fbe644281ab9 files/pymol-gentoo.diff 1566
-SHA256 15bdd116551022045c57743f21337c14ca368211a68a2a9763a1a7950f9af9d3 files/pymol-gentoo.diff 1566
-AUX setup.py-gentoo.patch 311 RMD160 483f63778aa928bf2ce4de99edbc45af98abab8c SHA1 ccb93c7f5c0364ed73fc82b4f0b05508d2bdc519 SHA256 b9131c5852b58db4da37b535a5cf12279e5b436a352ed5ac9680a6fb12b7e911
-MD5 e42746bf581479c61ff1e7cc5b978edd files/setup.py-gentoo.patch 311
-RMD160 483f63778aa928bf2ce4de99edbc45af98abab8c files/setup.py-gentoo.patch 311
-SHA256 b9131c5852b58db4da37b535a5cf12279e5b436a352ed5ac9680a6fb12b7e911 files/setup.py-gentoo.patch 311
-AUX setup2.py-gentoo.patch 493 RMD160 2d6bbabc01f6e4eb8ddafb9b0215ece50a639923 SHA1 f676594a701f3968da190e48cbd531311e0ac0ec SHA256 dc721d4d3fd557c684ddb1ec43e07e05c38f13750393cd1665148e18c5e6a959
-MD5 af2da92225ab57969d18d16ed60324ce files/setup2.py-gentoo.patch 493
-RMD160 2d6bbabc01f6e4eb8ddafb9b0215ece50a639923 files/setup2.py-gentoo.patch 493
-SHA256 dc721d4d3fd557c684ddb1ec43e07e05c38f13750393cd1665148e18c5e6a959 files/setup2.py-gentoo.patch 493
-DIST pymol-0_98-src.tgz 3033733 RMD160 0aa31ffc1fb85e1c03320fb806a76b315a847bbd SHA1 7140eb0478d41705ee2affb6527f7cacd0ff9ace SHA256 20e060d6152f111d8992af2bf5bc07ea3b6ba664019b2dc12e24ee4cba7e6960
+AUX pymol-1.0-r1-data-path.patch 3521 RMD160 bbd8722a1f52944f122caa64642db5dc2609a208 SHA1 735871b06d8f874334ef51fe9054ae92a7fbe523 SHA256 ba0c036b1f01338b42f9e31a0252be59292726289e330f4c33cf52ee48ea9172
+MD5 a4374b31425bacedced00a40affff235 files/pymol-1.0-r1-data-path.patch 3521
+RMD160 bbd8722a1f52944f122caa64642db5dc2609a208 files/pymol-1.0-r1-data-path.patch 3521
+SHA256 ba0c036b1f01338b42f9e31a0252be59292726289e330f4c33cf52ee48ea9172 files/pymol-1.0-r1-data-path.patch 3521
 DIST pymol-0_99rc6-src.tgz 4198816 RMD160 e9dc568dd38fffd37f306adf7e7a109d81dd4477 SHA1 dec1dabdf8cd57b1328b24b985b52c88b484ee4b SHA256 d56bebc1316fd3442c54dee5bc4b2979041943bf50a9b34b44839595fd1b9a59
-EBUILD pymol-0.98.ebuild 1174 RMD160 f88513abbcd1b960185a4509b98d0a71221804ae SHA1 88940bbb2b7d3c1b8a741663681540a3e94cfe6e SHA256 5818246a9e4412ebaa3ddda88652ce062594bf4df40556d357d395831d7f550a
-MD5 ec0393b6d2c86e79fc592c2e1db78249 pymol-0.98.ebuild 1174
-RMD160 f88513abbcd1b960185a4509b98d0a71221804ae pymol-0.98.ebuild 1174
-SHA256 5818246a9e4412ebaa3ddda88652ce062594bf4df40556d357d395831d7f550a pymol-0.98.ebuild 1174
-EBUILD pymol-0.99_rc10.ebuild 2133 RMD160 fa7b802a9361b72418ed6d1ad1a50b53e4fe2f13 SHA1 38ea50dedca2a52bab76062ffb6a2e79256334fc SHA256 b1e7a27c49c8f986ef112b81f8b2cde3b7c1e31a3464e1336e2fe9b382ec76cf
-MD5 a0ac3fb96496872c629090c7513d1ac7 pymol-0.99_rc10.ebuild 2133
-RMD160 fa7b802a9361b72418ed6d1ad1a50b53e4fe2f13 pymol-0.99_rc10.ebuild 2133
-SHA256 b1e7a27c49c8f986ef112b81f8b2cde3b7c1e31a3464e1336e2fe9b382ec76cf pymol-0.99_rc10.ebuild 2133
+EBUILD pymol-0.99_rc10.ebuild 2132 RMD160 dcab3106e6b2b25973c1d4f2efa82829a50a8bae SHA1 7658cbed57b8f21fdd6f482c37d0ba14c75d7c7a SHA256 08175fa75bd9e71879cc43dbd19205e42a4c7cea4cf557f46809d2f9a07c9355
+MD5 2d07bd64c654224dcbf5d0627642b577 pymol-0.99_rc10.ebuild 2132
+RMD160 dcab3106e6b2b25973c1d4f2efa82829a50a8bae pymol-0.99_rc10.ebuild 2132
+SHA256 08175fa75bd9e71879cc43dbd19205e42a4c7cea4cf557f46809d2f9a07c9355 pymol-0.99_rc10.ebuild 2132
 EBUILD pymol-0.99_rc6-r2.ebuild 2249 RMD160 e9880c17c713ea7a662d66f413826867e0488a9d SHA1 1f8b294c2207233f3f8cbb02e64589e16e77fd97 SHA256 f1e5aad775ff6eda2898fdf0fce73f0ce42a7bb4259696a2a3468f4b94e49a15
 MD5 d6952c3d9892e84d4a115697e97cac7f pymol-0.99_rc6-r2.ebuild 2249
 RMD160 e9880c17c713ea7a662d66f413826867e0488a9d pymol-0.99_rc6-r2.ebuild 2249
 SHA256 f1e5aad775ff6eda2898fdf0fce73f0ce42a7bb4259696a2a3468f4b94e49a15 pymol-0.99_rc6-r2.ebuild 2249
-EBUILD pymol-0.99_rc8.ebuild 2157 RMD160 d8cccc8cb2751c1e79293d5d42a2b4140eab90cc SHA1 43d5a67503444047ef6c5e97c4635f3620310a64 SHA256 cdfca51040a46b536bc9b46f6f859ff243e2cfaff7929e14c50d4e19c0163df9
-MD5 332bf0260ab7e634ab206f39d7009cdb pymol-0.99_rc8.ebuild 2157
-RMD160 d8cccc8cb2751c1e79293d5d42a2b4140eab90cc pymol-0.99_rc8.ebuild 2157
-SHA256 cdfca51040a46b536bc9b46f6f859ff243e2cfaff7929e14c50d4e19c0163df9 pymol-0.99_rc8.ebuild 2157
-MISC ChangeLog 7145 RMD160 acacadc35ee39c32c6ebf01936e78c1c191e40c8 SHA1 1c37f120814b618a52eaede33e0b4857f231810c SHA256 2ca8dad6f88328ae507ce7679f9865b8265130bc941cb9ce46694a3aefa01646
-MD5 9bc46d19ff7cf4437f52f2d863ba721c ChangeLog 7145
-RMD160 acacadc35ee39c32c6ebf01936e78c1c191e40c8 ChangeLog 7145
-SHA256 2ca8dad6f88328ae507ce7679f9865b8265130bc941cb9ce46694a3aefa01646 ChangeLog 7145
+EBUILD pymol-1.0-r1.ebuild 2117 RMD160 2dcfeb2e4c2f2b3c305659407139f9b2027922c9 SHA1 a8aab337f1245eb2174400f3f03cdd3df20a6225 SHA256 6955b2f830acd8047b78fea795466bdcff95264869a717ee3353284946ffb441
+MD5 c1b7327301e444a95d336e727ddce5ea pymol-1.0-r1.ebuild 2117
+RMD160 2dcfeb2e4c2f2b3c305659407139f9b2027922c9 pymol-1.0-r1.ebuild 2117
+SHA256 6955b2f830acd8047b78fea795466bdcff95264869a717ee3353284946ffb441 pymol-1.0-r1.ebuild 2117
+MISC ChangeLog 7573 RMD160 d399be8065c353c4abb11f9b09be509965ec4ec3 SHA1 0841da73802c78664eaf9bfcf1272d175ed591b1 SHA256 1dd2e02ca8e7992871745ed0916122f234acfd9c9d9b6627002bf3811ff2d6b7
+MD5 c4edf4c662d8b58b066947bf443d93cb ChangeLog 7573
+RMD160 d399be8065c353c4abb11f9b09be509965ec4ec3 ChangeLog 7573
+SHA256 1dd2e02ca8e7992871745ed0916122f234acfd9c9d9b6627002bf3811ff2d6b7 ChangeLog 7573
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 MD5 43628e9f5743b5c3b018a82669a76bc7 metadata.xml 166
 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 metadata.xml 166
 SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852 metadata.xml 166
-MD5 204b478a3550545a53feaf38156dc322 files/digest-pymol-0.98 238
-RMD160 558bae7078997372581f7046465a3ddc7b2d114b files/digest-pymol-0.98 238
-SHA256 f6ee1c2e2a10e9b2d317a9fd3272616e39a00b51fa6af041c762eb130195ca92 files/digest-pymol-0.98 238
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-pymol-0.99_rc10 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-pymol-0.99_rc10 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-pymol-0.99_rc10 0
 MD5 925dc45d0ae6070f5506dffc1d100975 files/digest-pymol-0.99_rc6-r2 247
 RMD160 505a34a7bebbbdd2c60913ea3ec7cd41164eeaff files/digest-pymol-0.99_rc6-r2 247
 SHA256 4644dbddb3d8af1a2956282b351c228ded4ebb2fe628a571e0e929922a1b485a files/digest-pymol-0.99_rc6-r2 247
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-pymol-0.99_rc8 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-pymol-0.99_rc8 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-pymol-0.99_rc8 0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFGiUyXNQqtfCuFneMRAs+1AJ0TdkXpcLQds9mRtFFGEHLhaaSv3gCggtLJ
-ddmQz6j94cRHxZMq79wWnQ4=
-=LCcZ
------END PGP SIGNATURE-----
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-pymol-1.0-r1 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-pymol-1.0-r1 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-pymol-1.0-r1 0
diff --git a/sci-chemistry/pymol/files/digest-pymol-0.98 b/sci-chemistry/pymol/files/digest-pymol-0.98
deleted file mode 100644
index 2f0f9a6dea46..000000000000
--- a/sci-chemistry/pymol/files/digest-pymol-0.98
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 096cc1d06fa36eb1c8ad30560d06b81e pymol-0_98-src.tgz 3033733
-RMD160 0aa31ffc1fb85e1c03320fb806a76b315a847bbd pymol-0_98-src.tgz 3033733
-SHA256 20e060d6152f111d8992af2bf5bc07ea3b6ba664019b2dc12e24ee4cba7e6960 pymol-0_98-src.tgz 3033733
diff --git a/sci-chemistry/pymol/files/digest-pymol-0.99_rc8 b/sci-chemistry/pymol/files/digest-pymol-1.0-r1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/sci-chemistry/pymol/files/digest-pymol-0.99_rc8
+++ b/sci-chemistry/pymol/files/digest-pymol-1.0-r1
diff --git a/sci-chemistry/pymol/files/header_order.patch b/sci-chemistry/pymol/files/header_order.patch
deleted file mode 100644
index e11f31b24029..000000000000
--- a/sci-chemistry/pymol/files/header_order.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- layer0/MyPNG.c	2004-01-30 00:40:33.000000000 +0100
-+++ layer0/MyPNG.c.new	2004-04-20 16:05:35.399498139 +0200
-@@ -14,17 +14,8 @@
- Z* -------------------------------------------------------------------
- */
- 
--#include"os_predef.h"
--#include"os_std.h"
--
--#include"Base.h"
--#include "MyPNG.h"
--#include"MemoryDebug.h"
--#include "Setting.h"
--
- #ifdef _HAVE_LIBPNG
--#include<png.h>
--
-+#include <png.h>
-  /* The png_jmpbuf() macro, used in error handling, became available in
-   * libpng version 1.0.6.  If you want to be able to run your code with older
-   * versions of libpng, you must define the macro yourself (but only if it
-@@ -37,6 +28,14 @@
- 
- #endif
- 
-+#include"os_predef.h"
-+#include"os_std.h"
-+
-+#include"Base.h"
-+#include "MyPNG.h"
-+#include"MemoryDebug.h"
-+#include "Setting.h"
-+
- int MyPNGWrite(char *file_name,unsigned char *p,unsigned int width,unsigned int height)
- {
- #ifdef _HAVE_LIBPNG
diff --git a/sci-chemistry/pymol/files/pymol-1.0-r1-data-path.patch b/sci-chemistry/pymol/files/pymol-1.0-r1-data-path.patch
new file mode 100644
index 000000000000..0b8e061eb4a0
--- /dev/null
+++ b/sci-chemistry/pymol/files/pymol-1.0-r1-data-path.patch
@@ -0,0 +1,67 @@
+diff -aurN pymol-1.0-orig/modules/pymol/commanding.py pymol-1.0/modules/pymol/commanding.py
+--- pymol-1.0-orig/modules/pymol/commanding.py	2007-07-01 17:12:26.000000000 -0500
++++ pymol-1.0/modules/pymol/commanding.py	2007-07-01 17:16:26.000000000 -0500
+@@ -198,11 +198,11 @@
+                 _self.unlock(0,_self)
+             r = DEFAULT_SUCCESS
+             if show_splash==1: # generic / open-source
+-                png_path = _self.exp_path("$PYMOL_PATH/data/pymol/splash.png")
++                png_path = _self.exp_path("$PYMOL_DATA/data/pymol/splash.png")
+             elif show_splash==2: # evaluation builds
+-                png_path = _self.exp_path("$PYMOL_PATH/data/pymol/epymol.png")
++                png_path = _self.exp_path("$PYMOL_DATA/data/pymol/epymol.png")
+             else: # incentive builds
+-                png_path = _self.exp_path("$PYMOL_PATH/data/pymol/ipymol.png")
++                png_path = _self.exp_path("$PYMOL_DATA/data/pymol/ipymol.png")
+             if os.path.exists(png_path):
+                 _self.do("_ cmd.load_png('%s',0,quiet=1)"%png_path)
+         else:
+diff -aurN pymol-1.0-orig/modules/pymol/fitting.py pymol-1.0/modules/pymol/fitting.py
+--- pymol-1.0-orig/modules/pymol/fitting.py	2007-07-01 17:12:26.000000000 -0500
++++ pymol-1.0/modules/pymol/fitting.py	2007-07-01 17:17:51.000000000 -0500
+@@ -68,7 +68,7 @@
+         if string.lower(matrix)=='none':
+             matrix=''
+         if len(matrix):
+-            mfile = cmd.exp_path("$PYMOL_PATH/data/pymol/matrices/"+matrix)
++            mfile = cmd.exp_path("$PYMOL_DATA/data/pymol/matrices/"+matrix)
+         else:
+             mfile = ''        
+         # delete existing alignment object (if asked to reset it)
+diff -aurN pymol-1.0-orig/modules/pymol/importing.py pymol-1.0/modules/pymol/importing.py
+--- pymol-1.0-orig/modules/pymol/importing.py	2007-07-01 17:12:26.000000000 -0500
++++ pymol-1.0/modules/pymol/importing.py	2007-07-01 17:18:52.000000000 -0500
+@@ -170,7 +170,7 @@
+         r = DEFAULT_ERROR
+         
+         
+-        tables = { 'cmyk' : "$PYMOL_PATH/data/pymol/cmyk.png",
++        tables = { 'cmyk' : "$PYMOL_DATA/data/pymol/cmyk.png",
+                       'pymol' : 'pymol',
+                       'rgb' : 'rgb' }
+ 
+diff -aurN pymol-1.0-orig/modules/pymol/wizard/mutagenesis.py pymol-1.0/modules/pymol/wizard/mutagenesis.py
+--- pymol-1.0-orig/modules/pymol/wizard/mutagenesis.py	2007-07-01 17:12:26.000000000 -0500
++++ pymol-1.0/modules/pymol/wizard/mutagenesis.py	2007-07-01 17:20:44.000000000 -0500
+@@ -53,8 +53,8 @@
+ 
+         self.dep = default_dep
+ 
+-        self.ind_library = io.pkl.fromFile(os.environ['PYMOL_PATH']+
+-                                           "/data/chempy/sidechains/sc_bb_ind.pkl")
++        self.ind_library = io.pkl.fromFile(os.environ['PYMOL_DATA']+
++                                           "/chempy/sidechains/sc_bb_ind.pkl")
+         self.load_library()
+         self.status = 0 # 0 no selection, 1 mutagenizing
+         self.bump_check = 1
+@@ -217,8 +217,8 @@
+     def load_library(self):
+         if self.dep == 'dep':
+             if not hasattr(self,'dep_library'):
+-                self.dep_library = io.pkl.fromFile(os.environ['PYMOL_PATH']+
+-                                           "/data/chempy/sidechains/sc_bb_dep.pkl")
++                self.dep_library = io.pkl.fromFile(os.environ['PYMOL_DATA']+
++                                           "/chempy/sidechains/sc_bb_dep.pkl")
+             
+     def set_mode(self,mode):
+         cmd=self.cmd
diff --git a/sci-chemistry/pymol/files/pymol-gentoo.diff b/sci-chemistry/pymol/files/pymol-gentoo.diff
deleted file mode 100644
index 8b4b2baabd4b..000000000000
--- a/sci-chemistry/pymol/files/pymol-gentoo.diff
+++ /dev/null
@@ -1,53 +0,0 @@
---- Rules.linux	Sun Mar 31 03:06:22 2002
-+++ Rules.make	Tue May 21 15:42:31 2002
-@@ -12,14 +12,13 @@
- XLIB_DIR = -L/usr/X11R6/lib
- XINC_DIR = -I/usr/X11R6/include
- #--- Python
--PYTHON_EXE = $(PYMOL_PATH)/ext/bin/python
-+PYTHON_EXE = /usr/bin/python
- PYTHON_LIB =
- PYTHON_LIB_DIR = 
--PYTHON_INC_DIR = -I$(PYMOL_PATH)/ext/include/python2.1 \
--	-I$(PYMOL_PATH)/ext/include/python2.1/Numeric
-+PYTHON_INC_DIR = -I/usr/include/python2.2  -I/usr/include/python2.2/Numeric
- #--- Other external dependencies
--EXT_INC_DIR = -I$(PYMOL_PATH)/ext/include
--EXT_LIB_DIR = -L$(PYMOL_PATH)/ext/lib
-+EXT_INC_DIR = 
-+EXT_LIB_DIR = 
- #---------------------------------------------------------------------
- #
- #- Build for LINUX as an importable module ---------------------------
-@@ -48,7 +47,7 @@
- #
- #- Choose One --------------------------------------------------------
- #--- Workaround for XFree86/DRI linux dll problem for module build
--BUGS = -D_DRI_WORKAROUND
-+DEFS += -D_DRI_WORKAROUND
- #---
- #BUGS =
- #---------------------------------------------------------------------
-@@ -58,7 +57,7 @@
- #PNG = -D_HAVE_LIBPNG 
- #ZLIB = 
- #--- Libpng2 available but needs zlib 
--PNG = -D_HAVE_LIBPNG 
-+DEFS += -D_HAVE_LIBPNG 
- ZLIB = -lz
- #--- Libpng2 not available
- #PNG = 
-@@ -77,12 +76,7 @@
- PYMOL_INC_DIRS = -I../layer0 -I../layer1 -I../layer2 \
-    -I../layer3 -I../layer4 -I../layer5 
- 
--C_FLAGS = $(CCOPT1) $(CCOPT2) $(EXT_INC_DIR) $(PYTHON_INC_DIR) \
--   $(XINC_DIR) $(PNG) $(DEFS) $(BUGS)
--
--CFLAGS = $(C_FLAGS)
--
--
-+C_FLAGS := $(CFLAGS) $(PYTHON_INC_DIR) $(XINC_DIR) $(DEFS)
- 
- 
- 
diff --git a/sci-chemistry/pymol/files/setup.py-gentoo.patch b/sci-chemistry/pymol/files/setup.py-gentoo.patch
deleted file mode 100644
index d67559643594..000000000000
--- a/sci-chemistry/pymol/files/setup.py-gentoo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- pymol-0.90/setup.py 2003-04-26 21:22:14.000000000 -0400
-+++ pymol-0.90.new/setup.py     2003-07-21 09:39:51.000000000 -0400
-@@ -71,6 +71,7 @@
-    "layer0/Map.c",
-    "layer0/Match.c",
-    "layer0/Matrix.c",
-+   "layer0/MemoryCache.c",
-    "layer0/MemoryDebug.c",
-    "layer0/MyPNG.c",
-    "layer0/Parse.c",
diff --git a/sci-chemistry/pymol/files/setup2.py-gentoo.patch b/sci-chemistry/pymol/files/setup2.py-gentoo.patch
deleted file mode 100644
index 1d387eaa0f4c..000000000000
--- a/sci-chemistry/pymol/files/setup2.py-gentoo.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- setup2.py.orig	2003-06-10 19:12:35.000000000 -0400
-+++ setup2.py	2003-06-10 19:11:46.000000000 -0400
-@@ -12,6 +12,14 @@
- import sys
- from distutils import dir_util,file_util
- 
-+import os.path
-+pmlibs = os.path.join(os.environ['D'],
-+                      sys.prefix[1:],
-+                      'lib/python%s' % sys.version[:3],
-+                      'site-packages')
-+sys.path.insert(0, pmlibs)
-+
-+
- if sys.platform=='win32':
-    launch_script = "pymol.bat"
- elif sys.platform=='cygwin':
diff --git a/sci-chemistry/pymol/pymol-0.98.ebuild b/sci-chemistry/pymol/pymol-0.98.ebuild
deleted file mode 100644
index 7525a0baacee..000000000000
--- a/sci-chemistry/pymol/pymol-0.98.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-0.98.ebuild,v 1.7 2007/02/10 03:29:43 beandog Exp $
-
-inherit distutils eutils multilib
-
-DESCRIPTION="A Python-extensible molecular graphics system."
-HOMEPAGE="http://pymol.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pymol/${PN}-${PV/./_}-src.tgz"
-
-LICENSE="PSF-2.2"
-IUSE=""
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="dev-lang/python
-	dev-python/pmw
-	dev-python/numeric
-	dev-lang/tk
-	media-libs/libpng
-	sys-libs/zlib
-	media-libs/glut"
-
-pkg_setup() {
-	distutils_python_tkinter
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# Turn off splash screen.  Please do make a project contribution
-	# if you are able though.
-	[[ -n "$WANT_NOSPLASH" ]] && epatch ${FILESDIR}/nosplash-gentoo.patch
-}
-
-src_install() {
-	distutils_src_install
-	cd ${S}
-	PYTHONPATH=$(find ${D}/usr/$(get_libdir) -type d -name site-packages) ${python} setup2.py
-
-	local sedexp="s:${D%/}::g"
-	sed -e ${sedexp} pymol.com > pymol
-	exeinto /usr/bin
-	doexe pymol
-	dodoc DEVELOPERS CHANGES
-	#install examples
-	mv examples ${D}/usr/share/doc/${PF}
-}
diff --git a/sci-chemistry/pymol/pymol-0.99_rc10.ebuild b/sci-chemistry/pymol/pymol-0.99_rc10.ebuild
index f5526e4a0706..487a2fea2dfa 100644
--- a/sci-chemistry/pymol/pymol-0.99_rc10.ebuild
+++ b/sci-chemistry/pymol/pymol-0.99_rc10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-0.99_rc10.ebuild,v 1.4 2007/07/02 19:05:52 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-0.99_rc10.ebuild,v 1.5 2007/07/03 00:12:04 je_fro Exp $
 
 inherit distutils eutils multilib subversion
 
@@ -10,7 +10,7 @@ ESVN_UPDATE_CMD="svn -r 2974 update"
 DESCRIPTION="A Python-extensible molecular graphics system."
 HOMEPAGE="http://pymol.sourceforge.net/"
 
-LICENSE="PSF-2.2"
+LICENSE="pymol"
 IUSE=""
 SLOT="0"
 KEYWORDS="~amd64 ppc x86"
diff --git a/sci-chemistry/pymol/pymol-0.99_rc8.ebuild b/sci-chemistry/pymol/pymol-1.0-r1.ebuild
index cc6a7fcf6b10..97ea99a2ac28 100644
--- a/sci-chemistry/pymol/pymol-0.99_rc8.ebuild
+++ b/sci-chemistry/pymol/pymol-1.0-r1.ebuild
@@ -1,32 +1,32 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-0.99_rc8.ebuild,v 1.1 2007/05/02 16:52:04 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.0-r1.ebuild,v 1.1 2007/07/03 00:12:04 je_fro Exp $
 
 inherit distutils eutils multilib subversion
 
-ESVN_REPO_URI="https://svn.sourceforge.net/svnroot/pymol/branches/b099/pymol"
-ESVN_UPDATE_CMD="svn -r 2805 update"
+ESVN_REPO_URI="https://svn.sourceforge.net/svnroot/pymol/trunk/pymol"
+ESVN_UPDATE_CMD="svn -r 3010 update"
 
 DESCRIPTION="A Python-extensible molecular graphics system."
 HOMEPAGE="http://pymol.sourceforge.net/"
 
-LICENSE="PSF-2.2"
+LICENSE="pymol"
+
 IUSE=""
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
 DEPEND="dev-lang/python
 dev-python/pmw
-dev-python/numeric
 dev-lang/tk
 media-libs/libpng
 sys-libs/zlib
-media-libs/glut"
+virtual/glut"
 
 src_unpack() {
 	subversion_src_unpack
 
-	epatch "${FILESDIR}"/${P}-data-path.patch
+	epatch "${FILESDIR}"/${PF}-data-path.patch
 
 # Turn off splash screen.  Please do make a project contribution
 # if you are able.
@@ -66,7 +66,7 @@ EOF
 
 		exeinto /usr/bin
 		doexe "${T}"/pymol || die "Failed to install wrapper."
-		dodoc DEVELOPERS CHANGES || die "Failed to install docs."
+		dodoc DEVELOPERS || die "Failed to install docs."
 
 		mv examples "${D}"/usr/share/doc/${PF}/ || die "Failed moving docs."