Don't install hal's policy file; bug #268243

Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

3 files changed, 16 insertions, 16 deletions

diff --git a/gnome-extra/gnome-power-manager/ChangeLog b/gnome-extra/gnome-power-manager/ChangeLog
index 0adeba0f01c2..5be7f5226a12 100644
--- a/gnome-extra/gnome-power-manager/ChangeLog
+++ b/gnome-extra/gnome-power-manager/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/gnome-power-manager
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.106 2009/04/22 22:15:29 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.107 2009/05/02 18:26:31 dang Exp $
+
+*gnome-power-manager-2.24.4-r2 (02 May 2009)
+
+  02 May 2009; Daniel Gryniewicz <dang@gentoo.org>
+  -gnome-power-manager-2.24.4-r1.ebuild,
+  +gnome-power-manager-2.24.4-r2.ebuild:
+  Bump to gnome-power-manager-2.24.4-r2
+  - Don't install hal's policy files; hal does it now bug #268243
 
   22 Apr 2009; Gilles Dartiguelongue <eva@gentoo.org>
   gnome-power-manager-2.20.0-r1.ebuild, -gnome-power-manager-2.20.2.ebuild,
diff --git a/gnome-extra/gnome-power-manager/Manifest b/gnome-extra/gnome-power-manager/Manifest
index 5930c5fc24e8..712ffe0133a9 100644
--- a/gnome-extra/gnome-power-manager/Manifest
+++ b/gnome-extra/gnome-power-manager/Manifest
@@ -9,13 +9,13 @@ DIST gnome-power-manager-2.24.4-cpufreq-patches.tar.bz2 8371 RMD160 5ceb8f8fbf42
 DIST gnome-power-manager-2.24.4.tar.bz2 2997032 RMD160 c0b16ead610ffeae9d801f8bde44507464808e53 SHA1 ea9c895a78761c59fea13701e074946a20c50fe6 SHA256 00da3aa929c444a600f7e5ccabd7a20f9b43710562b951c69cbe68ea4db37ef1
 EBUILD gnome-power-manager-2.20.0-r1.ebuild 2442 RMD160 60ae5507c78aeb6d33aa51b4cf085ebbc9b2e0f2 SHA1 2899114ea5ba76b2811de088b595d2fe9ffc6ef3 SHA256 a5bc475f807f5bda00fa927bd2d0addf2758b472037c5bf1f7fc8a402a4fc8a5
 EBUILD gnome-power-manager-2.22.1.ebuild 2723 RMD160 4ce2281f8ad838a71d1c55e6c18d65740dd70cbb SHA1 4120137d1067331cf932fba56dbb2cfd08116e3a SHA256 4199da671daba8851e004ba54df976d9bed3f6b536666c54f21f613141f46f0e
-EBUILD gnome-power-manager-2.24.4-r1.ebuild 3226 RMD160 5f4e50a5e9cf012715e47e09c743ba0c9c3955ba SHA1 0bbe40ec52ad5421a114caaa5d361310b0fd1931 SHA256 e3f18deee91bc0875950c70102c9f05aeaa99142c2775a0f2d1153656c7fb18b
-MISC ChangeLog 16877 RMD160 53ea4cc1d6893d54aa29ab48cccab34d534f4f80 SHA1 abfdac775969a8a888fd95826aa038742a787924 SHA256 e8624a11bc80795f78bb5db98b9f4206076f4ebf0d2e072371d3ff8e53bb7685
+EBUILD gnome-power-manager-2.24.4-r2.ebuild 3086 RMD160 5e4a0f07c95d1b85b3886e6f2c66a27e6f91ba05 SHA1 9c204ce029c8eeae7384c247a6cdf4c0b92ef6fd SHA256 a50eed4f55b6fa26693359ec1cb8bada0019dd5d37637fa0b80491bc0eca7d5c
+MISC ChangeLog 17164 RMD160 e8888422c329e05e3ce1e3f091399425c132b7d0 SHA1 6ae27bae2626e25ba37a8d86469dc73218664283 SHA256 74cdd2d7525c821f67d8629fdbabd93f779195c4f9424d3a6fa79c0948ad0b96
 MISC metadata.xml 438 RMD160 919237398a61022183868a6ad78259f5ba1ddb29 SHA1 22296b3f6619e92d83b5fa85e2ad1d3f15a1ba2a SHA256 b56e882af9618f6dc68e4c6d28bf85eb1cd0e12c2da53218551547760e63a489
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknvl1EACgkQ1fmVwcYIWAa+bgCfbAI0OmUZ0gB7t/izs0Hec6Xg
-YFcAoLCPvU4lfojhcm+YnOL4jXjhhGA8
-=kRj/
+iD8DBQFJ/JBxomPajV0RnrERAvl8AJ9s3TvgBYY1Axa23nm9aeCD2Zm93ACdEvzD
+NiZiPRepKLKduTfEtz2eNA4=
+=DF49
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r2.ebuild
index c064b5e9d31f..a5bbcf3b6574 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r1.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r1.ebuild,v 1.5 2009/04/22 22:15:29 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r2.ebuild,v 1.1 2009/05/02 18:26:31 dang Exp $
 
 inherit autotools eutils gnome2 virtualx
 
@@ -32,6 +32,7 @@ RDEPEND=">=dev-libs/glib-2.6.0
 	=media-libs/gstreamer-0.10*
 	policykit? (
 		>=sys-auth/policykit-0.8
+		>=sys-apps/hal-0.5.12_rc1-r2
 		>=gnome-extra/policykit-gnome-0.8 )
 
 	>=x11-apps/xrandr-1.2
@@ -97,15 +98,6 @@ src_test() {
 	Xemake check || die "Test phase failed"
 }
 
-src_install() {
-	gnome2_src_install
-
-	if use policykit; then
-		insinto /usr/share/PolicyKit/policy
-		doins "${FILESDIR}/org.freedesktop.hal.power-management.policy"
-	fi
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 	elog