commit: 431c7b83f7d02a2512e4149656e75bfe93231e7e Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Tue Aug 2 15:24:47 2016 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Aug 2 16:09:47 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=431c7b83
xfce-extra/xfce4-power-manager: Prune old xfce-extra/xfce4-power-manager/Manifest | 4 -- ....3.0-restore_brightness_level_after_sleep.patch | 70 ------------------- .../xfce4-power-manager-1.3.0.ebuild | 80 ---------------------- .../xfce4-power-manager-1.4.1.ebuild | 57 --------------- .../xfce4-power-manager-1.4.4.ebuild | 57 --------------- .../xfce4-power-manager-1.5.0.ebuild | 51 -------------- 6 files changed, 319 deletions(-) diff --git a/xfce-extra/xfce4-power-manager/Manifest b/xfce-extra/xfce4-power-manager/Manifest index 8919eb3..898139a 100644 --- a/xfce-extra/xfce4-power-manager/Manifest +++ b/xfce-extra/xfce4-power-manager/Manifest @@ -1,6 +1,2 @@ -DIST xfce4-power-manager-1.3.0.tar.bz2 1207141 SHA256 05beaede28078a19a5a397d5d03e5c72fd6fbc57ce627ee6fd84630993b415e0 SHA512 bdffa36c1480a33531062b3f484c3488939089bdd78545147cfc917bd01023a480bbe417d8212ce6e415a2439c82e80863d23030273ff9fa87a8369c6b539b9f WHIRLPOOL 78c842aa6b3b1bb6fbc28386c470692d73e8d877674cc0982806dadcaf225834a016cdf480a583a49a3bd36ba04979aff19ec4a574ecf709f4a6424700cf356b -DIST xfce4-power-manager-1.4.1.tar.bz2 1112797 SHA256 16a9e9bf3e0f8480d05b248817fbdc59e701e9161d3d0c7e53f3de28ed491f58 SHA512 ba6cc1b8304fd5d563da409c22e4ffc92ceed5e990bfa67cd13f430aba7795e8097845e38050cb8cf0a23e2a9f6b4bdb0747d6c413e76bd39be5bb5932613d34 WHIRLPOOL 07a6415d41a95057dde941e61b495ad9f1c30995f331f0aea1fc83f2507aee70ea98d01e0cf1ff9e43e3ab4a281305b32833c6dc3d4aaa1076daf8bb5f41660a -DIST xfce4-power-manager-1.4.4.tar.bz2 1144421 SHA256 c50ec8aa7e7848c57c0f856dceb8132eb5f37585f0ac1627459ab8c882c73b07 SHA512 40eb886e9316bedf02d2a6ff94f9045bd4094070a09b77e0005a1a7e5d281db7ab2ea96d6846efadeb3bb852bd301af03a0fd5b99d611fe43a763154c77390dc WHIRLPOOL 7e60e40e6bdadbd0d2ce421c308266244485b503e7a42aafd71a3d794ac2150dd4a7dd7cbeac0829d95e3be5ba43bf3b5cabeaa1ebe50a2d4082d46c1edd4977 -DIST xfce4-power-manager-1.5.0.tar.bz2 1108153 SHA256 62bc832d9474094fd7481c4658c0dd67e1b41fe89fdaa75b2803d3d2096f9fb7 SHA512 a5cb621033a58f3eaf087cfc370157148978cb5ed63df634a7e6aea531cb2507cd159c0949d8e7a8ddeef5afd2af03048ecae10bb3ce95b4e884673cefe62a40 WHIRLPOOL 87f1f5549bf18ab7becd262db1b7578416f9cf53c90c80ed9cc05620c7987b7a5e435edcbab85c24df7be21124c0478b7fcd28d28bd8a537e08e8d52bddf0b4b DIST xfce4-power-manager-1.5.2.tar.bz2 1165775 SHA256 8bdc640f227ffccbdcfbbcca8ba36d1ce054236c0a32dbf87a4a751f3a835415 SHA512 b59435b98cf4c85f9cdf6a66bc74dd8cbb9a8dc6d409a488e186478933b54278cfed102e70ac0b1bc9389a77c441ff32bbe051fa0c5c9b6981dc9e99a2c54263 WHIRLPOOL d882adfd7a3beb437f6d636ba0e8f17da6234b0d5bb6f35b61243163afa092c5a4f7b16d2efc3b673ad433ffa6bd2fa68875166c801f98e1319f6d538bc260c1 DIST xfce4-power-manager-1.6.0.tar.bz2 1171114 SHA256 bde3157e06ab31ff23648d163d53ee5095f7819544a9f48d3a96d57829857f2b SHA512 1b3628793a8bfb7a487fc4f1182769b0d7a90784aa4ef7800997dd7e9a061d938493b8c5653672b293fb018dd5b5209bb83caa16310c1de370413f98d8af1053 WHIRLPOOL 74a8a9857f7a2b42035e4d409bb6ee00e8e29dd547076191ae4c757f213546195b98c76a9520c1903b1f59310d243556820f794967704f946dc6723837a93f0b diff --git a/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.3.0-restore_brightness_level_after_sleep.patch b/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.3.0-restore_brightness_level_after_sleep.patch deleted file mode 100644 index 7687ae4..0000000 --- a/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.3.0-restore_brightness_level_after_sleep.patch +++ /dev/null @@ -1,70 +0,0 @@ -http://bugzilla.xfce.org/show_bug.cgi?id=10535 - -From 4c14d83794b94ac18519806314464599d5e905f6 Mon Sep 17 00:00:00 2001 -From: Eric Koegel <eric.koe...@gmail.com> -Date: Sat, 31 May 2014 20:09:56 +0300 -Subject: Restore screen power after sleep - -With this patch xfpm will cache the brightness level before going -to sleep and set it back to that level after resuming from sleep. - -diff --git a/common/xfpm-brightness.c b/common/xfpm-brightness.c -index e18c617..e49338e 100644 ---- a/common/xfpm-brightness.c -+++ b/common/xfpm-brightness.c -@@ -382,7 +382,7 @@ xfpm_brightness_helper_get_level (XfpmBrightness *brg, gint32 *level) - } - - static gboolean --xfpm_brightness_helper_set_level (XfpmBrightness *brg, gint level) -+xfpm_brightness_helper_set_level (XfpmBrightness *brg, gint32 level) - { - gboolean ret; - GError *error = NULL; -diff --git a/src/xfpm-power.c b/src/xfpm-power.c -index 9d98fab..b42210b 100644 ---- a/src/xfpm-power.c -+++ b/src/xfpm-power.c -@@ -60,6 +60,7 @@ - #include "egg-idletime.h" - #include "xfpm-systemd.h" - #include "xfpm-suspend.h" -+#include "xfpm-brightness.h" - - - static void xfpm_power_finalize (GObject *object); -@@ -312,6 +313,8 @@ xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force) - #ifdef WITH_NETWORK_MANAGER - gboolean network_manager_sleep; - #endif -+ XfpmBrightness *brightness; -+ gint32 brightness_level; - - if ( power->priv->inhibited && force == FALSE) - { -@@ -344,6 +347,10 @@ xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force) - #endif - - g_signal_emit (G_OBJECT (power), signals [SLEEPING], 0); -+ /* Get the current brightness level so we can use it after we suspend */ -+ brightness = xfpm_brightness_new(); -+ xfpm_brightness_setup (brightness); -+ xfpm_brightness_get_level (brightness, &brightness_level); - - #ifdef WITH_NETWORK_MANAGER - g_object_get (G_OBJECT (power->priv->conf), -@@ -429,6 +436,11 @@ xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force) - } - - g_signal_emit (G_OBJECT (power), signals [WAKING_UP], 0); -+ /* Check/update any changes while we slept */ -+ xfpm_power_get_properties (power); -+ /* Restore the brightness level from before we suspended */ -+ xfpm_brightness_set_level (brightness, brightness_level); -+ - #ifdef WITH_NETWORK_MANAGER - if ( network_manager_sleep ) - { --- -cgit v0.10.1 - diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.3.0.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.3.0.ebuild deleted file mode 100644 index 8cb5713..0000000 --- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.3.0.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 ppc64 x86" -IUSE="debug kernel_linux networkmanager policykit +udisks 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 - 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 ) - udisks? ( sys-fs/udisks:0 ) - !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() { - PATCHES=( "${FILESDIR}"/${P}-restore_brightness_level_after_sleep.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) - $(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-panel-plugins ) - 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 -} diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.1.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.1.ebuild deleted file mode 100644 index 8b05a08..0000000 --- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 ~ppc64 ~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.4.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.4.ebuild deleted file mode 100644 index 0921e42..0000000 --- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.4.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit 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 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.5.0.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.5.0.ebuild deleted file mode 100644 index 64556b8..0000000 --- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.5.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit 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 +xfce_plugins_power" - -COMMON_DEPEND=">=dev-libs/glib-2.42:= - >=sys-power/upower-0.99.0 - >=x11-libs/gtk+-3.14:3= - >=x11-libs/libnotify-0.7 - x11-libs/libX11:= - >=x11-libs/libXrandr-1.2:= - x11-libs/libXext:= - >=xfce-base/xfconf-4.12:= - >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] - >=xfce-base/libxfce4util-4.12:= - policykit? ( >=sys-auth/polkit-0.112 ) - xfce_plugins_power? ( >=xfce-base/xfce4-panel-4.12:= )" -RDEPEND="${COMMON_DEPEND} - networkmanager? ( net-misc/networkmanager )" -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) - $(xfconf_use_debug) - ) - - DOCS=( AUTHORS NEWS README TODO ) -}
