Fix dependencies to allow sys-power/upower-pm-utils.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 18 insertions, 8 deletions

diff --git a/x11-plugins/wmbattery/ChangeLog b/x11-plugins/wmbattery/ChangeLog
index 853f8a4be6b4..503bcb4cce24 100644
--- a/x11-plugins/wmbattery/ChangeLog
+++ b/x11-plugins/wmbattery/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmbattery
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/ChangeLog,v 1.26 2014/02/12 08:54:36 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/ChangeLog,v 1.27 2014/05/26 19:57:06 ssuominen Exp $
+
+  26 May 2014; Samuli Suominen <ssuominen@gentoo.org> wmbattery-2.42.ebuild:
+  Fix dependencies to allow sys-power/upower-pm-utils.
 
   12 Feb 2014; Bernard Cafarelli <voyageur@gentoo.org> wmbattery-2.42.ebuild:
   Depend on virtual/pkgconfig too
diff --git a/x11-plugins/wmbattery/Manifest b/x11-plugins/wmbattery/Manifest
index 2ed3124d2ffc..6e30e88a2daa 100644
--- a/x11-plugins/wmbattery/Manifest
+++ b/x11-plugins/wmbattery/Manifest
@@ -6,13 +6,17 @@ DIST wmbattery_2.41.tar.gz 37971 SHA256 1dd3ec541d55558e14161d2d6219c6242b50fb00
 DIST wmbattery_2.42.tar.gz 38881 SHA256 6e57d163443e2d31951d2238eeaadbbe71dbcc0a92c44e7e1f27598eb2c87b75 SHA512 f59b721bd6c59da7730bdee5a092036713c9e3fa4ed8b58d331a9ba67a2fc9e08095c98d77356bb9a95833284fc53f1ff38cb1c818ddbbbc23c756d2cbbd2b8f WHIRLPOOL 2137a80d92939e2307883a598188e282dbb9e279ba335d326754f8fbe5934caeca1dca0d95803f95926364d5b238d6f2486b8ce502b372582be88507e0451be0
 EBUILD wmbattery-2.40.ebuild 796 SHA256 d54907e6170e96b1cb91b4b41e027df37e62332b00c12d8f0f0c43049c09937f SHA512 fce1637c676b505ae6ba590c42ab355b73d2e95901422d57eda26dd83a9b3d707f3c9fb381974ba48a859594f00925f71df18b5276f241cf3f868c53983c1b7a WHIRLPOOL 0049c2bd4993304fcb5125f421683d651d0fdec546b39e4ee7deef2228c8daf2ea129ac97cbce6b7456788244f30ef6333ec646760a053d68d9023513421eb57
 EBUILD wmbattery-2.41.ebuild 816 SHA256 358b1819da3f8b5ccffa11939398a4d1161778ab82a086ce977b13f3c938420b SHA512 4d863b3fa178c23279fa1d2db41f5197bab155a4c08c956017d48ad4c5369ec3b4bf3087ca300904884356c2f9aee6242fca46306fd65e1deeac641e899142d3 WHIRLPOOL c23a250d13eed18ffdfa69c7d6e302e7082ca55e3471156713d0516135fd1578ce0b72a4485d6207826544678d5a3a4f34e9b3cc53795448bccb623ee4c6315f
-EBUILD wmbattery-2.42.ebuild 787 SHA256 3a878a2e18613f9f0901705b3ceef1d9ff1ee91ed6c39e7ef4b5661bc38a1284 SHA512 2bba6ef3ff5602864dfa5c74a28599283b741673c3b95d7768247200bc0dca8c4279dc7382f51fe3091acdfdc6b41a71d7c6cc184ebcfaf4cbda0f82028bcb74 WHIRLPOOL 7533ef8c3321c48c5d0a0559e8d4f7a8004870c8eb1e45695fed719b8af4c19dbcaa6095c0fb30a245c39dacfd344659ac19a86160aa3cc07f48d0475f283017
-MISC ChangeLog 3861 SHA256 f227ab77644ca44f932bace708dc5c81412ef19c15fe309e8766757d78ef5eac SHA512 82cf77626e1e566d61ae88fe4ce83e7bba219194fb4a236ac1d434ff12f4dcbc7cb4ea60c223be3fdb653a48f35b62e4a89ade9dc89e370bb64ad11c2ad2ad42 WHIRLPOOL 8ccb1f6b0d05dfeec92aa10fbfcd0317170232740b49e2dbcd452f9ec5472e497ed22345dcc886c516849c407f58d673d60411e6422417ab04fd94a70e86c386
+EBUILD wmbattery-2.42.ebuild 993 SHA256 4e2f5d00c83c837cea746468572c30dab9f1f44feb301926f47a60f93e773eb2 SHA512 f50dc1c5fe86818d1889154f02ea775cb47cd3a1dc0d03692c44723619690283996bda1797566b4de0b81f7b8a916d0c27454f1cacb67d4711ef4a3fc19aefb1 WHIRLPOOL a2c8a8f25b76f06e7c06f8e2c6d3f2cf205510019ce1b3d95d89420ffb24a3c963577615652925aad472c3342c3662e9b4ddb8a2a99e8f52e58eaa85e8d7e07e
+MISC ChangeLog 3995 SHA256 4da6a3b61f64749c195c3e6c107d27b3bdc978f94ba673789b2ce3bc6a202d9c SHA512 b0ab9b4db8cd3aa7250d11056e24b49f5d777b1bb4dcad8a537fcc89209eabb2423a1ccd9005eed1abc3a73d61173ca226e9d903dc59171e07bd609dd8601beb WHIRLPOOL b6a62d630f8bec3962a58c72dad059c7f0137377000940c0886f36602b0ab97b287082828946444df2c609077aed4aed423c0e14c2985896bdb68730cb5edfab
 MISC metadata.xml 510 SHA256 99c27a1b6d7bd330dcc1ed00a2c50f6c11c7a010d5719f9cfcee71e44d8c1608 SHA512 39bf83a9a0b0b5d13fba9a71e1849bb2e5913d7524c9f2ff13edb9cf9b1cfa4ea3651cd0cd21fb4e333b61d6f70e78685b2908dd6ef63b874ca1ad4c52545f85 WHIRLPOOL e2896c9ebf2a6f04e925149075824bfa4d5574cb5b967244ecdd97ab964308bdd3969d5e412d867b94382e65fcb9eb17cdffecc3c19f70765a40554fa137def2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlL7NtEACgkQFYEBGcdFJfLQwAD/b03EYwyPeo/dngCYlCA7uuk6
-2gQudFzGIEUmKfjkXucA/0OZ9bsFr7uIjbGLSKyycWDqMbQO6eTHpDUVN+qxiDuV
-=+sbn
+iQEcBAEBCAAGBQJTg5wvAAoJEEdUh39IaPFNklcIAKGL5/Voj86HOtt6J4zsBurU
+35uSURcihZwHl3PuJDURmT9em6KudDEyadbq1152AG/JCp5jb7Qg6CjNF+W8nzXt
+Jvsf1DgPHSpjWHyo6KzNaqNu56XiuzwAz+0Qi6a8kx1lzvQxkxdwwulyMdSpPFzW
+GTmjEqYqHGS6PFB0q+aLrYEOmkYgnMOxVqAZUPRN2mSPrclQr/lTaAuY2xKi8VEz
+u5IH+2kUGcNcwfSHgZs1fXZULeJC5vvFl0R55G7/gMGtc664xZbA8cBZReQnDypj
+fP5p7RBrCGXsCViQ1STyUBo3pU6RJkxMxTNosZNuhwcGymsvXo7jLMxxkNCO0Yc=
+=j5F9
 -----END PGP SIGNATURE-----
diff --git a/x11-plugins/wmbattery/wmbattery-2.42.ebuild b/x11-plugins/wmbattery/wmbattery-2.42.ebuild
index 12d7ff3b8ad6..a9cf97f41fd7 100644
--- a/x11-plugins/wmbattery/wmbattery-2.42.ebuild
+++ b/x11-plugins/wmbattery/wmbattery-2.42.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/wmbattery-2.42.ebuild,v 1.3 2014/02/12 08:54:36 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/wmbattery-2.42.ebuild,v 1.4 2014/05/26 19:57:06 ssuominen Exp $
 
 EAPI=5
 inherit autotools
@@ -14,8 +14,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc -sparc ~x86"
 IUSE=""
 
+#TODO FIXME: Does this release work with >=sys-power/upower-0.99 API?
+#If not, adjust dependencies accordingly to:
+#|| ( <sys-power/upower-0.99 sys-power/upower-pm-utils )
 RDEPEND="sys-apps/apmd
-	sys-power/upower
+	|| ( sys-power/upower sys-power/upower-pm-utils )
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"