Revision bump with full Gentoo Prefix support, signed off by maintainer with discussion on IRC. Remove old version.

(Portage version: 2.1.10.3/cvs/Linux i686)

4 files changed, 92 insertions, 77 deletions

diff --git a/net-misc/wget/ChangeLog b/net-misc/wget/ChangeLog
index 3fd0c5ebb53b..a04489e88e00 100644
--- a/net-misc/wget/ChangeLog
+++ b/net-misc/wget/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/wget
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.140 2011/09/01 09:24:29 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.141 2011/09/01 15:15:37 darkside Exp $
+
+*wget-1.13.3-r1 (01 Sep 2011)
+
+  01 Sep 2011; Jeremy Olexa <darkside@gentoo.org> -wget-1.12-r2.ebuild,
+  +wget-1.13.3-r1.ebuild, +files/wget-1.13-static-link-libz.patch:
+  Revision bump with full Gentoo Prefix support, signed off by maintainer with
+  discussion on IRC. Remove old version.
 
 *wget-1.13.3 (01 Sep 2011)
 
diff --git a/net-misc/wget/files/wget-1.13-static-link-libz.patch b/net-misc/wget/files/wget-1.13-static-link-libz.patch
new file mode 100644
index 000000000000..e3a1324a3a16
--- /dev/null
+++ b/net-misc/wget/files/wget-1.13-static-link-libz.patch
@@ -0,0 +1,28 @@
+http://bugs.gentoo.org/show_bug.cgi?id=290351
+
+patch by Alan Hourihane
+
+* don't patch configure.ac, or one gets a reconf, bug #286848
+
+*--- configure.ac.old	2009-10-23 10:36:00.000000000 +0100
+*+++ configure.ac	2009-10-23 10:06:41.000000000 +0100
+*@@ -255,7 +255,7 @@
+*     ])
+* 
+*     dnl Now actually check for -lssl
+*-    AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
+*+    AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [z], [
+*   #include <openssl/ssl.h>
+*   #include <openssl/x509.h>
+*   #include <openssl/err.h>
+--- configure.old	2009-10-24 10:20:08.000000000 +0100
++++ configure	2009-10-24 10:20:26.000000000 +0100
+@@ -27496,7 +27496,7 @@
+   rpathdirs=
+   ltrpathdirs=
+   names_already_handled=
+-  names_next_round='ssl crypto'
++  names_next_round='ssl crypto z'
+   while test -n "$names_next_round"; do
+     names_this_round="$names_next_round"
+     names_next_round=
diff --git a/net-misc/wget/wget-1.12-r2.ebuild b/net-misc/wget/wget-1.12-r2.ebuild
deleted file mode 100644
index 000c3c6fd194..000000000000
--- a/net-misc/wget/wget-1.12-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.12-r2.ebuild,v 1.8 2010/09/19 17:50:58 armin76 Exp $
-
-EAPI="2"
-
-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 x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="debug idn ipv6 nls ntlm +ssl static"
-
-RDEPEND="idn? ( net-dns/libidn )
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	if ! use ssl && use ntlm ; then
-		elog "USE=ntlm requires USE=ssl, so disabling ntlm support due to USE=-ssl"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.12-linking.patch
-	epatch "${FILESDIR}"/${PN}-1.12-sni.patch #301312
-	epatch "${FILESDIR}"/${P}-debug-tests.patch #286173
-	epatch "${FILESDIR}"/${P}-CVE-2010-2252.patch #329941
-}
-
-src_configure() {
-	# 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 \
-		--disable-rpath \
-		$(use_with ssl) $(use_enable ssl opie) $(use_enable ssl digest) \
-		$(use_enable idn iri) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use ssl && use_enable ntlm) \
-		$(use_enable debug)
-}
-
-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
-}
diff --git a/net-misc/wget/wget-1.13.3-r1.ebuild b/net-misc/wget/wget-1.13.3-r1.ebuild
new file mode 100644
index 000000000000..87b209f91494
--- /dev/null
+++ b/net-misc/wget/wget-1.13.3-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.13.3-r1.ebuild,v 1.1 2011/09/01 15:15:37 darkside Exp $
+
+EAPI=4
+
+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.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug idn ipv6 nls ntlm +ssl static"
+
+RDEPEND="idn? ( net-dns/libidn )
+	ssl? ( >=dev-libs/openssl-0.9.6b )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+REQUIRED_USE="ntlm? ( ssl )"
+
+DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.13-static-link-libz.patch
+}
+
+src_configure() {
+	# 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 \
+		--disable-rpath \
+		$(use_with ssl) $(use_enable ssl opie) $(use_enable ssl digest) \
+		$(use_enable idn iri) \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_enable ntlm) \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	use ipv6 && cat "${FILESDIR}"/wgetrc-ipv6 >> "${ED}"/etc/wgetrc
+
+	sed -i \
+		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
+		"${ED}"/etc/wgetrc \
+		"${ED}"/usr/share/man/man1/wget.1 \
+		"${ED}"/usr/share/info/wget.info
+}