Change the default config file so that elinks uses system settings to determine the character set (bug #153999).

(Portage version: 2.1.2_rc1-r3)

3 files changed, 87 insertions, 2 deletions

diff --git a/www-client/elinks/ChangeLog b/www-client/elinks/ChangeLog
index 1e9008d1000f..940b66b62365 100644
--- a/www-client/elinks/ChangeLog
+++ b/www-client/elinks/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/elinks
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.50 2006/10/28 23:34:53 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.51 2006/11/04 13:08:12 spock Exp $
+
+  04 Nov 2006; Michał Januszewski <spock@gentoo.org>
+  +files/elinks-0.10.4.conf-syscharset.diff, elinks-0.11.1.ebuild:
+  Change the default config file so that elinks uses system settings to
+  determine the character set (bug #153999).
 
   28 Oct 2006; Michał Januszewski <spock@gentoo.org> elinks-0.10.6.ebuild,
   elinks-0.11.0.ebuild, elinks-0.11.1.ebuild:
diff --git a/www-client/elinks/elinks-0.11.1.ebuild b/www-client/elinks/elinks-0.11.1.ebuild
index e064724a673b..f027880ef12c 100644
--- a/www-client/elinks/elinks-0.11.1.ebuild
+++ b/www-client/elinks/elinks-0.11.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.1.ebuild,v 1.7 2006/10/28 23:34:53 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.1.ebuild,v 1.8 2006/11/04 13:08:12 spock Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.4"
@@ -40,6 +40,7 @@ S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
+	epatch ${FILESDIR}/${PN}-0.10.4.conf-syscharset.diff
 	mv "${PN}-0.10.4.conf" "${PN}.conf"
 	if ! use ftp ; then
 		sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' ${PN}.conf
diff --git a/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff b/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
new file mode 100644
index 000000000000..dc64712b29a8
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
@@ -0,0 +1,79 @@
+--- elinks-0.10.4.conf	2005-04-08 15:29:49.000000000 -0700
++++ elinks-0.10.4-syscharset.conf	2006-11-04 00:26:26.000000000 -0800
+@@ -12,8 +12,6 @@
+   # obsolete config.saving_style. You shouldn't touch it.
+   set config.saving_style_w = 1
+ 
+-    ## terminal.linux.charset <codepage>
+-    set terminal.linux.charset = "us-ascii"
+     ## terminal.linux.transparency [0|1]
+     set terminal.linux.transparency = 1
+     ## terminal.linux.colors [0|1]
+@@ -29,8 +27,6 @@
+     ## terminal.linux.type <num>
+     set terminal.linux.type = 2
+ 
+-    ## terminal.vt100.charset <codepage>
+-    set terminal.vt100.charset = "us-ascii"
+     ## terminal.vt100.transparency [0|1]
+     set terminal.vt100.transparency = 1
+     ## terminal.vt100.colors [0|1]
+@@ -46,8 +42,6 @@
+     ## terminal.vt100.type <num>
+     set terminal.vt100.type = 1
+ 
+-    ## terminal.vt110.charset <codepage>
+-    set terminal.vt110.charset = "us-ascii"
+     ## terminal.vt110.transparency [0|1]
+     set terminal.vt110.transparency = 1
+     ## terminal.vt110.colors [0|1]
+@@ -63,8 +57,6 @@
+     ## terminal.vt110.type <num>
+     set terminal.vt110.type = 1
+ 
+-    ## terminal.xterm.charset <codepage>
+-    set terminal.xterm.charset = "us-ascii"
+     ## terminal.xterm.transparency [0|1]
+     set terminal.xterm.transparency = 1
+     ## terminal.xterm.colors [0|1]
+@@ -80,8 +72,6 @@
+     ## terminal.xterm.type <num>
+     set terminal.xterm.type = 1
+ 
+-    ## terminal.xterm-color.charset <codepage>
+-    set terminal.xterm-color.charset = "us-ascii"
+     ## terminal.xterm-color.transparency [0|1]
+     set terminal.xterm-color.transparency = 1
+     ## terminal.xterm-color.colors [0|1]
+@@ -96,8 +86,7 @@
+     set terminal.xterm-color.m11_hack = 0
+     ## terminal.xterm-color.type <num>
+     set terminal.xterm-color.type = 1
+-    ## terminal.screen.charset <codepage>
+-    set terminal.screen.charset = "us-ascii"
++
+     ## terminal.screen.transparency [0|1]
+     set terminal.screen.transparency = 1
+     ## terminal.screen.colors [0|1]
+@@ -270,10 +259,6 @@
+ 
+ 
+ 
+-    ## document.codepage.assume <codepage>
+-    # Default document codepage.
+-    set document.codepage.assume = "ISO-8859-1"
+-
+     ## document.codepage.force_assumed [0|1]
+     # Ignore charset info sent by server.
+     set document.codepage.force_assumed = 0
+@@ -343,10 +328,6 @@
+ 
+ 
+ 
+-    ## document.dump.codepage <codepage>
+-    # Codepage used in dump output.
+-    set document.dump.codepage = "us-ascii"
+-
+     ## document.dump.width <num>
+     # Width of screen in characters when dumping a HTML document.
+     set document.dump.width = 80