Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: xfce-extra/xfce4-power-manager/, xfce-extra/xfce4-power-manager/files/
Date: Tue, 02 Aug 2016 16:11:08
Message-Id: 1470154187.431c7b83f7d02a2512e4149656e75bfe93231e7e.mgorny@gentoo
1 commit: 431c7b83f7d02a2512e4149656e75bfe93231e7e
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 2 15:24:47 2016 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 2 16:09:47 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=431c7b83
7
8 xfce-extra/xfce4-power-manager: Prune old
9
10 xfce-extra/xfce4-power-manager/Manifest | 4 --
11 ....3.0-restore_brightness_level_after_sleep.patch | 70 -------------------
12 .../xfce4-power-manager-1.3.0.ebuild | 80 ----------------------
13 .../xfce4-power-manager-1.4.1.ebuild | 57 ---------------
14 .../xfce4-power-manager-1.4.4.ebuild | 57 ---------------
15 .../xfce4-power-manager-1.5.0.ebuild | 51 --------------
16 6 files changed, 319 deletions(-)
17
18 diff --git a/xfce-extra/xfce4-power-manager/Manifest b/xfce-extra/xfce4-power-manager/Manifest
19 index 8919eb3..898139a 100644
20 --- a/xfce-extra/xfce4-power-manager/Manifest
21 +++ b/xfce-extra/xfce4-power-manager/Manifest
22 @@ -1,6 +1,2 @@
23 -DIST xfce4-power-manager-1.3.0.tar.bz2 1207141 SHA256 05beaede28078a19a5a397d5d03e5c72fd6fbc57ce627ee6fd84630993b415e0 SHA512 bdffa36c1480a33531062b3f484c3488939089bdd78545147cfc917bd01023a480bbe417d8212ce6e415a2439c82e80863d23030273ff9fa87a8369c6b539b9f WHIRLPOOL 78c842aa6b3b1bb6fbc28386c470692d73e8d877674cc0982806dadcaf225834a016cdf480a583a49a3bd36ba04979aff19ec4a574ecf709f4a6424700cf356b
24 -DIST xfce4-power-manager-1.4.1.tar.bz2 1112797 SHA256 16a9e9bf3e0f8480d05b248817fbdc59e701e9161d3d0c7e53f3de28ed491f58 SHA512 ba6cc1b8304fd5d563da409c22e4ffc92ceed5e990bfa67cd13f430aba7795e8097845e38050cb8cf0a23e2a9f6b4bdb0747d6c413e76bd39be5bb5932613d34 WHIRLPOOL 07a6415d41a95057dde941e61b495ad9f1c30995f331f0aea1fc83f2507aee70ea98d01e0cf1ff9e43e3ab4a281305b32833c6dc3d4aaa1076daf8bb5f41660a
25 -DIST xfce4-power-manager-1.4.4.tar.bz2 1144421 SHA256 c50ec8aa7e7848c57c0f856dceb8132eb5f37585f0ac1627459ab8c882c73b07 SHA512 40eb886e9316bedf02d2a6ff94f9045bd4094070a09b77e0005a1a7e5d281db7ab2ea96d6846efadeb3bb852bd301af03a0fd5b99d611fe43a763154c77390dc WHIRLPOOL 7e60e40e6bdadbd0d2ce421c308266244485b503e7a42aafd71a3d794ac2150dd4a7dd7cbeac0829d95e3be5ba43bf3b5cabeaa1ebe50a2d4082d46c1edd4977
26 -DIST xfce4-power-manager-1.5.0.tar.bz2 1108153 SHA256 62bc832d9474094fd7481c4658c0dd67e1b41fe89fdaa75b2803d3d2096f9fb7 SHA512 a5cb621033a58f3eaf087cfc370157148978cb5ed63df634a7e6aea531cb2507cd159c0949d8e7a8ddeef5afd2af03048ecae10bb3ce95b4e884673cefe62a40 WHIRLPOOL 87f1f5549bf18ab7becd262db1b7578416f9cf53c90c80ed9cc05620c7987b7a5e435edcbab85c24df7be21124c0478b7fcd28d28bd8a537e08e8d52bddf0b4b
27 DIST xfce4-power-manager-1.5.2.tar.bz2 1165775 SHA256 8bdc640f227ffccbdcfbbcca8ba36d1ce054236c0a32dbf87a4a751f3a835415 SHA512 b59435b98cf4c85f9cdf6a66bc74dd8cbb9a8dc6d409a488e186478933b54278cfed102e70ac0b1bc9389a77c441ff32bbe051fa0c5c9b6981dc9e99a2c54263 WHIRLPOOL d882adfd7a3beb437f6d636ba0e8f17da6234b0d5bb6f35b61243163afa092c5a4f7b16d2efc3b673ad433ffa6bd2fa68875166c801f98e1319f6d538bc260c1
28 DIST xfce4-power-manager-1.6.0.tar.bz2 1171114 SHA256 bde3157e06ab31ff23648d163d53ee5095f7819544a9f48d3a96d57829857f2b SHA512 1b3628793a8bfb7a487fc4f1182769b0d7a90784aa4ef7800997dd7e9a061d938493b8c5653672b293fb018dd5b5209bb83caa16310c1de370413f98d8af1053 WHIRLPOOL 74a8a9857f7a2b42035e4d409bb6ee00e8e29dd547076191ae4c757f213546195b98c76a9520c1903b1f59310d243556820f794967704f946dc6723837a93f0b
29
30 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
31 deleted file mode 100644
32 index 7687ae4..0000000
33 --- a/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.3.0-restore_brightness_level_after_sleep.patch
34 +++ /dev/null
35 @@ -1,70 +0,0 @@
36 -http://bugzilla.xfce.org/show_bug.cgi?id=10535
37 -
38 -From 4c14d83794b94ac18519806314464599d5e905f6 Mon Sep 17 00:00:00 2001
39 -From: Eric Koegel <eric.koegel@×××××.com>
40 -Date: Sat, 31 May 2014 20:09:56 +0300
41 -Subject: Restore screen power after sleep
42 -
43 -With this patch xfpm will cache the brightness level before going
44 -to sleep and set it back to that level after resuming from sleep.
45 -
46 -diff --git a/common/xfpm-brightness.c b/common/xfpm-brightness.c
47 -index e18c617..e49338e 100644
48 ---- a/common/xfpm-brightness.c
49 -+++ b/common/xfpm-brightness.c
50 -@@ -382,7 +382,7 @@ xfpm_brightness_helper_get_level (XfpmBrightness *brg, gint32 *level)
51 - }
52 -
53 - static gboolean
54 --xfpm_brightness_helper_set_level (XfpmBrightness *brg, gint level)
55 -+xfpm_brightness_helper_set_level (XfpmBrightness *brg, gint32 level)
56 - {
57 - gboolean ret;
58 - GError *error = NULL;
59 -diff --git a/src/xfpm-power.c b/src/xfpm-power.c
60 -index 9d98fab..b42210b 100644
61 ---- a/src/xfpm-power.c
62 -+++ b/src/xfpm-power.c
63 -@@ -60,6 +60,7 @@
64 - #include "egg-idletime.h"
65 - #include "xfpm-systemd.h"
66 - #include "xfpm-suspend.h"
67 -+#include "xfpm-brightness.h"
68 -
69 -
70 - static void xfpm_power_finalize (GObject *object);
71 -@@ -312,6 +313,8 @@ xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force)
72 - #ifdef WITH_NETWORK_MANAGER
73 - gboolean network_manager_sleep;
74 - #endif
75 -+ XfpmBrightness *brightness;
76 -+ gint32 brightness_level;
77 -
78 - if ( power->priv->inhibited && force == FALSE)
79 - {
80 -@@ -344,6 +347,10 @@ xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force)
81 - #endif
82 -
83 - g_signal_emit (G_OBJECT (power), signals [SLEEPING], 0);
84 -+ /* Get the current brightness level so we can use it after we suspend */
85 -+ brightness = xfpm_brightness_new();
86 -+ xfpm_brightness_setup (brightness);
87 -+ xfpm_brightness_get_level (brightness, &brightness_level);
88 -
89 - #ifdef WITH_NETWORK_MANAGER
90 - g_object_get (G_OBJECT (power->priv->conf),
91 -@@ -429,6 +436,11 @@ xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force)
92 - }
93 -
94 - g_signal_emit (G_OBJECT (power), signals [WAKING_UP], 0);
95 -+ /* Check/update any changes while we slept */
96 -+ xfpm_power_get_properties (power);
97 -+ /* Restore the brightness level from before we suspended */
98 -+ xfpm_brightness_set_level (brightness, brightness_level);
99 -+
100 - #ifdef WITH_NETWORK_MANAGER
101 - if ( network_manager_sleep )
102 - {
103 ---
104 -cgit v0.10.1
105 -
106
107 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
108 deleted file mode 100644
109 index 8cb5713..0000000
110 --- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.3.0.ebuild
111 +++ /dev/null
112 @@ -1,80 +0,0 @@
113 -# Copyright 1999-2014 Gentoo Foundation
114 -# Distributed under the terms of the GNU General Public License v2
115 -# $Id$
116 -
117 -EAPI=5
118 -inherit linux-info multilib xfconf
119 -
120 -DESCRIPTION="Power manager for the Xfce desktop environment"
121 -HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-power-manager"
122 -SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
123 -
124 -LICENSE="GPL-2"
125 -SLOT="0"
126 -KEYWORDS="amd64 ~arm ppc ppc64 x86"
127 -IUSE="debug kernel_linux networkmanager policykit +udisks systemd +xfce_plugins_battery +xfce_plugins_brightness"
128 -
129 -COMMON_DEPEND=">=dev-libs/dbus-glib-0.100.2
130 - >=dev-libs/glib-2.30
131 - >=sys-apps/dbus-1.6.18
132 - || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23-r2 )
133 - >=x11-libs/gtk+-2.24:2
134 - >=x11-libs/libnotify-0.7
135 - x11-libs/libX11
136 - >=x11-libs/libXrandr-1.2
137 - x11-libs/libXext
138 - >=xfce-base/xfconf-4.10
139 - >=xfce-base/libxfce4ui-4.10
140 - >=xfce-base/libxfce4util-4.10
141 - policykit? ( >=sys-auth/polkit-0.112 )
142 - xfce_plugins_battery? ( >=xfce-base/xfce4-panel-4.10 )
143 - xfce_plugins_brightness? ( >=xfce-base/xfce4-panel-4.10 )"
144 -# USE="systemd" is for ensuring hibernate/suspend works by enforcing correct runtime -only dependencies
145 -RDEPEND="${COMMON_DEPEND}
146 - networkmanager? ( net-misc/networkmanager )
147 - udisks? ( sys-fs/udisks:0 )
148 - !systemd? ( || ( sys-power/pm-utils sys-power/upower-pm-utils ) )"
149 -DEPEND="${COMMON_DEPEND}
150 - dev-util/intltool
151 - sys-devel/gettext
152 - virtual/pkgconfig
153 - x11-proto/xproto"
154 -
155 -pkg_setup() {
156 - PATCHES=( "${FILESDIR}"/${P}-restore_brightness_level_after_sleep.patch )
157 -
158 - if use kernel_linux; then
159 - CONFIG_CHECK="~TIMER_STATS"
160 - linux-info_pkg_setup
161 - fi
162 -
163 - XFCONF=(
164 - $(use_enable policykit polkit)
165 - --enable-dpms
166 - $(use_enable networkmanager network-manager)
167 - $(xfconf_use_debug)
168 - )
169 -
170 - # TODO: Split --disable-panel-plugins to two separate AC_ARG_ENABLEs
171 - if ! use xfce_plugins_battery && ! use xfce_plugins_brightness; then
172 - XFCONF+=( --disable-panel-plugins )
173 - fi
174 -
175 - DOCS=( AUTHORS NEWS README TODO )
176 -}
177 -
178 -src_install() {
179 - xfconf_src_install
180 -
181 - if ! use xfce_plugins_battery; then
182 - rm -f \
183 - "${ED}"/usr/$(get_libdir)/xfce4/panel/plugins/libxfce4battery.* \
184 - "${ED}"/usr/share/xfce4/panel-plugins/xfce4-battery-plugin.desktop
185 - fi
186 -
187 - if ! use xfce_plugins_brightness; then
188 - rm -f \
189 - "${ED}"/usr/$(get_libdir)/xfce4/panel/plugins/libxfce4brightness.* \
190 - "${ED}"/usr/share/xfce4/panel-plugins/xfce4-brightness-plugin.desktop
191 - fi
192 -}
193
194 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
195 deleted file mode 100644
196 index 8b05a08..0000000
197 --- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.1.ebuild
198 +++ /dev/null
199 @@ -1,57 +0,0 @@
200 -# Copyright 1999-2015 Gentoo Foundation
201 -# Distributed under the terms of the GNU General Public License v2
202 -# $Id$
203 -
204 -EAPI=5
205 -inherit linux-info multilib xfconf
206 -
207 -DESCRIPTION="Power manager for the Xfce desktop environment"
208 -HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-power-manager"
209 -SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
210 -
211 -LICENSE="GPL-2"
212 -SLOT="0"
213 -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
214 -IUSE="debug kernel_linux lxpanel networkmanager policykit systemd +xfce_plugins_power"
215 -
216 -COMMON_DEPEND=">=dev-libs/dbus-glib-0.100.2
217 - >=dev-libs/glib-2.30
218 - >=sys-apps/dbus-1.6.18
219 - || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23-r2 )
220 - >=x11-libs/gtk+-2.24:2
221 - >=x11-libs/libnotify-0.7
222 - x11-libs/libX11
223 - >=x11-libs/libXrandr-1.2
224 - x11-libs/libXext
225 - >=xfce-base/xfconf-4.10
226 - >=xfce-base/libxfce4ui-4.10
227 - >=xfce-base/libxfce4util-4.10
228 - lxpanel? ( lxde-base/lxpanel )
229 - policykit? ( >=sys-auth/polkit-0.112 )
230 - xfce_plugins_power? ( >=xfce-base/xfce4-panel-4.10 )"
231 -# USE="systemd" is for ensuring hibernate/suspend works by enforcing correct runtime -only dependencies
232 -RDEPEND="${COMMON_DEPEND}
233 - networkmanager? ( net-misc/networkmanager )
234 - !systemd? ( || ( sys-power/pm-utils sys-power/upower-pm-utils ) )"
235 -DEPEND="${COMMON_DEPEND}
236 - dev-util/intltool
237 - sys-devel/gettext
238 - virtual/pkgconfig
239 - x11-proto/xproto"
240 -
241 -pkg_setup() {
242 - if use kernel_linux; then
243 - CONFIG_CHECK="~TIMER_STATS"
244 - linux-info_pkg_setup
245 - fi
246 -
247 - XFCONF=(
248 - $(use_enable policykit polkit)
249 - $(use_enable networkmanager network-manager)
250 - $(use_enable xfce_plugins_power xfce4panel)
251 - $(use_enable lxpanel lxdepanel)
252 - $(xfconf_use_debug)
253 - )
254 -
255 - DOCS=( AUTHORS NEWS README TODO )
256 -}
257
258 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
259 deleted file mode 100644
260 index 0921e42..0000000
261 --- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.4.ebuild
262 +++ /dev/null
263 @@ -1,57 +0,0 @@
264 -# Copyright 1999-2015 Gentoo Foundation
265 -# Distributed under the terms of the GNU General Public License v2
266 -# $Id$
267 -
268 -EAPI=5
269 -inherit linux-info xfconf
270 -
271 -DESCRIPTION="Power manager for the Xfce desktop environment"
272 -HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-power-manager"
273 -SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
274 -
275 -LICENSE="GPL-2"
276 -SLOT="0"
277 -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
278 -IUSE="debug kernel_linux lxpanel networkmanager policykit systemd +xfce_plugins_power"
279 -
280 -COMMON_DEPEND=">=dev-libs/dbus-glib-0.100.2:=
281 - >=dev-libs/glib-2.30:=
282 - >=sys-apps/dbus-1.6.18:=
283 - || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23-r2 )
284 - >=x11-libs/gtk+-2.24:2=
285 - >=x11-libs/libnotify-0.7
286 - x11-libs/libX11:=
287 - >=x11-libs/libXrandr-1.2:=
288 - x11-libs/libXext:=
289 - >=xfce-base/xfconf-4.10:=
290 - >=xfce-base/libxfce4ui-4.10:=
291 - >=xfce-base/libxfce4util-4.10:=
292 - lxpanel? ( lxde-base/lxpanel:= )
293 - policykit? ( >=sys-auth/polkit-0.112 )
294 - xfce_plugins_power? ( >=xfce-base/xfce4-panel-4.10:= )"
295 -# USE="systemd" is for ensuring hibernate/suspend works by enforcing correct runtime -only dependencies
296 -RDEPEND="${COMMON_DEPEND}
297 - networkmanager? ( net-misc/networkmanager )
298 - !systemd? ( || ( sys-power/pm-utils sys-power/upower-pm-utils ) )"
299 -DEPEND="${COMMON_DEPEND}
300 - dev-util/intltool
301 - sys-devel/gettext
302 - virtual/pkgconfig
303 - x11-proto/xproto"
304 -
305 -pkg_setup() {
306 - if use kernel_linux; then
307 - CONFIG_CHECK="~TIMER_STATS"
308 - linux-info_pkg_setup
309 - fi
310 -
311 - XFCONF=(
312 - $(use_enable policykit polkit)
313 - $(use_enable networkmanager network-manager)
314 - $(use_enable xfce_plugins_power xfce4panel)
315 - $(use_enable lxpanel lxdepanel)
316 - $(xfconf_use_debug)
317 - )
318 -
319 - DOCS=( AUTHORS NEWS README TODO )
320 -}
321
322 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
323 deleted file mode 100644
324 index 64556b8..0000000
325 --- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.5.0.ebuild
326 +++ /dev/null
327 @@ -1,51 +0,0 @@
328 -# Copyright 1999-2015 Gentoo Foundation
329 -# Distributed under the terms of the GNU General Public License v2
330 -# $Id$
331 -
332 -EAPI=5
333 -inherit linux-info xfconf
334 -
335 -DESCRIPTION="Power manager for the Xfce desktop environment"
336 -HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-power-manager"
337 -SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
338 -
339 -LICENSE="GPL-2"
340 -SLOT="0"
341 -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
342 -IUSE="debug kernel_linux networkmanager policykit +xfce_plugins_power"
343 -
344 -COMMON_DEPEND=">=dev-libs/glib-2.42:=
345 - >=sys-power/upower-0.99.0
346 - >=x11-libs/gtk+-3.14:3=
347 - >=x11-libs/libnotify-0.7
348 - x11-libs/libX11:=
349 - >=x11-libs/libXrandr-1.2:=
350 - x11-libs/libXext:=
351 - >=xfce-base/xfconf-4.12:=
352 - >=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
353 - >=xfce-base/libxfce4util-4.12:=
354 - policykit? ( >=sys-auth/polkit-0.112 )
355 - xfce_plugins_power? ( >=xfce-base/xfce4-panel-4.12:= )"
356 -RDEPEND="${COMMON_DEPEND}
357 - networkmanager? ( net-misc/networkmanager )"
358 -DEPEND="${COMMON_DEPEND}
359 - dev-util/intltool
360 - sys-devel/gettext
361 - virtual/pkgconfig
362 - x11-proto/xproto"
363 -
364 -pkg_setup() {
365 - if use kernel_linux; then
366 - CONFIG_CHECK="~TIMER_STATS"
367 - linux-info_pkg_setup
368 - fi
369 -
370 - XFCONF=(
371 - $(use_enable policykit polkit)
372 - $(use_enable networkmanager network-manager)
373 - $(use_enable xfce_plugins_power xfce4panel)
374 - $(xfconf_use_debug)
375 - )
376 -
377 - DOCS=( AUTHORS NEWS README TODO )
378 -}