Sort this out.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 27 insertions, 88 deletions

diff --git a/xfce-extra/xfce4-power-manager/metadata.xml b/xfce-extra/xfce4-power-manager/metadata.xml
index 70392ddac471..6c96e877de68 100644
--- a/xfce-extra/xfce4-power-manager/metadata.xml
+++ b/xfce-extra/xfce4-power-manager/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>xfce</herd>
-<use>
-	<flag name="xfce">Build Xfce4 panel plugins</flag>
-</use>
+	<herd>xfce</herd>
+	<use>
+		<flag name="panel-plugins">Build with panel plugins</flag>
+		<flag name="dpms">Build with DPMS support</flag>
+	</use>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-0.6.5.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-0.6.5.ebuild
deleted file mode 100644
index cd0c56e00b7b..000000000000
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-0.6.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2009 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-0.6.5.ebuild,v 1.1 2009/03/27 22:44:02 angelos Exp $
-
-EAPI=1
-
-inherit xfce4
-
-XFCE_VERSION=4.5.90
-
-xfce4_goodies
-
-DESCRIPTION="Xfce4 power manager"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug libnotify"
-
-RDEPEND=">=dev-libs/dbus-glib-0.70
-	>=dev-libs/glib-2.14:2
-	>=sys-apps/dbus-0.60
-	>=sys-apps/hal-0.5.6
-	>=x11-libs/gtk+-2.10:2
-	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}
-	>=xfce-base/xfconf-${XFCE_VERSION}
-	libnotify? ( >=x11-libs/libnotify-0.4.1 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool"
-
-pkg_setup() {
-	XFCE_CONFIG+=" $(use_enable libnotify)"
-}
-
-DOCS="AUTHORS NEWS README TODO"
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-0.8.2.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-0.8.2.ebuild
deleted file mode 100644
index fd21db0309f9..000000000000
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-0.8.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2009 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-0.8.2.ebuild,v 1.1 2009/08/01 01:26:02 darkside Exp $
-
-EAPI="1"
-
-inherit xfce4
-
-XFCE_VERSION=4.6.1
-
-xfce4_goodies
-
-DESCRIPTION="Xfce4 power manager"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +xfce"
-
-RDEPEND=">=dev-libs/dbus-glib-0.70
-	>=dev-libs/glib-2.16:2
-	gnome-base/libglade
-	>=sys-apps/dbus-0.60
-	>=sys-apps/hal-0.5.6
-	>=x11-libs/gtk+-2.10:2
-	>=x11-libs/libnotify-0.4.1
-	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}
-	>=xfce-base/xfconf-${XFCE_VERSION}
-	xfce? ( >=xfce-base/xfce4-panel-${XFCE_VERSION} )"
-DEPEND="${RDEPEND}
-	dev-util/intltool"
-
-pkg_setup() {
-	XFCE_CONFIG+=" $(use_enable xfce panel-plugins)"
-}
-
-DOCS="AUTHORS NEWS README TODO"
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-0.8.3.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-0.8.3.ebuild
index 85344b7d6557..9839721f9813 100644
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-0.8.3.ebuild
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-0.8.3.ebuild
@@ -1,36 +1,42 @@
 # Copyright 1999-2009 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-0.8.3.ebuild,v 1.1 2009/08/02 20:25:24 darkside Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/xfce4-power-manager-0.8.3.ebuild,v 1.2 2009/08/02 20:49:08 ssuominen Exp $
 
+EAPI=2
 inherit xfconf
 
-DESCRIPTION="Xfce4 power manager"
+DESCRIPTION="Power manager for Xfce4"
 HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-power-manager"
 SRC_URI="http://archive.xfce.org/src/apps/${PN}/0.8/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug +xfce"
+IUSE="debug doc +dpms +panel-plugins"
 
 RDEPEND=">=dev-libs/dbus-glib-0.70
 	>=dev-libs/glib-2.16:2
-	gnome-base/libglade
-	>=sys-apps/dbus-0.60
-	>=dev-libs/dbus-glib-0.70
+	>=gnome-base/libglade-2
 	>=sys-apps/hal-0.5.6
-	>=x11-libs/gtk+-2.12.0:2
+	>=x11-libs/gtk+-2.12:2
 	>=x11-libs/libnotify-0.4.1
-	>=xfce-base/libxfce4util-4.6.0
-	>=xfce-base/libxfcegui4-4.6.0
-	>=xfce-base/xfconf-4.6.0
-	xfce? ( >=xfce-base/xfce4-panel-4.6.0 )"
+	>=xfce-base/libxfce4util-4.6
+	>=xfce-base/libxfcegui4-4.6
+	>=xfce-base/xfconf-4.6
+	panel-plugins? ( >=xfce-base/xfce4-panel-4.6 )
+	dpms? ( x11-libs/libXext )"
 DEPEND="${RDEPEND}
-	dev-util/intltool"
+	dev-util/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext
+	x11-proto/xproto
+	doc? ( dev-libs/libxslt )"
 
 pkg_setup() {
-	XFCE_CONFIG+=" $(use_enable xfce panel-plugins)"
-	DOCS="AUTHORS NEWS README TODO"
+	XFCONF="--disable-dependency-tracking
+		$(use_enable dpms)
+		$(use_enable panel-plugins)
+		$(use_enable doc xsltproc)
+		$(use_enable debug)"
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
 }