add cardoe's patches

(Portage version: 2.1.4_rc11)

4 files changed, 64 insertions, 5 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 027f32b8de2c..51a5e8cee576 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,10 @@
 # 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.219 2007/12/06 22:29:02 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.220 2007/12/25 05:00:50 compnerd Exp $
+
+  25 Dec 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/96_plugdev_allow_send.patch, hal-0.5.10.ebuild:
+  Pull in cardoe's patches
 
   06 Dec 2007; Doug Klima <cardoe@gentoo.org> metadata.xml:
   removed myself as a maintainer of HAL.
diff --git a/sys-apps/hal/files/96_plugdev_allow_send.patch b/sys-apps/hal/files/96_plugdev_allow_send.patch
new file mode 100644
index 000000000000..ea462785f229
--- /dev/null
+++ b/sys-apps/hal/files/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/digest-hal-0.5.10 b/sys-apps/hal/files/digest-hal-0.5.10
index 0559695c8a34..6688949a7f1a 100644
--- a/sys-apps/hal/files/digest-hal-0.5.10
+++ b/sys-apps/hal/files/digest-hal-0.5.10
@@ -1,3 +1,6 @@
+MD5 0c73dc24ac72b9a5b66f3c807396c635 hal-0.5.10-p1.tar.bz2 22728
+RMD160 8580065498c7af6605509d03d69e5dbf01f9e350 hal-0.5.10-p1.tar.bz2 22728
+SHA256 ae708f8e75e457672e0b62b04700afdb29b62edc4306ebf78aa7f964f44b2422 hal-0.5.10-p1.tar.bz2 22728
 MD5 fce852c428e7cda0b937087c79eec63f hal-0.5.10.tar.gz 1591146
 RMD160 fafd90e671dbe95a8dd55a4ad257586a0289ef67 hal-0.5.10.tar.gz 1591146
 SHA256 5a71a18c40af2bac64f40f0b8add2b6789924b98d7f1cb79a0faf83cb77acb4c hal-0.5.10.tar.gz 1591146
diff --git a/sys-apps/hal/hal-0.5.10.ebuild b/sys-apps/hal/hal-0.5.10.ebuild
index 17e7eb76b4da..e0eb4826843a 100644
--- a/sys-apps/hal/hal-0.5.10.ebuild
+++ b/sys-apps/hal/hal-0.5.10.ebuild
@@ -1,16 +1,19 @@
 # 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.10.ebuild,v 1.2 2007/11/23 09:30:39 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.10.ebuild,v 1.3 2007/12/25 05:00:50 compnerd Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
+PATCH_VER="p1"
+
 DESCRIPTION="Hardware Abstraction Layer"
 HOMEPAGE="http://www.freedesktop.org/Software/hal"
-SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.gz"
+SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.gz
+		http://dev.gentoo.org/~cardoe/files/${PN}/${P}-${PATCH_VER}.tar.bz2"
 
 LICENSE="|| ( GPL-2 AFL-2.0 )"
 SLOT="0"
-KEYWORDS="~amd64 -mips -ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
 
 KERNEL_IUSE="kernel_linux kernel_FreeBSD"
 IUSE="acpi apm crypt debug dell disk-partition doc selinux ${KERNEL_IUSE}"
@@ -152,11 +155,18 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	# patchset from http://dev.gentoo.org/~cardoe/repos/hal.git
+	EPATCH_MULTI_MSG="Applying http://dev.gentoo.org/~cardoe/repos/hal.git patchset ..." \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_SOURCE="${WORKDIR}/hal-0.5.10-patches/" \
+	EPATCH_FORCE="yes" \
+	epatch 
+
 	# Hide recovery partitions
 	epatch "${FILESDIR}/hal-0.5.9-hide-recovery-partitions.patch"
 
 	# Enable plugdev support
-	epatch "${FILESDIR}/0.5.9/96_plugdev_allow_send.patch"
+	epatch "${FILESDIR}/96_plugdev_allow_send.patch"
 }
 
 src_compile() {