header cleanup patch: locale.h should be explicitly included

  to get LC_ALL definition (bug #286198)
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 24 insertions, 4 deletions

diff --git a/www-client/lynx/ChangeLog b/www-client/lynx/ChangeLog
index a1aeb106ba06..8d6df8bb5b47 100644
--- a/www-client/lynx/ChangeLog
+++ b/www-client/lynx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/lynx
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.99 2009/09/15 13:45:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.100 2009/10/05 06:47:54 wormo Exp $
+
+  05 Oct 2009; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  +files/lynx-2.8.7-include-locale.patch, lynx-2.8.7_p1.ebuild:
+  header cleanup patch: locale.h should be explicitly included
+  to get LC_ALL definition (bug #286198)
 
   15 Sep 2009; Jeroen Roovers <jer@gentoo.org> lynx-2.8.7_p1.ebuild:
   Stable for HPPA (bug #283035).
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index d07bb513366e..e9cd603b0f7f 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -1,9 +1,10 @@
 AUX lynx-2.8.6-CVE-2008-4690.patch 1598 RMD160 f54f9a8ddf113e1d57eefbc4a624a4b2b0bca8a9 SHA1 3c6784afa7df360927126e9d49c310c62eb0341e SHA256 c65a04c603611c5e3f02ee2aa5f3a5a27a073cb3632063a50c22602b05d7996a
 AUX lynx-2.8.7-configure-openssl.patch 1222 RMD160 39f979bfad18b63322c91b2dd2762ad9674efd83 SHA1 50a987b46ec1139cf3ee73151b56a41bda04e74c SHA256 1b7e679307a05e92646b9b6ee96f69ddbc5b60d72ad8bd7e3661c07d46abea15
+AUX lynx-2.8.7-include-locale.patch 381 RMD160 25566fffe5f4a0674b5130a44e33facc76252ba6 SHA1 18e9f8e71bbd248e597c7d8755509579c3842c1f SHA256 47bf397918356141dcee2556865032ac75f7ea72252e758246f881785b80992c
 DIST lynx2.8.6rel.4.tar.bz2 2291156 RMD160 47e48e4136df298bf5168bc8d2d49e1ac92a6820 SHA1 b4e37025e99aabaddb219b2f27b1b0ac5db89708 SHA256 c7d876d52d08e4e593e8f3a04ba6d6c86685570828d1b7a16723702c7643c2a3
 DIST lynx2.8.7rel.1.tar.bz2 2432045 RMD160 0969f85b6776c5e426cea4b910271356f9193bf1 SHA1 f5e67a298322b22fe0edcfba326c02eaa5edcb72 SHA256 40ec9774deb4a7acf69e1bcfb5e272a3857ccc17e20d923255d64cb5dbe55dad
 EBUILD lynx-2.8.6-r2.ebuild 2151 RMD160 19de76e04bede84a94aabc841430e13d7cee1c3b SHA1 2d4f595bf6e493406b824e52038d9e7baacdec15 SHA256 ceebc1f28c4d2a1057a2deca3819aae89db0aeb1bc7f61bd121eacf82b58d844
 EBUILD lynx-2.8.6-r4.ebuild 2241 RMD160 a7d0b18ecb42e5e9f8fd2b5f114e66d9a88c7ed8 SHA1 a3e1adfef7976492cd3aeceee6d46e2388d2e84d SHA256 b5e260b022a41c8932a736db3fcf82b6df44504dfd40455c907ee146eb070a88
-EBUILD lynx-2.8.7_p1.ebuild 3129 RMD160 9c96c631d905fbb85ab865db5490b0394fe1cf46 SHA1 57de46713b8938fbcb8a5a4e12b46fd03ae11751 SHA256 40d97b5846cc35df141266247c3b2cae4a177f5ad555ad1d85bd00bff9a0b1dc
-MISC ChangeLog 18738 RMD160 f573717ccd8e92d70412eaa34492c551581ad0ed SHA1 41f0e5b18ba379454d384c32965fcd668b9401fc SHA256 1c5619065a77fcbf721c842cc1d5aa310db00a285c6ababb2b56fe0ebeb53c22
+EBUILD lynx-2.8.7_p1.ebuild 3255 RMD160 9b4ef6c00da2685e874e60463159db8b43d895a4 SHA1 eb371c77b76af31816a81015a4c9412238d87aad SHA256 8e9bbd53d06ce6b43d8a8bf898d87282eb21f71b9e646a64e8c1894b55e1e568
+MISC ChangeLog 18970 RMD160 b96df59a4fc99e5d7c02969bfbf25198416e058d SHA1 3bc771740c6687bb6fd75bc576d0ecaee201466a SHA256 2f12819098a99c3c2be36f9f0055248fb90314a598065142bf1c433fd053164a
 MISC metadata.xml 404 RMD160 f0a1810344dee760f35a9d4aa6e404e0e9904a00 SHA1 6e87ab7e46d6e24385a722abcd774c8c82c8fc5c SHA256 703ad7ce52e513f1c0f4c6c3361d20cb07bffe698dc3bdd21f17f66943e3a7e5
diff --git a/www-client/lynx/files/lynx-2.8.7-include-locale.patch b/www-client/lynx/files/lynx-2.8.7-include-locale.patch
new file mode 100644
index 000000000000..0b600132560b
--- /dev/null
+++ b/www-client/lynx/files/lynx-2.8.7-include-locale.patch
@@ -0,0 +1,11 @@
+--- src/LYMain.c.orig	2009-10-04 22:18:14.000000000 -0700
++++ src/LYMain.c	2009-10-04 22:29:54.000000000 -0700
+@@ -57,7 +57,7 @@
+ #include <io.h>
+ #endif
+ 
+-#if defined(LOCALE) && !defined(HAVE_LIBINTL_H)
++#if defined(LOCALE) && (!defined(HAVE_LIBINTL_H) || !defined(LC_ALL))
+ #undef gettext			/* Solaris locale.h prototypes gettext() */
+ #include <locale.h>
+ #ifndef HAVE_GETTEXT
diff --git a/www-client/lynx/lynx-2.8.7_p1.ebuild b/www-client/lynx/lynx-2.8.7_p1.ebuild
index 6c12f0c0a668..4ff6c48990f3 100644
--- a/www-client/lynx/lynx-2.8.7_p1.ebuild
+++ b/www-client/lynx/lynx-2.8.7_p1.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/www-client/lynx/lynx-2.8.7_p1.ebuild,v 1.11 2009/09/15 13:45:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.7_p1.ebuild,v 1.12 2009/10/05 06:47:54 wormo Exp $
 
 EAPI=2
 
@@ -67,6 +67,9 @@ src_prepare() {
 
 	# fix configure for openssl compiled with kerberos (bug #267749)
 	epatch "${FILESDIR}/lynx-2.8.7-configure-openssl.patch"
+
+	# missing include of locale.h when compiled with -O0 (bug #286198) 
+	epatch "${FILESDIR}/lynx-2.8.7-include-locale.patch"
 }
 
 src_configure() {