summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xfce-base/xfce4-session/ChangeLog6
-rw-r--r--xfce-base/xfce4-session/Manifest18
-rw-r--r--xfce-base/xfce4-session/xfce4-session-4.10.1-r2.ebuild4
3 files changed, 16 insertions, 12 deletions
diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index 56671f636109..156ff47c6646 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.223 2014/07/18 20:01:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.224 2014/07/18 20:28:02 ssuominen Exp $
+
+ 18 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
+ xfce4-session-4.10.1-r2.ebuild:
+ Fix UPower dependency for non-systemd users.
18 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
-xfce4-session-4.10.1-r1.ebuild:
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index d67a7ae84ebe..bb6bcdde6caa 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -6,18 +6,18 @@ AUX xfce4-session-4.10.1-systemd.patch 12922 SHA256 0e90469248180390ce7736a5621a
AUX xfce4-session-4.11.0-upower-0.99.0.patch 13446 SHA256 9cd7f57c00868fe1ac6847e737be4a0a3cf95ae4444e910c9072719e153d211b SHA512 479ff89bab77b521eadaa2bd1d7cfb5494df922bff7dc665e589e1faba0b8cc9a308762774315c471e834a3f732ab9d60df59137f58cbeefd063c9b751f503bd WHIRLPOOL a5d994b6cacadcefd7bf6f8ced2e9a19eaba4574cefba58e9b7d10a3af1bb37382d84691b2fcf0f93c659ab4e70d12dea9fa91e58bc85476be73ba4ce754e911
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-r2.ebuild 1905 SHA256 1561cfaae1de55c977bd0f4e058f1edb941c47db7ef7af7c73e883f96b2ce5ba SHA512 310c034a1b14324385fe569ee591d7905825f0a6321e9e4ed2d581ce14f9cd289053700cd15832eee6f6d9e2a6e8a1ddb91d71b5f5aaaee082307a7a0394eb03 WHIRLPOOL 06fec70975fb1a7a352f39f5e5e3f4dd8780c40e8b1c70e131df8464b394a67556941b1f0b94d22b4ebcda3e15b8ed7349575a973ef5e9acd0ab6ffaef9a5482
+EBUILD xfce4-session-4.10.1-r2.ebuild 1882 SHA256 d649f2c47e8c736e3dab1b3c26942880d7014d048836b04ff7eaf95f48e33b6d SHA512 45161f27c8b4328331408c988bb38b295c01a2d7df43b69f0df1a3c2407797eed151e10400427f7b81b3871771bc81b197f1e2cfb17c4927ce827d6fc3a2a1d9 WHIRLPOOL 3211a269ba79678c320335b80d77863eff24281f9222933659d875f94ab27e7ad4fd4d4ce465c6ba852152f8363119adc1b7667fd6b533544a10da77d4253ba7
EBUILD xfce4-session-4.11.0-r2.ebuild 1950 SHA256 38ebca7facd5c0678a31f905070c89991f6b3808ce2b927a22cbf7b0eac5cfa7 SHA512 aa86392cbd8441f9c89e0016469acb3d6b6879d924898452e72c5cc98d0bd88ac6f58c60dddfe4093cd0d4ef44005a70122d6039159ac9e1db6bc70b12225b6e WHIRLPOOL 5f80d043daa753a2b38f3d819ce258d8006318c4e78423e5762c3118c94a7b8d89ae918d960b7edef4945baff0fd1865888d0052319db717ea9a00bac0d9d756
-MISC ChangeLog 30787 SHA256 7897cc537dd6d48db04189ba357dc9ced846e8c1d38ca5bf5e8a7912f439cdee SHA512 e6257263d333b5354ba8f11ab873597ee8a56cddbcff813c59478fa483ac7c1fec2eadc8b68d8d9449bede305d10deec6cd565268ef77b08216a1044f30eefb0 WHIRLPOOL db57cc5cf2292625f17f53e2384260d39ff58066a3f982baa8e5223566ead65efba3cf3e6830ebe85bfb91d266c3d9cac3544b28c8407d5720f76c01d4643c0d
+MISC ChangeLog 30923 SHA256 2a1289f8a955230874e046d45888252c633e49323a6a8ce7db603669b71d8500 SHA512 d70a56880ccd29b949cf02df9b63c1822e6348c79ca77b527094e87c573193ced2ddccf80f6fccfe668dfb93c6ab1deb8c8711e1e6fcf04738b5750ed04a50e3 WHIRLPOOL 89f3747ffcfdb50bff10aa876a5509b047bfced0f722a66b9a824f31464ec0a655306e859cde2f23422bf7f640ad4431089c5834756d59f5405f7deccc12c8cc
MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQEcBAEBCAAGBQJTyX0rAAoJEEdUh39IaPFN8HkH/2lczd0CwA7GOnRfxCZXdmyv
-etfAswHthQ4wPC7kOSo1GNU6I94S/VWlvKOOXjOR/OyPOm6fT+mDp6CYVdsaPSJO
-bZxzYzkzeJ9AiHSEg9LMtgn46UyOk1uiauGoV0bd1mQAboHkkHCqXnmG2ZflVHsF
-VUpjvkmX0WMqaGbR5mmFYU+qSc3L4hpKrC0iVA8m9Oj5s9e7P2mfMke44P2r3r9K
-9aqjkjF6rIJRcpKFQgPa2iJOx8vy9pq31n/uyH5u3FI84LYz93Q9oqsRgKYV4zZO
-CvNo62gvBj01nZhCU7UdpQnp+2HrsLPBTEGOJz1h4JooUKImiUwZTSQqgVNCcJc=
-=liOI
+iQEcBAEBCAAGBQJTyYNIAAoJEEdUh39IaPFNPfkH/iAvTqaC5t1EEUFTdV3/hXhJ
+dOtBSyW21JZEf18+BOl5jiMqpauxsIXBX6cnzz4nFnBh+8v8vo85JMfzf/aBFcJJ
+qpATzLH+bjiq9ho1G9geSgS8AWfJ7J8G0eZPrpnYNNSM8EALI5JJfe2Nrsb4lMGW
+u4QO1B5kMMJi6LWutD/piVJxy2l1cw6iHqZVn9c+5hy5J7rZDHibZMkvX2NFDDPY
+c50hyLuXaY+tSeZL9yyIuzYjIZL7p+oNsbVKjNMF8P32nRcfkDIDD2Hc9yL8QWL6
+q1M+TsqIQUI5nSanJgxkNo9a7IwLjIuUAPh9B/TS+H+RnwaH3fvIuhtp1M+0d8M=
+=nNdJ
-----END PGP SIGNATURE-----
diff --git a/xfce-base/xfce4-session/xfce4-session-4.10.1-r2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.10.1-r2.ebuild
index 52210a10ca10..660987f75038 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.10.1-r2.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.10.1-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/xfce-base/xfce4-session/xfce4-session-4.10.1-r2.ebuild,v 1.9 2014/07/18 19:56:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.10.1-r2.ebuild,v 1.10 2014/07/18 20:28:02 ssuominen Exp $
EAPI=5
EAUTORECONF=1
@@ -30,7 +30,7 @@ RDEPEND="${COMMON_DEPEND}
nls? ( x11-misc/xdg-user-dirs )
udev? (
systemd? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
- !systemd? ( || ( <sys-power/upower-0.99 sys-power/upower-pm-utils ) )
+ !systemd? ( sys-power/upower-pm-utils )
)
xscreensaver? ( || (
>=x11-misc/xscreensaver-5.26