correct dbus deps (bug #187369)

Package-Manager: portage-2.1.2.9

4 files changed, 21 insertions, 31 deletions

diff --git a/x11-plugins/beryl-plugins/ChangeLog b/x11-plugins/beryl-plugins/ChangeLog
index 850485fb835b..7e9e7933d6db 100644
--- a/x11-plugins/beryl-plugins/ChangeLog
+++ b/x11-plugins/beryl-plugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/beryl-plugins
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/beryl-plugins/ChangeLog,v 1.13 2007/07/18 04:28:30 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/beryl-plugins/ChangeLog,v 1.14 2007/08/02 06:43:30 mr_bones_ Exp $
+
+  02 Aug 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  beryl-plugins-0.2.1.ebuild, beryl-plugins-0.2.1-r1.ebuild:
+  correct dbus deps (bug #187369)
 
 *beryl-plugins-0.2.1-r1 (18 Jul 2007)
 
diff --git a/x11-plugins/beryl-plugins/Manifest b/x11-plugins/beryl-plugins/Manifest
index 7e8b015d812e..cd89c2d0a223 100644
--- a/x11-plugins/beryl-plugins/Manifest
+++ b/x11-plugins/beryl-plugins/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX beryl-plugins-0.2.1-burnbeam-memleak.patch 526 RMD160 8317b6b506fa540eb76d151f97319aaf830fee14 SHA1 e098e6bc30f57d1ca1efc3000504541ea4d47a33 SHA256 7499ad528a5d95c46798aa1abf17c84e799a06bf8a8ad48b1901fbf8789c02fd
 MD5 5cd15865fb258ef0202829026471557e files/beryl-plugins-0.2.1-burnbeam-memleak.patch 526
 RMD160 8317b6b506fa540eb76d151f97319aaf830fee14 files/beryl-plugins-0.2.1-burnbeam-memleak.patch 526
@@ -16,18 +13,18 @@ EBUILD beryl-plugins-0.1.4.ebuild 947 RMD160 06a1eb709edd5df762a59cb5c556a1c4afb
 MD5 7b3a6c5582c6d54af1a00209b7499b85 beryl-plugins-0.1.4.ebuild 947
 RMD160 06a1eb709edd5df762a59cb5c556a1c4afb4d70d beryl-plugins-0.1.4.ebuild 947
 SHA256 cd5e6185575709cd37db16678f7b7fef863667517492ad144f739c46b0d9ccaa beryl-plugins-0.1.4.ebuild 947
-EBUILD beryl-plugins-0.2.1-r1.ebuild 1258 RMD160 febf6fbcefe854c7cf34d63eace69bc13eefd1ee SHA1 a6bde1f27cecc2495cc3111cad5f93f0ff1d7737 SHA256 54a10922690f130addb265e43b109a3dd08cc5ea9a0cc703e7ddc22ff7803d08
-MD5 31dac13fe7373a400644e8603ebfe3dd beryl-plugins-0.2.1-r1.ebuild 1258
-RMD160 febf6fbcefe854c7cf34d63eace69bc13eefd1ee beryl-plugins-0.2.1-r1.ebuild 1258
-SHA256 54a10922690f130addb265e43b109a3dd08cc5ea9a0cc703e7ddc22ff7803d08 beryl-plugins-0.2.1-r1.ebuild 1258
-EBUILD beryl-plugins-0.2.1.ebuild 1170 RMD160 8b582f7cc8f08f485d167d525eb919bbc9ddbed5 SHA1 6cd09b0d306e0bf23b817f99120080db39100b1b SHA256 543ef0ade71babed6f243ceb092e4e376834e9de7c59f54fd14fd4b2041ce94b
-MD5 c722e462255e6042aaaab687b1617e6d beryl-plugins-0.2.1.ebuild 1170
-RMD160 8b582f7cc8f08f485d167d525eb919bbc9ddbed5 beryl-plugins-0.2.1.ebuild 1170
-SHA256 543ef0ade71babed6f243ceb092e4e376834e9de7c59f54fd14fd4b2041ce94b beryl-plugins-0.2.1.ebuild 1170
-MISC ChangeLog 2223 RMD160 4931cbc6ea678b47016a529fd2cab36d33437fcb SHA1 cd72ecec02ef561a9785c723b638e54a8a92fef1 SHA256 d78e9235ea59d4a2e988ea143afc990e07fc5e1a1052ff6b9c4052ef88222d25
-MD5 8a394d3ec87d724e16817a2e1b485012 ChangeLog 2223
-RMD160 4931cbc6ea678b47016a529fd2cab36d33437fcb ChangeLog 2223
-SHA256 d78e9235ea59d4a2e988ea143afc990e07fc5e1a1052ff6b9c4052ef88222d25 ChangeLog 2223
+EBUILD beryl-plugins-0.2.1-r1.ebuild 1230 RMD160 a222cefd285c232a091259a585eb0fe3138e955c SHA1 39387934b567bcdd2b11a73c5b154c0cc8e9c861 SHA256 3d09517e718ea3ae723a5a9085c1bcc09cc170ddd8d1915fd74fc14ebda3d997
+MD5 23165964230f951d2a78f5fe6fd4f299 beryl-plugins-0.2.1-r1.ebuild 1230
+RMD160 a222cefd285c232a091259a585eb0fe3138e955c beryl-plugins-0.2.1-r1.ebuild 1230
+SHA256 3d09517e718ea3ae723a5a9085c1bcc09cc170ddd8d1915fd74fc14ebda3d997 beryl-plugins-0.2.1-r1.ebuild 1230
+EBUILD beryl-plugins-0.2.1.ebuild 1139 RMD160 9a694dc11de418c086319b2304300866ba1d3c0d SHA1 f5fec97e5c4f64c2830dfe6c6eb32c5e5819e2c2 SHA256 d94e1b77c47e973407e554200d2c4ca0b7a6207f178cd5437b8c1bb01fde1a52
+MD5 9bed910c598d5c0100669b07ea00b33b beryl-plugins-0.2.1.ebuild 1139
+RMD160 9a694dc11de418c086319b2304300866ba1d3c0d beryl-plugins-0.2.1.ebuild 1139
+SHA256 d94e1b77c47e973407e554200d2c4ca0b7a6207f178cd5437b8c1bb01fde1a52 beryl-plugins-0.2.1.ebuild 1139
+MISC ChangeLog 2377 RMD160 8fda5e695c6bb040edbe419656835708c3195b68 SHA1 2aaba538833c5bcc4e8fe05853f27e84f8010745 SHA256 f350c0dbb12c0ac083c8361629116232fb2e788b8f021dbecf420640b523ca69
+MD5 529cb6a86eb46477848c86c0d56d4c4f ChangeLog 2377
+RMD160 8fda5e695c6bb040edbe419656835708c3195b68 ChangeLog 2377
+SHA256 f350c0dbb12c0ac083c8361629116232fb2e788b8f021dbecf420640b523ca69 ChangeLog 2377
 MISC metadata.xml 460 RMD160 62fcd323c3eb3b03f1c8300c0471f445fc15c323 SHA1 e5ac626410ba48809a6264bad971ff87c5dc65b3 SHA256 e808e11ce07260127147acd6467fe0b5dd718664eb56d46ce8571570e59d54a7
 MD5 fce68d24c44a897102e10d549d039c6c metadata.xml 460
 RMD160 62fcd323c3eb3b03f1c8300c0471f445fc15c323 metadata.xml 460
@@ -44,10 +41,3 @@ SHA256 e46423355aa25f1cd1189aaae5a928dc9b36baa9a4acb5f1f67cf6007081882c files/di
 MD5 b904c95294bb2154416bcc4045de0b86 files/digest-beryl-plugins-0.2.1-r1 265
 RMD160 36f08ffb81cfb109de24e14c8e7565afc87a5c82 files/digest-beryl-plugins-0.2.1-r1 265
 SHA256 e46423355aa25f1cd1189aaae5a928dc9b36baa9a4acb5f1f67cf6007081882c files/digest-beryl-plugins-0.2.1-r1 265
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFGnZb02ZWR0Jhg/EsRAu3fAJ9jaevDiUfvR7VSdj0RbTem1rN0pQCeJMCT
-n1bTnAYbJwMEsUckItwKfOg=
-=FhB8
------END PGP SIGNATURE-----
diff --git a/x11-plugins/beryl-plugins/beryl-plugins-0.2.1-r1.ebuild b/x11-plugins/beryl-plugins/beryl-plugins-0.2.1-r1.ebuild
index 8047ef4c821c..a1e98362b4ed 100644
--- a/x11-plugins/beryl-plugins/beryl-plugins-0.2.1-r1.ebuild
+++ b/x11-plugins/beryl-plugins/beryl-plugins-0.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/beryl-plugins/beryl-plugins-0.2.1-r1.ebuild,v 1.1 2007/07/18 04:28:30 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/beryl-plugins/beryl-plugins-0.2.1-r1.ebuild,v 1.2 2007/08/02 06:43:30 mr_bones_ Exp $
 
 inherit flag-o-matic
 
@@ -17,9 +17,7 @@ IUSE="dbus"
 RDEPEND="~x11-wm/beryl-core-${PV}
 	media-libs/jpeg
 	>=gnome-base/librsvg-2.14.0
-	dbus? (
-		|| ( dev-libs/dbus-glib	>=sys-apps/dbus-0.36 )
-	)
+	dbus? ( dev-libs/dbus-glib )
 	!x11-plugins/beryl-dbus"
 
 DEPEND="${RDEPEND}
diff --git a/x11-plugins/beryl-plugins/beryl-plugins-0.2.1.ebuild b/x11-plugins/beryl-plugins/beryl-plugins-0.2.1.ebuild
index e4ebfd075571..47fc4b175270 100644
--- a/x11-plugins/beryl-plugins/beryl-plugins-0.2.1.ebuild
+++ b/x11-plugins/beryl-plugins/beryl-plugins-0.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/beryl-plugins/beryl-plugins-0.2.1.ebuild,v 1.3 2007/07/08 05:57:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/beryl-plugins/beryl-plugins-0.2.1.ebuild,v 1.4 2007/08/02 06:43:30 mr_bones_ Exp $
 
 inherit flag-o-matic
 
@@ -17,9 +17,7 @@ IUSE="dbus"
 RDEPEND="~x11-wm/beryl-core-${PV}
 	media-libs/jpeg
 	>=gnome-base/librsvg-2.14.0
-	dbus? (
-		|| ( dev-libs/dbus-glib	>=sys-apps/dbus-0.36 )
-	)
+	dbus? ( dev-libs/dbus-glib )
 	!x11-plugins/beryl-dbus"
 
 DEPEND="${RDEPEND}