Fix compilation with glibc-2.10 headers, bug 271621.

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

4 files changed, 90 insertions, 6 deletions

diff --git a/dev-tex/dvi2tty/ChangeLog b/dev-tex/dvi2tty/ChangeLog
index 756b49bec0fd..39be2d955279 100644
--- a/dev-tex/dvi2tty/ChangeLog
+++ b/dev-tex/dvi2tty/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-tex/dvi2tty
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/dvi2tty/ChangeLog,v 1.21 2009/03/18 19:30:02 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/dvi2tty/ChangeLog,v 1.22 2009/06/03 14:20:22 ulm Exp $
+
+  03 Jun 2009; Ulrich Mueller <ulm@gentoo.org> +files/dvi2tty-getline.patch,
+  dvi2tty-5.3.1.ebuild:
+  Fix compilation with glibc-2.10 headers. Thanks to <hirakendu@gmail.com>
+  in bug 271621.
 
   18 Mar 2009; Raúl Porcel <armin76@gentoo.org> dvi2tty-5.3.1.ebuild:
   arm/s390/sh stable wrt #253551
diff --git a/dev-tex/dvi2tty/Manifest b/dev-tex/dvi2tty/Manifest
index 2ba7e3440174..8d40befc3583 100644
--- a/dev-tex/dvi2tty/Manifest
+++ b/dev-tex/dvi2tty/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX dvi2tty-cflags.patch 688 RMD160 57800e1992da9b0e87ae563959cde4793082b994 SHA1 db69a9c63cfc4a039de2f0424f9d7af37da518eb SHA256 6659f2ca148e8b6217c962ed9baf5353de672061d06962e1902de42797617f1a
 AUX dvi2tty-gcc.patch 341 RMD160 ad0334af112037fae9ee1fa7e67287bf65ba0665 SHA1 82cb5e16cc8336fb1d9c13bb6e4bf77ea2d85f23 SHA256 79e510dd5145a4939001235292cc560e92bde1b4d10b486445538863ed0da1d5
+AUX dvi2tty-getline.patch 2476 RMD160 e64479d12a54cbeb12bd4026369625451d9ffa79 SHA1 8fe1e58e04ee24f8b922398ccd68e9926ea6c161 SHA256 7e6805b9faf5e54d1503656c862178970136614a785a40c4cc98773e39cf2dcc
 DIST dvi2tty-5.3.1.tar.gz 61374 RMD160 a95b70bb93e46af7d50c5462e697b81eee1ce1d2 SHA1 268cd0a0e7c85afaf43cda8891a8aa87157f4d3c SHA256 341a40f2682042a4ff4da521c5865f2147eb2f0b2dee70c37e08bf003488d813
-EBUILD dvi2tty-5.3.1.ebuild 766 RMD160 e10688add07fde47ecebf3cbb36199384c95a754 SHA1 79a2a88258303ec2a7c6ed99d45e80b6f92ba304 SHA256 610262c3a1599d9ffd1fb3f2c21d67f847853133713c1d6941c3571ee68a50be
-MISC ChangeLog 2426 RMD160 c18e9d2556f0eb4d28548174b3aff1a6e8810979 SHA1 d75a8dba2f82f17dbdcbd140428a1d36a6b6f7aa SHA256 45e825f228585c6be532ab8fe3c57db6f75593d3f6a1ebcc10def592bdfe1742
+EBUILD dvi2tty-5.3.1.ebuild 795 RMD160 520f53fd0e7e84dfe2e7905cd2c58c8dec57f496 SHA1 c562bc257afb1e86a490782ee8354199b6cbe8f6 SHA256 5add803b61213293626d9c13f7a8af8ee1c16238182fd2d64545b99e24341645
+MISC ChangeLog 2616 RMD160 c780c4e6f39d6566f26d2f45ffd023db57fe20d8 SHA1 5b7565a537e955164a7044a277e8fa56ad66803e SHA256 3943021655179d0be732329e82e2ba8676f51fe8ede97d1f2a5f522502a477fd
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEARECAAYFAkomhw0ACgkQOeoy/oIi7uwlMwCgv6eBXhWuFEOy8/CReJ6R296r
+Xg8An3BUGI0w+Ae/PEbxRvnDkHudnOgN
+=GvMk
+-----END PGP SIGNATURE-----
diff --git a/dev-tex/dvi2tty/dvi2tty-5.3.1.ebuild b/dev-tex/dvi2tty/dvi2tty-5.3.1.ebuild
index 4379f45f5819..08c7eebdb834 100644
--- a/dev-tex/dvi2tty/dvi2tty-5.3.1.ebuild
+++ b/dev-tex/dvi2tty/dvi2tty-5.3.1.ebuild
@@ -1,22 +1,23 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/dvi2tty/dvi2tty-5.3.1.ebuild,v 1.18 2009/03/18 19:30:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/dvi2tty/dvi2tty-5.3.1.ebuild,v 1.19 2009/06/03 14:20:22 ulm Exp $
 
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Preview dvi-files on text-only devices"
 HOMEPAGE="http://www.ctan.org/tex-archive/dviware/"
 SRC_URI="ftp://ftp.mesa.nl/pub/dvi2tty/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
-DEPEND=""
 
 src_unpack() {
 	unpack ${A}
 	epatch "${FILESDIR}/${PN}-gcc.patch"
 	epatch "${FILESDIR}/${PN}-cflags.patch"
+	epatch "${FILESDIR}/${PN}-getline.patch"
 }
 
 src_compile() {
diff --git a/dev-tex/dvi2tty/files/dvi2tty-getline.patch b/dev-tex/dvi2tty/files/dvi2tty-getline.patch
new file mode 100644
index 000000000000..932810ea40a5
--- /dev/null
+++ b/dev-tex/dvi2tty/files/dvi2tty-getline.patch
@@ -0,0 +1,67 @@
+http://bugs.gentoo.org/271621
+
+--- dvi2tty-5.3.1-orig/dvistuff.c	2003-01-23 04:01:12.000000000 +0100
++++ dvi2tty-5.3.1/dvistuff.c	2009-06-03 15:57:26.000000000 +0200
+@@ -179,7 +179,7 @@
+ void            ruleaux         (long, long, char);
+ long            horizontalmove  (long);
+ int             skipnops        (void);
+-linetype    *   getline         (void);
++linetype    *   get_line        (void);
+ linetype    *   findline        (void);
+ unsigned long   num             (int);
+ long            snum            (int);
+@@ -208,7 +208,7 @@
+ void            ruleaux         (long rulewt, long ruleht, char ch);
+ long            horizontalmove  (long amount);
+ int             skipnops        (void);
+-linetype    *   getline         (void);
++linetype    *   get_line        (void);
+ linetype    *   findline        (void);
+ unsigned long   num             (int size);
+ long            snum            (int size);
+@@ -376,7 +376,7 @@
+     h = 0L;  v = 0L;                        /* initialize coordinates   */
+     x = 0L;  w = 0L;  y = 0L;  z = 0L;      /* initialize amounts       */
+     sptr = 0;                               /* initialize stack         */
+-    currentline = getline();                /* initialize list of lines */
++    currentline = get_line();               /* initialize list of lines */
+     currentline->vv = 0L;
+     firstline   = currentline;
+     lastline    = currentline;
+@@ -777,7 +777,7 @@
+  * GETLINE -- Returns an initialized line-object 
+  */
+ 
+-linetype *getline(void)
++linetype *get_line(void)
+ {
+     register int  i;
+     register linetype *temp;
+@@ -809,7 +809,7 @@
+ 
+     if (v <= firstline->vv) {                      /* above first line */
+         if (firstline->vv - v > lineheight) {
+-            temp = getline();
++            temp = get_line();
+             temp->next = firstline;
+             firstline->prev = temp;
+             temp->vv = v;
+@@ -820,7 +820,7 @@
+ 
+     if (v >= lastline->vv) {                       /* below last line */
+         if (v - lastline->vv > lineheight) {
+-            temp = getline();
++            temp = get_line();
+             temp->prev = lastline;
+             lastline->next = temp;
+             temp->vv = v;
+@@ -843,7 +843,7 @@
+             return temp->next;
+ 
+     /* no line fits suitable, generate a new one */
+-    currentline = getline();
++    currentline = get_line();
+     currentline->next = temp->next;
+     currentline->prev = temp;
+     temp->next->prev = currentline;