Version bump with a post-release patch for brightness level restore after sleep.

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

4 files changed, 149 insertions, 9 deletions

diff --git a/xfce-extra/xfce4-power-manager/ChangeLog b/xfce-extra/xfce4-power-manager/ChangeLog
index f0a7176f5c27..64b8f8b09ef8 100644
--- a/xfce-extra/xfce4-power-manager/ChangeLog
+++ b/xfce-extra/xfce4-power-manager/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for xfce-extra/xfce4-power-manager
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/ChangeLog,v 1.74 2014/05/27 11:34:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/ChangeLog,v 1.75 2014/06/02 16:28:26 ssuominen Exp $
+
+*xfce4-power-manager-1.3.0 (02 Jun 2014)
+
+  02 Jun 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/xfce4-power-manager-1.3.0-restore_brightness_level_after_sleep.patch,
+  +xfce4-power-manager-1.3.0.ebuild:
+  Version bump with a post-release patch for brightness level restore after
+  sleep.
 
   27 May 2014; Samuli Suominen <ssuominen@gentoo.org>
   -xfce4-power-manager-1.2.0_p20140511.ebuild:
diff --git a/xfce-extra/xfce4-power-manager/Manifest b/xfce-extra/xfce4-power-manager/Manifest
index 8bd670619aa7..e968e499e9ae 100644
--- a/xfce-extra/xfce4-power-manager/Manifest
+++ b/xfce-extra/xfce4-power-manager/Manifest
@@ -3,20 +3,23 @@ Hash: SHA256
 
 AUX xfce4-power-manager-1.2.0-brightness_level_gint32.patch 10778 SHA256 689751b6369fd8ade6337713283f5ef3dd40715bbbe69e4a8723c9cbe56e7465 SHA512 73d3a5a83f092bf4bddd7550728935905da8dcb37074151493178195ca79687437bdb91f0c23d44bae98abed65b94f1aab74aa4eabf702d333bd666a175a9a9d WHIRLPOOL d70deacd410573e925b0c1bf34cd414ef543cae78638325180135c5d44074b6e8bd00f8bba0e263f9e7ab45b5b0d799f588f3a2e040c111949634af960eafaf7
 AUX xfce4-power-manager-1.2.0-prevent_crash_with_locale-en_GB.patch 553 SHA256 1a4d924761de1af93e5cd2946bfd8c9cd05e27d4501acec04e7c212bbd68e0ee SHA512 b3dbfde6356b08ad1362ca85be27ee8fbafc2ab46926ff04ed22d5e762c3a07586b5d46dc4a75725c7709c6da4a8aed90387b59c72de76a46e3dd029eed20b0b WHIRLPOOL 1f9ca80b9af41ddd028172b063b7164b38442fcba4fc593614ede2af653db871662750f1d4d0d27cf8c1a30577d41ce1a41b25c21573390d89ca46de9fc29499
+AUX xfce4-power-manager-1.3.0-restore_brightness_level_after_sleep.patch 2393 SHA256 585d9e78b1475817d4692bdde9dc3141c79c44a7f20e7b952aebe0495038bf26 SHA512 785c3ace4fdd9617cc4f2a2038262697c328f348f8f12f3383196ee99d8a9c1021aaf481967f5da592fa632342fabcb7bd62e6751f6041afc27f26ae79a7c6f5 WHIRLPOOL 1c252a287ed79816429582018bf01c8b9f6094d3482fa3f16380ae3fa145bf538d73461f71eb3dde01cf053e0492add0ce94dbbfdd1f100db0618d41a1d516e8
 DIST xfce4-power-manager-1.2.0.tar.bz2 1034821 SHA256 d7fb98a540284b62f4201527de17d4b24123f9d26c9f49131dd497c8387184e9 SHA512 1ef800871510e7e2066f9d4637679917ca9d953eb4ef4775f781085103a433e4fb25ac389713aa8e478db5d27a81359be9049b63f5a110a9092246b07954f989 WHIRLPOOL e65a89dc2a5f7aafc48370043191e9c2abe6ac4e9a4654119194da9fcea0b6a0a9cc16c9beb576b5201e55d92b844741778d34ad6cc90feb4979cadaffd34005
 DIST xfce4-power-manager-1.2.0_p20140527.tar.xz 686540 SHA256 23cbc040d40da34b1306e816edb4bf04d8716f00f83d6edcefa197063cb6878c SHA512 819b0da9ecba0da5a03fdb65950f70114747c183d25c8a93b73a761773613729cc9f0d5b962aea074bf9789ac6218d0b6bb3ae86f29eb406e86908647a72f41c WHIRLPOOL 0030df10dfcf475b35f95625803c5af28e4f0dc8a3b5cb324967ab8c23c8d5f4fd2ff1c9735bcee924361e458ccd300f61e1fbbe51824b6ccc165bf78f931b3f
+DIST xfce4-power-manager-1.3.0.tar.bz2 1207141 SHA256 05beaede28078a19a5a397d5d03e5c72fd6fbc57ce627ee6fd84630993b415e0 SHA512 bdffa36c1480a33531062b3f484c3488939089bdd78545147cfc917bd01023a480bbe417d8212ce6e415a2439c82e80863d23030273ff9fa87a8369c6b539b9f WHIRLPOOL 78c842aa6b3b1bb6fbc28386c470692d73e8d877674cc0982806dadcaf225834a016cdf480a583a49a3bd36ba04979aff19ec4a574ecf709f4a6424700cf356b
 EBUILD xfce4-power-manager-1.2.0-r2.ebuild 1850 SHA256 22ca2311fd9686594ea9fd92ecb8ae8fb1aa03cd52b2b8ce4353385a878368ed SHA512 7587b598f189212eb9c062878ae391d8597f7888953000ebdde63a1fa495c01a88f398624a2e9af889c98217481bedf46a82a7157dbe3acdafcd3f4107f80083 WHIRLPOOL f85809b2ef4acaccf4f5e2f0e75a31e3a4bb70052827d629006e5bb7f5e42a0f908093609d7a62bb8b20c0a3ea9fca39afb9855702aa7e28ff5da80a616df91c
 EBUILD xfce4-power-manager-1.2.0_p20140527.ebuild 2066 SHA256 44d486d602eceeb4eaf8afb9cf0c9134608b57244e2feaf0df54b81905bc53e3 SHA512 7751857a2a77044f69ff1935af24a6d8531b5937753838d11effb19aa618e82b1e8b7fc359f855a1d65475ab5c4aa467f2a5d06c9737c890d3dd3b4e898aee73 WHIRLPOOL eb192bf72b0f8f3124dff351a531fe418d7006c0595be81df02992701261f1123ceffa7fecf04882235c8dde39e89dadd6654a348dd4db617a84bd493c7a450d
-MISC ChangeLog 12197 SHA256 bb8d4608d8bb542b08790ceb486d29124f79061cdc5af2c96171d945270030b0 SHA512 14e2ae539a0708b4289d30c768696864feae888ff063b28347f5aff54cb6843afe91ba3a9e3e750c5af764643e74cedf68d7667c60b10d6073d007f3948207ef WHIRLPOOL e279b5b302a30a46375fe681c4fa9ab1ccdf27ac065bc8ee16abe80ff256b898b2bf927953c5629a3ea88c99f49ae51d1d6bedb6598afe0a1f1131171445ab59
+EBUILD xfce4-power-manager-1.3.0.ebuild 1873 SHA256 9f0b9bd4ff01c14412bae06ea93b8889f212ed69058332056d77901ab96b94e3 SHA512 7482d1613b0288c6a25651affb4fbd9ea55600455ef6c51f7a568fb44948ba6bc1a9848daa8d38e81ceaf33f4b6cd15f9fc565f821638179467d3bf932cfbef7 WHIRLPOOL 2d0ea55c7f0f959d1a6a6fc8b6d4e55147585fef0151b71c615a857827d5dd07092ba2dad5ebb56a192a6a67643f01b95b0b4540a3eb89c819977434da5fe065
+MISC ChangeLog 12495 SHA256 5e593a25ed7e3e86106303901ffcd17ba4a5f355aba832a7fb03c7c6fa436e31 SHA512 683d90384678307bc36153859cadb0b6f292da6943c5545f13b8bd04d3debd0dff8ad25d1d58bd8bdbb14126cd9bce5179d8cbfcf2a2d9e782c253ed6764551e WHIRLPOOL d687b9d23f5ac2bf74d558910153623a5ae3ad4397fe7a9fe82f0db77fab4c6caf77fc1427a5b56e8a6b50b85e31f582e407bc07b27de2c02ba143140485a422
 MISC metadata.xml 261 SHA256 29b07a977816ace8a1fca4a9a2b5ef22ea916a33168a38eb3742a2d3ade8d1fd SHA512 5a25ecbeedb025295cfb507acd73eca8f6d1382b0a16edfef81c8e1b55e2a57bedcaf6aa1c22f20dbffd18d127ec04106b361c4408b7fac32d91e4455282e27f WHIRLPOOL 8124f081e1ec4fcc9c60af388ae8b9a08d1843c05f82ef6464af34fab24f99b07e031af3f881531190e35e716c40c89d8507883854bd081c931ea4d0291131bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJThHfTAAoJEEdUh39IaPFNjOsIAI4LSbRKqedrAn4poBmv9JAu
-Ni4RCWJrmRZAWzfllKR+2hQDecZPgw5XON9VycWXAeLb5HvJnuZBPLFbepQqahGW
-GgB0XHqSQT6dQ6ETLWfmFLqsHXgiH4ug3VlaFYCm2cOV6r+HjBDjqM7njDxAKX26
-YT8ziNekfEllTF2oJZVECTZDdQQiIcnDP6pnF9e17IsW6tqQpAG/GarqIoA3k8lV
-dxWnAyFbWhgHeZYn9yDQGiUQ5B4xP813Geb6jlvz/2aJAC5hHZCUggTpy6usyh04
-X9byVyJr80cLd1dhZgBNEQ3dEvrFGr88e8bv0h9aaCjc/jAqrKf2JzMMsm8Maaw=
-=KMJS
+iQEcBAEBCAAGBQJTjKWmAAoJEEdUh39IaPFNrscH/RXq9gDFqFmnS3GfOTtMAny6
+NKoH54BlI70ou46yOEHoTPucC68n6ITBBJeyKKBLvfhevREK6VQoT33KDQ/anAjw
+RvFUaqut66o9OSMVXhjIOszl1Lc0kdp5afqXWTePZMZLxeWHMyxOZvqTsM8eWPJJ
+SOXbUUwRYVU/bOyMFkgAs6awshM66sdgoPTmMr/YU6gupudZPK4Rhy6eGI5CsVbd
+E+iId0ZZADwMFnM3AFT4XNEnAx7Ut2m26iV0ExDu1oIxGNxNLwWcKkNLsbD6rOgL
+75n8wpYBH8ZPpHMCB9SmDQ4hZdeY+pacrmjxMXQYHn4a3jMpfCOQClsp9PFAQqA=
+=1pgv
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.3.0-restore_brightness_level_after_sleep.patch b/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.3.0-restore_brightness_level_after_sleep.patch
new file mode 100644
index 000000000000..7687ae4eb3c9
--- /dev/null
+++ b/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.3.0-restore_brightness_level_after_sleep.patch
@@ -0,0 +1,70 @@
+http://bugzilla.xfce.org/show_bug.cgi?id=10535
+
+From 4c14d83794b94ac18519806314464599d5e905f6 Mon Sep 17 00:00:00 2001
+From: Eric Koegel <eric.koegel@gmail.com>
+Date: Sat, 31 May 2014 20:09:56 +0300
+Subject: Restore screen power after sleep
+
+With this patch xfpm will cache the brightness level before going
+to sleep and set it back to that level after resuming from sleep.
+
+diff --git a/common/xfpm-brightness.c b/common/xfpm-brightness.c
+index e18c617..e49338e 100644
+--- a/common/xfpm-brightness.c
++++ b/common/xfpm-brightness.c
+@@ -382,7 +382,7 @@ xfpm_brightness_helper_get_level (XfpmBrightness *brg, gint32 *level)
+ }
+ 
+ static gboolean
+-xfpm_brightness_helper_set_level (XfpmBrightness *brg, gint level)
++xfpm_brightness_helper_set_level (XfpmBrightness *brg, gint32 level)
+ {
+     gboolean ret;
+     GError *error = NULL;
+diff --git a/src/xfpm-power.c b/src/xfpm-power.c
+index 9d98fab..b42210b 100644
+--- a/src/xfpm-power.c
++++ b/src/xfpm-power.c
+@@ -60,6 +60,7 @@
+ #include "egg-idletime.h"
+ #include "xfpm-systemd.h"
+ #include "xfpm-suspend.h"
++#include "xfpm-brightness.h"
+ 
+ 
+ static void xfpm_power_finalize     (GObject *object);
+@@ -312,6 +313,8 @@ xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force)
+ #ifdef WITH_NETWORK_MANAGER
+     gboolean network_manager_sleep;
+ #endif
++    XfpmBrightness *brightness;
++    gint32 brightness_level;
+ 
+     if ( power->priv->inhibited && force == FALSE)
+     {
+@@ -344,6 +347,10 @@ xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force)
+ #endif
+ 
+     g_signal_emit (G_OBJECT (power), signals [SLEEPING], 0);
++    /* Get the current brightness level so we can use it after we suspend */
++    brightness = xfpm_brightness_new();
++    xfpm_brightness_setup (brightness);
++    xfpm_brightness_get_level (brightness, &brightness_level);
+ 
+ #ifdef WITH_NETWORK_MANAGER
+     g_object_get (G_OBJECT (power->priv->conf),
+@@ -429,6 +436,11 @@ xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force)
+     }
+ 
+     g_signal_emit (G_OBJECT (power), signals [WAKING_UP], 0);
++    /* Check/update any changes while we slept */
++    xfpm_power_get_properties (power);
++    /* Restore the brightness level from before we suspended */
++    xfpm_brightness_set_level (brightness, brightness_level);
++
+ #ifdef WITH_NETWORK_MANAGER
+     if ( network_manager_sleep )
+     {
+-- 
+cgit v0.10.1
+
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.3.0.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.3.0.ebuild
new file mode 100644
index 000000000000..d15434927a44
--- /dev/null
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.3.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.3.0.ebuild,v 1.1 2014/06/02 16:28:26 ssuominen Exp $
+
+EAPI=5
+inherit flag-o-matic linux-info xfconf
+
+DESCRIPTION="Power manager for the Xfce desktop environment"
+HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-power-manager"
+SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="debug kernel_linux networkmanager policykit +udisks systemd +xfce_plugins_brightness"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.100.2
+	>=dev-libs/glib-2.30
+	>=sys-apps/dbus-1.6.18
+	|| ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils )
+	>=x11-libs/gtk+-2.24:2
+	>=x11-libs/libnotify-0.7
+	x11-libs/libX11
+	>=x11-libs/libXrandr-1.2
+	x11-libs/libXext
+	>=xfce-base/xfconf-4.10
+	>=xfce-base/libxfce4ui-4.10
+	>=xfce-base/libxfce4util-4.10
+	policykit? ( >=sys-auth/polkit-0.112 )
+	xfce_plugins_brightness? ( >=xfce-base/xfce4-panel-4.10 )"
+# USE="systemd" is for ensuring hibernate/suspend works by enforcing correct runtime -only dependencies
+RDEPEND="${COMMON_DEPEND}
+	networkmanager? ( net-misc/networkmanager )
+	udisks? ( sys-fs/udisks:0 )
+	!systemd? ( || ( sys-power/pm-utils sys-power/upower-pm-utils ) )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xproto"
+
+pkg_setup() {
+	PATCHES=( "${FILESDIR}"/${P}-restore_brightness_level_after_sleep.patch )
+
+	if use kernel_linux; then
+		CONFIG_CHECK="~TIMER_STATS"
+		linux-info_pkg_setup
+	fi
+
+	XFCONF=(
+		$(use_enable policykit polkit)
+		--enable-dpms
+		$(use_enable networkmanager network-manager)
+		$(use_enable xfce_plugins_brightness panel-plugins)
+		$(xfconf_use_debug)
+		)
+
+	DOCS=( AUTHORS NEWS README TODO )
+}