Grab fix from upstream for progress bar assert failure in some locales #208484 by Maxim Britov.

(Portage version: 2.2_pre2)

3 files changed, 91 insertions, 1 deletions

diff --git a/net-misc/wget/ChangeLog b/net-misc/wget/ChangeLog
index 3b13c12f17b7..3784911ed0d6 100644
--- a/net-misc/wget/ChangeLog
+++ b/net-misc/wget/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/wget
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.91 2008/01/28 17:36:04 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.92 2008/02/16 22:12:23 vapier Exp $
+
+*wget-1.11-r1 (16 Feb 2008)
+
+  16 Feb 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/wget-1.11-progress-bar-assert.patch, +wget-1.11-r1.ebuild:
+  Grab fix from upstream for progress bar assert failure in some locales
+  #208484 by Maxim Britov.
 
   28 Jan 2008; <pva@gentoo.org> wget-1.10.2.ebuild, wget-1.11.ebuild:
   License changed to GPL-3, thank you Winterheart for report, quotation fix.
diff --git a/net-misc/wget/files/wget-1.11-progress-bar-assert.patch b/net-misc/wget/files/wget-1.11-progress-bar-assert.patch
new file mode 100644
index 000000000000..8a11dde99810
--- /dev/null
+++ b/net-misc/wget/files/wget-1.11-progress-bar-assert.patch
@@ -0,0 +1,15 @@
+fix from upstream for a progress bar error in some locales
+
+http://bugs.gentoo.org/208484
+
+--- src/progress.c	2008-01-26 11:26:58.000000000 +0200
++++ src/progress.c	2008-02-11 10:12:42.000000000 +0200
+@@ -969,8 +969,6 @@
+       move_to_end (p);
+     }
+ 
+-  assert (p - bp->buffer <= bp->width);
+-
+   while (p < bp->buffer + bp->width)
+     *p++ = ' ';
+   *p = '\0';
diff --git a/net-misc/wget/wget-1.11-r1.ebuild b/net-misc/wget/wget-1.11-r1.ebuild
new file mode 100644
index 000000000000..7489af49f903
--- /dev/null
+++ b/net-misc/wget/wget-1.11-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.11-r1.ebuild,v 1.1 2008/02/16 22:12:23 vapier Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Network utility to retrieve files from the WWW"
+HOMEPAGE="http://www.gnu.org/software/wget/"
+SRC_URI="mirror://gnu/wget/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="debug ipv6 nls socks5 ssl static"
+
+RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6b )
+	socks5? ( net-proxy/dante )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-linking.patch
+	epatch "${FILESDIR}"/${P}-progress-bar-assert.patch #208484
+}
+
+src_compile() {
+	# openssl-0.9.8 now builds with -pthread on the BSD's
+	use elibc_FreeBSD && use ssl && append-ldflags -pthread
+
+	use static && append-ldflags -static
+	econf \
+		$(use_with ssl) $(use_enable ssl opie) $(use_enable ssl digest) \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_enable debug) \
+		$(use_with socks5 socks) \
+		|| die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog* MAILING-LIST NEWS README
+	dodoc doc/sample.wgetrc
+
+	use ipv6 && cat "${FILESDIR}"/wgetrc-ipv6 >> "${D}"/etc/wgetrc
+
+	sed -i \
+		-e 's:/usr/local/etc:/etc:g' \
+		"${D}"/etc/wgetrc \
+		"${D}"/usr/share/man/man1/wget.1 \
+		"${D}"/usr/share/info/wget.info
+}
+
+pkg_preinst() {
+	ewarn "The /etc/wget/wgetrc file has been relocated to /etc/wgetrc"
+	if [[ -e ${ROOT}/etc/wget/wgetrc ]] ; then
+		if [[ -e ${ROOT}/etc/wgetrc ]] ; then
+			ewarn "You have both /etc/wget/wgetrc and /etc/wgetrc ... you should delete the former"
+		else
+			einfo "Moving /etc/wget/wgetrc to /etc/wgetrc for you"
+			mv "${ROOT}"/etc/wget/wgetrc "${ROOT}"/etc/wgetrc
+			rmdir "${ROOT}"/etc/wget 2>/dev/null
+		fi
+	fi
+}