Clean USE flags as suggested in bug #313129, thanks to Diego and Plaes for their work.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 19 insertions, 13 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index 7fca31014229..f476a05c1179 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-applets
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.313 2010/07/11 11:20:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.314 2010/07/12 13:14:51 pacho Exp $
+
+  12 Jul 2010; Pacho Ramos <pacho@gentoo.org> gnome-applets-2.30.0.ebuild,
+  metadata.xml:
+  Clean USE flags as suggested in bug #313129, thanks to Diego and Plaes for
+  their work.
 
   11 Jul 2010; Pacho Ramos <pacho@gentoo.org> gnome-applets-2.26.3.ebuild:
   Drop hppa keyword per bug #324511.
diff --git a/gnome-base/gnome-applets/gnome-applets-2.30.0.ebuild b/gnome-base/gnome-applets/gnome-applets-2.30.0.ebuild
index 3b390df52f64..774b6a2e1e40 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.30.0.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.30.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.30.0.ebuild,v 1.1 2010/06/13 18:55:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.30.0.ebuild,v 1.2 2010/07/12 13:14:51 pacho Exp $
 
 inherit eutils gnome2 python
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="GPL-2 FDL-1.1 LGPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="acpi apm doc gnome gstreamer hal ipv6 networkmanager policykit"
+IUSE="battstat doc gnome gstreamer hal ipv6 networkmanager policykit"
 
 # TODO: configure says python stuff is optional
 # my secret script says cpufrequtils might be needed in RDEPEND
@@ -32,8 +32,7 @@ RDEPEND=">=x11-libs/gtk+-2.13
 	>=virtual/python-2.4
 	x11-libs/libX11
 
-	apm? ( sys-apps/apmd $HALDEPEND )
-	acpi? ( $HALDEPEND )
+	battstat? ( $HALDEPEND )
 	gnome?	(
 		>=gnome-base/libgnomekbd-2.21.4.1
 		gnome-base/gnome-settings-daemon
@@ -86,18 +85,15 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-scrollkeeper
 		--disable-schemas-install
+		--without-hal
 		$(use_enable gstreamer mixer-applet)
-		$(use_with hal)
+		$(use_enable battstat)
 		$(use_enable ipv6)
 		$(use_enable networkmanager)
 		$(use_enable policykit polkit)"
 
-	if ! use ppc && ! use apm && ! use acpi; then
-		G2CONF="${G2CONF} --disable-battstat"
-	fi
-
-	if use ppc && ! use apm; then
-		G2CONF="${G2CONF} --disable-battstat"
+	if use battstat; then
+		G2CONF="${G2CONF} $(use_with hal)"
 	fi
 }
 
@@ -127,7 +123,7 @@ src_install() {
 pkg_postinst() {
 	gnome2_pkg_postinst
 
-	if use acpi && ! use hal ; then
+	if use battstat && ! use hal ; then
 		elog "It is highly recommended that you install acpid if you use the"
 		elog "battstat applet to prevent any issues with other applications"
 		elog "trying to read acpi information."
diff --git a/gnome-base/gnome-applets/metadata.xml b/gnome-base/gnome-applets/metadata.xml
index da6fd63d0085..2b382c2192f9 100644
--- a/gnome-base/gnome-applets/metadata.xml
+++ b/gnome-base/gnome-applets/metadata.xml
@@ -2,4 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<use>
+	<flag name="battstat">Enable deprecated battery applet for people
+	unable to use <pkg>gnome-extra/gnome-power-manager</pkg>
+	instead.</flag>
+</use>
 </pkgmetadata>