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)

5 files changed, 94 insertions, 2 deletions

diff --git a/app-sci/pymol/ChangeLog b/app-sci/pymol/ChangeLog
index 9177bd8e9f2d..dade1fd68a07 100644
--- a/app-sci/pymol/ChangeLog
+++ b/app-sci/pymol/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-sci/pymol
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/pymol/ChangeLog,v 1.9 2004/04/19 12:16:46 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/pymol/ChangeLog,v 1.10 2004/04/20 14:23:36 phosphan Exp $
+
+*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:
diff --git a/app-sci/pymol/Manifest b/app-sci/pymol/Manifest
index efd9d5f21018..bb52ddbbc4eb 100644
--- a/app-sci/pymol/Manifest
+++ b/app-sci/pymol/Manifest
@@ -1,10 +1,13 @@
+MD5 5683a766199cb0e90aca5c703e83418c pymol-0.95.ebuild 1151
 MD5 49ddcc7fbe4dc1ce31e0e86a99983257 pymol-0.90.ebuild 1136
 MD5 5dd11276d53c84ff44f27d8f7a817bc8 pymol-0.88.ebuild 1036
-MD5 05def16d71cb5e172b605f5e681619a0 ChangeLog 1778
+MD5 7cc8d4c9c5ba4bae72a71b9d80e9be46 ChangeLog 2046
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 34d172ef31b5038e071b634d4e645cf1 files/pymol-gentoo.diff 1566
 MD5 bc61462df500f324f8ba07a1c1f7bdf4 files/digest-pymol-0.88 64
 MD5 6970b70ab3710cde34e422cba7cce5c2 files/digest-pymol-0.90 64
+MD5 b674c205dd6279884c91077eec6e5442 files/digest-pymol-0.95 64
+MD5 1a6ba582a7928c370c8dfe44c8867e7c files/header_order.patch 905
 MD5 929741dc2da6577e6e99c5542d68dbd5 files/nosplash-gentoo.patch 332
 MD5 e42746bf581479c61ff1e7cc5b978edd files/setup.py-gentoo.patch 311
 MD5 af2da92225ab57969d18d16ed60324ce files/setup2.py-gentoo.patch 493
diff --git a/app-sci/pymol/files/digest-pymol-0.95 b/app-sci/pymol/files/digest-pymol-0.95
new file mode 100644
index 000000000000..99112b99b7c5
--- /dev/null
+++ b/app-sci/pymol/files/digest-pymol-0.95
@@ -0,0 +1 @@
+MD5 ca5f7ee698bfec6218f45342bd925e56 pymol-0_95-src.tgz 2676518
diff --git a/app-sci/pymol/files/header_order.patch b/app-sci/pymol/files/header_order.patch
new file mode 100644
index 000000000000..e11f31b24029
--- /dev/null
+++ b/app-sci/pymol/files/header_order.patch
@@ -0,0 +1,36 @@
+--- 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/app-sci/pymol/pymol-0.95.ebuild b/app-sci/pymol/pymol-0.95.ebuild
new file mode 100644
index 000000000000..95b58e4b2d43
--- /dev/null
+++ b/app-sci/pymol/pymol-0.95.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-sci/pymol/pymol-0.95.ebuild,v 1.1 2004/04/20 14:23:36 phosphan Exp $
+
+inherit distutils eutils
+
+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="~x86 ~ppc"
+
+DEPEND="dev-lang/python
+	dev-python/pmw
+	dev-python/numeric
+	dev-lang/tk
+	media-libs/libpng
+	sys-libs/zlib
+	media-libs/glut"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/header_order.patch
+	# 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/lib -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}
+}