fix building with glibc-2.10 wrt bug #273178, assign empty RDEPEND

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

4 files changed, 37 insertions, 10 deletions

diff --git a/media-gfx/tic98/ChangeLog b/media-gfx/tic98/ChangeLog
index 1784ee88dc1f..6cffdf8f9976 100644
--- a/media-gfx/tic98/ChangeLog
+++ b/media-gfx/tic98/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/tic98
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tic98/ChangeLog,v 1.13 2008/11/15 17:12:12 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tic98/ChangeLog,v 1.14 2009/07/05 12:24:52 maekke Exp $
+
+  05 Jul 2009; Markus Meier <maekke@gentoo.org> tic98-1.01-r3.ebuild,
+  +files/tic98-1.01-glibc-2.10.patch:
+  fix building with glibc-2.10 wrt bug #273178, assign empty RDEPEND
 
   15 Nov 2008; Markus Meier <maekke@gentoo.org> -tic98-1.01-r2.ebuild:
   old
diff --git a/media-gfx/tic98/Manifest b/media-gfx/tic98/Manifest
index 51b82c1cbb90..ecd5addbf25b 100644
--- a/media-gfx/tic98/Manifest
+++ b/media-gfx/tic98/Manifest
@@ -2,15 +2,16 @@
 Hash: SHA1
 
 AUX tic98-1.01-gentoo.diff 5452 RMD160 5364eb320fdacbdb5c2ed0480abd70af0af38eab SHA1 533458a72d01012b99b4820b118d9278b9434475 SHA256 b526d8dc6f4539074a40c5f24dbbc72d4974b6d8d7dae650dca1bae86f38c933
+AUX tic98-1.01-glibc-2.10.patch 624 RMD160 f4d7693194c6feb1fd5e56c3a663005f74c80a5b SHA1 6327df19b8f0f4c8ad0cdfdcf25448affe4cc711 SHA256 c5945652b7d44e7ba503e339263cb6b06b109e67537bb2b259399314907385db
 AUX tic98-1.01-macos.patch 643 RMD160 09323ab4269321b1d0762be95c8df5029f32b325 SHA1 69c1342f2bf67fa69478dc9a3cb61bdad8e4058a SHA256 2c2a9970f1429fc04631a758ebd61b34e56d8770ff1de423b021dda453e6a1b2
 DIST tic98-1.01.tar.bz2 99145 RMD160 e1a75ae90feb3f98524c294ad918c3d1111ab0b3 SHA1 2199d35e321adda028a86ff43c8a2baa0c48bf85 SHA256 0e65a851ccc6fb45652ed03760e5973bac494ac2f07a9a7cccc0e7ccafe06fa2
-EBUILD tic98-1.01-r3.ebuild 1159 RMD160 5461103cff09ce9df5f5b47b8b38cbdcca35c8f5 SHA1 3ace95cead66d34349f9c430f7a25251d34decac SHA256 e5ad44c2076776ffa846ed28eb04c2a11afdcf21ac44754048ca1efd0c81da4a
-MISC ChangeLog 2245 RMD160 b467f53a2c44d0614135cf6917adae57cd489531 SHA1 414e4d2b04e10328d656bcef0557966f8ae98bf8 SHA256 fc66c4de5c2d67769639044fb6dcfae52c2b64c559925df85f51bb5d04751017
+EBUILD tic98-1.01-r3.ebuild 1214 RMD160 44701bb644f111f1a72279c989abf34dcb238356 SHA1 4fd6384b0d774f67932dcae1b1afd90c772a3f5a SHA256 e3fded4f2b43070e0804d527ac01f9ecc2f65932cf9f88a91c9ece72513414c9
+MISC ChangeLog 2423 RMD160 ea52e4c648eda72cbf7505a08969c8bd389107fd SHA1 0131ae844139da4290d1e9405ae06c870e9d35e5 SHA256 fb9e11a5f01dfa967010bd9a85e2ae90662aa33caaadea1f0d19f2cf0998ac5a
 MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.12 (GNU/Linux)
 
-iEYEARECAAYFAkkfAvoACgkQkKaRLQcq0GKYngCgmqVNpmwqtsPpaZ6dvm1yO57X
-VfgAn1fs8c9WfMN2LJ2H+scSwcnG4/uQ
-=W5R9
+iEYEARECAAYFAkpQnFUACgkQkKaRLQcq0GKw9wCfRgfMvVa2WGROPn5wGuZO8vSN
+wbwAoIutqaoHQnvTVSsqPqmEDUOTivB4
+=vvyM
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/tic98/files/tic98-1.01-glibc-2.10.patch b/media-gfx/tic98/files/tic98-1.01-glibc-2.10.patch
new file mode 100644
index 000000000000..32caf5e43477
--- /dev/null
+++ b/media-gfx/tic98/files/tic98-1.01-glibc-2.10.patch
@@ -0,0 +1,20 @@
+--- tic98.orig/ppmd_enc.c	2009-07-05 14:15:53.000000000 +0200
++++ tic98/ppmd_enc.c	2009-07-05 14:18:47.000000000 +0200
+@@ -63,7 +63,7 @@
+ }
+ 
+ int
+-getline (FILE *fp, char *s, int max)
++tic98_getline (FILE *fp, char *s, int max)
+ /* Read line from FP into S; return its length (maximum length = MAX). */
+ {
+     int i;
+@@ -111,7 +111,7 @@
+     ppm_start_encoding (max_order, max_symbol);
+ 
+     /* Read in the integers */
+-    while ((len = getline (fp, line, MAX_LINE)) != EOF)
++    while ((len = tic98_getline (fp, line, MAX_LINE)) != EOF)
+     {
+         count++;
+ 	if ((debugProgress) && ((count % debugProgress) == 0))
diff --git a/media-gfx/tic98/tic98-1.01-r3.ebuild b/media-gfx/tic98/tic98-1.01-r3.ebuild
index e5bdf79c3605..bdaf06587cd8 100644
--- a/media-gfx/tic98/tic98-1.01-r3.ebuild
+++ b/media-gfx/tic98/tic98-1.01-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tic98/tic98-1.01-r3.ebuild,v 1.4 2008/11/15 17:10:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tic98/tic98-1.01-r3.ebuild,v 1.5 2009/07/05 12:24:52 maekke Exp $
 
 inherit eutils
 
@@ -14,6 +14,7 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
+RDEPEND=""
 RESTRICT="test"
 
 S="${WORKDIR}/${PN}"
@@ -23,6 +24,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-macos.patch
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-gentoo.diff
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
 
 	# respect CFLAGS and LDFLAGS
 	sed -i -e "s:CFLAGS= -O -Wall -Wno-unused:CFLAGS=${CFLAGS}:" \