Fixing dbus depends

Package-Manager: portage-2.1.2_rc2

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index e912c6de8352240325e4cfc4d5592ed5922b36a4..748587298b09314ff7769ccc05e8b41eb33f11c2 100644 (file)
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.165 2006/10/21 21:05:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.166 2006/11/19 19:53:50 cardoe Exp $
+
+  19 Nov 2006; Doug Goldstein <cardoe@gentoo.org> k3b-0.12.17.ebuild,
+  k3b-1.0_pre1.ebuild, k3b-1.0_pre2.ebuild:
+  Fixing dbus depends
 
   21 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/k3b-0.12.17+flac-1.1.3.patch, +files/k3b-0.12.17-flac-beta.patch,

diff --git a/app-cdr/k3b/k3b-0.12.17.ebuild b/app-cdr/k3b/k3b-0.12.17.ebuild
index 7007a3a5482c2438b98d23aff95488ddd12736e4..6ae6edba3d8cf1f1d86ef0ecdddedad94c56c7dc 100644 (file)
--- a/app-cdr/k3b/k3b-0.12.17.ebuild
+++ b/app-cdr/k3b/k3b-0.12.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.12.17.ebuild,v 1.5 2006/10/21 21:05:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.12.17.ebuild,v 1.6 2006/11/19 19:53:50 cardoe Exp $
 
 inherit kde eutils
 
@@ -14,7 +14,8 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="alsa css dvdr encode ffmpeg flac hal kde mp3 musepack musicbrainz sndfile vcd vorbis"
 
 DEPEND="kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
-       hal? ( || ( dev-libs/dbus-qt3-old sys-apps/dbus )
+       hal? ( || ( dev-libs/dbus-qt3-old
+                               ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.30 ) )
                sys-apps/hal )
        media-libs/libsamplerate
        media-libs/taglib

diff --git a/app-cdr/k3b/k3b-1.0_pre1.ebuild b/app-cdr/k3b/k3b-1.0_pre1.ebuild
index a43cb014dd014868bd178e5ee818d3a95ce49c1a..c176ee8e44b8b3d98ca5feee323c034a2c345541 100644 (file)
--- a/app-cdr/k3b/k3b-1.0_pre1.ebuild
+++ b/app-cdr/k3b/k3b-1.0_pre1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0_pre1.ebuild,v 1.3 2006/10/19 17:41:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0_pre1.ebuild,v 1.4 2006/11/19 19:53:50 cardoe Exp $
 
 inherit kde eutils
 
@@ -17,7 +17,9 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="alsa css dvdr encode ffmpeg flac hal kde mp3 musepack musicbrainz sndfile vcd vorbis"
 
 DEPEND="kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
-       hal? ( sys-apps/dbus sys-apps/hal )
+       hal? ( || ( dev-libs/dbus-qt3-old
+                       ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.30 ) )
+               sys-apps/hal )
        media-libs/libsamplerate
        media-libs/taglib
        >=media-sound/cdparanoia-3.9.8

diff --git a/app-cdr/k3b/k3b-1.0_pre2.ebuild b/app-cdr/k3b/k3b-1.0_pre2.ebuild
index a77a4fcae2e9967dec36fc67c0ff3f792949800e..667461657506519a50906c605884678d333627cf 100644 (file)
--- a/app-cdr/k3b/k3b-1.0_pre2.ebuild
+++ b/app-cdr/k3b/k3b-1.0_pre2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0_pre2.ebuild,v 1.4 2006/10/21 21:05:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0_pre2.ebuild,v 1.5 2006/11/19 19:53:50 cardoe Exp $
 
 inherit kde eutils
 
@@ -17,7 +17,8 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="alsa css dvdr dvdread encode ffmpeg flac hal kde mp3 musepack musicbrainz sndfile vcd vorbis"
 
 DEPEND="kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
-       hal? ( || ( dev-libs/dbus-qt3-old sys-apps/dbus )
+       hal? ( || ( dev-libs/dbus-qt3-old
+                               ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.30 ) )
                sys-apps/hal )
        media-libs/libsamplerate
        media-libs/taglib