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 -}
