Fix building with glibc-2.10 due to getline #270383 by David Hallas.

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

4 files changed, 15 insertions, 9 deletions

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index 69eabf6e06f7..60aee665654f 100644
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/linux-headers
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.287 2009/05/09 22:02:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.288 2009/05/19 07:23:12 vapier Exp $
+
+  19 May 2009; Mike Frysinger <vapier@gentoo.org>
+  linux-headers-2.6.27-r2.ebuild, linux-headers-2.6.28-r1.ebuild:
+  Fix building with glibc-2.10 due to getline #270383 by David Hallas.
 
 *linux-headers-2.6.29 (09 May 2009)
 
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index a2314448b8ba..18065b90faa2 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -17,15 +17,15 @@ DIST patch-2.4.33.3.bz2 6069 RMD160 dba22420a3c3445042f1193475718fdf4c5a6c3d SHA
 EBUILD linux-headers-2.4.33.3.ebuild 599 RMD160 aee6698c5bdca15aa63a316bc34c8c03c0a2bd3f SHA1 cfc03a9296a0756959c56544825f0000bd77ac5f SHA256 d09cd3f3218c855e8fa4358282edb87f8dd3d4aee28f84dcbe401ed98b3f1e46
 EBUILD linux-headers-2.4.36.ebuild 610 RMD160 b7460f982042adb0a14748967b3dbf0050ad144e SHA1 4ef0a7d29eb2ec380da613558c9426810f9baeca SHA256 a7f9a2ea6541da2eda3178368bab8a0b111ee0618c14c69adc88f6367ea57e83
 EBUILD linux-headers-2.6.23-r3.ebuild 1082 RMD160 cdaade84c46000495b1a4919df41d9fbebfad984 SHA1 e1cc4de22fd33aaf45813917f1c5c8588125b503 SHA256 00ca1b2526644200957b436be24d489a34084a8b561edd304a692f1503e197f0
-EBUILD linux-headers-2.6.27-r2.ebuild 1344 RMD160 d778ac1b61c4a762a41d131fd83df7c0831709c5 SHA1 08f346af6c6e31a89d5cdcf72ba10afb92573d00 SHA256 901bee44ff40b87c85de95ba38e64e38e44577835c8fea33a39c42571e5a118d
-EBUILD linux-headers-2.6.28-r1.ebuild 1432 RMD160 0435a6196d6e255afa1711eaf3653e2270535df1 SHA1 bb51ec93d81bbf1e28eac7f328205807c7bb15e1 SHA256 88f5c45bf08f7ab82e5634f1a35222c1da424b8a6bc0b1a4a3462eb2e0d99dfc
+EBUILD linux-headers-2.6.27-r2.ebuild 1412 RMD160 fc2df75914d70e56110bcebbb3760a6801a6d995 SHA1 33322bad8aa714f5cc12939da6098a7a3fc378b0 SHA256 be69de0db756aad1094418273c0a45e5e2b8647ac2cd40e197acee0a7f44c2c7
+EBUILD linux-headers-2.6.28-r1.ebuild 1499 RMD160 8b0110c4b1946ad8945390d8b5ea1ee3f1bad000 SHA1 40b471714a3b51aeae5f4b19917b8f31c756adcd SHA256 13ca158ce92de5424969bd866cc1b508bbcdfd4661acf5f83dfd5a2d475f31a1
 EBUILD linux-headers-2.6.29.ebuild 1429 RMD160 838f6d0b14da4ac6e51b70b707cba85ec318b2c4 SHA1 4204cfe137827798d2cef86fc677e40c629d9a55 SHA256 14ddac375d2d57ad1a4198c4776586a1396b5a18bf82301fd529ecd90948a1e1
-MISC ChangeLog 49103 RMD160 e3e9498eba174f870d4049bed58982e5a5c0675d SHA1 633404c747487f84cf3acb7d3658729999e55d1c SHA256 6ac5d8a6ca6d879886f87a2d7b614577b37d6aeb4df8336e8c55a06c7d2f086c
+MISC ChangeLog 49291 RMD160 fc0fe2e31856d53d9c5eaecc16f604b793daa2b9 SHA1 a96fb126b45ef674e34ae87ea8f00715e8dd3be7 SHA256 1a3904d810a26383e5221a17fdd2cfebe26bc58d23733cc69108329eac0aaf47
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoF/YYACgkQn/5bYzqsSmFLjwCguyCasDAoXI/MRkOuZj4ULy4T
-JBYAoJNbl3/deVuSxjznB+z+etoGiHyy
-=3TQx
+iEYEARECAAYFAkoSXmYACgkQn/5bYzqsSmEyUQCfQk8QTchx/31880ypmEJ+uuS6
+s74AoJ2ElaMogcCK836XOOZeedC/Qw0L
+=tcsj
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.27-r2.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.27-r2.ebuild
index fc1eb79cce4d..464df1969998 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.27-r2.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.27-r2.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/sys-kernel/linux-headers/linux-headers-2.6.27-r2.ebuild,v 1.9 2009/05/09 20:48:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.27-r2.ebuild,v 1.10 2009/05/19 07:23:12 vapier Exp $
 
 ETYPE="headers"
 H_SUPPORTEDARCH="alpha amd64 arm cris hppa m68k mips ia64 ppc ppc64 s390 sh sparc x86"
@@ -22,6 +22,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	[[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV}
+	sed -i 's:\<getline\>:get_line:' scripts/unifdef.c || die #270383
 	# workaround #244640
 	mkdir arch/sparc64
 	touch arch/sparc64/Makefile
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.28-r1.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.28-r1.ebuild
index 8f22cc52e27b..9868f9d95021 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.28-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.28-r1.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/sys-kernel/linux-headers/linux-headers-2.6.28-r1.ebuild,v 1.3 2009/05/09 20:48:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.28-r1.ebuild,v 1.4 2009/05/19 07:23:12 vapier Exp $
 
 ETYPE="headers"
 H_SUPPORTEDARCH="alpha amd64 arm cris hppa m68k mips ia64 ppc ppc64 s390 sh sparc x86"
@@ -22,6 +22,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	[[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV}
+	sed -i 's:\<getline\>:get_line:' scripts/unifdef.c || die #270383
 	# workaround #244640
 	mkdir arch/sparc64
 	touch arch/sparc64/Makefile