diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2009-11-14 10:28:15 +0000 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2009-11-14 10:28:15 +0000 |
| commit | 7e52d9769d47fc933bf0ecf9d7cbc930465184cf (patch) | |
| tree | 9f46879d6b9664f76601f0461ee7435b36901402 /net-im/centerim | |
| parent | Fix net-misc/curl dependency to also match on the gnutls and nss USE flags, w... (diff) | |
| download | gentoo-2-7e52d9769d47fc933bf0ecf9d7cbc930465184cf.tar.gz gentoo-2-7e52d9769d47fc933bf0ecf9d7cbc930465184cf.tar.bz2 gentoo-2-7e52d9769d47fc933bf0ecf9d7cbc930465184cf.zip | |
Also force curl dependency for yahoo protocol support, bug #292540.
(Portage version: 2.2_rc49/cvs/Linux x86_64)
Diffstat (limited to 'net-im/centerim')
| -rw-r--r-- | net-im/centerim/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/centerim/centerim-4.22.7-r1.ebuild | 16 | ||||
| -rw-r--r-- | net-im/centerim/centerim-4.22.8.ebuild | 11 |
3 files changed, 21 insertions, 12 deletions
diff --git a/net-im/centerim/ChangeLog b/net-im/centerim/ChangeLog index 00637acb0b44..ee59971c56e4 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.39 2009/11/14 10:19:21 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/ChangeLog,v 1.40 2009/11/14 10:28:14 swegener Exp $ + + 14 Nov 2009; Sven Wegener <swegener@gentoo.org> centerim-4.22.7-r1.ebuild, + centerim-4.22.8.ebuild: + Also force curl dependency for yahoo protocol support, bug #292540. 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 diff --git a/net-im/centerim/centerim-4.22.7-r1.ebuild b/net-im/centerim/centerim-4.22.7-r1.ebuild index 1018ba633b58..14b22a5c0869 100644 --- a/net-im/centerim/centerim-4.22.7-r1.ebuild +++ b/net-im/centerim/centerim-4.22.7-r1.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.7-r1.ebuild,v 1.6 2009/11/07 23:07:12 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.7-r1.ebuild,v 1.7 2009/11/14 10:28:15 swegener Exp $ EAPI="2" @@ -30,15 +30,13 @@ 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] ) - dev-libs/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] + ) )" -# 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 )" diff --git a/net-im/centerim/centerim-4.22.8.ebuild b/net-im/centerim/centerim-4.22.8.ebuild index 5ff6e939005e..d676b223f61b 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.4 2009/11/14 10:19:21 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.8.ebuild,v 1.5 2009/11/14 10:28:15 swegener Exp $ EAPI="2" @@ -34,7 +34,14 @@ DEPEND=">=sys-libs/ncurses-5.2 >=net-misc/curl-7.19.7[gnutls] >=net-misc/curl-7.19.7[nss] ) - dev-libs/openssl + ) + yahoo? ( + || ( + <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] + ) )" RDEPEND="${DEPEND} |