Revision bump to really install battstat applet when requested since configure doesn't honor use_enable (thanks to rafnov for noticing). Also drop doc USE flag since it is not used at all.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

2 files changed, 14 insertions, 7 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index f476a05c1179..bf8aa692213e 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,14 @@
 # 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.314 2010/07/12 13:14:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.315 2010/07/14 11:27:31 pacho Exp $
+
+*gnome-applets-2.30.0-r1 (14 Jul 2010)
+
+  14 Jul 2010; Pacho Ramos <pacho@gentoo.org> -gnome-applets-2.30.0.ebuild,
+  +gnome-applets-2.30.0-r1.ebuild:
+  Revision bump to really install battstat applet when requested since
+  configure doesn't honor use_enable (thanks to rafnov for noticing). Also
+  drop doc USE flag since it is not used at all.
 
   12 Jul 2010; Pacho Ramos <pacho@gentoo.org> gnome-applets-2.30.0.ebuild,
   metadata.xml:
diff --git a/gnome-base/gnome-applets/gnome-applets-2.30.0.ebuild b/gnome-base/gnome-applets/gnome-applets-2.30.0-r1.ebuild
index 774b6a2e1e40..82df51310e51 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.30.0.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.30.0-r1.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.2 2010/07/12 13:14:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.30.0-r1.ebuild,v 1.1 2010/07/14 11:27:31 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="battstat doc gnome gstreamer hal ipv6 networkmanager policykit"
+IUSE="battstat gnome gstreamer hal ipv6 networkmanager policykit"
 
 # TODO: configure says python stuff is optional
 # my secret script says cpufrequtils might be needed in RDEPEND
@@ -60,8 +60,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.19
 	>=dev-util/intltool-0.35
 	dev-libs/libxslt
-	~app-text/docbook-xml-dtd-4.3
-	doc? ( app-text/docbook-sgml-utils )"
+	~app-text/docbook-xml-dtd-4.3"
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
@@ -85,15 +84,15 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-scrollkeeper
 		--disable-schemas-install
-		--without-hal
 		$(use_enable gstreamer mixer-applet)
-		$(use_enable battstat)
 		$(use_enable ipv6)
 		$(use_enable networkmanager)
 		$(use_enable policykit polkit)"
 
 	if use battstat; then
 		G2CONF="${G2CONF} $(use_with hal)"
+	else
+		G2CONF="${G2CONF} --without-hal --disable-battstat"
 	fi
 }