summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Mende <angelos@gentoo.org>2014-09-18 20:45:54 +0200
committerChristoph Mende <angelos@gentoo.org>2014-09-18 20:45:54 +0200
commit224d86fed56c7e784a7f1ccabd3c6f3ea07c65d8 (patch)
treee2a5bfa545c651806911a7886a945abd0cee02cc
parentxfdesktop: Sync with gentoo-x86 (diff)
downloadxfce-224d86fed56c7e784a7f1ccabd3c6f3ea07c65d8.tar.gz
xfce-224d86fed56c7e784a7f1ccabd3c6f3ea07c65d8.tar.bz2
xfce-224d86fed56c7e784a7f1ccabd3c6f3ea07c65d8.zip
xfce4-power-manager: Sync with gentoo-x86
Package-Manager: portage-2.2.12 Manifest-Sign-Key: 84F20B43
-rw-r--r--xfce-extra/xfce4-power-manager/Manifest8
-rw-r--r--xfce-extra/xfce4-power-manager/xfce4-power-manager-9999.ebuild29
2 files changed, 8 insertions, 29 deletions
diff --git a/xfce-extra/xfce4-power-manager/Manifest b/xfce-extra/xfce4-power-manager/Manifest
index 0b4b541..49c9f6f 100644
--- a/xfce-extra/xfce4-power-manager/Manifest
+++ b/xfce-extra/xfce4-power-manager/Manifest
@@ -1,12 +1,12 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-EBUILD xfce4-power-manager-9999.ebuild 2371 SHA256 6e1a76e6edcd4a97ce139a21a74ae2151f7a326e125aa8511a819b22c83429f9 SHA512 003549fec72b18da11cfeadbff89a68ae996cd1f37d77013341bf3ef2a9bf8c2c7125a1732b5e6327dd0d03c2137c2d2b55ccae32d693936700eef46daa5270f WHIRLPOOL d39235fa03997e1d58d9e3779cfcf4c5011cd8be08529776ac07826b619de50fd17fc12841b2e2123f8d331da0482e88acceed66044a622a1240adbc7250d82a
+EBUILD xfce4-power-manager-9999.ebuild 1719 SHA256 141138119ba0f4e6e4166785b672c396c6280e11b194fdef32d1adca95d70272 SHA512 76b2586a429209d423371a06658faabb22a321a686db8c840ac7d435bbb25227c349d79349bf7cd9eadc29604071a7370c1fc3881659c388a71c72da2eeb99d7 WHIRLPOOL ce3427d981039502264fef9d21adcc7d4b2b6eff44fc52089afde15c98f6261c141ee8f9acbe469effa76556bcf8cd84e982f765b45d11fcd9b1cb3c7d36cefc
MISC metadata.xml 428 SHA256 62769fb5be40bcf110fde5a8a9953c8daf5e3437f704a7ff2562c1a80ce4e1f2 SHA512 ab61f18c675992c2c433eed83e10e1059236ff98870fe56d8c73f0777ce20a6d4f9bfaefc6bd9c5d8485a41da2e9a630d9ed3445f24c7e942e36813deca449db WHIRLPOOL c804ae4b88811f57e2e738692d07cb69a2f993619358f0badf7c65309001a47de175dbfd40642dfe15ec90580036d49947faaf8fc7862b1333e6a3355a0d32bb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iF4EAREIAAYFAlQHdRMACgkQmWq1bYTyC0P8vQEAxMezA8riF1gcj3285v8wjff2
-oxnbJnmDTACOn8DCRTgA/ioWQpX2HJQVQZHVLp+eoSduSeFihF16EkGSMig4JFfn
-=46FN
+iF4EAREIAAYFAlQbKGIACgkQmWq1bYTyC0NtBAEAvAjalW2Yrw3CrRM4up97lF9m
+x/+hdXXBqz5SJeTnqIsBAIvQ4VnCYnDa0xRsYAo/PNgole8TDusQrBMJRPITrJQP
+=rTTE
-----END PGP SIGNATURE-----
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
-}