Fix building with GLIBC 2.10+ wrt #277760.

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

4 files changed, 53 insertions, 7 deletions

diff --git a/app-text/bogosort/ChangeLog b/app-text/bogosort/ChangeLog
index 23096c07d3ed..e42076266a80 100644
--- a/app-text/bogosort/ChangeLog
+++ b/app-text/bogosort/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/bogosort
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bogosort/ChangeLog,v 1.13 2009/07/03 01:04:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bogosort/ChangeLog,v 1.14 2009/08/06 11:32:16 ssuominen Exp $
+
+  06 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> bogosort-0.4.2.ebuild,
+  +files/bogosort-0.4.2-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #277760.
 
   03 Jul 2009; Jeroen Roovers <jer@gentoo.org> bogosort-0.4.2.ebuild:
   Quote some variables too.
diff --git a/app-text/bogosort/Manifest b/app-text/bogosort/Manifest
index d354c4382041..f23b9208d1d9 100644
--- a/app-text/bogosort/Manifest
+++ b/app-text/bogosort/Manifest
@@ -1,5 +1,6 @@
+AUX bogosort-0.4.2-glibc-2.10.patch 1479 RMD160 7fc99fab33b85b96ca2c20d7ef3d44c3ed4c30d1 SHA1 dba5c42ab1f646a1f5d18ec398ee5378ae595489 SHA256 8c0aeb13b37d7d41b1a93ef85c887aa0aa30c6b6ca5f7a80a0fdbe7894baac60
 AUX xmalloc.patch 395 RMD160 353199974200b2357bdf865b9175761c6f665562 SHA1 6fbaa3c2d1fd4f6db67bf4ecb343247a367e15f1 SHA256 40bcf7bb6475d1c69f7777da6ef27ba7e96e3ecf99aa3ebfccc842e89485f953
 DIST bogosort-0.4.2.tar.gz 161628 RMD160 fa269a9a5b6de0ec21702d4e090819ffcc0d0511 SHA1 9549be745ed349c231e29fba7616db276d8a11a8 SHA256 bfd66ce866bb8935088873c52323a06997f627a209da1017491425d93e5510ef
-EBUILD bogosort-0.4.2.ebuild 754 RMD160 6cfce833325fd8759b9fe7f2e9adcd19b7fd8553 SHA1 874cdab2518988685230ee86026a23d0092cddf0 SHA256 220a0b64c611e0520615da0a7e980f5da1ba326e051985fc2074aec994ba1994
-MISC ChangeLog 1592 RMD160 d1196aef8675835cb918d3201717be7bd8af53c2 SHA1 cc1905e3a1e11546f887c09fab11ace179a7b5a8 SHA256 3b3b13260001e6dfa304f258f7cf8f5397ebf91f3b3ad078f7d672471da75da0
+EBUILD bogosort-0.4.2.ebuild 810 RMD160 9201b95499455f91006a5044b480218ade871853 SHA1 4a7f1b63ff203db0e664066b06c4a1767d1bfac9 SHA256 c5161dd5df5de24dd118e4b5640b5ed65ef7b4ad7417b7d8d981839371682b75
+MISC ChangeLog 1763 RMD160 e97f40e4685cf9c118337facd2652e491016123d SHA1 3e9acdb6fe9d32e48f8e3e76425ffb902f5174ec SHA256 728a883d253684e4759ede2408d0b95bffb250bfec1b2a51c3f7edd2c30773d5
 MISC metadata.xml 400 RMD160 ddf9bcc15fc719298c21490bfc24a6173ab9248f SHA1 d4212574fc3fa6174c8f54ee0a6996cfc2372401 SHA256 c6f0eaa70a973086f7a052284eac9864551659d4da5beadc89d674e48a3b55a2
diff --git a/app-text/bogosort/bogosort-0.4.2.ebuild b/app-text/bogosort/bogosort-0.4.2.ebuild
index 77664419a4c2..8a88a1b3c28b 100644
--- a/app-text/bogosort/bogosort-0.4.2.ebuild
+++ b/app-text/bogosort/bogosort-0.4.2.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-text/bogosort/bogosort-0.4.2.ebuild,v 1.10 2009/07/03 01:04:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bogosort/bogosort-0.4.2.ebuild,v 1.11 2009/08/06 11:32:16 ssuominen Exp $
 
 inherit libtool eutils toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ulrik.haugen.se/pub/unix/bogosort/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="hppa mips ppc sparc x86"
+KEYWORDS="~amd64 hppa mips ppc sparc x86"
 IUSE=""
 
 DEPEND=""
@@ -18,9 +18,9 @@ RDEPEND=""
 
 src_unpack() {
 	unpack ${A}
-
 	cd "${S}"
-	epatch "${FILESDIR}/xmalloc.patch"
+	epatch "${FILESDIR}"/xmalloc.patch
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
 }
 
 src_compile() {
diff --git a/app-text/bogosort/files/bogosort-0.4.2-glibc-2.10.patch b/app-text/bogosort/files/bogosort-0.4.2-glibc-2.10.patch
new file mode 100644
index 000000000000..ac54c8b61b05
--- /dev/null
+++ b/app-text/bogosort/files/bogosort-0.4.2-glibc-2.10.patch
@@ -0,0 +1,41 @@
+diff -ur bogosort-0.4.2.orig/getlines.c bogosort-0.4.2/getlines.c
+--- bogosort-0.4.2.orig/getlines.c	2002-05-04 23:22:22.000000000 +0300
++++ bogosort-0.4.2/getlines.c	2009-08-06 14:32:22.000000000 +0300
+@@ -49,7 +49,7 @@
+     char **ss = NULL;
+ 
+     /* read all lines available */
+-    while ((s = getline(stream)) != NULL) {
++    while ((s = get_line(stream)) != NULL) {
+ 	if (numlines == allocated)		/* make more room if needed */
+ 	    ss = (char **)xrealloc(ss,
+ 		    (allocated += LINESTEP) * sizeof (char *));
+@@ -81,7 +81,7 @@
+     allocated = numlines + 1;	/* this is a lie, but it's close enough */
+ 
+     /* read all lines available */
+-    while ((s = getline(stream)) != NULL) {
++    while ((s = get_line(stream)) != NULL) {
+ 	if (numlines == allocated)		/* make more room if needed */
+ 	    ss = (char **)xrealloc(ss,
+ 		    (allocated += LINESTEP) * sizeof (char *));
+@@ -100,7 +100,7 @@
+  * line in stream, return NULL on EOF
+  */
+ char *
+-getline(FILE *stream)
++get_line(FILE *stream)
+ {
+     int c, numchars = 0, allocated = 0;
+     char *s = NULL;
+diff -ur bogosort-0.4.2.orig/getlines.h bogosort-0.4.2/getlines.h
+--- bogosort-0.4.2.orig/getlines.h	2002-03-16 00:04:38.000000000 +0200
++++ bogosort-0.4.2/getlines.h	2009-08-06 14:32:48.000000000 +0300
+@@ -39,6 +39,6 @@
+  * getline: return a pointer to a newly allocated string containing the next
+  * line in stream
+  */
+-char *getline(FILE *stream);
++char *get_line(FILE *stream);
+ 
+ #endif /* GETLINES_H */