| 1 |
scarabeus 11/09/02 06:58:11 |
| 2 |
|
| 3 |
Modified: wget-1.13.3-r2.ebuild ChangeLog |
| 4 |
Removed: wget-1.13.3-r1.ebuild wget-1.13.3.ebuild |
| 5 |
Log: |
| 6 |
Fix the gnutls uselfag to be wrapped around ssl one. Use use_with calls instead of bash conditions. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 net-misc/wget/wget-1.13.3-r2.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/wget-1.13.3-r2.ebuild?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/wget-1.13.3-r2.ebuild?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/wget-1.13.3-r2.ebuild?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: wget-1.13.3-r2.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.13.3-r2.ebuild,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- wget-1.13.3-r2.ebuild 2 Sep 2011 05:16:27 -0000 1.1 |
| 24 |
+++ wget-1.13.3-r2.ebuild 2 Sep 2011 06:58:11 -0000 1.2 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
# Copyright 1999-2011 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $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 $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.13.3-r2.ebuild,v 1.2 2011/09/02 06:58:11 scarabeus Exp $ |
| 30 |
|
| 31 |
EAPI=4 |
| 32 |
|
| 33 |
@@ -16,12 +16,15 @@ |
| 34 |
IUSE="debug gnutls idn ipv6 nls ntlm +ssl static" |
| 35 |
|
| 36 |
RDEPEND="idn? ( net-dns/libidn ) |
| 37 |
- gnutls? ( net-libs/gnutls ) |
| 38 |
- !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6b ) )" |
| 39 |
+ ssl? ( |
| 40 |
+ gnutls? ( net-libs/gnutls ) |
| 41 |
+ !gnutls? ( >=dev-libs/openssl-0.9.6b ) |
| 42 |
+ )" |
| 43 |
DEPEND="${RDEPEND} |
| 44 |
nls? ( sys-devel/gettext )" |
| 45 |
|
| 46 |
-REQUIRED_USE="ntlm? ( !gnutls ssl )" |
| 47 |
+REQUIRED_USE="ntlm? ( !gnutls ssl ) |
| 48 |
+ gnutls? ( ssl )" |
| 49 |
|
| 50 |
DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc ) |
| 51 |
|
| 52 |
@@ -36,24 +39,12 @@ |
| 53 |
# the included gnutls -- force ioctl.h to include this header |
| 54 |
[[ ${CHOST} == *-solaris* ]] && append-flags -DBSD_COMP=1 |
| 55 |
|
| 56 |
- local myconf |
| 57 |
- if use gnutls ; then |
| 58 |
- myconf+=" --with-ssl=gnutls" |
| 59 |
- elif use ssl ; then |
| 60 |
- myconf+=" --with-ssl=openssl" |
| 61 |
- else |
| 62 |
- myconf+=" --without-ssl" |
| 63 |
- fi |
| 64 |
- |
| 65 |
- if use gnutls || use ssl ; then |
| 66 |
- myconf+=" --enable-opie --enable-digest" |
| 67 |
- else |
| 68 |
- myconf+=" --disable-opie --disable-digest" |
| 69 |
- fi |
| 70 |
- |
| 71 |
use static && append-ldflags -static |
| 72 |
econf \ |
| 73 |
--disable-rpath \ |
| 74 |
+ $(use_with ssl ssl $(use gnutls && echo "gnutls" || echo "openssl")) \ |
| 75 |
+ $(use_enable ssl opie) \ |
| 76 |
+ $(use_enable ssl digest) \ |
| 77 |
$(use_enable idn iri) \ |
| 78 |
$(use_enable ipv6) \ |
| 79 |
$(use_enable nls) \ |
| 80 |
|
| 81 |
|
| 82 |
|
| 83 |
1.144 net-misc/wget/ChangeLog |
| 84 |
|
| 85 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/ChangeLog?rev=1.144&view=markup |
| 86 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/ChangeLog?rev=1.144&content-type=text/plain |
| 87 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/ChangeLog?r1=1.143&r2=1.144 |
| 88 |
|
| 89 |
Index: ChangeLog |
| 90 |
=================================================================== |
| 91 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v |
| 92 |
retrieving revision 1.143 |
| 93 |
retrieving revision 1.144 |
| 94 |
diff -u -r1.143 -r1.144 |
| 95 |
--- ChangeLog 2 Sep 2011 05:16:27 -0000 1.143 |
| 96 |
+++ ChangeLog 2 Sep 2011 06:58:11 -0000 1.144 |
| 97 |
@@ -1,6 +1,11 @@ |
| 98 |
# ChangeLog for net-misc/wget |
| 99 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 100 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.143 2011/09/02 05:16:27 radhermit Exp $ |
| 101 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.144 2011/09/02 06:58:11 scarabeus Exp $ |
| 102 |
+ |
| 103 |
+ 02 Sep 2011; Tomáš Chvátal <scarabeus@g.o> -wget-1.13.3.ebuild, |
| 104 |
+ -wget-1.13.3-r1.ebuild, wget-1.13.3-r2.ebuild: |
| 105 |
+ Fix the gnutls uselfag to be wrapped around ssl one. Use use_with calls |
| 106 |
+ instead of bash conditions. |
| 107 |
|
| 108 |
*wget-1.13.3-r2 (02 Sep 2011) |
Archives