Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206528.

Package-Manager: portage-2.1.4.4

diff --git a/net-p2p/kmldonkey/ChangeLog b/net-p2p/kmldonkey/ChangeLog
index f89bab18fe06d6d8bab73be3d8d726cb6382b65f..9485e31522bef197bc5f527838056bc9f0683693 100644 (file)
--- a/net-p2p/kmldonkey/ChangeLog
+++ b/net-p2p/kmldonkey/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/kmldonkey
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/kmldonkey/ChangeLog,v 1.28 2008/02/19 02:00:55 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/kmldonkey/ChangeLog,v 1.29 2008/02/19 02:02:02 ingmar Exp $
+
+  19 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  kmldonkey-0.10.1-r1.ebuild:
+  Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206528.
 
   19 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
   -kmldonkey-0.10.1.ebuild:

diff --git a/net-p2p/kmldonkey/kmldonkey-0.10.1-r1.ebuild b/net-p2p/kmldonkey/kmldonkey-0.10.1-r1.ebuild
index 3a6ac15a3980d00d8deb6025d0e83c6ca4c87928..7aabb2724efb6db2749ce4918ff0c3723fb7ed95 100644 (file)
--- a/net-p2p/kmldonkey/kmldonkey-0.10.1-r1.ebuild
+++ b/net-p2p/kmldonkey/kmldonkey-0.10.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/kmldonkey/kmldonkey-0.10.1-r1.ebuild,v 1.4 2008/02/08 09:36:07 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/kmldonkey/kmldonkey-0.10.1-r1.ebuild,v 1.5 2008/02/19 02:02:02 ingmar Exp $
 
 inherit kde eutils
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND="|| ( kde-base/kcontrol kde-base/kdebase )"
+DEPEND="|| ( =kde-base/kcontrol-3.5* =kde-base/kdebase-3.5* )"
 
 need-kde 3.5
 

diff --git a/net-p2p/ktorrent/ChangeLog b/net-p2p/ktorrent/ChangeLog
index bf2ac1c4eb855097d3292abac07aa7166ab17f82..ac69142f105b437d89bec01a68dcaa69a3277253 100644 (file)
--- a/net-p2p/ktorrent/ChangeLog
+++ b/net-p2p/ktorrent/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/ktorrent
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ChangeLog,v 1.77 2008/02/19 02:01:44 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ChangeLog,v 1.78 2008/02/19 02:03:09 ingmar Exp $
+
+  19 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> ktorrent-2.2.4.ebuild,
+  ktorrent-2.2.5-r1.ebuild:
+  Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206528.
 
   19 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> -ktorrent-2.2.5.ebuild:
   Old.

diff --git a/net-p2p/ktorrent/ktorrent-2.2.4.ebuild b/net-p2p/ktorrent/ktorrent-2.2.4.ebuild
index d4601d2c9e92fb1e7204feb6464c93a69a331622..2c0b05b348ea0d74299ffef11855dc901821d632 100644 (file)
--- a/net-p2p/ktorrent/ktorrent-2.2.4.ebuild
+++ b/net-p2p/ktorrent/ktorrent-2.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-2.2.4.ebuild,v 1.6 2008/01/06 22:44:24 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-2.2.4.ebuild,v 1.7 2008/02/19 02:03:09 ingmar Exp $
 
 inherit kde
 
@@ -21,7 +21,7 @@ DEPEND="dev-libs/gmp
                avahi? ( >=net-dns/avahi-0.6.16-r1 )
                geoip? ( >=dev-libs/geoip-1.4.0-r1 )"
 RDEPEND="${DEPEND}
-               || ( kde-base/kdebase kde-base/kdebase-kioslaves )"
+               || ( =kde-base/kdebase-3.5* =kde-base/kdebase-kioslaves-3.5* )"
 
 need-kde 3.5
 

diff --git a/net-p2p/ktorrent/ktorrent-2.2.5-r1.ebuild b/net-p2p/ktorrent/ktorrent-2.2.5-r1.ebuild
index c3b8d28b1f73f5d994a669031e5cd2fa68e73332..60467ac5382197a29fe883f10d92c13b8fd1a847 100644 (file)
--- a/net-p2p/ktorrent/ktorrent-2.2.5-r1.ebuild
+++ b/net-p2p/ktorrent/ktorrent-2.2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-2.2.5-r1.ebuild,v 1.1 2008/02/15 19:33:47 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-2.2.5-r1.ebuild,v 1.2 2008/02/19 02:03:09 ingmar Exp $
 
 inherit kde
 
@@ -19,7 +19,7 @@ DEPEND="dev-libs/gmp
        >=dev-libs/geoip-1.4.0-r1
        avahi? ( >=net-dns/avahi-0.6.16-r1 )"
 RDEPEND="${DEPEND}
-       || ( kde-base/kdebase-kioslaves kde-base/kdebase )"
+       || ( =kde-base/kdebase-kioslaves-3.5* =kde-base/kdebase-3.5* )"
 
 S="${WORKDIR}/${MY_P}"