Add support for USE=idn by Lars Wendler #286058, add support for USE=ntlm, and forward port the linking patch.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

5 files changed, 185 insertions, 11 deletions

diff --git a/net-misc/wget/ChangeLog b/net-misc/wget/ChangeLog
index 5a55a73681c4..fd3ce99c410d 100644
--- a/net-misc/wget/ChangeLog
+++ b/net-misc/wget/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/wget
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.111 2009/09/23 16:34:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.112 2009/09/23 19:55:16 vapier Exp $
+
+  23 Sep 2009; Mike Frysinger <vapier@gentoo.org> wget-1.12.ebuild,
+  +files/wget-1.12-linking.patch, metadata.xml:
+  Add support for USE=idn by Lars Wendler #286058, add support for USE=ntlm,
+  and forward port the linking patch.
 
 *wget-1.12 (23 Sep 2009)
 
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index d3216483514a..3fc03a7cbe62 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -2,17 +2,18 @@
 Hash: SHA1
 
 AUX wget-1.11-linking.patch 4935 RMD160 4285dd7325f29ac49edd5c42853c9f09b683b844 SHA1 2ae2e3202daa7ed0c4f33bd005469ab7c558ae7d SHA256 3f3a1b6ec439ba042c3da92cca04990e71ff4894ffc04d2d52a3186194665171
+AUX wget-1.12-linking.patch 9511 RMD160 8c7a27ec67d9c4ed9eb79c525bf1bff64bfaee95 SHA1 08905ad2bbfbe23a70d84d148426b671a20b5a6d SHA256 c53933a8a64574c999be2381c5991053725f9a6651b130511ed88fdacdc66c91
 AUX wgetrc-ipv6 54 RMD160 62ef29e13163463d42934b2ee970e235e64249dc SHA1 35a259c6817cccd04f23c56c9fd5b915f5f0fa00 SHA256 21bae947f1f94b09d2bf50704e1a69d7e90ee59898fd512c146d24e408d1a518
 DIST wget-1.11.4.tar.bz2 954561 RMD160 c7a7791a28900b8a4abb654f72b8dbd8982879ec SHA1 a69e382c0965992b2c662e80f7040600207619d2 SHA256 8b7f52e2861b89c3ee0cc10c3665af5b705d0cb7fc00bca59a9b1e2b50e027fb
 DIST wget-1.12.tar.bz2 1609032 RMD160 52fca690ea2b4e763a655aff36495059612fc65d SHA1 1a059b3736ef908b68acac91670f9df576d1a061 SHA256 c823d938e2f849305a101c0860229b123d7564c26470fdac9118d85e3c7dba9a
 EBUILD wget-1.11.4.ebuild 1831 RMD160 5428c5cf65e28d8200c5a296e6bd46e92fd96c07 SHA1 1adb9a5616a74f9777a0841acfa09f0568a97c36 SHA256 7ed3f3b4c61130ed7409b4ba48eaaf47adcd17b671493e816337fb45fd5a2f70
-EBUILD wget-1.12.ebuild 1748 RMD160 b9452fe1995bc0f4bc6d18492b88b62dfec791a6 SHA1 9f31c09fab44d05f8f2e8392e5dea4e27f7637dd SHA256 18fa7ca50c32e03c1a83d11acf1fa94bc3851fd6747e8ff79fe9736905fdf765
-MISC ChangeLog 17049 RMD160 0821665b4825661f8c9fc89089057b4b9e5a5939 SHA1 ac35f7b075d9a3a128ed82e77fccb1c464cbd177 SHA256 3e5200c28099c15813cdf74458eaad6bfcf4d053fb0e27780a2618619ebb8c50
-MISC metadata.xml 165 RMD160 e3b6f95d509697d06b5f2542a762765d1cdddcf8 SHA1 20a8b2455edbeeaea061b6ca712985e159b56740 SHA256 0ea65a43560f42b54fd7f3146bef9c3ef61acbf12d1f0f5289ae36a386138a1e
+EBUILD wget-1.12.ebuild 2090 RMD160 176d919cd184e3d7696ce854ab99c696bef82fde SHA1 739c9d126c613bf749890cb149c9115aebdb39d2 SHA256 bbec26e588ad60ed2f08d7f8d348797fe4ea41dde56f7e3e7b6511d00fca0907
+MISC ChangeLog 17281 RMD160 0533d62ced93f887c43a75a559a0dbad472fe5eb SHA1 924b5698001d7e92207928725d24fbc842063e39 SHA256 4981facc99b094f8ca64e92d1d438f611bcbac01a669c440360f42724ef502f6
+MISC metadata.xml 258 RMD160 67393c1bb85136bfc1cd8e1145f3e5e0efa32828 SHA1 8d60f18c79ce849b2e3b31d33cb04ef8a0d70546 SHA256 63f6de85aadabff6f0250403fd8c60a6782e62b0d953dbdae71daf62ea717716
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkq6ThsACgkQlPl3HsVfCDp/dwCeIEjUtN5PdtTKts18Wr+ilQ6S
-X+UAn0ztGAukAGg5I2gNsr40m33t7Al2
-=4UXy
+iEYEARECAAYFAkq6fSoACgkQlPl3HsVfCDqi7gCdFk7/OtVuDt5/vCEotV8MmtXq
+1k4An1eb+rGgr9aTAuG+AQcIi8XFkwHF
+=LfJE
 -----END PGP SIGNATURE-----
diff --git a/net-misc/wget/files/wget-1.12-linking.patch b/net-misc/wget/files/wget-1.12-linking.patch
new file mode 100644
index 000000000000..ade2be869d2d
--- /dev/null
+++ b/net-misc/wget/files/wget-1.12-linking.patch
@@ -0,0 +1,149 @@
+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/metadata.xml b/net-misc/wget/metadata.xml
index b61166215c7d..48906f53c22c 100644
--- a/net-misc/wget/metadata.xml
+++ b/net-misc/wget/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <herd>base-system</herd>
+<use>
+ <flag name='ntlm'>Enable support for NTLM (Windows-based) authorization</flag>
+</use>
 </pkgmetadata>
diff --git a/net-misc/wget/wget-1.12.ebuild b/net-misc/wget/wget-1.12.ebuild
index 7de79847979d..fb3874ca571b 100644
--- a/net-misc/wget/wget-1.12.ebuild
+++ b/net-misc/wget/wget-1.12.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.12.ebuild,v 1.1 2009/09/23 16:34:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.12.ebuild,v 1.2 2009/09/23 19:55:16 vapier Exp $
 
-inherit flag-o-matic
+inherit eutils flag-o-matic
 
 DESCRIPTION="Network utility to retrieve files from the WWW"
 HOMEPAGE="http://www.gnu.org/software/wget/"
@@ -11,21 +11,37 @@ 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 ipv6 nls ssl static"
+IUSE="debug idn ipv6 nls ntlm ssl static"
 
-RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6b )"
+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_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.12-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 \
+		--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) \
 		|| die
 	emake || die