Fix up upower dependency, due to the 0.9 -> 0.99 bump; with help from ssuominen.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

9 files changed, 63 insertions, 25 deletions

diff --git a/mate-base/mate-applets/ChangeLog b/mate-base/mate-applets/ChangeLog
index 379c6f167163..d4f620697364 100644
--- a/mate-base/mate-applets/ChangeLog
+++ b/mate-base/mate-applets/ChangeLog
@@ -1,6 +1,11 @@
 # 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.7 2014/05/31 10:20:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-applets/ChangeLog,v 1.8 2014/05/31 20:35:08 tomwij Exp $
+
+  31 May 2014; Tom Wijsman <TomWij@gentoo.org> mate-applets-1.6.2-r1.ebuild,
+  mate-applets-1.8.0-r1.ebuild:
+  Fix up upower dependency, due to the 0.9 -> 0.99 bump; with help from
+  ssuominen.
 
   31 May 2014; Pacho Ramos <pacho@gentoo.org> mate-applets-1.8.0-r1.ebuild:
   Needs to be rebuilt with libgtop soname bumps
diff --git a/mate-base/mate-applets/Manifest b/mate-base/mate-applets/Manifest
index 8b9b81ab77fa..cffb4dc381e4 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 2549 SHA256 2233a7604f1f9518385304712ddc4050106a67e67a125d368691d56277ca9f28 SHA512 10e238b275431fa08f4c97be2e71cf5edd583f957a330a62d8b6100e40a82f09ffe15a2168b63d00d3bde405ce37a3d700c137a4ec745a2acc306b9e86c27498 WHIRLPOOL f970badd6c9fb88bb38f156e910fbdc41b46aaf18736501cc1bceb2635c1767d11c5f35ac5f450446db186d23daa39f9e7f11ce0c8ba5551d173690a8ab959c2
-EBUILD mate-applets-1.8.0-r1.ebuild 2502 SHA256 707e95c912bcf1d36a3129f532c2f5848e0a75ec0555af12c7b5daf1929c8eaa SHA512 bfdcb9d805abfdafed426090ed83a140a9789705130e93de820db80a59a86d858436db3cc89334e8af824dd98767df3d392eae7fe0f23f11fdf31f6540fbcb07 WHIRLPOOL a338467ddcedf2400be1447f6417f241bde7b1b288eac67bd8986c63f5b7e84cba4f6311bd0f942151f3e37c1b70e338366ff8ad83b0401f0023d8c104173a66
-MISC ChangeLog 1651 SHA256 d30397af3f748aef80d86732d18a80db11d382a35fa3309017e6be4229ff9501 SHA512 209d10b6c3356bef021ad3ff7faf75a5a6713deb90bcc05891ff0906ed400dd1958659db5453d547191af526a752e89de032c44d438746acbdf80337f29f9acb WHIRLPOOL 25415fa960469decf1206c418bd4b804821439662bf9e8780fd99c4f1c288447a9720958bc26269d32be6d969472a931e0553194d4e27c123f9c1f0b459949aa
+EBUILD mate-applets-1.6.2-r1.ebuild 2612 SHA256 3fd3927af954b773a1b554bf55ec19194e302b5a85255617e48a4cad71cbee51 SHA512 779152c7e8c7dcfd0a8d4224d119bb585d201ffe6b05d4a8a7b63d761d4e36fa8474a3d180b240fdffc666959a2a0d99f8df6205c734d288a1e82f1c7985ee69 WHIRLPOOL a9ae142af33aed8f4488cdd93a03ace57e6ac511ba60f0853c64ee992c75c97c152c0ba691b27e77423598f645f150307fa5cec51efa516b6e8b072bb4228991
+EBUILD mate-applets-1.8.0-r1.ebuild 2566 SHA256 e64afd7dd04aa6d7bb9888440e73eb212f24251373fd73af2e53abc9cfd21783 SHA512 4a7ca15e00317fa40cdfb2e5108089aa2b080703eb55f5169ac469a50a253abca78869c60f15de6be5ad3a8e35c497bba9aa16f66cbac53f3cd0057a15866856 WHIRLPOOL aa3b9e1d0e6029fdde348ea4c739bd553aca0a37e0890ad28a6a892fc1391b34fc3b2f44762128eefad7b5b5df7d33002f9febd6618d60fbbf8da59816e21fbf
+MISC ChangeLog 1847 SHA256 79ed0073363baadedb436486b8e0f2cf45f50cc65d2feaf4cd2ce388c19117a5 SHA512 d6a95cc740ebf8dfcd60e51771bdf97bbc20fc630c5309348d636e5478d3355e1d983b1966b08703cc6578b967bb0db070f087eebd2e7fc78d595c8a2dd580a5 WHIRLPOOL b3171b9b18a218240740661cafae6fd8be9aac53fdde3dcc673e98d9c642c7ca4a3a287c0b945d95c789adaad8dccfca12b25aedbe461b114094f821304ca636
 MISC metadata.xml 230 SHA256 c188c403bd41d5dfe348e4809c2350a5a2fca98d46f8adae83a36d89af439ecd SHA512 17d13ca08cb96bf73a2c821019fd00677f17579c54b5543c1653c9f6106d7c52ad14b4a7ff72000ab7f59b7031e4471756b96864ca2fedef2e3a047fa0eb71eb WHIRLPOOL 39073c2fd817e3c41775408adf7271656a744ccd967e74770c673506c8c78cd11356b0cd28eeb16fe7350e8708141ad25037c45066263f2ed1b85d5270743986
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlOJrOsACgkQCaWpQKGI+9S7FQCeO1Bx3UY+pGQz2eLAecorK8vN
-v3cAn2g9W5fZrulcAkamYL5IBQ5V3jJc
-=PJj6
+iQEcBAEBCAAGBQJTijzVAAoJEJWyH81tNOV9vcAIAKx9lsHT7bAjrUj4KLNohicf
+N4pJ9l1i2pUZjbBoChI2iPm4YmxldiEuLDwusF9/NTUCEg3PMcCJ6943QkLb83RH
+nlKrdXMeKntw5PwEdFFfMEnsWuK6GhG/TOTpgZN8Tikh+Z0+EhMnGsZFG0TzuIKR
+4dS+ZLFkPKKe9M5jg9APR2tpjNGYOZxKMPQkgPVH9sFKHtd88i66gGnTN9kwlyOd
+myxssmNkl13l8KEte+ZymhlczEyok00NqIJhHukvRYYz7VHQ+I+xG/RmNnJ0XJlM
+ZdP51LBZqavJCJtPvFS+EmURtKR999rP8Wc5kJhIf+LzA1wj+8XvZUzvoZcQAJE=
+=Pnqp
 -----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 86378b558a9d..297b5053e9bc 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.2 2014/05/18 14:06:51 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-applets/mate-applets-1.6.2-r1.ebuild,v 1.3 2014/05/31 20:35:08 tomwij Exp $
 
 EAPI="5"
 
@@ -36,7 +36,10 @@ RDEPEND="${PYTHON_DEPS}
 	>=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:0
+	|| (
+		( >=sys-power/upower-0.9.4 <sys-power/upower-0.99 )
+		sys-power/upower-pm-utils
+	)
 	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 e1fed7d3acbe..cd327aa93750 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.3 2014/05/31 10:20:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-applets/mate-applets-1.8.0-r1.ebuild,v 1.4 2014/05/31 20:35:08 tomwij Exp $
 
 EAPI="5"
 
@@ -35,7 +35,10 @@ RDEPEND="${PYTHON_DEPS}
 	>=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:0
+	|| (
+		( >=sys-power/upower-0.9.4 <sys-power/upower-0.99 )
+		sys-power/upower-pm-utils
+	)
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-2.24:2
 	>=x11-libs/libnotify-0.7:0
diff --git a/mate-base/mate-session-manager/ChangeLog b/mate-base/mate-session-manager/ChangeLog
index 4b8b16e2ceb1..c2f4d820b416 100644
--- a/mate-base/mate-session-manager/ChangeLog
+++ b/mate-base/mate-session-manager/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mate-base/mate-session-manager
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/ChangeLog,v 1.8 2014/05/29 18:48:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/ChangeLog,v 1.9 2014/05/31 20:38:31 tomwij Exp $
+
+  31 May 2014; Tom Wijsman <TomWij@gentoo.org>
+  mate-session-manager-1.6.1-r1.ebuild, mate-session-manager-1.8.1-r1.ebuild,
+  mate-session-manager-1.8.1.ebuild:
+  Fix up upower dependency, due to the 0.9 -> 0.99 bump; with help from
+  ssuominen.
 
 *mate-session-manager-1.8.1-r1 (29 May 2014)
 
diff --git a/mate-base/mate-session-manager/Manifest b/mate-base/mate-session-manager/Manifest
index 904ed9282e71..8c5d3e5aa462 100644
--- a/mate-base/mate-session-manager/Manifest
+++ b/mate-base/mate-session-manager/Manifest
@@ -11,15 +11,19 @@ AUX mate-session-manager-1.6-gnome-keyring.patch 8857 SHA256 d0fae72ab5be01d9f07
 AUX mate-session-manager-1.6.1-login1.patch 7819 SHA256 7d0141356e09e00812165b55a0e8a04659decb304a9eebd6737f1bccd83cb80f SHA512 55452c738cbd80b80cfcd1cfda0e23e79a5d1626e34e75a978561ff748787e5283c09531db435333bf2fcd7f06249d738b4a08929ae902da2ef4c11c9baf2bbc WHIRLPOOL 01ff8e0b89cb480b07d2adb5bd2f608da1432ae35028a407776306ec386953785b45fcf75e1cd269558cf8fe27268141629d44679d11ae72ea822305b8b2b863
 DIST mate-session-manager-1.6.1.tar.xz 641524 SHA256 4ee7b4ae18df5becd986b05634428edf0ad8de150a14dc29848b6d34ab312ce9 SHA512 dfbfc782cd09b401565ed6021687cfb11f66cd0a05609c3f344b9b1059215f1717054b021166ca5956162794398905f36e51d13b6720e8005a923843af10129d WHIRLPOOL da47bc33b96a646e29f2bc3d957473c892b660c268a966487bb5f31beeacb1720ec8277e87d24afce99c8a8529fb0539d809705e26c9684d31c6ac7d6b599dbd
 DIST mate-session-manager-1.8.1.tar.xz 524204 SHA256 2f85a714704bc475d08809be6ecf24a5d94d2e2d0ea5ac704d67557c349d7b8c SHA512 1b09a471db710193a643ec90c9b153468d9a303957b9c4da4e30cf470aa5f582b6992f5e0ed69129943aa44f7c4e372e2a8554fc6020627817a3c49d656ca5b5 WHIRLPOOL 8c771ac713da92c2ae8bccc173a9cba4fc5bb16a943e588c679624e3e945555f2c37511426e666f38440947ec37139452ee230d07bc3a414a65629c04bfd31a6
-EBUILD mate-session-manager-1.6.1-r1.ebuild 2879 SHA256 62763beac4e0fa073f688818e054cafddb0c9602a45c3152f5a5bd1edbf3564f SHA512 45d9f60df28fac0833ae62d0be4245bab01054eddcaf8d4af885f8490220d6d8719f7c48166245a8ed91b14cefd518662659826cc88c9f6940a88e5e1983fde2 WHIRLPOOL a67c86716e3f0b5b1c7f522214bf9d32b7c5676fa6d3ac724048b930c0d0c83fe7d019d3a5753b39c42a95c74aaf7f002b939392923489318b987e67e5372689
-EBUILD mate-session-manager-1.8.1-r1.ebuild 2740 SHA256 d2169f09fc3a74dcb7f4915be6f6ee1cbdef47ddf995f2454ac1b41be96ec03a SHA512 ed064d45128d8ebc14ab9647ed3a73dba5a5f647f5ecd8f2fe3d46d74931e82ae14e0642fd8b6b12b9c0f67d9d0925ba96146488ad572ec8a1ad55826103275e WHIRLPOOL effdfc6fe20baebe3171999ec04d2366521d725416e707c7af0837662aa5834bbc17be9308da34a8d08344b9b272b65b8a562d83004ffb2719fbc35e3d2320ec
-EBUILD mate-session-manager-1.8.1.ebuild 2709 SHA256 3eeb1b97e9998042f4994558f1e040577be6776279b44fec6017b2417709994c SHA512 7b3074ec1efc341a9bad4ecc2674756add19508bddeedfbedb2f506075bf16c34666adbe96cb80f00e0b8c4ed638a7625cf4b5fcb3de57765ebc6f6dd6be7ae1 WHIRLPOOL d5e2d871edfc40c8d216efa54d017a5c9ff89a78cf95d621e424e0fd637d4fa554fb712a7c59317059318ebc05415998933d4881fe5908810e40dde4729dbe20
-MISC ChangeLog 1985 SHA256 13c4c783651be9e0ba288813443f3a9c6d8f1db18d9e2517b8f50287b20f12f5 SHA512 9d61f87a656f6afe9e273deab0d3ef2108a444f36d39c3711a950003470390bfe9c782b09b49154a0f97aedcaf269ce54d6556e164c976dcbfa6f2e7577f591c WHIRLPOOL 56e1e49cdd7396ab929ea4360f99d071797b6a46bac0799c59791cc3192d707e030881f687320db4936c6491fac1ca18ef237e28fa594370313d5b2df8d92dfa
+EBUILD mate-session-manager-1.6.1-r1.ebuild 2945 SHA256 e45409aed696e4fcde539678ff05bdc14ca242990930d971ecdb70f6e01be218 SHA512 0f69ff5eeb96ec6a29c8056cf888fa76c7de9491162f9e7547584c3f1fb0640e8a6224cfdfb563adddd09ecacf678ee7058a541657b549228e8f9920e507beff WHIRLPOOL cd7d3e730a7b37d766a01f3b93623abb36c8fe6b6944fde52da0fa9f4b691d493659a5aeb95914e203a822faa4d9332a1723bd8b7eb50937d1e58c3f9f2e03a7
+EBUILD mate-session-manager-1.8.1-r1.ebuild 2781 SHA256 5127cac5b24cd1d934e04ee4b48209fcea60664dcd6ab7f44a069c06df0d3c87 SHA512 21a60deb9376483cfb714722ea4a7d5d414ac8fdee279267238eb5612527b6d9b9180ec5f21d931f922554cd6151ad34d58aa834f870fb5d8c7d229e17726ee1 WHIRLPOOL 3af145b4d2f7f45d550e209a6c405234c37b8d7c7f3746c046b71da918f083d82ed66b7dd030a2e6993eae63c3743a7b306d4c6d0956aedba95602d65bb149f0
+EBUILD mate-session-manager-1.8.1.ebuild 2778 SHA256 009fdbea28cb51c22d7d10f0f30be846dfa7963da3ab21c78feac08a3814e810 SHA512 d4fd871fa3d729c74b324ce34c38ba5b8bc2b063fd88d58611c6523e753b28313a05bfbf09c54f1911a148d8da405f75be733c30796174e9ecbb7c21d7ecef11 WHIRLPOOL 24ab5ae46a738cac01936139679c0f6b2c1b462a69caaf0098ad508481aef0cf44916abeb071bee089f76919bed169cd9a6adf82d56713bec894a17e74f4f664
+MISC ChangeLog 2234 SHA256 68fa9ca4cd09e5202699f7b3450d6158a7e1b4b04d9c126204c0bbbd4d40aac0 SHA512 37c59760e118ab2da659bc62cea2ee6b45e10f31ebe45d7a8e510baea7eae1986d3541252d8bfdf391878583b9969ba2317938d9ebfe848d8c8c81a736e0df76 WHIRLPOOL 6a8c0ce5759018911790ae9fda38a622e6d18466b0bc717720e08bff66f8937d7207c0bb2792da97f96c122ed3e13b6862953de1806ca6f746bf696a9264e1cf
 MISC metadata.xml 335 SHA256 5270f4b1b9c1a59490b6310739fb64b25003887733d5efb593e3815696b9f451 SHA512 7e89895f4ccc1bffc61127e007da000c124a23a80e636d9f3eaffdcc212f5b7e29c4498f00bc63b1a15267086ae2e6f9e53ee8dbf5ae3ef96a425a9bba0ce1e8 WHIRLPOOL 5d355796255850ea932e08650f0d9ea54fbb121a74a1ee916f885909b2e1331dbd305b58cc448be6eee8e0ee710c242daf18db1e1d868dd2e50654bcba681fcc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlOHgPYACgkQCaWpQKGI+9QNLgCgh39OwcCBQzpzCaMkhQBT85fy
-S44An1k4KXfATHy82eBuDc0XmxQtge9n
-=/wGH
+iQEcBAEBCAAGBQJTij2fAAoJEJWyH81tNOV9SIgIAJL9+MBW+9nTGmme46WFpiBa
+bHSYJczPy21hbA42YlhXrjMxvpS6ZDL/QXYK/k9jJCt9LQ847IyT41NQrQGgz+Dz
+bqg5yLFYjKuHQ9ssEwhsLQSfqPAuohzWNJNb0xVXGKRml1YRy/k0TqlnLlGn7AxK
+nmXoWMPeUutoA40R0IJRHWZbm5z4Ok9yDCdL6QGfhwBbuHZhH4tggJnDPfN+5Tv+
+uJJk2hLySewgXkHxmgOJaOi25E3IbMJ6FphC6SKo9Nwj511bOx005QcV+2poao4I
+17cxubHCEyRxXNzyje1imtCDjarKrhOUmWfe8A8tnvuIuRbdPNsWWfs65Mg8X68=
+=UZwb
 -----END PGP SIGNATURE-----
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.6.1-r1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.6.1-r1.ebuild
index d3b687526e81..e4da52a8256c 100644
--- a/mate-base/mate-session-manager/mate-session-manager-1.6.1-r1.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.6.1-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-session-manager/mate-session-manager-1.6.1-r1.ebuild,v 1.6 2014/05/04 14:54:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/mate-session-manager-1.6.1-r1.ebuild,v 1.7 2014/05/31 20:38:31 tomwij Exp $
 
 EAPI="5"
 
@@ -28,7 +28,10 @@ RDEPEND=">=dev-libs/dbus-glib-0.76:0
 	>=dev-libs/glib-2.25:2
 	dev-libs/libxslt:0
 	sys-apps/dbus:0
-	>=sys-power/upower-0.9.0:0
+	|| (
+		( >=sys-power/upower-0.9.0 <sys-power/upower-0.99 )
+		sys-power/upower-pm-utils
+	)
 	x11-apps/xdpyinfo:0
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-2.14:2
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild
index 6ef101228adb..9c3ecec97ba0 100644
--- a/mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.8.1-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-session-manager/mate-session-manager-1.8.1-r1.ebuild,v 1.1 2014/05/29 18:48:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild,v 1.2 2014/05/31 20:38:31 tomwij Exp $
 
 EAPI="5"
 
@@ -46,7 +46,12 @@ RDEPEND=">=dev-libs/dbus-glib-0.76:0
 	elibc_FreeBSD? ( dev-libs/libexecinfo:0 )
 	gnome-keyring? ( gnome-base/gnome-keyring:0 )
 	systemd? ( sys-apps/systemd:0 )
-	upower? ( || ( <sys-power/upower-0.99 sys-power/upower-pm-utils ) )"
+	upower? (
+		|| (
+			( >=sys-power/upower-0.9.0 <sys-power/upower-0.99 )
+			sys-power/upower-pm-utils
+		)
+	)"
 
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40:*
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.8.1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.8.1.ebuild
index fa4255820eb8..c5f5235ae9a6 100644
--- a/mate-base/mate-session-manager/mate-session-manager-1.8.1.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.8.1.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-session-manager/mate-session-manager-1.8.1.ebuild,v 1.1 2014/04/17 15:11:08 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/mate-session-manager-1.8.1.ebuild,v 1.2 2014/05/31 20:38:31 tomwij Exp $
 
 EAPI="5"
 
@@ -45,7 +45,12 @@ RDEPEND=">=dev-libs/dbus-glib-0.76:0
 	virtual/libintl:0
 	elibc_FreeBSD? ( dev-libs/libexecinfo:0 )
 	gnome-keyring? ( gnome-base/gnome-keyring:0 )
-	upower? ( >=sys-power/upower-0.9.0:0 )"
+	upower? (
+		|| (
+			( >=sys-power/upower-0.9.0 <sys-power/upower-0.99 )
+			sys-power/upower-pm-utils
+		)
+	)"
 
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40:*