old

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

4 files changed, 14 insertions, 472 deletions

diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index 9cca80013396..986988676a8f 100644
--- a/xfce-base/xfce4-session/ChangeLog
+++ b/xfce-base/xfce4-session/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-base/xfce4-session
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.215 2014/07/08 13:58:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.216 2014/07/08 13:59:22 ssuominen Exp $
+
+  08 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -files/xfce4-session-4.11.0-upower-0.99.patch,
+  -xfce4-session-4.11.0-r1.ebuild:
+  old
 
 *xfce4-session-4.11.0-r2 (08 Jul 2014)
 
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index f03c6466a513..ade7586a77fb 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -4,23 +4,21 @@ Hash: SHA256
 AUX xfce4-session-4.10.1-alock_support_to_xflock4.patch 367 SHA256 2be32b49b268649e509b99e8d93a3d4e57665cbe8e03693bc85f88ea088e0650 SHA512 8ee765241997cbf32c08e9597d42ee666400fb27792a8716f59aa91daba7476e1de679e4c9254653cf9b14d95fc293f22d02e99ef3288287113a72407e513975 WHIRLPOOL b4b440c393c6175c9555d4df5d3eb4e730512c41fd83d291df2817206225efabc8db752887bd3316ae7fc915158a513202fa592536b78d52c4c40bbff7aa7ae8
 AUX xfce4-session-4.10.1-systemd.patch 12922 SHA256 0e90469248180390ce7736a5621a5c52a3444261768a959bb0d8b8cb68791980 SHA512 43f737b583bec96aae5a2da61124b5e2a6351117494af8cbe6d776e6cb066f778e01ff873ae26e7e44464c10128713d04b0521fbe16a8529833a4f5cf2dab23d WHIRLPOOL d9e15858cbbc72a487dde757844640b7d495e5c253b57b42fcf4694ff8d4168da8f9ca754da1d7947b95361cec90f21abc2257782748a636b90bf020b4febc43
 AUX xfce4-session-4.11.0-upower-0.99.0.patch 13446 SHA256 9cd7f57c00868fe1ac6847e737be4a0a3cf95ae4444e910c9072719e153d211b SHA512 479ff89bab77b521eadaa2bd1d7cfb5494df922bff7dc665e589e1faba0b8cc9a308762774315c471e834a3f732ab9d60df59137f58cbeefd063c9b751f503bd WHIRLPOOL a5d994b6cacadcefd7bf6f8ced2e9a19eaba4574cefba58e9b7d10a3af1bb37382d84691b2fcf0f93c659ab4e70d12dea9fa91e58bc85476be73ba4ce754e911
-AUX xfce4-session-4.11.0-upower-0.99.patch 11987 SHA256 babd6f01c39165c3f178708096695745b3e3d8a7434c8bc762c2ee4a0883c028 SHA512 962e33bac39cea783651ff2b6b89cdaa66b4af06752acf91e6270ade3b3a2947ac903da044330d268042be9a3aa5c2508226cd21969e65bc44cda3afcc664421 WHIRLPOOL d140fc8de712f1d0c527fca4edb6df73da49bbce68d5a5ea425bef8abd9463426b90a9ca5c97c51ab9358ffc02524e6381df137926607ffbbfdbb3cdc32eb3f1
 DIST xfce4-session-4.10.1.tar.bz2 1273015 SHA256 0154fabdc398798c3445374ccc52a2f5bcb2d867fc94bc54114395b24f9cfc83 SHA512 4c6931c350957107fc13f244748287141d524a0e954f48935b5dac2c46a8125af702e1164af98414644f9ea51f5a952db6c57a96fe2a51cab21b616381aac015 WHIRLPOOL fb6193b4d769fb0cd5461a925538bbfa9224b31209d3d16b8bef2f81cbf29aa4cf1c56373335b27326cc2a9f8905a11eec975ee7bc2068168b39e06cd08e64fa
 DIST xfce4-session-4.11.0.tar.bz2 1213569 SHA256 c68905b5124382e30e90f7e4f080fd7e24d58a065991eba9cfcb99e5d59a7c8e SHA512 cbb574117acdefb4781ecb16f7e4681c4c31e624eea2976c88199d3bba883c9a1f114d8b88eebfdd1f5e2c298a672ebf6171ee2b0a117dc54cb675ebd38db90e WHIRLPOOL fa14aa5e321339903460df8471b59b018d34c8453f639f8726e6961d88383aded6319448704d08f74be53ca08c03625dc76857ee328b19cfbaeffadce160d1fe
 EBUILD xfce4-session-4.10.1-r1.ebuild 1859 SHA256 38c4c3431a395f141d4998aedf398876d1e0a2e9a610c16358c0b805de48af4a SHA512 43d6b9f2553a39a3c4567ae09b4027714c35a2b97f43292510ec87ccbe43577d77d6d5fd6fa96df8bcd15a74c8278fb3e77115ddd4ebbd5fc729c0d756b30149 WHIRLPOOL d12c7ee237a11cfd60adb8d7e8cd40b58486ad557a4e9363968c8014a87780a7b0103f750287878439abd8923742e41535bc4fe0553c68db8eb0a20c4ed5e5cf
 EBUILD xfce4-session-4.10.1-r2.ebuild 1913 SHA256 5a5f6f8a6f53b93f4d4a0d81cbaf54ac90425e96bd521ed921bc35fc5bb18b8f SHA512 168498b7eb87be0591df67a6894bb39c667b94fa909bb5d1335133934a60c1eedd9e0b3239bdd452ae60f545019c1f955d0e13a63917c781d7d20443b8f2e6e4 WHIRLPOOL 2de7689287dbdfe5763dec377ab879e55aa5784832cecd63a8a6198550caea1dc122273d271bd3003875a259436a72c86c9077bae44781c66a63061b8174cd5d
-EBUILD xfce4-session-4.11.0-r1.ebuild 1939 SHA256 f4a6f46a7f0db83110b6575324a48e7915bcbc4dea42eafab5e1ae5fa8333a41 SHA512 b48a819c2d4a9fd64932d6ba2e590c9a1871806291d99fee3c32b515b6a0e8b0dae69810bb455ebaeb8b4ea11e7c6fa9a6cbaecc82b4f31d86936ad98bee0d9a WHIRLPOOL 142a45303b8702ac2cd60e7a691637a24ad407373c1bec4150d49ef697f8bfcaeeb7f5f0c4b6ba0f392b64dc6aede2a2e1aadcfc8952178b3f2f8495e63171e1
 EBUILD xfce4-session-4.11.0-r2.ebuild 1915 SHA256 936f272ccbd18a3e673aa351ef06a8c0a47fa6a394213e14f8a75591948e9bab SHA512 0e3851e65a4df382e10fe0258a70bb2c74411b8a6ee90fbd5ba133a5096f5c3863481e244db202b3dc8fdc8fe969235010f0de4282da88dfffbce6f037d6fea0 WHIRLPOOL 99c4acb81f5f6d900992a3d559e3ef89bd9efa76da88272bcdea922aca9225402fae41015f3d368978ec84db2de2735da8b247d5a419dc251ea4e9a0e507b7ee
-MISC ChangeLog 29741 SHA256 7793067dca108935efd8ed8b6ed93327eae12fbaee62d1476b282c585ccdb705 SHA512 8c6b826acafb055ed2c808ae1a2d8df6155d2d243bc7ea69760885db771584a37b82c1e3c19d781d1e62725c569a89db893bafacf6430afdfb6172fb91d50fa2 WHIRLPOOL b1b33584f736dc4e9069c469022cb7f35e588f3853480bdd0e61c31c227035d861fc973f618e6ebc783169a5e22b09286caa6bff1241e33cc3b86377bb7c99b4
+MISC ChangeLog 29886 SHA256 55c096c41b6be5e797d0ba328b6d298092ae833c39cd584af5ff34d318377e3a SHA512 b37be71c46fabe16b6d5ab0d8d641e62e9df52eb650d53ec69dc5ccd6f5f0d8cde46ab40540bc390bf20f265847b8246cbce9edff1972f3acec0401e3ed20252 WHIRLPOOL 1b518a5aec70837c85f4b1092065a70bbb73837c1e6a5aa94e16b540bfc6e8fe8e3d304891c66c7790403de74604ae2aec81025950d9e40f166d034bbc275929
 MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTu/fxAAoJEEdUh39IaPFNcUUIAJmCGXlDIj5m7fzZeHRN6REV
-5FFHOfMEdzmgcTLurxyR2IqC5vo6+yqoxsq8Ek2xbSicm/jK+IOZJFGuLQ+H/x53
-FvS//HSKGSokCXfETR4GqWGFIcBloFuOY3VRzDR44jf5kS1f0DAzsbGm/8s8b8ii
-rqKT7Urfy5WZLMRLvaUaF7lvj62SOc2CL8/SHzgC40LyfsqXBj5lqahel8XqsFn7
-jhXu7s7tcD6EA24UzT07y1saduHCIRr0ta/oU/5YXHKEENitDE6IyHP8O+njCGhr
-C4q2vmtSe1jAWq/CBRSZfvs73NoPdNNcyj/i43AePbybX5S3UzQpXAWfGiX0374=
-=e+Th
+iQEcBAEBCAAGBQJTu/gcAAoJEEdUh39IaPFN+DIH/1rwzKtM5YF+I/Zoxr53d1vY
+iNvGjC7YB3AY+qeTG0INVcQrZ0QtvQFuArGXBEm0UwaM2RLz843Dgwv9TXDLGLdz
+1ZC7bpTX62qIDcr1YpKpe2cFJSiML4+mBuG3X1o54PVVMyy0fOUIlJYc/vFTbxyP
+YlBOcaVQUiy7HD6JhqhyNnjec+7fj6nPmXDFTbLJxOAHohiBzzo6IH3rmbHADXqw
+Jw/0ktm0JaBP5hN/DmXOzn/YkUHh3H688/sWtmGuDSgt7Vs7Z1zuKQZtmjd89ev5
+3I9gJy+HirC/Ci69povwTxVvVTpa2WeyLS7K7g6PaSeEtdTafxAK0cqggyUlSlo=
+=MIBB
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/xfce4-session/files/xfce4-session-4.11.0-upower-0.99.patch b/xfce-base/xfce4-session/files/xfce4-session-4.11.0-upower-0.99.patch
deleted file mode 100644
index a246dcb4f9e4..000000000000
--- a/xfce-base/xfce4-session/files/xfce4-session-4.11.0-upower-0.99.patch
+++ /dev/null
@@ -1,392 +0,0 @@
-Patch from http://bugzilla.xfce.org/show_bug.cgi?id=9952 with modification
-to edit configure.ac (release tarball) instead of configure.ac.in (git)
-
-From ee2228c756e40a4289476f40a6d0045d17418bce Mon Sep 17 00:00:00 2001
-From: Eric Koegel <eric.koegel@gmail.com>
-Date: Thu, 29 May 2014 19:17:26 +0300
-Subject: [PATCH] Add suspend/hibernate to shutdown-helper
-
-Upower 0.99 dropped support for suspend/hibernate as an obsolete
-feature in this commit:
-http://cgit.freedesktop.org/upower/commit/?id=1ee642e705a63f5ad56a6b55e4bf5c4a64c959b8
-Add that functionality into the shutdown-helper so these features
-will work again.
----
- configure.ac.in               |  27 +++++++++
- xfce4-session/Makefile.am     |   4 +-
- xfce4-session/xfsm-shutdown.c | 126 ++++++++++++++++++++++++++++++++++++++++--
- xfce4-session/xfsm-upower.c   |   5 +-
- xfce4-session/xfsm-upower.h   |   4 ++
- xfsm-shutdown-helper/main.c   |  26 +++++++++
- 6 files changed, 186 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 910fd35..d4557a4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -95,6 +95,7 @@ XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.30])
- XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.1.0])
- XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.84])
- XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.9.0])
-+XDT_CHECK_PACKAGE([UPOWER],[upower-glib], [0.9.8])
- 
- dnl Check for polkit / systemd integration
- XDT_CHECK_OPTIONAL_PACKAGE([SYSTEMD], [polkit-gobject-1], [0.100],
-@@ -157,6 +158,31 @@ if test "x$linux_ioprio_works" = "xyes"; then
-             [Defined if linux/ioprio.h not only exists, but works properly])
- fi
- 
-+dnl Compile time default choice of backend
-+AC_ARG_WITH([backend],
-+	    AS_HELP_STRING([--with-backend=<option>],
-+			   [Default backend to use linux, freebsd, openbsd]))
-+# default to a sane option
-+AC_CANONICAL_HOST
-+if test x$with_backend = x; then
-+	AS_CASE([$host],
-+		[*-linux*],   [with_backend=linux],
-+		[*-*freebsd*], [with_backend=freebsd],
-+		[*-openbsd*], [with_backend=openbsd])
-+fi
-+AC_DEFINE_UNQUOTED(BACKEND, "$with_backend", [backend])
-+AC_SUBST(BACKEND, "$with_backend")
-+
-+if test x$with_backend = xlinux; then
-+    AC_DEFINE(BACKEND_TYPE_LINUX, 1, [Linux suspend/hibernate backend])
-+fi
-+if test x$with_backend = xfreebsd; then
-+    AC_DEFINE(BACKEND_TYPE_FREEBSD, 1, [FreeBSD suspend/hibernate backend])
-+fi
-+if test x$with_backend = xopenbsd; then
-+    AC_DEFINE(BACKEND_TYPE_OPENBSD, 1, [OpenBSD suspend/hibernate backend])
-+fi
-+
- dnl check for location Xfce glade files were installed to
- XFCE_GLADE_CATALOG_PATH="`pkg-config --variable glade_catalogdir libxfce4ui-1`"
- XFCE_GLADE_PIXMAP_PATH="`pkg-config --variable glade_pixmapdir libxfce4ui-1`"
-@@ -207,5 +233,6 @@ echo " * Gnome Keyring support:          yes"
- else
- echo " * Gnome Keyring support:          no"
- fi
-+echo " * Backend:                        ${with_backend}"
- 
- echo
-diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am
-index 5472b33..6b5968e 100644
---- a/xfce4-session/Makefile.am
-+++ b/xfce4-session/Makefile.am
-@@ -83,7 +83,8 @@ xfce4_session_CFLAGS =							\
- 	$(SYSTEMD_CFLAGS)						\
- 	$(XFCONF_CFLAGS)						\
- 	$(GMODULE_CFLAGS)						\
--	$(PLATFORM_CFLAGS)
-+	$(PLATFORM_CFLAGS)						\
-+	$(UPOWER_CFLAGS)
- 
- xfce4_session_LDFLAGS =							\
- 	-no-undefined							\
-@@ -102,6 +103,7 @@ xfce4_session_LDADD =							\
- 	$(LIBWNCK_LIBS)							\
- 	$(SYSTEMD_LIBS)							\
- 	$(XFCONF_LIBS)							\
-+	$(UPOWER_LIBS)							\
- 	-lm
- 
- xfce4_session_DEPENDENCIES =						\
-diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c
-index 4c483a7..cba08b8 100644
---- a/xfce4-session/xfsm-shutdown.c
-+++ b/xfce4-session/xfsm-shutdown.c
-@@ -57,6 +57,7 @@
- #include <dbus/dbus-glib-lowlevel.h>
- #include <libxfce4util/libxfce4util.h>
- #include <gtk/gtk.h>
-+#include <upower.h>
- 
- #include <libxfsm/xfsm-util.h>
- 
-@@ -76,6 +77,8 @@
- 
- static void xfsm_shutdown_finalize  (GObject      *object);
- static void xfsm_shutdown_sudo_free (XfsmShutdown *shutdown);
-+static gboolean xfsm_shutdown_fallback_can_hibernate (void);
-+static gboolean xfsm_shutdown_fallback_can_suspend   (void);
- 
- 
- 
-@@ -403,14 +406,16 @@ xfsm_shutdown_sudo_try_action (XfsmShutdown      *shutdown,
-   g_return_val_if_fail (shutdown->helper_state == SUDO_AVAILABLE, FALSE);
-   g_return_val_if_fail (shutdown->helper_outfile != NULL, FALSE);
-   g_return_val_if_fail (shutdown->helper_infile != NULL, FALSE);
--  g_return_val_if_fail (type == XFSM_SHUTDOWN_SHUTDOWN
--                        || type == XFSM_SHUTDOWN_RESTART, FALSE);
- 
-   /* the command we send to sudo */
-   if (type == XFSM_SHUTDOWN_SHUTDOWN)
-     action = "POWEROFF";
-   else if (type == XFSM_SHUTDOWN_RESTART)
-     action = "REBOOT";
-+  else if (type == XFSM_SHUTDOWN_SUSPEND)
-+    action = "SUSPEND";
-+  else if (type == XFSM_SHUTDOWN_HIBERNATE)
-+    action = "HIBERNATE";
-   else
-     return FALSE;
- 
-@@ -692,7 +697,17 @@ xfsm_shutdown_try_suspend (XfsmShutdown  *shutdown,
- {
-   g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE);
- 
--  return xfsm_upower_try_suspend (shutdown->upower, error);
-+#if UP_CHECK_VERSION(0, 99, 0)
-+  if (shutdown->helper_state == SUDO_AVAILABLE)
-+    {
-+      xfsm_upower_lock_screen (shutdown->upower, "Suspend", error);
-+      return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_SUSPEND, error);
-+    }
-+  else
-+    return FALSE;
-+#else
-+    return xfsm_upower_try_suspend (shutdown->upower, error);
-+#endif
- }
- 
- 
-@@ -703,7 +718,17 @@ xfsm_shutdown_try_hibernate (XfsmShutdown  *shutdown,
- {
-   g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE);
- 
--  return xfsm_upower_try_hibernate (shutdown->upower, error);
-+#if UP_CHECK_VERSION(0, 99, 0)
-+  if (shutdown->helper_state == SUDO_AVAILABLE)
-+    {
-+      xfsm_upower_lock_screen (shutdown->upower, "Hibernate", error);
-+      return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_HIBERNATE, error);
-+    }
-+  else
-+    return FALSE;
-+#else
-+    return xfsm_upower_try_hibernate (shutdown->upower, error);
-+#endif
- }
- 
- 
-@@ -784,8 +809,13 @@ xfsm_shutdown_can_suspend (XfsmShutdown  *shutdown,
-       return TRUE;
-     }
- 
-+#if UP_CHECK_VERSION(0, 99, 0)
-+  *can_suspend = xfsm_shutdown_fallback_can_suspend ();
-+  return TRUE;
-+#else
-   return xfsm_upower_can_suspend (shutdown->upower, can_suspend, 
-                                   auth_suspend, error);
-+#endif
- }
- 
- 
-@@ -804,8 +834,13 @@ xfsm_shutdown_can_hibernate (XfsmShutdown  *shutdown,
-       return TRUE;
-     }
- 
-+#if UP_CHECK_VERSION(0, 99, 0)
-+  *can_hibernate = xfsm_shutdown_fallback_can_hibernate ();
-+  return TRUE;
-+#else
-   return xfsm_upower_can_hibernate (shutdown->upower, can_hibernate,
-                                     auth_hibernate, error);
-+#endif
- }
- 
- 
-@@ -816,3 +851,86 @@ xfsm_shutdown_can_save_session (XfsmShutdown *shutdown)
-   g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE);
-   return shutdown->kiosk_can_save_session;
- }
-+
-+
-+
-+#ifdef BACKEND_TYPE_FREEBSD
-+static gboolean
-+freebsd_supports_sleep_state (const gchar *state)
-+{
-+  gboolean ret = FALSE;
-+  gchar *sleep_states;
-+
-+  sleep_states = up_get_string_sysctl (NULL, "hw.acpi.supported_sleep_state");
-+  if (sleep_states != NULL)
-+    {
-+      if (strstr (sleep_states, state) != NULL)
-+          ret = TRUE;
-+    }
-+
-+  g_free (sleep_states);
-+
-+  return ret;
-+}
-+#endif
-+
-+#ifdef BACKEND_TYPE_LINUX
-+static gboolean
-+linux_supports_sleep_state (const gchar *state)
-+{
-+  gboolean ret = FALSE;
-+  gchar *command;
-+  GError *error = NULL;
-+  gint exit_status;
-+
-+  /* run script from pm-utils */
-+  command = g_strdup_printf ("/usr/bin/pm-is-supported --%s", state);
-+
-+  ret = g_spawn_command_line_sync (command, NULL, NULL, &exit_status, &error);
-+  if (!ret)
-+    {
-+      g_warning ("failed to run script: %s", error->message);
-+      g_error_free (error);
-+      goto out;
-+    }
-+  ret = (WIFEXITED(exit_status) && (WEXITSTATUS(exit_status) == EXIT_SUCCESS));
-+
-+out:
-+  g_free (command);
-+
-+  return ret;
-+}
-+#endif
-+
-+
-+static gboolean
-+xfsm_shutdown_fallback_can_suspend (void)
-+{
-+#ifdef BACKEND_TYPE_FREEBSD
-+  return freebsd_supports_sleep_state ("S3");
-+#endif
-+#ifdef BACKEND_TYPE_LINUX
-+  return linux_supports_sleep_state ("suspend");
-+#endif
-+#ifdef BACKEND_TYPE_OPENBSD
-+  return TRUE;
-+#endif
-+
-+  return FALSE;
-+}
-+
-+static gboolean
-+xfsm_shutdown_fallback_can_hibernate (void)
-+{
-+#ifdef BACKEND_TYPE_FREEBSD
-+  return freebsd_supports_sleep_state ("S4");
-+#endif
-+#ifdef BACKEND_TYPE_LINUX
-+  return linux_supports_sleep_state ("hibernate");
-+#endif
-+#ifdef BACKEND_TYPE_OPENBSD
-+  return FALSE;
-+#endif
-+
-+  return FALSE;
-+}
-diff --git a/xfce4-session/xfsm-upower.c b/xfce4-session/xfsm-upower.c
-index 57402ec..8112829 100644
---- a/xfce4-session/xfsm-upower.c
-+++ b/xfce4-session/xfsm-upower.c
-@@ -21,6 +21,7 @@
- 
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
-+#include <upower.h>
- 
- #include <libxfsm/xfsm-util.h>
- #include <xfce4-session/xfsm-upower.h>
-@@ -283,7 +284,7 @@ xfsm_upower_try_method (XfsmUPower   *upower,
- 
- 
- 
--static gboolean
-+gboolean
- xfsm_upower_lock_screen (XfsmUPower   *upower,
-                          const gchar  *sleep_kind,
-                          GError      **error)
-@@ -299,6 +300,7 @@ xfsm_upower_lock_screen (XfsmUPower   *upower,
-     {
-       if (xfsm_upower_proxy_ensure (upower, error))
-         {
-+#if !UP_CHECK_VERSION(0, 99, 0)
-           /* tell upower we're going to sleep, this saves some
-            * time while we sleep 1 second if xflock4 is spawned */
-           ret = dbus_g_proxy_call (upower->upower_proxy,
-@@ -312,6 +314,7 @@ xfsm_upower_lock_screen (XfsmUPower   *upower,
-               g_warning ("Couldn't sent that we were about to sleep: %s", err->message);
-               g_error_free (err);
-             }
-+#endif
-         }
-       else
-         {
-diff --git a/xfce4-session/xfsm-upower.h b/xfce4-session/xfsm-upower.h
-index a492f7d..4e6a53b 100644
---- a/xfce4-session/xfsm-upower.h
-+++ b/xfce4-session/xfsm-upower.h
-@@ -51,4 +51,8 @@ gboolean        xfsm_upower_can_hibernate    (XfsmUPower      *upower,
-                                               gboolean        *auth_hibernate,
-                                               GError         **error);
- 
-+gboolean        xfsm_upower_lock_screen      (XfsmUPower      *upower,
-+                                              const gchar     *sleep_kind,
-+                                              GError         **error);
-+
- #endif /* !__XFSM_UPOWER_HELPER_H__ */
-diff --git a/xfsm-shutdown-helper/main.c b/xfsm-shutdown-helper/main.c
-index 667f288..60c621b 100644
---- a/xfsm-shutdown-helper/main.c
-+++ b/xfsm-shutdown-helper/main.c
-@@ -57,6 +57,12 @@
- #ifdef REBOOT_CMD
- #undef REBOOT_CMD
- #endif
-+#ifdef UP_BACKEND_SUSPEND_COMMAND
-+#undef UP_BACKEND_SUSPEND_COMMAND
-+#endif
-+#ifdef UP_BACKEND_HIBERNATE_COMMAND
-+#undef UP_BACKEND_HIBERNATE_COMMAND
-+#endif
- 
- #if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
- #define POWEROFF_CMD  "/sbin/shutdown -p now"
-@@ -68,6 +74,18 @@
- #define POWEROFF_CMD  "/sbin/shutdown -h now"
- #define REBOOT_CMD    "/sbin/shutdown -r now"
- #endif
-+#ifdef BACKEND_TYPE_FREEBSD
-+#define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/zzz"
-+#define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/acpiconf -s 4"
-+#endif
-+#if BACKEND_TYPE_LINUX
-+#define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/pm-suspend"
-+#define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/pm-hibernate"
-+#endif
-+#ifdef BACKEND_TYPE_OPENBSD
-+#define UP_BACKEND_SUSPEND_COMMAND	"/usr/sbin/zzz"
-+#define UP_BACKEND_HIBERNATE_COMMAND "/dev/null"
-+#endif
- 
- 
- static gboolean
-@@ -143,6 +161,14 @@ main (int argc, char **argv)
-     {
-       succeed = run (REBOOT_CMD);
-     }
-+  else if (strncasecmp (action, "SUSPEND", 7) == 0)
-+    {
-+      succeed = run (UP_BACKEND_SUSPEND_COMMAND);
-+    }
-+  else if (strncasecmp (action, "HIBERNATE", 9) == 0)
-+    {
-+      succeed = run (UP_BACKEND_HIBERNATE_COMMAND);
-+    }
- 
-   if (succeed)
-     {
--- 
-1.9.3
-
diff --git a/xfce-base/xfce4-session/xfce4-session-4.11.0-r1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.11.0-r1.ebuild
deleted file mode 100644
index 4c4eccd35c3d..000000000000
--- a/xfce-base/xfce4-session/xfce4-session-4.11.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.11.0-r1.ebuild,v 1.3 2014/06/02 16:39:34 ssuominen Exp $
-
-EAPI=5
-EAUTORECONF=1
-inherit xfconf
-
-DESCRIPTION="A session manager for the Xfce desktop environment"
-HOMEPAGE="http://docs.xfce.org/xfce/xfce4-session/start"
-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 ~x86-linux ~x86-solaris"
-IUSE="debug nls systemd udev +xscreensaver"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
-	x11-apps/iceauth
-	x11-libs/libSM
-	>=x11-libs/libwnck-2.30:1
-	x11-libs/libX11
-	>=xfce-base/libxfce4util-4.11
-	>=xfce-base/libxfce4ui-4.11
-	>=xfce-base/xfconf-4.10
-	!xfce-base/xfce-utils
-	udev? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
-	systemd? ( >=sys-auth/polkit-0.100 )"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xrdb
-	nls? ( x11-misc/xdg-user-dirs )
-	!systemd? ( udev? ( sys-power/pm-utils ) )
-	xscreensaver? ( || (
-		>=x11-misc/xscreensaver-5.26
-		gnome-extra/gnome-screensaver
-		>=x11-misc/xlockmore-5.43
-		x11-misc/slock
-		x11-misc/alock[pam]
-		) )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	PATCHES=( "${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch )
-
-	# http://bugs.gentoo.org/512084
-	use udev && PATCHES+=( "${FILESDIR}"/${P}-upower-0.99.patch )
-
-	XFCONF=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable systemd)
-		--with-xsession-prefix="${EPREFIX}"/usr
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS BUGS ChangeLog NEWS README TODO )
-}
-
-src_install() {
-	xfconf_src_install
-
-	local sessiondir=/etc/X11/Sessions
-	echo startxfce4 > "${T}"/Xfce4
-	exeinto ${sessiondir}
-	doexe "${T}"/Xfce4
-	dosym Xfce4 ${sessiondir}/Xfce
-}