Punting 1.7.1-r1 wrt bug #231250.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r6 x86_64

4 files changed, 6 insertions, 108 deletions

diff --git a/dev-python/pygame/ChangeLog b/dev-python/pygame/ChangeLog
index 90027a58fd69..a99d0e764925 100644
--- a/dev-python/pygame/ChangeLog
+++ b/dev-python/pygame/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pygame
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/ChangeLog,v 1.49 2008/07/08 17:59:28 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/ChangeLog,v 1.50 2008/07/14 21:33:22 coldwind Exp $
+
+  14 Jul 2008; Santiago M. Mola <coldwind@gentoo.org>
+  -files/pygame-1.7.1-python2.5.patch, -pygame-1.7.1-r1.ebuild:
+  Punting 1.7.1-r1 wrt bug #231250.
 
   08 Jul 2008; Santiago M. Mola <coldwind@gentoo.org>
   pygame-1.7.1-r1.ebuild:
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index b007b5ecca13..a0badc5ab5f6 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,8 +1,6 @@
-AUX pygame-1.7.1-python2.5.patch 1530 RMD160 e874f95c2d5c92ffc2fb4fce6368b2ee49dd7d2d SHA1 cca966b33415caa8112fa31063f88e36d3af29b3 SHA256 f960da5fd30b2d502d41736c4656ba5025fb8eb5c2ff28d606f81301e9d49bed
 DIST pygame-1.7.1release.tar.gz 1279697 RMD160 2cb7a60f3f57468958d452f8daf4cf81063e1955 SHA1 cf6940e3ec4f48930ef8e4600c6decfa13ebbbea SHA256 11dfa923f5f831d2bedf476978e004efcac4cfa7d1f315dd094262265fcd8042
 DIST pygame-1.8.0release.tar.gz 1473603 RMD160 6df6f88deea5a1ef19933e6a0696e102843b293c SHA1 00ef4695efc7a666017862ae4cffc316902dd99b SHA256 ee7748e2689f41b54544e9997c42abd568b8c2d85292c4e6c0146c48b464ba82
-EBUILD pygame-1.7.1-r1.ebuild 1421 RMD160 9286c7d85e0fc959c778c9782d4e3a30ed4eba41 SHA1 aa0d1e4531fb74623eef9280aeeab92f583f6a79 SHA256 265c3f404f9cc3cd7b950d631a912a04159b55454d1f0f6f7b202be1daaaf888
 EBUILD pygame-1.7.1.ebuild 1361 RMD160 4741f4e1e0db4e34a39cd523fb51b06a30b6fdab SHA1 dc73aab5da643e6197dad6a4cd3c8514c6315d19 SHA256 2ad4d3c4e0f404c772cb2489ec683ab9fda5c7784af372d317d6501cbd4334f2
 EBUILD pygame-1.8.0.ebuild 1543 RMD160 90d76d78005c25e3204fc38cb437e9a3e201b739 SHA1 f38ae8c95487f35ada5aff31b2f75f888187e457 SHA256 41e8b74cdec5ae73ba3970189350ef120ecc75ec2980638a840b00a14db5f2a8
-MISC ChangeLog 6408 RMD160 672585e716a73b26a23706a62576b46ecb547449 SHA1 24321a18f04971b88c5d1fda9c3cea20430cfd7d SHA256 2b9ea85e56b2a635d3c651e1f7b83f5b1298cb1f9a56f57f69344f4cd428dd2b
+MISC ChangeLog 6563 RMD160 89667f7b31a62397b03d53d5800054357110be19 SHA1 39139a9bf344ef849f9a2ef51ec5aeca030e2699 SHA256 53fa2d44e541d46cc48b5bc1b8da6b6eba1c5d9868393272dd992a0d2cbdbc5a
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
diff --git a/dev-python/pygame/files/pygame-1.7.1-python2.5.patch b/dev-python/pygame/files/pygame-1.7.1-python2.5.patch
deleted file mode 100644
index 6355a92ed4dc..000000000000
--- a/dev-python/pygame/files/pygame-1.7.1-python2.5.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- src/image.c.old	2005-03-13 02:12:35.000000000 +0100
-+++ src/image.c	2007-03-14 21:09:30.000000000 +0100
-@@ -291,7 +291,8 @@
- 	PyObject *surfobj, *string=NULL;
- 	char *format, *data, *pixels;
- 	SDL_Surface *surf, *temp=NULL;
--	int w, h, color, len, flipped=0;
-+	int w, h, color, flipped=0;
-+	Py_ssize_t len;
- 	int Rmask, Gmask, Bmask, Amask, Rshift, Gshift, Bshift, Ashift, Rloss, Gloss, Bloss, Aloss;
- 	int hascolorkey, colorkey;
- 
-@@ -331,7 +332,7 @@
- 	}
- 	else if(!strcmp(format, "RGB"))
- 	{
--		string = PyString_FromStringAndSize(NULL, surf->w*surf->h*3);
-+		string = PyString_FromStringAndSize(NULL, (Py_ssize_t)surf->w*surf->h*3);
- 		if(!string)
- 			return NULL;
- 		PyString_AsStringAndSize(string, &data, &len);
-@@ -407,7 +408,7 @@
- 		if(strcmp(format, "RGBA"))
- 			hascolorkey = 0;
- 
--		string = PyString_FromStringAndSize(NULL, surf->w*surf->h*4);
-+		string = PyString_FromStringAndSize(NULL, (Py_ssize_t)surf->w*surf->h*4);
- 		if(!string)
- 			return NULL;
- 		PyString_AsStringAndSize(string, &data, &len);
-@@ -605,7 +606,8 @@
- 	PyObject *string;
- 	char *format, *data;
- 	SDL_Surface *surf = NULL;
--	int w, h, len, flipped=0;
-+	int w, h, flipped=0;
-+	Py_ssize_t len;
- 	int loopw, looph;
- 
- 	if(!PyArg_ParseTuple(arg, "O!(ii)s|i", &PyString_Type, &string, &w, &h, &format, &flipped))
-@@ -729,7 +731,8 @@
- 	PyObject *buffer;
- 	char *format, *data;
- 	SDL_Surface *surf = NULL;
--	int w, h, len;
-+	int w, h;
-+	Py_ssize_t len;
-         PyObject *surfobj;
- 
- 	if(!PyArg_ParseTuple(arg, "O(ii)s|i", &buffer, &w, &h, &format))
diff --git a/dev-python/pygame/pygame-1.7.1-r1.ebuild b/dev-python/pygame/pygame-1.7.1-r1.ebuild
deleted file mode 100644
index c15e8282fb1f..000000000000
--- a/dev-python/pygame/pygame-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.7.1-r1.ebuild,v 1.3 2008/07/08 17:59:28 coldwind Exp $
-
-inherit eutils distutils
-
-MY_P="${P}release"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="python bindings to sdl and other libs that facilitate game production"
-HOMEPAGE="http://www.pygame.org/"
-SRC_URI="http://www.pygame.org/ftp/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
-
-DEPEND="virtual/python
-	>=media-libs/libsdl-1.2.5
-	>=media-libs/sdl-ttf-2.0.6
-	>=media-libs/sdl-image-1.2.2
-	>=media-libs/sdl-mixer-1.2.4
-	>=dev-python/numeric-22.0
-	>=media-libs/smpeg-0.4.4-r1"
-
-pkg_setup() {
-	if ! built_with_use media-libs/sdl-image png jpeg ; then
-		eerror "Please re-emerge media-libs/sdl-image with the png and jpeg
-		USE-flags set."
-		die "Missing USE-flag for media-libs/sdl-image"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	# Search correct libdir for existing sdl libs
-	sed -i -e "s:/lib:/$(get_libdir):" "${S}"/config_unix.py || die
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-python2.5.patch
-}
-
-src_install() {
-	DOCS=WHATSNEW
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r docs/*
-		insinto /usr/share/doc/"${PF}"/examples
-		doins "${S}"/examples/*
-		insinto /usr/share/doc/"${PF}"/examples/data
-		doins "${S}"/examples/data/*
-	fi
-}