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

Package-Manager: portage-2.1.4.4

8 files changed, 42 insertions, 26 deletions

diff --git a/kde-misc/kgraphspace/ChangeLog b/kde-misc/kgraphspace/ChangeLog
index 169b771f5324..ca56c4af9cc2 100644
--- a/kde-misc/kgraphspace/ChangeLog
+++ b/kde-misc/kgraphspace/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/kgraphspace
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kgraphspace/ChangeLog,v 1.8 2007/04/28 15:33:13 carlo Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kgraphspace/ChangeLog,v 1.9 2008/02/18 22:43:30 ingmar Exp $
+
+  18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  kgraphspace-0.3.0_pre1.ebuild:
+  Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206571.
 
   28 Apr 2007; Carsten Lohrke <carlo@gentoo.org>
   kgraphspace-0.3.0_pre1.ebuild:
diff --git a/kde-misc/kgraphspace/kgraphspace-0.3.0_pre1.ebuild b/kde-misc/kgraphspace/kgraphspace-0.3.0_pre1.ebuild
index 39954a172cd3..8a60ff1f35a7 100644
--- a/kde-misc/kgraphspace/kgraphspace-0.3.0_pre1.ebuild
+++ b/kde-misc/kgraphspace/kgraphspace-0.3.0_pre1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kgraphspace/kgraphspace-0.3.0_pre1.ebuild,v 1.6 2007/04/28 15:33:13 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kgraphspace/kgraphspace-0.3.0_pre1.ebuild,v 1.7 2008/02/18 22:43:30 ingmar Exp $
 
 inherit kde eutils
 
 DESCRIPTION="A Disk space utility "
 HOMEPAGE="http://kgraphspace.sourceforge.net"
-SRC_URI="mirror://sourceforge/kgraphspace/${P//_/-}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P//_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -15,12 +15,12 @@ IUSE=""
 
 S="$WORKDIR/${P//_/-}"
 
-DEPEND="|| ( kde-base/libkonq kde-base/kdebase )"
+DEPEND="|| ( =kde-base/kdebase-3.5* =kde-base/libkonq-3.5* )"
 
 need-kde 3.5
 
 src_unpack() {
 	kde_src_unpack
 
-	use arts || epatch ${FILESDIR}/${P}-configure.patch
+	use arts || epatch "${FILESDIR}"/${P}-configure.patch
 }
diff --git a/kde-misc/kopete-ktts/ChangeLog b/kde-misc/kopete-ktts/ChangeLog
index 227c74ba31b5..fd87c41bd2c8 100644
--- a/kde-misc/kopete-ktts/ChangeLog
+++ b/kde-misc/kopete-ktts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/kopete-ktts
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kopete-ktts/ChangeLog,v 1.1 2007/06/19 17:02:30 philantrop Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kopete-ktts/ChangeLog,v 1.2 2008/02/18 22:47:02 ingmar Exp $
+
+  18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  kopete-ktts-1.3.0.ebuild:
+  Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206571.
 
 *kopete-ktts-1.3.0 (19 Jun 2007)
 
diff --git a/kde-misc/kopete-ktts/kopete-ktts-1.3.0.ebuild b/kde-misc/kopete-ktts/kopete-ktts-1.3.0.ebuild
index a23e0eb47a36..5f45850350d9 100644
--- a/kde-misc/kopete-ktts/kopete-ktts-1.3.0.ebuild
+++ b/kde-misc/kopete-ktts/kopete-ktts-1.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kopete-ktts/kopete-ktts-1.3.0.ebuild,v 1.1 2007/06/19 17:02:30 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kopete-ktts/kopete-ktts-1.3.0.ebuild,v 1.2 2008/02/18 22:47:02 ingmar Exp $
 
 inherit kde
 
@@ -15,8 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="|| ( kde-base/kttsd kde-base/kdeaccessibility )
-		|| ( kde-base/kopete kde-base/kdenetwork )"
+DEPEND="|| ( =kde-base/kdeaccessibility-3.5* =kde-base/kttsd-3.5* )
+		|| ( =kde-base/kdenetwork-3.5* =kde-base/kopete-3.5* )"
 RDEPEND="${DEPEND}"
 
 need-kde 3
diff --git a/kde-misc/kshutdown/ChangeLog b/kde-misc/kshutdown/ChangeLog
index 6c26f538ddff..e8658e4b694e 100644
--- a/kde-misc/kshutdown/ChangeLog
+++ b/kde-misc/kshutdown/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-misc/kshutdown
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kshutdown/ChangeLog,v 1.11 2007/05/23 19:30:14 genstef Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kshutdown/ChangeLog,v 1.12 2008/02/18 22:51:47 ingmar Exp $
+
+  18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> kshutdown-1.0.ebuild:
+  Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206571.
 
 *kshutdown-1.0 (23 May 2007)
 
diff --git a/kde-misc/kshutdown/kshutdown-1.0.ebuild b/kde-misc/kshutdown/kshutdown-1.0.ebuild
index b8fcbd926aaf..963485e67cf4 100644
--- a/kde-misc/kshutdown/kshutdown-1.0.ebuild
+++ b/kde-misc/kshutdown/kshutdown-1.0.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kshutdown/kshutdown-1.0.ebuild,v 1.1 2007/05/23 19:30:14 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kshutdown/kshutdown-1.0.ebuild,v 1.2 2008/02/18 22:51:47 ingmar Exp $
 
 inherit kde
 
 DESCRIPTION="A shutdown manager for KDE"
 HOMEPAGE="http://kshutdown.sourceforge.net"
-SRC_URI="mirror://sourceforge/kshutdown/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 
 IUSE=""
 KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
 
-RDEPEND="|| ( ( kde-base/kdesu kde-base/kcontrol kde-base/kdialog )
-	      kde-base/kdebase )"
+RDEPEND="
+	|| ( =kde-base/kdebase-3.5*
+		( =kde-base/kdesu-3.5* =kde-base/kcontrol-3.5* =kde-base/kdialog-3.5* ) )"
 
 need-kde 3.4
diff --git a/kde-misc/quadkonsole/ChangeLog b/kde-misc/quadkonsole/ChangeLog
index 00a32975e20c..c5831dabda05 100644
--- a/kde-misc/quadkonsole/ChangeLog
+++ b/kde-misc/quadkonsole/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/quadkonsole
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/quadkonsole/ChangeLog,v 1.2 2007/06/18 05:42:59 philantrop Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/quadkonsole/ChangeLog,v 1.3 2008/02/18 22:53:13 ingmar Exp $
+
+  18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  quadkonsole-2.0.2.ebuild:
+  Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206571.
 
   18 Jun 2007; Wulf C. Krueger <philantrop@gentoo.org>
   quadkonsole-2.0.2.ebuild:
diff --git a/kde-misc/quadkonsole/quadkonsole-2.0.2.ebuild b/kde-misc/quadkonsole/quadkonsole-2.0.2.ebuild
index bc791e3168c5..a6499830fcf3 100644
--- a/kde-misc/quadkonsole/quadkonsole-2.0.2.ebuild
+++ b/kde-misc/quadkonsole/quadkonsole-2.0.2.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/quadkonsole/quadkonsole-2.0.2.ebuild,v 1.2 2007/06/18 05:42:59 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/quadkonsole/quadkonsole-2.0.2.ebuild,v 1.3 2008/02/18 22:53:13 ingmar Exp $
 
 inherit kde
 
 DESCRIPTION="Quadkonsole provides a grid of Konsole terminals."
 HOMEPAGE="http://nomis80.org/quadkonsole/"
-SRC_URI="http://nomis80.org/quadkonsole/${P}.tar.bz2"
+SRC_URI="http://nomis80.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="|| ( kde-base/konsole kde-base/kdebase )"
+RDEPEND="|| ( =kde-base/kdebase-3.5* =kde-base/konsole-3.5* )"
 DEPEND="${RDEPEND}"
 
 need-kde 3.3