Fail graciously rather than segfaulting #142453 by Jon Hurst.

Package-Manager: portage-2.1.1_rc1-r2

5 files changed, 54 insertions, 13 deletions

diff --git a/games-kids/tuxtype2/ChangeLog b/games-kids/tuxtype2/ChangeLog
index 43b00504776d..dccbe4755711 100644
--- a/games-kids/tuxtype2/ChangeLog
+++ b/games-kids/tuxtype2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-kids/tuxtype2
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/tuxtype2/ChangeLog,v 1.3 2005/05/15 01:25:41 luckyduck Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-kids/tuxtype2/ChangeLog,v 1.4 2006/09/04 03:10:11 vapier Exp $
+
+  04 Sep 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/tuxtype2-1.5.3-checks.patch, tuxtype2-1.5.3.ebuild:
+  Fail graciously rather than segfaulting #142453 by Jon Hurst.
 
   15 May 2005; Jan Brinkmann <luckyduck@gentoo.org> tuxtype2-1.5.3.ebuild:
   stable on amd64
diff --git a/games-kids/tuxtype2/Manifest b/games-kids/tuxtype2/Manifest
index 093ffc475169..22f3f37e6802 100644
--- a/games-kids/tuxtype2/Manifest
+++ b/games-kids/tuxtype2/Manifest
@@ -1,14 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 bd35e14924b524a3d029e86972bb9240 tuxtype2-1.5.3.ebuild 997
-MD5 a0d3fb452198dae06faafccb50ff419c ChangeLog 582
+AUX tuxtype2-1.5.3-checks.patch 565 RMD160 4dd864d41007d21a9811c688648b479af710b62c SHA1 860a5b1d4726c5a9964e11f73374bf46e86b6969 SHA256 43e08e4ec441a8e97ba55ad6021036b06eaeaf1f6920f678e2d35a8033ad329e
+MD5 4a40f6428f9000eb70b6feafcb9ac292 files/tuxtype2-1.5.3-checks.patch 565
+RMD160 4dd864d41007d21a9811c688648b479af710b62c files/tuxtype2-1.5.3-checks.patch 565
+SHA256 43e08e4ec441a8e97ba55ad6021036b06eaeaf1f6920f678e2d35a8033ad329e files/tuxtype2-1.5.3-checks.patch 565
+DIST tuxtype2-1.5.3.tar.bz2 7741487 RMD160 8771796272f23b0d70b909b8953bed26da162571 SHA1 f1b6e48ebb6622d089685cf5e99e8de3c3200e17 SHA256 f2a0cf5078690b0c309c4c7b65685cca2a68e28ddfbbdf7d1d50a5e80daef767
+EBUILD tuxtype2-1.5.3.ebuild 1046 RMD160 cfe2ff5ce317b9f98b8552efb0cd0bd1504bab21 SHA1 d82c31a3aca93d9f5e6cefc715a4f049c366351f SHA256 392cad892924c6bacd14b59ab31e7d814667591d616eb91cf176e6c288943e55
+MD5 5b1fe9b1c86042ee5da2cde9278b04d8 tuxtype2-1.5.3.ebuild 1046
+RMD160 cfe2ff5ce317b9f98b8552efb0cd0bd1504bab21 tuxtype2-1.5.3.ebuild 1046
+SHA256 392cad892924c6bacd14b59ab31e7d814667591d616eb91cf176e6c288943e55 tuxtype2-1.5.3.ebuild 1046
+MISC ChangeLog 755 RMD160 e9a7a21fc394840959a5f5bbb2461e6c8b54bc9f SHA1 70f5fccc5ccd7bed7fb5e5d789e09e23a00a6a8c SHA256 76a45b13cbec13bfa49670867ee9c7275add9835eb72141738b21eae7f815c5e
+MD5 3fc796ad88158e3d24634f9805223f9a ChangeLog 755
+RMD160 e9a7a21fc394840959a5f5bbb2461e6c8b54bc9f ChangeLog 755
+SHA256 76a45b13cbec13bfa49670867ee9c7275add9835eb72141738b21eae7f815c5e ChangeLog 755
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 e90cf08972a1a3a1d13e20753e7a296f files/digest-tuxtype2-1.5.3 68
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 ed0b168612dc99c22a9331dd9ce60a9f files/digest-tuxtype2-1.5.3 250
+RMD160 eefe9f716824b345aa4429b22473192992557fc5 files/digest-tuxtype2-1.5.3 250
+SHA256 803e00d02b2c32ad52fc024a6d877313e035cdb8941221b96e5a9fedae04e09d files/digest-tuxtype2-1.5.3 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFChqUf06ebR+OMO78RAvcNAJ4pcCNDDf5F+YVvXUUDDEtjgb8H/ACfWMya
-38Hb89vCKbj4sgR+L6zhVo4=
-=R0aw
+iD8DBQFE+5k/amhnQswr0vIRArZ/AKCYHIhybhN1AM4D0yaJCWdZkVSGFwCggvNX
+549BMMYCPcxqO+JVIEThdOc=
+=tQB0
 -----END PGP SIGNATURE-----
diff --git a/games-kids/tuxtype2/files/digest-tuxtype2-1.5.3 b/games-kids/tuxtype2/files/digest-tuxtype2-1.5.3
index 4c63a66fb9d1..e78c716ebd08 100644
--- a/games-kids/tuxtype2/files/digest-tuxtype2-1.5.3
+++ b/games-kids/tuxtype2/files/digest-tuxtype2-1.5.3
@@ -1 +1,3 @@
 MD5 ca04e65d3b19ddeeedb8a49147ed642b tuxtype2-1.5.3.tar.bz2 7741487
+RMD160 8771796272f23b0d70b909b8953bed26da162571 tuxtype2-1.5.3.tar.bz2 7741487
+SHA256 f2a0cf5078690b0c309c4c7b65685cca2a68e28ddfbbdf7d1d50a5e80daef767 tuxtype2-1.5.3.tar.bz2 7741487
diff --git a/games-kids/tuxtype2/files/tuxtype2-1.5.3-checks.patch b/games-kids/tuxtype2/files/tuxtype2-1.5.3-checks.patch
new file mode 100644
index 000000000000..315c2c28147d
--- /dev/null
+++ b/games-kids/tuxtype2/files/tuxtype2-1.5.3-checks.patch
@@ -0,0 +1,18 @@
+--- tuxtype/alphabet.c
++++ tuxtype/alphabet.c
+@@ -120,7 +120,15 @@
+         DEBUGCODE { fprintf( stderr, "black_outline of \"%s\"\n", t ); }
+ 
+ 	tmp = TTF_RenderText_Solid(font, t, black);
++	if (tmp == NULL) {
++		fprintf(stderr, "TTF_RenderText_Solid(%s) failed: %s\n", t, TTF_GetError());
++		exit(1);
++	}
+ 	out = SDL_CreateRGBSurface(SDL_SWSURFACE, (tmp->w)+5, (tmp->h)+5, 32, rmask, gmask, bmask, amask);
++	if (out == NULL) {
++		fprintf(stderr, "SDL_CreateRGBSurface() failed: %s\n", SDL_GetError());
++		exit(1);
++	}
+ 
+ 	dstrect.w = tmp->w;
+ 	dstrect.h = tmp->h;
diff --git a/games-kids/tuxtype2/tuxtype2-1.5.3.ebuild b/games-kids/tuxtype2/tuxtype2-1.5.3.ebuild
index b1f0fec6dc13..0364fe5239f9 100644
--- a/games-kids/tuxtype2/tuxtype2-1.5.3.ebuild
+++ b/games-kids/tuxtype2/tuxtype2-1.5.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/tuxtype2/tuxtype2-1.5.3.ebuild,v 1.4 2005/05/15 01:25:41 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/tuxtype2/tuxtype2-1.5.3.ebuild,v 1.5 2006/09/04 03:10:11 vapier Exp $
 
 inherit games
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/tuxtype/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="ppc sparc x86 amd64"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.2
@@ -20,7 +20,8 @@ DEPEND=">=media-libs/libsdl-1.2
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
+	epatch "${FILESDIR}"/tuxtype2-1.5.3-checks.patch
 	sed -i \
 		-e 's:$(prefix)/share:'${GAMES_DATADIR}':g' \
 		-e 's:$(prefix)/doc/$(PACKAGE):/usr/share/doc/'${PF}':g' \