summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2011-02-10 18:19:45 +0000
committerTim Harder <radhermit@gentoo.org>2011-02-10 18:19:45 +0000
commita70cbe42afb244fb141e18bd975e29bef09e9780 (patch)
tree2fca28567a38a3416aa26c317477c36994985450 /net-im
parentsys-kernel/git-sources: Fix Manifest to include 2.6.38_rc4-r1. (diff)
downloadgentoo-2-a70cbe42afb244fb141e18bd975e29bef09e9780.tar.gz
gentoo-2-a70cbe42afb244fb141e18bd975e29bef09e9780.tar.bz2
gentoo-2-a70cbe42afb244fb141e18bd975e29bef09e9780.zip
Fix compile when the ssl USE flag isn't selected.
(Portage version: 2.2.0_alpha22/cvs/Linux x86_64)
Diffstat (limited to 'net-im')
-rw-r--r--net-im/bitlbee/ChangeLog6
-rw-r--r--net-im/bitlbee/bitlbee-3.0.1.ebuild3
-rw-r--r--net-im/bitlbee/files/bitlbee-3.0.1-no-ssl.patch11
3 files changed, 18 insertions, 2 deletions
diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index 4ae1c64c6c43..f5899b13646d 100644
--- a/net-im/bitlbee/ChangeLog
+++ b/net-im/bitlbee/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-im/bitlbee
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.137 2011/01/27 11:00:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.138 2011/02/10 18:19:45 radhermit Exp $
+
+ 10 Feb 2011; Tim Harder <radhermit@gentoo.org> bitlbee-3.0.1.ebuild,
+ +files/bitlbee-3.0.1-no-ssl.patch:
+ Fix compile when the ssl USE flag isn't selected.
27 Jan 2011; Markos Chandras <hwoarang@gentoo.org> bitlbee-3.0.1.ebuild,
+files/bitlbee-3.0.1-ldflags.patch:
diff --git a/net-im/bitlbee/bitlbee-3.0.1.ebuild b/net-im/bitlbee/bitlbee-3.0.1.ebuild
index d43f1bf2348c..c80b86110b94 100644
--- a/net-im/bitlbee/bitlbee-3.0.1.ebuild
+++ b/net-im/bitlbee/bitlbee-3.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.0.1.ebuild,v 1.6 2011/01/27 11:00:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.0.1.ebuild,v 1.7 2011/02/10 18:19:45 radhermit Exp $
EAPI="3"
inherit eutils toolchain-funcs confutils multilib
@@ -88,6 +88,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-3.0-configure.patch
epatch "${FILESDIR}"/${PN}-3.0.1-ldflags.patch
+ epatch "${FILESDIR}"/${P}-no-ssl.patch
}
src_configure() {
diff --git a/net-im/bitlbee/files/bitlbee-3.0.1-no-ssl.patch b/net-im/bitlbee/files/bitlbee-3.0.1-no-ssl.patch
new file mode 100644
index 000000000000..6164ca9ed6b9
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee-3.0.1-no-ssl.patch
@@ -0,0 +1,11 @@
+--- bitlbee-3.0.1/lib/ssl_bogus.c.orig
++++ bitlbee-3.0.1/lib/ssl_bogus.c
+@@ -69,8 +69,3 @@
+ {
+ return 0;
+ }
+-
+-int ssl_pending( void *conn )
+-{
+- return 0;
+-}