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

Package-Manager: portage-2.1.2_rc1-r3

4 files changed, 102 insertions, 13 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/Manifest b/www-client/elinks/Manifest
index bd1cca708a6c..18babdf35a23 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -5,6 +5,10 @@ AUX elinks-0.10.1-utf_8_io-default.patch 456 RMD160 69bcd2fe9a85381d53ef7d2c3da3
 MD5 d027e68bce77b2262fa23fbc77ba1080 files/elinks-0.10.1-utf_8_io-default.patch 456
 RMD160 69bcd2fe9a85381d53ef7d2c3da32e15d8eae36b files/elinks-0.10.1-utf_8_io-default.patch 456
 SHA256 3255c36e7107323d7415995c3c5d2458acf7b739848fb9804157b708956a7010 files/elinks-0.10.1-utf_8_io-default.patch 456
+AUX elinks-0.10.4.conf-syscharset.diff 2580 RMD160 3bb9037e75adc225915a4a6b41afff0ef09f1eba SHA1 fe28f5ae8f290f15f1165273f22e9417f5648e40 SHA256 3269413843aabff245ee3dce522a475e5b3042adf4676b644a63d323bb77818c
+MD5 ca62065cbd5fd110b4a724b0bdafd164 files/elinks-0.10.4.conf-syscharset.diff 2580
+RMD160 3bb9037e75adc225915a4a6b41afff0ef09f1eba files/elinks-0.10.4.conf-syscharset.diff 2580
+SHA256 3269413843aabff245ee3dce522a475e5b3042adf4676b644a63d323bb77818c files/elinks-0.10.4.conf-syscharset.diff 2580
 AUX elinks-0.11.0-gcc4-inline.patch 388 RMD160 535a758ae6a315053f8ab8bcb9f450d427e2098f SHA1 68f6c6dc3bf170aeef6b0d3a5df46bd53b7a3bef SHA256 583d5da585201707b483a3e99c27595b88142d3a5f5c2e65a917d8131bdabe4f
 MD5 52b202f65c123224829a121624237100 files/elinks-0.11.0-gcc4-inline.patch 388
 RMD160 535a758ae6a315053f8ab8bcb9f450d427e2098f files/elinks-0.11.0-gcc4-inline.patch 388
@@ -46,14 +50,14 @@ EBUILD elinks-0.11.0.ebuild 4371 RMD160 13b287e5f8d341b0d0f0d02527171033213d308d
 MD5 7bd6e1da7a1e66ae03c764075fd96014 elinks-0.11.0.ebuild 4371
 RMD160 13b287e5f8d341b0d0f0d02527171033213d308d elinks-0.11.0.ebuild 4371
 SHA256 f6a70d79f8d970ca691321e73d101b1b20e60756ddf867183f7a14bf509480aa elinks-0.11.0.ebuild 4371
-EBUILD elinks-0.11.1.ebuild 4404 RMD160 7148172c725a05f720ddfce6460e0b1706dd771d SHA1 1383cd0b0cde180b5756daa6db1749693030365e SHA256 c0abb28e5e8eaaf8b1609b899fe7a6a7cfbcaf224609401a1529f7274ffef3a5
-MD5 00441a0a4ce8130152c803059816c95d elinks-0.11.1.ebuild 4404
-RMD160 7148172c725a05f720ddfce6460e0b1706dd771d elinks-0.11.1.ebuild 4404
-SHA256 c0abb28e5e8eaaf8b1609b899fe7a6a7cfbcaf224609401a1529f7274ffef3a5 elinks-0.11.1.ebuild 4404
-MISC ChangeLog 14473 RMD160 8a7a05d87d632a16d2e91bb77bd336066daf7d33 SHA1 a8c84e5724e2eea95438d6b16da41e848dd76043 SHA256 cab4258ebc380343de1014b095da711b3e86b119f5acd746cc67dc31f45b060c
-MD5 a945d27d95117c8116f9a202718e804b ChangeLog 14473
-RMD160 8a7a05d87d632a16d2e91bb77bd336066daf7d33 ChangeLog 14473
-SHA256 cab4258ebc380343de1014b095da711b3e86b119f5acd746cc67dc31f45b060c ChangeLog 14473
+EBUILD elinks-0.11.1.ebuild 4458 RMD160 b9792894b88557091b82b34a2c0c6dde387f313a SHA1 f071c0705fbb5390962b4df025f49334fa0b3257 SHA256 cc19a4266eede5dcb9d7234830a7ad70f675c8b28fe20328238148e13fd229c0
+MD5 27f0f095038be1c0daaa941625273e56 elinks-0.11.1.ebuild 4458
+RMD160 b9792894b88557091b82b34a2c0c6dde387f313a elinks-0.11.1.ebuild 4458
+SHA256 cc19a4266eede5dcb9d7234830a7ad70f675c8b28fe20328238148e13fd229c0 elinks-0.11.1.ebuild 4458
+MISC ChangeLog 14712 RMD160 5bfdc5ff28e38f709a557cf37762f5c2747c8e23 SHA1 5aa07fde45ea300cc9418d2fe989114e81a0cda4 SHA256 f8c4bdaf4013838db60e2861cb9ff598ad237c679ed40c8d7cd0372d86bce490
+MD5 d6d816adbc0b7966bc0da04caa56ae2d ChangeLog 14712
+RMD160 5bfdc5ff28e38f709a557cf37762f5c2747c8e23 ChangeLog 14712
+SHA256 f8c4bdaf4013838db60e2861cb9ff598ad237c679ed40c8d7cd0372d86bce490 ChangeLog 14712
 MISC metadata.xml 255 RMD160 399f78e98260d4f311124e71c6d294e368a76976 SHA1 61f663af9ea0cb4967a12878352e65b095dcd473 SHA256 b2dfe92cb4cae7ec4ecb4af91e94b9aa507a3c8214af32f75cf44f6011a13cc5
 MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
 RMD160 399f78e98260d4f311124e71c6d294e368a76976 metadata.xml 255
@@ -76,7 +80,7 @@ SHA256 0074385608ba5c7e0b6193b003b5218c75d179e3bbdb1d1134328332f71ffc6b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFQ+kichej4aZK9/cRAhDUAJ41xKyR49Yb/DRl96Hq/RTmJNAA7gCcDRYt
-gAJZqNIzmOn2bPyKOXrLoWo=
-=BHdo
+iD8DBQFFTJDEchej4aZK9/cRAuoCAJ9W6thRrCVuXyMeIDJuynEvXOBIpACfRNg5
+AFiQZzN5gKTMiJoknSC+Ie8=
+=AinZ
 -----END PGP SIGNATURE-----
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