diff options
| author |   Daniel Gryniewicz <dang@gentoo.org> | 2006-08-21 03:00:45 +0000 |
|---|---|---|
| committer | Daniel Gryniewicz <dang@gentoo.org> | 2006-08-21 03:00:45 +0000 |
| commit | a8e7bec1cd614cc5c184ded94bea6e6831da63e3 (patch) | |
| tree | 58595e997b2c1e4fd6dd44c68306e309d3626274 /gnome-base | |
| parent | Marked stable on amd64 (diff) | |
| download | gentoo-2-a8e7bec1cd614cc5c184ded94bea6e6831da63e3.tar.gz gentoo-2-a8e7bec1cd614cc5c184ded94bea6e6831da63e3.tar.bz2 gentoo-2-a8e7bec1cd614cc5c184ded94bea6e6831da63e3.zip | |
Fix ppc battstat deps. Bug #120200
(Portage version: 2.1.1_pre5-r2)
Diffstat (limited to 'gnome-base')
4 files changed, 24 insertions, 7 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/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 } |