Reenable battstat/apm on ppc

4 files changed, 48 insertions, 15 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index b6f79e90707b..ba9e7811132f 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-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.59 2004/03/22 01:31:42 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.60 2004/04/05 22:10:04 lu_zero Exp $
+
+  05 Apr 2004; Luca Barbato <lu_zero@gentoo.org> gnome-applets-2.6.0.ebuild,
+  files/gnome-applets-2.6.0-battstat.patch:
+  Reenabled the support for the battstat applet on ppc
+  Refer to bug #45925, thanks to Christopher Sachs <amitofu@mac.com>
 
 *gnome-applets-2.6.0 (21 Mar 2004)
 
diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index a193f81cfa58..51e41a2ebc5a 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -1,16 +1,17 @@
-MD5 e3f58a4e977c48032ddff3d56d8c31d8 gnome-applets-1.4.0.5.ebuild 1034
-MD5 bb982dce3b7137ff6af111cf0072ec34 gnome-applets-2.4.0.ebuild 1386
-MD5 9ee78dcdbf3d047e28f5f524e32c9b46 gnome-applets-2.4.1-r2.ebuild 1661
-MD5 c100194ff3bfef4ba75006954bb5986f gnome-applets-2.4.2.ebuild 1376
-MD5 04b37d1c0439f7d621a17183203c0b64 gnome-applets-2.6.0.ebuild 1507
-MD5 ade82d61b9c1754d055a1df88d066340 gnome-applets-2.4.1-r1.ebuild 1596
-MD5 29fc3bc293740c683248aece4c2c0422 ChangeLog 8546
+MD5 55fc3ed1c32dc15a3bcdf1c37c61f1d9 gnome-applets-2.6.0.ebuild 1562
+MD5 a799c245158a25e93fac0c676fbe8939 gnome-applets-1.4.0.5.ebuild 1033
+MD5 cd39cd96324a15f749e01fab8a4c7d81 gnome-applets-2.4.1-r2.ebuild 1660
+MD5 c4553d068fe9178de4ce0068e1a43425 gnome-applets-2.4.2.ebuild 1375
+MD5 d92a82ce7a55d3253b5267d354a88f01 ChangeLog 8793
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 ae737a9ee078ab2fd5e577bfe297ca7f files/digest-gnome-applets-2.4.0 73
-MD5 de598f4caa39888e1ac75adb7fea28be files/digest-gnome-applets-2.4.2 73
+MD5 036ed472fb529854756543026e163398 gnome-applets-2.4.1-r1.ebuild 1595
+MD5 1bd2d92fe371bbc31f2b81f896d21c08 gnome-applets-2.4.0.ebuild 1385
+MD5 64fc569d3525778df8e780dda1429c19 files/digest-gnome-applets-2.4.1-r1 73
 MD5 e6c0361579fce4e995585cbb9aa6c99f files/digest-gnome-applets-2.6.0 73
+MD5 62eb963d0b1badb3016ce37a1afc4000 files/gnome-applets-2.6.0-battstat.patch 898
+MD5 e8861003d9c73bcf26b9df775ec65fbe files/digest-gnome-applets-1.4.0.5 75
+MD5 10b40dca343dcbf0feee84fd964a0fe3 files/gnome-applets-2.4.1-multiload_mem_fix.patch 813
+MD5 de598f4caa39888e1ac75adb7fea28be files/digest-gnome-applets-2.4.2 73
+MD5 ae737a9ee078ab2fd5e577bfe297ca7f files/digest-gnome-applets-2.4.0 73
 MD5 13d00fdb8a7ed770c2278e3fde342cd8 files/battstat-acpi-events-2.3.90.diff 18154
-MD5 64fc569d3525778df8e780dda1429c19 files/digest-gnome-applets-2.4.1-r1 73
 MD5 64fc569d3525778df8e780dda1429c19 files/digest-gnome-applets-2.4.1-r2 73
-MD5 10b40dca343dcbf0feee84fd964a0fe3 files/gnome-applets-2.4.1-multiload_mem_fix.patch 813
-MD5 e8861003d9c73bcf26b9df775ec65fbe files/digest-gnome-applets-1.4.0.5 75
diff --git a/gnome-base/gnome-applets/files/gnome-applets-2.6.0-battstat.patch b/gnome-base/gnome-applets/files/gnome-applets-2.6.0-battstat.patch
new file mode 100644
index 000000000000..302f8da909f0
--- /dev/null
+++ b/gnome-base/gnome-applets/files/gnome-applets-2.6.0-battstat.patch
@@ -0,0 +1,27 @@
+diff -ruN gnome-applets-2.6.0.orig/configure gnome-applets-2.6.0/configure
+--- gnome-applets-2.6.0.orig/configure	2004-04-05 00:42:13.075488632 +0200
++++ gnome-applets-2.6.0/configure	2004-04-05 18:18:27.738075488 +0200
+@@ -24147,8 +24147,6 @@
+ NEED_LIBAPM=no
+ build_battstat_applet=yes
+ case "${host}" in
+-  powerpc-*-linux*)
+-	;;
+   # list of supported OS cores that use libapm
+   *-*-linux*)
+ 	NEED_LIBAPM=yes
+diff -ruN gnome-applets-2.6.0.orig/configure.in gnome-applets-2.6.0/configure.in
+--- gnome-applets-2.6.0.orig/configure.in	2004-04-05 00:42:10.972808288 +0200
++++ gnome-applets-2.6.0/configure.in	2004-04-05 18:18:13.551232216 +0200
+@@ -208,8 +208,9 @@
+ NEED_LIBAPM=no
+ build_battstat_applet=yes
+ case "${host}" in
+-  powerpc-*-linux*)
+-	;;
++# linux powerpc has apm emulation.
++#  powerpc-*-linux*)
++#	;;
+   # list of supported OS cores that use libapm
+   *-*-linux*)
+ 	NEED_LIBAPM=yes
diff --git a/gnome-base/gnome-applets/gnome-applets-2.6.0.ebuild b/gnome-base/gnome-applets/gnome-applets-2.6.0.ebuild
index 519ea035e577..20c57d7d1c51 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.6.0.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.6.0.ebuild,v 1.1 2004/03/22 01:31:42 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.6.0.ebuild,v 1.2 2004/04/05 22:10:04 lu_zero Exp $
 
 inherit gnome2
 
@@ -42,7 +42,7 @@ src_unpack() {
 	unpack ${A}
 
 	gnome2_omf_fix
-
+	epatch ${FILESDIR}/gnome-applets-2.6.0-battstat.patch
 }
 
 src_install () {