Remove dependency of <sys-power/upower-0.99 from || ( ) construct.

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

3 files changed, 17 insertions, 12 deletions

diff --git a/mate-extra/mate-power-manager/ChangeLog b/mate-extra/mate-power-manager/ChangeLog
index e2d9b816f9fc..86b5ee7821ea 100644
--- a/mate-extra/mate-power-manager/ChangeLog
+++ b/mate-extra/mate-power-manager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mate-extra/mate-power-manager
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-power-manager/ChangeLog,v 1.12 2014/07/02 09:47:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-power-manager/ChangeLog,v 1.13 2014/09/19 17:00:36 ssuominen Exp $
+
+  19 Sep 2014; Samuli Suominen <ssuominen@gentoo.org>
+  mate-power-manager-1.6.3.ebuild:
+  Remove dependency of <sys-power/upower-0.99 from || ( ) construct.
 
   02 Jul 2014; Pacho Ramos <pacho@gentoo.org>
   mate-power-manager-1.8.0-r1.ebuild:
diff --git a/mate-extra/mate-power-manager/Manifest b/mate-extra/mate-power-manager/Manifest
index a2e3d50818af..293279227125 100644
--- a/mate-extra/mate-power-manager/Manifest
+++ b/mate-extra/mate-power-manager/Manifest
@@ -10,15 +10,19 @@ AUX mate-power-manager-1.8.0-r1-port-to-upower-0.99-API.patch 12875 SHA256 8171d
 AUX mate-power-manager-1.8.0-r1-remove-battery-recall-logic.patch 9292 SHA256 c20e8b1274f7779b559179eceba9cc4c16eee2f903e44338d8e9891d6ac87007 SHA512 53872f88bf882cafa9dd6f91d2fb9923940d8a23e95577dacf4d7fdf299c8a1ccc7f9e0add802f22f5134d24e84e71d47b847b1e2aa6a26502b31fcaf680a503 WHIRLPOOL e6b641e787f42d8b4050b7e6d93ae40f80487d240fe19bd93e3cd2225fae4e868e1d9924ed34c58ec703964daf4050d3c9c6bf38f3a67602e0f450053dd5412e
 DIST mate-power-manager-1.6.3.tar.xz 3362188 SHA256 465b8d88d25333c9a5f0dd9a34720cac6024e21e574378d1d49326e1ff1d253b SHA512 dfc17688a60aa19109af39f1436ed3f8a5acbfa1a89b128c4619356574a5df73e058366ca53626be04bed6ff37d2ebefa8a04b4efca7d3ce96e5753594e14769 WHIRLPOOL 8993f97df88ebd1d71da7480d1c09529c8df924f0d33f268b3f84f1d81914eca278a2eebb1e5465fb59937e875ec970cbd7ee5c307aa92120c8441b270ac1640
 DIST mate-power-manager-1.8.0.tar.xz 3339588 SHA256 3d83b7736b0b6256242db3b9efaa18530b4ba6d80b146eafaf511230ae926d9f SHA512 f91b195e384138ce0881f53f4d3e8924d422445ac258de2138da16ab29999cd367b2e37c226e5d56e698bc54b82c8996b3263a638702f45b2f96ffabbceca479 WHIRLPOOL 31a423d25abd488bceb13354cabc3f80844f791060339ea38d4fa12f8ac80d1d4a4c94c8e07af7ba489fd5da98f7bbdfbf4edebe339926e91e0d39747ddb3a34
-EBUILD mate-power-manager-1.6.3.ebuild 2475 SHA256 95f5dcad27a4b45f55980d082362db9ee07e82d846d2ac123e913c1bc4f6cd03 SHA512 037dbc425bf77c9cecdb2499e7bf0122fa382e4afb11b2433d50c5c48eced45242009ac5a950d7490ffedda2e69f2d87ffb08f9ce66ffd9e1a24888a91eb7b25 WHIRLPOOL 206e137f8317a3e1123711fa1787b8fa71def6b9e004b662b87c3690865b2d709ef993b17b5470ad530464f2da18c92bf96e4a23360381cd11f6ed6161cdee63
+EBUILD mate-power-manager-1.6.3.ebuild 2423 SHA256 8a701eff7d9ad6357034605947786694b5c043adb54d26d0ef1d46d200ab4a9f SHA512 e67d48bfa41aa168bbf01f37a73bf17e044049f5149a3be6d4f95a0c9256fed0ae991ba6d73b3b3c1ed0618e37438eb147b29cc3401dde0ae074150294ea17f4 WHIRLPOOL 7bb32307981c243200021950b0279d9b985999326bdfe052dab1f377c2e7608b3fb63e6efaeaaf83c9f6d2a9ba7a27d8edfd64212c11aa0d44f923f9a5eb67d6
 EBUILD mate-power-manager-1.8.0-r1.ebuild 3107 SHA256 7d64cd7d4b167b78be97c887a5b23a812a2b17f29584b0daa3a98501a833c646 SHA512 acc6700b38c9142661347679241b80b967b42faef137c004f935c16f6068308c207704bfceb4179c4ba6841d5a1bdad99d0c614405287dcd561bb0dedbe0c0d5 WHIRLPOOL fb31b1d3c2db625265428ee35624d1dd7abe36fa4b4cb62c193dece53d5b7dc1390e5b13d2da37946731d5b329bdc55882dba70e2b8879965ca74e5f367f694f
 EBUILD mate-power-manager-1.8.0.ebuild 2393 SHA256 f712da72c29fa6a9d207d7d888d6b04586bc43d9727c2ea1f5fd22dbf9e3d177 SHA512 d1ac72b5dcfa4ef5ce121081a0bdfe655b39fb8051fce64b98017266c8265b627fbf20cb09dae5916fc104d3ed558c6687be24563a578022b9a0bb08a38914cc WHIRLPOOL 1d9a56f1e39b9693c0b6dc9911dc61830e723823a33f87bec94486b72308831fe88bda1a05109cbe0918363639295388ee15161c55e669a5129671ba6e31235a
-MISC ChangeLog 2722 SHA256 37b0d2eba47350045c5a5c5a04b651a9b1fbcc03c34b229d78ea48332e1282af SHA512 fa15fd7e775bb3ea4c1f4e864fcbeced90b26d4ebbc645e6e169162a5fd3022d6cc60f4ea8beaa4dabf41fd3135ec42ace109a63b307b75c895b8cbef4b1e8a9 WHIRLPOOL e90ada46711ccda14c16692b95a8d0b521bff2f026a32d9359775e0d4a457469656b2bf0db7af101452a6b1406e1d207238b0d7fe38ecd975c8be05f908bd3f4
+MISC ChangeLog 2885 SHA256 716d1eae48efcf76dfd4d8a55c918314e4e21a3a9132a7bfed4821133b52f01a SHA512 eac5354ec6bee46faa503cbd5de09cab908503a510e0cd41e6b5d90f2ed0fa0f322ec56229a95867a227a9bc0e7837589c053de969c17c47499f849dfb28da18 WHIRLPOOL 8e8416de8c85cfb02d326b9c06108a8eac3c037c85b7c1c9e17ea790ae1fb1bed2b2e2dbed5f8a47825456b3902894a7b97ccf0ce6ccae72c2687a9372ef3fa9
 MISC metadata.xml 468 SHA256 138877fb0154af1e9e2ed98f927a16daa6f49d3a8312b8e469fc92fa54232ae8 SHA512 318497639aa45f81e65e89d59820977fe89a618dff7844c13bf3a1d875ac9407f8b190c6ea6d4e9aed6f97b1bc96b7f821d1222fc605729af8c783f620c1358b WHIRLPOOL 2112944a997e20ed2609f0e9d1f99ae80c2dca2f57631d953fdc38f68a19905dd137584a756f07dcf79b26dc16b8780dced00f2f87e394a46cc641ac0d9c377f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlOz1UoACgkQCaWpQKGI+9RTDACfeRtZDldtDztUn4RlPxvpl0lC
-/vYAn1VCXUw2xS6cjsoWF5lgoBho+6bo
-=yrT7
+iQEcBAEBCAAGBQJUHGEvAAoJEEdUh39IaPFNQnAH/0ZUxb92Ixrmq1lI8eDPE/es
+aoyCw62xAGPyMlttaQvv6SDjL3uR8wcmZ4/eKbcm/f0jbuHAXui9uLiGFDTov1Fi
+y44ect4zgU0bjUZRHNjGX5GivBAYApQhfG56TosdusZJ4dgEbpwNPOyTzWohEeYH
+A4zIZ6ERPW9wRURgLvHu5CButszSxfweIkxSvSFB3o9jPYxvFpAIKshHwceo3ir0
+5mEoC5wnFG5Z26OWornEeU0P3K0Uvl4ELtNDk+Ge7Pxo38/9UuLh6HoNpk+dORsv
+I42OKF96EZnV3w8FMyoK9hsBUe5f5/U3atW5irqRr9LrhAsWDCWEhapT/Q+OGjc=
+=XFGM
 -----END PGP SIGNATURE-----
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.6.3.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.6.3.ebuild
index e53668a7738a..1641046c9bce 100644
--- a/mate-extra/mate-power-manager/mate-power-manager-1.6.3.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.6.3.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/mate-extra/mate-power-manager/mate-power-manager-1.6.3.ebuild,v 1.5 2014/05/31 20:40:24 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-power-manager/mate-power-manager-1.6.3.ebuild,v 1.6 2014/09/19 17:00:36 ssuominen Exp $
 
 EAPI="5"
 
@@ -28,10 +28,7 @@ COMMON_DEPEND="app-text/rarian:0
 	>=dev-libs/glib-2.13:2
 	>=media-libs/libcanberra-0.10:0[gtk]
 	>=sys-apps/dbus-1:0
-	|| (
-		( >=sys-power/upower-0.9.1 <sys-power/upower-0.99 )
-		sys-power/upower-pm-utils
-	)
+	>=sys-power/upower-pm-utils-0.9.23
 	>=x11-apps/xrandr-1.2:0
 	>=x11-libs/cairo-1:0
 	>=x11-libs/gdk-pixbuf-2.11:2