mirror from gentopia, cause it has more fixes!

(Portage version: 2.1.4_rc11)

4 files changed, 22 insertions, 19 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 51a5e8cee576..fa946ef13953 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.220 2007/12/25 05:00:50 compnerd Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.221 2008/01/05 19:23:07 compnerd Exp $
+
+  05 Jan 2008; Saleem Abdulrasool <compnerd@gentoo.org>
+  files/0.5.10-hald.rc, hal-0.5.10.ebuild:
+  Update the state to mirror gentopia's ebuild
 
   25 Dec 2007; Saleem Abdulrasool <compnerd@gentoo.org>
   +files/96_plugdev_allow_send.patch, hal-0.5.10.ebuild:
diff --git a/sys-apps/hal/files/0.5.10-hald.rc b/sys-apps/hal/files/0.5.10-hald.rc
index f9e53f4dc679..f14e12ab7421 100644
--- a/sys-apps/hal/files/0.5.10-hald.rc
+++ b/sys-apps/hal/files/0.5.10-hald.rc
@@ -1,11 +1,11 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/files/0.5.10-hald.rc,v 1.1 2007/11/23 06:29:51 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/files/0.5.10-hald.rc,v 1.2 2008/01/05 19:23:08 compnerd Exp $
 
 depend() {
 	use logger acpid
-	need dbus consolekit
+	need dbus
 	after coldplug dns nscd
 }
 
diff --git a/sys-apps/hal/files/digest-hal-0.5.10 b/sys-apps/hal/files/digest-hal-0.5.10
index 6688949a7f1a..f71522e94157 100644
--- a/sys-apps/hal/files/digest-hal-0.5.10
+++ b/sys-apps/hal/files/digest-hal-0.5.10
@@ -1,6 +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 91cb5a7d261615c11ceda2da9c5374c3 hal-0.5.10-gentoo-patches-0.tar.bz2 38854
+RMD160 5f3cfc320885851f0024cb4543b2a9266fb6bea5 hal-0.5.10-gentoo-patches-0.tar.bz2 38854
+SHA256 60775698be0dbe1a9a3507bdc8188a454a03252e59aa68a0700c82bd6aaece66 hal-0.5.10-gentoo-patches-0.tar.bz2 38854
 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 8f51b8f99223..e3de97052058 100644
--- a/sys-apps/hal/hal-0.5.10.ebuild
+++ b/sys-apps/hal/hal-0.5.10.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.4 2007/12/25 12:19:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.10.ebuild,v 1.5 2008/01/05 19:23:07 compnerd Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
-PATCH_VER="p1"
+PATCH_VER="0"
 
 DESCRIPTION="Hardware Abstraction Layer"
 HOMEPAGE="http://www.freedesktop.org/Software/hal"
 SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.gz
-		http://dev.gentoo.org/~cardoe/files/${PN}/${P}-${PATCH_VER}.tar.bz2"
+		http://dev.gentoo.org/~compnerd/files/${PN}/${P}-gentoo-patches-${PATCH_VER}.tar.bz2"
 
 LICENSE="|| ( GPL-2 AFL-2.0 )"
 SLOT="0"
@@ -24,8 +24,6 @@ RDEPEND=">=dev-libs/glib-2.6
 		 >=sys-apps/pciutils-2.2.7-r1
 		 >=dev-libs/libusb-0.1.10a
 		 >=dev-util/gperf-3.0.3
-		 >=sys-auth/consolekit-0.2
-		 >=sys-auth/policykit-0.6
 		   sys-apps/usbutils
 		   virtual/eject
 		 amd64? ( >=sys-apps/dmidecode-2.7 )
@@ -117,7 +115,7 @@ pkg_setup() {
 
 		linux_chkconfig_present INOTIFY_USER || notify_inotify
 
-		if use acpi ; then
+		if kernel_is lt 2 6 23 && use acpi ; then
 			linux_chkconfig_present ACPI_PROCFS || notify_acpi_procfs
 			linux_chkconfig_present ACPI_PROC_EVENT || notify_acpi_proc_event
 		fi
@@ -155,8 +153,7 @@ 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_MULTI_MSG="Applying Gentoo Patchset ..." \
 	EPATCH_SUFFIX="patch" \
 	EPATCH_SOURCE="${WORKDIR}/hal-0.5.10-patches/" \
 	EPATCH_FORCE="yes" \
@@ -167,6 +164,8 @@ src_unpack() {
 
 	# Enable plugdev support
 	epatch "${FILESDIR}/96_plugdev_allow_send.patch"
+
+	eautoreconf
 }
 
 src_compile() {
@@ -222,9 +221,9 @@ src_compile() {
 		  --with-socket-dir=/var/run/hald \
 		  --enable-umount-helper \
 		  --enable-man-pages \
-		  --enable-policy-kit \
-		  --enable-console-kit \
-		  --enable-acl-management \
+		  --disable-policy-kit \
+		  --disable-console-kit \
+		  --disable-acl-management \
 		  --enable-pci \
 		  --enable-sonypic \
 		  $(use_enable apm) \