Added fix for bug #70734 per seemant's request as he's leaving and won't be able to fix it for awhile.

6 files changed, 42 insertions, 22 deletions

diff --git a/net-misc/wget/ChangeLog b/net-misc/wget/ChangeLog
index d332abeb8dfa..6a44f998fabb 100644
--- a/net-misc/wget/ChangeLog
+++ b/net-misc/wget/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/wget
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.43 2004/12/29 20:16:01 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.44 2005/01/04 06:06:40 chriswhite Exp $
+
+  04 Jan 2005; Chris White <chriswhite@gentoo.org>
+  +files/wget-1.9.1-locale.patch, wget-1.9.1-r2.ebuild:
+  Added fix for bug #70734 per seemant's request as he's leaving and won't be
+  able to fix it for awhile.
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index ec550b472a29..9314bcf3a4db 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,12 +1,23 @@
-MD5 63ec9182faa7accf8f12a6f9b283c846 ChangeLog 7373
-MD5 0b7b828f2beadb6465e22989b832ef8d wget-1.9-r2.ebuild 1603
-MD5 046eabc430b60c0ba9794d04a41d3c4d wget-1.8.2-r3.ebuild 1846
-MD5 4642339e1f3e9a9b2ea96fa989562026 wget-1.9.1-r2.ebuild 1739
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e18288415a1a6f132f95be274772bfb2 ChangeLog 7591
 MD5 d8da3021a3e635af9c4511b2a55b5633 metadata.xml 343
+MD5 6e20ef8fb57b883a884963f69ce7fe59 wget-1.8.2-r3.ebuild 1848
+MD5 5882db0bbf857839e357ac4a0f057b80 wget-1.9-r2.ebuild 1605
+MD5 4f1a7b463fc3a3fe6055ef932d2ffe03 wget-1.9.1-r2.ebuild 1625
 MD5 28f004e72194fae0e65365e48b867c83 files/digest-wget-1.8.2-r3 221
 MD5 cb7be837f683bbf0b328e3f5513d8775 files/digest-wget-1.9-r2 131
+MD5 3ae4d064cf6e6d112fe89fd8e3fa389c files/digest-wget-1.9.1-r2 63
 MD5 f91472025c987d7159170dee736d35e6 files/wget-1.8.2-2Glimit.diff 23388
+MD5 987b30c931a50d2dc02a905c29f84821 files/wget-1.8.2-gentoo.diff 1549
 MD5 daf2955489495fca41ecca68b4e65114 files/wget-1.9-uclibc.patch 2951
 MD5 a48195a152f8913a82d743f3136f3d95 files/wget-1.9.1+ipvmisc.patch 25622
-MD5 987b30c931a50d2dc02a905c29f84821 files/wget-1.8.2-gentoo.diff 1549
-MD5 3ae4d064cf6e6d112fe89fd8e3fa389c files/digest-wget-1.9.1-r2 63
+MD5 4dcb05d1f54b53a2aed7a21663352952 files/wget-1.9.1-locale.patch 322
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFB2jKCFdQwWVoAgN4RAiYqAKDZ55WR4FYF2rpnsGJyvQ8eh9RnKQCg9HVU
+F1l2/1iIwtBmAdqA6L6lwxc=
+=GmqU
+-----END PGP SIGNATURE-----
diff --git a/net-misc/wget/files/wget-1.9.1-locale.patch b/net-misc/wget/files/wget-1.9.1-locale.patch
new file mode 100644
index 000000000000..ca28f37a8aa4
--- /dev/null
+++ b/net-misc/wget/files/wget-1.9.1-locale.patch
@@ -0,0 +1,11 @@
+--- po/Makefile.in.in_old	2001-04-12 21:25:22.000000000 +0900
++++ po/Makefile.in.in	2004-11-11 12:16:10.174648784 +0900
+@@ -67,7 +67,7 @@
+ 	$(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
+ 
+ .po.mo:
+-	$(MSGFMT) -o $@ $<
++	LANG=C LANGUAGE=C $(MSGFMT) -o $@ $<
+ 
+ .po.gmo:
+ 	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
diff --git a/net-misc/wget/wget-1.8.2-r3.ebuild b/net-misc/wget/wget-1.8.2-r3.ebuild
index e57eccb782dd..a80173319694 100644
--- a/net-misc/wget/wget-1.8.2-r3.ebuild
+++ b/net-misc/wget/wget-1.8.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.8.2-r3.ebuild,v 1.14 2004/07/15 03:43:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.8.2-r3.ebuild,v 1.15 2005/01/04 06:06:40 chriswhite Exp $
 
 inherit gnuconfig eutils
 
diff --git a/net-misc/wget/wget-1.9-r2.ebuild b/net-misc/wget/wget-1.9-r2.ebuild
index dad95ba02519..7589ac23d455 100644
--- a/net-misc/wget/wget-1.9-r2.ebuild
+++ b/net-misc/wget/wget-1.9-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.9-r2.ebuild,v 1.10 2004/07/15 03:43:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.9-r2.ebuild,v 1.11 2005/01/04 06:06:40 chriswhite Exp $
 
 inherit gnuconfig eutils
 
diff --git a/net-misc/wget/wget-1.9.1-r2.ebuild b/net-misc/wget/wget-1.9.1-r2.ebuild
index 0c1d2c1ee8e6..2423b44fad15 100644
--- a/net-misc/wget/wget-1.9.1-r2.ebuild
+++ b/net-misc/wget/wget-1.9.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.9.1-r2.ebuild,v 1.20 2004/11/12 15:48:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.9.1-r2.ebuild,v 1.21 2005/01/04 06:06:40 chriswhite Exp $
 
 inherit gnuconfig eutils
 
@@ -23,17 +23,10 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}+ipvmisc.patch
 	epatch ${FILESDIR}/${PN}-1.9-uclibc.patch
+	epatch ${FILESDIR}/${P}-locale.patch
 }
 
 src_compile() {
-	#fix bug 34515, REMOVE THIS AFTER 1.9.1
-	if use nls; then
-		cd po
-		cat de.po | iconv -f UTF-8 -t ISO-8859-1 > de.po.new
-		mv de.po.new de.po
-		cd ..
-	fi
-
 	# Make wget use up-to-date configure scripts
 	gnuconfig_update