summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2006-06-02 20:06:14 +0000
committerStefan Schweizer <genstef@gentoo.org>2006-06-02 20:06:14 +0000
commitefe2bd605c2db8bddca732a3f76db8028e73c8e5 (patch)
tree03fc0e6588b8ba6eb6ff3590f8ed5b82b657a2f6 /net-libs/libjingle
parentProperly block kde-base/kdenetwork and net-libs/libjingle thanks to Daniel We... (diff)
downloadgentoo-2-efe2bd605c2db8bddca732a3f76db8028e73c8e5.tar.gz
gentoo-2-efe2bd605c2db8bddca732a3f76db8028e73c8e5.tar.bz2
gentoo-2-efe2bd605c2db8bddca732a3f76db8028e73c8e5.zip
block kopete
(Portage version: 2.1_rc3-r1)
Diffstat (limited to 'net-libs/libjingle')
-rw-r--r--net-libs/libjingle/ChangeLog6
-rw-r--r--net-libs/libjingle/libjingle-0.3.0_p20060508.ebuild3
2 files changed, 7 insertions, 2 deletions
diff --git a/net-libs/libjingle/ChangeLog b/net-libs/libjingle/ChangeLog
index 4d185640a7e7..84e755fc92d5 100644
--- a/net-libs/libjingle/ChangeLog
+++ b/net-libs/libjingle/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-libs/libjingle
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libjingle/ChangeLog,v 1.2 2006/05/22 15:58:07 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libjingle/ChangeLog,v 1.3 2006/06/02 20:06:14 genstef Exp $
+
+ 02 Jun 2006; Stefan Schweizer <genstef@gentoo.org>
+ libjingle-0.3.0_p20060508.ebuild:
+ block kopete
22 May 2006; Stefan Schweizer <genstef@gentoo.org>
libjingle-0.3.0_p20060508.ebuild:
diff --git a/net-libs/libjingle/libjingle-0.3.0_p20060508.ebuild b/net-libs/libjingle/libjingle-0.3.0_p20060508.ebuild
index 0766df7a002c..b2685273e187 100644
--- a/net-libs/libjingle/libjingle-0.3.0_p20060508.ebuild
+++ b/net-libs/libjingle/libjingle-0.3.0_p20060508.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libjingle/libjingle-0.3.0_p20060508.ebuild,v 1.3 2006/05/23 17:09:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libjingle/libjingle-0.3.0_p20060508.ebuild,v 1.4 2006/06/02 20:06:14 genstef Exp $
inherit autotools
@@ -15,6 +15,7 @@ IUSE="speex ilbc ortp"
SLOT="0"
RDEPEND="dev-libs/openssl
+ !net-im/kopete
ortp? (
~net-libs/ortp-0.7.1
ilbc? ( dev-libs/ilbc-rfc3951 )