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 | 30a0fafed3bd420fdb03e6e0a0da3d5f0a86b62e (patch) | |
| tree | 27353872292a8143fb4bae22b6deb401794938b5 /net-im/bitlbee | |
| parent | Added parmetis as a possible graph partitoner (diff) | |
| download | historical-30a0fafed3bd420fdb03e6e0a0da3d5f0a86b62e.tar.gz historical-30a0fafed3bd420fdb03e6e0a0da3d5f0a86b62e.tar.bz2 historical-30a0fafed3bd420fdb03e6e0a0da3d5f0a86b62e.zip | |
Disable jabber protocol to compile with nss for bug #213958
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'net-im/bitlbee')
| -rw-r--r-- | net-im/bitlbee/ChangeLog | 5 | ||||
| -rw-r--r-- | net-im/bitlbee/Manifest | 4 | ||||
| -rw-r--r-- | net-im/bitlbee/bitlbee-1.2.ebuild | 19 |
3 files changed, 21 insertions, 7 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/Manifest b/net-im/bitlbee/Manifest index 3ad70be59ec2..12baf7f98b90 100644 --- a/net-im/bitlbee/Manifest +++ b/net-im/bitlbee/Manifest @@ -15,6 +15,6 @@ EBUILD bitlbee-1.0.3.ebuild 4622 RMD160 cad15ed525e30646bed341d56b50fc0ba0890280 EBUILD bitlbee-1.0.4.ebuild 4780 RMD160 7ec0ca612ed9be89b962d3b8135de1d242411c66 SHA1 8ec67fb2ccbc57b12b4c929647c7d83c9553cfcc SHA256 985a541fd32d87aeece425260110bb2d278a174f869cf82178ef42b4a785575f EBUILD bitlbee-1.1-r1.ebuild 4525 RMD160 5db4e8fe9bbce32fcd893fe61fbea13c83e9a1e0 SHA1 3b6fd1383bf0bf9875f96f2cfb81a47d6a99926d SHA256 d6a509f1318f4c438915963792dd2ba84b97d883835cd16048b5848e2abaf4da EBUILD bitlbee-1.1.1.ebuild 4485 RMD160 7fadfde761bc4e8caf669c76b4d5e0f7277d9014 SHA1 1bfa40755c72c014bc3fc05b44dd28be086dbe42 SHA256 69cb6853f13059de983725bcb679db40f56312585879ed63bc90a046928d1074 -EBUILD bitlbee-1.2.ebuild 4482 RMD160 4989b4bf50cf29be15661098be31a7886db6ddcf SHA1 8c86c55231c14062334409807e47e80890f4b7b0 SHA256 2ddf4057dc871c9e2ac1147bf307c2406b2e8202963fded4d4fccd4a923eb337 -MISC ChangeLog 15305 RMD160 0bebd4c0e17057052412b4b2b0ca5f04356fcb6f SHA1 8e0c05544f82000aa375c4fa84347eadb2b5677d SHA256 1d6b620fa316b9bb2d7f887d2b2f4285ff25339c1fbcf765d6f7f6fc3ca899be +EBUILD bitlbee-1.2.ebuild 4770 RMD160 806024a6f27d12830968fb4c0cc806be31dc5940 SHA1 e3701e739aac8a3b82725eff418cb977f3b44501 SHA256 4b5c57da7282e5bca438789b6d86820ab2893a7f5bb8f43a1269583f51f8e84f +MISC ChangeLog 15435 RMD160 fe25ef2f0032703d4d30e2ff8eac6474eebc9ffe SHA1 2b215b212bd14012bda5bfd01f4bbe8b10233770 SHA256 0d089c270c70041b2ef50c85be29af54ed23a6211385baf160b98fe5f5ad0b8d MISC metadata.xml 441 RMD160 f440e9e63bc4c6abdcf4b7e23fcfddcd678f961e SHA1 6cca8fafd875ff937fc225a1b0fd1876802ffb42 SHA256 a6dcfed15814498c58a9625f9bb9f742595a253181656d8b7fc69234d3170840 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." |