Fix bug with python 2.5 and amd64, bug #194932. Remove old rc.

Package-Manager: portage-2.2_pre8/cvs/Linux 2.6.25-gentoo-r3 x86_64

5 files changed, 107 insertions, 80 deletions

diff --git a/dev-python/pygame/ChangeLog b/dev-python/pygame/ChangeLog
index d0300e489262..9efa3905f99f 100644
--- a/dev-python/pygame/ChangeLog
+++ b/dev-python/pygame/ChangeLog
@@ -1,6 +1,13 @@
 # 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.46 2008/04/09 04:44:35 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/ChangeLog,v 1.47 2008/06/20 17:53:36 coldwind Exp $
+
+*pygame-1.7.1-r1 (20 Jun 2008)
+
+  20 Jun 2008; Santiago M. Mola <coldwind@gentoo.org>
+  +files/pygame-1.7.1-python2.5.patch, +pygame-1.7.1-r1.ebuild,
+  -pygame-1.8.0_rc4.ebuild:
+  Fix bug with python 2.5 and amd64, bug #194932. Remove old rc.
 
 *pygame-1.8.0 (09 Apr 2008)
 
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index a15d61af1040..d7694260dba3 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+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.0rc4.tar.gz 1484331 RMD160 a9071b1701e27cb1503723fcd909779bb88ce482 SHA1 236a1f3fb31b6593e4581faa49099cafd4fb260d SHA256 3ceca44ee296ef50b70fc8f0130a1b0198199b8ee56dd1f2a7c334b8458091d8
 DIST pygame-1.8.0release.tar.gz 1473603 RMD160 6df6f88deea5a1ef19933e6a0696e102843b293c SHA1 00ef4695efc7a666017862ae4cffc316902dd99b SHA256 ee7748e2689f41b54544e9997c42abd568b8c2d85292c4e6c0146c48b464ba82
+EBUILD pygame-1.7.1-r1.ebuild 1195 RMD160 ba36ab2eb71668545502947fc9fbae7db3a374cd SHA1 d7c345b2fe9001a7b05a035aabcc4d07de99484e SHA256 f29bbfb4425d933cf13b25b3dc6ad618952a018b987bfb83af53c47b95761b6a
 EBUILD pygame-1.7.1.ebuild 1130 RMD160 f428118ea14b2790d846e6db4e10385077ee44d7 SHA1 8bb6b7d7f4f6677a3f589ffd54c420db350840b1 SHA256 4f7a788c68b5fc7897847f693e203d711fbce0b83123cd54edddf877ac579aa0
 EBUILD pygame-1.8.0.ebuild 1339 RMD160 bff6397dc794f7f90bd4cf858c74c3240d87d08e SHA1 cadc168e242b3115d224611c4d1f705be937c1a3 SHA256 b7f6ea14d2dd04312cacb670393296bf1da18ee117093f9ab8f044dd37c7ba70
-EBUILD pygame-1.8.0_rc4.ebuild 1536 RMD160 e3eb50f75d7fde6ca2fd1990183777c14251bbcc SHA1 087926cf2a370cd18981c4ebdbe161e3ab5e1e6e SHA256 5a668eb31d880ec687fdd71bd2d4dad6995df25aac675a66a81f092bb8fcee01
-MISC ChangeLog 5884 RMD160 395292e5f4f10a1f19a089fcb9ad055859fccf83 SHA1 8a4c722ae1b663028b83fdb4831d7a8d4c3c328f SHA256 ebfb8976272098d76aa7525a4c841651a2cbed0050500b9e552ae221f292e834
+MISC ChangeLog 6130 RMD160 e622c56e989171f2ca76c197f91dbd2633d96bd0 SHA1 99f51fdd2149b1661312957772a49aec2f994b32 SHA256 facf429e76c0c149b7aa17e5bfa67eb21bde23f6abd5104f82b62ec013477102
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFH/Em4mOfEJZHYOKcRAo5mAKCR754dpUTsiJtd5BHXNeyMarxk2ACggTr9
-oBChtY9/pNvCP2PCOagRgaE=
-=dvOF
------END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..6355a92ed4dc
--- /dev/null
+++ b/dev-python/pygame/files/pygame-1.7.1-python2.5.patch
@@ -0,0 +1,50 @@
+--- 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
new file mode 100644
index 000000000000..4e08f65190bf
--- /dev/null
+++ b/dev-python/pygame/pygame-1.7.1-r1.ebuild
@@ -0,0 +1,46 @@
+# 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.1 2008/06/20 17:53:36 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"
+
+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
+}
diff --git a/dev-python/pygame/pygame-1.8.0_rc4.ebuild b/dev-python/pygame/pygame-1.8.0_rc4.ebuild
deleted file mode 100644
index 929ae282b54f..000000000000
--- a/dev-python/pygame/pygame-1.8.0_rc4.ebuild
+++ /dev/null
@@ -1,66 +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.8.0_rc4.ebuild,v 1.2 2008/03/03 13:56:20 dev-zero Exp $
-
-inherit distutils multilib eutils
-
-MY_P="${PN}-${PV/_}"
-
-DESCRIPTION="python bindings to sdl and other libs that facilitate game production"
-HOMEPAGE="http://www.pygame.org/"
-SRC_URI="http://rene.f0o.com/~rene/stuff/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND=">=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/numpy
-	>=media-libs/smpeg-0.4.4-r1"
-DEPEND="${DEPEND}
-	dev-python/setuptools"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if ! built_with_use media-libs/libsdl X ; then
-		eerror "Please re-emerge media-libs/libsdl with the X USE-flag set."
-		die "Missing USE-flag for media-libs/libsdl"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	# Search correct libdir for existing sdl libs
-	sed -i \
-		-e "s:/lib:/$(get_libdir):" \
-		"${S}/config_unix.py" || die "sed failed"
-}
-
-src_compile() {
-	distutils_src_install
-
-	# Copy missing icon-file
-	cp lib/pygame_icon.bmp build/lib.*/pygame/
-}
-
-src_install() {
-	DOCS=WHATSNEW
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r docs/*
-
-		insinto /usr/share/doc/${PF}
-		doins -r "${S}/examples"
-	fi
-}
-
-src_test() {
-	python_version
-	PYTHONPATH="$(ls -d build/lib.*)" "${python}" run_tests.py || die "tests failed"
-}