Fixed some tests that failed. Closes Bug #223055.

Package-Manager: portage-2.2_rc23/cvs/Linux i686

4 files changed, 66 insertions, 7 deletions

diff --git a/dev-python/pygame/ChangeLog b/dev-python/pygame/ChangeLog
index 988a47bffb40..316daf1a660b 100644
--- a/dev-python/pygame/ChangeLog
+++ b/dev-python/pygame/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pygame
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/ChangeLog,v 1.60 2009/04/09 10:04:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/ChangeLog,v 1.61 2009/07/15 02:00:12 neurogeek Exp $
+
+  15 Jul 2009; Jesus Rivero <neurogeek@gentoo.org>
+  +files/pygame-1.8.1_icon_path.patch, pygame-1.8.1-r1.ebuild:
+  Fixed some tests that failed. Closes Bug #223055.
 
 *pygame-1.8.1-r1 (09 Apr 2009)
 
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 1e067b7e65a8..b4c2dfcaeb17 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX pygame-1.8.1_icon_path.patch 1308 RMD160 f4679b1b60071822ca803b13bdcec9dc5c95b9a5 SHA1 562cc454ffcd2fd86b302dad1ad02d90f77cc87b SHA256 6dfcccab7dc0b8404b0ee0ba7f3188d47e29596f1b4b61dcbe789e990d16fdfc
 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
 DIST pygame-1.8.1release.tar.gz 1705162 RMD160 dc3374e2185a3fbc36cc74ac3b050e7e57f0a4ce SHA1 62d2ad452a0cc1486f877d5a2ae736b6703548cc SHA256 7e1841d812b9eb39fd49c297ce6c3ad83bda56bf78a666e9426d3f6ecce92a75
 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
-EBUILD pygame-1.8.1-r1.ebuild 1180 RMD160 4ef2440ca34a9a092ad04140df972c7d8bde61cd SHA1 6cc22109363963b635ef69029b43790ac8b45009 SHA256 9108a88bd195fa9a79c5d9ee10a3485969ee426506303fd0297d16431efe1257
+EBUILD pygame-1.8.1-r1.ebuild 1462 RMD160 9b7ef7f7e0004f586d7464cd172bf0f9ae8dd6aa SHA1 9ba0a8f44d28e18f1b3316879a363a68ce7d15ee SHA256 7961efab54dc169019b9fc4a63a8326957f504cb66031ebfab6b9065154518ff
 EBUILD pygame-1.8.1.ebuild 1535 RMD160 a3ac0f75c21c72abf98d32c6041feefbb4efd1cb SHA1 1f236f8cf7c5b8efbc4a5e91ac241275e2a5f467 SHA256 3b0df44b69d39798b0ca25e7d6474a489692b2e1b8529a5175ad80cfcf286db3
-MISC ChangeLog 7647 RMD160 0ae31ea652f3c71939b8cf3cff8a9008a2b7fd67 SHA1 f82763059a658c72f00dd4a8ea7549dd5d2e6102 SHA256 536cfc0262ce64912490b908c242d373a8f8abf57271b9d228a4cf1d9a5a4ba2
+MISC ChangeLog 7816 RMD160 ee6ed112281777802155d4aab4dabbe64062053c SHA1 837ec7b12b9b00771d7e01f7c38d0a27cdc55cdc SHA256 bacdec02a2175721a81691e2cb2ca5c9e8b9ca8fba2b28f941609c0cec7129d2
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkpdODgACgkQdIssYB9vBoOdCgCfQGbR4RAUbwp71zXKijwpE4EF
+CpoAn2W6rol3T8BoAOb53q8mW7ykWqND
+=Vee7
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pygame/files/pygame-1.8.1_icon_path.patch b/dev-python/pygame/files/pygame-1.8.1_icon_path.patch
new file mode 100644
index 000000000000..d2f1eb7385de
--- /dev/null
+++ b/dev-python/pygame/files/pygame-1.8.1_icon_path.patch
@@ -0,0 +1,30 @@
+Patch: Patch to make tests works
+Added: 14 Jul 2009
+By: Jesus Rivero (Neurogeek)
+
+diff -uNr pygame-1.8.1release.orig/test/image_test.py pygame-1.8.1release/test/image_test.py
+--- pygame-1.8.1release.orig/test/image_test.py 2009-07-14 19:20:38.000000000 -0430
++++ pygame-1.8.1release/test/image_test.py      2009-07-14 19:34:11.000000000 -0430
+@@ -27,7 +27,7 @@
+     def testLoadIcon(self):
+         """ see if we can load the pygame icon.
+         """
+-        f = pygame.pkgdata.getResource("pygame_icon.bmp")
++        f = pygame.pkgdata.getResource("../../../lib/pygame_icon.bmp")
+         self.assertEqual(f.mode, "rb")
+ 
+         surf = pygame.image.load_basic(f)
+
+diff -uNtr pygame-1.8.1release.orig/test/font_test.py pygame-1.8.1release.new/test/font_test.py
+--- pygame-1.8.1release.orig/test/font_test.py	2009-07-14 19:20:38.000000000 -0430
++++ pygame-1.8.1release.new/test/font_test.py	2009-07-14 20:53:02.000000000 -0430
+@@ -11,7 +11,7 @@
+         """

+         #print __file__

+         pygame.font.init ()

+-        f = pygame.font.Font(None, 20)

++        f = pygame.font.Font("lib/freesansbold.ttf", 20)

+         s = f.render("foo", True, [0, 0, 0], [255, 255, 255])

+         s = f.render("xxx", True, [0, 0, 0], [255, 255, 255])

+         s = f.render("", True, [0, 0, 0], [255, 255, 255])

+
diff --git a/dev-python/pygame/pygame-1.8.1-r1.ebuild b/dev-python/pygame/pygame-1.8.1-r1.ebuild
index 3df5775901df..775a3943a099 100644
--- a/dev-python/pygame/pygame-1.8.1-r1.ebuild
+++ b/dev-python/pygame/pygame-1.8.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.8.1-r1.ebuild,v 1.1 2009/04/09 10:04:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.8.1-r1.ebuild,v 1.2 2009/07/15 02:00:12 neurogeek Exp $
 
 EAPI="2"
 
-inherit distutils multilib eutils
+inherit distutils
 
 DESCRIPTION="python bindings to sdl and other libs that facilitate game production"
 HOMEPAGE="http://www.pygame.org/"
@@ -26,6 +26,10 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${P}release
 
+src_prepare(){
+	epatch "${FILESDIR}/${P}_icon_path.patch"
+}
+
 src_compile() {
 	python config.py
 	sed -i -e 's:X11R6/lib:lib64:g' Setup
@@ -34,18 +38,28 @@ src_compile() {
 }
 
 src_install() {
-	DOCS=WHATSNEW
+	DOCS="WHATSNEW"
 	distutils_src_install
 
 	if use doc; then
 		dohtml -r docs/*
 
-		insinto /usr/share/doc/${PF}
+		insinto "/usr/share/doc/${PF}"
 		doins -r "${S}/examples"
 	fi
 }
 
 src_test() {
 	python_version
+
+	#Skip tests that depend on DISPLAY being set. Bug #223055
+	SKIP_TESTS="display_test image__save_gl_surface_test movie_test"
+
+	for test_ in $SKIP_TESTS
+	do
+		einfo "Removing test: ${test_}"
+		rm -rf "${S}/test/${test_}.py"
+	done
+
 	PYTHONPATH="$(ls -d build/lib.*)" "${python}" run_tests.py || die "tests failed"
 }