Removed old versions and files

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

13 files changed, 10 insertions, 1173 deletions

diff --git a/net-misc/wget/ChangeLog b/net-misc/wget/ChangeLog
index 3b4e25e282c0..cfbdb79a7f54 100644
--- a/net-misc/wget/ChangeLog
+++ b/net-misc/wget/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/wget
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.178 2013/12/23 07:23:59 vapier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.179 2014/01/04 18:45:31 polynomial-c Exp $
+
+  04 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> -wget-1.12-r3.ebuild,
+  -wget-1.13.3-r2.ebuild, -wget-1.13.4.ebuild, -wget-1.13.4-r1.ebuild,
+  -files/wget-1.12-CVE-2010-2252.patch, -files/wget-1.12-debug-tests.patch,
+  -files/wget-1.12-linking.patch, -files/wget-1.12-sae.patch,
+  -files/wget-1.12-sni.patch, -files/wget-1.13.4-no-gets.patch,
+  -files/wget-1.13-static-link-libz.patch, -files/wgetrc-ipv6:
+  Removed old versions and files.
 
 *wget-1.14-r1 (23 Dec 2013)
 
diff --git a/net-misc/wget/files/wget-1.12-CVE-2010-2252.patch b/net-misc/wget/files/wget-1.12-CVE-2010-2252.patch
deleted file mode 100644
index d163996d73e2..000000000000
--- a/net-misc/wget/files/wget-1.12-CVE-2010-2252.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-http://bugs.gentoo.org/329941
-
-based on upstream commit, but tweaked to work with wget-1.12 and
-remove useless style changes
-
-------------------------------------------------------------
-revno: 2409
-committer: Giuseppe Scrivano <gscrivano@gnu.org>
-branch nick: wget
-timestamp: Wed 2010-07-28 21:22:22 +0200
-message:
-  Introduce --trust-server-names.  Close CVE-2010-2252.
-diff:
-
-NEWS:
-** By default, on server redirects, use the original URL to get the
-   local file name. Close CVE-2010-2252.
-
-ChangeLog:
-2010-07-28  Giuseppe Scrivano  <gscrivano@gnu.org>
-
-	* http.h (http_loop): Add new argument `original_url'
-	* http.c (http_loop): Add new argument `original_url'.  Use
-	`original_url' to get a filename if `trustservernames' is false.
-
-	* init.c (commands): Add "trustservernames".
-
-	* options.h (library): Add variable `trustservernames'.
-
-	* main.c (option_data): Add trust-server-names.
-	(print_help): Describe --trust-server-names.
-
-	* retr.c (retrieve_url): Pass new argument to `http_loop'.
-
-=== modified file 'doc/wget.texi'
---- doc/wget.texi	2010-05-27 10:45:15 +0000
-+++ doc/wget.texi	2010-07-28 19:22:22 +0000
-@@ -1498,6 +1498,13 @@
- @code{Content-Disposition} headers to describe what the name of a
- downloaded file should be.
- 
-+@cindex Trust server names
-+@item --trust-server-names
-+
-+If this is set to on, on a redirect the last component of the
-+redirection URL will be used as the local file name.  By default it is
-+used the last component in the original URL.
-+
- @cindex authentication
- @item --auth-no-challenge
- 
-@@ -2810,6 +2817,10 @@
- Turn on recognition of the (non-standard) @samp{Content-Disposition}
- HTTP header---if set to @samp{on}, the same as @samp{--content-disposition}.
- 
-+@item trust_server_names = on/off
-+If set to on, use the last component of a redirection URL for the local
-+file name.
-+
- @item continue = on/off
- If set to on, force continuation of preexistent partially retrieved
- files.  See @samp{-c} before setting it.
-
-=== modified file 'src/http.c'
---- src/http.c	2010-07-20 17:42:13 +0000
-+++ src/http.c	2010-07-28 19:22:22 +0000
-@@ -2593,8 +2593,9 @@
- /* The genuine HTTP loop!  This is the part where the retrieval is
-    retried, and retried, and retried, and...  */
- uerr_t
--http_loop (struct url *u, char **newloc, char **local_file, const char *referer,
--           int *dt, struct url *proxy, struct iri *iri)
-+http_loop (struct url *u, struct url *original_url, char **newloc,
-+           char **local_file, const char *referer, int *dt, struct url *proxy,
-+           struct iri *iri)
- {
-   int count;
-   bool got_head = false;         /* used for time-stamping and filename detection */
-@@ -2641,7 +2642,8 @@
-     }
-   else if (!opt.content_disposition)
-     {
--      hstat.local_file = url_file_name (u);
-+      hstat.local_file =
-+        url_file_name (opt.trustservernames ? u : original_url);
-       got_name = true;
-     }
- 
-@@ -2679,7 +2681,7 @@
- 
-   /* Send preliminary HEAD request if -N is given and we have an existing
-    * destination file. */
--  file_name = url_file_name (u);
-+  file_name = url_file_name (opt.trustservernames ? u : original_url);
-   if (opt.timestamping
-       && !opt.content_disposition
-       && file_exists_p (file_name))
-=== modified file 'src/http.h'
---- src/http.h	2010-05-08 19:56:15 +0000
-+++ src/http.h	2010-07-28 19:22:22 +0000
-@@ -33,8 +33,8 @@
- 
- struct url;
- 
--uerr_t http_loop (struct url *, char **, char **, const char *, int *,
--		  struct url *, struct iri *);
-+uerr_t http_loop (struct url *, struct url *, char **, char **, const char *,
-+                  int *, struct url *, struct iri *);
- void save_cookies (void);
- void http_cleanup (void);
- time_t http_atotm (const char *);
-
-=== modified file 'src/init.c'
---- src/init.c	2010-05-08 19:56:15 +0000
-+++ src/init.c	2010-07-28 19:22:22 +0000
-@@ -252,6 +252,7 @@
-   { "timeout",          NULL,                   cmd_spec_timeout },
-   { "timestamping",     &opt.timestamping,      cmd_boolean },
-   { "tries",            &opt.ntry,              cmd_number_inf },
-+  { "trustservernames", &opt.trustservernames,  cmd_boolean },
-   { "useproxy",         &opt.use_proxy,         cmd_boolean },
-   { "user",             &opt.user,              cmd_string },
-   { "useragent",        NULL,                   cmd_spec_useragent },
-
-=== modified file 'src/main.c'
---- src/main.c	2010-06-20 10:10:35 +0000
-+++ src/main.c	2010-07-28 19:22:22 +0000
-@@ -266,5 +266,6 @@
-     { "timeout", 'T', OPT_VALUE, "timeout", -1 },
-     { "timestamping", 'N', OPT_BOOLEAN, "timestamping", -1 },
-     { "tries", 't', OPT_VALUE, "tries", -1 },
-+    { "trust-server-names", 0, OPT_BOOLEAN, "trustservernames", -1 },
-     { "user", 0, OPT_VALUE, "user", -1 },
-     { "user-agent", 'U', OPT_VALUE, "useragent", -1 },
-@@ -680,6 +681,8 @@
-     N_("\
-   -I,  --include-directories=LIST  list of allowed directories.\n"),
-     N_("\
-+       --trust-server-names        use the name specified by the redirection url last component.\n"),
-+    N_("\
-   -X,  --exclude-directories=LIST  list of excluded directories.\n"),
-     N_("\
-   -np, --no-parent                 don't ascend to the parent directory.\n"),
-
-=== modified file 'src/options.h'
---- src/options.h	2010-05-08 19:56:15 +0000
-+++ src/options.h	2010-07-28 19:22:22 +0000
-@@ -242,6 +242,7 @@
-   char *encoding_remote;
-   char *locale;
- 
-+  bool trustservernames;
- #ifdef __VMS
-   int ftp_stmlf;                /* Force Stream_LF format for binary FTP. */
- #endif /* def __VMS */
-
-=== modified file 'src/retr.c'
---- src/retr.c	2010-05-08 19:56:15 +0000
-+++ src/retr.c	2010-07-28 19:22:22 +0000
-@@ -731,7 +731,8 @@
- #endif
-       || (proxy_url && proxy_url->scheme == SCHEME_HTTP))
-     {
--      result = http_loop (u, &mynewloc, &local_file, refurl, dt, proxy_url, iri);
-+      result = http_loop (u, orig_parsed, &mynewloc, &local_file, refurl, dt,
-+                          proxy_url, iri);
-     }
-   else if (u->scheme == SCHEME_FTP)
-     {
-
-make sure tests pass after this change
-https://bugs.gentoo.org/333965
-https://savannah.gnu.org/bugs/index.php?30841
-
---- tests/Test-iri-forced-remote.px
-+++ tests/Test-iri-forced-remote.px
-@@ -174,7 +174,7 @@ my %urls = (
-     },
- );
- 
--my $cmdline = $WgetTest::WGETPATH . " --iri --remote-encoding=iso-8859-1 -nH -r http://localhost:{{port}}/";
-+my $cmdline = $WgetTest::WGETPATH . " --iri --trust-server-names --remote-encoding=iso-8859-1 -nH -r http://localhost:{{port}}/";
- 
- my $expected_error_code = 0;
- 
---- tests/Test-iri-list.px
-+++ tests/Test-iri-list.px
-@@ -143,7 +143,7 @@ my %urls = (
-     },
- );
- 
--my $cmdline = $WgetTest::WGETPATH . " --iri -i http://localhost:{{port}}/url_list.txt";
-+my $cmdline = $WgetTest::WGETPATH . " --iri --trust-server-names -i http://localhost:{{port}}/url_list.txt";
- 
- my $expected_error_code = 0;
- 
---- tests/Test-iri.px
-+++ tests/Test-iri.px
-@@ -186,7 +186,7 @@ my %urls = (
-     },
- );
- 
--my $cmdline = $WgetTest::WGETPATH . " --iri --restrict-file-names=nocontrol -nH -r http://localhost:{{port}}/";
-+my $cmdline = $WgetTest::WGETPATH . " --iri --trust-server-names --restrict-file-names=nocontrol -nH -r http://localhost:{{port}}/";
- 
- my $expected_error_code = 0;
- 
diff --git a/net-misc/wget/files/wget-1.12-debug-tests.patch b/net-misc/wget/files/wget-1.12-debug-tests.patch
deleted file mode 100644
index 2cba7be44f32..000000000000
--- a/net-misc/wget/files/wget-1.12-debug-tests.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-Remove debug code from tests (since they'd require USE=debug)
-
-http://bugs.gentoo.org/286173
-http://bugs.gentoo.org/288156
-
-diff -r f5754f5d165c -r 3aa1d93d1c10 tests/Test-idn-cmd.px
---- a/tests/Test-idn-cmd.px	Fri Sep 25 10:17:49 2009 -0700
-+++ b/tests/Test-idn-cmd.px	Sun Sep 27 11:29:01 2009 -0700
-@@ -28,7 +28,7 @@
-     },
- );
- 
--my $cmdline = $WgetTest::WGETPATH . " --debug --iri -rH"
-+my $cmdline = $WgetTest::WGETPATH . " --iri -rH"
-     . " -e http_proxy=localhost:{{port}} --local-encoding=EUC-JP $euc_jp_hostname";
- 
- my $expected_error_code = 0;
-diff -r f5754f5d165c -r 3aa1d93d1c10 tests/Test-idn-headers.px
---- a/tests/Test-idn-headers.px	Fri Sep 25 10:17:49 2009 -0700
-+++ b/tests/Test-idn-headers.px	Sun Sep 27 11:29:01 2009 -0700
-@@ -40,7 +40,7 @@
-     },
- );
- 
--my $cmdline = $WgetTest::WGETPATH . " --debug --iri -rH"
-+my $cmdline = $WgetTest::WGETPATH . " --iri -rH"
-     . " -e http_proxy=localhost:{{port}} http://start-here.com/start.html";
- 
- my $expected_error_code = 0;
-diff -r f5754f5d165c -r 3aa1d93d1c10 tests/Test-idn-meta.px
---- a/tests/Test-idn-meta.px	Fri Sep 25 10:17:49 2009 -0700
-+++ b/tests/Test-idn-meta.px	Sun Sep 27 11:29:01 2009 -0700
-@@ -41,7 +41,7 @@
-     },
- );
- 
--my $cmdline = $WgetTest::WGETPATH . " --debug --iri -rH"
-+my $cmdline = $WgetTest::WGETPATH . " --iri -rH"
-     . " -e http_proxy=localhost:{{port}} http://start-here.com/start.html";
- 
- my $expected_error_code = 0;
-diff -r f5754f5d165c -r 3aa1d93d1c10 tests/Test-idn-robots.px
---- a/tests/Test-idn-robots.px	Fri Sep 25 10:17:49 2009 -0700
-+++ b/tests/Test-idn-robots.px	Sun Sep 27 11:29:01 2009 -0700
-@@ -48,7 +48,7 @@
-     },
- );
- 
--my $cmdline = $WgetTest::WGETPATH . " --debug --iri -rH"
-+my $cmdline = $WgetTest::WGETPATH . " --iri -rH"
-     . " -e http_proxy=localhost:{{port}} --local-encoding=EUC-JP"
-     . " http://$euc_jp_hostname/";
- 
-diff -r f5754f5d165c -r 3aa1d93d1c10 tests/Test-proxy-auth-basic.px
---- a/tests/Test-proxy-auth-basic.px	Fri Sep 25 10:17:49 2009 -0700
-+++ b/tests/Test-proxy-auth-basic.px	Sun Sep 27 11:29:01 2009 -0700
-@@ -25,7 +25,7 @@
-     },
- );
- 
--my $cmdline = $WgetTest::WGETPATH . " --debug --user=fiddle-dee-dee --password=Dodgson"
-+my $cmdline = $WgetTest::WGETPATH . " --user=fiddle-dee-dee --password=Dodgson"
-     . " -e http_proxy=localhost:{{port}} http://no.such.domain/needs-auth.txt";
- 
- my $expected_error_code = 0;
-
-
-
-
-diff -r ee7b9018a483 tests/Test-E-k-K.px
---- a/tests/Test-E-k-K.px	Fri Oct 09 02:23:26 2009 -0700
-+++ b/tests/Test-E-k-K.px	Tue Oct 13 21:18:51 2009 -0400
-@@ -61,7 +61,7 @@
-     },
- );
- 
--my $cmdline = $WgetTest::WGETPATH . " -d -r -nd -E -k -K http://localhost:{{port}}/index.php";
-+my $cmdline = $WgetTest::WGETPATH . " -r -nd -E -k -K http://localhost:{{port}}/index.php";
- 
- my $expected_error_code = 0;
- 
-diff -r ee7b9018a483 tests/Test-cookies-401.px
---- a/tests/Test-cookies-401.px	Fri Oct 09 02:23:26 2009 -0700
-+++ b/tests/Test-cookies-401.px	Tue Oct 13 21:18:51 2009 -0400
-@@ -29,7 +29,7 @@
-     },
- );
- 
--my $cmdline = $WgetTest::WGETPATH . " -d http://localhost:{{port}}/one.txt"
-+my $cmdline = $WgetTest::WGETPATH . " http://localhost:{{port}}/one.txt"
-     . " http://localhost:{{port}}/two.txt";
- 
- my $expected_error_code = 6;
-diff -r ee7b9018a483 tests/Test-ftp-bad-list.px
---- a/tests/Test-ftp-bad-list.px	Fri Oct 09 02:23:26 2009 -0700
-+++ b/tests/Test-ftp-bad-list.px	Tue Oct 13 21:18:51 2009 -0400
-@@ -29,7 +29,7 @@
-     },
- );
- 
--my $cmdline = $WgetTest::WGETPATH . " -d -nH -Nc -r ftp://localhost:{{port}}/";
-+my $cmdline = $WgetTest::WGETPATH . " -nH -Nc -r ftp://localhost:{{port}}/";
- 
- my $expected_error_code = 0;
- 
-diff -r ee7b9018a483 tests/Test-iri-list.px
---- a/tests/Test-iri-list.px	Fri Oct 09 02:23:26 2009 -0700
-+++ b/tests/Test-iri-list.px	Tue Oct 13 21:18:51 2009 -0400
-@@ -143,7 +143,7 @@
-     },
- );
- 
--my $cmdline = $WgetTest::WGETPATH . " --iri -d -i http://localhost:{{port}}/url_list.txt";
-+my $cmdline = $WgetTest::WGETPATH . " --iri -i http://localhost:{{port}}/url_list.txt";
- 
- my $expected_error_code = 0;
- 
-diff -r ee7b9018a483 tests/Test-iri.px
---- a/tests/Test-iri.px	Fri Oct 09 02:23:26 2009 -0700
-+++ b/tests/Test-iri.px	Tue Oct 13 21:18:51 2009 -0400
-@@ -186,7 +186,7 @@
-     },
- );
- 
--my $cmdline = $WgetTest::WGETPATH . " -d --iri --restrict-file-names=nocontrol -nH -r http://localhost:{{port}}/";
-+my $cmdline = $WgetTest::WGETPATH . " --iri --restrict-file-names=nocontrol -nH -r http://localhost:{{port}}/";
- 
- my $expected_error_code = 0;
- 
diff --git a/net-misc/wget/files/wget-1.12-linking.patch b/net-misc/wget/files/wget-1.12-linking.patch
deleted file mode 100644
index ade2be869d2d..000000000000
--- a/net-misc/wget/files/wget-1.12-linking.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-For static linking, we need to use -l<libname> and not <full path to lib>,
-else it tries to link against the .so.  The lib-link.m4 code is limited here.
-
-Martin Schlemmer <azarah@gentoo.org>
-
---- configure
-+++ configure
-@@ -5862,7 +5862,7 @@ fi
-                         LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
-             if test "X$found_so" != "X"; then
-                                                         if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
--                                LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-+                                LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
-               else
-                                                                                 haveit=
-                 for x in $ltrpathdirs; do
-@@ -5875,10 +5875,10 @@ fi
-                   ltrpathdirs="$ltrpathdirs $found_dir"
-                 fi
-                                 if test "$acl_hardcode_direct" = yes; then
--                                                      LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-+                                                      LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
-                 else
-                   if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
--                                                            LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-+                                                            LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
-                                                             haveit=
-                     for x in $rpathdirs; do
-                       if test "X$x" = "X$found_dir"; then
-@@ -5910,7 +5910,7 @@ fi
-                       LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
-                     fi
-                     if test "$acl_hardcode_minus_L" != no; then
--                                                                                        LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-+                                                                                        LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
-                     else
-                                                                                                                                                                                 LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
-                     fi
-@@ -6854,7 +6854,7 @@ fi
-                         LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
-             if test "X$found_so" != "X"; then
-                                                         if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
--                                LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-+                                LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
-               else
-                                                                                 haveit=
-                 for x in $ltrpathdirs; do
-@@ -6867,10 +6867,10 @@ fi
-                   ltrpathdirs="$ltrpathdirs $found_dir"
-                 fi
-                                 if test "$acl_hardcode_direct" = yes; then
--                                                      LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-+                                                      LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
-                 else
-                   if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
--                                                            LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-+                                                            LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
-                                                             haveit=
-                     for x in $rpathdirs; do
-                       if test "X$x" = "X$found_dir"; then
-@@ -6902,7 +6902,7 @@ fi
-                       LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
-                     fi
-                     if test "$acl_hardcode_minus_L" != no; then
--                                                                                        LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-+                                                                                        LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
-                     else
-                                                                                                                                                                                 LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
-                     fi
-@@ -26907,7 +26907,7 @@ fi
-                         LTLIBGNUTLS="${LTLIBGNUTLS}${LTLIBGNUTLS:+ }-L$found_dir -l$name"
-             if test "X$found_so" != "X"; then
-                                                         if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
--                                LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }$found_so"
-+                                LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }-l$name"
-               else
-                                                                                 haveit=
-                 for x in $ltrpathdirs; do
-@@ -26920,10 +26920,10 @@ fi
-                   ltrpathdirs="$ltrpathdirs $found_dir"
-                 fi
-                                 if test "$acl_hardcode_direct" = yes; then
--                                                      LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }$found_so"
-+                                                      LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }-l$name"
-                 else
-                   if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
--                                                            LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }$found_so"
-+                                                            LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }-l$name"
-                                                             haveit=
-                     for x in $rpathdirs; do
-                       if test "X$x" = "X$found_dir"; then
-@@ -26955,7 +26955,7 @@ fi
-                       LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }-L$found_dir"
-                     fi
-                     if test "$acl_hardcode_minus_L" != no; then
--                                                                                        LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }$found_so"
-+                                                                                        LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }-l$name"
-                     else
-                                                                                                                                                                                 LIBGNUTLS="${LIBGNUTLS}${LIBGNUTLS:+ }-l$name"
-                     fi
-@@ -27183,7 +27183,7 @@ if test "${ac_cv_libgnutls+set}" = set; then
- else
- 
-     ac_save_LIBS="$LIBS"
--    LIBS="$LIBS $LIBGNUTLS"
-+    LIBS="$LIBGNUTLS $LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -27636,7 +27636,7 @@ fi
-                         LTLIBSSL="${LTLIBSSL}${LTLIBSSL:+ }-L$found_dir -l$name"
-             if test "X$found_so" != "X"; then
-                                                         if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
--                                LIBSSL="${LIBSSL}${LIBSSL:+ }$found_so"
-+                                LIBSSL="${LIBSSL}${LIBSSL:+ }-l$name"
-               else
-                                                                                 haveit=
-                 for x in $ltrpathdirs; do
-@@ -27649,10 +27649,10 @@ fi
-                   ltrpathdirs="$ltrpathdirs $found_dir"
-                 fi
-                                 if test "$acl_hardcode_direct" = yes; then
--                                                      LIBSSL="${LIBSSL}${LIBSSL:+ }$found_so"
-+                                                      LIBSSL="${LIBSSL}${LIBSSL:+ }-l$name"
-                 else
-                   if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
--                                                            LIBSSL="${LIBSSL}${LIBSSL:+ }$found_so"
-+                                                            LIBSSL="${LIBSSL}${LIBSSL:+ }-l$name"
-                                                             haveit=
-                     for x in $rpathdirs; do
-                       if test "X$x" = "X$found_dir"; then
-@@ -27684,7 +27684,7 @@ fi
-                       LIBSSL="${LIBSSL}${LIBSSL:+ }-L$found_dir"
-                     fi
-                     if test "$acl_hardcode_minus_L" != no; then
--                                                                                        LIBSSL="${LIBSSL}${LIBSSL:+ }$found_so"
-+                                                                                        LIBSSL="${LIBSSL}${LIBSSL:+ }-l$name"
-                     else
-                                                                                                                                                                                 LIBSSL="${LIBSSL}${LIBSSL:+ }-l$name"
-                     fi
-@@ -27912,7 +27912,7 @@ if test "${ac_cv_libssl+set}" = set; then
- else
- 
-     ac_save_LIBS="$LIBS"
--    LIBS="$LIBS $LIBSSL"
-+    LIBS="$LIBSSL $LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
diff --git a/net-misc/wget/files/wget-1.12-sae.patch b/net-misc/wget/files/wget-1.12-sae.patch
deleted file mode 100644
index 1d3d456d6be1..000000000000
--- a/net-misc/wget/files/wget-1.12-sae.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-http://bugs.gentoo.org/344939
-
-upstream commit 2317
-
-2009-10-24  Petr Pisar  <petr.pisar@atlas.cz>
-
-	* openssl.c: Implement support for (multiple) subjectAltNames in
-	X509 certificates, not just the commonName.
-
---- src/openssl.c	2009-09-22 16:16:43 +0000
-+++ src/openssl.c	2009-10-24 23:06:44 +0000
-@@ -39,7 +39,7 @@
- #include <string.h>
- 
- #include <openssl/ssl.h>
--#include <openssl/x509.h>
-+#include <openssl/x509v3.h>
- #include <openssl/err.h>
- #include <openssl/rand.h>
- 
-@@ -486,9 +486,11 @@
- ssl_check_certificate (int fd, const char *host)
- {
-   X509 *cert;
-+  GENERAL_NAMES *subjectAltNames;
-   char common_name[256];
-   long vresult;
-   bool success = true;
-+  bool alt_name_checked = false;
- 
-   /* If the user has specified --no-check-cert, we still want to warn
-      him about problems with the server's certificate.  */
-@@ -536,7 +538,8 @@
-           break;
-         case X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN:
-         case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
--          logprintf (LOG_NOTQUIET, _("  Self-signed certificate encountered.\n"));
-+          logprintf (LOG_NOTQUIET,
-+                     _("  Self-signed certificate encountered.\n"));
-           break;
-         case X509_V_ERR_CERT_NOT_YET_VALID:
-           logprintf (LOG_NOTQUIET, _("  Issued certificate not yet valid.\n"));
-@@ -558,10 +561,6 @@
-   /* Check that HOST matches the common name in the certificate.
-      #### The following remains to be done:
- 
--     - It should use dNSName/ipAddress subjectAltName extensions if
--       available; according to rfc2818: "If a subjectAltName extension
--       of type dNSName is present, that MUST be used as the identity."
--
-      - When matching against common names, it should loop over all
-        common names and choose the most specific one, i.e. the last
-        one, not the first one, which the current code picks.
-@@ -569,50 +568,123 @@
-      - Ensure that ASN1 strings from the certificate are encoded as
-        UTF-8 which can be meaningfully compared to HOST.  */
- 
--  X509_NAME *xname = X509_get_subject_name(cert);
--  common_name[0] = '\0';
--  X509_NAME_get_text_by_NID (xname, NID_commonName, common_name,
--                             sizeof (common_name));
-+  subjectAltNames = X509_get_ext_d2i (cert, NID_subject_alt_name, NULL, NULL);
- 
--  if (!pattern_match (common_name, host))
-+  if (subjectAltNames)
-     {
--      logprintf (LOG_NOTQUIET, _("\
--%s: certificate common name %s doesn't match requested host name %s.\n"),
--                 severity, quote_n (0, common_name), quote_n (1, host));
--      success = false;
-+      /* Test subject alternative names */
-+
-+      /* Do we want to check for dNSNAmes or ipAddresses (see RFC 2818)?
-+       * Signal it by host_in_octet_string. */
-+      ASN1_OCTET_STRING *host_in_octet_string = NULL;
-+      host_in_octet_string = a2i_IPADDRESS (host);
-+
-+      int numaltnames = sk_GENERAL_NAME_num (subjectAltNames);
-+      int i;
-+      for (i=0; i < numaltnames; i++)
-+        {
-+          const GENERAL_NAME *name =
-+            sk_GENERAL_NAME_value (subjectAltNames, i);
-+          if (name)
-+            {
-+              if (host_in_octet_string)
-+                {
-+                  if (name->type == GEN_IPADD)
-+                    {
-+                      /* Check for ipAddress */
-+                      /* TODO: Should we convert between IPv4-mapped IPv6
-+                       * addresses and IPv4 addresses? */
-+                      alt_name_checked = true;
-+                      if (!ASN1_STRING_cmp (host_in_octet_string,
-+                            name->d.iPAddress))
-+                        break;
-+                    }
-+                }
-+              else if (name->type == GEN_DNS)
-+                {
-+                  /* Check for dNSName */
-+                  alt_name_checked = true;
-+                  /* dNSName should be IA5String (i.e. ASCII), however who
-+                   * does trust CA? Convert it into UTF-8 for sure. */
-+                  unsigned char *name_in_utf8 = NULL;
-+                  if (0 <= ASN1_STRING_to_UTF8 (&name_in_utf8, name->d.dNSName))
-+                    {
-+                      /* Compare and check for NULL attack in ASN1_STRING */
-+                      if (pattern_match ((char *)name_in_utf8, host) &&
-+                            (strlen ((char *)name_in_utf8) ==
-+                                ASN1_STRING_length (name->d.dNSName)))
-+                        {
-+                          OPENSSL_free (name_in_utf8);
-+                          break;
-+                        }
-+                      OPENSSL_free (name_in_utf8);
-+                    }
-+                }
-+            }
-+        }
-+      sk_GENERAL_NAME_free (subjectAltNames);
-+      if (host_in_octet_string)
-+        ASN1_OCTET_STRING_free(host_in_octet_string);
-+
-+      if (alt_name_checked == true && i >= numaltnames)
-+        {
-+          logprintf (LOG_NOTQUIET,
-+              _("%s: no certificate subject alternative name matches\n"
-+                "\trequested host name %s.\n"),
-+                     severity, quote_n (1, host));
-+          success = false;
-+        }
-     }
--  else
-+  
-+  if (alt_name_checked == false)
-     {
--      /* We now determine the length of the ASN1 string. If it differs from
--       * common_name's length, then there is a \0 before the string terminates.
--       * This can be an instance of a null-prefix attack.
--       *
--       * https://www.blackhat.com/html/bh-usa-09/bh-usa-09-archives.html#Marlinspike
--       * */
--
--      int i = -1, j;
--      X509_NAME_ENTRY *xentry;
--      ASN1_STRING *sdata;
--
--      if (xname) {
--        for (;;)
--          {
--            j = X509_NAME_get_index_by_NID (xname, NID_commonName, i);
--            if (j == -1) break;
--            i = j;
-+      /* Test commomName */
-+      X509_NAME *xname = X509_get_subject_name(cert);
-+      common_name[0] = '\0';
-+      X509_NAME_get_text_by_NID (xname, NID_commonName, common_name,
-+                                 sizeof (common_name));
-+
-+      if (!pattern_match (common_name, host))
-+        {
-+          logprintf (LOG_NOTQUIET, _("\
-+    %s: certificate common name %s doesn't match requested host name %s.\n"),
-+                     severity, quote_n (0, common_name), quote_n (1, host));
-+          success = false;
-+        }
-+      else
-+        {
-+          /* We now determine the length of the ASN1 string. If it
-+           * differs from common_name's length, then there is a \0
-+           * before the string terminates.  This can be an instance of a
-+           * null-prefix attack.
-+           *
-+           * https://www.blackhat.com/html/bh-usa-09/bh-usa-09-archives.html#Marlinspike
-+           * */
-+
-+          int i = -1, j;
-+          X509_NAME_ENTRY *xentry;
-+          ASN1_STRING *sdata;
-+
-+          if (xname) {
-+            for (;;)
-+              {
-+                j = X509_NAME_get_index_by_NID (xname, NID_commonName, i);
-+                if (j == -1) break;
-+                i = j;
-+              }
-           }
--      }
- 
--      xentry = X509_NAME_get_entry(xname,i);
--      sdata = X509_NAME_ENTRY_get_data(xentry);
--      if (strlen (common_name) != ASN1_STRING_length (sdata))
--        {
--          logprintf (LOG_NOTQUIET, _("\
--%s: certificate common name is invalid (contains a NUL character).\n\
--This may be an indication that the host is not who it claims to be\n\
--(that is, it is not the real %s).\n"),
--                     severity, quote (host));
--          success = false;
-+          xentry = X509_NAME_get_entry(xname,i);
-+          sdata = X509_NAME_ENTRY_get_data(xentry);
-+          if (strlen (common_name) != ASN1_STRING_length (sdata))
-+            {
-+              logprintf (LOG_NOTQUIET, _("\
-+    %s: certificate common name is invalid (contains a NUL character).\n\
-+    This may be an indication that the host is not who it claims to be\n\
-+    (that is, it is not the real %s).\n"),
-+                         severity, quote (host));
-+              success = false;
-+            }
-         }
-     }
- 
-@@ -631,3 +703,7 @@
-   /* Allow --no-check-cert to disable certificate checking. */
-   return opt.check_cert ? success : true;
- }
-+
-+/*
-+ * vim: tabstop=2 shiftwidth=2 softtabstop=2
-+ */
-
diff --git a/net-misc/wget/files/wget-1.12-sni.patch b/net-misc/wget/files/wget-1.12-sni.patch
deleted file mode 100644
index f4d11f4383f0..000000000000
--- a/net-misc/wget/files/wget-1.12-sni.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-http://bugs.gentoo.org/301312
-http://savannah.gnu.org/bugs/index.php?26786
-http://lists.gnu.org/archive/html/bug-wget/2009-03/msg00033.html
-
---- src/gnutls.c
-+++ src/gnutls.c
-@@ -45,6 +45,7 @@ as that of the covered work.  */
- #include "connect.h"
- #include "url.h"
- #include "ssl.h"
-+#include "host.h"
- 
- /* Note: some of the functions private to this file have names that
-    begin with "wgnutls_" (e.g. wgnutls_read) so that they wouldn't be
-@@ -181,7 +182,7 @@ static struct transport_implementation w
- };
- 
- bool
--ssl_connect (int fd)
-+ssl_connect (int fd, const char *hostname)
- {
-   static const int cert_type_priority[] = {
-     GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0
-@@ -189,8 +190,17 @@ ssl_connect (int fd) 
-   struct wgnutls_transport_context *ctx;
-   gnutls_session session;
-   int err;
-+
-   gnutls_init (&session, GNUTLS_CLIENT);
-   gnutls_set_default_priority (session);
-+
-+  /* We set the server name but only if it's not an IP address. */
-+  if (!is_ip_address(hostname))
-+    {
-+      gnutls_server_name_set (session, GNUTLS_NAME_DNS,
-+         hostname, strlen(hostname));
-+    }
-+
-   gnutls_certificate_type_set_priority (session, cert_type_priority);
-   gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, credentials);
-   gnutls_transport_set_ptr (session, (gnutls_transport_ptr) fd);
---- src/host.c
-+++ src/host.c
-@@ -904,3 +904,19 @@ host_cleanup (void)
-       host_name_addresses_map = NULL;
-     }
- }
-+
-+/* Determine whether or not a hostname is an IP address that we recognise. */
-+bool
-+is_ip_address (const char *name)
-+{
-+  const char *endp;
-+
-+  endp = name + strlen(name);
-+  if (is_valid_ipv4_address(name, endp))
-+    return true;
-+#ifdef ENABLE_IPV6
-+  if (is_valid_ipv6_address(name, endp))
-+    return true;
-+#endif
-+  return false;
-+}
---- src/host.h
-+++ src/host.h
-@@ -102,4 +102,6 @@ bool sufmatch (const char **, const char
- 
- void host_cleanup (void);
- 
-+bool is_ip_address(const char *);
-+
- #endif /* HOST_H */
---- src/http.c
-+++ src/http.c
-@@ -1762,7 +1762,7 @@ gethttp (struct url *u, struct http_stat
- 
-       if (conn->scheme == SCHEME_HTTPS)
-         {
--          if (!ssl_connect_wget (sock))
-+          if (!ssl_connect_wget (sock, u->host))
-             {
-               fd_close (sock);
-               return CONSSLERR;
---- src/openssl.c
-+++ src/openssl.c
-@@ -47,6 +47,7 @@ as that of the covered work.  */
- #include "connect.h"
- #include "url.h"
- #include "ssl.h"
-+#include "host.h"
- 
- /* Application-wide SSL context.  This is common to all SSL
-    connections.  */
-@@ -390,7 +391,7 @@ static struct transport_implementation o
-    Returns true on success, false on failure.  */
-
- bool
--ssl_connect_wget (int fd)
-+ssl_connect_wget (int fd, const char *hostname)
- {
-   SSL *conn;
-   struct openssl_transport_context *ctx;
-@@ -401,6 +402,19 @@ ssl_connect (int fd)
-   conn = SSL_new (ssl_ctx);
-   if (!conn)
-     goto error;
-+
-+#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
-+  /* If the SSL library was build with support for ServerNameIndication
-+     then use it whenever we have a hostname.  If not, don't, ever. */
-+  if (!is_ip_address(hostname))
-+    {
-+      if (!SSL_set_tlsext_host_name(conn, hostname)) {
-+       DEBUGP (("Failed to set TLS server-name indication."));
-+       goto error;
-+      }
-+    }
-+#endif
-+
-   if (!SSL_set_fd (conn, fd))
-     goto error;
-   SSL_set_connect_state (conn);
---- src/ssl.h
-+++ src/ssl.h
-@@ -33,7 +33,7 @@ as that of the covered work.  */
- #define GEN_SSLFUNC_H
- 
- bool ssl_init (void);
--bool ssl_connect_wget (int);
-+bool ssl_connect_wget (int, const char *);
- bool ssl_check_certificate (int, const char *);
- 
- #endif /* GEN_SSLFUNC_H */
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
deleted file mode 100644
index e21bb548d840..000000000000
--- a/net-misc/wget/files/wget-1.13-static-link-libz.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-http://savannah.gnu.org/bugs/?34196
-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/files/wget-1.13.4-no-gets.patch b/net-misc/wget/files/wget-1.13.4-no-gets.patch
deleted file mode 100644
index df836c71ccc3..000000000000
--- a/net-misc/wget/files/wget-1.13.4-no-gets.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-hack until gzip pulls a newer gnulib version
-
-From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Thu, 29 Mar 2012 13:30:41 -0600
-Subject: [PATCH] stdio: don't assume gets any more
-
-Gnulib intentionally does not have a gets module, and now that C11
-and glibc have dropped it, we should be more proactive about warning
-any user on a platform that still has a declaration of this dangerous
-interface.
-
---- a/lib/stdio.in.h
-+++ b/lib/stdio.in.h
-@@ -125,7 +125,6 @@
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
- 
- 
diff --git a/net-misc/wget/files/wgetrc-ipv6 b/net-misc/wget/files/wgetrc-ipv6
deleted file mode 100644
index d87995fc4f31..000000000000
--- a/net-misc/wget/files/wgetrc-ipv6
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# To try ipv6 addresses first:
-#prefer-family = IPv6
diff --git a/net-misc/wget/wget-1.12-r3.ebuild b/net-misc/wget/wget-1.12-r3.ebuild
deleted file mode 100644
index 26f5987e1d4b..000000000000
--- a/net-misc/wget/wget-1.12-r3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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.12-r3.ebuild,v 1.9 2011/02/28 23:40:41 ranger 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
-	epatch "${FILESDIR}"/${P}-sae.patch #344939
-}
-
-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-r2.ebuild b/net-misc/wget/wget-1.13.3-r2.ebuild
deleted file mode 100644
index 0079879bc862..000000000000
--- a/net-misc/wget/wget-1.13.3-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2012 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-r2.ebuild,v 1.4 2012/08/06 19:42:06 vapier 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 gnutls idn ipv6 nls ntlm +ssl static"
-
-RDEPEND="idn? ( net-dns/libidn )
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( >=dev-libs/openssl-0.9.6b )
-	)"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="ntlm? ( !gnutls ssl )
-	gnutls? ( 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
-	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
-	# the included gnutls -- force ioctl.h to include this header
-	[[ ${CHOST} == *-solaris* ]] && append-flags -DBSD_COMP=1
-
-	use static && append-ldflags -static
-	econf \
-		--disable-rpath \
-		$(use_with ssl ssl $(use gnutls && echo "gnutls" || echo "openssl")) \
-		$(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
-
-	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
-}
diff --git a/net-misc/wget/wget-1.13.4-r1.ebuild b/net-misc/wget/wget-1.13.4-r1.ebuild
deleted file mode 100644
index bc067e92c6ac..000000000000
--- a/net-misc/wget/wget-1.13.4-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.13.4-r1.ebuild,v 1.16 2013/01/28 20:06:23 vapier Exp $
-
-EAPI="4"
-
-inherit flag-o-matic toolchain-funcs autotools
-
-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 ~amd64-fbsd ~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 gnutls idn ipv6 nls ntlm +ssl static"
-
-LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] )
-	ssl? (
-		gnutls? ( net-libs/gnutls[static-libs(+)] )
-		!gnutls? ( dev-libs/openssl:0[static-libs(+)] )
-	)"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )
-	nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
-
-DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-openssl-pkg-config.patch
-	epatch "${FILESDIR}"/${P}-no-gets.patch
-	eautoreconf
-}
-
-src_configure() {
-	# openssl-0.9.8 now builds with -pthread on the BSD's
-	use elibc_FreeBSD && use ssl && append-ldflags -pthread
-	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
-	# the included gnutls -- force ioctl.h to include this header
-	[[ ${CHOST} == *-solaris* ]] && append-flags -DBSD_COMP=1
-
-	# the configure script contains a few hacks to workaround openssl
-	# build limitations.  disable those, and use openssl's pkg-config.
-	eval export ac_cv_lib_{z_compress,dl_{dlopen,shl_load}}=no
-
-	if use static ; then
-		append-ldflags -static
-		tc-export PKG_CONFIG
-		PKG_CONFIG+=" --static"
-	fi
-	econf \
-		--disable-rpath \
-		$(use_with ssl ssl $(usex gnutls gnutls openssl)) \
-		$(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
-
-	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
-}
diff --git a/net-misc/wget/wget-1.13.4.ebuild b/net-misc/wget/wget-1.13.4.ebuild
deleted file mode 100644
index 5c7eb611ed9a..000000000000
--- a/net-misc/wget/wget-1.13.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.13.4.ebuild,v 1.2 2012/08/06 19:42:06 vapier Exp $
-
-EAPI=4
-
-inherit 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 gnutls idn ipv6 nls ntlm +ssl static"
-
-RDEPEND="idn? ( net-dns/libidn )
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( >=dev-libs/openssl-0.9.6b )
-	)"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="ntlm? ( !gnutls ssl )
-	gnutls? ( ssl )"
-
-DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
-
-src_configure() {
-	# openssl-0.9.8 now builds with -pthread on the BSD's
-	use elibc_FreeBSD && use ssl && append-ldflags -pthread
-	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
-	# the included gnutls -- force ioctl.h to include this header
-	[[ ${CHOST} == *-solaris* ]] && append-flags -DBSD_COMP=1
-
-	use static && append-ldflags -static
-	econf \
-		--disable-rpath \
-		$(use_with ssl ssl $(use gnutls && echo "gnutls" || echo "openssl")) \
-		$(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
-
-	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
-}