Cleanup. Make sure to keep xfce4-power-manager-1.4.1 as long as bug #531694 is not resolved upstream.

Package-Manager: portage-2.2.18/cvs/Linux x86_64

6 files changed, 9 insertions, 235 deletions

diff --git a/xfce-extra/xfce4-power-manager/ChangeLog b/xfce-extra/xfce4-power-manager/ChangeLog
index 0764d3074aa0..9e5e00ed1b3e 100644
--- a/xfce-extra/xfce4-power-manager/ChangeLog
+++ b/xfce-extra/xfce4-power-manager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-extra/xfce4-power-manager
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/ChangeLog,v 1.91 2015/03/22 14:31:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/ChangeLog,v 1.92 2015/04/22 14:54:07 calchan Exp $
+
+  22 Apr 2015; Denis Dupeyron <calchan@gentoo.org>
+  -xfce4-power-manager-1.4.0.ebuild, -xfce4-power-manager-1.4.2.ebuild,
+  -xfce4-power-manager-1.4.3.ebuild,
+  -files/xfce4-power-manager-1.4.0-fix-handle-lid-switch.patch:
+  Cleanup. Make sure to keep xfce4-power-manager-1.4.1 as long as bug #531694
+  is not resolved upstream.
 
 *xfce4-power-manager-1.4.4 (22 Mar 2015)
 
diff --git a/xfce-extra/xfce4-power-manager/Manifest b/xfce-extra/xfce4-power-manager/Manifest
index 8e44896ab23a..e6a11292101f 100644
--- a/xfce-extra/xfce4-power-manager/Manifest
+++ b/xfce-extra/xfce4-power-manager/Manifest
@@ -1,38 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX xfce4-power-manager-1.3.0-restore_brightness_level_after_sleep.patch 2393 SHA256 585d9e78b1475817d4692bdde9dc3141c79c44a7f20e7b952aebe0495038bf26 SHA512 785c3ace4fdd9617cc4f2a2038262697c328f348f8f12f3383196ee99d8a9c1021aaf481967f5da592fa632342fabcb7bd62e6751f6041afc27f26ae79a7c6f5 WHIRLPOOL 1c252a287ed79816429582018bf01c8b9f6094d3482fa3f16380ae3fa145bf538d73461f71eb3dde01cf053e0492add0ce94dbbfdd1f100db0618d41a1d516e8
-AUX xfce4-power-manager-1.4.0-fix-handle-lid-switch.patch 1044 SHA256 68e68f3a35d59b8e5af81034e240ca9a496abc9ab913daac87ddabfe8b964bbf SHA512 ba0b6c84f34ae9c8438f926b3b4c2961baf0b3fc746d9721abe4661aadb844f4d7532eec4de419c7f73dd3e7f4f93d350fb7f81623f2a3e5417449ce1f0c1942 WHIRLPOOL f4b79a8c699a81b53e20e3c902b039bcef1e6901f7b6112d1a865a04f835171125ab253e41635281dccbe94ef1151ba2ea85fa3d552654cc7abdd3c82d58dc16
 DIST xfce4-power-manager-1.3.0.tar.bz2 1207141 SHA256 05beaede28078a19a5a397d5d03e5c72fd6fbc57ce627ee6fd84630993b415e0 SHA512 bdffa36c1480a33531062b3f484c3488939089bdd78545147cfc917bd01023a480bbe417d8212ce6e415a2439c82e80863d23030273ff9fa87a8369c6b539b9f WHIRLPOOL 78c842aa6b3b1bb6fbc28386c470692d73e8d877674cc0982806dadcaf225834a016cdf480a583a49a3bd36ba04979aff19ec4a574ecf709f4a6424700cf356b
-DIST xfce4-power-manager-1.4.0.tar.bz2 1108569 SHA256 3fba9d1bdb2f535e5a5c2a832503368d26629d6fe496c547fa93a3278d2cf6e7 SHA512 3e05bbc2c6a2c20309d01be49998b1b868491da5666167f0f0e1d51fd261ada7dba4eb3a9a60a2631f5238f443c2cfe5630645aad64e04bbe99f98367deed815 WHIRLPOOL 0828e9f3ab4f7f33577493c2589eb297503b5955b019085dc1adbf4189bd0440ca5ffca36383ec8e413b13b25c84dc0d24715805955ed00cdd30588d6ae719ad
 DIST xfce4-power-manager-1.4.1.tar.bz2 1112797 SHA256 16a9e9bf3e0f8480d05b248817fbdc59e701e9161d3d0c7e53f3de28ed491f58 SHA512 ba6cc1b8304fd5d563da409c22e4ffc92ceed5e990bfa67cd13f430aba7795e8097845e38050cb8cf0a23e2a9f6b4bdb0747d6c413e76bd39be5bb5932613d34 WHIRLPOOL 07a6415d41a95057dde941e61b495ad9f1c30995f331f0aea1fc83f2507aee70ea98d01e0cf1ff9e43e3ab4a281305b32833c6dc3d4aaa1076daf8bb5f41660a
-DIST xfce4-power-manager-1.4.2.tar.bz2 1124605 SHA256 f28bad9270a155566e5ccf03de91c9cce7516e28192f3c0259a620bbce9d6b97 SHA512 9a349167a0f4eb8701459f8170a79aba94b41b82fb183f7b1e2859449b5e0122d71fafec3f02817ecd399458c7cb0416fe26384b7cf494a9ba90dd6936562ac1 WHIRLPOOL 90f00ee33787928dd4621cb5ae49ba0b5d840153e290d301b263097a764fd6f824a4fb4ffc90768b0e4beb16c71c378718e834df0986b5174236df99e4fffc98
-DIST xfce4-power-manager-1.4.3.tar.bz2 1138831 SHA256 018e11dd315745f582d70108b6071d37fb94854fde70961e17325bc19c4e2011 SHA512 fb3643d2527f365f129e98cacee71e587786587ac070f47cecff035b85962ea7c4ba47fbc58fc64ecafc0fe9120acb20fef0b0ef90c47450740c1bf107bcb86b WHIRLPOOL 83fd30d2d2e117ffe52bb6ee15a70d3ba3f662b5b4deee7c2b56609c1c5f041e02e5b97f8ae961d3f1f0e90ee8d0c9b15888bee46594ddde341f4988e6d3e4cf
 DIST xfce4-power-manager-1.4.4.tar.bz2 1144421 SHA256 c50ec8aa7e7848c57c0f856dceb8132eb5f37585f0ac1627459ab8c882c73b07 SHA512 40eb886e9316bedf02d2a6ff94f9045bd4094070a09b77e0005a1a7e5d281db7ab2ea96d6846efadeb3bb852bd301af03a0fd5b99d611fe43a763154c77390dc WHIRLPOOL 7e60e40e6bdadbd0d2ce421c308266244485b503e7a42aafd71a3d794ac2150dd4a7dd7cbeac0829d95e3be5ba43bf3b5cabeaa1ebe50a2d4082d46c1edd4977
 EBUILD xfce4-power-manager-1.3.0.ebuild 2508 SHA256 90ebf5678a6531308ed07ababcba24b4dc14cf91b15276217679568c7c12e8f1 SHA512 c185d5cf87795511a321cfc02f20ccc06e8e7e8dd07ad8df53243070cc962a7219638fda16f26561a8268a2829cee6eb95415c88b15e87129688ea2afcb3a57c WHIRLPOOL a2b18035171161bab7a7dcafe28e74fd4f6265978570866bb9dedd3ccb1a6b81cccbab9412b3f80a364aa5355bbefc9c88f21f6e421ffdf55c1e12ac032a7f32
-EBUILD xfce4-power-manager-1.4.0.ebuild 1862 SHA256 9eca65a39818044f3780c6deeacb7ebe330b8e98090d877836975db782ebf73f SHA512 6e1f1912e1cf138dbf9744001a6b5c3cf9e897dbcc8039d4125c9b9d55999e3d23c90086cd44ebf826ebff6c2fcf83de80c8fbbcf5725e168197fcea66668fdf WHIRLPOOL b136a23bbee04bfe65f6e5d8c67945d03f2d4339704bfbaff277d172591629d98930d3b9a165c5ce0471f72b638b52a2155fcf1f57ce854afad80f19cf0df050
 EBUILD xfce4-power-manager-1.4.1.ebuild 1801 SHA256 c418fed58bcfc1f8c0cc05e583f81baa804e45997b54e3c1522e821d0750e7f3 SHA512 a29e1e8d4033192dbc7887f0ea3f719eeae19d99b51831a50edcbbfa446c5dbf406d3e1cdcb254cc6611f06e45011fdc107654640ee19b7edff1708d19e0c518 WHIRLPOOL 81fa1b47aa662515b5b843f16f9cc4a74c292c161d14864fdf91972dfa361c37908cff2f629f1d33a6f1d42a8796e8fa048eaa8bc4a248b58fb0e23ed17dd9e3
-EBUILD xfce4-power-manager-1.4.2.ebuild 1800 SHA256 c0cb18239b6ac60bee2723c4cd637bb7385c503c85551cd8c95f92bc78a09521 SHA512 6878a906c32202d251c95b33a1488751b3e4819eef62602e341113724db33009e656b8440f2fc7f27ef6aed10f95ad498c75d514452657fb3d885ce4dd6b8331 WHIRLPOOL 8e7697866926778ca15b02c6dd9e8bf9cfea09ab9dc2daebd5f7252f7c6e6321b293147487ce1b5ccffeea891845551c4734cf4ac6a3268fdf2e910f666cd24e
-EBUILD xfce4-power-manager-1.4.3.ebuild 1798 SHA256 3ae32d917ec7eddbc844cd93aa7a814962593c318d904e1981d0df9ce530ab1d SHA512 9a4e045281b0f6b73419b51ef51884fb15b0804809245017ab0b416a02dbd842d760d7ca8a617ce235d5b04c91b8451d9dc51b672bf68f2d1843a2679397b023 WHIRLPOOL bc8590c080f12b2d035ad01aaaa269d275ca851b8b0abd9c4ded1fc0d53df3cea1a012ecd176b7a06c59f436857dc38b08098c33ceb42de095a0ee0f15aefcd9
 EBUILD xfce4-power-manager-1.4.4.ebuild 1812 SHA256 4728841d29ce7867e180e1a8a19324c7b5e7a264c34492de4bb3aedd315e7033 SHA512 ccc5c6e2388c03ff283a55f41e3ec3c81220de95f527dcd0b803fa2608ca091d1c57cd60bc1f3ab722d79b83397df93afa88480e1769970dcbec9275dc73a18d WHIRLPOOL e067cf75ae840175f5733cc23a253ac4fae5d9789eaf10b251c92b3e1ecd8b31b07fa87f34c7e570913c457863bbe8a3d9db7ea6a6f99827de311e28e7c2d3bc
-MISC ChangeLog 15576 SHA256 422f5ec1b344d9eee68cad8b112ff63fdf04fb0d167b3ffd5c9d67e8765e16dd SHA512 e504309a6bddd489c28c52e65b811237cd229088c747e6dc2c3ba98dd7cb2faaac16056e07449f0c6e60d23f0cd7426e7257ea0ce414314b7432d267487f4266 WHIRLPOOL 2f4a616c46e394eb73825af2de291cf15b34aae0fe03dedc7d979c62d484ee4e956dad045ab0514592d2941913ba1e57705a279a6ebd9fd66e3cf4d48e2791fd
+MISC ChangeLog 15908 SHA256 4300846d7b9546d710a2bfb4a9c807f2635271f11387a1eea2d5dd36dd2a1563 SHA512 f72be2f46dd19f2255058261f3d26690cb5a35a0a70abe2400b3a8fcc273d51b4a067d1d53479c1053806e96308dfec518d61bb5b5c15fe108e5c78a16466f97 WHIRLPOOL c3b3fe54994dc8754e29116b1d7e6465365540eb0fe10dd47bd983f0aefebcebbbc3e069bcfb49eff0a82031ae7df7266b2808e1f99f19dcba9a86e6533e0f7b
 MISC metadata.xml 328 SHA256 f2c527a7d705dba4f89e8d4ee9e8753a1b02d76e807c543e0828cd552e36fa4a SHA512 3d2fb44a95a8f5efef609fd9055d79c1dabb6f83647671e7b41039ecaa96622878bf1d01fd23f563934668e3af22c7ae9e692789efcb7f81637b4e3fa1ea798d WHIRLPOOL 0080330bfccb679e920c1dd333433e33a27b2b52bb8a22cb341251e68e8e7ce108a040470eac9f57d3c9b28cae375cc533be1539ed025e6df9850709450a5bb5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQJ8BAEBCABmBQJVDtI7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZONgkP/2yc/VgFWzAm0Z5s3OXV/otC
-/V/u7gCu9lb5Zsk6XVcDXrwkBA9sMOQAbHB+8BgEVQLjzm72/mn1pe7sRiJY6mGi
-rs8dlsU4Q9vudiQ2a8zcq4wQj8GHUfRe+WyE1g6UYYp6/J93dIkPKRVOh/3oUfxS
-seIOgCDJnhVhAdSETC9KvufFFhBEjryggHNFr829aeilfdsdGyy7xvvuFnHab9Yl
-r3iVNmHShsrI7s33bWXKiia5XLHW6254NOTLzIcHeRsd0LUnhyxW8P7hau8clJTx
-kj3s59n9D0YLrrwYw1ZGDyIoYpKGR36QAlhww7Nehgs/6O0xc5VhpUhbYyWZNp6H
-KSj7nnBcVOAr+hitlBKE7Bv10HECBysflKaCinmWJRYKovos7iznsh1ckPqKlm3W
-o8sZTb3g72L/JzUXSZL3TQEeT6Ah6JveP7/3iEWz2mcgqyajNDZmLrrz2mMpB7Kv
-/ZzLliamDJ8eIAAdqUw4pmEQWszgQDiT9/JBQ+zQNn49uSA+3b/IY8YaqQ+NkKfx
-+DxV63Y7vKmEZUgH8rmkSyT4zkDkAoQ57aucUBKIyvuERwsvXtwkw2zZQyibZrne
-G0LrHDPybhrT74dz2WzObw2Wy7gp30BwdMC08N8nonq7+IcQu00j28OyEHeYt4ET
-X5BCDVWJpUM+Uq78IegG
-=ggA5
------END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.4.0-fix-handle-lid-switch.patch b/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.4.0-fix-handle-lid-switch.patch
deleted file mode 100644
index df4320462544..000000000000
--- a/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.4.0-fix-handle-lid-switch.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-http://bugzilla.xfce.org/show_bug.cgi?id=11160
-
-From d61db320d8a893a292812256470a873c7ce1b35d Mon Sep 17 00:00:00 2001
-From: Eric Koegel <eric.koegel@gmail.com>
-Date: Mon, 15 Sep 2014 14:35:00 +0300
-Subject: [PATCH] Fix handle lid switch with loginD (Bug 11160)
-
-The xfconf settings logic for logind interactions were inverted
-in commit: 03193df6cad651841e8d9960335b4a3bf13afdad
-However the handle lid switch in the xfpm_manager_lid_changed_cb
-also needs to be inverted. This patch fixes it. Patch submitted
-by Simon P.
----
- src/xfpm-manager.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/xfpm-manager.c b/src/xfpm-manager.c
-index d6c533c..9549b66 100644
---- a/src/xfpm-manager.c
-+++ b/src/xfpm-manager.c
-@@ -335,7 +335,7 @@ xfpm_manager_lid_changed_cb (XfpmPower *power, gboolean lid_is_closed, XfpmManag
-               LOGIND_HANDLE_LID_SWITCH, &logind_handle_lid_switch,
-               NULL);
- 
--        if (!logind_handle_lid_switch)
-+        if (logind_handle_lid_switch)
-             return;
-     }
- 
--- 
-2.1.0
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.0.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.0.ebuild
deleted file mode 100644
index 4e274e29baca..000000000000
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.4.0.ebuild,v 1.1 2014/09/16 11:12:16 ssuominen Exp $
-
-EAPI=5
-inherit linux-info multilib xfconf
-
-DESCRIPTION="Power manager for the Xfce desktop environment"
-HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-power-manager"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-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
-	>=sys-apps/dbus-1.6.18
-	|| ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23-r2 )
-	>=x11-libs/gtk+-2.24:2
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	>=x11-libs/libXrandr-1.2
-	x11-libs/libXext
-	>=xfce-base/xfconf-4.10
-	>=xfce-base/libxfce4ui-4.10
-	>=xfce-base/libxfce4util-4.10
-	lxpanel? ( lxde-base/lxpanel )
-	policykit? ( >=sys-auth/polkit-0.112 )
-	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 )
-	!systemd? ( || ( sys-power/pm-utils sys-power/upower-pm-utils ) )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xproto"
-
-pkg_setup() {
-	if use kernel_linux; then
-		CONFIG_CHECK="~TIMER_STATS"
-		linux-info_pkg_setup
-	fi
-
-	PATCHES=( "${FILESDIR}"/${P}-fix-handle-lid-switch.patch )
-
-	XFCONF=(
-		$(use_enable policykit polkit)
-		$(use_enable networkmanager network-manager)
-		$(use_enable xfce_plugins_power xfce4panel)
-		$(use_enable lxpanel lxdepanel)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS NEWS README TODO )
-}
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.2.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.2.ebuild
deleted file mode 100644
index f0ae22922b62..000000000000
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.4.2.ebuild,v 1.1 2014/12/03 05:39:40 williamh Exp $
-
-EAPI=5
-inherit linux-info multilib xfconf
-
-DESCRIPTION="Power manager for the Xfce desktop environment"
-HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-power-manager"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-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
-	>=sys-apps/dbus-1.6.18
-	|| ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23-r2 )
-	>=x11-libs/gtk+-2.24:2
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	>=x11-libs/libXrandr-1.2
-	x11-libs/libXext
-	>=xfce-base/xfconf-4.10
-	>=xfce-base/libxfce4ui-4.10
-	>=xfce-base/libxfce4util-4.10
-	lxpanel? ( lxde-base/lxpanel )
-	policykit? ( >=sys-auth/polkit-0.112 )
-	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 )
-	!systemd? ( || ( sys-power/pm-utils sys-power/upower-pm-utils ) )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xproto"
-
-pkg_setup() {
-	if use kernel_linux; then
-		CONFIG_CHECK="~TIMER_STATS"
-		linux-info_pkg_setup
-	fi
-
-	XFCONF=(
-		$(use_enable policykit polkit)
-		$(use_enable networkmanager network-manager)
-		$(use_enable xfce_plugins_power xfce4panel)
-		$(use_enable lxpanel lxdepanel)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS NEWS README TODO )
-}
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.3.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.3.ebuild
deleted file mode 100644
index c86fcc715ae2..000000000000
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 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.4.3.ebuild,v 1.1 2015/03/08 15:06:39 mgorny Exp $
-
-EAPI=5
-inherit linux-info multilib xfconf
-
-DESCRIPTION="Power manager for the Xfce desktop environment"
-HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-power-manager"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-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
-	>=sys-apps/dbus-1.6.18
-	|| ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23-r2 )
-	>=x11-libs/gtk+-2.24:2
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	>=x11-libs/libXrandr-1.2
-	x11-libs/libXext
-	>=xfce-base/xfconf-4.10
-	>=xfce-base/libxfce4ui-4.10
-	>=xfce-base/libxfce4util-4.10
-	lxpanel? ( lxde-base/lxpanel )
-	policykit? ( >=sys-auth/polkit-0.112 )
-	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 )
-	!systemd? ( || ( sys-power/pm-utils sys-power/upower-pm-utils ) )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xproto"
-
-pkg_setup() {
-	if use kernel_linux; then
-		CONFIG_CHECK="~TIMER_STATS"
-		linux-info_pkg_setup
-	fi
-
-	XFCONF=(
-		$(use_enable policykit polkit)
-		$(use_enable networkmanager network-manager)
-		$(use_enable xfce_plugins_power xfce4panel)
-		$(use_enable lxpanel lxdepanel)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS NEWS README TODO )
-}