summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Krier <cedk@gentoo.org>2008-03-29 12:39:49 +0000
committerCédric Krier <cedk@gentoo.org>2008-03-29 12:39:49 +0000
commitebc824eb3174cb402a7168ee7d7a35949d1da13f (patch)
treeb99cf15cbc8c4a05f67a902f8f6bb3a46df5a8ff /net-im/bitlbee
parentStable on x86 wrt bug #214734 (diff)
downloadhistorical-ebc824eb3174cb402a7168ee7d7a35949d1da13f.tar.gz
historical-ebc824eb3174cb402a7168ee7d7a35949d1da13f.tar.bz2
historical-ebc824eb3174cb402a7168ee7d7a35949d1da13f.zip
Change order of ssl selection
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'net-im/bitlbee')
-rw-r--r--net-im/bitlbee/ChangeLog5
-rw-r--r--net-im/bitlbee/Manifest4
-rw-r--r--net-im/bitlbee/bitlbee-1.2.ebuild8
3 files changed, 10 insertions, 7 deletions
diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index 2fce57b93534..fd67d874aaaf 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.95 2008/03/27 19:13:28 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.96 2008/03/29 12:39:49 cedk Exp $
+
+ 29 Mar 2008; Cédric Krier <cedk@gentoo.org> bitlbee-1.2.ebuild:
+ Change order of ssl selection
27 Mar 2008; Cédric Krier <cedk@gentoo.org> bitlbee-1.2.ebuild:
Disable jabber protocol to compile with nss for bug #213958
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index 12baf7f98b90..5dda4765f1c5 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 4770 RMD160 806024a6f27d12830968fb4c0cc806be31dc5940 SHA1 e3701e739aac8a3b82725eff418cb977f3b44501 SHA256 4b5c57da7282e5bca438789b6d86820ab2893a7f5bb8f43a1269583f51f8e84f
-MISC ChangeLog 15435 RMD160 fe25ef2f0032703d4d30e2ff8eac6474eebc9ffe SHA1 2b215b212bd14012bda5bfd01f4bbe8b10233770 SHA256 0d089c270c70041b2ef50c85be29af54ed23a6211385baf160b98fe5f5ad0b8d
+EBUILD bitlbee-1.2.ebuild 4770 RMD160 26fc487f009c4912d15d516192299d94840284e0 SHA1 46f001578bb08619cfac05055d501e19b996b687 SHA256 ebb48b06d90b607960f55ecda0a040b0add26d0eae7392ce718d649f6775866e
+MISC ChangeLog 15535 RMD160 dd15a3660f8045e80336b46804e71af89c45a9d0 SHA1 5c4cc45c4519c85bf4b0e1a1a7bd6e62f947e02a SHA256 a45d9dd2e2d07a51611d9c09d1f294726db6b4afedf448f548948613863c40b4
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 421b2ab591e8..ba526ae0237f 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.3 2008/03/27 19:13:28 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-1.2.ebuild,v 1.4 2008/03/29 12:39:49 cedk Exp $
EAPI="1"
inherit eutils toolchain-funcs confutils
@@ -97,12 +97,12 @@ src_compile() {
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"
+ elif use nss ; then
+ myconf="${myconf} --ssl=nss"
+ einfo "Use nss as SSL support"
else
myconf="${myconf} --ssl=bogus"
einfo "You will not have any encryption support enabled."