From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-733148-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 6D81313838B
for <garchives@archives.gentoo.org>; Thu, 18 Sep 2014 18:46:09 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 7383FE08D1;
Thu, 18 Sep 2014 18:46:08 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id C40CCE08D1
for <gentoo-commits@lists.gentoo.org>; Thu, 18 Sep 2014 18:46:07 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id C273E34025E
for <gentoo-commits@lists.gentoo.org>; Thu, 18 Sep 2014 18:46:06 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 0F64F5E89
for <gentoo-commits@lists.gentoo.org>; Thu, 18 Sep 2014 18:46:05 +0000 (UTC)
From: "Christoph Mende" <angelos@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Mende" <angelos@gentoo.org>
Message-ID: <1411065954.224d86fed56c7e784a7f1ccabd3c6f3ea07c65d8.angelos@gentoo>
Subject: [gentoo-commits] proj/xfce:master commit in: xfce-extra/xfce4-power-manager/
X-VCS-Repository: proj/xfce
X-VCS-Files: xfce-extra/xfce4-power-manager/xfce4-power-manager-9999.ebuild
X-VCS-Directories: xfce-extra/xfce4-power-manager/
X-VCS-Committer: angelos
X-VCS-Committer-Name: Christoph Mende
X-VCS-Revision: 224d86fed56c7e784a7f1ccabd3c6f3ea07c65d8
X-VCS-Branch: master
Date: Thu, 18 Sep 2014 18:46:05 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 635d1310-79d6-4117-a8d9-557a77fa3a7a
X-Archives-Hash: e48d4dad6d7b541b613b6d8e01c2b10c
commit: 224d86fed56c7e784a7f1ccabd3c6f3ea07c65d8
Author: Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 18 18:45:54 2014 +0000
Commit: Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Thu Sep 18 18:45:54 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/xfce.git;a=commit;h=224d86fe
xfce4-power-manager: Sync with gentoo-x86
Package-Manager: portage-2.2.12
Manifest-Sign-Key: 84F20B43
---
.../xfce4-power-manager-9999.ebuild | 29 +++-------------------
1 file changed, 4 insertions(+), 25 deletions(-)
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 6e749b2..9e7872a 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-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.3.1.ebuild,v 1.1 2014/08/20 07:06:28 ssuominen Exp $
+# $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
@@ -11,7 +11,7 @@ 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_battery +xfce_plugins_brightness"
+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
@@ -27,8 +27,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.100.2
>=xfce-base/libxfce4util-4.10
lxpanel? ( lxde-base/lxpanel )
policykit? ( >=sys-auth/polkit-0.112 )
- xfce_plugins_battery? ( >=xfce-base/xfce4-panel-4.10 )
- xfce_plugins_brightness? ( >=xfce-base/xfce4-panel-4.10 )"
+ 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 )
@@ -48,30 +47,10 @@ pkg_setup() {
XFCONF=(
$(use_enable policykit polkit)
$(use_enable networkmanager network-manager)
+ $(use_enable xfce_plugins_power xfce4panel)
$(use_enable lxpanel lxdepanel)
$(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-xfce4panel )
- 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
-}