Version bump

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

5 files changed, 314 insertions, 15 deletions

diff --git a/net-misc/wget/ChangeLog b/net-misc/wget/ChangeLog
index 260b6be272ad..91e312bc50f2 100644
--- a/net-misc/wget/ChangeLog
+++ b/net-misc/wget/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/wget
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.181 2014/01/18 05:35:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.182 2014/01/23 07:41:32 polynomial-c Exp $
+
+*wget-1.15 (23 Jan 2014)
+
+  23 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> +wget-1.15.ebuild,
+  +files/wget-1.15-pkg-config.patch, +files/wget-1.15-test_fix.patch:
+  Version bump.
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> wget-1.14-r1.ebuild,
   wget-1.14.ebuild:
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 6ef8d627b4f8..83e5e233f962 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -6,25 +6,29 @@ AUX wget-1.14-gnutls-ssl.patch 2178 SHA256 b636075031b80d667ea0204423b71e4ef4a8f
 AUX wget-1.14-pkg-config.patch 6187 SHA256 ccece749fef2a378611d809103651831cfaa69c528629d37a4c2e3656d0fe63c SHA512 6a895f435b7d650d706cebda1d430b32a6769b021c14593723907c0e4ccb6399fd45b663d6bd926e9d5a9ec2d9cfe700ec0e81b5b83bf533e299244764edd452 WHIRLPOOL 1064e042404bdb645a82c8025748d697661f503c457fcef10337fe1f13dd1f9b41ead038321f2a61af5880410a72d9776f115b9d5ba93142340aa7d3276c3bae
 AUX wget-1.14-texi2pod.patch 969 SHA256 b494c2a97b0c993621a38f63f3053854bba00c8ed555dc9df4a6dcbdf84dc8ab SHA512 1c04cb24067a89f37e53232c9262b3e462c0ba019474a8459dcb705fa273c8db0dea81d9fe788a554785a5fe713a02b8c0c93f179fa952d002e8a39142a6d4d3 WHIRLPOOL 549c027e1d79750e1d50460622bef414425f1dfc4914f408e87a52aa3b4b4c2b5c0a83d81c1507e3abc4860b3337221c870212247527a6db1b100a01db9723c3
 AUX wget-1.14-wgetrc.patch 1284 SHA256 c0ca848e78ebe3d5ceb8f41d1271bb7f92c4d8edb98063af86a2b6279a2d0b2d SHA512 ce9623cb8da5fb0b1bc44a399c1f4c5af2e967d85032c3a0ec05e341c9dcebf45c223615fb320acf62b24b63561e91c1018bd615d2b7169b9835bffe211c7c32 WHIRLPOOL 1cac60e1f29e40e3ebe01bb7b424c5431dd4451f7447ff50066698e21aea52e7f56249bc85f59eb01a89414f7e0bc4f8b460f5aa4da728cb8622c62d77c619ad
+AUX wget-1.15-pkg-config.patch 5589 SHA256 d0fd1f7f7331c19b2597e3ae665991b29f890a18bd23f9a2c033f3d97bb52309 SHA512 3e213202e8441a65a9e6ffa79f14e7663d2de40f99d2e009c117e78d7fdca5dc7e0db5e30d2999abe22b1796fb6ad648881735147ea98c2d02c3832b7fbc0c8d WHIRLPOOL 772201026acf5e1599e743818061e1ca1d346693fb9f86cdecbcd6dd0c295e5ddf1fe68a741e3f24944e58628c6de03fa2cd44f6cec485e1f1767a044b001e08
+AUX wget-1.15-test_fix.patch 847 SHA256 29cce71f521834a09977340f75454b8831ff6309f165041aa93da161fe0761a2 SHA512 cc97a1d57ab17c2e34961c7c4f3b2fee906e6027366987233ced310acacf7d8a96cadbe13a09a7fa31bf7040e18a046435dc1edc558cf8481c59d1016ad4f07c WHIRLPOOL ecfd898ddca8e01c877c5c7f33895867c0bc1b5c636ff26474c63639b001bbe31c1ecf23c386a80f43cb84f1bfd9ad9c2198e22bb9099e190182e3b9a90112bd
 DIST wget-1.14.tar.xz 1584060 SHA256 1761d7f7c6a2ad6c8d494d239c53f0c17126efb6449ada16dee3a66d87a4147b SHA512 b01351b3e086c713c0f64af34d87e013d2edb69b76fa84699b3afa4975622993053c4e367f965218c8a3326a85b734f3ee8bcce8ba0c72a89bb2208f3b1759ef WHIRLPOOL 8071b49a28ac03c832d965bfb9c00e4f28f59098c896c40c73081e56ec0091fbe8290b115e3eaa85b81c90006a39e3efba811f30dea5d33b726fc62d2b307824
+DIST wget-1.15.tar.xz 1679908 SHA256 d18a5f4354c9854b1f1b9897353443bceed8e19a391d36d4dbebe85cc9d480fb SHA512 1cb49e083500cb2753f023d9b4594b61d6e909994ea327ed9b861424df77df3ffbe7c431af9ee73de0eda083b3bb28cf22a53c2b3a3b781754fce39f4c13fae4 WHIRLPOOL 5d649f7fba4ad4f1482a75c960f845cef22db1711178bd22ed29a6fd1242f483e53ca2501e62b59bad23fbbf554ddff1f74fc2e79bd4ecaeefd7e28795c743f4
 EBUILD wget-1.14-r1.ebuild 2790 SHA256 4638bccfe9a760c0974889f79b1230436083b4312f1f6c6cd9e84dfd78983faa SHA512 44cca80deed49c8cde34eb7931c1b718cd7602152d7c2cadd47d49b03f763588cb37706b1c50f7828a2f06b7923fbca10c5a4610fa2c6f3efbc91d820c74d472 WHIRLPOOL 75c4271faa98106a1f6bfa0e8294e0527e9d6c2caf50ca7cd0dae2b8584222f12b39322b7b3f8c2cd70b5eb9c5fcb30fa6787a857aef3c451471be2d88959950
 EBUILD wget-1.14.ebuild 2636 SHA256 3603addd5ca6d21501997584a2fc185bc6314b843c6c3296166f082938bd74aa SHA512 4fabe38bb5c10638fd77ca47544ef24c44783146f97a7ca98e893e78cee408c8652414e7fc49d1d618ff0b72c83bc3b851fd2f61fd05cb06dc0b02c7d8e4da97 WHIRLPOOL b3423bebb6c567b35916b6979be10b7986a30003ce1944ffe0ecdd0ed4740c200af81e08cb4b0cc10e88be085e02e07dc220325cb34d72145f008eff4d061a05
-MISC ChangeLog 27243 SHA256 87df86e1bce9cd4b7e7b7c22ba7c39d134cbd202f12a23f23304c22f22e8e86d SHA512 54c3602c9dae0e475925a9ad24838eefc34314cd8311b8a7e01b3ec027b3b37eb677292fe2a26c24356cf6afd635f1d9f22bb3c14ca3306df237850529f0dba9 WHIRLPOOL d5b4107ce13a371c5fc70fc1b4d4ad7aab99ccf5a8efa9b70e994e96994a98224b4fb574bda8904356f7408aaac5c4a59caf66b564e6988b8ad9c4f1c4edb9f7
+EBUILD wget-1.15.ebuild 2497 SHA256 7b5799ac154514afc9c3e643d4ede8ae9fb3916e1ce4d46e77a1ae8e27f17693 SHA512 dc37979c433b3c274b0570c49e4c5894d9333fbbffeadb1b4bd92908a640c564922175b989b6b0714131ac82b85945211c5cfc41701e42a277012efa465a3175 WHIRLPOOL 4d1758ef46788fe51a929acb08a77e5e3a51acdfd496fc469d0b3c2b41874e0a75626677cea3e960bcb819e53a828fbf5fbbcf40851abc0b9bb9119d65c6af66
+MISC ChangeLog 27435 SHA256 906aef0d9617443e0d5199e17d53b6420104ab488a4a11d0080a30d773b8f7f9 SHA512 ae706f49fd56d34c38572124d564707467f2e24e4361a7dc3e9fe624181ae1e3a8ac5c2c8b5cb2d279d8b3c3692649e6aa12c905fb303b0ea1adc1b80fad290a WHIRLPOOL 93623ede8524a9d534eaf6f6bdeba11cfc6d9c76421db026b1aac4f1ddf02cbb5972050dcdcb623e0bc2f652dc82ed5d069b254bf77e11c1d171a8f989839aca
 MISC metadata.xml 480 SHA256 623ea871cdd741de1f7b1bdde73f38d222d489ed7496694a3b8f2fff7d49cf44 SHA512 4dae8e65a95c5f03e0434fce20012581fb75e33310598ef6b099b11ad611dfdbc5043b0223b1cd791500b1d4dcd19c52ab94142587508b2ed362b11cc7acddb1 WHIRLPOOL 189bc2a775087a96010a7426b562cf55e9426bad2da13e085d14dcf713631466ee4fe9c3dffe1ee578482d7d5bf0e4cac2510af431a4ef1ec21626770fe284b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS2hKdAAoJEPGu1DbS6WIA4jQP/1eGfGvp4SzXQxe+ph9dyYWB
-HZp7Y2Jf+f0Hs9JBadXsAoQ1rb309hLy/gafWbz+gf04NWZjrMnVeg5b5JweX91l
-4ouAgx0tEoSBPwiFfYkX3oxpXq93CqbtJVgwtpkTdggKY8yE2FVPCcROFMUgGnOg
-CeRNYuv3vYshoErgDgSDUiNx4HbuZnM7KsocUBX5wozfb+Ud7oR82CQjWPazYVfp
-ZFKD+g6JCxbjsoaf98s/FOR4+czH8mWo50H95E1/j3Mg/OPZW2KJ1/IZTC1DlJwv
-SunDkeroaziDjYU5GG7BBMOMI8ejSWzpvYtTPf5wck3Tar+QHWcdgPibYnLG/jlZ
-HBVVFy0Do/lF7cyAjxgrsQVZBUBj4/bldvYd04I27qYXphQSvmvXttzxuCmjdwW3
-VF8ic/9GQ+g189vDP52kiavv3k9yfOTJ6m/npN+A5sc4us6qXtwjywo1I7sentNY
-j5FJRHParLhcmCW8H2qM+KJeTSBk9LyucyB5otBTbUPIg/G6z22mWwRLbHNzx4W+
-EY95nKfEM14FdLI29d0zOJeJLtdvCQ85aCZ6kvUlHDD8/u9eLnS9tGNCvKCBFke5
-op6QGgYBAASx+nbk+my7YQEyAEHi75UUhiy3YlCYLtIB/K9AnHMnVwe/mX2wbza+
-qWYjbtbAfPrR5+2XjhTN
-=zq2l
+iQIcBAEBCAAGBQJS4MetAAoJEPiazRVxLXTFig0QAJGCD8t86iPejraaKgQYjLb9
+LWzBudCX2qKxQ/KYh/g8WEwSuvz9T0FLl+sL8YdrYWO+lOIjeNWiPGLLb2pAVH9J
+XExa/0lgWZKtNveanRAXNHmAkFqTbgRA73u4oHZN3zJSWHqYiEfrsvE7pmEqjqyz
+duJDpHkgTMdaFNtlUojAxyOXce0Cq6cMYmeaRf8wHcWcjajXlDOvZASbrgfIhxW3
+n7Ipvv9oLixQ3t5p9EBq1KMCzVrtlOE6GWmwAWs6F+KEF4y3PHWg1ix2/M2/L00G
+bVYahcerwDc+yXCWbkReK+Kg3HvvabAESYYledTDZEBLAVvlgSGa0Mei7roJw827
+MWhoFywxsWeZQsPNg7vKh9qfo88zInaAEs940SpjmBlvVMITVG2KlOamZViVpY1O
+DZeYceG5aclFYuvSLp11wmjog+1vK/LsAOQEtVWL9+FI19FwAAZeD6N0yviA2wDi
+XYVSAsO2KwV/fPx/3wec8UG0rn7HdfQFqFxdoExP3izhEptnC9337uJeyqCUb+78
+7mQslyfqpysvNxwY74GNOHNc35qyp7IL7gdtmg/iz8yzlif2aJNBAffw5+xm0nG4
+iNfgYJXuF3Thzg8u1W5VgYiPBy/ONZLBUHvB0gqXmY3Qx0u10FChqNjIXjq6ejB6
+f4By4fWuKGHJF8tUiXEj
+=WaOd
 -----END PGP SIGNATURE-----
diff --git a/net-misc/wget/files/wget-1.15-pkg-config.patch b/net-misc/wget/files/wget-1.15-pkg-config.patch
new file mode 100644
index 000000000000..560556c30920
--- /dev/null
+++ b/net-misc/wget/files/wget-1.15-pkg-config.patch
@@ -0,0 +1,185 @@
+From 0f3c2a0720dd6dd86837d72f032644058e56cacd Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 22 Jan 2014 14:01:24 +0100
+Subject: [PATCH] detect openssl/pcre/libuuid/zlib via pkg-config if it's
+ available
+
+Newer versions of these packages ship with pkg-config files, so if we can
+detect it via those, do so.  If that fails, fall back to the old methods.
+
+Forward-ported to 1.15 release from b97942cd6b496501b396ea3bc2710010f4591542
+(Mon, 21 May 2012 18:39:59 -0400)
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure.ac | 102 +++++++++++++++++++++++++++++++++++++++++------------------
+ 1 file changed, 72 insertions(+), 30 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b24588f..088ef22 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -68,6 +68,9 @@ AC_ARG_WITH(ssl,
+ AC_ARG_WITH(zlib,
+ [[  --without-zlib          disable zlib ]])
+ 
++AC_ARG_ENABLE(pcre, AC_HELP_STRING([--disable-pcre],
++				   [Disable PCRE style regular expressions]))
++
+ AC_ARG_ENABLE(opie,
+ [  --disable-opie          disable support for opie or s/key FTP login],
+ ENABLE_OPIE=$enableval, ENABLE_OPIE=yes)
+@@ -237,12 +240,26 @@ dnl
+ dnl Checks for libraries.
+ dnl
+ 
++PKG_PROG_PKG_CONFIG
++
+ AS_IF([test x"$with_zlib" != xno], [
+   with_zlib=yes
+-  AC_CHECK_LIB(z, compress)
++  PKG_CHECK_MODULES([ZLIB], zlib, [
++    LIBS="$ZLIB_LIBS $LIBS"
++    CFLAGS="$ZLIB_CFLAGS $CFLAGS"
++  ], [
++    AC_CHECK_LIB(z, compress)
++  ])
+ ])
+ 
+ AS_IF([test x"$with_ssl" = xopenssl], [
++  PKG_CHECK_MODULES([OPENSSL], [openssl], [
++    AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
++    AC_LIBOBJ([openssl])
++    LIBS="$OPENSSL_LIBS $LIBS"
++    CFLAGS="$OPENSSL_CFLAGS -DHAVE_LIBSSL $CFLAGS"
++    LIBSSL=" " # ntlm check below wants this
++  ], [
+   dnl As of this writing (OpenSSL 0.9.6), the libcrypto shared library
+   dnl doesn't record its dependency on libdl, so we need to make sure
+   dnl -ldl ends up in LIBS on systems that have it.  Most OSes use
+@@ -276,9 +293,9 @@ AS_IF([test x"$with_ssl" = xopenssl], [
+     ;;
+   esac
+ 
+-  AS_IF([test x$ssl_found != xyes], [
+-    dnl Now actually check for -lssl if it wasn't already found
+-    AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
++    AS_IF([test x$ssl_found != xyes], [
++      dnl Now actually check for -lssl if it wasn't already found
++      AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
+ #include <openssl/ssl.h>
+ #include <openssl/x509.h>
+ #include <openssl/err.h>
+@@ -286,17 +303,18 @@ AS_IF([test x"$with_ssl" = xopenssl], [
+ #include <openssl/des.h>
+ #include <openssl/md4.h>
+ #include <openssl/md5.h>
+-    ], [SSL_library_init ()])
+-    if test x"$LIBSSL" != x
+-    then
+-      ssl_found=yes
+-      AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
+-      AC_LIBOBJ([openssl])
+-      LIBS="$LIBSSL $LIBS"
+-    elif test x"$with_ssl" != x
+-    then
+-      AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
+-    fi
++      ], [SSL_library_init ()])
++      if test x"$LIBSSL" != x
++      then
++        ssl_found=yes
++        AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
++        AC_LIBOBJ([openssl])
++        LIBS="$LIBSSL $LIBS"
++      elif test x"$with_ssl" != x
++      then
++        AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
++      fi
++    ])
+   ])
+ 
+ ], [
+@@ -305,6 +323,13 @@ AS_IF([test x"$with_ssl" = xopenssl], [
+     dnl default is -lgnutls
+     with_ssl=gnutls
+ 
++  PKG_CHECK_MODULES([GNUTLS], [gnutls], [
++    AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
++    AC_LIBOBJ([gnutls])
++    LIBS="$GNUTLS_LIBS $LIBS"
++    CFLAGS="$GNUTLS_CFLAGS -DHAVE_LIBGNUTLS $CFLAGS"
++  ], [
++
+     dnl Now actually check for -lgnutls
+     AC_LIB_HAVE_LINKFLAGS([gnutls], [], [
+ #include <gnutls/gnutls.h>
+@@ -319,6 +344,8 @@ AS_IF([test x"$with_ssl" = xopenssl], [
+       AC_MSG_ERROR([--with-ssl=gnutls was given, but GNUTLS is not available.])
+     fi
+ 
++    ])
++
+     AC_CHECK_FUNCS(gnutls_priority_set_direct)
+   ]) # endif: --with-ssl != no?
+ ]) # endif: --with-ssl == openssl?
+@@ -535,26 +562,41 @@ dnl
+ dnl Check for UUID
+ dnl
+ 
+-AC_CHECK_HEADER(uuid/uuid.h,
+-                AC_CHECK_LIB(uuid, uuid_generate,
+-                  [LIBS="${LIBS} -luuid"
+-                   AC_DEFINE([HAVE_LIBUUID], 1,
+-                             [Define if libuuid is available.])
+-                  ])
+-)
++AC_ARG_WITH(libuuid, AC_HELP_STRING([--without-libuuid],
++				    [Generate UUIDs for WARC files via libuuid]))
++AS_IF([test "X$with_libuuid" != "Xno"],[
++  PKG_CHECK_MODULES([UUID], uuid, [
++    LIBS="$UUID_LIBS $LIBS"
++    CFLAGS="$UUID_CFLAGS $CFLAGS"
++  ], [
++    AC_CHECK_HEADER(uuid/uuid.h,
++		    AC_CHECK_LIB(uuid, uuid_generate,
++				 [LIBS="${LIBS} -luuid"
++				  AC_DEFINE([HAVE_LIBUUID], 1,
++					    [Define if libuuid is available.])
++				 ])
++    )
++  ])
++])
+ 
+ dnl
+ dnl Check for PCRE
+ dnl
+ 
+-AC_CHECK_HEADER(pcre.h,
+-                AC_CHECK_LIB(pcre, pcre_compile,
+-                  [LIBS="${LIBS} -lpcre"
+-                   AC_DEFINE([HAVE_LIBPCRE], 1,
+-                             [Define if libpcre is available.])
+-                  ])
+-)
+-
++AS_IF([test "X$enable_pcre" != "Xno"],[
++  PKG_CHECK_MODULES([PCRE], libpcre, [
++    LIBS="$PCRE_LIBS $LIBS"
++    CFLAGS="$PCRE_CFLAGS $CFLAGS"
++  ], [
++    AC_CHECK_HEADER(pcre.h,
++		    AC_CHECK_LIB(pcre, pcre_compile,
++				 [LIBS="${LIBS} -lpcre"
++				  AC_DEFINE([HAVE_LIBPCRE], 1,
++					    [Define if libpcre is available.])
++				 ])
++    )
++  ])
++])
+  
+ dnl Needed by src/Makefile.am
+ AM_CONDITIONAL([IRI_IS_ENABLED], [test "X$iri" != "Xno"])
+-- 
+1.8.5.3
+
diff --git a/net-misc/wget/files/wget-1.15-test_fix.patch b/net-misc/wget/files/wget-1.15-test_fix.patch
new file mode 100644
index 000000000000..754e44f2d92e
--- /dev/null
+++ b/net-misc/wget/files/wget-1.15-test_fix.patch
@@ -0,0 +1,26 @@
+From 3a47a1a918e9076133c046f8792cf68973f7c585 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 22 Jan 2014 22:07:18 +0100
+Subject: [PATCH] Don't use --debug in Test--post-file.px
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ tests/Test--post-file.px | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/Test--post-file.px b/tests/Test--post-file.px
+index 1c017b7..1212af6 100755
+--- a/tests/Test--post-file.px
++++ b/tests/Test--post-file.px
+@@ -8,7 +8,7 @@ use HTTPTest;
+ 
+ ###############################################################################
+ 
+-my $cmdline = $WgetTest::WGETPATH . " -d --post-file=nofile http://localhost:{{port}}/";
++my $cmdline = $WgetTest::WGETPATH . " --post-file=nofile http://localhost:{{port}}/";
+ 
+ my $expected_error_code = 3;
+ 
+-- 
+1.8.5.3
+
diff --git a/net-misc/wget/wget-1.15.ebuild b/net-misc/wget/wget-1.15.ebuild
new file mode 100644
index 000000000000..d767052e39e4
--- /dev/null
+++ b/net-misc/wget/wget-1.15.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.15.ebuild,v 1.1 2014/01/23 07:41:32 polynomial-c 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 ~arm64 ~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 ~arm-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 pcre +ssl static uuid zlib"
+
+LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] )
+	pcre? ( dev-libs/libpcre[static-libs(+)] )
+	ssl? (
+		gnutls? ( net-libs/gnutls[static-libs(+)] )
+		!gnutls? ( dev-libs/openssl:0[static-libs(+)] )
+	)
+	uuid? ( sys-apps/util-linux[static-libs(+)] )
+	zlib? ( sys-libs/zlib[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}"/${PN}-1.15-pkg-config.patch \
+		"${FILESDIR}"/${PN}-1.15-test_fix.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
+
+	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 pcre) \
+		$(use_enable debug) \
+		$(use_with uuid libuuid) \
+		$(use_with zlib)
+}
+
+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
+}