Allow falling back to sys-power/upower-pm-utils.

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

7 files changed, 31 insertions, 32 deletions

diff --git a/lxde-base/lxsession/ChangeLog b/lxde-base/lxsession/ChangeLog
index 735de9891b90..6491265b368f 100644
--- a/lxde-base/lxsession/ChangeLog
+++ b/lxde-base/lxsession/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for lxde-base/lxsession
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/ChangeLog,v 1.58 2014/03/13 20:10:19 nullishzero Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/ChangeLog,v 1.59 2014/05/31 22:20:19 ssuominen Exp $
+
+  31 May 2014; Samuli Suominen <ssuominen@gentoo.org> lxsession-0.4.6.1.ebuild,
+  lxsession-0.4.9.2-r1.ebuild, lxsession-0.4.9.2-r2.ebuild,
+  lxsession-0.4.9.2-r3.ebuild, lxsession-0.4.9.2.ebuild:
+  Allow falling back to sys-power/upower-pm-utils.
 
   13 Mar 2014; Pavel Kazakov <nullishzero@gentoo.org>
   lxsession-0.4.9.2-r2.ebuild, lxsession-0.4.9.2-r3.ebuild:
diff --git a/lxde-base/lxsession/Manifest b/lxde-base/lxsession/Manifest
index b86cabb0f136..27bc640de2a2 100644
--- a/lxde-base/lxsession/Manifest
+++ b/lxde-base/lxsession/Manifest
@@ -6,27 +6,21 @@ AUX lxsession-0.4.9.2-fix-logind-dbus-calls.patch 3033 SHA256 ed66db0e2c622d71a6
 AUX lxsession-0.4.9.2-makefile.patch 462 SHA256 d7683ed44e93d65d06c07852116efb10af24ba831119aba33c6853901eeeab32 SHA512 7343a6c1413246c76e6be52c9abe99d50753e3f894838d2ea4928973e0a76d7e03aff0d97a8288ed67ad43568b06fdd676968a5d13d8d5d198da7efaa571507d WHIRLPOOL 93d27e7499c53371a6e668faa726403ca8268f6a279efc26b96f2d786e15c3ab7988b700afbc8c209fe7850af528c87d1b58ea61542608ee8dd4b8d5cb23b46c
 DIST lxsession-0.4.6.1.tar.gz 407100 SHA256 bd6a7ef3c0ba4b9eedf3c58624dbce8bbbba3b179abbc552bf10c2830eec3ee1 SHA512 eea554ba70b3fd278b7ce0bb2d278241dff26eaccf74f2a4a0a9846515688fd5dd846c97f29c71139a0c3b95bc5e906efc4673f0cd79d8db427894dff5524f16 WHIRLPOOL 235d6c2e8a622a4460d767d5b6af22710f17060fffea18ac5cedaeb4dc9f70dc77872d486caa9d7256c379f160755ac7b8299e7836fd513675b65d1c979b900a
 DIST lxsession-0.4.9.2.tar.gz 745637 SHA256 eff03e573b561cabe81c5d015d825e3d998e98d6621040113d7df471c8b9cfb4 SHA512 cffcd15faab79ad165f969edf65b6b106c5b4405b78e6c102a74ab96da9cf61b781d0be7587849ce56672ae3015e8f63bc1b84465f5ec0084c299ec588992172 WHIRLPOOL 5a5c172cda30a4690d82a4a8acd3b983cbcc60ed71fefdfbfbb97e8b4363f4c26825267a0bd45c71589c2dd180f9699a2d05dd759fe23bcfdd5e9d3a10ccdda2
-EBUILD lxsession-0.4.6.1.ebuild 1032 SHA256 f4b370644992af47a61562c1fc0007f7d0e543a3b3f32f23916a63aa90bb6cca SHA512 4fef19b4509d19fd4d40331a34ae374ea1c56f9d0f69f665334b60ec060e9855006408dafaabf908a916afb1457bbc88f174f380d32dfe8283105842819ee9a1 WHIRLPOOL 95fdc47d78bf0f3341003add98fcd9811c594523fa4278685dceb01b7411eafcd02c4eed46cfea7ed5593ae5c3f35eea64fd88872771b27a156a510249543190
-EBUILD lxsession-0.4.9.2-r1.ebuild 1257 SHA256 8b6c9e7dd798253d600ef6368a135901113153033f567d4605fb08b356c51ea0 SHA512 7e8bce19019d75d0163c5c3daa5d02042526ff1b07f79a9dd6069ee4c94cbeaf0e87631f53572aef0706db168c98247ae0fe9c6745cb199d1ab41af4a029c9ed WHIRLPOOL 73ea6c205618bf0fdee9e5b47474b9aaecc33b4271285d4ea758fb7eadba7684bc9dd94f1e033bea28c7def1bb1e3be59d271d69ebd0bbd403457860882a9bce
-EBUILD lxsession-0.4.9.2-r2.ebuild 1328 SHA256 6f15de0d77ef380c38c022e4ede84bc6008f68302359a2bbba406f01e25b87e2 SHA512 a716ddc7f961e50b2c79c0fe70e28765a34b6bbabd83ffed881fda64a3775952ca7a66646c903df9ac6dee8be9bac7db9816add03f1a463f8d8560eb1f1a3727 WHIRLPOOL 5bf96e7731b18411a85a3fffdb541305f90ef1ffadaf498e00a2f103043ff515b0e575700e7e542238c734b46011995ed06fc83c361c5eb83f7e853de0ebf08b
-EBUILD lxsession-0.4.9.2-r3.ebuild 1399 SHA256 8ed55e32700b389d7c8cf79bb390ef01964fa4d1b1bb088c47cceed129c9e0b9 SHA512 05425c937f9f7129ddf48b989e246250fc13b273d685961f077feb2ed68e6ac8be32a766203bf65aa266744a3ea4f77773f6bf3aa18483cf8e17272caa5baf86 WHIRLPOOL 75f37344767e5a01a67a4139f00ff9f42e3044ec29346523e8e0e755437313f1e257a4287acc5eeb100bf6d46d63e5c601acbd672d9844faf9a977de8b1c5142
-EBUILD lxsession-0.4.9.2.ebuild 1244 SHA256 cb8262bb3e0a68c0b1a8dee7a16de2a2074135cfe8c59cfdb817c145878db91e SHA512 8538d6744e7f9f525eb54e5750cbe385a6ad5e365f428c2ebb83d46ad320b6f5f8b8c41e7f7b0b8ff9effa75dca9f5c7e4ff73d7f39ce50e0ccbc9a9b2500113 WHIRLPOOL 5dd4be4caec517db7357c98a05aa4b7a88eef0cfb8e374e841b55b13a1f37f087e6397a5c66d081a2a45f773d9a9e31c9591a78cf78663554ca9ca590d161cf4
-MISC ChangeLog 8051 SHA256 5acbc93c4ff71591bcd1719043260308feae38616bd59066958319c2ff3b6e70 SHA512 ebe02577d9720323e8293d6bd4e0575da955042084cc17f40f879038ec9f3efecdb1b730c8d328fd17d48389881806fbdb434277ac30e88ae7ee2e955be38479 WHIRLPOOL 9bebce01a3f25e1d7b6c1313ad9f405845b394234d13af89377dd5efffd5ecc7a38364b4be53463162f5297ea7f0dc9b6ebe99cfe54c257698d222f3e8e4f1ae
+EBUILD lxsession-0.4.6.1.ebuild 1065 SHA256 8dd3e078c74df4b42c492f9a6bcf382cab58d6667721e079945db1bb24578ce9 SHA512 da41ca34d5d213f1b3e126e6715af7f26a475e71f93e9cccfa97d03d90524e6e4c06bcba8e64eb41bffc96e7348bbf0cd3b1e3ec761d3d6945ff8467caea0fd1 WHIRLPOOL 806410dec027840619647e4a07257946845b5c3b095a6728b448b5beff2e04d2bd4f741ad7c852b0f060d5727d222f13282b35d7b3e3145a0fc7a61fffcc895e
+EBUILD lxsession-0.4.9.2-r1.ebuild 1296 SHA256 1d32463df5e0699c22e78d7d6b312b22419efb2d02693913b42caa2318448ff5 SHA512 fa871daff22a2894f22a178d2af0923d53d6b681a89e25ed655c899fd495caf71f12d3d22cc31cf2d8a9df5bc050dad06c09faffb0058347813a08ba001e6b4f WHIRLPOOL 066165a6c4c75f1b3d5fe4ddeb765cfec7d868318ff9e3dede28eb0fd35b10407cbb565c5f648cca19759ecc7bb98f38339fa3faa00582158d1653950d686ceb
+EBUILD lxsession-0.4.9.2-r2.ebuild 1359 SHA256 43a13692184bf73f1c1552566bb203b6d246b75f05de5a16dd59a9c8681441db SHA512 8046ecb23b596d5edb139f9ed45e98a85859256e156533ce388244f66a8c3238cd517de86c3788322f415cf9b839bf0b2e3afe7bcc6c6168999fdfac4877d0b5 WHIRLPOOL 1fc00017006452311946350cd012437bd05364e437bb7cb2cc182731539061007c34d0458a2021535822f1fad67872d68f8149fdfef6887eb8b27bf3b2920d99
+EBUILD lxsession-0.4.9.2-r3.ebuild 1430 SHA256 01290d8407bdb9b75d65186eb6cbbf0d4ec7e2c5024e599bcd328fbf5e84db1c SHA512 17d97d8179e5cb4b72547eb162e305d2f8863d78cf74cee7f672858e2e395793834e9cf3540bd960005f9fad11b13cc59fdbffb74d423277a1bbabb94aed887f WHIRLPOOL 05ae952a4024516905a9eaa1b64c8ef9a8ba4d79ff00985b53ec86bf1825aad34955723e760cb411a3312725f5c2633d8996654c72967632920e148a45d00b5f
+EBUILD lxsession-0.4.9.2.ebuild 1275 SHA256 9f5c36ba1a003082474e7f668eb685263943c425400cdff93bfa4f4d04e5dcd0 SHA512 fb61782c43d6a30c5e1311bac46a72a4b3933c3280603007c21aafea087f58dd282c59dc8ed544495dfcc2ac112a395cf2ae2b47c10e8f44743f703862df7cd1 WHIRLPOOL e9ecb1c402d005684aa6ad5b0fab5650d06e432f31057e62c9fc583ec3e9ba0031947af702395e21c4a4b2476b478700a75714591201fb9f054400b95f61aa75
+MISC ChangeLog 8298 SHA256 cc23a73f9125b08f853fd2e1597342c3c0166567f4a23b26e42daf2802e3eeb5 SHA512 4f871aec89c49dba68c668287c55f24e11c142257c157bed133aa2b7525287c9183fa0fe8caabeaded0752ee94627ba20152558f31bca4503b24d2401a737ac6 WHIRLPOOL df996d07734880aaa0be2b353c590a0618563c75a3fe52811c07e5b3b2276ff458c2c85305907c8c685206cee36ba98435d10b6c605da8b34105a445794e1658
 MISC metadata.xml 273 SHA256 81ec974708665ad78687d951d92cc04365d3cc14e29f7bffe7b44a7feae00b0e SHA512 377b077e8df5d96050c07d631ad60535b28a307e40554ff8772e2baf1ac509caadb0a843f33a16ed98b677d547526b2045ee8b8d36ba1324f1b2d8c8be87d382 WHIRLPOOL a93a8996b05319db10902fa49ec30fa605c73e8e93bd6fe02ede29b3b08fa4786d9034729475935fa6b826486c72a7b3504a21255a1b68d2467fc45ab51f8c2c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTIhCsAAoJENb1ecI556suLlwP/jcmwOulHyGyUuyvZ4FvbiFz
-Lo4EE8G6M2b0Y23sJGkbM4dI7z8as9nM6vN4wCi47qdL3SJfrsHeTmO1HPjNUeJu
-jOcqoliBhbZ9Z2Z91aTFT3VNwbOa/LOtoBKcwYqiMP9pVvVwuLeXffRWfRbTCDsc
-CRhjxvf+jWJxTtK4Y3XOmW5cxoAPetE/HBj/O6aCUR2HdINjD5kDAPANxXXzetKD
-64RQcLwNaSS/jxZwOrYFOPtJogdiqYe9MlMV8k/N61unZceH3WB9tFmi9r4sG0IL
-Ho1nCOG2i8q6C65wvzjVvYND1dlFSixXuVg1B18rGz7PgSxhqAiN6swru2WUfO3E
-UOAuWtfDrNB8txPf0S2Qw0EPumDDnQZEoMV5M+1JPTEpkijp/nD1pTD8Bmt/9OsN
-j4bjRNWfuuObQNyyeS9u3JVPxtneV/ISEnQa91q2r2oAhH5Y4tO75CiUao+FTIe2
-mJb8WRJYOXfICbykJSDj0cbQndjjwxzDgagNosYE2aBB8Q1qfdVr0VhCvrtATFHL
-4lbn+y2frFlNF/Dqfp5jQKw21BnGR2OCHwaFFvvFnGuvvPj7vPWirtXP/CrBkYSA
-zmGkPMV9C+e6dE7f5IBBW98rF81SQymAFtjhAlVLxumlf/xyl+1ORE728+arbRbg
-Kgm6/n9HRzd8NvE9QrNg
-=Qg5h
+iQEcBAEBCAAGBQJTilUoAAoJEEdUh39IaPFNCRIIAJq+rvUQaQBILdPKIFQSzJGa
+id6Qk5WkE9yT1+Gst65Ys8/zW11UB34cCAO+uhyDbWRHQixXRA35mTVPa8jiNhc/
+Q+hJf4Mms1zyocFkwz357lrfdtWXj/xNFHvpTtS0oK+xb4vgasR1dcpFExhLWnCJ
+ZHPZEtEIx7+O1RpA8i+JVIHaynKJ3uFv/NQn8t9M9FBk/stJOUm0FYCmtYi2nDvA
+yE/PrYLFV0G8d55gsr49wHhbZdxb1lq3JSzhpyLU8wcq94QoGgUFgwfLfkYPKRL2
+Mf44mDJ3CaNSR2bk/9t92wrUzSKUTLtS4Jz6gN7yGuUABSa/iaqouFwySiil0Jo=
+=ydmz
 -----END PGP SIGNATURE-----
diff --git a/lxde-base/lxsession/lxsession-0.4.6.1.ebuild b/lxde-base/lxsession/lxsession-0.4.6.1.ebuild
index 744d36bbe516..235fc8726bfa 100644
--- a/lxde-base/lxsession/lxsession-0.4.6.1.ebuild
+++ b/lxde-base/lxsession/lxsession-0.4.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/lxsession-0.4.6.1.ebuild,v 1.8 2013/08/23 19:12:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/lxsession-0.4.6.1.ebuild,v 1.9 2014/05/31 22:20:19 ssuominen Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ COMMON_DEPEND="dev-libs/glib:2
 	x11-libs/libX11
 	dbus? ( sys-apps/dbus )"
 RDEPEND="${COMMON_DEPEND}
-	upower? ( sys-power/upower )"
+	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
 DEPEND="${COMMON_DEPEND}
 	dev-util/intltool
 	sys-devel/gettext
diff --git a/lxde-base/lxsession/lxsession-0.4.9.2-r1.ebuild b/lxde-base/lxsession/lxsession-0.4.9.2-r1.ebuild
index d0c424435896..31ea73801c3d 100644
--- a/lxde-base/lxsession/lxsession-0.4.9.2-r1.ebuild
+++ b/lxde-base/lxsession/lxsession-0.4.9.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/lxde-base/lxsession/lxsession-0.4.9.2-r1.ebuild,v 1.5 2014/01/14 15:33:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/lxsession-0.4.9.2-r1.ebuild,v 1.6 2014/05/31 22:20:19 ssuominen Exp $
 
 EAPI=5
 
@@ -30,7 +30,7 @@ COMMON_DEPEND="dev-libs/glib:2
 RDEPEND="${COMMON_DEPEND}
 	!lxde-base/lxsession-edit
 	sys-apps/lsb-release
-	upower? ( sys-power/upower )"
+	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
 DEPEND="${COMMON_DEPEND}
 	$(vala_depend)
 	dev-util/intltool
diff --git a/lxde-base/lxsession/lxsession-0.4.9.2-r2.ebuild b/lxde-base/lxsession/lxsession-0.4.9.2-r2.ebuild
index ff86575ab1e1..4c0bc7eb1c23 100644
--- a/lxde-base/lxsession/lxsession-0.4.9.2-r2.ebuild
+++ b/lxde-base/lxsession/lxsession-0.4.9.2-r2.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/lxde-base/lxsession/lxsession-0.4.9.2-r2.ebuild,v 1.2 2014/03/13 20:06:32 nullishzero Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/lxsession-0.4.9.2-r2.ebuild,v 1.3 2014/05/31 22:20:19 ssuominen Exp $
 
 EAPI=5
 
@@ -30,7 +30,7 @@ COMMON_DEPEND="dev-libs/glib:2
 RDEPEND="${COMMON_DEPEND}
 	!lxde-base/lxsession-edit
 	sys-apps/lsb-release
-	upower? ( sys-power/upower )"
+	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
 DEPEND="${COMMON_DEPEND}
 	$(vala_depend)
 	dev-util/intltool
diff --git a/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild b/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild
index d38a1e3f92dc..7f2655fdd333 100644
--- a/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild
+++ b/lxde-base/lxsession/lxsession-0.4.9.2-r3.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/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild,v 1.2 2014/03/13 20:06:32 nullishzero Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild,v 1.3 2014/05/31 22:20:19 ssuominen Exp $
 
 EAPI=5
 
@@ -30,7 +30,7 @@ COMMON_DEPEND="dev-libs/glib:2
 RDEPEND="${COMMON_DEPEND}
 	!lxde-base/lxsession-edit
 	sys-apps/lsb-release
-	upower? ( sys-power/upower )"
+	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
 DEPEND="${COMMON_DEPEND}
 	$(vala_depend)
 	dev-util/intltool
diff --git a/lxde-base/lxsession/lxsession-0.4.9.2.ebuild b/lxde-base/lxsession/lxsession-0.4.9.2.ebuild
index b8b90aaec85a..ceb13ed5f333 100644
--- a/lxde-base/lxsession/lxsession-0.4.9.2.ebuild
+++ b/lxde-base/lxsession/lxsession-0.4.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/lxsession-0.4.9.2.ebuild,v 1.6 2013/10/23 09:45:42 nullishzero Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/lxsession-0.4.9.2.ebuild,v 1.7 2014/05/31 22:20:19 ssuominen Exp $
 
 EAPI=5
 
@@ -29,7 +29,7 @@ COMMON_DEPEND="dev-libs/glib:2
 	sys-apps/dbus"
 RDEPEND="${COMMON_DEPEND}
 	!lxde-base/lxsession-edit
-	upower? ( sys-power/upower )"
+	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
 DEPEND="${COMMON_DEPEND}
 	$(vala_depend)
 	dev-util/intltool