xfce-extra/xfce4-power-manager: Replace XFCE_PLUGINS with a local flag

Closes: https://github.com/gentoo/gentoo/pull/5017

diff --git a/xfce-extra/xfce4-power-manager/metadata.xml b/xfce-extra/xfce4-power-manager/metadata.xml
index 359901b31db49298a74c801cf70f8a4560fe84ca..468e985aae473f7ddbadbcf66e265a7e0e8e2eab 100644 (file)
--- a/xfce-extra/xfce4-power-manager/metadata.xml
+++ b/xfce-extra/xfce4-power-manager/metadata.xml
@@ -5,4 +5,8 @@
     <email>xfce@gentoo.org</email>
     <name>XFCE Team</name>
   </maintainer>
+  <use>
+    <flag name='panel-plugin'>Build the power management plugin for
+      the XFCE panel</flag>
+  </use>
 </pkgmetadata>

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
index 57dab16b09f2d7cd28d1e45485b7a9020fd4fb8a..31a2ef1fd5be2fa42edbd39da1d43aa497b2f03a 100644 (file)
--- 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
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="debug kernel_linux networkmanager policykit systemd +xfce_plugins_power"
+IUSE="debug kernel_linux networkmanager +panel-plugin policykit systemd"
 
 COMMON_DEPEND=">=dev-libs/glib-2.42:=
        >=sys-power/upower-0.99.0
@@ -26,11 +26,11 @@ COMMON_DEPEND=">=dev-libs/glib-2.42:=
        >=xfce-base/xfconf-4.12:=
        >=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
        >=xfce-base/libxfce4util-4.12:=
+       panel-plugin? ( >=xfce-base/xfce4-panel-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 )"
 DEPEND="${COMMON_DEPEND}
@@ -50,7 +50,7 @@ src_configure() {
        local myconf=(
                $(use_enable policykit polkit)
                $(use_enable networkmanager network-manager)
-               $(use_enable xfce_plugins_power xfce4panel)
+               $(use_enable panel-plugin xfce4panel)
        )
 
        econf "${myconf[@]}"