From: Ingmar Vanhassel Date: Tue, 19 Feb 2008 01:53:09 +0000 (+0000) Subject: Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206528. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0fc11fb35d5ac3391afc0cf477f5fe0178857c02;p=gentoo.git 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 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 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 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 ) diff --git a/media-sound/kwave/ChangeLog b/media-sound/kwave/ChangeLog index 2e3dadf6773d..6b96ca3b85c2 100644 --- 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 kwave-0.7.9.ebuild: + Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206528. 18 Feb 2008; Ingmar Vanhassel 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 f58dea36bde6..c056a12bce14 100644 --- 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 c64af7e0eef5..5cfff93bb162 100644 --- 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 yammi-1.2.3.ebuild: + Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206528. 04 May 2007; Daniel Gryniewicz 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 112704123981..4eacb3457b8a 100644 --- 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 )