man page changes for Gentoo. migrate plugdev policy patch to new patchset.

(Portage version: 2.1.2.3)

5 files changed, 560 insertions, 5 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index b5befad5bba6..7eb86ca1ac91 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.149 2007/04/06 19:13:01 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.150 2007/04/07 00:43:57 cardoe Exp $
+
+  07 Apr 2007; Doug Goldstein <cardoe@gentoo.org>
+  +files/0.5.9/95_gentoo_man_page.patch,
+  +files/0.5.9/96_plugdev_allow_send.patch, files/0.5.9/series,
+  hal-0.5.9.ebuild:
+  man page changes for Gentoo. migrate plugdev policy patch to new patchset.
 
   06 Apr 2007; Doug Goldstein <cardoe@gentoo.org> hal-0.5.9.ebuild:
   Fix up SELinux support
diff --git a/sys-apps/hal/files/0.5.9/95_gentoo_man_page.patch b/sys-apps/hal/files/0.5.9/95_gentoo_man_page.patch
new file mode 100644
index 000000000000..804bb9c12af1
--- /dev/null
+++ b/sys-apps/hal/files/0.5.9/95_gentoo_man_page.patch
@@ -0,0 +1,507 @@
+---
+ doc/man/hal-disable-polling.1         |    1 +
+ doc/man/hal-disable-polling.1.in      |    1 +
+ doc/man/hal-find-by-capability.1      |    1 +
+ doc/man/hal-find-by-capability.1.in   |    1 +
+ doc/man/hal-find-by-property.1        |    1 +
+ doc/man/hal-find-by-property.1.in     |    1 +
+ doc/man/hal-get-property.1            |    1 +
+ doc/man/hal-get-property.1.in         |    1 +
+ doc/man/hal-is-caller-locked-out.1    |    1 +
+ doc/man/hal-is-caller-locked-out.1.in |    1 +
+ doc/man/hal-lock.1                    |    1 +
+ doc/man/hal-lock.1.in                 |    1 +
+ doc/man/hal-set-property.1            |    1 +
+ doc/man/hal-set-property.1.in         |    1 +
+ doc/man/hald.8                        |    1 +
+ doc/man/hald.8.in                     |    6 ++++--
+ 16 files changed, 19 insertions(+), 2 deletions(-)
+
+Index: b/doc/man/hal-disable-polling.1
+===================================================================
+--- a/doc/man/hal-disable-polling.1	2007-04-06 19:37:52.000000000 -0400
++++ b/doc/man/hal-disable-polling.1	2007-04-06 20:26:09.000000000 -0400
+@@ -18,7 +18,8 @@
+ .B HAL
+ properties, refer to the \fIHAL spec\fP which can be found in
+ .I "/usr/share/doc/hal/spec/hal-spec.html"
+-depending on the distribution.
++if emerged with
++.B USE=doc.
+ 
+ .SH OPTIONS
+ The following options are supported:
+@@ -117,7 +118,7 @@
+ 
+ .SH BUGS
+ .PP
+-Please send bug reports to either the distribution or the HAL
++Please send bug reports to http://bugs.gentoo.org or the HAL
+ mailing list, see 
+ .I "http://lists.freedesktop.org/mailman/listinfo/hal"
+ on how to subscribe.
+@@ -134,4 +135,5 @@
+ .SH AUTHOR
+ Written by David Zeuthen <david@fubar.dk> with a lot of help from many
+ others.
++Gentoo specific changes by Doug Goldstein <cardoe@gentoo.org> and Steev Klimaszewski <steev@gentoo.org> with help from Gentoo testers and contributors.
+ 
+Index: b/doc/man/hal-disable-polling.1.in
+===================================================================
+--- a/doc/man/hal-disable-polling.1.in	2007-04-06 19:37:52.000000000 -0400
++++ b/doc/man/hal-disable-polling.1.in	2007-04-06 20:26:18.000000000 -0400
+@@ -18,7 +18,8 @@
+ .B HAL
+ properties, refer to the \fIHAL spec\fP which can be found in
+ .I "@docdir@/spec/hal-spec.html"
+-depending on the distribution.
++if emerged with
++.B USE=doc.
+ 
+ .SH OPTIONS
+ The following options are supported:
+@@ -117,7 +118,7 @@
+ 
+ .SH BUGS
+ .PP
+-Please send bug reports to either the distribution or the HAL
++Please send bug reports to http://bugs.gentoo.org or the HAL
+ mailing list, see 
+ .I "http://lists.freedesktop.org/mailman/listinfo/hal"
+ on how to subscribe.
+@@ -134,4 +135,4 @@
+ .SH AUTHOR
+ Written by David Zeuthen <david@fubar.dk> with a lot of help from many
+ others.
+-
++Gentoo specific changes by Doug Goldstein <cardoe@gentoo.org> and Steev Klimaszewski <steev@gentoo.org> with help from Gentoo testers and contributors.
+Index: b/doc/man/hal-find-by-capability.1
+===================================================================
+--- a/doc/man/hal-find-by-capability.1	2007-04-06 19:37:52.000000000 -0400
++++ b/doc/man/hal-find-by-capability.1	2007-04-06 20:25:54.000000000 -0400
+@@ -20,7 +20,8 @@
+ .B HAL
+ properties, refer to the \fIHAL spec\fP which can be found in
+ .I "/usr/share/doc/hal/spec/hal-spec.html"
+-depending on the distribution.
++if emerged with
++.B USE=doc.
+ 
+ .SH OPTIONS
+ The following options are supported:
+@@ -46,7 +47,7 @@
+ 
+ .SH BUGS
+ .PP
+-Please send bug reports to either the distribution or the HAL
++Please send bug reports to http://bugs.gentoo.org or the HAL
+ mailing list, see 
+ .I "http://lists.freedesktop.org/mailman/listinfo/hal"
+ on how to subscribe.
+@@ -64,3 +65,4 @@
+ Written by David Zeuthen <david@fubar.dk> with a lot of help from many
+ others.
+ 
++Gentoo specific changes by Doug Goldstein <cardoe@gentoo.org> and Steev Klimaszewski <steev@gentoo.org> with help from Gentoo testers and contributors.
+Index: b/doc/man/hal-find-by-capability.1.in
+===================================================================
+--- a/doc/man/hal-find-by-capability.1.in	2007-04-06 19:37:52.000000000 -0400
++++ b/doc/man/hal-find-by-capability.1.in	2007-04-06 20:25:30.000000000 -0400
+@@ -20,7 +20,8 @@
+ .B HAL
+ properties, refer to the \fIHAL spec\fP which can be found in
+ .I "@docdir@/spec/hal-spec.html"
+-depending on the distribution.
++if emerged with
++.B USE=doc.
+ 
+ .SH OPTIONS
+ The following options are supported:
+@@ -46,7 +47,7 @@
+ 
+ .SH BUGS
+ .PP
+-Please send bug reports to either the distribution or the HAL
++Please send bug reports to http://bugs.gentoo.org or the HAL
+ mailing list, see 
+ .I "http://lists.freedesktop.org/mailman/listinfo/hal"
+ on how to subscribe.
+@@ -64,3 +65,4 @@
+ Written by David Zeuthen <david@fubar.dk> with a lot of help from many
+ others.
+ 
++Gentoo specific changes by Doug Goldstein <cardoe@gentoo.org> and Steev Klimaszewski <steev@gentoo.org> with help from Gentoo testers and contributors.
+Index: b/doc/man/hal-find-by-property.1
+===================================================================
+--- a/doc/man/hal-find-by-property.1	2007-04-06 19:37:52.000000000 -0400
++++ b/doc/man/hal-find-by-property.1	2007-04-06 20:25:30.000000000 -0400
+@@ -20,7 +20,8 @@
+ .B HAL
+ properties, refer to the \fIHAL spec\fP which can be found in
+ .I "/usr/share/doc/hal/spec/hal-spec.html"
+-depending on the distribution.
++if emerged with
++.B USE=doc.
+ 
+ .SH OPTIONS
+ The following options are supported:
+@@ -49,7 +50,7 @@
+ 
+ .SH BUGS
+ .PP
+-Please send bug reports to either the distribution or the HAL
++Please send bug reports to http://bugs.gentoo.org or the HAL
+ mailing list, see 
+ .I "http://lists.freedesktop.org/mailman/listinfo/hal"
+ on how to subscribe.
+@@ -67,3 +68,4 @@
+ Written by David Zeuthen <david@fubar.dk> with a lot of help from many
+ others.
+ 
++Gentoo specific changes by Doug Goldstein <cardoe@gentoo.org> and Steev Klimaszewski <steev@gentoo.org> with help from Gentoo testers and contributors.
+Index: b/doc/man/hal-find-by-property.1.in
+===================================================================
+--- a/doc/man/hal-find-by-property.1.in	2007-04-06 19:37:52.000000000 -0400
++++ b/doc/man/hal-find-by-property.1.in	2007-04-06 20:25:30.000000000 -0400
+@@ -20,7 +20,8 @@
+ .B HAL
+ properties, refer to the \fIHAL spec\fP which can be found in
+ .I "@docdir@/spec/hal-spec.html"
+-depending on the distribution.
++if emerged with
++.B USE=doc.
+ 
+ .SH OPTIONS
+ The following options are supported:
+@@ -49,7 +50,7 @@
+ 
+ .SH BUGS
+ .PP
+-Please send bug reports to either the distribution or the HAL
++Please send bug reports to http://bugs.gentoo.org or the HAL
+ mailing list, see 
+ .I "http://lists.freedesktop.org/mailman/listinfo/hal"
+ on how to subscribe.
+@@ -67,3 +68,4 @@
+ Written by David Zeuthen <david@fubar.dk> with a lot of help from many
+ others.
+ 
++Gentoo specific changes by Doug Goldstein <cardoe@gentoo.org> and Steev Klimaszewski <steev@gentoo.org> with help from Gentoo testers and contributors.
+Index: b/doc/man/hal-get-property.1
+===================================================================
+--- a/doc/man/hal-get-property.1	2007-04-06 19:37:52.000000000 -0400
++++ b/doc/man/hal-get-property.1	2007-04-06 20:25:30.000000000 -0400
+@@ -20,7 +20,8 @@
+ .B HAL
+ properties, refer to the \fIHAL spec\fP which can be found in
+ .I "/usr/share/doc/hal/spec/hal-spec.html"
+-depending on the distribution.
++if emerged with
++.B USE=doc.
+ 
+ .SH OPTIONS
+ The following options are supported:
+@@ -53,7 +54,7 @@
+ 
+ .SH BUGS
+ .PP
+-Please send bug reports to either the distribution or the HAL
++Please send bug reports to http://bugs.gentoo.org or the HAL
+ mailing list, see 
+ .I "http://lists.freedesktop.org/mailman/listinfo/hal"
+ on how to subscribe.
+@@ -70,3 +71,4 @@
+ Written by David Zeuthen <david@fubar.dk> with a lot of help from many
+ others.
+ 
++Gentoo specific changes by Doug Goldstein <cardoe@gentoo.org> and Steev Klimaszewski <steev@gentoo.org> with help from Gentoo testers and contributors.
+Index: b/doc/man/hal-get-property.1.in
+===================================================================
+--- a/doc/man/hal-get-property.1.in	2007-04-06 19:37:52.000000000 -0400
++++ b/doc/man/hal-get-property.1.in	2007-04-06 20:25:30.000000000 -0400
+@@ -20,7 +20,8 @@
+ .B HAL
+ properties, refer to the \fIHAL spec\fP which can be found in
+ .I "@docdir@/spec/hal-spec.html"
+-depending on the distribution.
++if emerged with
++.B USE=doc.
+ 
+ .SH OPTIONS
+ The following options are supported:
+@@ -53,7 +54,7 @@
+ 
+ .SH BUGS
+ .PP
+-Please send bug reports to either the distribution or the HAL
++Please send bug reports to http://bugs.gentoo.org or the HAL
+ mailing list, see 
+ .I "http://lists.freedesktop.org/mailman/listinfo/hal"
+ on how to subscribe.
+@@ -70,3 +71,4 @@
+ Written by David Zeuthen <david@fubar.dk> with a lot of help from many
+ others.
+ 
++Gentoo specific changes by Doug Goldstein <cardoe@gentoo.org> and Steev Klimaszewski <steev@gentoo.org> with help from Gentoo testers and contributors.
+Index: b/doc/man/hal-is-caller-locked-out.1
+===================================================================
+--- a/doc/man/hal-is-caller-locked-out.1	2007-04-06 19:37:52.000000000 -0400
++++ b/doc/man/hal-is-caller-locked-out.1	2007-04-06 20:25:30.000000000 -0400
+@@ -18,7 +18,8 @@
+ .B HAL
+ properties, refer to the \fIHAL spec\fP which can be found in
+ .I "/usr/share/doc/hal/spec/hal-spec.html"
+-depending on the distribution.
++if emerged with
++.B USE=doc.
+ 
+ .SH OPTIONS
+ The following options are supported:
+@@ -47,7 +48,7 @@
+ 
+ .SH BUGS
+ .PP
+-Please send bug reports to either the distribution or the HAL
++Please send bug reports to http://bugs.gentoo.org or the HAL
+ mailing list, see 
+ .I "http://lists.freedesktop.org/mailman/listinfo/hal"
+ on how to subscribe.
+@@ -65,3 +66,4 @@
+ Written by David Zeuthen <david@fubar.dk> with a lot of help from many
+ others.
+ 
++Gentoo specific changes by Doug Goldstein <cardoe@gentoo.org> and Steev Klimaszewski <steev@gentoo.org> with help from Gentoo testers and contributors.
+Index: b/doc/man/hal-is-caller-locked-out.1.in
+===================================================================
+--- a/doc/man/hal-is-caller-locked-out.1.in	2007-04-06 19:37:52.000000000 -0400
++++ b/doc/man/hal-is-caller-locked-out.1.in	2007-04-06 20:25:30.000000000 -0400
+@@ -18,7 +18,8 @@
+ .B HAL
+ properties, refer to the \fIHAL spec\fP which can be found in
+ .I "@docdir@/spec/hal-spec.html"
+-depending on the distribution.
++if emerged with
++.B USE=doc.
+ 
+ .SH OPTIONS
+ The following options are supported:
+@@ -47,7 +48,7 @@
+ 
+ .SH BUGS
+ .PP
+-Please send bug reports to either the distribution or the HAL
++Please send bug reports to http://bugs.gentoo.org or the HAL
+ mailing list, see 
+ .I "http://lists.freedesktop.org/mailman/listinfo/hal"
+ on how to subscribe.
+@@ -65,3 +66,4 @@
+ Written by David Zeuthen <david@fubar.dk> with a lot of help from many
+ others.
+ 
++Gentoo specific changes by Doug Goldstein <cardoe@gentoo.org> and Steev Klimaszewski <steev@gentoo.org> with help from Gentoo testers and contributors.
+Index: b/doc/man/hal-lock.1
+===================================================================
+--- a/doc/man/hal-lock.1	2007-04-06 19:37:52.000000000 -0400
++++ b/doc/man/hal-lock.1	2007-04-06 20:25:30.000000000 -0400
+@@ -18,7 +18,8 @@
+ .B HAL
+ locks, refer to the \fIHAL spec\fP which can be found in
+ .I "/usr/share/doc/hal/spec/hal-spec.html"
+-depending on the distribution.
++if emerged with
++.B USE=doc.
+ 
+ .SH OPTIONS
+ The following options are supported:
+@@ -78,7 +79,7 @@
+ 
+ .SH BUGS
+ .PP
+-Please send bug reports to either the distribution or the HAL
++Please send bug reports to http://bugs.gentoo.org or the HAL
+ mailing list, see 
+ .I "http://lists.freedesktop.org/mailman/listinfo/hal"
+ on how to subscribe.
+@@ -96,3 +97,4 @@
+ Written by David Zeuthen <david@fubar.dk> with a lot of help from many
+ others.
+ 
++Gentoo specific changes by Doug Goldstein <cardoe@gentoo.org> and Steev Klimaszewski <steev@gentoo.org> with help from Gentoo testers and contributors.
+Index: b/doc/man/hal-lock.1.in
+===================================================================
+--- a/doc/man/hal-lock.1.in	2007-04-06 19:37:52.000000000 -0400
++++ b/doc/man/hal-lock.1.in	2007-04-06 20:25:30.000000000 -0400
+@@ -18,7 +18,8 @@
+ .B HAL
+ locks, refer to the \fIHAL spec\fP which can be found in
+ .I "@docdir@/spec/hal-spec.html"
+-depending on the distribution.
++if emerged with
++.B USE=doc.
+ 
+ .SH OPTIONS
+ The following options are supported:
+@@ -78,7 +79,7 @@
+ 
+ .SH BUGS
+ .PP
+-Please send bug reports to either the distribution or the HAL
++Please send bug reports to http://bugs.gentoo.org or the HAL
+ mailing list, see 
+ .I "http://lists.freedesktop.org/mailman/listinfo/hal"
+ on how to subscribe.
+@@ -96,3 +97,4 @@
+ Written by David Zeuthen <david@fubar.dk> with a lot of help from many
+ others.
+ 
++Gentoo specific changes by Doug Goldstein <cardoe@gentoo.org> and Steev Klimaszewski <steev@gentoo.org> with help from Gentoo testers and contributors.
+Index: b/doc/man/hal-set-property.1
+===================================================================
+--- a/doc/man/hal-set-property.1	2007-04-06 19:37:52.000000000 -0400
++++ b/doc/man/hal-set-property.1	2007-04-06 20:25:30.000000000 -0400
+@@ -20,7 +20,8 @@
+ .B HAL
+ properties, refer to the \fIHAL spec\fP which can be found in
+ .I "/usr/share/doc/hal/spec/hal-spec.html"
+-depending on the distribution.
++if emerged with
++.B USE=doc.
+ 
+ .SH OPTIONS
+ The following options are supported:
+@@ -87,7 +88,7 @@
+ 
+ .SH BUGS
+ .PP
+-Please send bug reports to either the distribution or the HAL
++Please send bug reports to http://bugs.gentoo.org or the HAL
+ mailing list, see 
+ .I "http://lists.freedesktop.org/mailman/listinfo/hal"
+ on how to subscribe.
+@@ -104,3 +105,4 @@
+ Written by David Zeuthen <david@fubar.dk> with a lot of help from many
+ others.
+ 
++Gentoo specific changes by Doug Goldstein <cardoe@gentoo.org> and Steev Klimaszewski <steev@gentoo.org> with help from Gentoo testers and contributors.
+Index: b/doc/man/hal-set-property.1.in
+===================================================================
+--- a/doc/man/hal-set-property.1.in	2007-04-06 19:37:52.000000000 -0400
++++ b/doc/man/hal-set-property.1.in	2007-04-06 20:25:30.000000000 -0400
+@@ -20,7 +20,8 @@
+ .B HAL
+ properties, refer to the \fIHAL spec\fP which can be found in
+ .I "@docdir@/spec/hal-spec.html"
+-depending on the distribution.
++if emerged with
++.B USE=doc.
+ 
+ .SH OPTIONS
+ The following options are supported:
+@@ -87,7 +88,7 @@
+ 
+ .SH BUGS
+ .PP
+-Please send bug reports to either the distribution or the HAL
++Please send bug reports to http://bugs.gentoo.org or the HAL
+ mailing list, see 
+ .I "http://lists.freedesktop.org/mailman/listinfo/hal"
+ on how to subscribe.
+@@ -104,3 +105,4 @@
+ Written by David Zeuthen <david@fubar.dk> with a lot of help from many
+ others.
+ 
++Gentoo specific changes by Doug Goldstein <cardoe@gentoo.org> and Steev Klimaszewski <steev@gentoo.org> with help from Gentoo testers and contributors.
+Index: b/doc/man/hald.8
+===================================================================
+--- a/doc/man/hald.8	2007-04-06 19:37:52.000000000 -0400
++++ b/doc/man/hald.8	2007-04-06 20:29:53.000000000 -0400
+@@ -19,7 +19,8 @@
+ more information about both the big picture and specific API details,
+ refer to the \fIHAL spec\fP which can be found in
+ .I "/usr/share/doc/hal/spec/hal-spec.html"
+-depending on the distribution.
++if emerged with
++.B USE=doc.
+ 
+ .SH OPTIONS
+ The following options are supported:
+@@ -38,24 +39,20 @@
+ 
+ .SH BUGS AND DEBUGGING
+ .PP
+-Please send bug reports to either the distribution or the HAL
++Please send bug reports to http://bugs.gentoo.org or the HAL
+ mailing list, see 
+ .I "http://lists.freedesktop.org/mailman/listinfo/hal"
+ on how to subscribe.
+ 
+-First, to obtain useful debug traces you will need to have
+-.B debuginfo
+-packages installed. On a Fedora system this is in the 
+-.B hal-debuginfo 
+-package and can be installed via the
+-.I yum
+-update program. 
++First, to obtain useful debug traces you will need to have HAL emerged with
++.B USE=debug
++enabled. Additionally you should read http://www.gentoo.org/proj/en/qa/backtraces.xml
+ 
+ Second, shut down the existing 
+ .B hald
+-daemon instance; on a Fedora system this is achieved by
++daemon instance; on a Gentoo system this is achieved by
+ 
+-.I "/etc/init.d/haldaemon stop"
++.I "/etc/init.d/hald stop"
+ 
+ After having shut down the daemon, you might want to run
+ 
+@@ -102,4 +99,5 @@
+ .SH AUTHOR
+ Written by David Zeuthen <david@fubar.dk> with a lot of help from many
+ others.
++Gentoo specific changes by Doug Goldstein <cardoe@gentoo.org> and Steev Klimaszewski <steev@gentoo.org> with help from Gentoo testers and contributors.
+ 
+Index: b/doc/man/hald.8.in
+===================================================================
+--- a/doc/man/hald.8.in	2007-04-06 19:37:52.000000000 -0400
++++ b/doc/man/hald.8.in	2007-04-06 20:30:19.000000000 -0400
+@@ -19,7 +19,8 @@
+ more information about both the big picture and specific API details,
+ refer to the \fIHAL spec\fP which can be found in
+ .I "@docdir@/spec/hal-spec.html"
+-depending on the distribution.
++if emerged with
++.B USE=doc.
+ 
+ .SH OPTIONS
+ The following options are supported:
+@@ -38,18 +39,14 @@
+ 
+ .SH BUGS AND DEBUGGING
+ .PP
+-Please send bug reports to either the distribution or the HAL
++Please send bug reports to http://bugs.gentoo.org or the HAL
+ mailing list, see 
+ .I "http://lists.freedesktop.org/mailman/listinfo/hal"
+ on how to subscribe.
+ 
+-First, to obtain useful debug traces you will need to have
+-.B debuginfo
+-packages installed. On a Fedora system this is in the 
+-.B hal-debuginfo 
+-package and can be installed via the
+-.I yum
+-update program. 
++First, to obtain useful debug traces you will need to have HAL emerged with
++.B USE=debug
++enabled. Additionally you should read http://www.gentoo.org/proj/en/qa/backtraces.xml
+ 
+ Second, shut down the existing 
+ .B hald
+@@ -102,4 +99,4 @@
+ .SH AUTHOR
+ Written by David Zeuthen <david@fubar.dk> with a lot of help from many
+ others.
+-
++Gentoo specific changes by Doug Goldstein <cardoe@gentoo.org> and Steev Klimaszewski <steev@gentoo.org> with help from Gentoo testers and contributors.
diff --git a/sys-apps/hal/files/0.5.9/96_plugdev_allow_send.patch b/sys-apps/hal/files/0.5.9/96_plugdev_allow_send.patch
new file mode 100644
index 000000000000..ea462785f229
--- /dev/null
+++ b/sys-apps/hal/files/0.5.9/96_plugdev_allow_send.patch
@@ -0,0 +1,42 @@
+Index: b/hal.conf
+===================================================================
+--- a/hal.conf	2007-04-03 00:41:24.000000000 -0400
++++ b/hal.conf	2007-04-06 20:36:53.000000000 -0400
+@@ -63,5 +63,16 @@
+     <allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
+   </policy>
+ 
++  <!-- Gentoo specific rules to allow 'plugdev' group to access Volumes and Power Management -->
++  <!-- We possibly will use 'powerdev' for Power Management or work on encapsulating everything in ConsoleKit -->
++  <policy group="plugdev">
++  	<allow send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
++	<allow send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
++  </policy>
++  <policy group="plugdev">
++  	<allow send_interface="org.freedesktop.Hal.Device.Volume"/>
++	<allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
++  </policy>
++
+ </busconfig>
+ 
+Index: b/hal.conf.in
+===================================================================
+--- a/hal.conf.in	2007-03-07 16:52:19.000000000 -0500
++++ b/hal.conf.in	2007-04-06 20:37:59.000000000 -0400
+@@ -63,5 +63,16 @@
+     <allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
+   </policy>
+ 
++  <!-- Gentoo specific rules to allow 'plugdev' group to access Volumes and Power Management -->
++  <!-- We possibly will use 'powerdev' for Power Management or work on encapsulating everything in ConsoleKit -->
++  <policy group="plugdev">
++  	<allow send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
++	<allow send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
++  </policy>
++  <policy group="plugdev">
++  	<allow send_interface="org.freedesktop.Hal.Device.Volume"/>
++	<allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
++  </policy>
++
+ </busconfig>
+ 
diff --git a/sys-apps/hal/files/0.5.9/series b/sys-apps/hal/files/0.5.9/series
index 7bf644648466..7aa6aa0c19b9 100644
--- a/sys-apps/hal/files/0.5.9/series
+++ b/sys-apps/hal/files/0.5.9/series
@@ -1,3 +1,5 @@
 01_luks_mount_fix.patch
 02_acpi_repeated_property_change.patch
 03_crasher_fix_fail_to_return_value.patch
+95_gentoo_man_page.patch
+96_plugdev_allow_send.patch
diff --git a/sys-apps/hal/hal-0.5.9.ebuild b/sys-apps/hal/hal-0.5.9.ebuild
index 5a428e525435..591e3399b8a0 100644
--- a/sys-apps/hal/hal-0.5.9.ebuild
+++ b/sys-apps/hal/hal-0.5.9.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/sys-apps/hal/hal-0.5.9.ebuild,v 1.8 2007/04/06 19:13:01 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.ebuild,v 1.9 2007/04/07 00:43:57 cardoe Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
@@ -30,7 +30,7 @@ RDEPEND=">=dev-libs/glib-2.6
 		dell? ( >=sys-libs/libsmbios-0.13.4 )
 		disk-partition? ( >=sys-apps/parted-1.7.1 )
 		crypt? ( >=sys-fs/cryptsetup-luks-1.0.1 )
-		selinux? ( sys-libs/libselinux 
+		selinux? ( sys-libs/libselinux
 					sec-policy/selinux-hal )
 		pam? ( sys-auth/consolekit )"
 
@@ -91,8 +91,6 @@ src_unpack() {
 
 	# Gentoo Patch Set
 	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch ${FILESDIR}/${PV}
-
-	epatch ${FILESDIR}/${PN}-0.5.7-plugdev-allow-send.patch
 }
 
 src_compile() {