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
commitf049bee646ae2d4be699cb78fb210fe5ae0d301d (patch)
tree4bb13b53984a833d6717cc0f33a622df8e424f7b /net-im
parentStable amd64, sparc. (diff)
downloadhistorical-f049bee646ae2d4be699cb78fb210fe5ae0d301d.tar.gz
historical-f049bee646ae2d4be699cb78fb210fe5ae0d301d.tar.bz2
historical-f049bee646ae2d4be699cb78fb210fe5ae0d301d.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/Manifest4
-rw-r--r--net-im/kopete/kopete-0.9.0.ebuild5
3 files changed, 10 insertions, 5 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/Manifest b/net-im/kopete/Manifest
index 620a5f6e3cce..4df043ff4d7d 100644
--- a/net-im/kopete/Manifest
+++ b/net-im/kopete/Manifest
@@ -1,5 +1,5 @@
-MD5 39475908cf39b9998cd298729bd32492 ChangeLog 5482
-MD5 54d56910947e2920ec9eaf92d8dfc705 kopete-0.9.0.ebuild 639
+MD5 bc0929c4c421a5a8957e1e0d409bc666 ChangeLog 5641
+MD5 a1dcb925aebf16c8417cfdc6cd8f128f kopete-0.9.0.ebuild 661
MD5 647223fea91f8588858e175dc584d569 kopete-0.8.0.ebuild 661
MD5 c449be6a59f3b1bcfbc0d2771a5d8bbd metadata.xml 255
MD5 85c4d22bc4a395c10045ee1c3b2bf50e kopete-0.8.4.ebuild 639
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