Bugzilla Bug 155602

Noticed when going to the masked dbus that things didn't work the way I thought
they should. The newer powersave and dbus>0.95 require dbus-glib. Here's the
fix:

--- /usr/portage/sys-power/powersave/powersave-0.14.0.ebuild    2006-11-02
13:06:24.000000000 -0800
+++ powersave-0.14.0.ebuild     2006-11-18 11:43:13.000000000 -0800
@@ -13,7 +13,7 @@
 IUSE="pam_console doc"


-RDEPEND="|| ( dev-libs/dbus-glib >=sys-apps/dbus-0.30 )
+RDEPEND="|| ( ( dev-libs/dbus-glib >=sys-apps/dbus-0.95 ) <sys-apps/dbus-0.95
)
        >=sys-apps/hal-0.5.3
        >=sys-power/cpufrequtils-001
        pam_console? ( || ( sys-auth/pam_console <sys-libs/pam-0.99 ) )"

Should actually be 

RDEPEND="|| ( dev-libs/dbus-glib ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.34 ) )

Created an attachment (id=102291) [details]
Seems that my inline patch got chewed up. Here's a diff

thanks, fixed

Well, as noted in Comment #1 - dbus-glib already depends on dbus, so that part
of the dependency is redundant; <sys-apps/dbus-0.95 is not the correct minimal
"non-modular" version; should be <sys-apps/dbus-0.90. See Bug 154521 for
porting howto.

Whoops. I did test it on both dbus>0.95 and dbus<0.95 and it worked as
advertised. I'm unsure there's actually a different functionality that occurs
in comment 1 but I'm no ebuild ninja.

Comment 1 doesnt work here, changing my diff to 0.90 would definitely be a fix,
if there were versions 0.90-0.95 (sorry didn't realize):
--- /usr/portage/sys-power/powersave/powersave-0.14.0.ebuild    2006-11-02
13:06:24.000000000 -0800
+++ powersave-0.14.0.ebuild     2006-11-18 14:36:55.876408088 -0800
@@ -13,7 +13,7 @@
 IUSE="pam_console doc"


-RDEPEND="|| ( dev-libs/dbus-glib >=sys-apps/dbus-0.30 )
+RDEPEND="|| ( dev-libs/dbus-glib ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.34 )
)
        >=sys-apps/hal-0.5.3
        >=sys-power/cpufrequtils-001
        pam_console? ( || ( sys-auth/pam_console <sys-libs/pam-0.99 ) )"


tulip powersave # echo 'sys-apps/dbus' >> /etc/portage/package.unmask
tulip powersave # emerge -pv dbus powersave

These are the packages that would be merged, in order:

Calculating dependencies... done!
[ebuild     U ] sys-apps/dbus-1.0.1 [0.62-r1] USE="X -debug -doc (-selinux)
(-gtk%) (-mono%) (-python%*) (-qt3%*) (-qt4%*)" 0 kB
[ebuild   R   ] sys-power/powersave-0.14.0  USE="pam_console -doc" 0 kB [1]

really fixed now, Thanks