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

(Portage version: 2.1.4.4)

4 files changed, 14 insertions, 10 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 16876b82298e..28815afa4e4f 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.258 2008/01/08 15:21:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.259 2008/02/19 01:52:19 ingmar Exp $
+
+  19 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> amarok-1.4.7-r2.ebuild,
+  amarok-1.4.8.ebuild, amarok-1.4.9999-r2.ebuild:
+  Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206528.
 
   08 Jan 2008; Raúl Porcel <armin76@gentoo.org> amarok-1.4.8.ebuild:
   sparc stable wrt #204046, thanks to Alex Maclean for testing
diff --git a/media-sound/amarok/amarok-1.4.7-r2.ebuild b/media-sound/amarok/amarok-1.4.7-r2.ebuild
index 5be4532ca14f..957759aa5e67 100644
--- a/media-sound/amarok/amarok-1.4.7-r2.ebuild
+++ b/media-sound/amarok/amarok-1.4.7-r2.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/media-sound/amarok/amarok-1.4.7-r2.ebuild,v 1.7 2007/11/23 13:55:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.7-r2.ebuild,v 1.8 2008/02/19 01:52:19 ingmar Exp $
 
 LANGS="af ar az be bg bn br ca cs cy da de el en_GB eo es et eu fa fi
 fr ga gl he hi hu id is it ja km ko ku lo lt mk ms nb nds ne nl nn pa pl
@@ -40,7 +40,7 @@ visualization ipod ifp real njb mtp musicbrainz daap
 python"
 # kde: enables compilation of the konqueror sidebar plugin
 
-RDEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
+RDEPEND="kde? ( || ( =kde-base/konqueror-3.5* =kde-base/kdebase-3.5* ) )
 	>=media-libs/xine-lib-1.1.2_pre20060328-r8
 	>=media-libs/taglib-1.4
 	mysql? ( >=virtual/mysql-4.0 )
diff --git a/media-sound/amarok/amarok-1.4.8.ebuild b/media-sound/amarok/amarok-1.4.8.ebuild
index 12b8f8098fd0..a9a08efa8f82 100644
--- a/media-sound/amarok/amarok-1.4.8.ebuild
+++ b/media-sound/amarok/amarok-1.4.8.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/media-sound/amarok/amarok-1.4.8.ebuild,v 1.7 2008/01/08 15:21:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.8.ebuild,v 1.8 2008/02/19 01:52:19 ingmar Exp $
 
 LANGS="af ar az be bg bn br ca cs cy da de el en_GB eo es et eu fa fi
 fr ga gl he hi hu id is it ja km ko ku lo lt mk ms nb nds ne nl nn pa
@@ -41,14 +41,14 @@ visualization ipod ifp real njb mtp musicbrainz daap
 python"
 # kde: enables compilation of the konqueror sidebar plugin
 
-RDEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
+RDEPEND="kde? ( || ( =kde-base/konqueror-3.5* =kde-base/kdebase-3.5* ) )
 	>=media-libs/xine-lib-1.1.2_pre20060328-r8
 	>=media-libs/taglib-1.4
 	mysql? ( >=virtual/mysql-4.0 )
 	postgres? ( dev-db/libpq )
 	opengl? ( virtual/opengl )
 	visualization? ( media-libs/libsdl
-					 =media-plugins/libvisual-plugins-0.4* )
+		=media-plugins/libvisual-plugins-0.4* )
 	ipod? ( >=media-libs/libgpod-0.5.2 )
 	mp4? ( media-libs/libmp4v2 )
 	ifp? ( media-libs/libifp )
diff --git a/media-sound/amarok/amarok-1.4.9999-r2.ebuild b/media-sound/amarok/amarok-1.4.9999-r2.ebuild
index f0d6cd4459f8..f21dfcee8d02 100644
--- a/media-sound/amarok/amarok-1.4.9999-r2.ebuild
+++ b/media-sound/amarok/amarok-1.4.9999-r2.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/media-sound/amarok/amarok-1.4.9999-r2.ebuild,v 1.2 2008/01/05 12:33:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.9999-r2.ebuild,v 1.3 2008/02/19 01:52:19 ingmar Exp $
 
 inherit kde subversion
 
@@ -21,14 +21,14 @@ visualization ipod ifp real njb mtp musicbrainz daap
 python"
 # kde: enables compilation of the konqueror sidebar plugin
 
-RDEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
+RDEPEND="kde? ( || ( =kde-base/konqueror-3.5* =kde-base/kdebase-3.5* ) )
 	>=media-libs/xine-lib-1.1.2_pre20060328-r8
 	>=media-libs/taglib-1.4
 	mysql? ( >=virtual/mysql-4.0 )
 	postgres? ( dev-db/libpq )
 	opengl? ( virtual/opengl )
 	visualization? ( media-libs/libsdl
-					 =media-plugins/libvisual-plugins-0.4* )
+		=media-plugins/libvisual-plugins-0.4* )
 	ipod? ( >=media-libs/libgpod-0.5.2 )
 	mp4? ( media-libs/libmp4v2 )
 	ifp? ( media-libs/libifp )