Restrict -r0 to old UPower and add -r1 for compability with UPower >= 0.99

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

5 files changed, 144 insertions, 12 deletions

diff --git a/xfce-base/xfce4-settings/ChangeLog b/xfce-base/xfce4-settings/ChangeLog
index aa86fd1ae8b9..912fa5789ff3 100644
--- a/xfce-base/xfce4-settings/ChangeLog
+++ b/xfce-base/xfce4-settings/ChangeLog
@@ -1,6 +1,14 @@
 # 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.120 2014/05/26 19:44:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.121 2014/05/31 19:13:04 ssuominen Exp $
+
+*xfce4-settings-4.11.2-r1 (31 May 2014)
+
+  31 May 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/xfce4-settings-4.11.2-upower-0.99.patch,
+  +xfce4-settings-4.11.2-r1.ebuild, xfce4-settings-4.10.1.ebuild,
+  xfce4-settings-4.11.2.ebuild:
+  Restrict -r0 to old UPower and add -r1 for compability with UPower >= 0.99
 
   26 May 2014; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-settings-4.11.2.ebuild:
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index c2c58980cc9b..f771f7786211 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,20 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX xfce4-settings-4.11.2-upower-0.99.patch 2630 SHA256 021876788c5076799dd1f9cf5208fccdec9eda6191d35184fc3895d7468158f3 SHA512 9c8a50c0ef155081d4b17486602ff125dfb0444eb07a32b1436e419a5b94a215151b47e57aaebee5db3044436078fc1a112effbb74d3ef175fa5c9109aab20c8 WHIRLPOOL efc357d5641d779f89cf353156699adcfbb9a822895d478a5f06a7b3fe681d1741b2706d6f81350ab04f801639a1b3de2ec0a011f681699ef1a081cb680e59a2
 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 1540 SHA256 7e187425b8ab07c285ffc566ed3f0f29a15b277ae9902ab096be84de68cba929 SHA512 058d01c2c6c6a1770e84833a7bda21be14050096998f6d6946ebd1f2b3ce9cadd41045e9b8fb8f98d38ac89dee89ef26b207efcbc20de2d7d9e7e39720d0c7d6 WHIRLPOOL aa15691389e7691775cc1b741380911f23e2aff46a355aebe69eac28629ea17f0c11bff2a1005e93ae8498f20652cb6d2b8893dda5555bfb53056c1f9816d495
-MISC ChangeLog 15603 SHA256 17d1cfe88f2b2ac638948a14d820221c12ba08f9c31118fd7f64ae73ae6f0dbf SHA512 73d1d93052f48f280cd1fcda9df3c1400da5a4276f44913a471489e41b4dd911e4fd1055e3728548b7596c78314a0b85c3cd7c433751bd97328debcaf12c7bb3 WHIRLPOOL 210d94416699d51e012b731f25af7ec210b38ac711d2c188f6a1ac46c96ac5bab483e7cfd9a1ed11ddf27b22995d3d84f17430e6b0844154579d94ee1dc8e765
+EBUILD xfce4-settings-4.11.2-r1.ebuild 1595 SHA256 10309ad3325e5ec5c260626598e7d76359b551bd7e9adfbfce6e9323995e70ad SHA512 d24a73f84d7eda906e440d79fae187994b0d0f3f69a47d1ec243fd9df150f8b1d84194cf93960eaf0f43a804f87659a1b5df0a69cb41bee92068c0e04af762c6 WHIRLPOOL c813248f35a2ecf5966dc5c9d242deb3add422c0d6e70eed95774882ca7b8e5d2493d0f184d88235cd321f8c3f98031adfbb9cee40b019e71b2f5e4351bc9b0b
+EBUILD xfce4-settings-4.11.2.ebuild 1538 SHA256 83418a5215dea9867919554fdf038c3d7721f4336f7b8d298efe6efec0391977 SHA512 0ab89fc88f0082bc7d701ab347143f995fc172f03d10f3b26d8b260c25fe1352e83e5be485adc94e84b58c460ab552b8e6dd49d3c82b217ede09a2f7df30f095 WHIRLPOOL f9a9b1339c41b34460270ff8562cf3ee380f438f96ec7a5a97d8960e6dad8cab519a1602f26663bdea427cba63087ef7a9b02b29e56c3e98a89992b15d364a4d
+MISC ChangeLog 15924 SHA256 48e1d11c7b57a52cad4a65d89d0edb080aba46d46eb9aba3765757b1813ac897 SHA512 d59c4fc4c5ccf90902c1a8ce70fea6feaa2b98974ab43e98b3438a23da523aee2f6eea176f6405fbf616c3d6ffebc934afae7760cc81d782b092641b3c1c5ed8 WHIRLPOOL 0670f3d2f42a1cff409a816424eadd59cdbd71de1a4ef1a2c9ec9933757c2d30702cd36cb6de338fd1679aa52982a707caf5e3fe7a39443b51ca8ea5fbf82e47
 MISC metadata.xml 391 SHA256 e12aab743d09d93de0374287e05add71330871ddafb70f9af31707241e1e2815 SHA512 61b5f4e2794713eda461738e970a8609eb357618bb260e4aa7c651a5e85680e128ad1aa2600af8cc100ebcfc493028bb8aedc09b860145b4b61fdc7dd1b5ce59 WHIRLPOOL a482a5c406cfd50f608dbaa9c4a58c60d0d0e8ab1ce07e82d9ef51c99145289e6a9b8cb1b8b419077683b08df5be6086236a069fff6527643c4be08126f7e79f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTg5k1AAoJEEdUh39IaPFNwkAH/3ncFCRN2OD96h4RBVzVoDHV
-LJTTZIe8FuGA5LwnGKS2KknIbsTN2H6f8R5RqxVfqfyhNa4GUiHyqPLwY4t285Gk
-ZRu9hg8oX/8ViocLdAUE78SzNBwyepIhvL670AZ0SIhVA5YJZ8K0nsXp0z4iBfNZ
-eNsi8EicQiW++mXaMrPihZ4M5iaQv8hiHAj9FL1h7YWopHbpx7exCw+h9UURj4HL
-RhywOMD85R2UCYzK1B/yGxb4Yk8zYBEvg3KJo1oPDm+X9tGq0ZLoSE1M3DeSKFri
-7EXvpbgW/m+S6LDNxcBIFl+3KLR0/ClQu6RSxYGVTj+hRWfUE6kM8i184Kk3EKk=
-=uVh1
+iQEcBAEBCAAGBQJTiilGAAoJEEdUh39IaPFNXGoIAJa9Q6UNHk9kmLWPb/aDN/t/
+WN5LRziaaSUvm/4PJpXBpA4YAJ9/1kFDd47g7Sckq8tyjygNun4UGc4ujNKlYt09
+L5j4LMPgI1o6Cf7jegH/ikrTH2jPfRhCpaFpE6+I7woqfcAEZIaoG6j5vFHOEC1Y
+51+q/Mmmb1q1EjKLCflxT3R6wQcoTHgfN1JQIzn2oHQj34O6YClrlODC4ZVl0EZ2
+rQF08MPtJ33+jlb1IOD4VMbfSMqaBXPjYs9fqRlwGAKMNG3sw3yI2D01hux33CVz
+Of28rM2uOB+1OPFHCrxZ5SsmSSxdTJi/7lgwmQ/V+D6FbzjLPsh32iDXlibLeEw=
+=rLeY
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/xfce4-settings/files/xfce4-settings-4.11.2-upower-0.99.patch b/xfce-base/xfce4-settings/files/xfce4-settings-4.11.2-upower-0.99.patch
new file mode 100644
index 000000000000..a1704ba4fb2a
--- /dev/null
+++ b/xfce-base/xfce4-settings/files/xfce4-settings-4.11.2-upower-0.99.patch
@@ -0,0 +1,69 @@
+http://bugzilla.xfce.org/show_bug.cgi?id=10918
+
+From 5247716c9105dc68a737757da5a2b260538945a9 Mon Sep 17 00:00:00 2001
+From: Eric Koegel <eric.koegel@gmail.com>
+Date: Wed, 28 May 2014 07:55:39 +0300
+Subject: [PATCH] Update for Upower 0.99
+
+Upower changed a singal handler.
+---
+ xfsettingsd/displays-upower.c | 21 ++++++++++++++++++++-
+ 1 file changed, 20 insertions(+), 1 deletion(-)
+
+diff --git a/xfsettingsd/displays-upower.c b/xfsettingsd/displays-upower.c
+index bbb3028..e1fab38 100644
+--- a/xfsettingsd/displays-upower.c
++++ b/xfsettingsd/displays-upower.c
+@@ -34,9 +34,15 @@
+ 
+ 
+ static void             xfce_displays_upower_dispose                        (GObject                 *object);
++
++#if UP_CHECK_VERSION(0, 99, 0)
+ static void             xfce_displays_upower_property_changed               (UpClient                *client,
++                                                                             GParamSpec              *pspec,
+                                                                              XfceDisplaysUPower      *upower);
+-
++#else
++static void             xfce_displays_upower_property_changed               (UpClient                *client,
++                                                                             XfceDisplaysUPower      *upower);
++#endif
+ 
+ 
+ struct _XfceDisplaysUPowerClass
+@@ -95,10 +101,17 @@ xfce_displays_upower_init (XfceDisplaysUPower *upower)
+ {
+     upower->client = up_client_new ();
+     upower->lid_is_closed = up_client_get_lid_is_closed (upower->client);
++#if UP_CHECK_VERSION(0, 99, 0)
++    upower->handler = g_signal_connect (G_OBJECT (upower->client),
++                                        "notify",
++                                        G_CALLBACK (xfce_displays_upower_property_changed),
++                                        upower);
++#else
+     upower->handler = g_signal_connect (G_OBJECT (upower->client),
+                                         "changed",
+                                         G_CALLBACK (xfce_displays_upower_property_changed),
+                                         upower);
++#endif
+ }
+ 
+ 
+@@ -122,8 +135,14 @@ xfce_displays_upower_dispose (GObject *object)
+ 
+ 
+ static void
++#if UP_CHECK_VERSION(0, 99, 0)
+ xfce_displays_upower_property_changed (UpClient           *client,
++                                       GParamSpec         *pspec,
+                                        XfceDisplaysUPower *upower)
++#else
++xfce_displays_upower_property_changed (UpClient           *client,
++                                       XfceDisplaysUPower *upower)
++#endif
+ {
+     gboolean lid_is_closed;
+ 
+-- 
+1.9.3
+
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.11.2-r1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.11.2-r1.ebuild
new file mode 100644
index 000000000000..c7030aaabc18
--- /dev/null
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.11.2-r1.ebuild
@@ -0,0 +1,53 @@
+# 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-r1.ebuild,v 1.1 2014/05/31 19:13:04 ssuominen Exp $
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Configuration system for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="debug libcanberra libnotify udev +xklavier"
+
+RDEPEND=">=dev-libs/dbus-glib-0.100
+	>=dev-libs/glib-2.24
+	media-libs/fontconfig
+	>=x11-libs/gtk+-2.20:2
+	x11-libs/libX11
+	>=x11-libs/libXcursor-1.1
+	>=x11-libs/libXi-1.3
+	>=x11-libs/libXrandr-1.2
+	>=xfce-base/garcon-0.2
+	>=xfce-base/exo-0.8
+	>=xfce-base/libxfce4ui-4.11
+	>=xfce-base/libxfce4util-4.11
+	>=xfce-base/xfconf-4.10
+	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+	udev? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
+	xklavier? ( >=x11-libs/libxklavier-5 )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+	>=x11-proto/inputproto-1.4
+	x11-proto/xproto"
+
+pkg_setup() {
+	PATCHES=( "${FILESDIR}"/${P}-upower-0.99.patch )
+
+	XFCONF=(
+		$(use_enable udev upower-glib)
+		$(use_enable libnotify)
+		$(use_enable xklavier libxklavier)
+		$(use_enable libcanberra sound-settings)
+		$(xfconf_use_debug)
+		)
+
+	DOCS=( AUTHORS ChangeLog NEWS TODO )
+}
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 7aa27dc07874..c12fea1f434f 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.2 2014/05/26 19:44:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.11.2.ebuild,v 1.3 2014/05/31 19:13:04 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 sys-power/upower-pm-utils ) )
+	udev? ( || ( <sys-power/upower-0.99 sys-power/upower-pm-utils ) )
 	xklavier? ( >=x11-libs/libxklavier-5 )"
 DEPEND="${RDEPEND}
 	dev-util/intltool