ipv6 and ipv4 should now both work just fine

7 files changed, 18 insertions, 80 deletions

diff --git a/net-misc/wget/ChangeLog b/net-misc/wget/ChangeLog
index 7cbc17df09e7..dfdee83a7073 100644
--- a/net-misc/wget/ChangeLog
+++ b/net-misc/wget/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/wget
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.33 2003/12/01 17:54:21 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.34 2003/12/05 02:13:03 seemant Exp $
+
+*wget-1.9-r2 (04 Dec 2003)
+
+  04 Dec 2003; Seemant Kulleen <seemant@gentoo.org> wget-1.9-r1.ebuild,
+  wget-1.9-r2.ebuild, wget-1.9.1-r1.ebuild:
+  fix the ipvmisc patch to allow name resolution as well as ipaddresses. The fix
+  was found by: Josh Grebe <josh@brokedown.net> in bug #33827 opened by Marcin
+  Kryczek <crytcheck@napisy.org>
 
   01 Dec 2003; Seemant Kulleen <seemant@gentoo.org> wget-1.9.1-r2.ebuild:
   why was autoconf moved into nls USE check???? Closing bug #34411 by Daniel
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 8fe869265a1c..f564cc7e35f0 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,12 +1,9 @@
 MD5 21d91d5faa8fdf137ef40147b3640fc0 wget-1.9.1-r2.ebuild 1717
-MD5 f7037b5ffa6c9588ce78b59a1c825643 wget-1.9-r1.ebuild 1600
 MD5 47765e34328c20c6d1e5eea63ed5f478 wget-1.8.2-r3.ebuild 1867
-MD5 21d91d5faa8fdf137ef40147b3640fc0 wget-1.9.1-r3.ebuild 1717
-MD5 84b3f4013a1b7d010c59ac8bdffa8e2a wget-1.9-r2.ebuild 1622
-MD5 2b0d98c6f6c8b8d1b2047f39975c5260 ChangeLog 5977
+MD5 c7279264213f1f09db1af1fc9b63cc34 wget-1.9-r2.ebuild 1585
+MD5 17bb0c6b093701920e197db9ad927a2c ChangeLog 6315
 MD5 2b5fde1ea46870de987e3f078face638 metadata.xml 344
 MD5 736cf284b5bbd861e403cfeb2a843465 files/wget-1.9.1+ipvmisc.patch 25623
-MD5 37da667ed578ec42044b54637f46a3ae files/digest-wget-1.9-r1 127
 MD5 cb7be837f683bbf0b328e3f5513d8775 files/digest-wget-1.9-r2 131
 MD5 987b30c931a50d2dc02a905c29f84821 files/wget-1.8.2-gentoo.diff 1549
 MD5 f91472025c987d7159170dee736d35e6 files/wget-1.8.2-2Glimit.diff 23388
diff --git a/net-misc/wget/files/digest-wget-1.9-r1 b/net-misc/wget/files/digest-wget-1.9-r1
deleted file mode 100644
index 8b24ce0890fd..000000000000
--- a/net-misc/wget/files/digest-wget-1.9-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 18ac093db70801b210152dd69b4ef08a wget-1.9.tar.gz 1315995
-MD5 736cf284b5bbd861e403cfeb2a843465 wget-1.9+ipvmisc.patch 25623
diff --git a/net-misc/wget/files/digest-wget-1.9-r2 b/net-misc/wget/files/digest-wget-1.9-r2
new file mode 100644
index 000000000000..81a027bef1bb
--- /dev/null
+++ b/net-misc/wget/files/digest-wget-1.9-r2
@@ -0,0 +1,2 @@
+MD5 18ac093db70801b210152dd69b4ef08a wget-1.9.tar.gz 1315995
+MD5 865374f176bc7577ce26bdbaf45fb170 wget-1.9+ipvmisc-0.1.patch 24915
diff --git a/net-misc/wget/files/digest-wget-1.9.1-r1 b/net-misc/wget/files/digest-wget-1.9.1-r1
deleted file mode 100644
index fc78fd386c38..000000000000
--- a/net-misc/wget/files/digest-wget-1.9.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e6051f1e1487ec0ebfdbda72bedc70ad wget-1.9.1.tar.gz 1322378
diff --git a/net-misc/wget/wget-1.9-r1.ebuild b/net-misc/wget/wget-1.9-r2.ebuild
index 1cf4a9fd4799..14be9887236c 100644
--- a/net-misc/wget/wget-1.9-r1.ebuild
+++ b/net-misc/wget/wget-1.9-r2.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.9-r1.ebuild,v 1.6 2003/11/27 15:19:49 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.9-r2.ebuild,v 1.4 2003/12/05 02:13:04 seemant Exp $
 
 inherit gnuconfig
 
 IUSE="ssl nls static ipv6 debug socks5"
 
-NPVER=20031022
+PATCHVER=0.1
 DESCRIPTION="Network utility to retrieve files from the WWW"
 HOMEPAGE="http://www.cg.tuwien.ac.at/~prikryl/wget.html"
 SRC_URI="mirror://gnu/wget/${P}.tar.gz
-	http://www.episec.com/people/edelkind/patches/wget/${P}+ipvmisc.patch"
+	mirror://gentoo/${P}+ipvmisc-${PATCHVER}.patch"
 
-LICENSE="GPL-2"
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc alpha hppa arm mips amd64 ia64"
 
 RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6b )"
@@ -23,7 +23,7 @@ DEPEND="nls? ( sys-devel/gettext )
 
 src_unpack() {
 	unpack ${P}.tar.gz
-	epatch ${DISTDIR}/${P}+ipvmisc.patch
+	epatch ${DISTDIR}/${P}+ipvmisc-${PATCHVER}.patch
 }
 
 src_compile() {
diff --git a/net-misc/wget/wget-1.9.1-r1.ebuild b/net-misc/wget/wget-1.9.1-r1.ebuild
deleted file mode 100644
index e05b68a92e72..000000000000
--- a/net-misc/wget/wget-1.9.1-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.9.1-r1.ebuild,v 1.10 2003/11/27 15:19:49 brad_mssw Exp $
-
-inherit gnuconfig
-
-IUSE="ssl nls static ipv6 debug socks5"
-
-NPVER=20031022
-DESCRIPTION="Network utility to retrieve files from the WWW"
-HOMEPAGE="http://www.cg.tuwien.ac.at/~prikryl/wget.html"
-SRC_URI="mirror://gnu/wget/${P}.tar.gz"
-#RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~arm ~mips ~amd64 ~ia64"
-
-RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6b )"
-DEPEND="nls? ( sys-devel/gettext )
-	sys-devel/autoconf"
-
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}+ipvmisc.patch
-}
-
-src_compile() {
-	# Make wget use up-to-date configure scripts
-	gnuconfig_update
-
-	local myconf
-	use ssl \
-		&& myconf="${myconf} --with-ssl" \
-		|| myconf="${myconf} --without-ssl --disable-opie --disable-digest"
-
-	use ssl && CFLAGS="${CFLAGS} -I/usr/include/openssl"
-
-	econf \
-		--sysconfdir=/etc/wget \
-		`use_enable ipv6` \
-		`use_enable nls` \
-		`use_enable debug` \
-		`use_with socks5 socks` \
-		${myconf} || die
-
-	if use static; then
-		emake LDFLAGS="--static" || die
-	else
-		emake || die
-	fi
-}
-
-src_install() {
-	if use build; then
-		insinto /usr
-		dobin ${S}/src/wget
-		return
-	fi
-	make prefix=${D}/usr sysconfdir=${D}/etc/wget \
-		mandir=${D}/usr/share/man infodir=${D}/usr/share/info install || die
-	dodoc AUTHORS COPYING ChangeLog MACHINES MAILING-LIST NEWS README TODO
-	dodoc doc/sample.wgetrc
-}