diff options
| author |   Cédric Krier <cedk@gentoo.org> | 2008-03-27 19:13:28 +0000 |
|---|---|---|
| committer | Cédric Krier <cedk@gentoo.org> | 2008-03-27 19:13:28 +0000 |
| commit | be1f009df9c99253562b08562808111b464ac402 (patch) | |
| tree | 6430e65068a959f7b3f41a04649e450f0d7b357c /net-im/bitlbee | |
| parent | Added parmetis as a possible graph partitoner (diff) | |
| download | gentoo-2-be1f009df9c99253562b08562808111b464ac402.tar.gz gentoo-2-be1f009df9c99253562b08562808111b464ac402.tar.bz2 gentoo-2-be1f009df9c99253562b08562808111b464ac402.zip | |
Disable jabber protocol to compile with nss for bug #213958
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-im/bitlbee')
| -rw-r--r-- | net-im/bitlbee/ChangeLog | 5 | ||||
| -rw-r--r-- | net-im/bitlbee/bitlbee-1.2.ebuild | 19 |
2 files changed, 19 insertions, 5 deletions
diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog index 68b8a5fe3e8d..2fce57b93534 100644 --- a/net-im/bitlbee/ChangeLog +++ b/net-im/bitlbee/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-im/bitlbee # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.94 2008/03/25 22:11:48 cedk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.95 2008/03/27 19:13:28 cedk Exp $ + + 27 Mar 2008; Cédric Krier <cedk@gentoo.org> bitlbee-1.2.ebuild: + Disable jabber protocol to compile with nss for bug #213958 25 Mar 2008; Cédric Krier <cedk@gentoo.org> bitlbee-1.0.3.ebuild, bitlbee-1.0.4.ebuild, bitlbee-1.1-r1.ebuild: diff --git a/net-im/bitlbee/bitlbee-1.2.ebuild b/net-im/bitlbee/bitlbee-1.2.ebuild index 20aa11919a28..421b2ab591e8 100644 --- a/net-im/bitlbee/bitlbee-1.2.ebuild +++ b/net-im/bitlbee/bitlbee-1.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-1.2.ebuild,v 1.2 2008/03/25 22:04:34 cedk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-1.2.ebuild,v 1.3 2008/03/27 19:13:28 cedk Exp $ EAPI="1" inherit eutils toolchain-funcs confutils @@ -42,14 +42,22 @@ pkg_setup() { # but no SSL support has been enabled confutils_use_depend_any msn gnutls nss ssl - # Warn but not die if jabber is enabled but SSL is not - if use jabber && ! use gnutls && ! use nss && ! use ssl ; then + if use jabber && ! use gnutls && ! use ssl ; then + if use nss; then + ewarn "" + ewarn "You have enabled nss and jabber" + ewarn "but nss doesn't work with jabber" + ewarn "Enable ONE of the following use instead" + ewarn "flags: gnutls or ssl" + ewarn "" + die "nss with jabber doesn't work" + fi ewarn "" ewarn "You have enabled support for Jabber but do not have SSL" ewarn "support enabled. This *will* prevent bitlbee from being" ewarn "able to connect to SSL enabled Jabber servers. If you need to" ewarn "connect to Jabber over SSL, enable ONE of the following use" - ewarn "flags: gnutls, nss or ssl" + ewarn "flags: gnutls or ssl" ewarn "" fi @@ -88,10 +96,13 @@ src_compile() { # setup ssl use flags if use gnutls ; then myconf="${myconf} --ssl=gnutls" + einfo "Use gnutls as SSL support" elif use nss ; then myconf="${myconf} --ssl=nss" + einfo "Use nss as SSL support" elif use ssl ; then myconf="${myconf} --ssl=openssl" + einfo "Use openssl as SSL support" else myconf="${myconf} --ssl=bogus" einfo "You will not have any encryption support enabled." |