Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/wget: wget-1.13.3-r2.ebuild ChangeLog
Date: Fri, 02 Sep 2011 05:16:36
Message-Id: 20110902051627.54D542004C@flycatcher.gentoo.org
1 radhermit 11/09/02 05:16:27
2
3 Modified: ChangeLog
4 Added: wget-1.13.3-r2.ebuild
5 Log:
6 Revision bump. Add gnutls USE flag and fix ssl issues (bugs #381441 and #381513).
7
8 (Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.143 net-misc/wget/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/ChangeLog?rev=1.143&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/ChangeLog?rev=1.143&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/ChangeLog?r1=1.142&r2=1.143
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v
20 retrieving revision 1.142
21 retrieving revision 1.143
22 diff -u -r1.142 -r1.143
23 --- ChangeLog 1 Sep 2011 18:33:59 -0000 1.142
24 +++ ChangeLog 2 Sep 2011 05:16:27 -0000 1.143
25 @@ -1,6 +1,12 @@
26 # ChangeLog for net-misc/wget
27 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.142 2011/09/01 18:33:59 grobian Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.143 2011/09/02 05:16:27 radhermit Exp $
30 +
31 +*wget-1.13.3-r2 (02 Sep 2011)
32 +
33 + 02 Sep 2011; Tim Harder <radhermit@g.o> +wget-1.13.3-r2.ebuild:
34 + Revision bump. Add gnutls USE flag and fix ssl issues (bugs #381441 and
35 + #381513).
36
37 01 Sep 2011; Fabian Groffen <grobian@g.o> wget-1.13.3-r1.ebuild:
38 Fix compilation on Solaris
39
40
41
42 1.1 net-misc/wget/wget-1.13.3-r2.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/wget-1.13.3-r2.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/wget-1.13.3-r2.ebuild?rev=1.1&content-type=text/plain
46
47 Index: wget-1.13.3-r2.ebuild
48 ===================================================================
49 # Copyright 1999-2011 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.13.3-r2.ebuild,v 1.1 2011/09/02 05:16:27 radhermit Exp $
52
53 EAPI=4
54
55 inherit eutils flag-o-matic
56
57 DESCRIPTION="Network utility to retrieve files from the WWW"
58 HOMEPAGE="http://www.gnu.org/software/wget/"
59 SRC_URI="mirror://gnu/wget/${P}.tar.xz"
60
61 LICENSE="GPL-3"
62 SLOT="0"
63 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"
64 IUSE="debug gnutls idn ipv6 nls ntlm +ssl static"
65
66 RDEPEND="idn? ( net-dns/libidn )
67 gnutls? ( net-libs/gnutls )
68 !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6b ) )"
69 DEPEND="${RDEPEND}
70 nls? ( sys-devel/gettext )"
71
72 REQUIRED_USE="ntlm? ( !gnutls ssl )"
73
74 DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
75
76 src_prepare() {
77 epatch "${FILESDIR}"/${PN}-1.13-static-link-libz.patch
78 }
79
80 src_configure() {
81 # openssl-0.9.8 now builds with -pthread on the BSD's
82 use elibc_FreeBSD && use ssl && append-ldflags -pthread
83 # fix compilation on Solaris, we need filio.h for FIONBIO as used in
84 # the included gnutls -- force ioctl.h to include this header
85 [[ ${CHOST} == *-solaris* ]] && append-flags -DBSD_COMP=1
86
87 local myconf
88 if use gnutls ; then
89 myconf+=" --with-ssl=gnutls"
90 elif use ssl ; then
91 myconf+=" --with-ssl=openssl"
92 else
93 myconf+=" --without-ssl"
94 fi
95
96 if use gnutls || use ssl ; then
97 myconf+=" --enable-opie --enable-digest"
98 else
99 myconf+=" --disable-opie --disable-digest"
100 fi
101
102 use static && append-ldflags -static
103 econf \
104 --disable-rpath \
105 $(use_enable idn iri) \
106 $(use_enable ipv6) \
107 $(use_enable nls) \
108 $(use_enable ntlm) \
109 $(use_enable debug) \
110 ${myconf}
111 }
112
113 src_install() {
114 default
115
116 use ipv6 && cat "${FILESDIR}"/wgetrc-ipv6 >> "${ED}"/etc/wgetrc
117
118 sed -i \
119 -e "s:/usr/local/etc:${EPREFIX}/etc:g" \
120 "${ED}"/etc/wgetrc \
121 "${ED}"/usr/share/man/man1/wget.1 \
122 "${ED}"/usr/share/info/wget.info
123 }