If using sys-power/upower instead of sys-power/upower-pm-utils, force old version of it, because xfce4-session from Xfce 4.10 doesn't include built-in sys-power/upower support like Xfce 4.11 git master does. Leave the dependency untouched for 4.11.x because with 4.11.1 version bump, the support will be there, and 4.11.0 is p.masked anyway.

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

3 files changed, 20 insertions, 12 deletions

diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index 2c1e4ab5f9ca..5457fa5c5c07 100644
--- a/xfce-base/xfce4-session/ChangeLog
+++ b/xfce-base/xfce4-session/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for xfce-base/xfce4-session
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.205 2014/05/26 19:42:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.206 2014/05/26 19:48:41 ssuominen Exp $
+
+  26 May 2014; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-session-4.10.1-r1.ebuild:
+  If using sys-power/upower instead of sys-power/upower-pm-utils, force old
+  version of it, because xfce4-session from Xfce 4.10 doesn't include built-in
+  sys-power/upower support like Xfce 4.11 git master does. Leave the dependency
+  untouched for 4.11.x because with 4.11.1 version bump, the support will be
+  there, and 4.11.0 is p.masked anyway.
 
   26 May 2014; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-session-4.10.1-r1.ebuild, xfce4-session-4.11.0.ebuild:
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 7b98bf098612..1aa46b4a4cc9 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -4,18 +4,18 @@ Hash: SHA256
 AUX xfce4-session-4.10.1-alock_support_to_xflock4.patch 367 SHA256 2be32b49b268649e509b99e8d93a3d4e57665cbe8e03693bc85f88ea088e0650 SHA512 8ee765241997cbf32c08e9597d42ee666400fb27792a8716f59aa91daba7476e1de679e4c9254653cf9b14d95fc293f22d02e99ef3288287113a72407e513975 WHIRLPOOL b4b440c393c6175c9555d4df5d3eb4e730512c41fd83d291df2817206225efabc8db752887bd3316ae7fc915158a513202fa592536b78d52c4c40bbff7aa7ae8
 DIST xfce4-session-4.10.1.tar.bz2 1273015 SHA256 0154fabdc398798c3445374ccc52a2f5bcb2d867fc94bc54114395b24f9cfc83 SHA512 4c6931c350957107fc13f244748287141d524a0e954f48935b5dac2c46a8125af702e1164af98414644f9ea51f5a952db6c57a96fe2a51cab21b616381aac015 WHIRLPOOL fb6193b4d769fb0cd5461a925538bbfa9224b31209d3d16b8bef2f81cbf29aa4cf1c56373335b27326cc2a9f8905a11eec975ee7bc2068168b39e06cd08e64fa
 DIST xfce4-session-4.11.0.tar.bz2 1213569 SHA256 c68905b5124382e30e90f7e4f080fd7e24d58a065991eba9cfcb99e5d59a7c8e SHA512 cbb574117acdefb4781ecb16f7e4681c4c31e624eea2976c88199d3bba883c9a1f114d8b88eebfdd1f5e2c298a672ebf6171ee2b0a117dc54cb675ebd38db90e WHIRLPOOL fa14aa5e321339903460df8471b59b018d34c8453f639f8726e6961d88383aded6319448704d08f74be53ca08c03625dc76857ee328b19cfbaeffadce160d1fe
-EBUILD xfce4-session-4.10.1-r1.ebuild 1770 SHA256 39f47589a8ea1d844100aa207a72e19a01ec0e6e0578bc32dbb5503bbfc786f9 SHA512 d43507993c4f7d1fe6eac3f467229a2b630fe2fe4e4031d44f712f6fdad4ee1cd7051a82dabe6d4e871db31b83c947249c2b9b69b4409228aae67c422e918c6e WHIRLPOOL 5930207ed4975c5db1d845a613dad45b8ce0ec808388c3daa76f67e824691797e10f8cc7aa39c17c9377156b589757f22a1bab1c53216fa066755232c46ff919
+EBUILD xfce4-session-4.10.1-r1.ebuild 1767 SHA256 ff110abecc8a14df6cc49a30455de2c3ae747e65d7e6a90b81bee3666e8527dd SHA512 8b01527cc1f76bd8ad5ddffa8e9158581eb3c67e307a2578cfe561f2db15ccc25ebad62b8442e8c5f6eae53b5842858ba0083df690a8fc88069e5b1b5c18f3fd WHIRLPOOL 85febc5aa20fb062488ae4d810d4396dfb6c0d1b849c7058166e9ab97b2c48f42e0da5d36d178b926cd3858b54bf5fa471f4a250c237728b29621685d72b6279
 EBUILD xfce4-session-4.11.0.ebuild 1781 SHA256 aa74d03c8d965eab9f8b1581c6c2179c0491f771c00b07f00aba03fc79d6b294 SHA512 3fa8e29e264473440080269c28fc4e1b7989dc25340a2cfcf1b0723a91038f108a45b758181e3438119f7674b8cb64331dbfa7b165bc974d934d9e4c147ecf81 WHIRLPOOL c9bf62a41a2a3ebd2ac19536e22a729dc25dcf88449e7e0769074006048e4d207df94892f974baab7d679ab7e8f02b79ed52bf7fa52c6afd23fcebae0176e04f
-MISC ChangeLog 27582 SHA256 611fe4159c453ee576fa1e11fae818cc6dded6b7b9cf6ccf26639da48322a117 SHA512 8c4a4a858e92d69159cff741f569626db7388da178a39f25d68d98385de40be80a5d13b2e444b810d789c98eb04a9b3a84b8d3cbcf0a5d2ced3f2321fedd0a91 WHIRLPOOL 46620394173d859c52f33bff6c230d94c5951e9663bba825eb4226439ed4075e06e96388a89c189f6bd0f13e7e1b2bdc828ab151ee65818778bcd3288461f11b
+MISC ChangeLog 28023 SHA256 781eb3bb8c76ba8d3bd6e6c30bf1f361595a25058dcddea34e7ce401e90969f7 SHA512 6e4ccbd8d509c80543b2269c41cc672ed3f5e000f8fa503bd56d7d604ac1db37d3dc769e45ada575cc4100558812fcd1744a38a960d5fb1ec4188439b9167c3f WHIRLPOOL 3c95d6bf8ff6a948fce78b6cd2583e955e2281ee2f23b85e4b515d2253592443cdd3329b7817e3f85d45e37ef52483d2b8be70b9397a14ac0157c860246a79a1
 MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTg5i1AAoJEEdUh39IaPFNtfcH/0r8YU8S9ZYDyeq+ZPRz/bMA
-9+HcsvqQaRfhMrUI7TMYikE6rUmLVvmzzY7j1Zt4LnQVg6PO5F6s3jxkLnu50Tue
-caN3tOfx7V+TJILdpWyA+sjKWDPBTS81o+UTCVZyWTigZ3Ci49YTbe8PMTZ/iIB1
-h5vdSagwnTfgbskC9UX9KvMiVqUnnc9rLmhG0zkspoppTy+nuqa56AaoR7PDIe8c
-oTiGflRtwNCzy6wlO7QC8bBAeXggE2EBZQp8zRTLMg+ifYNXXFGmxg5hiIBrMzNC
-cbXg/nI22ISU0LZtJNpIGx5F5cH8kV8k18hDqRsnK5jQ7QzBxRstEIsvlwxJ4Jg=
-=kxbw
+iQEcBAEBCAAGBQJTg5o3AAoJEEdUh39IaPFNe5gH/2dE0atI9SlDGWE5W0f5Q7FU
+OkwORaLuHRhbwBuv9XQx6mqsi4CPZxNQJfEBpr9mDZrLUT2FzrnkmuCZTeR3Xwe2
+uSYFIhq4C1mSj81ZnDbA6s8gzF/uvouwH+Sy41tPUD4E0i4YhtNELZArPaZol158
+DxX+PdZmfl2OEi27U+N5jF8rGE0Sx24TPfvwF7PeuRt2F8QYCHLwDf1WhNAziItX
+rEF34hhDInXIkyhRtICiuIYIALyFSm5juQ8y5KndqlW9NoqwhM8j1ktg61sIp3JZ
+gsPGyz/NrlqfecZtJEVT+N3i/tIUPcu5lzEbQ305Tx0H2//VN3WChjk6wm3CJvo=
+=LDVO
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/xfce4-session/xfce4-session-4.10.1-r1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.10.1-r1.ebuild
index 7bd2540c27b4..3597dce1e423 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.10.1-r1.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.10.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/xfce-base/xfce4-session/xfce4-session-4.10.1-r1.ebuild,v 1.13 2014/05/26 19:42:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.10.1-r1.ebuild,v 1.14 2014/05/26 19:48:41 ssuominen Exp $
 
 EAPI=5
 inherit xfconf
@@ -27,7 +27,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
 RDEPEND="${COMMON_DEPEND}
 	x11-apps/xrdb
 	nls? ( x11-misc/xdg-user-dirs )
-	udev? ( || ( >=sys-power/upower-0.9.20 sys-power/upower-pm-utils ) )
+	udev? ( || ( <sys-power/upower-0.99 sys-power/upower-pm-utils ) )
 	xscreensaver? ( || (
 		>=x11-misc/xscreensaver-5.26
 		gnome-extra/gnome-screensaver