Clean up.

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

3 files changed, 10 insertions, 52 deletions

diff --git a/xfce-extra/xfce4-power-manager/metadata.xml b/xfce-extra/xfce4-power-manager/metadata.xml
index 6c96e877de68..2996ea5a870a 100644
--- a/xfce-extra/xfce4-power-manager/metadata.xml
+++ b/xfce-extra/xfce4-power-manager/metadata.xml
@@ -1,9 +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="panel-plugins">Build with panel plugins</flag>
-		<flag name="dpms">Build with DPMS support</flag>
-	</use>
+  <herd>xfce</herd>
+  <use>
+    <flag name="plugins">Build 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.8.3.1.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-0.8.3.1.ebuild
index c50e4aded06b..fcd11437848a 100644
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-0.8.3.1.ebuild
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-0.8.3.1.ebuild
@@ -1,8 +1,8 @@
 # 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.1.ebuild,v 1.1 2009/08/10 14:30:09 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/xfce4-power-manager-0.8.3.1.ebuild,v 1.2 2009/08/25 11:16:37 ssuominen Exp $
 
-EAPI="2"
+EAPI=2
 inherit xfconf
 
 DESCRIPTION="Power manager for Xfce4"
@@ -12,7 +12,7 @@ SRC_URI="http://archive.xfce.org/src/apps/${PN}/0.8/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug doc +dpms +panel-plugins"
+IUSE="debug doc +dpms +plugins"
 
 RDEPEND=">=dev-libs/dbus-glib-0.70
 	>=dev-libs/glib-2.16:2
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.70
 	>=xfce-base/libxfce4util-4.6
 	>=xfce-base/libxfcegui4-4.6
 	>=xfce-base/xfconf-4.6
-	panel-plugins? ( >=xfce-base/xfce4-panel-4.6 )
+	plugins? ( >=xfce-base/xfce4-panel-4.6 )
 	dpms? ( x11-libs/libXext )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -35,7 +35,7 @@ DEPEND="${RDEPEND}
 pkg_setup() {
 	XFCONF="--disable-dependency-tracking
 		$(use_enable dpms)
-		$(use_enable panel-plugins)
+		$(use_enable plugins panel-plugins)
 		$(use_enable doc xsltproc)
 		$(use_enable debug)"
 	DOCS="AUTHORS ChangeLog 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
deleted file mode 100644
index 9839721f9813..000000000000
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-0.8.3.ebuild
+++ /dev/null
@@ -1,42 +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.3.ebuild,v 1.2 2009/08/02 20:49:08 ssuominen Exp $
-
-EAPI=2
-inherit xfconf
-
-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 doc +dpms +panel-plugins"
-
-RDEPEND=">=dev-libs/dbus-glib-0.70
-	>=dev-libs/glib-2.16:2
-	>=gnome-base/libglade-2
-	>=sys-apps/hal-0.5.6
-	>=x11-libs/gtk+-2.12:2
-	>=x11-libs/libnotify-0.4.1
-	>=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/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext
-	x11-proto/xproto
-	doc? ( dev-libs/libxslt )"
-
-pkg_setup() {
-	XFCONF="--disable-dependency-tracking
-		$(use_enable dpms)
-		$(use_enable panel-plugins)
-		$(use_enable doc xsltproc)
-		$(use_enable debug)"
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-}