fix build with glibc 2.10, getline conflicts, bug #270611, by Honza Macháček

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

4 files changed, 51 insertions, 8 deletions

diff --git a/app-text/t1utils/ChangeLog b/app-text/t1utils/ChangeLog
index 04fe728f5492..34f16e086ba7 100644
--- a/app-text/t1utils/ChangeLog
+++ b/app-text/t1utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/t1utils
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/t1utils/ChangeLog,v 1.46 2009/04/16 08:48:55 aballier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/t1utils/ChangeLog,v 1.47 2009/05/22 14:38:23 aballier Exp $
+
+  22 May 2009; Alexis Ballier <aballier@gentoo.org> t1utils-1.34.ebuild,
+  +files/t1utils-1.34-glibc-2.10.patch:
+  fix build with glibc 2.10, getline conflicts, bug #270611, by Honza
+  Macháček
 
   16 Apr 2009; Alexis Ballier <aballier@gentoo.org> t1utils-1.34.ebuild:
   block old freetype:1, they collide, bug #266186
diff --git a/app-text/t1utils/Manifest b/app-text/t1utils/Manifest
index 2b678bf85bbe..d4d5dffb852c 100644
--- a/app-text/t1utils/Manifest
+++ b/app-text/t1utils/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX t1utils-1.34-glibc-2.10.patch 800 RMD160 86c34421efd0d6c8772b36dafe11bd0502a71982 SHA1 4c47b0947f7cce15f9223fce6e1a842a7e4a39d5 SHA256 25fc8c9741c9d71e53fd977b21e9279aa0a9121369f3862d2a9848d5d35a7bab
 DIST t1utils-1.34.tar.gz 155425 RMD160 325b6be1267d570acf56cd850323aa12908e736e SHA1 a5b174a1d132436c410edf514ac74a6f4ae258e2 SHA256 9462cd1ec725bda6c9b9f330b2d47e5126ef85f704d547a1d84880e042fa62c6
-EBUILD t1utils-1.34.ebuild 637 RMD160 5ccfb85f65df4caa7936047b3fb22cffb909e0f3 SHA1 1d73839fc2d6b4ed89cb4d6645a273c479daad9b SHA256 23d41ba8662c07b700dd3db158fdae799e32eb999661a368ba39c8d83788722e
-MISC ChangeLog 5507 RMD160 c7ba2379a532c49aeb61971a5e58eb6c0e747e19 SHA1 528a86f89d7f63183c228195bbf92b7ef1bf6e60 SHA256 1f62bad2de1bc43dbc306def9843183352247de40d05cdc874bdb131def324a1
+EBUILD t1utils-1.34.ebuild 747 RMD160 43f3a266148a2c700d4d0f8d5a2078b1b06870f2 SHA1 e3b54a071f0bb16f14150bb296bb3dc621a42254 SHA256 2bcdbb878c023a82360a42cb8c45b939b5e2adf62cbf9fd6efa487c8da72a2a1
+MISC ChangeLog 5704 RMD160 b9ff768cd072d5b8d56b7f5256105c41ef3d1c46 SHA1 da4a9ed3496ecd95c95804e08e05ab9644ed3f39 SHA256 b77132e5715d6fee71a2b7c9149f99588278e2d69b5e1883962ddaf9bbfc17a3
 MISC metadata.xml 255 RMD160 272a5b0433d807244465db46156a4417a1733116 SHA1 3b7d498a9d5f94633233ae1a991ca83f6adb6781 SHA256 b0cf2f9b5f759909bcb3fcb1d80ba3cbb00220b6324b81022ad9dc17a9c38d71
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknm8PwACgkQvFcC4BYPU0ocKACgtQPyIogDhjpiuiVVe21R+XgT
-hMgAoLPL+8iY1OOCq4uN3CxYvUIKuHMN
-=x6ie
+iEYEARECAAYFAkoWuOIACgkQvFcC4BYPU0r4OACghrewfuQoFiM/VXAijvfQCSzd
+wgkAnjRchYD7XxWXA9QMyev1kswCP3kM
+=ZtJo
 -----END PGP SIGNATURE-----
diff --git a/app-text/t1utils/files/t1utils-1.34-glibc-2.10.patch b/app-text/t1utils/files/t1utils-1.34-glibc-2.10.patch
new file mode 100644
index 000000000000..c909c3e56d22
--- /dev/null
+++ b/app-text/t1utils/files/t1utils-1.34-glibc-2.10.patch
@@ -0,0 +1,29 @@
+--- t1utils-1.34/t1asm.c	2008-03-01 17:59:11.000000000 +0000
++++ t1utils-1.34/t1asm.c	2009-05-21 07:47:28.489113686 +0000
+@@ -280,7 +280,7 @@
+    the newline is put into line[]. When terminated by '{', the '{' is not put
+    into line[], and the flag start_charstring is set to 1. */
+ 
+-static void getline()
++static void t_getline()
+ {
+   int c;
+   char *p = line;
+@@ -721,7 +721,7 @@
+      without /Subrs sections and provided a patch. */
+   
+   while (!feof(ifp) && !ferror(ifp)) {
+-    getline();
++    t_getline();
+     
+     if (!ever_active) {
+       if (strncmp(line, "currentfile eexec", 17) == 0 && isspace(line[17])) {
+@@ -792,7 +792,7 @@
+   
+   /* There may be additional code. */
+   while (!feof(ifp) && !ferror(ifp)) {
+-    getline();
++    t_getline();
+     eexec_string(line);
+   }
+   
diff --git a/app-text/t1utils/t1utils-1.34.ebuild b/app-text/t1utils/t1utils-1.34.ebuild
index 7abae4d68594..78b8e3428989 100644
--- a/app-text/t1utils/t1utils-1.34.ebuild
+++ b/app-text/t1utils/t1utils-1.34.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/t1utils/t1utils-1.34.ebuild,v 1.11 2009/04/16 08:48:55 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/t1utils/t1utils-1.34.ebuild,v 1.12 2009/05/22 14:38:23 aballier Exp $
+
+inherit eutils
 
 IUSE=""
 
@@ -15,6 +17,12 @@ DEPEND="virtual/libc"
 RDEPEND="${DEPEND}
 	!<media-libs/freetype-1.4_pre20080316"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/t1utils-1.34-glibc-2.10.patch
+}
+
 src_install () {
 	emake DESTDIR="${D}" install || die "make install failed"
 	dodoc NEWS README