Fixing dbus depends

(Portage version: 2.1.2_rc2)

5 files changed, 34 insertions, 17 deletions

diff --git a/media-libs/libipoddevice/ChangeLog b/media-libs/libipoddevice/ChangeLog
index 1c3bd7d53d0d..763eafb9c8e8 100644
--- a/media-libs/libipoddevice/ChangeLog
+++ b/media-libs/libipoddevice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libipoddevice
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libipoddevice/ChangeLog,v 1.9 2006/10/29 17:54:15 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libipoddevice/ChangeLog,v 1.10 2006/11/19 20:26:29 cardoe Exp $
+
+  19 Nov 2006; Doug Goldstein <cardoe@gentoo.org>
+  libipoddevice-0.4.5.ebuild, libipoddevice-0.5.0.ebuild,
+  libipoddevice-0.5.0-r1.ebuild, libipoddevice-0.5.1.ebuild:
+  Fixing dbus depends
 
   29 Oct 2006; Doug Goldstein <cardoe@gentoo.org>
   libipoddevice-0.4.5.ebuild, libipoddevice-0.5.0.ebuild,
diff --git a/media-libs/libipoddevice/libipoddevice-0.4.5.ebuild b/media-libs/libipoddevice/libipoddevice-0.4.5.ebuild
index 7d264dc6cf70..e13925c19d06 100644
--- a/media-libs/libipoddevice/libipoddevice-0.4.5.ebuild
+++ b/media-libs/libipoddevice/libipoddevice-0.4.5.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/media-libs/libipoddevice/libipoddevice-0.4.5.ebuild,v 1.3 2006/10/30 17:41:16 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libipoddevice/libipoddevice-0.4.5.ebuild,v 1.4 2006/11/19 20:26:29 cardoe Exp $
 
 inherit multilib eutils
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND="|| ( >=dev-libs/dbus-glib-0.71 <sys-apps/dbus-0.90 )
+RDEPEND="|| ( >=dev-libs/dbus-glib-0.71
+			( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.30 ) )
 	>=sys-apps/hal-0.5.2
 	sys-apps/pmount
 	virtual/eject"
@@ -31,8 +32,10 @@ src_unpack() {
 	fi
 }
 pkg_setup() {
-	if ! built_with_use sys-apps/dbus gtk; then
-		die "need sys-libs/dbus built with gtk USE flag"
+	if [ ! -z $(best_version =sys-apps/dbus-0.62*) ]; then
+		if ! built_with_use "=sys-apps/dbus-0.62*" gtk; then
+			die "need sys-libs/dbus built with gtk USE flag"
+		fi
 	fi
 }
 src_compile() {
diff --git a/media-libs/libipoddevice/libipoddevice-0.5.0-r1.ebuild b/media-libs/libipoddevice/libipoddevice-0.5.0-r1.ebuild
index 63be61ca5d95..5a79dc34af1d 100644
--- a/media-libs/libipoddevice/libipoddevice-0.5.0-r1.ebuild
+++ b/media-libs/libipoddevice/libipoddevice-0.5.0-r1.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/media-libs/libipoddevice/libipoddevice-0.5.0-r1.ebuild,v 1.3 2006/10/30 17:41:16 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libipoddevice/libipoddevice-0.5.0-r1.ebuild,v 1.4 2006/11/19 20:26:29 cardoe Exp $
 
 inherit multilib eutils
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND="|| ( >=dev-libs/dbus-glib-0.71 <sys-apps/dbus-0.90 )
+RDEPEND="|| ( >=dev-libs/dbus-glib-0.71
+			( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.30 ) )
 	>=sys-apps/hal-0.5.2
 	sys-apps/pmount
 	virtual/eject"
@@ -33,8 +34,10 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-gentoohal.patch
 }
 pkg_setup() {
-	if ! built_with_use sys-apps/dbus gtk; then
-		die "need sys-libs/dbus built with gtk USE flag"
+	if [ ! -z $(best_version =sys-apps/dbus-0.62*) ]; then
+		if ! built_with_use "=sys-apps/dbus-0.62*" gtk; then
+			die "need sys-libs/dbus built with gtk USE flag"
+		fi
 	fi
 }
 src_compile() {
diff --git a/media-libs/libipoddevice/libipoddevice-0.5.0.ebuild b/media-libs/libipoddevice/libipoddevice-0.5.0.ebuild
index a587fce4bbcd..ecf01ac41913 100644
--- a/media-libs/libipoddevice/libipoddevice-0.5.0.ebuild
+++ b/media-libs/libipoddevice/libipoddevice-0.5.0.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/media-libs/libipoddevice/libipoddevice-0.5.0.ebuild,v 1.3 2006/10/30 17:41:16 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libipoddevice/libipoddevice-0.5.0.ebuild,v 1.4 2006/11/19 20:26:29 cardoe Exp $
 
 inherit multilib eutils
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND="|| ( >=dev-libs/dbus-glib-0.71 <sys-apps/dbus-0.90 )
+RDEPEND="|| ( >=dev-libs/dbus-glib-0.71
+			( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.30 ) )
 	>=sys-apps/hal-0.5.2
 	sys-apps/pmount
 	virtual/eject"
@@ -32,8 +33,10 @@ src_unpack() {
 	fi
 }
 pkg_setup() {
-	if ! built_with_use sys-apps/dbus gtk; then
-		die "need sys-libs/dbus built with gtk USE flag"
+	if [ ! -z $(best_version =sys-apps/dbus-0.62*) ]; then
+		if ! built_with_use "=sys-apps/dbus-0.62*" gtk; then
+			die "need sys-libs/dbus built with gtk USE flag"
+		fi
 	fi
 }
 src_compile() {
diff --git a/media-libs/libipoddevice/libipoddevice-0.5.1.ebuild b/media-libs/libipoddevice/libipoddevice-0.5.1.ebuild
index c2c675685b49..36f4dcbb403c 100644
--- a/media-libs/libipoddevice/libipoddevice-0.5.1.ebuild
+++ b/media-libs/libipoddevice/libipoddevice-0.5.1.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/media-libs/libipoddevice/libipoddevice-0.5.1.ebuild,v 1.3 2006/10/30 17:41:16 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libipoddevice/libipoddevice-0.5.1.ebuild,v 1.4 2006/11/19 20:26:29 cardoe Exp $
 
 inherit multilib eutils
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND="|| ( >=dev-libs/dbus-glib-0.71 <sys-apps/dbus-0.90 )
+RDEPEND="|| ( >=dev-libs/dbus-glib-0.71
+			( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.30 ) )
 	>=sys-apps/hal-0.5.2
 	sys-apps/pmount
 	virtual/eject"
@@ -32,8 +33,10 @@ src_unpack() {
 	fi
 }
 pkg_setup() {
-	if ! built_with_use sys-apps/dbus gtk; then
-		die "need sys-libs/dbus built with gtk USE flag"
+	if [ ! -z $(best_version =sys-apps/dbus-0.62*) ]; then
+		if ! built_with_use "=sys-apps/dbus-0.62*" gtk; then
+			die "need sys-libs/dbus built with gtk USE flag"
+		fi
 	fi
 }
 src_compile() {