drop acpid dep (bug #173581)

Package-Manager: portage-2.1.2.3

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index c50e76d1b8f19b09e3053cf00e6ff2007f0e452c..08be02755aeb04b479d52d73e89e05fdf1218149 100644 (file)
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-applets
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.211 2007/03/24 19:02:49 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.212 2007/04/06 19:05:48 compnerd Exp $
+
+  06 Apr 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+  gnome-applets-2.18.0.ebuild:
+  Drop the acpid dependency, adding it as an elog message if HAL is not in use.
+  It is entirely a runtime option, and as such does not belong as a dependency.
 
 *gnome-applets-2.18.0 (24 Mar 2007)
 

diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index 65f01839748b7b09062d383d52c5d5ae1bd3e8f6..72420e4a0b3f611a1d09daa68524626885929f46 100644 (file)
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnome-applets-2.14.0-prefs_startup-r1.patch 776 RMD160 d29eadd0748d95f2d0743669114956df10095b0a SHA1 70ac81b01e32bda71147ed80bb2905c065bd0c61 SHA256 54218c81861a721708194738f8933ebdb0f450b0d8d8ecdc4f7514732a8d7213
 MD5 029ed267b1c47fdf2275b1cc71700b62 files/gnome-applets-2.14.0-prefs_startup-r1.patch 776
 RMD160 d29eadd0748d95f2d0743669114956df10095b0a files/gnome-applets-2.14.0-prefs_startup-r1.patch 776
@@ -32,14 +29,14 @@ EBUILD gnome-applets-2.16.2.ebuild 2650 RMD160 13d80188e729200264073b63be4e4f15d
 MD5 82cea9099c32cd64f980f01cd1c3529e gnome-applets-2.16.2.ebuild 2650
 RMD160 13d80188e729200264073b63be4e4f15d3ff8201 gnome-applets-2.16.2.ebuild 2650
 SHA256 c7377a4cacde0f914c6a038b891e0c523ba22a363cef59d6a4b7589fcc566dfa gnome-applets-2.16.2.ebuild 2650
-EBUILD gnome-applets-2.18.0.ebuild 2645 RMD160 a441763721d7586a80eec8f6a3123b76b8fef816 SHA1 a4d7aaaef4e8d01cdb76b5686a1ae0a501c9e1e1 SHA256 0095f6befa043e82ceca3ededdfca027bf3443a2cfd10e69e8d7f9374cce5536
-MD5 512bb010158a6a2d071544171725857b gnome-applets-2.18.0.ebuild 2645
-RMD160 a441763721d7586a80eec8f6a3123b76b8fef816 gnome-applets-2.18.0.ebuild 2645
-SHA256 0095f6befa043e82ceca3ededdfca027bf3443a2cfd10e69e8d7f9374cce5536 gnome-applets-2.18.0.ebuild 2645
-MISC ChangeLog 29205 RMD160 bb08a1e40edc2598df801adfd9e34cd1c8a23992 SHA1 be1659db70207e0fed7b8bc4d1630896044230e6 SHA256 997175e2aa5be1506d4665359c3c9013834521853f906204ac1728f15dbf8e5a
-MD5 e34aa675a2ebd8d084fa850e9bf0689b ChangeLog 29205
-RMD160 bb08a1e40edc2598df801adfd9e34cd1c8a23992 ChangeLog 29205
-SHA256 997175e2aa5be1506d4665359c3c9013834521853f906204ac1728f15dbf8e5a ChangeLog 29205
+EBUILD gnome-applets-2.18.0.ebuild 2885 RMD160 7310b152e63da7c676650092021762953d53ad41 SHA1 ba6d395dd3d81a43ffcca93d349e89d17e7fbc9d SHA256 43d3e82a64f6b3b60f2b2912de63eb59166f77b9757a4640503660f8923db0a5
+MD5 996b63dfedf9d413e53fcf8f85dd808a gnome-applets-2.18.0.ebuild 2885
+RMD160 7310b152e63da7c676650092021762953d53ad41 gnome-applets-2.18.0.ebuild 2885
+SHA256 43d3e82a64f6b3b60f2b2912de63eb59166f77b9757a4640503660f8923db0a5 gnome-applets-2.18.0.ebuild 2885
+MISC ChangeLog 29457 RMD160 85d83cf5d3861aa813dce37b4bd6b26810f5c4c5 SHA1 4a331b3b9ad0cfce8da63cb899b6e7a1a097b830 SHA256 c45feda3e5c1c7efc3859156796f0f5f53d774a7563c3d43a4c0db4aeb372c4c
+MD5 0c674dc9b63b5ea79b4dba22e7a77e48 ChangeLog 29457
+RMD160 85d83cf5d3861aa813dce37b4bd6b26810f5c4c5 ChangeLog 29457
+SHA256 c45feda3e5c1c7efc3859156796f0f5f53d774a7563c3d43a4c0db4aeb372c4c ChangeLog 29457
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -56,10 +53,3 @@ SHA256 753267861fe4c73102dc09d66bcb41cdac6f39a26cd3c21a6ad95a7b5d100440 files/di
 MD5 520433101587db3701cc08eb46418763 files/digest-gnome-applets-2.18.0 268
 RMD160 01a80c3ac08eb23693cd2adad2485c19722b518a files/digest-gnome-applets-2.18.0 268
 SHA256 98fa05a12d0c192e46fdff101ebb142fc448aa808ee4cdc30866a81158f20c39 files/digest-gnome-applets-2.18.0 268
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD4DBQFGBXWuomPajV0RnrERArLzAJjuF3dsbQZ/rs1ycPb/nd/vNFlVAJ9OELnV
-eX4D0xPhcyDFrLG9eLWcsw==
-=eDUn
------END PGP SIGNATURE-----

diff --git a/gnome-base/gnome-applets/gnome-applets-2.18.0.ebuild b/gnome-base/gnome-applets/gnome-applets-2.18.0.ebuild
index 12bf39e6bd20e54217daf33ce5924d59f1dede0c..976cb9c63422a84af417c6733cce68856c8c187a 100644 (file)
--- a/gnome-base/gnome-applets/gnome-applets-2.18.0.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.18.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.18.0.ebuild,v 1.1 2007/03/24 19:02:49 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.18.0.ebuild,v 1.2 2007/04/06 19:05:48 compnerd Exp $
 
 inherit eutils gnome2 autotools
 
@@ -34,7 +34,6 @@ RDEPEND=">=x11-libs/gtk+-2.6
                >=dev-libs/libxml2-2.5.0
                >=virtual/python-2.4
                apm? ( sys-apps/apmd )
-               acpi? ( sys-power/acpid )
                x11-apps/xrdb x11-libs/libX11
                gnome?  (
                                        gnome-base/libgnomekbd
@@ -101,3 +100,13 @@ src_install() {
                done
        done
 }
+
+pkg_postinst() {
+       gnome2_pkg_postinst
+
+       if use acpi && !use hal ; then
+               elog "It is highly recommended that you install acpid if you use the"
+               elog "battstat applet to prevent any issues with other applications "
+               elog "trying to read acpi information."
+       fi
+}