old

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

7 files changed, 17 insertions, 490 deletions

diff --git a/xfce-extra/xfce4-power-manager/ChangeLog b/xfce-extra/xfce4-power-manager/ChangeLog
index d4f321e83e08..822dbae926fd 100644
--- a/xfce-extra/xfce4-power-manager/ChangeLog
+++ b/xfce-extra/xfce4-power-manager/ChangeLog
@@ -1,6 +1,13 @@
 # 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.86 2014/09/16 11:12:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/ChangeLog,v 1.87 2014/09/16 11:13:44 ssuominen Exp $
+
+  16 Sep 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -files/xfce4-power-manager-1.2.0-brightness_level_gint32.patch,
+  -files/xfce4-power-manager-1.2.0-prevent_crash_with_locale-en_GB.patch,
+  -xfce4-power-manager-1.2.0-r2.ebuild, -xfce4-power-manager-1.3.1.ebuild,
+  metadata.xml:
+  old
 
 *xfce4-power-manager-1.4.0 (16 Sep 2014)
 
diff --git a/xfce-extra/xfce4-power-manager/Manifest b/xfce-extra/xfce4-power-manager/Manifest
index 23bcc3abef57..2221c28ed9a1 100644
--- a/xfce-extra/xfce4-power-manager/Manifest
+++ b/xfce-extra/xfce4-power-manager/Manifest
@@ -1,28 +1,22 @@
 -----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
 AUX xfce4-power-manager-1.3.0-restore_brightness_level_after_sleep.patch 2393 SHA256 585d9e78b1475817d4692bdde9dc3141c79c44a7f20e7b952aebe0495038bf26 SHA512 785c3ace4fdd9617cc4f2a2038262697c328f348f8f12f3383196ee99d8a9c1021aaf481967f5da592fa632342fabcb7bd62e6751f6041afc27f26ae79a7c6f5 WHIRLPOOL 1c252a287ed79816429582018bf01c8b9f6094d3482fa3f16380ae3fa145bf538d73461f71eb3dde01cf053e0492add0ce94dbbfdd1f100db0618d41a1d516e8
 AUX xfce4-power-manager-1.4.0-fix-handle-lid-switch.patch 1044 SHA256 68e68f3a35d59b8e5af81034e240ca9a496abc9ab913daac87ddabfe8b964bbf SHA512 ba0b6c84f34ae9c8438f926b3b4c2961baf0b3fc746d9721abe4661aadb844f4d7532eec4de419c7f73dd3e7f4f93d350fb7f81623f2a3e5417449ce1f0c1942 WHIRLPOOL f4b79a8c699a81b53e20e3c902b039bcef1e6901f7b6112d1a865a04f835171125ab253e41635281dccbe94ef1151ba2ea85fa3d552654cc7abdd3c82d58dc16
-DIST xfce4-power-manager-1.2.0.tar.bz2 1034821 SHA256 d7fb98a540284b62f4201527de17d4b24123f9d26c9f49131dd497c8387184e9 SHA512 1ef800871510e7e2066f9d4637679917ca9d953eb4ef4775f781085103a433e4fb25ac389713aa8e478db5d27a81359be9049b63f5a110a9092246b07954f989 WHIRLPOOL e65a89dc2a5f7aafc48370043191e9c2abe6ac4e9a4654119194da9fcea0b6a0a9cc16c9beb576b5201e55d92b844741778d34ad6cc90feb4979cadaffd34005
 DIST xfce4-power-manager-1.3.0.tar.bz2 1207141 SHA256 05beaede28078a19a5a397d5d03e5c72fd6fbc57ce627ee6fd84630993b415e0 SHA512 bdffa36c1480a33531062b3f484c3488939089bdd78545147cfc917bd01023a480bbe417d8212ce6e415a2439c82e80863d23030273ff9fa87a8369c6b539b9f WHIRLPOOL 78c842aa6b3b1bb6fbc28386c470692d73e8d877674cc0982806dadcaf225834a016cdf480a583a49a3bd36ba04979aff19ec4a574ecf709f4a6424700cf356b
-DIST xfce4-power-manager-1.3.1.tar.bz2 1219387 SHA256 8726de7dc8d9ffae8669714aae77edf1002e9220d09d4ee6d340d551e0499467 SHA512 05bc35f8594761e380ffc8dcabb22f823b761cf0b858ec8b4de3b4eb64e94c93e3499f9afcc4bbf5efd69a563e6b2cc62f51c2def06351c6dd061163e47accc9 WHIRLPOOL b612553a57be0f064903ef44c9eacbddfbb4af970e56375c137d349d33534b0772fb6c1294cc0efe788bb43540e8303d5b8e178b3b3ad1d4c33ad6dc46bca76b
 DIST xfce4-power-manager-1.4.0.tar.bz2 1108569 SHA256 3fba9d1bdb2f535e5a5c2a832503368d26629d6fe496c547fa93a3278d2cf6e7 SHA512 3e05bbc2c6a2c20309d01be49998b1b868491da5666167f0f0e1d51fd261ada7dba4eb3a9a60a2631f5238f443c2cfe5630645aad64e04bbe99f98367deed815 WHIRLPOOL 0828e9f3ab4f7f33577493c2589eb297503b5955b019085dc1adbf4189bd0440ca5ffca36383ec8e413b13b25c84dc0d24715805955ed00cdd30588d6ae719ad
-EBUILD xfce4-power-manager-1.2.0-r2.ebuild 1850 SHA256 22ca2311fd9686594ea9fd92ecb8ae8fb1aa03cd52b2b8ce4353385a878368ed SHA512 7587b598f189212eb9c062878ae391d8597f7888953000ebdde63a1fa495c01a88f398624a2e9af889c98217481bedf46a82a7157dbe3acdafcd3f4107f80083 WHIRLPOOL f85809b2ef4acaccf4f5e2f0e75a31e3a4bb70052827d629006e5bb7f5e42a0f908093609d7a62bb8b20c0a3ea9fca39afb9855702aa7e28ff5da80a616df91c
 EBUILD xfce4-power-manager-1.3.0.ebuild 2508 SHA256 90ebf5678a6531308ed07ababcba24b4dc14cf91b15276217679568c7c12e8f1 SHA512 c185d5cf87795511a321cfc02f20ccc06e8e7e8dd07ad8df53243070cc962a7219638fda16f26561a8268a2829cee6eb95415c88b15e87129688ea2afcb3a57c WHIRLPOOL a2b18035171161bab7a7dcafe28e74fd4f6265978570866bb9dedd3ccb1a6b81cccbab9412b3f80a364aa5355bbefc9c88f21f6e421ffdf55c1e12ac032a7f32
-EBUILD xfce4-power-manager-1.3.1.ebuild 2453 SHA256 6af610086ef8d4c453f983bf853f51df471d89631c3645847affa6d91efd4061 SHA512 d17c9967b33c52bafa475becc0602a5dd7a7fe81eff7c4687240eeece4de56e238247a0947e0aa08652cd1a140ffae05e006dd4af3080b8fa8db02ff14556e55 WHIRLPOOL e9320a7aa5ab1390d79a9c799917818a2ba07df84bb19e1fc6a65e66dd237e27926cf3a9680933d6a67dcc31dc89d0a3a771c7c79084e3cb7989139c1580392a
 EBUILD xfce4-power-manager-1.4.0.ebuild 1862 SHA256 9eca65a39818044f3780c6deeacb7ebe330b8e98090d877836975db782ebf73f SHA512 6e1f1912e1cf138dbf9744001a6b5c3cf9e897dbcc8039d4125c9b9d55999e3d23c90086cd44ebf826ebff6c2fcf83de80c8fbbcf5725e168197fcea66668fdf WHIRLPOOL b136a23bbee04bfe65f6e5d8c67945d03f2d4339704bfbaff277d172591629d98930d3b9a165c5ce0471f72b638b52a2155fcf1f57ce854afad80f19cf0df050
-MISC ChangeLog 14496 SHA256 d39095d1955d37ce74bd756ed56501ced0b94c2e021ab24d63a5568ce8d66029 SHA512 c381be67f94ce0fb9986e1ac07ab41d97066ae2526c2fc5bc57f00863d9ad17c53408dd89720f915fc6b3fd30067360c681673d217191e8bb30970d510f7e65d WHIRLPOOL 3cc2167283d58f835df54b0f2dc8eb48641ca6ddfd5f28fe5d6d87725dbd90b0248ccb3048f8df870961794fa2c3161ef4d545eb7ba31a28c3eb2d5ce5b372a3
-MISC metadata.xml 428 SHA256 62769fb5be40bcf110fde5a8a9953c8daf5e3437f704a7ff2562c1a80ce4e1f2 SHA512 ab61f18c675992c2c433eed83e10e1059236ff98870fe56d8c73f0777ce20a6d4f9bfaefc6bd9c5d8485a41da2e9a630d9ed3445f24c7e942e36813deca449db WHIRLPOOL c804ae4b88811f57e2e738692d07cb69a2f993619358f0badf7c65309001a47de175dbfd40642dfe15ec90580036d49947faaf8fc7862b1333e6a3355a0d32bb
+MISC ChangeLog 14788 SHA256 16ee21d743ada7a275a33f87dacb05055a5794d7985e2496d81afc0174754bff SHA512 95bc727f199609a8d114589a64ce6d6c5e39cbdd2c0159feb9fec44dbdde79dbcc75cb63d8f669b95c67eaa8f82fa802044d8f619ae512eec9400d7b0d3bfd8f WHIRLPOOL 475e3b782a41795e0a7764d375dbd9cff33780a74fdde7c24b7853117d97151fd06d4f8b64011834b535e896ac2f7a6114a3cab0a99368f6712da236800ab701
+MISC metadata.xml 328 SHA256 f2c527a7d705dba4f89e8d4ee9e8753a1b02d76e807c543e0828cd552e36fa4a SHA512 3d2fb44a95a8f5efef609fd9055d79c1dabb6f83647671e7b41039ecaa96622878bf1d01fd23f563934668e3af22c7ae9e692789efcb7f81637b4e3fa1ea798d WHIRLPOOL 0080330bfccb679e920c1dd333433e33a27b2b52bb8a22cb341251e68e8e7ce108a040470eac9f57d3c9b28cae375cc533be1539ed025e6df9850709450a5bb5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUGBsBAAoJEEdUh39IaPFNIlIIAIZJU3Fqtt/DVWG8IsC+cxXU
-HtqMbLeAKNs9WKtO7ZXo9i/JWCg3d+HZMb3dhpN63K1/g9HVxl8UuxUhfUxT8z+Q
-O1FWs6Wjekr5/LQC8bWHVd9IF4QcQIbdL6DM3DCS1okblvlEGX3t/3CdJIBzdJER
-IOsbZoL+AaytRIS0cZU2VvN3CRarguz+NmH6onUa3rqznOW9IX4Cp4cBik2qS9Hf
-TEpaKSdeZ8T2sL87T7XHydiwLLSsfen9mZMxACjRGTyH9pYYKQf6LpVyPP2eDomh
-7HwWDOy8zbcPLI3Gqw2H6sEOtV1/8XYlrW9A8X1NWIOR38bGn51qA6GxC5k4XRU=
-=ZDJW
+iQEcBAEBCAAGBQJUGBtaAAoJEEdUh39IaPFN/PwIAJvPga6QJRpHisAa0E3gj5eC
+ll8usCDTQze9IImCwd23whn87hZA3WVOz8qyKUamn0dh+zljJsrBKToX0CFbpcqM
+mIfar+pi+EuryEDoFNL917NsY+yXID0nRlD2zQO78Hp7UrGiTPIO7IXlYPpgAuw8
+qsC0KXOyZt2afCN+i5Xx/GvqwGUqAJzUdQyCvWawZ84B9L0oPajcHwrVPlHAsxI9
+ge0EzJUOMq5ECwU0/00UD8JmmGtXNR6C3IdwAl4PQfxbTcwxIYUk5LVGLFZPFW17
+uNoWrYLPPKTpuIOkhrwhJnno5avLOjDN3kz6rRg+xWTtQuEJBbVzCoc5U4tZmeU=
+=/IG3
 -----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
deleted file mode 100644
index 5cb4fdb0b1c2..000000000000
--- a/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.2.0-brightness_level_gint32.patch
+++ /dev/null
@@ -1,306 +0,0 @@
-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/files/xfce4-power-manager-1.2.0-prevent_crash_with_locale-en_GB.patch b/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.2.0-prevent_crash_with_locale-en_GB.patch
deleted file mode 100644
index f43fe9d91c0c..000000000000
--- a/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.2.0-prevent_crash_with_locale-en_GB.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-http://bugs.gentoo.org/419973
-http://bugzilla.xfce.org/show_bug.cgi?id=8992
-
---- po/en_GB.po
-+++ po/en_GB.po
-@@ -549,7 +549,6 @@ msgid ""
- "%s until is fully charged."
- msgstr ""
--"%s\n"
--"Your %s is charging (%i%%)\n"
-+"%s (%i%%)\n"
- "%s until is fully charged."
- 
- #: ../src/xfpm-battery.c:232 ../src/xfpm-battery.c:268
-@@ -568,8 +567,7 @@ msgid ""
- "%s (%i%%)\n"
- "Estimated time left is %s."
- msgstr ""
--"%s\n"
--"Your %s is discharging (%i%%)\n"
-+"%s (%i%%)\n"
- "Estimated time left is %s."
- 
- #: ../src/xfpm-battery.c:250 ../src/xfpm-battery.c:271
diff --git a/xfce-extra/xfce4-power-manager/metadata.xml b/xfce-extra/xfce4-power-manager/metadata.xml
index c294065689cf..db7b902fbcd0 100644
--- a/xfce-extra/xfce4-power-manager/metadata.xml
+++ b/xfce-extra/xfce4-power-manager/metadata.xml
@@ -4,6 +4,5 @@
   <herd>xfce</herd>
   <use>
     <flag name='lxpanel'>Build the applet for <pkg>lxde-base/lxpanel</pkg>, you can set XFCE_PLUGINS="" if you don't want the Xfce dependencies.</flag>
-    <flag name='udisks'>Pull in <pkg>sys-fs/udisks:0</pkg> for spindown support (DEPRECATED)</flag>
   </use>
 </pkgmetadata>
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
deleted file mode 100644
index 5de41f755974..000000000000
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.2.0-r2.ebuild,v 1.8 2014/05/26 19:40:50 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 +xfce_plugins_brightness"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.24
-	|| ( <sys-power/upower-0.99 sys-power/upower-pm-utils )
-	>=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
-}
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.3.1.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.3.1.ebuild
deleted file mode 100644
index 464bee72ec8c..000000000000
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.3.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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.1.ebuild,v 1.1 2014/08/20 07:06:28 ssuominen Exp $
-
-EAPI=5
-inherit linux-info multilib 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 ~x86"
-IUSE="debug kernel_linux lxpanel networkmanager policykit systemd +xfce_plugins_battery +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-0.9.23-r2 )
-	>=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
-	lxpanel? ( lxde-base/lxpanel )
-	policykit? ( >=sys-auth/polkit-0.112 )
-	xfce_plugins_battery? ( >=xfce-base/xfce4-panel-4.10 )
-	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 )
-	!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() {
-	if use kernel_linux; then
-		CONFIG_CHECK="~TIMER_STATS"
-		linux-info_pkg_setup
-	fi
-
-	XFCONF=(
-		$(use_enable policykit polkit)
-		$(use_enable networkmanager network-manager)
-		$(use_enable lxpanel lxdepanel)
-		$(xfconf_use_debug)
-		)
-
-	# TODO: Split --disable-panel-plugins to two separate AC_ARG_ENABLEs
-	if ! use xfce_plugins_battery && ! use xfce_plugins_brightness; then
-		XFCONF+=( --disable-xfce4panel )
-	fi
-
-	DOCS=( AUTHORS NEWS README TODO )
-}
-
-src_install() {
-	xfconf_src_install
-
-	if ! use xfce_plugins_battery; then
-		rm -f \
-			"${ED}"/usr/$(get_libdir)/xfce4/panel/plugins/libxfce4battery.* \
-			"${ED}"/usr/share/xfce4/panel-plugins/xfce4-battery-plugin.desktop
-	fi
-
-	if ! use xfce_plugins_brightness; then
-		rm -f \
-			"${ED}"/usr/$(get_libdir)/xfce4/panel/plugins/libxfce4brightness.* \
-			"${ED}"/usr/share/xfce4/panel-plugins/xfce4-brightness-plugin.desktop
-	fi
-}