Backport upstream patch for brightness level handling wrt #474092 by Christoph Junghans

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

4 files changed, 392 insertions, 11 deletions

diff --git a/xfce-extra/xfce4-power-manager/ChangeLog b/xfce-extra/xfce4-power-manager/ChangeLog
index 108c815140d2..49b2b26a61f7 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/ChangeLog,v 1.61 2012/11/28 12:19:07 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/ChangeLog,v 1.62 2013/07/24 04:34:29 ssuominen Exp $
+
+*xfce4-power-manager-1.2.0-r2 (24 Jul 2013)
+
+  24 Jul 2013; Samuli Suominen <ssuominen@gentoo.org>
+  +xfce4-power-manager-1.2.0-r2.ebuild,
+  +files/xfce4-power-manager-1.2.0-brightness_level_gint32.patch:
+  Backport upstream patch for brightness level handling wrt #474092 by
+  Christoph Junghans
 
   28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-power-manager-1.2.0-r1.ebuild:
diff --git a/xfce-extra/xfce4-power-manager/Manifest b/xfce-extra/xfce4-power-manager/Manifest
index 1dedec89c610..adec4ccf9021 100644
--- a/xfce-extra/xfce4-power-manager/Manifest
+++ b/xfce-extra/xfce4-power-manager/Manifest
@@ -1,19 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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
 DIST xfce4-power-manager-1.2.0.tar.bz2 1034821 SHA256 d7fb98a540284b62f4201527de17d4b24123f9d26c9f49131dd497c8387184e9 SHA512 1ef800871510e7e2066f9d4637679917ca9d953eb4ef4775f781085103a433e4fb25ac389713aa8e478db5d27a81359be9049b63f5a110a9092246b07954f989 WHIRLPOOL e65a89dc2a5f7aafc48370043191e9c2abe6ac4e9a4654119194da9fcea0b6a0a9cc16c9beb576b5201e55d92b844741778d34ad6cc90feb4979cadaffd34005
 EBUILD xfce4-power-manager-1.2.0-r1.ebuild 1760 SHA256 8f02b23a431bf9f1ac85c545851d15b6483cf120aeba4ea38cbc4bbc472b8a99 SHA512 257b7e124cebe438bc7e9259ce1d83ec771a409793b7a16f8e14590b94b4f6ebfa9a23eabd4b030f25e679857a0da0324146bab27582f7e2c7602151a758a656 WHIRLPOOL 1eaaf5607f808f674b4d2b53299e2e81a15dcbbcdc7183e580d17bcaa57240bf5812bba56eba4ad1903eb9eb8a34d0dbb4630b1556ac9f861094500fb5b6ccbc
-MISC ChangeLog 9714 SHA256 f3d62e30099b229c0517d218c561bc79542c9b396526b40cfb2d8095e682b692 SHA512 e3f6421e7307bcd58a7feb267ecc266f79a76b4efb76af7f333f1dc270ea750355697a2af5f9d980768bb53fb4d818e81a5ca3ada643e67be9f3097609dd3e3f WHIRLPOOL 4e0b1915c677f954010c7ccecf8fe06af2b1435f3211a2850f03e92cb4666f3dd3afdab82dfe6b23dee315bebcf7b62ffbe0bf41309bb786a60f5591febc24c2
+EBUILD xfce4-power-manager-1.2.0-r2.ebuild 1819 SHA256 ebdfd1a2a22d9c18f803cdd6f29742d85cc1302c86b912f3b1c9b98f311cb16c SHA512 52e69f8afc24b702c3afaeb64a04cafb4c4abd76d17767ef01019decf638311e8b77baace339d6e29ae7e4749d44ea9f982a8560d2ee50acfa0f2e11d8fbb16f WHIRLPOOL ea76facefc83c160a04b48f38179c69f195658024337fa453c1c42e0328d576ea8d79eecadc5fe10bedf87d377fc4a87756413ea197e4a6d257a6d36fe73ff18
+MISC ChangeLog 10012 SHA256 178302f02eaa7553a6589a984919424522bd4a5e71d9d5784416e26997749e25 SHA512 71d60e44a5042a0dc7134fc2a35c633662925bfb9112ae53bd5c4a7a6d0bd71634331cbb2e41bf05cbcb0187b304f881be7b85407e0af4e48868d5ab42805680 WHIRLPOOL 6dc020dd86af06b3c457567b565a20e2d39687b0bcea55391858e09344a707c752fa8d7f9367aee8217a140be343189f65ceb12f3a169aa5c1221cfe42d9e3bb
 MISC metadata.xml 261 SHA256 29b07a977816ace8a1fca4a9a2b5ef22ea916a33168a38eb3742a2d3ade8d1fd SHA512 5a25ecbeedb025295cfb507acd73eca8f6d1382b0a16edfef81c8e1b55e2a57bedcaf6aa1c22f20dbffd18d127ec04106b361c4408b7fac32d91e4455282e27f WHIRLPOOL 8124f081e1ec4fcc9c60af388ae8b9a08d1843c05f82ef6464af34fab24f99b07e031af3f881531190e35e716c40c89d8507883854bd081c931ea4d0291131bb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQtgEGAAoJEEdUh39IaPFNksYIAJp78vphLkzFrPxwhObWUjAu
-6o7c9FTwvOqTLbOZOaZebijlgQKEYaKhcGrgZbj6i+BecWTHdy9FwIqOX9UZ2BlK
-mx9uT06slYhSCkzjLD3J24aeWx2ATUzEWVus8t4wg8NTcLGDFh7AiKBfEGNekNod
-Npr/9xTXuNC1HT4ZKhm5gnsK8S5jb1NWLmR5BhWB6vAkafIlfUMwILWlMO3Vly0r
-Cvo8BSCqxjs/+xGCWlYET4sg+4ALGeqjF8ZnIZJ5g9o7Se8VeinOqxPJO3qZgLsN
-8TFZWnboLw3GtXSi7gbhxJo7cniZo1/IvBkkRhgml0q+piTFu5BUtdC59p+sS4U=
-=CkJ1
+iQEcBAEBCAAGBQJR71knAAoJEEdUh39IaPFNvMUH/0788a2HosMCnoqR0l+gvJLN
+8FaacFJUAEgs51x82ASb6Kn+yoSnzcHqnHssqRTbf8hNBU7MT9zcOMO6R//Fldk4
+XlzabivF58BjaKGMMEAb9g9l6woHZWy7RybZ8HqMf7nVulNn+kjeLVOE5UPxzKi0
+NDUqUbSZ/Pv9y8moqlJ7YAU5ps9ONuRAYXqNOLNdK7xlZ3SSwcBRhx0iRCGXynAN
+2z3ZyrKieC6qKrNdA8+Kuw7tOhUGYe3EA8nEz5GAERA7EuGuQVn3ZN6GyDgglRr2
+I16HjP4KyhoOiN1qcSebrQMIKfPjuCkhtZFTrpJaOSmhGZzyvAZlxTNVxNnSvQ4=
+=1MUh
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.2.0-brightness_level_gint32.patch b/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.2.0-brightness_level_gint32.patch
new file mode 100644
index 000000000000..5cb4fdb0b1c2
--- /dev/null
+++ b/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.2.0-brightness_level_gint32.patch
@@ -0,0 +1,306 @@
+From 05d12e12596512f7a31d3cdb4845a69dc2d4c611 Mon Sep 17 00:00:00 2001
+From: Martin Matuska <martin@matuska.org>
+Date: Tue, 23 Jul 2013 09:27:41 +0000
+Subject: Change brightness level from glong to gint32
+
+The "Backlight" RandR property is a 32-bit integer. This means that the int32 (gint32) type should be used to represent brightness levels. The attached patch does nothing else than changing the brightness level representation from glong to gint32. This fixes the screen auto-dimming issue and brightness panel plugin issue.
+---
+diff --git a/common/xfpm-brightness.c b/common/xfpm-brightness.c
+index aa1ef33..f1524cb 100644
+--- a/common/xfpm-brightness.c
++++ b/common/xfpm-brightness.c
+@@ -92,11 +92,11 @@ out:
+ }
+ 
+ static gboolean
+-xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, long *current)
++xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, gint32 *current)
+ {
+     unsigned long nitems;
+     unsigned long bytes_after;
+-    long *prop;
++    gint32 *prop;
+     Atom actual_type;
+     int actual_format;
+     gboolean ret = FALSE;
+@@ -124,7 +124,7 @@ xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, l
+ }
+ 
+ static gboolean
+-xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, long level)
++xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, gint32 level)
+ {
+     gboolean ret = TRUE;
+ 
+@@ -137,7 +137,7 @@ xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, l
+     
+     if ( gdk_error_trap_pop () ) 
+     {
+-	    g_warning ("failed to XRRChangeOutputProperty for brightness %li", level);
++	    g_warning ("failed to XRRChangeOutputProperty for brightness %d", level);
+ 	    ret = FALSE;
+     }
+     
+@@ -225,11 +225,11 @@ xfpm_brightness_setup_xrandr (XfpmBrightness *brightness)
+ }
+ 
+ static gboolean
+-xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level)
++xfpm_brightness_xrand_up (XfpmBrightness *brightness, gint32 *new_level)
+ {
+-    long hw_level;
++    gint32 hw_level;
+     gboolean ret = FALSE;
+-    long set_level;
++    gint32 set_level;
+     
+     ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, &hw_level);
+     
+@@ -250,14 +250,14 @@ xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level)
+     
+     if ( !ret )
+     {
+-	g_warning ("xfpm_brightness_xrand_up failed for %li", set_level);
++	g_warning ("xfpm_brightness_xrand_up failed for %d", set_level);
+ 	return FALSE;
+     }
+ 	
+     /* Nothing changed in the hardware*/
+     if ( *new_level == hw_level )
+     {
+-	g_warning ("xfpm_brightness_xrand_up did not change the hw level to %li", set_level);
++	g_warning ("xfpm_brightness_xrand_up did not change the hw level to %d", set_level);
+ 	return FALSE;
+     }
+     
+@@ -265,11 +265,11 @@ xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level)
+ }
+ 
+ static gboolean
+-xfpm_brightness_xrand_down (XfpmBrightness *brightness, long *new_level)
++xfpm_brightness_xrand_down (XfpmBrightness *brightness, gint32 *new_level)
+ {
+-    long hw_level;
++    gint32 hw_level;
+     gboolean ret;
+-    long set_level;
++    gint32 set_level;
+     
+     ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, &hw_level);
+     
+@@ -290,14 +290,14 @@ xfpm_brightness_xrand_down (XfpmBrightness *brightness, long *new_level)
+     
+     if ( !ret )
+     {
+-	g_warning ("xfpm_brightness_xrand_down failed for %li", set_level);
++	g_warning ("xfpm_brightness_xrand_down failed for %d", set_level);
+ 	return FALSE;
+     }
+     
+     /* Nothing changed in the hardware*/
+     if ( *new_level == hw_level )
+     {
+-	g_warning ("xfpm_brightness_xrand_down did not change the hw level to %li", set_level);
++	g_warning ("xfpm_brightness_xrand_down did not change the hw level to %d", set_level);
+ 	return FALSE;
+     }
+     
+@@ -361,7 +361,7 @@ xfpm_brightness_setup_helper (XfpmBrightness *brightness)
+ }
+ 
+ static gboolean
+-xfpm_brightness_helper_get_level (XfpmBrightness *brg, glong *level)
++xfpm_brightness_helper_get_level (XfpmBrightness *brg, gint32 *level)
+ {
+     int ret;
+ 
+@@ -406,11 +406,11 @@ out:
+ }
+ 
+ static gboolean
+-xfpm_brightness_helper_up (XfpmBrightness *brightness, glong *new_level)
++xfpm_brightness_helper_up (XfpmBrightness *brightness, gint32 *new_level)
+ {
+-    glong hw_level;
++    gint32 hw_level;
+     gboolean ret = FALSE;
+-    gint set_level;
++    gint32 set_level;
+     
+     ret = xfpm_brightness_helper_get_level (brightness, &hw_level);
+     
+@@ -446,11 +446,11 @@ xfpm_brightness_helper_up (XfpmBrightness *brightness, glong *new_level)
+ }
+ 
+ static gboolean
+-xfpm_brightness_helper_down (XfpmBrightness *brightness, glong *new_level)
++xfpm_brightness_helper_down (XfpmBrightness *brightness, gint32 *new_level)
+ {
+-    glong hw_level;
++    gint32 hw_level;
+     gboolean ret;
+-    gint set_level;
++    gint32 set_level;
+     
+     ret = xfpm_brightness_helper_get_level (brightness, &hw_level);
+     
+@@ -572,7 +572,7 @@ xfpm_brightness_setup (XfpmBrightness *brightness)
+     return FALSE;
+ }
+ 
+-gboolean xfpm_brightness_up (XfpmBrightness *brightness, glong *new_level)
++gboolean xfpm_brightness_up (XfpmBrightness *brightness, gint32 *new_level)
+ {
+     gboolean ret = FALSE;
+     
+@@ -589,7 +589,7 @@ gboolean xfpm_brightness_up (XfpmBrightness *brightness, glong *new_level)
+     return ret;
+ }
+ 
+-gboolean xfpm_brightness_down (XfpmBrightness *brightness, glong *new_level)
++gboolean xfpm_brightness_down (XfpmBrightness *brightness, gint32 *new_level)
+ {
+     gboolean ret = FALSE;
+     
+@@ -618,7 +618,7 @@ gint xfpm_brightness_get_max_level (XfpmBrightness *brightness)
+     return brightness->priv->max_level;
+ }
+ 
+-gboolean xfpm_brightness_get_level	(XfpmBrightness *brightness, glong *level)
++gboolean xfpm_brightness_get_level	(XfpmBrightness *brightness, gint32 *level)
+ {
+     gboolean ret = FALSE;
+     
+@@ -632,7 +632,7 @@ gboolean xfpm_brightness_get_level	(XfpmBrightness *brightness, glong *level)
+     return ret;
+ }
+ 
+-gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, glong level)
++gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, gint32 level)
+ {
+     gboolean ret = FALSE;
+     
+diff --git a/common/xfpm-brightness.h b/common/xfpm-brightness.h
+index 0c4e3ed..26b3dbe 100644
+--- a/common/xfpm-brightness.h
++++ b/common/xfpm-brightness.h
+@@ -51,20 +51,20 @@ XfpmBrightness       	       *xfpm_brightness_new             (void);
+ gboolean			xfpm_brightness_setup 		(XfpmBrightness *brightness);
+ 
+ gboolean			xfpm_brightness_up		(XfpmBrightness *brightness,
+-								 glong *new_level);
++								 gint32 *new_level);
+ 
+ gboolean			xfpm_brightness_down		(XfpmBrightness *brightness,
+-								 glong *new_level);
++								 gint32 *new_level);
+ 
+ gboolean			xfpm_brightness_has_hw 		(XfpmBrightness *brightness);
+ 
+ gint 				xfpm_brightness_get_max_level   (XfpmBrightness *brightness);
+ 
+ gboolean			xfpm_brightness_get_level	(XfpmBrightness *brightness,
+-								 glong *level);
++								 gint32 *level);
+ 
+ gboolean			xfpm_brightness_set_level	(XfpmBrightness *brightness,
+-								 glong level);
++								 gint32 level);
+ 
+ gboolean			xfpm_brightness_dim_down	(XfpmBrightness *brightness);
+ 
+diff --git a/panel-plugins/brightness/brightness-button.c b/panel-plugins/brightness/brightness-button.c
+index 6e60c29..bd466c9 100644
+--- a/panel-plugins/brightness/brightness-button.c
++++ b/panel-plugins/brightness/brightness-button.c
+@@ -186,7 +186,7 @@ static gboolean
+ brightness_button_popup_win (GtkWidget *widget, GdkEvent *ev, guint32 ev_time)
+ {
+     gint x, y;
+-    glong current_level = 0;
++    gint32 current_level = 0;
+     GdkDisplay *display;
+     GdkScreen *screen;
+     BrightnessButton *button;
+@@ -342,7 +342,7 @@ plus_clicked (GtkWidget *widget, BrightnessButton *button)
+ static void
+ range_value_changed (GtkWidget *widget, BrightnessButton *button)
+ {
+-    glong range_level, hw_level;
++    gint32 range_level, hw_level;
+     
+     range_level = (gint) gtk_range_get_value (GTK_RANGE (button->priv->range));
+     
+@@ -428,8 +428,8 @@ brightness_button_create_popup (BrightnessButton *button)
+ static void
+ brightness_button_up (BrightnessButton *button)
+ {
+-    glong level;
+-    glong max_level;
++    gint32 level;
++    gint32 max_level;
+     
+     xfpm_brightness_get_level (button->priv->brightness, &level);
+     max_level = xfpm_brightness_get_max_level (button->priv->brightness);
+@@ -443,7 +443,7 @@ brightness_button_up (BrightnessButton *button)
+ static void
+ brightness_button_down (BrightnessButton *button)
+ {
+-    glong level;
++    gint32 level;
+     xfpm_brightness_get_level (button->priv->brightness, &level);
+     
+     if ( level != 0 )
+diff --git a/src/xfpm-backlight.c b/src/xfpm-backlight.c
+index baeeb43..45c990f 100644
+--- a/src/xfpm-backlight.c
++++ b/src/xfpm-backlight.c
+@@ -63,8 +63,8 @@ struct XfpmBacklightPrivate
+     gboolean	    has_hw;
+     gboolean	    on_battery;
+     
+-    glong            last_level;
+-    glong 	    max_level;
++    gint32          last_level;
++    gint32 	    max_level;
+     
+     gboolean        dimmed;
+     gboolean	    block;
+@@ -79,7 +79,7 @@ xfpm_backlight_dim_brightness (XfpmBacklight *backlight)
+     
+     if (xfpm_power_get_mode (backlight->priv->power) == XFPM_POWER_MODE_NORMAL )
+     {
+-	glong dim_level;
++	gint32 dim_level;
+ 	
+ 	g_object_get (G_OBJECT (backlight->priv->conf),
+ 		      backlight->priv->on_battery ? BRIGHTNESS_LEVEL_ON_BATTERY : BRIGHTNESS_LEVEL_ON_AC, &dim_level,
+@@ -101,7 +101,7 @@ xfpm_backlight_dim_brightness (XfpmBacklight *backlight)
+ 	 **/
+ 	if (backlight->priv->last_level > dim_level)
+ 	{
+-	    XFPM_DEBUG ("Current brightness level before dimming : %li, new %li", backlight->priv->last_level, dim_level);
++	    XFPM_DEBUG ("Current brightness level before dimming : %d, new %d", backlight->priv->last_level, dim_level);
+ 	    backlight->priv->dimmed = xfpm_brightness_set_level (backlight->priv->brightness, dim_level);
+ 	}
+     }
+@@ -182,7 +182,7 @@ xfpm_backlight_reset_cb (EggIdletime *idle, XfpmBacklight *backlight)
+     {
+ 	if ( !backlight->priv->block)
+ 	{
+-	    XFPM_DEBUG ("Alarm reset, setting level to %li", backlight->priv->last_level);
++	    XFPM_DEBUG ("Alarm reset, setting level to %d", backlight->priv->last_level);
+ 	    xfpm_brightness_set_level (backlight->priv->brightness, backlight->priv->last_level);
+ 	}
+ 	backlight->priv->dimmed = FALSE;
+@@ -192,7 +192,7 @@ xfpm_backlight_reset_cb (EggIdletime *idle, XfpmBacklight *backlight)
+ static void
+ xfpm_backlight_button_pressed_cb (XfpmButton *button, XfpmButtonKey type, XfpmBacklight *backlight)
+ {
+-    glong level;
++    gint32 level;
+     gboolean ret = TRUE;
+     
+     gboolean enable_brightness, show_popup;
+--
+cgit v0.9.2
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0-r2.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0-r2.ebuild
new file mode 100644
index 000000000000..b551a59ca1c7
--- /dev/null
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 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.2.0-r2.ebuild,v 1.1 2013/07/24 04:34:29 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 ~ppc ~ppc64 ~x86"
+IUSE="debug kernel_linux networkmanager policykit +udisks +xfce_plugins_brightness"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
+	>=dev-libs/glib-2.24
+	>=sys-power/upower-0.9.16
+	>=x11-libs/gtk+-2.20: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.104-r1 )
+	xfce_plugins_brightness? ( >=xfce-base/xfce4-panel-4.10 )"
+RDEPEND="${COMMON_DEPEND}
+	networkmanager? ( net-misc/networkmanager )
+	udisks? ( sys-fs/udisks:0 )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xproto"
+
+pkg_setup() {
+	PATCHES=(
+		"${FILESDIR}"/${P}-prevent_crash_with_locale-en_GB.patch
+		"${FILESDIR}"/${P}-brightness_level_gint32.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 ChangeLog NEWS README TODO )
+}
+
+src_install() {
+	xfconf_src_install \
+		docdir=/usr/share/doc/${PF}/html \
+		imagesdir=/usr/share/doc/${PF}/html/images
+}