# HG changeset patch
# User holger@hoho.dyndns.org
# Date 1206571325 -3600
# Node ID aa846b9f01c16e7fe9bb6af02a4af3b5eb71c2e1
# Parent  13732669c9a1ac592ef8afa3db289ad3f5eb50a7
wget 1.11.1 is in portage

diff -r 13732669c9a1 -r aa846b9f01c1 net-misc/wget/Manifest
--- a/net-misc/wget/Manifest	Wed Mar 26 21:29:45 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-AUX wget-1.11.1-linking.patch 4935 RMD160 4285dd7325f29ac49edd5c42853c9f09b683b844 SHA1 2ae2e3202daa7ed0c4f33bd005469ab7c558ae7d SHA256 3f3a1b6ec439ba042c3da92cca04990e71ff4894ffc04d2d52a3186194665171
-AUX wgetrc-ipv6 54 RMD160 62ef29e13163463d42934b2ee970e235e64249dc SHA1 35a259c6817cccd04f23c56c9fd5b915f5f0fa00 SHA256 21bae947f1f94b09d2bf50704e1a69d7e90ee59898fd512c146d24e408d1a518
-DIST wget-1.11.1.tar.bz2 929618 RMD160 556239133972c82345e15629d2872839f9a678a5 SHA1 bb75dc1877da04fea2d0b3cc662c0cc51ffb21f5 SHA256 486e2d6be920ceed44602b2f4c08e57d815b8097b4474615f4cd4b463e2b18ca
-EBUILD wget-1.11.1.ebuild 1906 RMD160 b4a619e54399d41fd8f02bb54356eb33cbcaec83 SHA1 0d143cff459ae526eed5e423c9ae52bbd86f8189 SHA256 0cb4c67dfb4be3b5ecf89471588507d51b1c5eb0c020ecc373c482e01fbc704d
diff -r 13732669c9a1 -r aa846b9f01c1 net-misc/wget/files/wget-1.11.1-linking.patch
--- a/net-misc/wget/files/wget-1.11.1-linking.patch	Wed Mar 26 21:29:45 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-For static linking, we need 2 things:
-1) lib-link.m4 should use -l<libname> and not <full path to lib>, else it tries
-   to link against the .so
-2) lib-link.m4 should add $LIBS after the libs we test for, else newer ld's do
-   not resolve symbols in static libs properly.
-
-Martin Schlemmer <azarah@gentoo.org>
-
---- configure
-+++ configure
-@@ -10304,5 +10304,5 @@
-             if test "X$found_so" != "X"; then
-                                                         if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
--                                LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }$found_so"
-+                                LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }-l$name"
-               else
-                                                                                 haveit=
-@@ -10317,8 +10317,8 @@
-                 fi
-                                 if test "$hardcode_direct" = yes; then
--                                                      LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }$found_so"
-+                                                      LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }-l$name"
-                 else
-                   if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
--                                                            LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }$found_so"
-+                                                            LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }-l$name"
-                                                             haveit=
-                     for x in $rpathdirs; do
-@@ -10352,5 +10352,5 @@
-                     fi
-                     if test "$hardcode_minus_L" != no; then
--                                                                                        LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }$found_so"
-+                                                                                        LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }-l$name"
-                     else
-                                                                                                                                                                                 LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }-l$name"
-@@ -10579,5 +10579,5 @@
- 
-     ac_save_LIBS="$LIBS"
--    LIBS="$LIBS $LIBGNUTLS"
-+    LIBS="$LIBGNUTLS $LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -10957,5 +10957,5 @@
-             if test "X$found_so" != "X"; then
-                                                         if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
--                                LIBSSL="${LIBSSL}${LIBSSL:+ }$found_so"
-+                                LIBSSL="${LIBSSL}${LIBSSL:+ }-l$name"
-               else
-                                                                                 haveit=
-@@ -10970,8 +10970,8 @@
-                 fi
-                                 if test "$hardcode_direct" = yes; then
--                                                      LIBSSL="${LIBSSL}${LIBSSL:+ }$found_so"
-+                                                      LIBSSL="${LIBSSL}${LIBSSL:+ }-l$name"
-                 else
-                   if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
--                                                            LIBSSL="${LIBSSL}${LIBSSL:+ }$found_so"
-+                                                            LIBSSL="${LIBSSL}${LIBSSL:+ }-l$name"
-                                                             haveit=
-                     for x in $rpathdirs; do
-@@ -11005,5 +11005,5 @@
-                     fi
-                     if test "$hardcode_minus_L" != no; then
--                                                                                        LIBSSL="${LIBSSL}${LIBSSL:+ }$found_so"
-+                                                                                        LIBSSL="${LIBSSL}${LIBSSL:+ }-l$name"
-                     else
-                                                                                                                                                                                 LIBSSL="${LIBSSL}${LIBSSL:+ }-l$name"
-@@ -11232,5 +11232,5 @@
- 
-     ac_save_LIBS="$LIBS"
--    LIBS="$LIBS $LIBSSL"
-+    LIBS="$LIBSSL $LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
---- src/Makefile.in
-+++ src/Makefile.in
-@@ -53,7 +53,7 @@
- DEFS     = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\"
- CFLAGS   = @CFLAGS@
- LDFLAGS  = @LDFLAGS@ 
--LIBS     = @LIBS@ @LIBSSL@ @LIBGNUTLS@
-+LIBS     = @LIBSSL@ @LIBGNUTLS@ @LIBS@
- exeext   = @EXEEXT@
- 
- INCLUDES = -I. -I$(srcdir)
---- Makefile.in
-+++ Makefile.in
-@@ -58,7 +58,7 @@
- CFLAGS = @CFLAGS@
- CPPFLAGS = @CPPFLAGS@
- DEFS = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\"
--LIBS = @LIBS@ @LIBSSL@ @LIBGNUTLS@
-+LIBS = @LIBSSL@ @LIBGNUTLS@ @LIBS@
- LDFLAGS = @LDFLAGS@
- 
- #
diff -r 13732669c9a1 -r aa846b9f01c1 net-misc/wget/files/wgetrc-ipv6
--- a/net-misc/wget/files/wgetrc-ipv6	Wed Mar 26 21:29:45 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-
-# To try ipv6 addresses first:
-#prefer-family = IPv6
diff -r 13732669c9a1 -r aa846b9f01c1 net-misc/wget/wget-1.11.1.ebuild
--- a/net-misc/wget/wget-1.11.1.ebuild	Wed Mar 26 21:29:45 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-# 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
-}
-
-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
-}