Fixing dbus depends

Package-Manager: portage-2.1.2_rc2

6 files changed, 57 insertions, 40 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/Manifest b/media-libs/libipoddevice/Manifest
index 8d748da95c7c..58817a461bd0 100644
--- a/media-libs/libipoddevice/Manifest
+++ b/media-libs/libipoddevice/Manifest
@@ -8,26 +8,26 @@ SHA256 374847a8dae2ee7922cd57d01bcc7d6366394f408eb60b73c782352cf955bf7e files/li
 DIST libipoddevice-0.4.5.tar.gz 343309 RMD160 547752ca3559caea3497378eeb25f8787120c592 SHA1 0c23cf26acedf819437052d18e1aa29596df64b1 SHA256 08765a01a2170f6550aa455b8c3a080da69d68ce5e8ba439ddd43503a5347ad3
 DIST libipoddevice-0.5.0.tar.gz 351535 RMD160 814ba67a5ab8a97653466e27d89d715c6d395acc SHA1 98bb245bf73ec3e23c5ed95c244b1475a9085356 SHA256 4da39bccfe605c5ca35abf606603395eedae83feab159184ad4f5efc2acac12d
 DIST libipoddevice-0.5.1.tar.gz 351928 RMD160 2e17ea340e49242ea9aaf0ba426b3bf6c8aff0ea SHA1 6b99812ba7af107dbaeb7257c57fe1568de5a530 SHA256 235f7b8dace1066e3555805afa758f904fadb11bc227b37667cf5b7686e17c5d
-EBUILD libipoddevice-0.4.5.ebuild 1208 RMD160 f3cad59b81ca718c35d1c3e4f6d75813309964fd SHA1 712d907389a35a3ebc66fc0241493dbb3e0c11ea SHA256 0624e4273bd7370bfdc99567ab4fcd9b3db8db047d279af0b7440d31797f225e
-MD5 2ac56a0f4653f54a17f10c182be2caa5 libipoddevice-0.4.5.ebuild 1208
-RMD160 f3cad59b81ca718c35d1c3e4f6d75813309964fd libipoddevice-0.4.5.ebuild 1208
-SHA256 0624e4273bd7370bfdc99567ab4fcd9b3db8db047d279af0b7440d31797f225e libipoddevice-0.4.5.ebuild 1208
-EBUILD libipoddevice-0.5.0-r1.ebuild 1279 RMD160 44870db6f4b4e91cb0d3be87ae45ce8079ab23b0 SHA1 7d2b81da2c9414bae1eeb0895c6473e24e93ec7a SHA256 b7dabd8699b5bc00f843728df6018452962125ec638dbf87c6d66d87404cba0e
-MD5 5c98e323b5232c852f19a10aafc3d577 libipoddevice-0.5.0-r1.ebuild 1279
-RMD160 44870db6f4b4e91cb0d3be87ae45ce8079ab23b0 libipoddevice-0.5.0-r1.ebuild 1279
-SHA256 b7dabd8699b5bc00f843728df6018452962125ec638dbf87c6d66d87404cba0e libipoddevice-0.5.0-r1.ebuild 1279
-EBUILD libipoddevice-0.5.0.ebuild 1235 RMD160 98c953bd80ed7b87f75ae239f2d477d1e8501757 SHA1 7d73eb8719857ae2923f511df0fbaee87ab14a36 SHA256 2b333cdfa6665320982de2a628c86f290d6144ec610a084a8df16eb3bfc7d63c
-MD5 704e7270b9d07a17946cfa4969f3eb00 libipoddevice-0.5.0.ebuild 1235
-RMD160 98c953bd80ed7b87f75ae239f2d477d1e8501757 libipoddevice-0.5.0.ebuild 1235
-SHA256 2b333cdfa6665320982de2a628c86f290d6144ec610a084a8df16eb3bfc7d63c libipoddevice-0.5.0.ebuild 1235
-EBUILD libipoddevice-0.5.1.ebuild 1235 RMD160 93421a24bd3103d205689d5920aa02ff10d99056 SHA1 19a02a51456ba5f9571b25f95d970cee175c801a SHA256 488b205ff2260dd1852d66dd521193cd8b3d5667f8f7e53c85230a1ef8f1bad0
-MD5 c5d05181129adac80e4194f3d720adff libipoddevice-0.5.1.ebuild 1235
-RMD160 93421a24bd3103d205689d5920aa02ff10d99056 libipoddevice-0.5.1.ebuild 1235
-SHA256 488b205ff2260dd1852d66dd521193cd8b3d5667f8f7e53c85230a1ef8f1bad0 libipoddevice-0.5.1.ebuild 1235
-MISC ChangeLog 1682 RMD160 fb8f774e36b88db96cabd8106c260223488191b0 SHA1 01579024f2b4d930b535b6fb5234628b90ea1a21 SHA256 88cffd0f2872414170e9eaa55b548d8adcfe19221c7ca72a22cccccb2935afba
-MD5 9f2d5138885d61375bc95cee0cfc7c98 ChangeLog 1682
-RMD160 fb8f774e36b88db96cabd8106c260223488191b0 ChangeLog 1682
-SHA256 88cffd0f2872414170e9eaa55b548d8adcfe19221c7ca72a22cccccb2935afba ChangeLog 1682
+EBUILD libipoddevice-0.4.5.ebuild 1308 RMD160 0611d6850a5598b6045e0d1d65d39ba52c76baa0 SHA1 18dd3b556e95eed2b8a0d783fd9f1f53e3207e70 SHA256 b33ee135e1dde6f7ff8f9dcf4b3b39a03a9b935bc6ce1995d76997471de0c787
+MD5 d3a6a60c11a7606f5d26ea88b4e99fc8 libipoddevice-0.4.5.ebuild 1308
+RMD160 0611d6850a5598b6045e0d1d65d39ba52c76baa0 libipoddevice-0.4.5.ebuild 1308
+SHA256 b33ee135e1dde6f7ff8f9dcf4b3b39a03a9b935bc6ce1995d76997471de0c787 libipoddevice-0.4.5.ebuild 1308
+EBUILD libipoddevice-0.5.0-r1.ebuild 1379 RMD160 8c383aa4a567908253d67d3b86adc02bce2597b1 SHA1 926d34042103bbe8100b428b6b92a1878bfd91ce SHA256 c27386f705d44472b0dc8f5f768a5d7975d4d97aed4697fe003d3fa0db162da1
+MD5 72f503a0374fe420319e9b9697afec14 libipoddevice-0.5.0-r1.ebuild 1379
+RMD160 8c383aa4a567908253d67d3b86adc02bce2597b1 libipoddevice-0.5.0-r1.ebuild 1379
+SHA256 c27386f705d44472b0dc8f5f768a5d7975d4d97aed4697fe003d3fa0db162da1 libipoddevice-0.5.0-r1.ebuild 1379
+EBUILD libipoddevice-0.5.0.ebuild 1335 RMD160 8fbf48bcf2c17ccef292c17d3527a4296456a4a3 SHA1 e9109eeab73c1f3d4544a55f00d525d2b020958f SHA256 682d395651708850c0db83455364b79aab11646747a2a17e247a14ce50ab0645
+MD5 12a1bcc9ea14b32b2bd2408c1b275f91 libipoddevice-0.5.0.ebuild 1335
+RMD160 8fbf48bcf2c17ccef292c17d3527a4296456a4a3 libipoddevice-0.5.0.ebuild 1335
+SHA256 682d395651708850c0db83455364b79aab11646747a2a17e247a14ce50ab0645 libipoddevice-0.5.0.ebuild 1335
+EBUILD libipoddevice-0.5.1.ebuild 1335 RMD160 88c7adc8d12a513b3e26abc7881e2de0697a0073 SHA1 1d6e59859462ced62f4945939873b27781502d38 SHA256 d06ad0d6466f81cbf6e3d11d4de779f26f97ac4c8eb1f2883c7023f521c732ae
+MD5 35739053219f40d7cda5c5fc5ebc79ee libipoddevice-0.5.1.ebuild 1335
+RMD160 88c7adc8d12a513b3e26abc7881e2de0697a0073 libipoddevice-0.5.1.ebuild 1335
+SHA256 d06ad0d6466f81cbf6e3d11d4de779f26f97ac4c8eb1f2883c7023f521c732ae libipoddevice-0.5.1.ebuild 1335
+MISC ChangeLog 1875 RMD160 89373d757d714b7d282c0d24d38380251c329479 SHA1 382f550717f9e5b8d13974d3181c310ae6ec6dde SHA256 30790fdcc61bf618dc8342f3a0209abe7bc9987e55fedce5944ae006c816b9ef
+MD5 f520f44e0777b2536805f8c13ee23f3f ChangeLog 1875
+RMD160 89373d757d714b7d282c0d24d38380251c329479 ChangeLog 1875
+SHA256 30790fdcc61bf618dc8342f3a0209abe7bc9987e55fedce5944ae006c816b9ef ChangeLog 1875
 MISC metadata.xml 294 RMD160 a0ecd559d8ebff0b2e91aac31e12dd1fb9074c7e SHA1 a82bcefd597a8ca762a169dd8b2895d1347dcdfb SHA256 50e382a1cdc9b8d5bd7a6e62bae3e8b57cf36e157f70d0136b57d50edf2e8041
 MD5 46261388ca1ae057f1d8590a23834c49 metadata.xml 294
 RMD160 a0ecd559d8ebff0b2e91aac31e12dd1fb9074c7e metadata.xml 294
@@ -47,7 +47,7 @@ SHA256 d9fe6a75917fcdd1e638cff116ca96c2e62b18eeaa4d367e07e7b415b9da5944 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFRjmFoeSe8B0zEfwRAkgqAJwPEDfh3INmZwu8yi4gn9Ud7I1x5wCfeN4l
-Q7YsQepZ3bSsyIlDs8m6A7M=
-=7w4V
+iD8DBQFFYL4PoeSe8B0zEfwRAiioAJ4knCdxA7KAD8zXBcQRz83tSqUDlwCeNV8R
++vFtZFD0V5WxXZYzu6KKfCc=
+=Y+yS
 -----END PGP SIGNATURE-----
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() {