Accept dbus-qt3-old aside from dbus proper, and don't do the useflag check for that case.

Package-Manager: portage-2.1.1_rc1-r7

3 files changed, 27 insertions, 12 deletions

diff --git a/sys-power/kpowersave/ChangeLog b/sys-power/kpowersave/ChangeLog
index 81ba276ed9be..75d0d1b428b4 100644
--- a/sys-power/kpowersave/ChangeLog
+++ b/sys-power/kpowersave/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-power/kpowersave
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/kpowersave/ChangeLog,v 1.6 2006/07/03 07:45:31 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/kpowersave/ChangeLog,v 1.7 2006/09/08 19:07:12 flameeyes Exp $
+
+  08 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
+  kpowersave-0.6.2.ebuild:
+  Accept dbus-qt3-old aside from dbus proper, and don't do the useflag check
+  for that case.
 
 *kpowersave-0.6.2 (03 Jul 2006)
 
diff --git a/sys-power/kpowersave/Manifest b/sys-power/kpowersave/Manifest
index dd151f158815..c3e8bc6db9e1 100644
--- a/sys-power/kpowersave/Manifest
+++ b/sys-power/kpowersave/Manifest
@@ -1,17 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST kpowersave-0.6.1.tar.bz2 3515434 RMD160 c075e81580f1d2f7fe838186a7e8dcd78478f0b6 SHA1 4af7560ff70d641b613b0d5a3398d38bed54bce1 SHA256 229e37aab0bdc6dcfb2b05cfc6cde2273b6d1c94e575257077569f6767bd596c
 DIST kpowersave-0.6.2.tar.bz2 3527068 RMD160 256debb2dbb5311e152339dc885508af432883dd SHA1 95c187a770bee052c8866aad605a2576481671d5 SHA256 ef99671654162fb95c86b10ef1e67a7e94145fbce42b3ead5f10ad6c53c09b7c
 EBUILD kpowersave-0.6.1.ebuild 802 RMD160 fff65b4688e8758bf6040690f6ba86f358b478bf SHA1 24e6c39d12a4c0545204d5112c47a56b2b1fb717 SHA256 a12fec4ca4576441bd5b850a8817c717651e2ecbcaf69152bd8d3419421f7871
 MD5 430a89df31fd3ea1f1dd3c5c78161de2 kpowersave-0.6.1.ebuild 802
 RMD160 fff65b4688e8758bf6040690f6ba86f358b478bf kpowersave-0.6.1.ebuild 802
 SHA256 a12fec4ca4576441bd5b850a8817c717651e2ecbcaf69152bd8d3419421f7871 kpowersave-0.6.1.ebuild 802
-EBUILD kpowersave-0.6.2.ebuild 800 RMD160 69646d76b49c529b98465400349d4cf4c4fab2db SHA1 c9f2bfa7256601a21f74728aa09f941323a37592 SHA256 1db25e3acf910d56b2fa748f946902a59a3d3d6c57b5c9d270eb2618b0030c5e
-MD5 0569752b966d3f5689847375e518f3c9 kpowersave-0.6.2.ebuild 800
-RMD160 69646d76b49c529b98465400349d4cf4c4fab2db kpowersave-0.6.2.ebuild 800
-SHA256 1db25e3acf910d56b2fa748f946902a59a3d3d6c57b5c9d270eb2618b0030c5e kpowersave-0.6.2.ebuild 800
-MISC ChangeLog 1256 RMD160 dce617a7b93322af2319b14ab712875e72ec9f4e SHA1 2df3c4d5e5b90c770cab3627e8a5fb1733bd5531 SHA256 de16f4699c3e996ed81c50a722d237adc40cf9a17b9f7892bdf704420281ff66
-MD5 2a19d2ae05ea02ff226f3e8c7c3411db ChangeLog 1256
-RMD160 dce617a7b93322af2319b14ab712875e72ec9f4e ChangeLog 1256
-SHA256 de16f4699c3e996ed81c50a722d237adc40cf9a17b9f7892bdf704420281ff66 ChangeLog 1256
+EBUILD kpowersave-0.6.2.ebuild 868 RMD160 008ed146211bfdefc6a4dba4e5236a5c066cccf8 SHA1 cdb310d73c589478e5964558b47c1a58cfca3a7e SHA256 2909b1ef9cf3943d626411826c7d929750b2675f8e543af283de0336bc2f58aa
+MD5 6e558d99dcda1579112e20a32a83c8a6 kpowersave-0.6.2.ebuild 868
+RMD160 008ed146211bfdefc6a4dba4e5236a5c066cccf8 kpowersave-0.6.2.ebuild 868
+SHA256 2909b1ef9cf3943d626411826c7d929750b2675f8e543af283de0336bc2f58aa kpowersave-0.6.2.ebuild 868
+MISC ChangeLog 1433 RMD160 606f9b4279042dd08e06e2b85ca3d61d9453fff9 SHA1 a4e07cd85e59b9e497d34c5bd0a211a5e1367adb SHA256 5a7bc590554d38add2202aee5097d26c085162962635377377324bee508c0bc7
+MD5 9630e58e5e91e8c851a0e83a54c01ded ChangeLog 1433
+RMD160 606f9b4279042dd08e06e2b85ca3d61d9453fff9 ChangeLog 1433
+SHA256 5a7bc590554d38add2202aee5097d26c085162962635377377324bee508c0bc7 ChangeLog 1433
 MISC metadata.xml 264 RMD160 f0a7ffecb77c58db347daaf1c348b12ab0526429 SHA1 943b8b424ee3872f0f4ac2d99b5e620ae4c82ca5 SHA256 b97f69b9acc177e7c613f542e17461256be508ac97086f4538f31e65df3647bf
 MD5 f17c483cfcc1efe580afd0b737d3f2c3 metadata.xml 264
 RMD160 f0a7ffecb77c58db347daaf1c348b12ab0526429 metadata.xml 264
@@ -22,3 +25,10 @@ SHA256 77b688a40929e5db0a1f14b2a57c4c5d1b1d4633af029dc4970584887420c4c7 files/di
 MD5 18328c508d6f2cba6300d88d919f1119 files/digest-kpowersave-0.6.2 256
 RMD160 cc9fee402062b4bd6da2ee5825384f45fdf56a0e files/digest-kpowersave-0.6.2 256
 SHA256 5b7fc3802f2b80fa819737e575f96101ffe4881805ab10f87744ede37bddddc0 files/digest-kpowersave-0.6.2 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFAb9mAiZjviIA2XgRAsHNAKCKpx5bk5L2HgHyotSeEmpIoD6PzgCfYB5p
++8aBil6kJbaDkHI6Hh5fbjM=
+=0/Ey
+-----END PGP SIGNATURE-----
diff --git a/sys-power/kpowersave/kpowersave-0.6.2.ebuild b/sys-power/kpowersave/kpowersave-0.6.2.ebuild
index de93658a2b2f..0b58a65e9746 100644
--- a/sys-power/kpowersave/kpowersave-0.6.2.ebuild
+++ b/sys-power/kpowersave/kpowersave-0.6.2.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/sys-power/kpowersave/kpowersave-0.6.2.ebuild,v 1.1 2006/07/03 07:45:31 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/kpowersave/kpowersave-0.6.2.ebuild,v 1.2 2006/09/08 19:07:12 flameeyes Exp $
 
 inherit kde
 
@@ -13,12 +13,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND=">=sys-apps/hal-0.5.4
-	>=sys-apps/dbus-0.33
+	|| ( dev-libs/dbus-qt3-old >=sys-apps/dbus-0.33 )
 	>=sys-power/powersave-0.11.5
 	kde-base/unsermake"
 
 pkg_setup() {
-	if ! built_with_use sys-apps/dbus qt3; then
+	if has_version '<sys-apps/dbus-0.91' && ! built_with_use sys-apps/dbus qt3; then
 		eerror "dbus is missing qt3 support. Please add"
 		eerror "'qt3' to your USE flags, and re-emerge sys-apps/dbus."
 		die "dbus needs qt3 support"