Fix build failure with glibc-2.10, bug 274352.

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

4 files changed, 96 insertions, 9 deletions

diff --git a/app-editors/jove/ChangeLog b/app-editors/jove/ChangeLog
index b5ae27dfafa6..7e3f568ba784 100644
--- a/app-editors/jove/ChangeLog
+++ b/app-editors/jove/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/jove
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jove/ChangeLog,v 1.26 2008/12/04 23:03:16 ulm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jove/ChangeLog,v 1.27 2009/06/16 20:39:45 ulm Exp $
+
+  16 Jun 2009; Ulrich Mueller <ulm@gentoo.org> jove-4.16.0.70.3.1.ebuild,
+  +files/jove-4.16.0.70.3.1-getline.patch:
+  Fix build failure with glibc-2.10, bug 274352.
 
   04 Dec 2008; Ulrich Mueller <ulm@gentoo.org> -jove-4.16.0.70.3.ebuild:
   Remove old.
diff --git a/app-editors/jove/Manifest b/app-editors/jove/Manifest
index 0d2b9826fdc1..99c78bc95805 100644
--- a/app-editors/jove/Manifest
+++ b/app-editors/jove/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX jove-4.16.0.70.3.1-getline.patch 2058 RMD160 b5d68b3008b9a31afd593640bf5b595f2bd4593d SHA1 a8cc545e02a368fb75f4e8b19f1adf1601c41724 SHA256 3d9738661666d379c8003ea2a8e2de996208e8ee301ff7a83397f8e3758ed2cd
 DIST jove_4.16.0.70-3.1.diff.gz 16063 RMD160 d39641b4f4e9ed081138ff21cf9d71f014da0bd9 SHA1 d38caae7c3c1a09b459f987d53491e13e232420b SHA256 0d41388c5070fee94ef87f32e5ef467082e3175793aa5dba3bf9f9de903318cd
 DIST jove_4.16.0.70.orig.tar.gz 451492 RMD160 37fdabc3b91be411e51d71d9029485491d2dec8f SHA1 a954003c177bdc3a0af560df7caa74ee5b2b5735 SHA256 619035b5a5e882ce907498b7252e02d997b346d990e4cb057fbed351ba9a5ec7
-EBUILD jove-4.16.0.70.3.1.ebuild 1287 RMD160 1d17ac6d6514b3a9fc3729fdf27b614495c29c2d SHA1 19ad528a52142ed1f756b74a25f85788a87cbd74 SHA256 3cbfc49c6a5ec88c068cf00e62f9adc5887880eeb49c40479d46c9ca251baaa7
-MISC ChangeLog 4420 RMD160 9f286d22ceab3281ff513662d7753856ddb14acc SHA1 2e67d6606fed2b5d8f559e165c1847d29a02b076 SHA256 e9c54c49a0ba5caaab66f859cccdcdfa3ac5f7a94a49f6ef8aacf26972fd1db3
+EBUILD jove-4.16.0.70.3.1.ebuild 1325 RMD160 05adde77ab1f5091bdce3331cc7106753a24ea39 SHA1 f97fad09f63a49caf58ae510941a7265844764e0 SHA256 78b3320542d3abdcb8f1cd4ec20578c2d7844354f4845bb8c1d87acd119fcd44
+MISC ChangeLog 4587 RMD160 82175019f6af9223a5a70dab6839740289f0f7c1 SHA1 ed55b6ce5a08ae267c2388b6391b4bbd1f78c470 SHA256 42291c7082d7c2a4d3500e67be84cecee5866fef7bad0410568351fe9277ea26
 MISC metadata.xml 611 RMD160 4c06a7334369482c540b9e63920dca1847d07979 SHA1 7407da956422bdbe23f440db8299d0d266d1d736 SHA256 f26b2edc723fc043f51e70f0052bb119663dd3176e0f2afc87d3e4b4fd79c2a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkk4YdwACgkQOeoy/oIi7uxaLACeMdDnVVkPkHXRTwycxvsDlk+e
-OM8AnRmfNASxgzvXHMEosbEeCDuSSl5J
-=sGbN
+iEYEARECAAYFAko4A3wACgkQOeoy/oIi7uz32wCgn1VFgd+oReoinzIUcOjMR/c5
+PeUAoKNFw2co5wUz3kIWPcXM63/E43Sa
+=dVAu
 -----END PGP SIGNATURE-----
diff --git a/app-editors/jove/files/jove-4.16.0.70.3.1-getline.patch b/app-editors/jove/files/jove-4.16.0.70.3.1-getline.patch
new file mode 100644
index 000000000000..98cef6011f8c
--- /dev/null
+++ b/app-editors/jove/files/jove-4.16.0.70.3.1-getline.patch
@@ -0,0 +1,81 @@
+http://bugs.gentoo.org/274352
+Fix build failure with glibc-2.10
+
+--- jove4.16.0.70-orig/insert.c
++++ jove4.16.0.70/insert.c
+@@ -504,7 +504,7 @@
+ 		atchar = 0;
+ 	}
+ 
+-	getline(atline->l_dline, genbuf);
++	get_line(atline->l_dline, genbuf);
+ 	atchar += tchar;
+ 	linecopy(genbuf, atchar, save);
+ 	atline->l_dline = putline(genbuf);
+--- jove4.16.0.70-orig/io.c
++++ jove4.16.0.70/io.c
+@@ -1347,9 +1347,9 @@
+ 
+ void
+ #ifdef USE_PROTOTYPES
+-getline proto((daddr addr, register char *buf))
++get_line proto((daddr addr, register char *buf))
+ #else
+-getline(addr, buf)
++get_line(addr, buf)
+ daddr	addr;
+ register char	*buf;
+ #endif
+--- jove4.16.0.70-orig/io.h
++++ jove4.16.0.70/io.h
+@@ -40,7 +40,7 @@
+ 	close_file proto((File *fp)),
+ 	d_cache_init proto((void)),
+ 	file_write proto((char *fname, bool app)),
+-	getline proto((daddr addr, char *buf)),
++	get_line proto((daddr addr, char *buf)),
+ 	lsave proto((void)),
+ 	putreg proto((File *fp,LinePtr line1,int char1,LinePtr line2,int char2,bool makesure)),
+ 	read_file proto((char *file, bool is_insert)),
+--- jove4.16.0.70-orig/recover.c
++++ jove4.16.0.70/recover.c
+@@ -165,7 +165,7 @@
+ private char	*getblock proto((daddr atl));
+ 
+ void
+-getline(tl, buf)
++get_line(tl, buf)
+ daddr	tl;
+ char	*buf;
+ {
+@@ -580,7 +580,7 @@
+ 	Nchars = Nlines = 0L;
+ 	while (--nlines >= 0) {
+ 		addr = getaddr(ptrs_fp);
+-		getline(addr, buf);
++		get_line(addr, buf);
+ 		Nlines += 1;
+ 		Nchars += 1 + strlen(buf);
+ 		fputs(buf, out);
+--- jove4.16.0.70-orig/util.c
++++ jove4.16.0.70/util.c
+@@ -280,7 +280,7 @@
+ 			strcpy(buf, linebuf);
+ 		Jr_Len = strlen(linebuf);
+ 	} else
+-		getline(line->l_dline, buf);
++		get_line(line->l_dline, buf);
+ 	return buf;
+ }
+ 
+--- jove4.16.0.70-orig/util.h
++++ jove4.16.0.70/util.h
+@@ -18,7 +18,7 @@
+ #define eobp()		(lastp(curline) && eolp())
+ #define eolp()		(linebuf[curchar] == '\0')
+ #define firstp(line)	((line) == curbuf->b_first)
+-#define getDOT()	getline(curline->l_dline, linebuf)
++#define getDOT()	get_line(curline->l_dline, linebuf)
+ #define lastp(line)	((line) == curbuf->b_last)
+ 
+ extern UnivPtr
diff --git a/app-editors/jove/jove-4.16.0.70.3.1.ebuild b/app-editors/jove/jove-4.16.0.70.3.1.ebuild
index e7fbc866e0f9..fb472274c31f 100644
--- a/app-editors/jove/jove-4.16.0.70.3.1.ebuild
+++ b/app-editors/jove/jove-4.16.0.70.3.1.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/app-editors/jove/jove-4.16.0.70.3.1.ebuild,v 1.6 2008/12/04 22:45:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jove/jove-4.16.0.70.3.1.ebuild,v 1.7 2009/06/16 20:39:45 ulm Exp $
 
 inherit eutils toolchain-funcs versionator
 
@@ -27,6 +27,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${WORKDIR}/${MY_DIFFP}.diff"
+	epatch "${FILESDIR}/${P}-getline.patch"
 
 	sed -i \
 		-e "s:-ltermcap:-lncurses:" \