Fix building with GLIBC 2.10+ wrt #277559.

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

4 files changed, 63 insertions, 20 deletions

diff --git a/app-editors/elvis/ChangeLog b/app-editors/elvis/ChangeLog
index d4364daac5bc..6a08b58d1bc4 100644
--- a/app-editors/elvis/ChangeLog
+++ b/app-editors/elvis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/elvis
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/ChangeLog,v 1.41 2008/03/11 11:24:56 nelchael Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/ChangeLog,v 1.42 2009/08/05 18:29:29 ssuominen Exp $
+
+  05 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> elvis-2.2.0-r3.ebuild,
+  +files/elvis-2.2.0-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #277559.
 
   11 Mar 2008; Krzysiek Pawlik <nelchael@gentoo.org> -elvis-2.2.0-r1.ebuild,
   -elvis-2.2.0-r2.ebuild, elvis-2.2.0-r3.ebuild:
diff --git a/app-editors/elvis/Manifest b/app-editors/elvis/Manifest
index 1c4b82ee70cd..7a9d6a5bd8ac 100644
--- a/app-editors/elvis/Manifest
+++ b/app-editors/elvis/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX elvis-2.2.0-glibc-2.10.patch 1526 RMD160 bcc0a2905063606ee6079a12a474a2aa27649d47 SHA1 d21ab5fd0146025bfa0750a78dace1ce5204eb88 SHA256 1363fd4ed25c7b97d1a79da7c243f38ed5d2053fdf83e23ed0be3167bd14c46d
 AUX ft2.3-symbol-collision-fix.patch 2396 RMD160 c80ec1c5e7a15e2dea185e2d0d83da5fccd39b1b SHA1 3957feb87b9d8fe0a3a58ec8715d0c328545c086 SHA256 59960b0498863f0793b5c33a824efc62c6255d26455d3ec6c87f62cb1969f008
 DIST elvis-2.2_0.tar.gz 1439293 RMD160 9867a3941a84a3db0bcfe4e36dd14132fbcf5805 SHA1 8c16574b6d36529735b8ced70972ddaf6275a477 SHA256 9a8466b2293798441056bc279736af3a616baaba2f11940396cc60ff71924ea0
-EBUILD elvis-2.2.0-r3.ebuild 2230 RMD160 563a98e9967368941d1f9cadb2b545415190dfe9 SHA1 aee97aa18e1a5acc517962e845e051998555b5ac SHA256 dc831a3415a9d6a223c680bd2cf570ba2d732fe5cb15935e8a01de415748f3e9
-MISC ChangeLog 4930 RMD160 449874bdc2336f1fa7a207e3c4026e61f1b5f799 SHA1 1baaace537b685003e1384a22843aa901757de44 SHA256 3188e96f6fde72da8d2c7b1b156784cfa750849eb68ac5792587346b181cad34
+EBUILD elvis-2.2.0-r3.ebuild 2266 RMD160 d3d1f48a644358a400b89122b367b056f3816f20 SHA1 7d382ea75bfabde0fc762de600763e34b5782223 SHA256 56358b67b78a984dbecee454aba85c18cc52936af299fdbba12f30c4a0290da9
+MISC ChangeLog 5093 RMD160 f1d80da05b4d9334cfd949b6622fbffef51ac371 SHA1 df55b7d62313d1419aa0182f883ecd48746b6a70 SHA256 02bd20ecd425e48c4afbb20b28869545cf9c2cd29acb656a466b35c2da2d5266
 MISC metadata.xml 156 RMD160 3e105a159e09ab3231aaa16b01919bcfbf58a0a8 SHA1 fe63ba71f6fd04f1e293fb238af2eba994b0335d SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH1mwOgo/w9rxVVVERAkD7AJ0WzD+DiispWvn7g/gXbF14KvsUJQCfRmkV
-GOCOBy8hMBU8b0qI5SrEv8U=
-=8ST9
------END PGP SIGNATURE-----
diff --git a/app-editors/elvis/elvis-2.2.0-r3.ebuild b/app-editors/elvis/elvis-2.2.0-r3.ebuild
index e3cdd0416b3e..5f779ecefed9 100644
--- a/app-editors/elvis/elvis-2.2.0-r3.ebuild
+++ b/app-editors/elvis/elvis-2.2.0-r3.ebuild
@@ -1,10 +1,10 @@
-# 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/elvis/elvis-2.2.0-r3.ebuild,v 1.10 2008/03/11 11:24:56 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.2.0-r3.ebuild,v 1.11 2009/08/05 18:29:29 ssuominen Exp $
 
 inherit eutils versionator
 
-MY_PV="$(replace_version_separator 2 '_')"
+MY_PV=$(replace_version_separator 2 '_')
 
 DESCRIPTION="A vi/ex clone"
 HOMEPAGE="ftp://ftp.cs.pdx.edu/pub/elvis/"
@@ -23,13 +23,13 @@ DEPEND=">=sys-libs/ncurses-5.2
 		>=x11-libs/libXft-2.1.8.2 )
 	app-admin/eselect-vi"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
+S=${WORKDIR}/${PN}-${MY_PV}
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
-	epatch "${FILESDIR}/ft2.3-symbol-collision-fix.patch"
+	epatch "${FILESDIR}"/ft2.3-symbol-collision-fix.patch \
+		"${FILESDIR}"/${P}-glibc-2.10.patch
 }
 
 src_compile() {
diff --git a/app-editors/elvis/files/elvis-2.2.0-glibc-2.10.patch b/app-editors/elvis/files/elvis-2.2.0-glibc-2.10.patch
new file mode 100644
index 000000000000..1a3d1affb303
--- /dev/null
+++ b/app-editors/elvis/files/elvis-2.2.0-glibc-2.10.patch
@@ -0,0 +1,48 @@
+diff -ur elvis-2.2_0.orig/ref.c elvis-2.2_0/ref.c
+--- elvis-2.2_0.orig/ref.c	2003-10-21 05:32:25.000000000 +0300
++++ elvis-2.2_0/ref.c	2009-08-05 21:28:30.000000000 +0300
+@@ -42,7 +42,7 @@
+ 
+ #if USE_PROTOTYPES
+ static void usage(char *argv0);
+-static char *getline(FILE *fp);
++static char *get_line(FILE *fp);
+ static void store(char *line, char **list);
+ static LINECLS classify(char *line, LINECLS prev);
+ static void lookup(TAG *tag);
+@@ -171,7 +171,7 @@
+ /* This function reads a single line, and replaces the terminating newline with
+  * a '\0' byte.  The string will be in a static buffer.  Returns NULL at EOF.
+  */
+-static char *getline(fp)
++static char *get_line(fp)
+ 	FILE	*fp;
+ {
+ 	int	ch;
+@@ -348,7 +348,7 @@
+ 	}
+ 
+ 	/* for each line... */
+-	for (lnum = 1, lc = LC_COMPLETE; (line = getline(fp)) != NULL; lnum++)
++	for (lnum = 1, lc = LC_COMPLETE; (line = get_line(fp)) != NULL; lnum++)
+ 	{
+ 		/* is this the tag definition? */
+ 		if (taglnum > 0 ? taglnum == lnum : !strncmp(tagline, line, len))
+@@ -377,7 +377,7 @@
+ 			{
+ 				if (strchr(line, '(') != NULL)
+ 				{
+-					while ((line = getline(fp)) != NULL
++					while ((line = get_line(fp)) != NULL
+ 					    && *line
+ 					    && ((*line != '#' && *line != '{')
+ 						|| line[strlen(line) - 1] == '\\'))
+@@ -387,7 +387,7 @@
+ 				}
+ 				else if ((lc = classify(line, lc)) == LC_PARTIAL)
+ 				{
+-					while ((line = getline(fp)) != NULL
++					while ((line = get_line(fp)) != NULL
+ 					    && (lc = classify(line, lc)) == LC_PARTIAL)
+ 					{
+ 						puts(line);