diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-12-01 12:53:09 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-12-01 12:53:09 +0000 |
| commit | c3f55bc3846b45488058dbc2ff90e25c3f606d9b (patch) | |
| tree | 29d8548ba7faf29de87a5f2485d82b097aa372cc /net-misc | |
| parent | dev-java/lucene: fixed compilation problem (diff) | |
| download | gentoo-2-c3f55bc3846b45488058dbc2ff90e25c3f606d9b.tar.gz gentoo-2-c3f55bc3846b45488058dbc2ff90e25c3f606d9b.tar.bz2 gentoo-2-c3f55bc3846b45488058dbc2ff90e25c3f606d9b.zip | |
QA: do not try to be smart about setting dependencies, when the tricks don't work, instead duplicate the info and get it right for now.
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/wget/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/wget/wget-1.13.4-r1.ebuild | 13 |
2 files changed, 14 insertions, 5 deletions
diff --git a/net-misc/wget/ChangeLog b/net-misc/wget/ChangeLog index d9ccfc1ff4c2..d1f90f2b12b7 100644 --- a/net-misc/wget/ChangeLog +++ b/net-misc/wget/ChangeLog @@ -1,6 +1,10 @@ # 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.148 2011/12/01 02:04:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.149 2011/12/01 12:53:09 flameeyes Exp $ + + 01 Dec 2011; Diego E. Pettenò <flameeyes@gentoo.org> wget-1.13.4-r1.ebuild: + QA: do not try to be smart about setting dependencies, when the tricks don't + work, instead duplicate the info and get it right for now. *wget-1.13.4-r1 (01 Dec 2011) diff --git a/net-misc/wget/wget-1.13.4-r1.ebuild b/net-misc/wget/wget-1.13.4-r1.ebuild index 2491d1a20bc4..985fd1e152d8 100644 --- a/net-misc/wget/wget-1.13.4-r1.ebuild +++ b/net-misc/wget/wget-1.13.4-r1.ebuild @@ -1,6 +1,6 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.13.4-r1.ebuild,v 1.2 2011/12/01 12:53:09 flameeyes Exp $ EAPI="4" @@ -15,15 +15,20 @@ 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] ) +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]} )" +LIB_DEPEND="idn? ( net-dns/libidn ) + ssl? ( + gnutls? ( net-libs/gnutls ) + !gnutls? ( >=dev-libs/openssl-0.9.6b ) + )" +RDEPEND="!static? ( ${LIB_DEPEND} )" DEPEND="${RDEPEND} app-arch/xz-utils - static? ( ${LIB_DEPEND} ) + static? ( ${STATIC_LIB_DEPEND} ) nls? ( sys-devel/gettext )" REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )" |