diff options
Diffstat (limited to 'xfce-extra')
5 files changed, 8 insertions, 205 deletions
diff --git a/xfce-extra/xfce4-power-manager/ChangeLog b/xfce-extra/xfce4-power-manager/ChangeLog index 0764d3074aa0..9e5e00ed1b3e 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-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/ChangeLog,v 1.91 2015/03/22 14:31:22 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/ChangeLog,v 1.92 2015/04/22 14:54:07 calchan Exp $ + + 22 Apr 2015; Denis Dupeyron <calchan@gentoo.org> + -xfce4-power-manager-1.4.0.ebuild, -xfce4-power-manager-1.4.2.ebuild, + -xfce4-power-manager-1.4.3.ebuild, + -files/xfce4-power-manager-1.4.0-fix-handle-lid-switch.patch: + Cleanup. Make sure to keep xfce4-power-manager-1.4.1 as long as bug #531694 + is not resolved upstream. *xfce4-power-manager-1.4.4 (22 Mar 2015) 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 deleted file mode 100644 index df4320462544..000000000000 --- a/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.4.0-fix-handle-lid-switch.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 4e274e29baca..000000000000 --- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.0.ebuild +++ /dev/null @@ -1,59 +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.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 ) -} diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.2.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.2.ebuild deleted file mode 100644 index f0ae22922b62..000000000000 --- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.2.ebuild +++ /dev/null @@ -1,57 +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.4.2.ebuild,v 1.1 2014/12/03 05:39:40 williamh 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 - - 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 ) -} diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.3.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.3.ebuild deleted file mode 100644 index c86fcc715ae2..000000000000 --- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.3.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2015 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.3.ebuild,v 1.1 2015/03/08 15:06:39 mgorny 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 - - 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 ) -} |