gentoo resync : 24.12.2018

4 files changed, 8 insertions, 8 deletions

diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 2cfeee788ab4..37d5e25314ad 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -4,7 +4,7 @@ AUX xfce4-session-4.13.0-add-edit-autostart-segv.patch 2511 BLAKE2B 028e1b05cd83
 AUX xfce4-session-4.13.1-kill-dbus-includes.patch 1279 BLAKE2B 3c446b5dcadc9f68dcfd9b2fd9d8ebd1b94e54fc6f3815ff7ee5d01f9be9fbefd1b2b269344bcff148a4c5199bb3dc58d4e1253450c541f4f996e6d4c55ad64d SHA512 8d5265737db4ade8fe59b7b051b741ca5b1a90a7d2abcdf5a48e658c04b3fc25f304555116009e58125662b243cf3dae1822c7ab387c7fe6ac6e0fb661b2d6b3
 DIST xfce4-session-4.12.1.tar.bz2 1289284 BLAKE2B 00af274ac1160a413c9e2c8b308dfc84248f0078e8c294528614bb642988468f9dadaae906b4a8e2179d2beef0a48ebf5e2eedcb2ed3ad7ea73a8f7a9b90e224 SHA512 d7f37dbff59acb316965ab2224674ac3b5b7cfd7262acd4426b582001cee313945acb8883be21553dd6d7a046934bbbe116f451e6d5fd35b6fa5444da94605df
 DIST xfce4-session-4.13.1.tar.bz2 1322823 BLAKE2B e50cc2628a068bed39d2aa6344eab7676e6464c84e3cf11d79518f78db54ea01316bd098a541b6f0897f3decbed2eb37e55009d4bf89d460e136d7a44d31c26a SHA512 5845e3591919e23ca176199e81075a097ef9d65cbcf23b34d84afc649a307bfa8c6492e3a01855cacff9328da809725213ec1fa9d76024c0a0c25cce3c51da1b
-EBUILD xfce4-session-4.12.1-r1.ebuild 1918 BLAKE2B f031e4d584bb86a02542543db6289d235e355f54bdafbb4b14b43198d683449be3ef1fa09a8425af8c5642dba7c7b0a91cb401d8a4d84a9fe95303cc3ee42c8e SHA512 5248448b59df99255762ee61dda50b487cbfae77d01c5bc41ea7e04e2211df99190f4f544d77d38c0db86e25ca7a5c7582d1915053b8da33d70c9e0a2f2a242f
-EBUILD xfce4-session-4.12.1-r2.ebuild 1888 BLAKE2B a84a4840c33d017527f8d01047a8d747eb59b5c07cb827b80a807015363302dc9d682b3bb0c84c262ba6232f13a9eb0644496bc8fb11b0434ea332988930f792 SHA512 9c376b4a8b9308b95274dd36f2d5edb238ba652810ff4ed659580df32beb491a6ead9feec844be5749b7fe0352ce9fc732e07cb8822e927d8ba58139f1cf8979
-EBUILD xfce4-session-4.13.1.ebuild 1912 BLAKE2B de6a89c260be73b8e01a98ab8737d8a53bbca0442c1d22d23d947fe914ec24f2635b6d1ce765fd6e8f8636f4de96e31707235fe0b285bc2fcc9efa39d686ba44 SHA512 5cf4fb7960a5ae8bcbf929d9e9a2599fa96d6441e240762929cc5e6392ebd2aae67aadc5d3a3777e74a6c312e5a8f1c44dd2e4d42728af072986a06a0239bb93
+EBUILD xfce4-session-4.12.1-r1.ebuild 1882 BLAKE2B 07829f94bc2ea104a95ab0eb3e631903331a0432ac030840fae8fd52f03383fa2356783fff7a4ad5f61d2348eb1f36322f0be16af5624714957f819cc3c5dfa6 SHA512 f00f579028cb83844fc4c8e53415e25b4dde5c10f9820fb57e3889069dbc5765c82e0e62360aa7f7d91a67b6d7d1a097dcbdb1c75130864d36b8b4cd4593d71b
+EBUILD xfce4-session-4.12.1-r2.ebuild 1850 BLAKE2B 41c4c7749498cad4abe017a71dfeccdb5281b44d19e84d7b35ac16ccd2ec74d9a41427fa319f7ab014c14aa8e8fad266609ceb5e76e85e630d31627d35201122 SHA512 4993036ea26110793eef9e904e921227b0e02806c1b9e0d93b9959af8d7cbeb65d230493a154b39db5827255963fcadcb6e218cce8d584ec314ffcc948de2ba8
+EBUILD xfce4-session-4.13.1.ebuild 1909 BLAKE2B d1563a305005e39aeb534e8460014b3a717d12fbc706cc61e2878ae99fbaee5d11321297175670c8d9d56342d63f757a9037f329da24c47bd3e840aca7011f37 SHA512 edf5c122ddc019c6ab842d05264be8eb27e1b69bce7d4261c21ff5a9bd4e655a93b86ec725d02d387622035e105f11322159a3248a0588a85505919aa5e3d6c1
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-session/xfce4-session-4.12.1-r1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.12.1-r1.ebuild
index 384a9d6c6bc2..c572b71ce575 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.12.1-r1.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.12.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,7 +25,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
 	!xfce-base/xfce-utils
 	!=xfce-base/libxfce4ui-4.12.0
 	policykit? ( >=sys-auth/polkit-0.102:= )
-	upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )"
+	upower? ( >=sys-power/upower-0.9.23 )"
 RDEPEND="${COMMON_DEPEND}
 	x11-apps/xrdb
 	nls? ( x11-misc/xdg-user-dirs )
diff --git a/xfce-base/xfce4-session/xfce4-session-4.12.1-r2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.12.1-r2.ebuild
index 3ebcdf8307f0..d1d259d55cc4 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.12.1-r2.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.12.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="nls policykit systemd upower +xscreensaver"
 
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
@@ -23,7 +23,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
 	>=xfce-base/libxfce4ui-4.12.1:=
 	>=xfce-base/xfconf-4.10:=
 	policykit? ( >=sys-auth/polkit-0.102:= )
-	upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )"
+	upower? ( >=sys-power/upower-0.9.23 )"
 RDEPEND="${COMMON_DEPEND}
 	x11-apps/xrdb
 	nls? ( x11-misc/xdg-user-dirs )
diff --git a/xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild
index d0df74cf881d..9f521606e782 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6