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/
Date: Sun, 09 Jul 2017 21:41:40
Message-Id: 1499636479.e37fbbfe94df6e030a906b1fcba785f198d57031.mgorny@gentoo
1 commit: e37fbbfe94df6e030a906b1fcba785f198d57031
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 1 07:57:03 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 9 21:41:19 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e37fbbfe
7
8 xfce-extra/xfce4-power-manager: Replace XFCE_PLUGINS with a local flag
9
10 Closes: https://github.com/gentoo/gentoo/pull/5017
11
12 xfce-extra/xfce4-power-manager/metadata.xml | 4 ++++
13 .../xfce4-power-manager/xfce4-power-manager-1.6.0-r1.ebuild | 8 ++++----
14 2 files changed, 8 insertions(+), 4 deletions(-)
15
16 diff --git a/xfce-extra/xfce4-power-manager/metadata.xml b/xfce-extra/xfce4-power-manager/metadata.xml
17 index 359901b31db..468e985aae4 100644
18 --- a/xfce-extra/xfce4-power-manager/metadata.xml
19 +++ b/xfce-extra/xfce4-power-manager/metadata.xml
20 @@ -5,4 +5,8 @@
21 <email>xfce@g.o</email>
22 <name>XFCE Team</name>
23 </maintainer>
24 + <use>
25 + <flag name='panel-plugin'>Build the power management plugin for
26 + the XFCE panel</flag>
27 + </use>
28 </pkgmetadata>
29
30 diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.0-r1.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.0-r1.ebuild
31 index 57dab16b09f..31a2ef1fd5b 100644
32 --- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.0-r1.ebuild
33 +++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.0-r1.ebuild
34 @@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
35 LICENSE="GPL-2"
36 SLOT="0"
37 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
38 -IUSE="debug kernel_linux networkmanager policykit systemd +xfce_plugins_power"
39 +IUSE="debug kernel_linux networkmanager +panel-plugin policykit systemd"
40
41 COMMON_DEPEND=">=dev-libs/glib-2.42:=
42 >=sys-power/upower-0.99.0
43 @@ -26,11 +26,11 @@ COMMON_DEPEND=">=dev-libs/glib-2.42:=
44 >=xfce-base/xfconf-4.12:=
45 >=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
46 >=xfce-base/libxfce4util-4.12:=
47 + panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= )
48 policykit? (
49 >=sys-auth/polkit-0.112
50 !systemd? ( sys-auth/consolekit )
51 - )
52 - xfce_plugins_power? ( >=xfce-base/xfce4-panel-4.12:= )"
53 + )"
54 RDEPEND="${COMMON_DEPEND}
55 networkmanager? ( net-misc/networkmanager )"
56 DEPEND="${COMMON_DEPEND}
57 @@ -50,7 +50,7 @@ src_configure() {
58 local myconf=(
59 $(use_enable policykit polkit)
60 $(use_enable networkmanager network-manager)
61 - $(use_enable xfce_plugins_power xfce4panel)
62 + $(use_enable panel-plugin xfce4panel)
63 )
64
65 econf "${myconf[@]}"