Revision bump to really install battstat applet when requested since configure doesn...

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

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index f476a05c11790151673c04304840ecf70fcc3c38..bf8aa692213ee2bb40326fc718db86f37e04d2e9 100644 (file)
--- 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/Manifest b/gnome-base/gnome-applets/Manifest
index 972701077f5249389d5200b8f01b0a4bd0186030..d360ef3967ef29d7f0ecef23911088e5948d2bfb 100644 (file)
--- 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 3855 RMD160 c4e2ddd9a11fbcc75abef654da18ed265c3f28ea SHA1 c1c129c4b34d515bd05e40ed51b48194b3981df2 SHA256 066dedd2c8fff7e4b5a2d0f49ec1f7144f90ebda1e775583b947fba27ec3131c
-MISC ChangeLog 45182 RMD160 e518c25d39e52c70a27a7ed92df79118a2ee9ac9 SHA1 e5b1a70d74fa134c1bc8baace7df0a7c61970d13 SHA256 074c5ca8fa31d37f639fb1c34b463054b2608ef05a74cc2fe2a707ade03071a7
+EBUILD gnome-applets-2.30.0-r1.ebuild 3835 RMD160 21d47dbaf0a520deb7b47b30d09cbebcacf1bbf1 SHA1 39f8643c78fe800dd24b61886e1ba52c063c83e9 SHA256 835d1ea696925a865a3732f01c42ab9d27bf8393664081052beea068a0b9e022
+MISC ChangeLog 45529 RMD160 0ec1dfcc3e19132bdfe219efd24d0c5291878ef8 SHA1 f7e1fd4ab9bef05f2c9c368a52fca1429b2f5e70 SHA256 3d83df846fade04c1f45ca38c6c889855492a9052f65ac409b26c276cc93ce2c
 MISC metadata.xml 313 RMD160 378fcac5ad9324a5f93413ddb9b73ff34ec7dbf3 SHA1 b1f8d11380da2ff0dd9927ac85345026facc1c96 SHA256 d54765f0855da98c60cd16672b306e2f0f8a17c4ee0a765e6d6653c47f75ee60
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkw7FVYACgkQCaWpQKGI+9TUpwCfdCz+w51h/PQ8ERD81BXBFRT2
-jaAAoIfRSDy1Atvd5DsO1qp5n58mcC/8
-=g1V4
+iEYEARECAAYFAkw9nywACgkQCaWpQKGI+9RDAQCfYUtt6dbiJ9PWY/T9S8+5alwq
+eqkAn1Dj6oo+G7B9g4AmH2/okcjjIGpp
+=2oAU
 -----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-r1.ebuild
similarity index 93%
rename from gnome-base/gnome-applets/gnome-applets-2.30.0.ebuild
rename to gnome-base/gnome-applets/gnome-applets-2.30.0-r1.ebuild
index 774b6a2e1e40b5a30da6e3b5d9475c56d62d7363..82df51310e519e373874c2b045973ebbea9ef507 100644 (file)
--- 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
 }