| 1 |
commit: 8dba4c7fea93f59b5848c3555886833cddf5ac33 |
| 2 |
Author: Christoph Mende <angelos <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 3 20:07:47 2014 +0000 |
| 4 |
Commit: Christoph Mende <angelos <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 3 20:07:47 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/xfce.git;a=commit;h=8dba4c7f |
| 7 |
|
| 8 |
xfce4-power-manager: Sync with gentoo-x86 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.10 |
| 11 |
Manifest-Sign-Key: 84F20B43 |
| 12 |
|
| 13 |
--- |
| 14 |
xfce-extra/xfce4-power-manager/metadata.xml | 3 ++- |
| 15 |
xfce-extra/xfce4-power-manager/xfce4-power-manager-9999.ebuild | 10 +++++----- |
| 16 |
2 files changed, 7 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/xfce-extra/xfce4-power-manager/metadata.xml b/xfce-extra/xfce4-power-manager/metadata.xml |
| 19 |
index 39b2bdd..c294065 100644 |
| 20 |
--- a/xfce-extra/xfce4-power-manager/metadata.xml |
| 21 |
+++ b/xfce-extra/xfce4-power-manager/metadata.xml |
| 22 |
@@ -3,6 +3,7 @@ |
| 23 |
<pkgmetadata> |
| 24 |
<herd>xfce</herd> |
| 25 |
<use> |
| 26 |
- <flag name='udisks'>Pull in <pkg>sys-fs/udisks</pkg> for spindown support</flag> |
| 27 |
+ <flag name='lxpanel'>Build the applet for <pkg>lxde-base/lxpanel</pkg>, you can set XFCE_PLUGINS="" if you don't want the Xfce dependencies.</flag> |
| 28 |
+ <flag name='udisks'>Pull in <pkg>sys-fs/udisks:0</pkg> for spindown support (DEPRECATED)</flag> |
| 29 |
</use> |
| 30 |
</pkgmetadata> |
| 31 |
|
| 32 |
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-9999.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-9999.ebuild |
| 33 |
index f4bb88d..6e749b2 100644 |
| 34 |
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-9999.ebuild |
| 35 |
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-9999.ebuild |
| 36 |
@@ -1,6 +1,6 @@ |
| 37 |
# Copyright 1999-2014 Gentoo Foundation |
| 38 |
# Distributed under the terms of the GNU General Public License v2 |
| 39 |
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.3.0.ebuild,v 1.6 2014/06/23 04:19:25 ssuominen Exp $ |
| 40 |
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.3.1.ebuild,v 1.1 2014/08/20 07:06:28 ssuominen Exp $ |
| 41 |
|
| 42 |
EAPI=5 |
| 43 |
inherit linux-info multilib xfconf |
| 44 |
@@ -11,7 +11,7 @@ HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-power-manager" |
| 45 |
LICENSE="GPL-2" |
| 46 |
SLOT="0" |
| 47 |
KEYWORDS="" |
| 48 |
-IUSE="debug kernel_linux networkmanager policykit +udisks systemd +xfce_plugins_battery +xfce_plugins_brightness" |
| 49 |
+IUSE="debug kernel_linux lxpanel networkmanager policykit systemd +xfce_plugins_battery +xfce_plugins_brightness" |
| 50 |
|
| 51 |
COMMON_DEPEND=">=dev-libs/dbus-glib-0.100.2 |
| 52 |
>=dev-libs/glib-2.30 |
| 53 |
@@ -25,13 +25,13 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.100.2 |
| 54 |
>=xfce-base/xfconf-4.10 |
| 55 |
>=xfce-base/libxfce4ui-4.10 |
| 56 |
>=xfce-base/libxfce4util-4.10 |
| 57 |
+ lxpanel? ( lxde-base/lxpanel ) |
| 58 |
policykit? ( >=sys-auth/polkit-0.112 ) |
| 59 |
xfce_plugins_battery? ( >=xfce-base/xfce4-panel-4.10 ) |
| 60 |
xfce_plugins_brightness? ( >=xfce-base/xfce4-panel-4.10 )" |
| 61 |
# USE="systemd" is for ensuring hibernate/suspend works by enforcing correct runtime -only dependencies |
| 62 |
RDEPEND="${COMMON_DEPEND} |
| 63 |
networkmanager? ( net-misc/networkmanager ) |
| 64 |
- udisks? ( sys-fs/udisks:0 ) |
| 65 |
!systemd? ( || ( sys-power/pm-utils sys-power/upower-pm-utils ) )" |
| 66 |
DEPEND="${COMMON_DEPEND} |
| 67 |
dev-util/intltool |
| 68 |
@@ -47,14 +47,14 @@ pkg_setup() { |
| 69 |
|
| 70 |
XFCONF=( |
| 71 |
$(use_enable policykit polkit) |
| 72 |
- --enable-dpms |
| 73 |
$(use_enable networkmanager network-manager) |
| 74 |
+ $(use_enable lxpanel lxdepanel) |
| 75 |
$(xfconf_use_debug) |
| 76 |
) |
| 77 |
|
| 78 |
# TODO: Split --disable-panel-plugins to two separate AC_ARG_ENABLEs |
| 79 |
if ! use xfce_plugins_battery && ! use xfce_plugins_brightness; then |
| 80 |
- XFCONF+=( --disable-panel-plugins ) |
| 81 |
+ XFCONF+=( --disable-xfce4panel ) |
| 82 |
fi |
| 83 |
|
| 84 |
DOCS=( AUTHORS NEWS README TODO ) |
Archives