Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/wget: wget-1.14-r1.ebuild ChangeLog
Date: Mon, 23 Dec 2013 07:24:05
Message-Id: 20131223072400.0A2DE2004C@flycatcher.gentoo.org
1 vapier 13/12/23 07:23:59
2
3 Modified: ChangeLog
4 Added: wget-1.14-r1.ebuild
5 Log:
6 Add fix from upstream for gnutls/ssl connection rejections #479948 by Scott Bertilson. Document user agent issue in /etc/wgetrc wrt portage fetching #327229. Update the pkg-config patch to cover more libraries #438912.
7
8 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
9
10 Revision Changes Path
11 1.178 net-misc/wget/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/ChangeLog?rev=1.178&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/ChangeLog?rev=1.178&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/ChangeLog?r1=1.177&r2=1.178
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v
20 retrieving revision 1.177
21 retrieving revision 1.178
22 diff -u -r1.177 -r1.178
23 --- ChangeLog 4 Nov 2013 06:38:44 -0000 1.177
24 +++ ChangeLog 23 Dec 2013 07:23:59 -0000 1.178
25 @@ -1,6 +1,15 @@
26 # ChangeLog for net-misc/wget
27 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.177 2013/11/04 06:38:44 polynomial-c Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.178 2013/12/23 07:23:59 vapier Exp $
30 +
31 +*wget-1.14-r1 (23 Dec 2013)
32 +
33 + 23 Dec 2013; Mike Frysinger <vapier@g.o>
34 + +files/wget-1.14-gnutls-ssl.patch, +files/wget-1.14-pkg-config.patch,
35 + +files/wget-1.14-wgetrc.patch, +wget-1.14-r1.ebuild:
36 + Add fix from upstream for gnutls/ssl connection rejections #479948 by Scott
37 + Bertilson. Document user agent issue in /etc/wgetrc wrt portage fetching
38 + #327229. Update the pkg-config patch to cover more libraries #438912.
39
40 04 Nov 2013; Lars Wendler <polynomial-c@g.o> wget-1.14.ebuild,
41 +files/wget-1.14-texi2pod.patch:
42
43
44
45 1.1 net-misc/wget/wget-1.14-r1.ebuild
46
47 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/wget-1.14-r1.ebuild?rev=1.1&view=markup
48 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/wget-1.14-r1.ebuild?rev=1.1&content-type=text/plain
49
50 Index: wget-1.14-r1.ebuild
51 ===================================================================
52 # Copyright 1999-2013 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 # $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.14-r1.ebuild,v 1.1 2013/12/23 07:23:59 vapier Exp $
55
56 EAPI="4"
57
58 inherit flag-o-matic toolchain-funcs autotools
59
60 DESCRIPTION="Network utility to retrieve files from the WWW"
61 HOMEPAGE="http://www.gnu.org/software/wget/"
62 SRC_URI="mirror://gnu/wget/${P}.tar.xz"
63
64 LICENSE="GPL-3"
65 SLOT="0"
66 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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
67 IUSE="debug gnutls idn ipv6 nls ntlm pcre +ssl static uuid zlib"
68
69 LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] )
70 pcre? ( dev-libs/libpcre[static-libs(+)] )
71 ssl? (
72 gnutls? ( net-libs/gnutls[static-libs(+)] )
73 !gnutls? ( dev-libs/openssl:0[static-libs(+)] )
74 )
75 uuid? ( sys-apps/util-linux[static-libs(+)] )
76 zlib? ( sys-libs/zlib[static-libs(+)] )"
77 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
78 DEPEND="${RDEPEND}
79 app-arch/xz-utils
80 virtual/pkgconfig
81 static? ( ${LIB_DEPEND} )
82 nls? ( sys-devel/gettext )"
83
84 REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
85
86 DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
87
88 src_prepare() {
89 epatch "${FILESDIR}"/${PN}-1.14-pkg-config.patch
90 epatch "${FILESDIR}"/${P}-texi2pod.patch
91 epatch "${FILESDIR}"/${PN}-1.14-gnutls-ssl.patch #479948
92 epatch "${FILESDIR}"/${PN}-1.14-wgetrc.patch #327229
93 # We patch the wgetrc sample file which goes into the info page.
94 # Update the info timestamp to avoid regenerating it.
95 touch doc/sample.wgetrc.munged_for_texi_inclusion doc/wget.info
96 eautoreconf
97 }
98
99 src_configure() {
100 # openssl-0.9.8 now builds with -pthread on the BSD's
101 use elibc_FreeBSD && use ssl && append-ldflags -pthread
102 # fix compilation on Solaris, we need filio.h for FIONBIO as used in
103 # the included gnutls -- force ioctl.h to include this header
104 [[ ${CHOST} == *-solaris* ]] && append-flags -DBSD_COMP=1
105
106 # some libraries tests lack configure options :( #432468
107 eval export ac_cv_{header_pcre_h,lib_pcre_pcre_compile}=$(usex pcre)
108 eval export ac_cv_{header_uuid_uuid_h,lib_uuid_uuid_generate}=$(usex uuid)
109
110 if use static ; then
111 append-ldflags -static
112 tc-export PKG_CONFIG
113 PKG_CONFIG+=" --static"
114 fi
115 econf \
116 --disable-rpath \
117 $(use_with ssl ssl $(usex gnutls gnutls openssl)) \
118 $(use_enable ssl opie) \
119 $(use_enable ssl digest) \
120 $(use_enable idn iri) \
121 $(use_enable ipv6) \
122 $(use_enable nls) \
123 $(use_enable ntlm) \
124 $(use_enable debug) \
125 $(use_with zlib)
126 }
127
128 src_install() {
129 default
130
131 sed -i \
132 -e "s:/usr/local/etc:${EPREFIX}/etc:g" \
133 "${ED}"/etc/wgetrc \
134 "${ED}"/usr/share/man/man1/wget.1 \
135 "${ED}"/usr/share/info/wget.info
136 }