nfbtrans should now build with glibc-2.10.

This fixes bug #274243.
Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 52 insertions, 5 deletions

diff --git a/app-accessibility/nfbtrans/ChangeLog b/app-accessibility/nfbtrans/ChangeLog
index 047c73a04a5d..64d7d76cb59a 100644
--- a/app-accessibility/nfbtrans/ChangeLog
+++ b/app-accessibility/nfbtrans/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-accessibility/nfbtrans
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/nfbtrans/ChangeLog,v 1.13 2009/01/10 17:44:39 williamh Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/nfbtrans/ChangeLog,v 1.14 2009/06/15 21:12:04 williamh Exp $
+
+  15 Jun 2009; William Hubbs <williamh@gentoo.org> nfbtrans-7.74.ebuild,
+  +files/nfbtrans-7.74-getline-fix.patch:
+  nfbtrans should now build with glibc-2.10.
+  This fixes bug #274243.
 
   10 Jan 2009; William Hubbs <williamh@gentoo.org> nfbtrans-7.74.ebuild:
   I removed virtual/libc from depend and set rdepend correctly. The SRC_URI
diff --git a/app-accessibility/nfbtrans/Manifest b/app-accessibility/nfbtrans/Manifest
index 27cbf9efd68c..3aeb87057d8b 100644
--- a/app-accessibility/nfbtrans/Manifest
+++ b/app-accessibility/nfbtrans/Manifest
@@ -1,5 +1,6 @@
 AUX nfbtrans-7.74-gentoo-fix.patch 310 RMD160 03ed1f49f1b3c9736264f079fb000a523207c02f SHA1 6e19dc5a10e58300ef5a3f2d7373f3b0985bed71 SHA256 6bd60b185caa76564dad6c0a0aacad9f6cb1df1f32c0725cf63ed5fe86acf556
+AUX nfbtrans-7.74-getline-fix.patch 957 RMD160 1ba02dd10f421b837078ffc65ab9eb815d7ebb4c SHA1 b32b7452abc315baa7641b84ae69db4ef0b7b97e SHA256 9c2b27afbf2c6d15d67c342160a1480f2398ffd62f366c0de7f1ea8a20235447
 DIST nfbtr774.zip 470847 RMD160 af7c3286363b50668c1fe3e05e5be4570571f718 SHA1 647d2aa6dcd04ed9fa1552c38b27b123019ee4a9 SHA256 87cad2aa875f44ad6035f5af080e02ecc23a8c3718e3e1943cb3a006c5fc93ec
-EBUILD nfbtrans-7.74.ebuild 937 RMD160 f212e283a84dad3dfd9a76b8feeff25402bf27d7 SHA1 89db1de9899c2e1103977e78b13fcf9fc6fe8972 SHA256 04d1df2c8e331506a3cfe52c7f512c4aeb0b9cbfb19473f06df3bb477b8f36d2
-MISC ChangeLog 1741 RMD160 2774010c50092cd30cbab2c2b1dda097f4b1a497 SHA1 c6a5d455bcf04289a472764173e8841627845df8 SHA256 094e6927766be12e41d27eff6fd28a9ef83c135081119b4b01bc8d9eeb1bc5b0
+EBUILD nfbtrans-7.74.ebuild 982 RMD160 55dbd192e78903fc19fde990389a9ffbfdf5fa0e SHA1 482059da3cd53286d2916ff7165345ddd05dd1fe SHA256 cd21e3a6075a9b37ce93dbcb90efaeaf953a077322f5a2ba7a5d8cdca58acf1e
+MISC ChangeLog 1928 RMD160 1c3774e0e0fce9e643d98dd6b559e5d925bd9af0 SHA1 a186706c6310f6848ff869149699f15769060a48 SHA256 73aec6ef8d9acf12c42871a507919f367955acd2203ec2cd33eab0967ca9c320
 MISC metadata.xml 231 RMD160 054f5d191e7b9a652b1aab439e1afdd5c50cd413 SHA1 c9080a031f8ef43e7e6d3e840390428a234e5c80 SHA256 440ddcc5e65f0d7dfd084eb51b19a637d25e434400b1d6d9a3ac997e3d4c6f88
diff --git a/app-accessibility/nfbtrans/files/nfbtrans-7.74-getline-fix.patch b/app-accessibility/nfbtrans/files/nfbtrans-7.74-getline-fix.patch
new file mode 100644
index 000000000000..14c13c063246
--- /dev/null
+++ b/app-accessibility/nfbtrans/files/nfbtrans-7.74-getline-fix.patch
@@ -0,0 +1,40 @@
+diff --git a/nfbtrans.c.orig b/nfbtrans.c
+index e697393..9a2944e 100644
+--- a/nfbtrans.c.orig
++++ b/nfbtrans.c
+@@ -534,7 +534,7 @@ void compact_line(char *);
+ void length_error(char *);
+ void do_lop_op(foptype *);
+ void do_lop(void);
+-void getline(void);
++void nfbtrans_getline(void);
+ void get_input(char *, int);
+ int get_paragraph_type(int);
+ void check_purge(void);
+@@ -2585,7 +2585,7 @@ void do_lop()
+   }
+ }                  /* do_lop */
+ 
+-void getline()
++void nfbtrans_getline()
+ {
+   int i = -1;
+   for (;;)
+@@ -2722,7 +2722,7 @@ int get_paragraph_type(int mode)
+   total_lines = 0;
+   do
+   {
+-    getline();
++    nfbtrans_getline();
+     if (linein[0])
+     {              /* line not empty */
+       if (prev_char == '\0')
+@@ -2874,7 +2874,7 @@ void get_word()
+     }              /* head */
+     else
+       header_flag = 0;
+-    getline();
++    nfbtrans_getline();
+     if (remove_page_nums)
+       remove_page_number();
+     if (auto_center)
diff --git a/app-accessibility/nfbtrans/nfbtrans-7.74.ebuild b/app-accessibility/nfbtrans/nfbtrans-7.74.ebuild
index 98fdf0a74002..9603f13a8edb 100644
--- a/app-accessibility/nfbtrans/nfbtrans-7.74.ebuild
+++ b/app-accessibility/nfbtrans/nfbtrans-7.74.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/nfbtrans/nfbtrans-7.74.ebuild,v 1.7 2009/01/10 17:44:39 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/nfbtrans/nfbtrans-7.74.ebuild,v 1.8 2009/06/15 21:12:04 williamh Exp $
 
 inherit eutils
 
@@ -24,6 +24,7 @@ src_unpack() {
 	mv SPANISH.ZIP spanish.zip
 	make lowercase || die
 	epatch "${FILESDIR}"/${P}-gentoo-fix.patch
+	epatch "${FILESDIR}"/${P}-getline-fix.patch
 }
 
 src_compile() {