summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorDon Seiler <rizzo@gentoo.org>2004-09-15 17:20:41 +0000
committerDon Seiler <rizzo@gentoo.org>2004-09-15 17:20:41 +0000
commitd8c2cdeb766a708b46f63aa12aae15be1bc1b172 (patch)
tree802ac56f193cd2910a784325d6b5148780d4ba83 /net-im
parentStable amd64. (Manifest recommit) (diff)
downloadgentoo-2-d8c2cdeb766a708b46f63aa12aae15be1bc1b172.tar.gz
gentoo-2-d8c2cdeb766a708b46f63aa12aae15be1bc1b172.tar.bz2
gentoo-2-d8c2cdeb766a708b46f63aa12aae15be1bc1b172.zip
Specified kde-base/kdenetwork as a blocker since both provide kopete and they interfere
Diffstat (limited to 'net-im')
-rw-r--r--net-im/kopete/ChangeLog6
-rw-r--r--net-im/kopete/kopete-0.9.0.ebuild5
2 files changed, 8 insertions, 3 deletions
diff --git a/net-im/kopete/ChangeLog b/net-im/kopete/ChangeLog
index 03c504767d64..4e251b9a25a4 100644
--- a/net-im/kopete/ChangeLog
+++ b/net-im/kopete/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-im/kopete
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/ChangeLog,v 1.46 2004/09/07 19:00:03 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/ChangeLog,v 1.47 2004/09/15 17:20:41 rizzo Exp $
+
+ 15 Sep 2004; Don Seiler <rizzo@gentoo.org> kopete-0.9.0.ebuild:
+ Specified kde-base/kdenetwork as a blocker since both provide kopete and they
+ interfere
*kopete-0.9.0 (07 Sep 2004)
diff --git a/net-im/kopete/kopete-0.9.0.ebuild b/net-im/kopete/kopete-0.9.0.ebuild
index bd71b96a0cbc..10fbebedd4ed 100644
--- a/net-im/kopete/kopete-0.9.0.ebuild
+++ b/net-im/kopete/kopete-0.9.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/kopete-0.9.0.ebuild,v 1.1 2004/09/07 19:00:03 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/kopete-0.9.0.ebuild,v 1.2 2004/09/15 17:20:41 rizzo Exp $
inherit kde
@@ -13,7 +13,8 @@ LICENSE="GPL-2"
KEYWORDS="~x86 ppc ~sparc ~amd64"
IUSE=""
-DEPEND=">=dev-libs/libxml2-2.4.8
+DEPEND="!kde-base/kdenetwork
+ >=dev-libs/libxml2-2.4.8
>=dev-libs/libxslt-1.0.7"
need-kde 3