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

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

4 files changed, 25 insertions, 19 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/Manifest b/gnome-base/gnome-applets/Manifest
index e30832e92923..972701077f52 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -10,13 +10,13 @@ DIST gnome-applets-2.30.0.tar.bz2 9919459 RMD160 ad3c2bb2062de7599a8a34403bf517b
 EBUILD gnome-applets-2.26.3-r1.ebuild 4194 RMD160 9891286d9a87133136edaffd17e90cde7b1f57f8 SHA1 e204b312a329d9b8a889e8882d5b740d2d1375d8 SHA256 41126f9ae285e8383564bd70e00bf4dee197e87967bad5646195c650cb0b6c75
 EBUILD gnome-applets-2.26.3.ebuild 4199 RMD160 798715c44b795a478bc5728a950227e3522cb043 SHA1 a3940273df03caec61eda308d35afd9702168e13 SHA256 36c71faeea4327af864a40deb22a48251da90cb47b9e623fa421f7eb3f656120
 EBUILD gnome-applets-2.28.0.ebuild 4065 RMD160 37ecc280cbb996195ffbdc2238864d01c89518dc SHA1 274dd24b5f885bc52f46b4407e63a50a4b49b066 SHA256 8105645a894d3d402cd0aadc2cacb1efceabc7ef828ba8b952df30ae0dbfbddf
-EBUILD gnome-applets-2.30.0.ebuild 3962 RMD160 6de3df3122e0774c978c88e75d8d95c589d2ba90 SHA1 dd535494d448c075fba96702a13975ef7802f33b SHA256 08c70de42c28ff374e3d4d73432c29094af00ad28885e6f6772f2fa7ff98dcb0
-MISC ChangeLog 44999 RMD160 be9d6a3f5c90fd89b63b1ad9df263cd2fc3d12f0 SHA1 f16f2f23648d5c31aa4b5ad0adaf6d190ea47e8e SHA256 350db608ba5781508de208f543b3d40a65b4f7638e3ed667af91d20a2c86c3c9
-MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+EBUILD gnome-applets-2.30.0.ebuild 3855 RMD160 c4e2ddd9a11fbcc75abef654da18ed265c3f28ea SHA1 c1c129c4b34d515bd05e40ed51b48194b3981df2 SHA256 066dedd2c8fff7e4b5a2d0f49ec1f7144f90ebda1e775583b947fba27ec3131c
+MISC ChangeLog 45182 RMD160 e518c25d39e52c70a27a7ed92df79118a2ee9ac9 SHA1 e5b1a70d74fa134c1bc8baace7df0a7c61970d13 SHA256 074c5ca8fa31d37f639fb1c34b463054b2608ef05a74cc2fe2a707ade03071a7
+MISC metadata.xml 313 RMD160 378fcac5ad9324a5f93413ddb9b73ff34ec7dbf3 SHA1 b1f8d11380da2ff0dd9927ac85345026facc1c96 SHA256 d54765f0855da98c60cd16672b306e2f0f8a17c4ee0a765e6d6653c47f75ee60
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkw5qPcACgkQCaWpQKGI+9TeHACcCokPi4LhmoY3fDW8gJ/BuZE/
-JkoAn2lSmmyUyw9uVz95bagihhDqQImb
-=7zpd
+iEYEARECAAYFAkw7FVYACgkQCaWpQKGI+9TUpwCfdCz+w51h/PQ8ERD81BXBFRT2
+jaAAoIfRSDy1Atvd5DsO1qp5n58mcC/8
+=g1V4
 -----END PGP SIGNATURE-----
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>