update to 1.4. Closes 1865

5 files changed, 104 insertions, 1 deletions

diff --git a/dev-python/pygame/ChangeLog b/dev-python/pygame/ChangeLog
index 4f758822b964..416638451624 100644
--- a/dev-python/pygame/ChangeLog
+++ b/dev-python/pygame/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/pygame
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/ChangeLog,v 1.1 2002/02/01 21:53:28 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/ChangeLog,v 1.2 2002/04/28 17:10:27 jnelson Exp $
+
+*pygame-1.4 (28 Apr 2002)
+
+  28 Apr 2002; Jon Nelson <jnelson@gentoo.org> ChangeLog pygame-1.4.ebuild
+  
+  New upstream
+  ebuild should build properly - next version won't need the patches,
+    CVS pygame already has them fixed.
+  Closes bug 1865  
 
 *pygame-1.2 (1 Feb 2002)
 
diff --git a/dev-python/pygame/files/digest-pygame-1.4 b/dev-python/pygame/files/digest-pygame-1.4
new file mode 100644
index 000000000000..a3874fe49f1d
--- /dev/null
+++ b/dev-python/pygame/files/digest-pygame-1.4
@@ -0,0 +1 @@
+MD5 f418f24ba425fc92306a4f8c6904b430 pygame-1.4.tar.gz 819801
diff --git a/dev-python/pygame/files/mixer.c-pause.patch b/dev-python/pygame/files/mixer.c-pause.patch
new file mode 100644
index 000000000000..193464f71750
--- /dev/null
+++ b/dev-python/pygame/files/mixer.c-pause.patch
@@ -0,0 +1,21 @@
+diff -ur pygame-1.4.orig/src/mixer.c pygame-1.4/src/mixer.c
+--- pygame-1.4.orig/src/mixer.c	2002-04-28 11:48:42.000000000 -0500
++++ pygame-1.4/src/mixer.c	2002-04-28 11:48:05.000000000 -0500
+@@ -926,7 +926,7 @@
+     /*DOC*/    "Temporarily stops playback on all the mixer channels.\n"
+     /*DOC*/ ;
+ 
+-static PyObject* pause(PyObject* self, PyObject* args)
++static PyObject* pause_(PyObject* self, PyObject* args)
+ {
+ 	if(!PyArg_ParseTuple(args, ""))
+ 		return NULL;
+@@ -1029,7 +1029,7 @@
+ 	{ "find_channel", find_channel, 1, doc_find_channel },
+ 	{ "fadeout", fadeout, 1, doc_fadeout },
+ 	{ "stop", stop, 1, doc_stop },
+-	{ "pause", pause, 1, doc_pause },
++	{ "pause", pause_, 1, doc_pause },
+ 	{ "unpause", unpause, 1, doc_unpause },
+ /*	{ "lookup_frequency", lookup_frequency, 1, doc_lookup_frequency },*/
+ 
diff --git a/dev-python/pygame/files/music.c-pause.patch b/dev-python/pygame/files/music.c-pause.patch
new file mode 100644
index 000000000000..b3bf4ea2f749
--- /dev/null
+++ b/dev-python/pygame/files/music.c-pause.patch
@@ -0,0 +1,21 @@
+diff -ur pygame-1.4.orig/src/music.c pygame-1.4/src/music.c
+--- pygame-1.4.orig/src/music.c	2002-04-28 11:54:03.000000000 -0500
++++ pygame-1.4/src/music.c	2002-04-28 11:54:30.000000000 -0500
+@@ -148,7 +148,7 @@
+     /*DOC*/    "Temporarily stops the current music.\n"
+     /*DOC*/ ;
+ 
+-static PyObject* pause(PyObject* self, PyObject* args)
++static PyObject* pause_(PyObject* self, PyObject* args)
+ {
+ 	if(!PyArg_ParseTuple(args, ""))
+ 		return NULL;
+@@ -365,7 +365,7 @@
+ 	{ "get_busy", get_busy, 1, doc_get_busy },
+ 	{ "fadeout", fadeout, 1, doc_fadeout },
+ 	{ "stop", stop, 1, doc_stop },
+-	{ "pause", pause, 1, doc_pause },
++	{ "pause", pause_, 1, doc_pause },
+ 	{ "unpause", unpause, 1, doc_unpause },
+ 	{ "rewind", mus_rewind, 1, doc_rewind },
+ 	{ "set_volume", set_volume, 1, doc_set_volume },
diff --git a/dev-python/pygame/pygame-1.4.ebuild b/dev-python/pygame/pygame-1.4.ebuild
new file mode 100644
index 000000000000..7f66cf004e23
--- /dev/null
+++ b/dev-python/pygame/pygame-1.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author: David Creswick <davidc@sat.net>
+# Maintainer: Jon Nelson <jnelson@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.4.ebuild,v 1.1 2002/04/28 17:10:27 jnelson Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="python bindings to sdl and other libs that facilitate game production"
+SRC_URI="http://www.pygame.org/ftp/${P}.tar.gz"
+HOMEPAGE="http://www.pygame.org/"
+
+# NOTES: sdl-image has been updated upstream to 1.2.2 as of
+# this writing.
+
+DEPEND="virtual/python
+	>=media-libs/libsdl-1.2.4
+	>=media-libs/sdl-ttf-2.0.5
+	>=media-libs/sdl-image-1.2.0
+	>=media-libs/sdl-mixer-1.2.3
+	>=dev-python/Numeric-21.0.0
+	>=media-libs/smpeg-0.4.4-r1"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A} && cd ${S} || die
+	mv config_unix.py config_unix.py.orig || die
+	# the smpeg library header is installed in /usr/include/smpeg
+	# The package expects it in /usr/include/SDL
+	# Note sure which is correct, but the following allows the
+	# ebuild to work with either.
+	sed -e 's:incdirs = \[\]:incdirs = \["/usr/include/smpeg"\]:g' config_unix.py.orig > config_unix.py || die
+	# Patch mixer.c and music.c to not conflict with the 'pause' library call
+	# Note that the next version won't need these, as CVS pygame
+	# has an equivalent patch
+	patch -p1 < ${FILESDIR}/mixer.c-pause.patch || die
+	patch -p1 < ${FILESDIR}/music.c-pause.patch || die
+}
+
+src_compile() {
+	python setup.py build || die
+}
+
+src_install () {
+	python setup.py install --root=${D} --prefix=/usr || die
+	
+	dodoc README.TXT WHATSNEW
+	dohtml -r docs/*
+	dodir /usr/share/doc/${PF}/examples
+	cp -r ${S}/examples ${D}usr/share/doc/${PF}/examples
+}
+