summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Mende <angelos@gentoo.org>2015-10-09 21:41:40 +0200
committerChristoph Mende <angelos@gentoo.org>2015-10-09 21:41:40 +0200
commit795ee32f5bb7302fd005347250a211eb3c9f5a44 (patch)
treeea8791f1e9660809d4b7c1b33b09415e2ce2294e
parentxfwm4: Sync with gentoo-x86 (diff)
downloadxfce-795ee32f5bb7302fd005347250a211eb3c9f5a44.tar.gz
xfce-795ee32f5bb7302fd005347250a211eb3c9f5a44.tar.bz2
xfce-795ee32f5bb7302fd005347250a211eb3c9f5a44.zip
xfce4-power-manager: Sync with gentoo-x86
Package-Manager: portage-2.2.23
-rw-r--r--xfce-extra/xfce4-power-manager/metadata.xml8
-rw-r--r--xfce-extra/xfce4-power-manager/xfce4-power-manager-9999.ebuild34
2 files changed, 21 insertions, 21 deletions
diff --git a/xfce-extra/xfce4-power-manager/metadata.xml b/xfce-extra/xfce4-power-manager/metadata.xml
index db7b902..008cf47 100644
--- a/xfce-extra/xfce4-power-manager/metadata.xml
+++ b/xfce-extra/xfce4-power-manager/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>xfce</herd>
- <use>
- <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>
- </use>
+ <maintainer>
+ <email>xfce@gentoo.org</email>
+ <name>XFCE Team</name>
+ </maintainer>
</pkgmetadata>
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-9999.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-9999.ebuild
index 4d7468b..7838bef 100644
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-9999.ebuild
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-9999.ebuild
@@ -1,6 +1,6 @@
# 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.4.ebuild,v 1.1 2015/03/22 14:31:22 mgorny Exp $
+# $Id$
EAPI=5
inherit linux-info xfconf
@@ -11,27 +11,28 @@ HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-power-manager"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="debug kernel_linux lxpanel networkmanager policykit systemd +xfce_plugins_power"
+IUSE="debug kernel_linux 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=
+COMMON_DEPEND=">=dev-libs/glib-2.42:=
+ >=sys-power/upower-0.99.0
+ sys-power/pm-utils
+ >=x11-libs/gtk+-3.14:3=
>=x11-libs/libnotify-0.7
x11-libs/libX11:=
+ x11-libs/libXScrnSaver:=
>=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
+ x11-libs/libXtst:=
+ >=xfce-base/xfconf-4.12:=
+ >=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+ >=xfce-base/libxfce4util-4.12:=
+ policykit? (
+ >=sys-auth/polkit-0.112
+ !systemd? ( sys-auth/consolekit )
+ )
+ xfce_plugins_power? ( >=xfce-base/xfce4-panel-4.12:= )"
RDEPEND="${COMMON_DEPEND}
- networkmanager? ( net-misc/networkmanager )
- !systemd? ( || ( sys-power/pm-utils sys-power/upower-pm-utils ) )"
+ networkmanager? ( net-misc/networkmanager )"
DEPEND="${COMMON_DEPEND}
dev-util/intltool
sys-devel/gettext
@@ -48,7 +49,6 @@ pkg_setup() {
$(use_enable policykit polkit)
$(use_enable networkmanager network-manager)
$(use_enable xfce_plugins_power xfce4panel)
- $(use_enable lxpanel lxdepanel)
$(xfconf_use_debug)
)