Fix ppc battstat deps. Bug #120200

Package-Manager: portage-2.1.1_pre5-r2

5 files changed, 50 insertions, 23 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index 410fd5031b70..37481ecc0a7f 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-applets
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.179 2006/08/17 02:56:33 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.180 2006/08/21 03:00:45 dang Exp $
+
+  21 Aug 2006; Daniel Gryniewicz <dang@gentoo.org>
+  gnome-applets-2.12.3.ebuild, gnome-applets-2.14.2.ebuild,
+  gnome-applets-2.14.2-r1.ebuild:
+  Fix ppc battstat deps.  Bug #120200
 
 *gnome-applets-2.14.2-r1 (17 Aug 2006)
 
diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index 3b5486370d7b..f42750597f2c 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-applets-2.10.1-fbsd.patch 1494 RMD160 0bb5c993e7ccae6c63af4b1e6a81c6a3e420287b SHA1 e4fbe91b239fd94895cb2a7d37ae9fc50807986c SHA256 2a76a931341d38f9a28dbd18238abab5d39de4bdf10474fe19411dd6ddfeb849
 MD5 ebcb8c6d8a9406b441de3e591d350960 files/gnome-applets-2.10.1-fbsd.patch 1494
 RMD160 0bb5c993e7ccae6c63af4b1e6a81c6a3e420287b files/gnome-applets-2.10.1-fbsd.patch 1494
@@ -30,22 +33,22 @@ EBUILD gnome-applets-2.10.1.ebuild 1739 RMD160 22c5a73ad41ad0e2debade19cd2b539b9
 MD5 2c78a217349e3f1081e3f9cd1156ae52 gnome-applets-2.10.1.ebuild 1739
 RMD160 22c5a73ad41ad0e2debade19cd2b539b94659f72 gnome-applets-2.10.1.ebuild 1739
 SHA256 5dbfdd99a1e8efdbd7816277916ea488850f0fc002d1515cb1d58adb2ca053d8 gnome-applets-2.10.1.ebuild 1739
-EBUILD gnome-applets-2.12.3.ebuild 2165 RMD160 43b45d3e7add28533734ac6b2401abf808696240 SHA1 9cab7be18f2da7b5d7cb420c80c8bf8f448ea85e SHA256 553774b4f5fcaa4932e0d50ec39035542ea85b20955106ab5b7070eefa3698f5
-MD5 2ced511914b3b9779f8db6d83156271e gnome-applets-2.12.3.ebuild 2165
-RMD160 43b45d3e7add28533734ac6b2401abf808696240 gnome-applets-2.12.3.ebuild 2165
-SHA256 553774b4f5fcaa4932e0d50ec39035542ea85b20955106ab5b7070eefa3698f5 gnome-applets-2.12.3.ebuild 2165
-EBUILD gnome-applets-2.14.2-r1.ebuild 2277 RMD160 dadd407f95a66de6286f458e83e192cc4161f843 SHA1 8d7f27f75202f8ecb344955c8603165f040b30be SHA256 853e446421176de6395f1936df790c0dd3b63f01d1fc5a7a0458fcb171fde13d
-MD5 bc5f9857880633894542e0ad483d6e0c gnome-applets-2.14.2-r1.ebuild 2277
-RMD160 dadd407f95a66de6286f458e83e192cc4161f843 gnome-applets-2.14.2-r1.ebuild 2277
-SHA256 853e446421176de6395f1936df790c0dd3b63f01d1fc5a7a0458fcb171fde13d gnome-applets-2.14.2-r1.ebuild 2277
-EBUILD gnome-applets-2.14.2.ebuild 2170 RMD160 48d91ae633a0d643e8543b794e2180d200c40fc4 SHA1 be32237210dff05f107ed1a4f10292c049fc34bc SHA256 fe4fef6bb41aa5d87407eb110d9b1587b46c7cc79f536f65fa0386087619a366
-MD5 42df7a22718d74543fc9bcf26d687dd2 gnome-applets-2.14.2.ebuild 2170
-RMD160 48d91ae633a0d643e8543b794e2180d200c40fc4 gnome-applets-2.14.2.ebuild 2170
-SHA256 fe4fef6bb41aa5d87407eb110d9b1587b46c7cc79f536f65fa0386087619a366 gnome-applets-2.14.2.ebuild 2170
-MISC ChangeLog 24971 RMD160 8fc51b2e7cd235957fd4335eae4578506cac9fd2 SHA1 fdd97f8aa059a218cc0bed9ccfb57d11dc73cf60 SHA256 68d92605a73630ca4ad0a9289f4f6263bd72261edfd32e98943b4e6fa7a5f763
-MD5 aceb38f7cc240b0e1bdd4deee35ddc07 ChangeLog 24971
-RMD160 8fc51b2e7cd235957fd4335eae4578506cac9fd2 ChangeLog 24971
-SHA256 68d92605a73630ca4ad0a9289f4f6263bd72261edfd32e98943b4e6fa7a5f763 ChangeLog 24971
+EBUILD gnome-applets-2.12.3.ebuild 2263 RMD160 9bedb6e62c0497734e343e5f4349a597e3b8662e SHA1 6da07cf1fd35f8ee8ed650cfc342560160da133f SHA256 537a99a1c39ac1abe411e98369c3d54388e7a1deee0bdac669248387eb00bee0
+MD5 f0c9198295a72018659481a00bf4f159 gnome-applets-2.12.3.ebuild 2263
+RMD160 9bedb6e62c0497734e343e5f4349a597e3b8662e gnome-applets-2.12.3.ebuild 2263
+SHA256 537a99a1c39ac1abe411e98369c3d54388e7a1deee0bdac669248387eb00bee0 gnome-applets-2.12.3.ebuild 2263
+EBUILD gnome-applets-2.14.2-r1.ebuild 2375 RMD160 0fad8b64de8c535f1cf1cf5be68b88f5d36412a2 SHA1 680ec1d7d4e440839568144f668fc465d398f446 SHA256 f29d99e49ca7d5fabeffa26282e4fe211e90aff431fc1453761cfb92d07a737d
+MD5 6b82c01719936e3d5af701cee03fce82 gnome-applets-2.14.2-r1.ebuild 2375
+RMD160 0fad8b64de8c535f1cf1cf5be68b88f5d36412a2 gnome-applets-2.14.2-r1.ebuild 2375
+SHA256 f29d99e49ca7d5fabeffa26282e4fe211e90aff431fc1453761cfb92d07a737d gnome-applets-2.14.2-r1.ebuild 2375
+EBUILD gnome-applets-2.14.2.ebuild 2269 RMD160 dcc1d54f5aa205e1990fe0299b4372942f62e3f6 SHA1 2e76f4b24ea4eac25b25662e6913193af5a7b562 SHA256 6a6aa8bce6335e0b3a1a13bf30c0d575a0259d01e6b53400599a8582b8e41252
+MD5 bff4f49fa429d29302246329b56440bd gnome-applets-2.14.2.ebuild 2269
+RMD160 dcc1d54f5aa205e1990fe0299b4372942f62e3f6 gnome-applets-2.14.2.ebuild 2269
+SHA256 6a6aa8bce6335e0b3a1a13bf30c0d575a0259d01e6b53400599a8582b8e41252 gnome-applets-2.14.2.ebuild 2269
+MISC ChangeLog 25151 RMD160 880047a4b307c3145ed7714251975fee64c840aa SHA1 5330331ba3a82ba203f9793fdc76df27f23db3de SHA256 af7b4f9eca1164a2efd40a94571f4dc08937b4f64107f491124397ef7e828127
+MD5 b7f842bcf6f744be6dff4044db53b9ee ChangeLog 25151
+RMD160 880047a4b307c3145ed7714251975fee64c840aa ChangeLog 25151
+SHA256 af7b4f9eca1164a2efd40a94571f4dc08937b4f64107f491124397ef7e828127 ChangeLog 25151
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -65,3 +68,10 @@ SHA256 0ca7cbacc88a45c24e7ae3efc467ef2bf0a7cf20550dd4b73e062052f49707e6 files/di
 MD5 7b36fca2101bd54516168d3f3b33449a files/digest-gnome-applets-2.14.2-r1 268
 RMD160 75722a986d754c91d7a5196e9793c68055e56801 files/digest-gnome-applets-2.14.2-r1 268
 SHA256 0ca7cbacc88a45c24e7ae3efc467ef2bf0a7cf20550dd4b73e062052f49707e6 files/digest-gnome-applets-2.14.2-r1 268
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFE6SHjomPajV0RnrERAnldAKCEPj4riw1EsfxooxvcvKSX7dBBYwCeIk80
+F4ta+V0zPGdxiFfHB7yNmZE=
+=EyCR
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-applets/gnome-applets-2.12.3.ebuild b/gnome-base/gnome-applets/gnome-applets-2.12.3.ebuild
index 445896ec8aa9..d11ddbfbf9b7 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.12.3.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.12.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.12.3.ebuild,v 1.10 2006/06/28 15:32:17 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.12.3.ebuild,v 1.11 2006/08/21 03:00:45 dang Exp $
 
 inherit eutils gnome2
 
@@ -54,7 +54,11 @@ pkg_setup() {
 		$(use_enable ipv6)
 		$(use_with hal)"
 
-	if ! use apm && ! use acpi; then
+	if ! use ppc && ! use apm && ! use acpi; then
+		G2CONF="${G2CONF} --disable-battstat"
+	fi
+
+	if use ppc && ! use apm && ! use hal; then
 		G2CONF="${G2CONF} --disable-battstat"
 	fi
 }
diff --git a/gnome-base/gnome-applets/gnome-applets-2.14.2-r1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.14.2-r1.ebuild
index 922b790adc2c..ae18654dff30 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.14.2-r1.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.14.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.14.2-r1.ebuild,v 1.1 2006/08/17 02:56:33 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.14.2-r1.ebuild,v 1.2 2006/08/21 03:00:45 dang Exp $
 
 inherit eutils gnome2 autotools
 
@@ -58,7 +58,11 @@ pkg_setup() {
 		G2CONF="${G2CONF} --with-gstreamer=0.10"
 	fi
 
-	if ! use apm && ! use acpi; then
+	if ! use ppc && ! use apm && ! use acpi; then
+		G2CONF="${G2CONF} --disable-battstat"
+	fi
+
+	if use ppc && ! use apm && ! use hal; then
 		G2CONF="${G2CONF} --disable-battstat"
 	fi
 }
diff --git a/gnome-base/gnome-applets/gnome-applets-2.14.2.ebuild b/gnome-base/gnome-applets/gnome-applets-2.14.2.ebuild
index a9ee02d715b2..1c569953f5e7 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.14.2.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.14.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.14.2.ebuild,v 1.7 2006/08/16 15:37:39 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.14.2.ebuild,v 1.8 2006/08/21 03:00:45 dang Exp $
 
 inherit eutils gnome2
 
@@ -59,7 +59,11 @@ pkg_setup() {
 		G2CONF="${G2CONF} --with-gstreamer=0.10"
 	fi
 
-	if ! use apm && ! use acpi; then
+	if ! use ppc && ! use apm && ! use acpi; then
+		G2CONF="${G2CONF} --disable-battstat"
+	fi
+
+	if use ppc && ! use apm && ! use hal; then
 		G2CONF="${G2CONF} --disable-battstat"
 	fi
 }