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

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

7 files changed, 35 insertions, 27 deletions

diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index 1d6aeb72bc33..2c1e4ab5f9ca 100644
--- a/xfce-base/xfce4-session/ChangeLog
+++ b/xfce-base/xfce4-session/ChangeLog
@@ -1,6 +1,10 @@
 # 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.204 2014/04/22 13:41:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.205 2014/05/26 19:42:15 ssuominen Exp $
+
+  26 May 2014; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-session-4.10.1-r1.ebuild, xfce4-session-4.11.0.ebuild:
+  Fix dependencies to allow sys-power/upower-pm-utils.
 
   22 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
   Remove unused USE="consolekit" and USE="gnome-keyring" from metadata.xml
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 87ebfebf398d..7b98bf098612 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 1731 SHA256 cbb2b1507221470058040d846bfc92abcaa392ac790866a2d192c67882b34349 SHA512 ec7465c9e8b35bb3abf9fa64202274d6c309f4d46e800465a56548fc7d87a9278c2190191510a971776e292ef43fe6da822832faaf4a7360c01e872ce9d0751f WHIRLPOOL b28fa3da7accbafe4dfe24952e184a8f616f025f9472ad7af90b39625d8c9339265494736951710b412e3096bc36b5d95e975f72a89b5772ce96dc21e8925332
-EBUILD xfce4-session-4.11.0.ebuild 1748 SHA256 f779f600ea3156d0e1f88d01ea3e0c5099ae64e379a4136482625c7638be6069 SHA512 b1e26dcd183268ce90e6bacaac32283295063731b0c2a391a8f3b7361f3c6c590fe3f8931446b54006ddc423b3d0c1e29a0e8dcc031ef785fbf3fc77243426cb WHIRLPOOL 211230d80a1a72e1cf873e877ee8da858cdd1969e39d394825ef9fbdd022482fe84a528c5bfd6e3fe8cf60ccc44adec6a0076120427e1181a96c9c3721d23134
-MISC ChangeLog 27409 SHA256 8c7117991770435eca9f9e4549d8de54ab8f320d176051dc8658869ecab6bf93 SHA512 0082568339b75110700676445aea9864656f9e155c2b2e3e9b710c51f031f463e0225bf4f022c77c77a101d10477ec37374eca85069c451b7ae676a10bd7163d WHIRLPOOL 66c263dfdaf546fe65ba3e9ab6cdf6cc7c05debf42beacd702c7a14e97c664d66e9017512c6a67596c8df8a27b20f5e83623ad9038037c791be73b72e6621cc5
+EBUILD xfce4-session-4.10.1-r1.ebuild 1770 SHA256 39f47589a8ea1d844100aa207a72e19a01ec0e6e0578bc32dbb5503bbfc786f9 SHA512 d43507993c4f7d1fe6eac3f467229a2b630fe2fe4e4031d44f712f6fdad4ee1cd7051a82dabe6d4e871db31b83c947249c2b9b69b4409228aae67c422e918c6e WHIRLPOOL 5930207ed4975c5db1d845a613dad45b8ce0ec808388c3daa76f67e824691797e10f8cc7aa39c17c9377156b589757f22a1bab1c53216fa066755232c46ff919
+EBUILD xfce4-session-4.11.0.ebuild 1781 SHA256 aa74d03c8d965eab9f8b1581c6c2179c0491f771c00b07f00aba03fc79d6b294 SHA512 3fa8e29e264473440080269c28fc4e1b7989dc25340a2cfcf1b0723a91038f108a45b758181e3438119f7674b8cb64331dbfa7b165bc974d934d9e4c147ecf81 WHIRLPOOL c9bf62a41a2a3ebd2ac19536e22a729dc25dcf88449e7e0769074006048e4d207df94892f974baab7d679ab7e8f02b79ed52bf7fa52c6afd23fcebae0176e04f
+MISC ChangeLog 27582 SHA256 611fe4159c453ee576fa1e11fae818cc6dded6b7b9cf6ccf26639da48322a117 SHA512 8c4a4a858e92d69159cff741f569626db7388da178a39f25d68d98385de40be80a5d13b2e444b810d789c98eb04a9b3a84b8d3cbcf0a5d2ced3f2321fedd0a91 WHIRLPOOL 46620394173d859c52f33bff6c230d94c5951e9663bba825eb4226439ed4075e06e96388a89c189f6bd0f13e7e1b2bdc828ab151ee65818778bcd3288461f11b
 MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTVnGHAAoJEEdUh39IaPFNF+MH/A/ziMJby1W9sbHbEcjIwcYe
-WvRlE4om3Bwhh1VGkcL8cCbIS9LgnN63DHk6zpHf3IBRJ14VMrmJYMBqBoPHyyFp
-v7ruSgoSDYeX4Y9B4RNvhra7KKRu3Py3YhBO/382XGP442z4MjlGtdi1n+lFnOa4
-JtZ3auJ/dPDxn8L0wdT7JzOGxSc8BONQPBXivw1GcOvRs/b5TrZkMLifuzH8tDS0
-dHzY+rKU+4a1Nf4iKcR23nfVi0h92Kof4jqMgHn2Vr+uoNTUkqe+PYdQ92oe9RgK
-rGhcpUih+9veFQw1T4P93zGYqr4dc9fTQ9QNtp0/df901r7x4UWttG0C1lN9uQ4=
-=MjIN
+iQEcBAEBCAAGBQJTg5i1AAoJEEdUh39IaPFNtfcH/0r8YU8S9ZYDyeq+ZPRz/bMA
+9+HcsvqQaRfhMrUI7TMYikE6rUmLVvmzzY7j1Zt4LnQVg6PO5F6s3jxkLnu50Tue
+caN3tOfx7V+TJILdpWyA+sjKWDPBTS81o+UTCVZyWTigZ3Ci49YTbe8PMTZ/iIB1
+h5vdSagwnTfgbskC9UX9KvMiVqUnnc9rLmhG0zkspoppTy+nuqa56AaoR7PDIe8c
+oTiGflRtwNCzy6wlO7QC8bBAeXggE2EBZQp8zRTLMg+ifYNXXFGmxg5hiIBrMzNC
+cbXg/nI22ISU0LZtJNpIGx5F5cH8kV8k18hDqRsnK5jQ7QzBxRstEIsvlwxJ4Jg=
+=kxbw
 -----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 56d37ab34682..7bd2540c27b4 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.12 2014/04/20 08:50:18 ago Exp $
+# $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 $
 
 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 )
+	udev? ( || ( >=sys-power/upower-0.9.20 sys-power/upower-pm-utils ) )
 	xscreensaver? ( || (
 		>=x11-misc/xscreensaver-5.26
 		gnome-extra/gnome-screensaver
diff --git a/xfce-base/xfce4-session/xfce4-session-4.11.0.ebuild b/xfce-base/xfce4-session/xfce4-session-4.11.0.ebuild
index 5eb87a51b1c3..ec9d1f472dcf 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.11.0.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.11.0.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.11.0.ebuild,v 1.2 2014/03/15 19:30:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.11.0.ebuild,v 1.3 2014/05/26 19:42:15 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 )
+	udev? ( || ( >=sys-power/upower-0.9.20 sys-power/upower-pm-utils ) )
 	xscreensaver? ( || (
 		>=x11-misc/xscreensaver-5.26
 		gnome-extra/gnome-screensaver
diff --git a/xfce-base/xfce4-settings/ChangeLog b/xfce-base/xfce4-settings/ChangeLog
index 11b680d47ccd..aa86fd1ae8b9 100644
--- a/xfce-base/xfce4-settings/ChangeLog
+++ b/xfce-base/xfce4-settings/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/xfce4-settings
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.119 2014/04/22 13:50:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.120 2014/05/26 19:44:23 ssuominen Exp $
+
+  26 May 2014; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-settings-4.11.2.ebuild:
+  Fix dependencies to allow sys-power/upower-pm-utils.
 
   22 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
   -xfce4-settings-4.10.0.ebuild:
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index ad921e68f6a8..c2c58980cc9b 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -4,17 +4,17 @@ Hash: SHA256
 DIST xfce4-settings-4.10.1.tar.bz2 777735 SHA256 118a6959ea50e3a533d7aa18ec5a878a47a30608b3ce9ce59a93c3888f4e13d5 SHA512 cf2d3255a0c862b0d016a8653fd1ba94c86b9da36b894dd7ad733d6758b9e023807aa93b1e43deeb0f6a34c6db23507f6fe32b6b7a98fa3e0d3bc7577da429f7 WHIRLPOOL 82f6e28e5d6519fc37c2265efc759054d7208fe38374acb07b40f281f7b802e47e5230a78066e7dac0727453ed14017abc8b0c6afd069eed1f164c607ff1f2ad
 DIST xfce4-settings-4.11.2.tar.bz2 869865 SHA256 2745fc11fe6e856344a6a7c1ae9c12e1f0f21cc6d56c5a46bd16987a7e10081f SHA512 677633cc6c965b85092662a3d2e38f1775d6af8d6b91a3e650eee394f96364216b9614a3a0af24b7848857108b0d42b3cecfc2770e9759e0803b3a32e05db362 WHIRLPOOL cdfd5a2ba217afda5a091f9350f01cc2295ef955c8dcd0bdb25fb1f819a8767a0ed0e44227eb95566dc3f1e575237efa0c4fbc291e248842a23b0a9a65781bb1
 EBUILD xfce4-settings-4.10.1.ebuild 1419 SHA256 efe4385a1b5cdbd574454280736f274005b2be13dc89d814043274e027bbb14e SHA512 a9a22e04566405d987199fbf8855854e6022dbc60698d8ab3a72966b681fdf70b4e0df562719b2ea2d9e6cb71ff9ba013d269734bf0af1e61cbc3542b1d62083 WHIRLPOOL e5acf5ac8f8587ea4d34023bbda1afc7123305d4c9f0ff8f188cfa181269ed571c93053bc267af8c761f4bf29d544920e626e26bc0bc0a59416855f7ad51cc44
-EBUILD xfce4-settings-4.11.2.ebuild 1507 SHA256 27e77c113ddd4aed6cbd709e653eb845feb04913234e6ebfa90dbe0ad5342a52 SHA512 f4d6a55631f49c4f905c0e574dd3118d5b60cb8f04332a2fb32cda812b00a471bbff4820c7671ee64fd4f9e1e8e138a05a43b5372c786f26ff1381f9826319a0 WHIRLPOOL d47e28ac703e211c9376147d9daeeb46d05b9392fcf81d9e7a5b908bc675b6e156d4d63dba1761877b4f016d6acca7fe6688d6a1700947903db49c31eef882a3
-MISC ChangeLog 15461 SHA256 cdb7fb4d346a68c6e76ea9947e349904884f81dfe3532de3eddb2ea001f4dfd8 SHA512 72ca408a026cf85db34780da952da20c98e1f752490641a3fa5584a80095b22ff83451354b901d574070ee123e69d43f2e8193b74ff16446683e83bf6a64f7db WHIRLPOOL 2b746f659bc24da2da865244e16fc9a278d32a03f9e3993c8294f1c91978b312ce71cce0082bb64253fe0a7ece19470b2e6710c161bdccb77766bfb236cfa7a3
+EBUILD xfce4-settings-4.11.2.ebuild 1540 SHA256 7e187425b8ab07c285ffc566ed3f0f29a15b277ae9902ab096be84de68cba929 SHA512 058d01c2c6c6a1770e84833a7bda21be14050096998f6d6946ebd1f2b3ce9cadd41045e9b8fb8f98d38ac89dee89ef26b207efcbc20de2d7d9e7e39720d0c7d6 WHIRLPOOL aa15691389e7691775cc1b741380911f23e2aff46a355aebe69eac28629ea17f0c11bff2a1005e93ae8498f20652cb6d2b8893dda5555bfb53056c1f9816d495
+MISC ChangeLog 15603 SHA256 17d1cfe88f2b2ac638948a14d820221c12ba08f9c31118fd7f64ae73ae6f0dbf SHA512 73d1d93052f48f280cd1fcda9df3c1400da5a4276f44913a471489e41b4dd911e4fd1055e3728548b7596c78314a0b85c3cd7c433751bd97328debcaf12c7bb3 WHIRLPOOL 210d94416699d51e012b731f25af7ec210b38ac711d2c188f6a1ac46c96ac5bab483e7cfd9a1ed11ddf27b22995d3d84f17430e6b0844154579d94ee1dc8e765
 MISC metadata.xml 391 SHA256 e12aab743d09d93de0374287e05add71330871ddafb70f9af31707241e1e2815 SHA512 61b5f4e2794713eda461738e970a8609eb357618bb260e4aa7c651a5e85680e128ad1aa2600af8cc100ebcfc493028bb8aedc09b860145b4b61fdc7dd1b5ce59 WHIRLPOOL a482a5c406cfd50f608dbaa9c4a58c60d0d0e8ab1ce07e82d9ef51c99145289e6a9b8cb1b8b419077683b08df5be6086236a069fff6527643c4be08126f7e79f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTVnOeAAoJEEdUh39IaPFNWSgH/ihWwHf1riAAI0gGdak4cn/T
-v/yrQEI3/2P45z93mxHa0k7qhh6IhqAvafA9SZbPAhxR3ZrXwEbdCPtrqNDg9Dpr
-alNTX/CxpodyZTKN6VcVUZh4n6P2zQK6mKNoIGSAYUx017v6jOw0C+AItnslXCyc
-MG5YUpK3KpAclhKCbR4/WHuGuGJ/BmYTi/SYkP7mg1wCQWlbyN3LMRN4FFU45dFV
-8Pr2G0oGbnWiMIjCefnKpoL/07IIexP8zXbQpf5zXTPzcf0aMinM1jjlLvpRV7mR
-DoZaZnkjVGTYM5quyD6Ji2/mHFQVZvTmdG7GVMCQI4PQri3xhkLvrz9QNsw3ykA=
-=0keQ
+iQEcBAEBCAAGBQJTg5k1AAoJEEdUh39IaPFNwkAH/3ncFCRN2OD96h4RBVzVoDHV
+LJTTZIe8FuGA5LwnGKS2KknIbsTN2H6f8R5RqxVfqfyhNa4GUiHyqPLwY4t285Gk
+ZRu9hg8oX/8ViocLdAUE78SzNBwyepIhvL670AZ0SIhVA5YJZ8K0nsXp0z4iBfNZ
+eNsi8EicQiW++mXaMrPihZ4M5iaQv8hiHAj9FL1h7YWopHbpx7exCw+h9UURj4HL
+RhywOMD85R2UCYzK1B/yGxb4Yk8zYBEvg3KJo1oPDm+X9tGq0ZLoSE1M3DeSKFri
+7EXvpbgW/m+S6LDNxcBIFl+3KLR0/ClQu6RSxYGVTj+hRWfUE6kM8i184Kk3EKk=
+=uVh1
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.11.2.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.11.2.ebuild
index 1c4a59badb75..7aa27dc07874 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.11.2.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.11.2.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-settings/xfce4-settings-4.11.2.ebuild,v 1.1 2014/03/11 15:11:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.11.2.ebuild,v 1.2 2014/05/26 19:44:23 ssuominen Exp $
 
 EAPI=5
 inherit xfconf
@@ -29,7 +29,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.100
 	>=xfce-base/xfconf-4.10
 	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
 	libnotify? ( >=x11-libs/libnotify-0.7 )
-	udev? ( >=sys-power/upower-0.9.8 )
+	udev? ( || ( >=sys-power/upower-0.9.8 sys-power/upower-pm-utils ) )
 	xklavier? ( >=x11-libs/libxklavier-5 )"
 DEPEND="${RDEPEND}
 	dev-util/intltool