Version bump.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 98 insertions, 1 deletions

diff --git a/xfce-extra/xfce4-power-manager/ChangeLog b/xfce-extra/xfce4-power-manager/ChangeLog
index 72878d992df1..d4f321e83e08 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.85 2014/08/20 07:06:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/ChangeLog,v 1.86 2014/09/16 11:12:16 ssuominen Exp $
+
+*xfce4-power-manager-1.4.0 (16 Sep 2014)
+
+  16 Sep 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/xfce4-power-manager-1.4.0-fix-handle-lid-switch.patch,
+  +xfce4-power-manager-1.4.0.ebuild:
+  Version bump.
 
 *xfce4-power-manager-1.3.1 (20 Aug 2014)
 
diff --git a/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.4.0-fix-handle-lid-switch.patch b/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.4.0-fix-handle-lid-switch.patch
new file mode 100644
index 000000000000..df4320462544
--- /dev/null
+++ b/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.4.0-fix-handle-lid-switch.patch
@@ -0,0 +1,31 @@
+http://bugzilla.xfce.org/show_bug.cgi?id=11160
+
+From d61db320d8a893a292812256470a873c7ce1b35d Mon Sep 17 00:00:00 2001
+From: Eric Koegel <eric.koegel@gmail.com>
+Date: Mon, 15 Sep 2014 14:35:00 +0300
+Subject: [PATCH] Fix handle lid switch with loginD (Bug 11160)
+
+The xfconf settings logic for logind interactions were inverted
+in commit: 03193df6cad651841e8d9960335b4a3bf13afdad
+However the handle lid switch in the xfpm_manager_lid_changed_cb
+also needs to be inverted. This patch fixes it. Patch submitted
+by Simon P.
+---
+ src/xfpm-manager.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/xfpm-manager.c b/src/xfpm-manager.c
+index d6c533c..9549b66 100644
+--- a/src/xfpm-manager.c
++++ b/src/xfpm-manager.c
+@@ -335,7 +335,7 @@ xfpm_manager_lid_changed_cb (XfpmPower *power, gboolean lid_is_closed, XfpmManag
+               LOGIND_HANDLE_LID_SWITCH, &logind_handle_lid_switch,
+               NULL);
+ 
+-        if (!logind_handle_lid_switch)
++        if (logind_handle_lid_switch)
+             return;
+     }
+ 
+-- 
+2.1.0
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.0.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.0.ebuild
new file mode 100644
index 000000000000..4e274e29baca
--- /dev/null
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.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.4.0.ebuild,v 1.1 2014/09/16 11:12:16 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_power"
+
+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_power? ( >=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
+
+	PATCHES=( "${FILESDIR}"/${P}-fix-handle-lid-switch.patch )
+
+	XFCONF=(
+		$(use_enable policykit polkit)
+		$(use_enable networkmanager network-manager)
+		$(use_enable xfce_plugins_power xfce4panel)
+		$(use_enable lxpanel lxdepanel)
+		$(xfconf_use_debug)
+		)
+
+	DOCS=( AUTHORS NEWS README TODO )
+}