Switch to pkg-config for looking up openssl #246556 by Rick Farina.

Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64

4 files changed, 120 insertions, 10 deletions

diff --git a/net-misc/wget/ChangeLog b/net-misc/wget/ChangeLog
index a1090407dfe2..d9ccfc1ff4c2 100644
--- a/net-misc/wget/ChangeLog
+++ b/net-misc/wget/ChangeLog
@@ -1,6 +1,12 @@
 # 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.147 2011/09/18 23:08:35 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.148 2011/12/01 02:04:41 vapier Exp $
+
+*wget-1.13.4-r1 (01 Dec 2011)
+
+  01 Dec 2011; Mike Frysinger <vapier@gentoo.org> +wget-1.13.4-r1.ebuild,
+  +files/wget-1.13.4-openssl-pkg-config.patch:
+  Switch to pkg-config for looking up openssl #246556 by Rick Farina.
 
 *wget-1.13.4 (18 Sep 2011)
 
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 51d8c9e4cd50..840aa5efd894 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX wget-1.12-CVE-2010-2252.patch 7161 RMD160 5d550714018feaaa1a6af966974b69f3710e2fcf SHA1 e464bafa17ca31e1e4d1e63034cd3517a513bd2e SHA256 aca852c923577ce17ff3050c0eae20bd77defa719aad1d7233407e2b492681a8
 AUX wget-1.12-debug-tests.patch 4482 RMD160 6fe85307685aa5ff8821100b26c69f67d7290d7a SHA1 b9e9e1a805c28aec6aa5a3cff9248cddf8f08ac9 SHA256 f043466367bcf895cc03319f5f8d2397e455ced6dd045b150695689df7220f1b
@@ -7,23 +7,21 @@ AUX wget-1.12-linking.patch 9511 RMD160 8c7a27ec67d9c4ed9eb79c525bf1bff64bfaee95
 AUX wget-1.12-sae.patch 8241 RMD160 5bc6e50c821933259f39f585d2973601d1834f4e SHA1 96f4ebc7a37f06c2df2eb6b1ea66564675452415 SHA256 daf58f2505413c35e0c3aaa80b9f230a8621b13c12ed96f01e65ca5168692dc5
 AUX wget-1.12-sni.patch 3668 RMD160 f0588c2a107be5b07883404289cea92e5e200bb0 SHA1 d4d6e55880e4a975a8517cb6b5224c73b8ba1221 SHA256 6178e1d56f5d86e6915d22247e07d23946cfceea76a9a393dc5e45fb51a50a43
 AUX wget-1.13-static-link-libz.patch 897 RMD160 e6d2f965185dd6d412b72f4cee61dbd7fa1876bf SHA1 d8cedeab70939c202020d1a890a2c95e05a59cf0 SHA256 ab054e459334f64709e5d2cbf3e7c3251ab4c98a68ceea91c3f56d51e2098251
+AUX wget-1.13.4-openssl-pkg-config.patch 707 RMD160 bd0f777c9999168fb2a665ffd54560c30ba3cb0f SHA1 c4c33e0f0de723d44e15cb1732f22e0c71bfe0bb SHA256 daba11c918a8932224135724d1d936dba1c40cf4deb2bca142c16e0d2bd5eaf6
 AUX wgetrc-ipv6 54 RMD160 62ef29e13163463d42934b2ee970e235e64249dc SHA1 35a259c6817cccd04f23c56c9fd5b915f5f0fa00 SHA256 21bae947f1f94b09d2bf50704e1a69d7e90ee59898fd512c146d24e408d1a518
 DIST wget-1.12.tar.bz2 1609032 RMD160 52fca690ea2b4e763a655aff36495059612fc65d SHA1 1a059b3736ef908b68acac91670f9df576d1a061 SHA256 c823d938e2f849305a101c0860229b123d7564c26470fdac9118d85e3c7dba9a
 DIST wget-1.13.3.tar.xz 1448908 RMD160 27884a72edbe55bc39a2a99c6517250253074419 SHA1 99e095825da4de51bd62eb479774c24366d59509 SHA256 8d8346caec575a0d4953b5a16dcdf37fedcb739f4d5db85307749996375489ba
 DIST wget-1.13.4.tar.xz 1453220 RMD160 01dfec4870d9878a323275eb4d69fd744a470fda SHA1 a55ecf582fa58e8bb50c3952f6786f33f498f42a SHA256 12a839a5f622e82d4f7b4a75ae09ed4b084658468c9f90796480754f5d96d1d6
 EBUILD wget-1.12-r3.ebuild 2250 RMD160 904891d523522814845046e62508812d564ee1d2 SHA1 9307dde7e5412a282996a8aee9c0737d790bb36e SHA256 db1f22e3f8f61d94d7702f7d6788bcd1512b8e11acce04d039bbf44eb0bf3310
 EBUILD wget-1.13.3-r2.ebuild 2036 RMD160 6258a59ff189ff76bcfcd3ef667dd3a542f70fda SHA1 4953e0748402970ac3e24310377fa4d3deff1f11 SHA256 bd7d22e725ea822f7794a2caf49a654e6f04c5e0f5914b2fec5b0112ac7e66a7
+EBUILD wget-1.13.4-r1.ebuild 2448 RMD160 7ab24b9b0347b4bba468b03790018d688a057fb1 SHA1 11f93558e089db0a98401f6244b6817c66d46aab SHA256 3bcf665ad9616ec534ae44cbd238f9835a0c420f0e86d06d9c71dafea440575a
 EBUILD wget-1.13.4.ebuild 1970 RMD160 268b6fc0fddd123172feada22d0fff95ee7c7466 SHA1 7a4e95248e22154a1c931876c37c8ee89eb11911 SHA256 b0c3b67116fbab7bbf1ad4d9fc397481a2fe585f54bc67650e0b3f30b2d0d927
-MISC ChangeLog 22154 RMD160 506a40cd0722b11ffa4dafc36be36ed4619d2470 SHA1 c5713b3afaa926b8e98d2a2c5a9fa7902caef3f9 SHA256 0c4a0573992ac9f7f704597c78f5569bc799eb90fc5b44f7925788c62d7b97f4
+MISC ChangeLog 22374 RMD160 12c633b90cc5752c9f5c795a84bd5f471a9ecc76 SHA1 bffe57a2875fdd9950d54f8eecd96700006a8a08 SHA256 51748b76be10e39393c4a8bee7d4fa8c6fd019a21452804ccef1d83467f4e3e1
 MISC metadata.xml 258 RMD160 67393c1bb85136bfc1cd8e1145f3e5e0efa32828 SHA1 8d60f18c79ce849b2e3b31d33cb04ef8a0d70546 SHA256 63f6de85aadabff6f0250403fd8c60a6782e62b0d953dbdae71daf62ea717716
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOdnn5AAoJEEqz6FtPBkyjMaEIAIULJ040q+AgjoUiRzEH8Dr+
-9h7MUFPrEdpcW3nLBOuq9S/xlbGPm5rgXKiKnNPF6zIrLLmZwc8LgQrzFtOybk5N
-Fxs1i1nlL9s3va0MMxQWknImCOrBGypxQypfK79NMGOu3ec1nBhtvXx2LkCyn5dz
-mt+u36n/4fg0+1lI/8zezJFj5E7rdnXPp6g3Aj0EKsHPrMIT3M7djh+0WWS7F0zN
-zWEeJFeqf80tzyEXTKbwqL7WW04eDd5p2sF8WuyXDF1rYS7tYw3LjBkfntPCsYDf
-3H/QlD0vbEpu43BGkbJZsje+E2emdnbof9WVCDvHLlcxy7rL+i7Q4xU7+cGv8bc=
-=drIQ
+iF4EAREIAAYFAk7W4MEACgkQaC/OocHi7JZwcgD9E3GQpKDmTd87Gg7Rr6QywoWN
++fzUTVJkG4OguqjTaNsA/Rd0ebFC67cSYTr5UMjsCiWujTIzxkJe3/rcONV4bG+g
+=Alyd
 -----END PGP SIGNATURE-----
diff --git a/net-misc/wget/files/wget-1.13.4-openssl-pkg-config.patch b/net-misc/wget/files/wget-1.13.4-openssl-pkg-config.patch
new file mode 100644
index 000000000000..c052b4a189e3
--- /dev/null
+++ b/net-misc/wget/files/wget-1.13.4-openssl-pkg-config.patch
@@ -0,0 +1,30 @@
+detect openssl via pkg-config if it's available
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -234,7 +234,16 @@ dnl
+ dnl Checks for libraries.
+ dnl
+ 
++PKG_PROG_PKG_CONFIG
++
+ 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"
++    ], [
++
+     dnl some versions of openssl use zlib compression
+     AC_CHECK_LIB(z, compress)
+ 
+@@ -294,6 +303,8 @@ AS_IF([test x$ssl_found != xyes],
+ 
+ ])
+ 
++])
++
+ ], [
+   # --with-ssl is not gnutls: check if it's no
+   AS_IF([test x"$with_ssl" != xno], [
diff --git a/net-misc/wget/wget-1.13.4-r1.ebuild b/net-misc/wget/wget-1.13.4-r1.ebuild
new file mode 100644
index 000000000000..2491d1a20bc4
--- /dev/null
+++ b/net-misc/wget/wget-1.13.4-r1.ebuild
@@ -0,0 +1,76 @@
+# 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.4-r1.ebuild,v 1.1 2011/12/01 02:04:41 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 ~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.9.6b[static-libs(+)] )
+	)"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	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
+	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
+
+	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
+}