Escaping acpid on ppc makes DEPEND/RDEPEND clean there. Removing old acpi patch for battstat now that its functionality is in the main branch

6 files changed, 31 insertions, 28 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index b3bfe19b53a5..868d7e092382 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,15 @@
 # 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.51 2004/02/05 20:57:17 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.52 2004/02/06 01:25:06 spider Exp $
+
+  06 Feb 2004; <spider@gentoo.org> gnome-applets-2.4.0.ebuild,
+  gnome-applets-2.4.1-r1.ebuild, gnome-applets-2.4.1-r2.ebuild,
+  gnome-applets-2.4.2.ebuild:
+  escaping acpi? dependency with !ppc? ()  check. Makes dependencies happy again
+
+  06 Feb 2004; <spider@gentoo.org> gnome-applets-2.4.2.ebuild:
+  Finally acpi is fixed, remove the patch from src_unpack (it failed anyhow.
+  *ahumm*)
 
 *gnome-applets-2.4.2 (05 Feb 2004)
 
diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index f8747a66356f..5fe643060d09 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -1,14 +1,14 @@
-MD5 e3f58a4e977c48032ddff3d56d8c31d8 gnome-applets-1.4.0.5.ebuild 1034
-MD5 c02e4f114fe883d6c371af3ed35fc99e gnome-applets-2.4.0.ebuild 1386
-MD5 5a04ddcb7cb51c3cd56a206253dd0c2a gnome-applets-2.4.1-r2.ebuild 1650
-MD5 d5c5b9cb4e2a327073da106f17a86bc8 gnome-applets-2.4.2.ebuild 1575
-MD5 9e5ca0fec93872f83b2c08e4b23e3429 gnome-applets-2.4.1-r1.ebuild 1586
-MD5 24ebb9b7de667d8953af1cb7a7b8d8ab ChangeLog 7385
+MD5 100f24894b406e957d6f01a467e2b013 ChangeLog 7777
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 ade82d61b9c1754d055a1df88d066340 gnome-applets-2.4.1-r1.ebuild 1596
+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 b6d4c2835bf643cd1e44ee5395d5219a gnome-applets-2.4.2.ebuild 1376
+MD5 e8861003d9c73bcf26b9df775ec65fbe files/digest-gnome-applets-1.4.0.5 75
 MD5 ae737a9ee078ab2fd5e577bfe297ca7f files/digest-gnome-applets-2.4.0 73
-MD5 de598f4caa39888e1ac75adb7fea28be files/digest-gnome-applets-2.4.2 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
+MD5 de598f4caa39888e1ac75adb7fea28be files/digest-gnome-applets-2.4.2 73
diff --git a/gnome-base/gnome-applets/gnome-applets-2.4.0.ebuild b/gnome-base/gnome-applets/gnome-applets-2.4.0.ebuild
index 96dd05df9c62..7d1347b2f473 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.4.0.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.4.0.ebuild,v 1.10 2003/12/13 01:24:46 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.4.0.ebuild,v 1.11 2004/02/06 01:25:06 spider Exp $
 
 inherit gnome2
 
diff --git a/gnome-base/gnome-applets/gnome-applets-2.4.1-r1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.4.1-r1.ebuild
index 313bfcf2b479..d6efc6db10b0 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.4.1-r1.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.4.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.4.1-r1.ebuild,v 1.2 2003/10/18 22:54:00 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.4.1-r1.ebuild,v 1.3 2004/02/06 01:25:06 spider Exp $
 
 inherit gnome2
 
@@ -23,7 +23,9 @@ RDEPEND=">=x11-libs/gtk+-2.1
 	>=gnome-base/libgnomeui-2
 	virtual/x11
 	apm? ( sys-apps/apmd )
-	acpi? ( sys-apps/acpid )"
+	!ppc? (
+		acpi? ( sys-apps/acpid )
+	)"
 	# Virtual/x11 for XKB.h 
 
 DEPEND="${RDEPEND}
diff --git a/gnome-base/gnome-applets/gnome-applets-2.4.1-r2.ebuild b/gnome-base/gnome-applets/gnome-applets-2.4.1-r2.ebuild
index 9df1adeb8ac7..eb1a43a79344 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.4.1-r2.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.4.1-r2.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.4.1-r2.ebuild,v 1.5 2004/01/29 05:07:23 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.4.1-r2.ebuild,v 1.6 2004/02/06 01:25:06 spider Exp $
 
 inherit gnome2
 
@@ -23,7 +23,9 @@ RDEPEND=">=x11-libs/gtk+-2.1
 	>=gnome-base/libgnomeui-2
 	virtual/x11
 	apm? ( sys-apps/apmd )
-	acpi? ( sys-apps/acpid )"
+	!ppc? (
+		acpi? ( sys-apps/acpid )
+	)"
 	# Virtual/x11 for XKB.h 
 
 DEPEND="${RDEPEND}
diff --git a/gnome-base/gnome-applets/gnome-applets-2.4.2.ebuild b/gnome-base/gnome-applets/gnome-applets-2.4.2.ebuild
index e6f514dfd148..77c9f80eef32 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.4.2.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.4.2.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.4.2.ebuild,v 1.1 2004/02/05 20:57:17 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.4.2.ebuild,v 1.2 2004/02/06 01:25:06 spider Exp $
 
 inherit gnome2
 
@@ -23,7 +23,7 @@ RDEPEND=">=x11-libs/gtk+-2.1
 	>=gnome-base/libgnomeui-2
 	virtual/x11
 	apm? ( sys-apps/apmd )
-	acpi? ( sys-apps/acpid )"
+	!ppc? (	acpi? ( sys-apps/acpid ) )"
 	# Virtual/x11 for XKB.h 
 
 DEPEND="${RDEPEND}
@@ -35,18 +35,8 @@ DOCS="AUTHORS ChangeLog COPYING COPYING-DOCS INSTALL NEWS README"
 G2CONF="${G2CONF} $(use_enable ipv6)"
 
 src_unpack() {
-
 	unpack ${A}
-
-	# http://bugzilla.gnome.org/show_bug.cgi?id=88553
-	# http://www.its.caltech.edu/~dmoore/battstat/
-	if [ -n "`use acpi`" ]; then
-		cd ${S}/battstat
-		epatch ${FILESDIR}/battstat-acpi-events-2.3.90.diff
-	fi
-
 	gnome2_omf_fix
-
 }
 
 src_install () {