summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@gentoo.org>2011-02-18 13:22:51 +0000
committerNirbheek Chauhan <nirbheek@gentoo.org>2011-02-18 13:22:51 +0000
commit89fab1a9f4e21ee0fb7f76669e6b004c16379983 (patch)
tree3238b0faf4d3c1ed7e1f5429f976dea38c22049d /net-voip
parentProperly handle the return value from i915_wait_request call. Linux patch 2.6... (diff)
downloadgentoo-2-89fab1a9f4e21ee0fb7f76669e6b004c16379983.tar.gz
gentoo-2-89fab1a9f4e21ee0fb7f76669e6b004c16379983.tar.bz2
gentoo-2-89fab1a9f4e21ee0fb7f76669e6b004c16379983.zip
Fix libsoup dependency: after 2.33.1, libsoup started using glib-networking for ssl instead of gnutls, and it is now enabled unconditionally)
(Portage version: 2.1.9.40/cvs/Linux x86_64)
Diffstat (limited to 'net-voip')
-rw-r--r--net-voip/telepathy-gabble/ChangeLog8
-rw-r--r--net-voip/telepathy-gabble/telepathy-gabble-0.10.5.ebuild8
2 files changed, 13 insertions, 3 deletions
diff --git a/net-voip/telepathy-gabble/ChangeLog b/net-voip/telepathy-gabble/ChangeLog
index 102bdc180a33..82cfd0e0c270 100644
--- a/net-voip/telepathy-gabble/ChangeLog
+++ b/net-voip/telepathy-gabble/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-voip/telepathy-gabble
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/ChangeLog,v 1.68 2011/02/16 18:07:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/ChangeLog,v 1.69 2011/02/18 13:22:51 nirbheek Exp $
+
+ 18 Feb 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+ telepathy-gabble-0.10.5.ebuild:
+ Fix libsoup dependency: after 2.33.1, libsoup started using
+ glib-networking for ssl instead of gnutls, and it is now enabled
+ unconditionally)
*telepathy-gabble-0.10.5 (16 Feb 2011)
diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.10.5.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.10.5.ebuild
index 058ec25c0d25..59f2ae2968de 100644
--- a/net-voip/telepathy-gabble/telepathy-gabble-0.10.5.ebuild
+++ b/net-voip/telepathy-gabble/telepathy-gabble-0.10.5.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-voip/telepathy-gabble/telepathy-gabble-0.10.5.ebuild,v 1.2 2011/02/16 18:36:44 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/telepathy-gabble-0.10.5.ebuild,v 1.3 2011/02/18 13:22:51 nirbheek Exp $
EAPI="3"
PYTHON_DEPEND="2:2.5"
@@ -20,11 +20,15 @@ RDEPEND=">=dev-libs/glib-2.24
>=sys-apps/dbus-1.1.0
>=dev-libs/dbus-glib-0.82
>=net-libs/telepathy-glib-0.11.16
- net-libs/libsoup:2.4[ssl]
>=net-libs/libnice-0.0.11
>=net-libs/gnutls-2.10.2
+
dev-db/sqlite:3
dev-libs/libxml2
+
+ || ( net-libs/libsoup:2.4[ssl]
+ >=net-libs/libsoup-2.33.1 )
+
!<net-im/telepathy-mission-control-5.5.0"
DEPEND="${RDEPEND}
dev-libs/libxslt