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

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

4 files changed, 22 insertions, 17 deletions

diff --git a/mate-base/mate-applets/ChangeLog b/mate-base/mate-applets/ChangeLog
index b283ca24a8cf..51363528a074 100644
--- a/mate-base/mate-applets/ChangeLog
+++ b/mate-base/mate-applets/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mate-base/mate-applets
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-applets/ChangeLog,v 1.13 2014/07/02 09:46:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-applets/ChangeLog,v 1.14 2014/09/19 17:09:31 ssuominen Exp $
+
+  19 Sep 2014; Samuli Suominen <ssuominen@gentoo.org>
+  mate-applets-1.6.2-r1.ebuild:
+  Remove dependency of <sys-power/upower-0.99 from || ( ) construct.
 
   02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-applets-1.8.0-r1.ebuild:
   x86 stable, bug 513714
diff --git a/mate-base/mate-applets/Manifest b/mate-base/mate-applets/Manifest
index 4dde4255c501..5b9c29391363 100644
--- a/mate-base/mate-applets/Manifest
+++ b/mate-base/mate-applets/Manifest
@@ -4,14 +4,18 @@ Hash: SHA256
 AUX mate-applets-1.6.2-r1-replace-cpufreq-by-cpupower.patch 3196 SHA256 2a0e69b60f0a2777190eba9b4d2bf7cfabb7912c302e992ca5b6e49971a58eba SHA512 6506e1346a972384916e54bc675db7457f9f93ade8617db291214cf9842049f3653e00d7a02bc158c19ab902b21fe276282f4f118d097d576608536899dc8ae3 WHIRLPOOL c7e5aaf8546e9879b79abe4ddf4e71afc3e9e44adaa637673844e4dcec0525416902abee6fb0eabbc88ab0095795a0da3753ef9431c4cad7cabff633845b5ffa
 DIST mate-applets-1.6.2.tar.xz 7102728 SHA256 a5607bf5f5bbd7bc75fcdc5d6eb9d2a4e45d0eb5c3b0e73ee6bb9d711c970cb1 SHA512 fb60e4c0e96d103f75720e17c7e6e847a603ecc7b639330fa845abc3b742147503d686ffb7a4d825c0f0fe78c9fe95514d911ee166d6bcd3d37445653b7fe353 WHIRLPOOL 3990f722538edb394a0aed4f9089f25b8d569fd90e1304b1828f9cb0fc3b9c726405d55a562eb3ae4eb1159f942ede2196b40c9d86acc9a92def0e42267dd01d
 DIST mate-applets-1.8.0.tar.xz 6911348 SHA256 e1798784cf2828803e8bae4660a7bcd4c5a44b510217a50c650cfcaacadf71c1 SHA512 d5d211377df4e7bb0135babee7f49fb1fdc894d3fee3a4a485efe0b47d392d0534a1aa978743730e927420f9607efb761b4d3e6814a76aa393aa892788055e35 WHIRLPOOL 69bc6167b2907463660e75fa9a69a97ee9f4d106c8ace983492c78631f603198f93396ed5d58abd87ffd123188503ddee222527aac28a998aa738b4aa76ad288
-EBUILD mate-applets-1.6.2-r1.ebuild 2612 SHA256 b2d247d065db7b4b8f178d56abb2e875978831162b0a99ab0d0327d507a6c5d5 SHA512 2a32111a1ed9c0072a0ac75bc2704d3ecbec1005063df512eb7b8663acbe96ea60fdd974dfe25f0b3a3c08f2a8d7e78abda933c5d8e847fa5496b3f65da71491 WHIRLPOOL 8c882aa1dfc21034d8c14b511b558c743d034163df5d65e3bce10d1bbac5108f12f8613e6dcdf7789d01b29440c9254e165d3581c1d83d379e5477ee6afca25b
-EBUILD mate-applets-1.8.0-r1.ebuild 2536 SHA256 a27d9fbbcd5f4cabcf99976b1dd54feb9cfc465bf74d08a56d5e7616fab2accd SHA512 09b9445c7b29f47801e78e7eb22dfc16271790dad048bf2101e7900827722e7585e7edc1ff009be389fff6b7a6d1e0198fc28693bcd881737f2a240e3a28fa65 WHIRLPOOL 9d2294a62aaa8155038d5aea968526f1f6fbbcb39996f6503fbbe25f5b85739d62025bf6a723ee0d60a8ab0d90b56449d02147715bf19096cbca24d451e68b12
-MISC ChangeLog 2650 SHA256 f69c2a3ed8bc3f34cb7c315955e4e9167493be19fe3e172e1ab73f6fc0df19a0 SHA512 056d2f7f370cecb7fc10e14ff58158ebac9e784c6bf88c0db6e0bb07945750829d6b7aee956a9f52f00b1f5dba7a51547e48b5ad4179ab15d4a5a74f0a21aa5a WHIRLPOOL 1d7c28bbb56963f3e439cd654d010f21edd4dda039f5f86c5421aa50bfe92574b3f5e544385aba0e5fe08a750b8950af3d31b7b1f0b1b3f8e95e7989fe618c00
+EBUILD mate-applets-1.6.2-r1.ebuild 2558 SHA256 210080f84077de400e25bec2ac41829ca6bc94cc56ffb3ac2b22300126e0136c SHA512 f1addc9221bd5ad5781a52e505a703799da83a16d32a1df399d42d2b9e253f9a04d631d1cf5fae965918d0da072c2ede3bf7bdf66c59f88952c34c50c8d629dc WHIRLPOOL c9dd969ef4f4fc47e3b4861d831ad06589902267112d2cc1f60f1ccb12a65759c6b586badd125c2818cf087a63d5501e95d7923ff973b211a3ca43882af2c623
+EBUILD mate-applets-1.8.0-r1.ebuild 2548 SHA256 bae9748a2e8c931d2c7b8caae5b1eaf006866aea3b5e4bc2a1bf942570b55a51 SHA512 23a194a2ee1fe4093d35634af6d4d760cc23c02f16ef8206917b769dd74cc0e47fcfab068c39b0b164423ecae1306454cf0e43bac09e227a0de773f5555b962c WHIRLPOOL aa8c46f382698d67cffd7af1f0e074713369754683a67eb447eac9ecd37977b9cb9b0c694a1fef0c65f8b2d9501d3ba68f8c6072c3c06ee07cacdc8ac198f62b
+MISC ChangeLog 2810 SHA256 065da2e59e20fedf6dbef7aa70fa93ba29b6313c7c82aeeb398af2f25729fe00 SHA512 5e69106e63108e5ebf5f7a98c8f2d341b39fc041a6755849f1e8256539e98d9ccf0902c0045a8e4fe7e5446f1f67eaf10f34b8f12b96f7cf4a347c48e975dd80 WHIRLPOOL 4518826a15c9352d20161db46165b6abbcc34b7ebe76b1c7a126f527e856684f295d05dc3e57c8e595380ac860141803f4bc9521a36d9132e8756dae3d7d1807
 MISC metadata.xml 230 SHA256 c188c403bd41d5dfe348e4809c2350a5a2fca98d46f8adae83a36d89af439ecd SHA512 17d13ca08cb96bf73a2c821019fd00677f17579c54b5543c1653c9f6106d7c52ad14b4a7ff72000ab7f59b7031e4471756b96864ca2fedef2e3a047fa0eb71eb WHIRLPOOL 39073c2fd817e3c41775408adf7271656a744ccd967e74770c673506c8c78cd11356b0cd28eeb16fe7350e8708141ad25037c45066263f2ed1b85d5270743986
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlOz1OcACgkQCaWpQKGI+9SdrgCdHmF6WeOMWf5QPlzIy49Zm+yS
-U/kAn2LJOkbJ5/+oVG6hrMHIinKdg2B6
-=fn7C
+iQEcBAEBCAAGBQJUHGNIAAoJEEdUh39IaPFN408IAKN2AloAe10GKpd1kobP/O3t
+7zX8GiZ4ieIrxsrIwWMQ1umBhjhb0fR3vk/IXtiN3+R4eL6PfdiPIaM0hGP/rhwG
+XFC4bjQya+yoZhDxrbhOu1ro/GBAlSnvMX2KzOC8UvScXnT7jHYhRNjv+H9UkCW4
+CHzCQysYeZNYM1TCL8tuiWQkBIaYxxf5PvHEA8sDWTwmKBmEa01gL40aCiZ6UWRO
+7yRsEmpFLmhhyojy9ve0ZDuQQGNszT/P67W86EdqFXHt5bnVyYKeyOzIKWOyYtzJ
+GmdZ/XDin+GmfEEaCPFfessFF6NPK8Di+E3lHrrV9u6Uq6B6oQayy6LzHG03h+Q=
+=ldyJ
 -----END PGP SIGNATURE-----
diff --git a/mate-base/mate-applets/mate-applets-1.6.2-r1.ebuild b/mate-base/mate-applets/mate-applets-1.6.2-r1.ebuild
index 2b6232ad8620..7d4d29c77f6f 100644
--- a/mate-base/mate-applets/mate-applets-1.6.2-r1.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.6.2-r1.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-base/mate-applets/mate-applets-1.6.2-r1.ebuild,v 1.5 2014/06/01 09:49:13 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-applets/mate-applets-1.6.2-r1.ebuild,v 1.6 2014/09/19 17:09:31 ssuominen Exp $
 
 EAPI="5"
 
@@ -35,11 +35,8 @@ RDEPEND="${PYTHON_DEPS}
 	>=mate-base/mate-settings-daemon-1.6:0
 	>=mate-extra/mate-character-map-1.6:0
 	>=sys-apps/dbus-1.1.2:0
-	sys-power/cpupower:0
-	|| (
-		( >=sys-power/upower-0.9.4 <sys-power/upower-0.99 )
-		sys-power/upower-pm-utils
-	)
+	sys-power/cpupower
+	>=sys-power/upower-pm-utils-0.9.23
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-2.20:2
 	>=x11-libs/libmatewnck-1.6:0
diff --git a/mate-base/mate-applets/mate-applets-1.8.0-r1.ebuild b/mate-base/mate-applets/mate-applets-1.8.0-r1.ebuild
index 97f9d5ed2f34..003e20b63305 100644
--- a/mate-base/mate-applets/mate-applets-1.8.0-r1.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.8.0-r1.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-base/mate-applets/mate-applets-1.8.0-r1.ebuild,v 1.8 2014/07/02 09:46:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-applets/mate-applets-1.8.0-r1.ebuild,v 1.9 2014/09/19 17:09:31 ssuominen Exp $
 
 EAPI="5"
 
@@ -34,8 +34,8 @@ RDEPEND="${PYTHON_DEPS}
 	>=mate-base/mate-panel-1.8:0
 	>=mate-base/mate-settings-daemon-1.6:0
 	>=sys-apps/dbus-1.1.2:0
-	sys-power/cpupower:0
-	|| ( >=sys-power/upower-0.9.4 sys-power/upower-pm-utils )
+	sys-power/cpupower
+	|| ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 )
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-2.24:2
 	>=x11-libs/libnotify-0.7:0