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

Package-Manager: portage-2.1.4.4

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 16876b82298e14f36ee5b37ed62c661606004f35..28815afa4e4f4367b46726eaaf840525469eb7b6 100644 (file)
--- 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 5be4532ca14f13f765b5ead0401168a8c6846148..957759aa5e67799273bfa17ee0fd3929667f1739 100644 (file)
--- 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 12b8f8098fd041400f704671673f618d7033b62a..a9a08efa8f82ea37d04b3a5e3092bf76d27dc720 100644 (file)
--- 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 f0d6cd4459f8c64a3392ece0bf379bda66065028..f21dfcee8d021c91988508bbf030322653db1a84 100644 (file)
--- 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 )

diff --git a/media-sound/kwave/ChangeLog b/media-sound/kwave/ChangeLog
index 2e3dadf6773dcfd744bd090ce04ed7f72dbbda5c..6b96ca3b85c27557960b54ebabba16aef74b3541 100644 (file)
--- a/media-sound/kwave/ChangeLog
+++ b/media-sound/kwave/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/kwave
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/ChangeLog,v 1.5 2008/02/18 12:10:26 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/ChangeLog,v 1.6 2008/02/19 01:52:12 ingmar Exp $
+
+  19 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> kwave-0.7.9.ebuild:
+  Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206528.
 
   18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> kwave-0.7.9.ebuild:
   Don't run autotools during src_compile(), bug 207457.

diff --git a/media-sound/kwave/kwave-0.7.9.ebuild b/media-sound/kwave/kwave-0.7.9.ebuild
index f58dea36bde65591862c40a253f906898a1ca914..c056a12bce14bffdb2a7e3b92c9a09cc273483ba 100644 (file)
--- a/media-sound/kwave/kwave-0.7.9.ebuild
+++ b/media-sound/kwave/kwave-0.7.9.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/kwave/kwave-0.7.9.ebuild,v 1.6 2008/02/18 12:10:26 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/kwave-0.7.9.ebuild,v 1.7 2008/02/19 01:52:12 ingmar Exp $
 
 ARTS_REQUIRED=yes
 inherit kde flag-o-matic
@@ -24,7 +24,7 @@ RDEPEND="media-libs/alsa-lib
        sci-libs/gsl"
 
 DEPEND="${RDEPEND}
-       || ( kde-base/kdemultimedia-arts =kde-base/kdemultimedia-3.5* )
+       || ( =kde-base/kdemultimedia-arts-3.5* =kde-base/kdemultimedia-3.5* )
        || ( =kde-base/kdesdk-misc-3.5* =kde-base/kdesdk-3.5* )
        app-text/recode
        media-gfx/imagemagick"

diff --git a/media-sound/yammi/ChangeLog b/media-sound/yammi/ChangeLog
index c64af7e0eef5dbcabb79882a9680036f29786240..5cfff93bb162bb848b398cb99e3b015872e63346 100644 (file)
--- a/media-sound/yammi/ChangeLog
+++ b/media-sound/yammi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/yammi
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/ChangeLog,v 1.35 2007/05/04 18:19:26 dang Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/ChangeLog,v 1.36 2008/02/19 01:53:09 ingmar Exp $
+
+  19 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> yammi-1.2.3.ebuild:
+  Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206528.
 
   04 May 2007; Daniel Gryniewicz <dang@gentoo.org> yammi-1.2.3.ebuild:
   Marked stable on amd64 for bug #176693

diff --git a/media-sound/yammi/yammi-1.2.3.ebuild b/media-sound/yammi/yammi-1.2.3.ebuild
index 112704123981fdaa856ead9fee9cc9db71627cce..4eacb3457b8a832da16fad578bf141ae6c5e3c5e 100644 (file)
--- a/media-sound/yammi/yammi-1.2.3.ebuild
+++ b/media-sound/yammi/yammi-1.2.3.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/yammi/yammi-1.2.3.ebuild,v 1.4 2007/05/04 18:19:26 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-1.2.3.ebuild,v 1.5 2008/02/19 01:53:09 ingmar Exp $
 
 ARTS_REQUIRED="yes"
 inherit kde
@@ -18,7 +18,7 @@ IUSE="cdr encode kde vorbis"
 DEPEND=">=media-libs/taglib-1.3"
 
 RDEPEND="${DEPEND}
-       kde? ( || ( kde-base/noatun kde-base/kdemultimedia ) )
+       kde? ( || ( =kde-base/noatun-3.5* =kde-base/kdemultimedia-3.5* ) )
        media-sound/sox
        virtual/mpg123
        vorbis? ( media-sound/vorbis-tools )