Update HOMEPAGE, closes bug #261356 by Mr. Anderson <walch.martin@web.de>. Version bump to 0.5.12 release candidate 1 which incorporates some patches. Patchset trimmed and rebased accordingly.

(Portage version: 2.1.6.7/cvs/Linux x86_64)

7 files changed, 31 insertions, 623 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 1278b55f3348..36cfe25e372a 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,10 +1,24 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.277 2009/03/08 21:54:11 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.278 2009/03/08 22:03:59 chainsaw Exp $
 
   08 Mar 2009; Joseph Jezak <josejx@gentoo.org> hal-0.5.11-r8.ebuild:
   Marked ppc64 for bug #259080.
 
+*hal-0.5.12_rc1 (08 Mar 2009)
+
+  08 Mar 2009; <chainsaw@gentoo.org> hal-0.5.9.1-r3.ebuild,
+  -hal-0.5.11-r1.ebuild, hal-0.5.11-r4.ebuild, -hal-0.5.11-r6.ebuild,
+  -hal-0.5.11-r7.ebuild, hal-0.5.11-r8.ebuild, +hal-0.5.12_rc1.ebuild:
+  Update HOMEPAGE, closes bug #261356 by Mr. Anderson <walch.martin@web.de>.
+  Version bump to 0.5.12 release candidate 1 which incorporates some
+  patches. Patchset trimmed and rebased accordingly.
+
+  08 Mar 2009; <chainsaw@gentoo.org> -hal-0.5.11-r1.ebuild,
+  -hal-0.5.11-r6.ebuild, -hal-0.5.11-r7.ebuild:
+  Spring cleaning, -r1, -r6 & -r7 are no longer required. Will have to keep
+  -r4 around until requested PPC64 keywording is completed.
+
   21 Feb 2009; Jeroen Roovers <jer@gentoo.org> hal-0.5.11-r8.ebuild:
   Stable for HPPA (bug #259080).
 
diff --git a/sys-apps/hal/hal-0.5.11-r1.ebuild b/sys-apps/hal/hal-0.5.11-r1.ebuild
deleted file mode 100644
index 27cbfb85b415..000000000000
--- a/sys-apps/hal/hal-0.5.11-r1.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r1.ebuild,v 1.16 2009/02/05 10:18:24 chainsaw Exp $
-
-inherit eutils linux-info autotools flag-o-matic
-
-PATCH_VERSION="1"
-
-DESCRIPTION="Hardware Abstraction Layer"
-HOMEPAGE="http://www.freedesktop.org/Software/hal"
-SRC_URI="http://hal.freedesktop.org/releases/${P/_/}.tar.bz2
-		 http://dev.gentoo.org/~compnerd/files/${PN}/${P}-gentoo-patches-${PATCH_VERSION}.tar.bz2"
-
-LICENSE="|| ( GPL-2 AFL-2.0 )"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
-
-KERNEL_IUSE="kernel_linux kernel_FreeBSD"
-IUSE="X acpi apm crypt debug dell disk-partition doc laptop selinux ${KERNEL_IUSE}"
-
-RDEPEND=">=dev-libs/dbus-glib-0.61
-		 >=dev-libs/glib-2.14
-		 >=dev-libs/expat-1.95.8
-		 >=dev-libs/libusb-0.1.10a
-		 >=sys-apps/pciutils-2.2.7-r1
-		 >=dev-util/gperf-3.0.3
-		   sys-apps/usbutils
-		   virtual/eject
-		 amd64? ( >=sys-apps/dmidecode-2.7 )
-		 dell? ( >=sys-libs/libsmbios-0.13.4 )
-		 disk-partition? ( >=sys-apps/parted-1.8.0 )
-		 ia64? ( >=sys-apps/dmidecode-2.7 )
-		 kernel_linux?	(
-							>=sys-fs/udev-111
-							!>=sys-fs/udev-125
-							>=sys-apps/util-linux-2.13
-							>=sys-kernel/linux-headers-2.6.19
-							crypt?	( >=sys-fs/cryptsetup-1.0.5 )
-						)
-		 kernel_FreeBSD? ( dev-libs/libvolume_id )
-		 x86? ( >=sys-apps/dmidecode-2.7 )
-		 selinux? ( sys-libs/libselinux sec-policy/selinux-hal )"
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig
-		>=dev-util/intltool-0.35
-		X? ( >=dev-python/pyxf86config-0.3.34-r1 )
-		doc?	(
-					app-doc/doxygen
-					app-text/docbook-sgml-utils
-					app-text/xmlto
-					dev-libs/libxml2
-				)"
-PDEPEND=">=app-misc/hal-info-20080310
-		 !gnome-extra/hal-device-manager
-		 laptop? ( >=sys-power/pm-utils-0.99.3 )"
-
-## HAL Daemon drops privledges so we need group access to read disks
-HALDAEMON_GROUPS_LINUX="haldaemon,plugdev,disk,cdrom,cdrw,floppy,usb"
-HALDAEMON_GROUPS_FREEBSD="haldaemon,plugdev,operator"
-
-function check_hotplug_net() {
-	local CONFIG_CHECK="~HOTPLUG ~NET"
-	local WARNING_HOTPLUG="CONFIG_HOTPLUG:\tis not set (required for HAL)\n"
-	local WARNING_NET="CONFIG_NET:\tis not set (required for HAL)\n"
-	check_extra_config
-}
-
-function check_inotify() {
-	local CONFIG_CHECK="~INOTIFY_USER"
-	local WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER:\tis not set (required for HAL)\n"
-	check_extra_config
-}
-
-function check_acpi_proc() {
-	local CONFIG_CHECK="~ACPI_PROCFS ~ACPI_PROC_EVENT"
-	local WARNING_ACPI_PROCFS="CONFIG_ACPI_PROCFS:\tis not set (required for HAL)\n"
-	local WARNING_ACPI_PROC_EVENT="CONFIG_ACPI_PROC_EVENT:\tis not set (required for HAL)\n"
-	check_extra_config
-}
-
-pkg_setup() {
-	if use kernel_linux ; then
-		if [[ -e "${ROOT}/usr/src/linux/.config" ]] ; then
-			kernel_is ge 2 6 19 || ewarn "HAL requires a kernel version 2.6.19 or newer"
-
-			if kernel_is lt 2 6 23 && use acpi ; then
-				check_acpi_proc
-			fi
-		fi
-
-		check_hotplug_net
-		check_inotify
-	fi
-
-	# http://devmanual.gentoo.org/ebuild-writing/functions/
-	# http://bugs.gentoo.org/show_bug.cgi?id=191605
-
-	# Create groups for hotplugging and HAL
-	enewgroup haldaemon
-	enewgroup plugdev
-
-	# HAL drops priviledges by default now ...
-	# ... so we must make sure it can read disk/cdrom info (ie. be in ${HALDAEMON_GROUPS} groups)
-	if use kernel_linux; then
-		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX}
-	elif use kernel_FreeBSD; then
-		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD}
-	fi
-
-	# Make sure that the haldaemon user is in the ${HALDAEMON_GROUPS}
-	# If users have a problem with this, let them file a bug
-	if [[ ${ROOT} == / ]] ; then
-		if use kernel_linux; then
-			usermod -G ${HALDAEMON_GROUPS_LINUX} haldaemon
-		elif use kernel_FreeBSD; then
-			pw usermod haldaemon -G ${HALDAEMON_GROUPS_FREEBSD}
-		fi
-	fi
-}
-
-S="${WORKDIR}/${PF/-r*/}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	EPATCH_MULTI_MSG="Applying Gentoo Patchset ..." \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_SOURCE="${WORKDIR}/${P}-patches/" \
-	EPATCH_FORCE="yes" \
-	epatch
-
-	eautoreconf
-}
-
-src_compile() {
-	local acpi="$(use_enable acpi)"
-	local backend=
-	local hardware=
-
-	append-flags -rdynamic
-
-	if use kernel_linux ; then
-		backend="linux"
-	elif use kernel_FreeBSD ; then
-		backend="freebsd"
-	else
-		eerror "Invalid backend"
-	fi
-
-	if use kernel_linux ; then
-		if use acpi ; then
-			# Using IBM ACPI and Toshiba ACPI results in double notification as this
-			# was merged into the Linux Kernel 2.6.22
-			if kernel_is lt 2 6 22 ; then
-				acpi="$acpi --enable-acpi-ibm --enable-acpi-toshiba"
-			else
-				acpi="$acpi --disable-acpi-ibm --disable-acpi-toshiba"
-			fi
-
-			acpi="$acpi --enable-acpi-proc --enable-acpi-acpid"
-		else
-			acpi="$acpi --disable-acpi-ibm --disable-acpi-toshiba"
-			acpi="$acpi --disable-acpi-proc --disable-acpi-acpid"
-		fi
-
-		hardware="--with-cpufreq --with-usb-csr --with-keymaps"
-		use arm && hardware="$hardware --enable-omap"
-
-		if use dell ; then
-			hardware="$hardware --with-dell-backlight"
-		else
-			hardware="$hardware --without-dell-backlight"
-		fi
-	else
-		hardware="--without-cpufreq --without-usb-csr --without-keymaps"
-		hardware="$hardware --disable-omap"
-		hardware="$hardware --without-dell-backlight"
-		hardware="$hardware --enable-acpi-ibm --enable-acpi-toshiba"
-	fi
-
-	econf --with-backend=${backend} \
-		  --with-os-type=gentoo \
-		  --with-pid-file=/var/run/hald.pid \
-		  --with-hwdata=/usr/share/misc \
-		  --with-socket-dir=/var/run/hald \
-		  --enable-umount-helper \
-		  --enable-man-pages \
-		  --disable-policy-kit \
-		  --disable-console-kit \
-		  --disable-acl-management \
-		  --enable-pci \
-		  --enable-sonypic \
-		  $(use_enable apm) \
-		  $(use_enable arm pmu) \
-		  $(use_with arm omap) \
-		  $(use_enable debug verbose-mode) \
-		  $(use_enable disk-partition parted) \
-		  $(use_enable doc docbook-docs) \
-		  $(use_enable doc doxygen-docs) \
-		  --docdir=/usr/share/doc/${PF} \
-		  --localstatedir=/var \
-		  ${acpi} ${hardware} \
-	|| die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake failed"
-	dodoc AUTHORS ChangeLog NEWS README || die "docs failed"
-
-	# hal umount for unclean unmounts
-	exeinto /lib/udev/
-	newexe "${FILESDIR}/hal-unmount.dev" hal_unmount || die "udev helper failed"
-
-	# initscript
-	newinitd "${FILESDIR}/0.5.10-hald.rc" hald || die "init script failed"
-
-	# configuration
-	cp "${FILESDIR}/0.5.10-hald.conf" "${WORKDIR}/" || \
-		die "failed to copy hald.conf"
-
-	if use debug; then
-		sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \
-			-i "${WORKDIR}/0.5.10-hald.conf" || die "failed to change verbose"
-	fi
-	newconfd "${WORKDIR}/0.5.10-hald.conf" hald || \
-		die "failed to install hald.conf"
-
-	if use X ; then
-		# New Configuration Snippets
-		dodoc "${WORKDIR}/${PN}-config-examples/"*.fdi || \
-			die "dodoc X examples failed"
-		dobin "${WORKDIR}/${PN}-config-examples/migrate-xorg-to-fdi.py" || \
-			die "dodoc X migration script failed"
-
-		# Automagic conversion!
-		elog "Migrating xorg.conf Core Keyboard configuration to HAL FDI file"
-		"${WORKDIR}/${PN}-config-examples/migrate-xorg-to-fdi.py" 2> /dev/null \
-			> "${D}/etc/hal/fdi/policy/10-x11-input.fdi" || \
-			ewarn "Failed to migrate your keyboard configuration."
-	fi
-
-	# We now create and keep /media here as both gnome-mount and pmount
-	# use these directories, to avoid collision.
-	keepdir /media
-
-	# We also need to create and keep /etc/fdi/{information,policy,preprobe}
-	# or else hal bombs.
-	keepdir /etc/hal/fdi/{information,policy,preprobe}
-
-	# HAL stores it's fdi cache in /var/lib/cache/hald
-	keepdir /var/lib/cache/hald
-
-	# HAL keeps its unix socket here
-	keepdir /var/run/hald
-	keepdir /var/lib/hal
-}
-
-pkg_postinst() {
-	# Despite what people keep changing this location. Either one works.. it doesn't matter
-	# http://dev.gentoo.org/~plasmaroo/devmanual/ebuild-writing/functions/
-
-	elog "The HAL daemon needs to be running for certain applications to"
-	elog "work. Suggested is to add the init script to your start-up"
-	elog "scripts, this should be done like this :"
-	elog "\`rc-update add hald default\`"
-	echo
-	elog "Looking for automounting support? Add yourself to the plugdev group"
-	echo
-	elog "IF you have additional applications which consume ACPI events, you"
-	elog "should consider installing acpid to allow applications to share ACPI"
-	elog "events."
-	if use X ; then
-		echo
-		elog "If you wish to use a non US layout, you may do so by executing:"
-		elog "setxkbmap <layout> or by utilizing your Desktop Environment's"
-		elog "Keyboard Layout Settings mechanism."
-		elog "Under GNOME, this is gnome-keyboard-properties, and under KDE"
-		elog "it is kxkb."
-	fi
-	echo
-	elog "In order have suspend/hibernate function with HAL or apps that use HAL"
-	elog "(such as gnome-power-manager), you should build HAL with the laptop"
-	elog "useflag which will install pm-utils."
-	if use X ; then
-		echo
-		elog "X Input Hotplugging (if you build xorg-server with the HAL useflag)"
-		elog "reads user specific configuration from /etc/hal/fdi/policy/."
-		if [[ $(cat "${ROOT}etc/hal/fdi/policy/10-x11-input.fdi" | wc -c) -gt 0 ]]
-		then
-			elog "We have converted your existing xorg.conf rules and the FDI is stored"
-			elog "at /etc/hal/fdi/policy/10-x11-input.fdi"
-		fi
-		elog "You should remove the Input sections from your xorg.conf once you have"
-		elog "migrated the rules to a HAL fdi file."
-	fi
-
-	ebeep 5
-	epause 5
-}
diff --git a/sys-apps/hal/hal-0.5.11-r4.ebuild b/sys-apps/hal/hal-0.5.11-r4.ebuild
index 3ed430e8cc44..4d3c59fe92dd 100644
--- a/sys-apps/hal/hal-0.5.11-r4.ebuild
+++ b/sys-apps/hal/hal-0.5.11-r4.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r4.ebuild,v 1.6 2009/02/05 10:18:24 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r4.ebuild,v 1.7 2009/03/08 22:03:59 chainsaw Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
 PATCH_VERSION="3"
 
 DESCRIPTION="Hardware Abstraction Layer"
-HOMEPAGE="http://www.freedesktop.org/Software/hal"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/hal"
 SRC_URI="http://hal.freedesktop.org/releases/${P/_/}.tar.bz2
 		 http://dev.gentoo.org/~compnerd/files/${PN}/${P}-gentoo-patches-${PATCH_VERSION}.tar.bz2"
 
diff --git a/sys-apps/hal/hal-0.5.11-r6.ebuild b/sys-apps/hal/hal-0.5.11-r6.ebuild
deleted file mode 100644
index 1820e6627b11..000000000000
--- a/sys-apps/hal/hal-0.5.11-r6.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r6.ebuild,v 1.4 2009/01/21 22:18:36 aballier Exp $
-
-inherit eutils linux-info autotools flag-o-matic
-
-PATCH_VERSION="3"
-
-DESCRIPTION="Hardware Abstraction Layer"
-HOMEPAGE="http://www.freedesktop.org/Software/hal"
-SRC_URI="http://hal.freedesktop.org/releases/${P/_/}.tar.bz2
-		 http://dev.gentoo.org/~compnerd/files/${PN}/${P}-gentoo-patches-${PATCH_VERSION}.tar.bz2"
-
-LICENSE="|| ( GPL-2 AFL-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-
-KERNEL_IUSE="kernel_linux kernel_FreeBSD"
-IUSE="X acpi apm crypt debug dell disk-partition doc laptop selinux ${KERNEL_IUSE}"
-
-RDEPEND=">=dev-libs/dbus-glib-0.61
-		 >=dev-libs/glib-2.14
-		 >=dev-libs/expat-1.95.8
-		 >=dev-libs/libusb-0.1.10a
-		 >=sys-apps/pciutils-2.2.7-r1
-		 >=dev-util/gperf-3.0.3
-		   sys-apps/usbutils
-		   virtual/eject
-		 amd64? ( >=sys-apps/dmidecode-2.7 )
-		 dell? ( >=sys-libs/libsmbios-0.13.4 )
-		 disk-partition? ( >=sys-apps/parted-1.8.0 )
-		 ia64? ( >=sys-apps/dmidecode-2.7 )
-		 kernel_linux?	(
-							>=sys-fs/udev-117
-							>=sys-apps/util-linux-2.13
-							>=sys-kernel/linux-headers-2.6.19
-							crypt?	( >=sys-fs/cryptsetup-1.0.5 )
-						)
-		 kernel_FreeBSD? ( >=dev-libs/libvolume_id-0.77 )
-		 x86? ( >=sys-apps/dmidecode-2.7 )
-		 selinux? ( sys-libs/libselinux sec-policy/selinux-hal )"
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig
-		>=dev-util/intltool-0.35
-		X? ( >=dev-python/pyxf86config-0.3.34-r1 )
-		doc?	(
-					app-text/xmlto
-					dev-libs/libxml2
-					dev-util/gtk-doc
-					app-text/docbook-sgml-utils
-				)"
-PDEPEND="|| (
-	=app-misc/hal-info-20080310
-	=app-misc/hal-info-20080508
-	=app-misc/hal-info-20081219 )
-	!gnome-extra/hal-device-manager
-	laptop? ( >=sys-power/pm-utils-0.99.3 )"
-
-## HAL Daemon drops privledges so we need group access to read disks
-HALDAEMON_GROUPS_LINUX="haldaemon,plugdev,disk,cdrom,cdrw,floppy,usb"
-HALDAEMON_GROUPS_FREEBSD="haldaemon,plugdev,operator"
-
-function check_hotplug_net() {
-	local CONFIG_CHECK="~HOTPLUG ~NET"
-	local WARNING_HOTPLUG="CONFIG_HOTPLUG:\tis not set (required for HAL)\n"
-	local WARNING_NET="CONFIG_NET:\tis not set (required for HAL)\n"
-	check_extra_config
-}
-
-function check_inotify() {
-	local CONFIG_CHECK="~INOTIFY_USER"
-	local WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER:\tis not set (required for HAL)\n"
-	check_extra_config
-}
-
-function check_acpi_proc() {
-	local CONFIG_CHECK="~ACPI_PROCFS ~ACPI_PROC_EVENT"
-	local WARNING_ACPI_PROCFS="CONFIG_ACPI_PROCFS:\tis not set (required for HAL)\n"
-	local WARNING_ACPI_PROC_EVENT="CONFIG_ACPI_PROC_EVENT:\tis not set (required for HAL)\n"
-	check_extra_config
-}
-
-pkg_setup() {
-	if use kernel_linux ; then
-		if [[ -e "${ROOT}/usr/src/linux/.config" ]] ; then
-			kernel_is ge 2 6 19 || ewarn "HAL requires a kernel version 2.6.19 or newer"
-
-			if kernel_is lt 2 6 23 && use acpi ; then
-				check_acpi_proc
-			fi
-		fi
-
-		check_hotplug_net
-		check_inotify
-	fi
-
-	# http://devmanual.gentoo.org/ebuild-writing/functions/
-	# http://bugs.gentoo.org/show_bug.cgi?id=191605
-
-	# Create groups for hotplugging and HAL
-	enewgroup haldaemon
-	enewgroup plugdev
-
-	# HAL drops priviledges by default now ...
-	# ... so we must make sure it can read disk/cdrom info (ie. be in ${HALDAEMON_GROUPS} groups)
-	if use kernel_linux; then
-		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX}
-	elif use kernel_FreeBSD; then
-		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD}
-	fi
-
-	# Make sure that the haldaemon user is in the ${HALDAEMON_GROUPS}
-	# If users have a problem with this, let them file a bug
-	if [[ ${ROOT} == / ]] ; then
-		if use kernel_linux; then
-			usermod -G ${HALDAEMON_GROUPS_LINUX} haldaemon
-		elif use kernel_FreeBSD; then
-			pw usermod haldaemon -G ${HALDAEMON_GROUPS_FREEBSD}
-		fi
-	fi
-}
-
-S="${WORKDIR}/${PF/-r*/}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	EPATCH_MULTI_MSG="Applying Gentoo Patchset ..." \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_SOURCE="${WORKDIR}/${P}-patches/" \
-	EPATCH_FORCE="yes" \
-	epatch
-
-	epatch "${FILESDIR}"/${P}-ppc64.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	local acpi="$(use_enable acpi)"
-	local backend=
-	local hardware=
-
-	append-flags -rdynamic
-
-	if use kernel_linux ; then
-		backend="linux"
-	elif use kernel_FreeBSD ; then
-		backend="freebsd"
-	else
-		eerror "Invalid backend"
-	fi
-
-	if use kernel_linux ; then
-		if use acpi ; then
-			# Using IBM ACPI and Toshiba ACPI results in double notification as this
-			# was merged into the Linux Kernel 2.6.22
-			if kernel_is lt 2 6 22 ; then
-				acpi="$acpi --enable-acpi-ibm --enable-acpi-toshiba"
-			else
-				acpi="$acpi --disable-acpi-ibm --disable-acpi-toshiba"
-			fi
-
-			acpi="$acpi --enable-acpi-proc --enable-acpi-acpid"
-		else
-			acpi="$acpi --disable-acpi-ibm --disable-acpi-toshiba"
-			acpi="$acpi --disable-acpi-proc --disable-acpi-acpid"
-		fi
-
-		hardware="--with-cpufreq --with-usb-csr --with-keymaps"
-		use arm && hardware="$hardware --with-omap --enable-pmu"
-		use ppc && hardware="$hardware --enable-pmu"
-
-		if use dell ; then
-			hardware="$hardware --with-dell-backlight"
-		else
-			hardware="$hardware --without-dell-backlight"
-		fi
-
-		hardware="$hardware --enable-sonypic"
-	else
-		hardware="--without-cpufreq --without-usb-csr --without-keymaps"
-		hardware="$hardware --without-omap"
-		hardware="$hardware --without-dell-backlight"
-		hardware="$hardware --enable-acpi-ibm --enable-acpi-toshiba"
-		hardware="$hardware --disable-sonypic"
-	fi
-
-	econf --with-backend=${backend} \
-		  --with-os-type=gentoo \
-		  --with-pid-file=/var/run/hald.pid \
-		  --with-hwdata=/usr/share/misc \
-		  --with-socket-dir=/var/run/hald \
-		  --enable-umount-helper \
-		  --enable-man-pages \
-		  --disable-policy-kit \
-		  --disable-console-kit \
-		  --disable-acl-management \
-		  --enable-pci \
-		  $(use_enable apm) \
-		  $(use_enable debug verbose-mode) \
-		  $(use_enable disk-partition parted) \
-		  $(use_enable doc docbook-docs) \
-		  $(use_enable doc gtk-doc) \
-		  --docdir=/usr/share/doc/${PF} \
-		  --localstatedir=/var \
-		  ${acpi} ${hardware} \
-	|| die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README || die "docs failed"
-
-	# hal umount for unclean unmounts
-	exeinto /lib/udev/
-	newexe "${FILESDIR}/hal-unmount.dev" hal_unmount || die "udev helper failed"
-
-	# initscript
-	newinitd "${FILESDIR}/0.5.10-hald.rc" hald || die "init script failed"
-
-	# configuration
-	cp "${FILESDIR}/0.5.10-hald.conf" "${WORKDIR}/" || \
-		die "failed to copy hald.conf"
-
-	if use debug; then
-		sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \
-			-i "${WORKDIR}/0.5.10-hald.conf" || die "failed to change verbose"
-	fi
-	newconfd "${WORKDIR}/0.5.10-hald.conf" hald || \
-		die "failed to install hald.conf"
-
-	if use X ; then
-		# New Configuration Snippets
-		dodoc "${WORKDIR}/${PN}-config-examples/"*.fdi || \
-			die "dodoc X examples failed"
-		dobin "${WORKDIR}/${PN}-config-examples/migrate-xorg-to-fdi.py" || \
-			die "dodoc X migration script failed"
-
-		# Automagic conversion!
-		elog "Migrating xorg.conf Core Keyboard configuration to HAL FDI file"
-		"${WORKDIR}/${PN}-config-examples/migrate-xorg-to-fdi.py" 2> /dev/null \
-			> "${D}/etc/hal/fdi/policy/10-x11-input.fdi" || \
-			ewarn "Failed to migrate your keyboard configuration."
-	fi
-
-	# We now create and keep /media here as both gnome-mount and pmount
-	# use these directories, to avoid collision.
-	keepdir /media
-
-	# We also need to create and keep /etc/fdi/{information,policy,preprobe}
-	# or else hal bombs.
-	keepdir /etc/hal/fdi/{information,policy,preprobe}
-
-	# HAL stores it's fdi cache in /var/lib/cache/hald
-	keepdir /var/lib/cache/hald
-
-	# HAL keeps its unix socket here
-	keepdir /var/run/hald
-	keepdir /var/lib/hal
-}
-
-pkg_postinst() {
-	# Despite what people keep changing this location. Either one works.. it doesn't matter
-	# http://dev.gentoo.org/~plasmaroo/devmanual/ebuild-writing/functions/
-
-	elog "The HAL daemon needs to be running for certain applications to"
-	elog "work. Suggested is to add the init script to your start-up"
-	elog "scripts, this should be done like this :"
-	elog "\`rc-update add hald default\`"
-	echo
-	elog "Looking for automounting support? Add yourself to the plugdev group"
-	echo
-	elog "IF you have additional applications which consume ACPI events, you"
-	elog "should consider installing acpid to allow applications to share ACPI"
-	elog "events."
-	if use X ; then
-		echo
-		elog "If you wish to use a non US layout, you may do so by executing:"
-		elog "setxkbmap <layout> or by utilizing your Desktop Environment's"
-		elog "Keyboard Layout Settings mechanism."
-		elog "Under GNOME, this is gnome-keyboard-properties, and under KDE"
-		elog "it is kxkb."
-	fi
-	echo
-	elog "In order have suspend/hibernate function with HAL or apps that use HAL"
-	elog "(such as gnome-power-manager), you should build HAL with the laptop"
-	elog "useflag which will install pm-utils."
-	if use X ; then
-		echo
-		elog "X Input Hotplugging (if you build xorg-server with the HAL useflag)"
-		elog "reads user specific configuration from /etc/hal/fdi/policy/."
-		if [[ $(cat "${ROOT}etc/hal/fdi/policy/10-x11-input.fdi" | wc -c) -gt 0 ]]
-		then
-			elog "We have converted your existing xorg.conf rules and the FDI is stored"
-			elog "at /etc/hal/fdi/policy/10-x11-input.fdi"
-		fi
-		elog "You should remove the Input sections from your xorg.conf once you have"
-		elog "migrated the rules to a HAL fdi file."
-	fi
-
-	ebeep 5
-	epause 5
-}
diff --git a/sys-apps/hal/hal-0.5.11-r8.ebuild b/sys-apps/hal/hal-0.5.11-r8.ebuild
index d9d63f028be0..2f7448403f13 100644
--- a/sys-apps/hal/hal-0.5.11-r8.ebuild
+++ b/sys-apps/hal/hal-0.5.11-r8.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r8.ebuild,v 1.8 2009/03/08 21:54:11 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r8.ebuild,v 1.9 2009/03/08 22:03:59 chainsaw Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
 PATCH_VERSION="5"
 
 DESCRIPTION="Hardware Abstraction Layer"
-HOMEPAGE="http://www.freedesktop.org/Software/hal"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/hal"
 SRC_URI="http://hal.freedesktop.org/releases/${P/_/}.tar.bz2
 		 http://dev.gentoo.org/~chainsaw/files/${P}-gentoo-patches-${PATCH_VERSION}.tar.bz2"
 
diff --git a/sys-apps/hal/hal-0.5.11-r7.ebuild b/sys-apps/hal/hal-0.5.12_rc1.ebuild
index 245a030ed0da..c3934937f9db 100644
--- a/sys-apps/hal/hal-0.5.11-r7.ebuild
+++ b/sys-apps/hal/hal-0.5.12_rc1.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r7.ebuild,v 1.2 2009/02/04 14:27:53 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.12_rc1.ebuild,v 1.1 2009/03/08 22:03:59 chainsaw Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
-PATCH_VERSION="4"
+PATCH_VERSION="1"
 
+MY_P=${P/_/}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="Hardware Abstraction Layer"
-HOMEPAGE="http://www.freedesktop.org/Software/hal"
-SRC_URI="http://hal.freedesktop.org/releases/${P/_/}.tar.bz2
-		 http://dev.gentoo.org/~chainsaw/files/${P}-gentoo-patches-${PATCH_VERSION}.tar.bz2"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/hal"
+SRC_URI="http://hal.freedesktop.org/releases/${MY_P}.tar.bz2
+	 http://dev.gentoo.org/~chainsaw/files/${MY_P}-gentoo-patches-${PATCH_VERSION}.tar.bz2"
 
 LICENSE="|| ( GPL-2 AFL-2.0 )"
 SLOT="0"
@@ -117,8 +119,6 @@ pkg_setup() {
 	fi
 }
 
-S="${WORKDIR}/${PF/-r*/}"
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -166,6 +166,9 @@ src_compile() {
 		hardware="--with-cpufreq --with-usb-csr --with-keymaps"
 		use arm && hardware="$hardware --with-omap --enable-pmu"
 		use ppc && hardware="$hardware --enable-pmu"
+		if use x86 || use amd64; then
+			hardware="$hardware --with-macbook --with-macbookpro"
+		fi
 
 		if use dell ; then
 			hardware="$hardware --with-dell-backlight"
diff --git a/sys-apps/hal/hal-0.5.9.1-r3.ebuild b/sys-apps/hal/hal-0.5.9.1-r3.ebuild
index 273810fd8329..8d916c6e4a6c 100644
--- a/sys-apps/hal/hal-0.5.9.1-r3.ebuild
+++ b/sys-apps/hal/hal-0.5.9.1-r3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2009 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.1-r3.ebuild,v 1.13 2009/02/05 10:18:24 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.1-r3.ebuild,v 1.14 2009/03/08 22:03:59 chainsaw Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
 DESCRIPTION="Hardware Abstraction Layer"
-HOMEPAGE="http://www.freedesktop.org/Software/hal"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/hal"
 SRC_URI="http://people.freedesktop.org/~david/dist/${P}.tar.gz
 		http://dev.gentoo.org/~cardoe/files/hal/${P}-r2.tar.bz2"