diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2009-11-14 10:19:21 +0000 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2009-11-14 10:19:21 +0000 |
| commit | 3cd449ca361ed2bf03afd90a37311223a082f3fc (patch) | |
| tree | 6602d7fbd8db60c76ce574a114344c05e847fa40 /net-im | |
| parent | version bump (diff) | |
| download | gentoo-2-3cd449ca361ed2bf03afd90a37311223a082f3fc.tar.gz gentoo-2-3cd449ca361ed2bf03afd90a37311223a082f3fc.tar.bz2 gentoo-2-3cd449ca361ed2bf03afd90a37311223a082f3fc.zip | |
Fix net-misc/curl dependency to also match on the gnutls and nss USE flags, we only need SSL support and not one specific implementation.
(Portage version: 2.2_rc49/cvs/Linux x86_64)
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/centerim/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/centerim/centerim-4.22.8.ebuild | 15 |
2 files changed, 12 insertions, 9 deletions
diff --git a/net-im/centerim/ChangeLog b/net-im/centerim/ChangeLog index 1dd79d0d398b..00637acb0b44 100644 --- a/net-im/centerim/ChangeLog +++ b/net-im/centerim/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/centerim # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/ChangeLog,v 1.38 2009/11/07 22:55:23 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/ChangeLog,v 1.39 2009/11/14 10:19:21 swegener Exp $ + + 14 Nov 2009; Sven Wegener <swegener@gentoo.org> centerim-4.22.8.ebuild: + Fix net-misc/curl dependency to also match on the gnutls and nss USE + flags, we only need SSL support and not one specific implementation. 07 Nov 2009; Daniel Black <dragonheart@gentoo.org> centerim-4.22.7-r1.ebuild, centerim-4.22.8.ebuild: diff --git a/net-im/centerim/centerim-4.22.8.ebuild b/net-im/centerim/centerim-4.22.8.ebuild index 69176bbe6ee6..5ff6e939005e 100644 --- a/net-im/centerim/centerim-4.22.8.ebuild +++ b/net-im/centerim/centerim-4.22.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.8.ebuild,v 1.3 2009/11/07 23:07:12 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.8.ebuild,v 1.4 2009/11/14 10:19:21 swegener Exp $ EAPI="2" @@ -28,15 +28,14 @@ DEPEND=">=sys-libs/ncurses-5.2 crypt? ( >=app-crypt/gpgme-1.0.2 ) ) msn? ( - || ( <net-misc/curl-7.19.7[ssl] >=net-misc/curl-7.19.7[openssl] ) + || ( + <net-misc/curl-7.19.7[ssl] + >=net-misc/curl-7.19.7[openssl] + >=net-misc/curl-7.19.7[gnutls] + >=net-misc/curl-7.19.7[nss] + ) dev-libs/openssl )" -# dual curl dependancies added by dragonheart 20091108 -# as I transition between USE flags -# I also note that curl hides its crypt so maybe this should be: -# || ( net-misc/curl[ssl] -# net-misc/curl[openssl] net-misc/curl[nss] -# net-misc/curl[gnutls] ) RDEPEND="${DEPEND} nls? ( sys-devel/gettext )" |