remove old versions that are no longer supported

(Portage version: 2.1.6.1/cvs/Linux 2.6.27-gentoo-r7 x86_64)

9 files changed, 7 insertions, 2075 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 4a978d1a966c..0c5afaba1a84 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.257 2008/12/23 20:43:00 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.258 2008/12/23 21:04:59 cardoe Exp $
+
+  23 Dec 2008; Doug Goldstein <cardoe@gentoo.org> -hal-0.5.7.1-r5.ebuild,
+  -hal-0.5.9-r1.ebuild, -hal-0.5.9.1-r1.ebuild, -hal-0.5.9.1-r2.ebuild,
+  -hal-0.5.10.ebuild, -hal-0.5.11.ebuild, -hal-0.5.11-r2.ebuild,
+  -hal-0.5.11-r3.ebuild:
+  remove old versions that are no longer supported
 
   23 Dec 2008; Doug Goldstein <cardoe@gentoo.org> hal-0.5.11-r1.ebuild,
   hal-0.5.11-r2.ebuild, hal-0.5.11-r3.ebuild, hal-0.5.11-r4.ebuild:
diff --git a/sys-apps/hal/hal-0.5.10.ebuild b/sys-apps/hal/hal-0.5.10.ebuild
deleted file mode 100644
index b2ce1232d9df..000000000000
--- a/sys-apps/hal/hal-0.5.10.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# 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.19 2008/12/22 21:44:12 cardoe Exp $
-
-inherit eutils linux-info autotools flag-o-matic
-
-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/~compnerd/files/${PN}/${P}-gentoo-patches-${PATCH_VER}.tar.bz2"
-
-LICENSE="|| ( GPL-2 AFL-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
-
-KERNEL_IUSE="kernel_linux kernel_FreeBSD"
-IUSE="acpi apm crypt debug dell disk-partition doc laptop selinux ${KERNEL_IUSE}"
-
-RDEPEND=">=dev-libs/glib-2.6
-		 >=dev-libs/dbus-glib-0.61
-		 >=dev-libs/expat-1.95.8
-		 >=sys-apps/pciutils-2.2.7-r1
-		 >=dev-libs/libusb-0.1.10a
-		 >=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.7.1
-									~sys-apps/parted-1.8.6
-									~sys-apps/parted-1.8.7
-								)
-						 )
-		 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
-		doc?	(
-					app-doc/doxygen
-					app-text/docbook-sgml-utils
-					app-text/xmlto
-					dev-libs/libxml2
-				)"
-PDEPEND=">=app-misc/hal-info-20071011
-		 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)
-"
-	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
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	EPATCH_MULTI_MSG="Applying Gentoo Patchset ..." \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_SOURCE="${WORKDIR}/hal-0.5.10-patches/" \
-	EPATCH_FORCE="yes" \
-	epatch
-
-	epatch "${FILESDIR}"/${P}-autotools.patch #212772
-
-	# Hide recovery partitions
-	epatch "${FILESDIR}/hal-0.5.9-hide-recovery-partitions.patch"
-
-	# Enable plugdev support
-	epatch "${FILESDIR}/96_plugdev_allow_send.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 --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_enable 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() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-
-	# hal umount for unclean unmounts
-	exeinto /lib/udev/
-	newexe "${FILESDIR}"/hal-unmount.dev hal_unmount
-
-	# initscript
-	newinitd "${FILESDIR}"/0.5.10-hald.rc hald
-
-	# configuration
-	cp "${FILESDIR}"/0.5.10-hald.conf "${WORKDIR}"/
-
-	if use debug; then
-		sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \
-			-i "${WORKDIR}"/0.5.10-hald.conf
-	fi
-	newconfd "${WORKDIR}"/0.5.10-hald.conf hald
-
-	# 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"
-
-	elog "IF you have additional applications which consume ACPI events, you"
-	elog "should consider installing acpid to allow applications to share ACPI"
-	elog "events."
-
-	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."
-}
diff --git a/sys-apps/hal/hal-0.5.11-r2.ebuild b/sys-apps/hal/hal-0.5.11-r2.ebuild
deleted file mode 100644
index 1b50a7c8a87c..000000000000
--- a/sys-apps/hal/hal-0.5.11-r2.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# 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.11-r2.ebuild,v 1.6 2008/12/23 20:43:00 cardoe Exp $
-
-inherit eutils linux-info autotools flag-o-matic
-
-PATCH_VERSION="2"
-
-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-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 )
-		 !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 --with-omap"
-
-		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 arm pmu) \
-		  $(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
-
-	if use X ; then
-		# New Configuration Snippets
-		dodoc "${WORKDIR}/${PN}-config-examples/"*.fdi || die
-		dobin "${WORKDIR}/${PN}-config-examples/migrate-xorg-to-fdi.py" || die
-
-		# 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-r3.ebuild b/sys-apps/hal/hal-0.5.11-r3.ebuild
deleted file mode 100644
index b1fe12fa3d57..000000000000
--- a/sys-apps/hal/hal-0.5.11-r3.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# 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.11-r3.ebuild,v 1.4 2008/12/23 20:43:00 cardoe 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 ~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-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 )
-		 !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 --with-omap"
-
-		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 arm pmu) \
-		  $(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
-
-	if use X ; then
-		# New Configuration Snippets
-		dodoc "${WORKDIR}/${PN}-config-examples/"*.fdi || die
-		dobin "${WORKDIR}/${PN}-config-examples/migrate-xorg-to-fdi.py" || die
-
-		# 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.ebuild b/sys-apps/hal/hal-0.5.11.ebuild
deleted file mode 100644
index 0a404a7aa09d..000000000000
--- a/sys-apps/hal/hal-0.5.11.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# 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.11.ebuild,v 1.8 2008/12/22 21:44:12 cardoe Exp $
-
-inherit eutils linux-info autotools flag-o-matic
-
-PATCH_VERSION="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/~compnerd/files/${PN}/${P}-gentoo-patches-${PATCH_VERSION}.tar.bz2"
-
-LICENSE="|| ( GPL-2 AFL-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~sparc ~x86"
-
-KERNEL_IUSE="kernel_linux kernel_FreeBSD"
-IUSE="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
-		>=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/_/}"
-
-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_enable 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() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-
-	# hal umount for unclean unmounts
-	exeinto /lib/udev/
-	newexe "${FILESDIR}/hal-unmount.dev" hal_unmount
-
-	# initscript
-	newinitd "${FILESDIR}/0.5.10-hald.rc" hald
-
-	# configuration
-	cp "${FILESDIR}/0.5.10-hald.conf" "${WORKDIR}/"
-
-	if use debug; then
-		sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \
-			-i "${WORKDIR}/0.5.10-hald.conf"
-	fi
-	newconfd "${WORKDIR}/0.5.10-hald.conf" hald
-
-	# New Configuration Snippets
-	dodoc "${WORKDIR}/${P}-extras/"*.fdi
-	dobin "${WORKDIR}/${P}-extras/migrate-xorg-to-fdi.py"
-
-	# Authomagic conversion!
-	elog "Migrating xorg.conf Core Keyboard configuration to HAL FDI file..."
-	"${WORKDIR}/${P}-extras/migrate-xorg-to-fdi.py" 2> /dev/null > "${D}/etc/hal/fdi/policy/10-x11-input.fdi"
-
-	# 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."
-	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."
-	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."
-	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."
-
-	ebeep 5
-	epause 5
-}
diff --git a/sys-apps/hal/hal-0.5.7.1-r5.ebuild b/sys-apps/hal/hal-0.5.7.1-r5.ebuild
deleted file mode 100644
index d955a9989c27..000000000000
--- a/sys-apps/hal/hal-0.5.7.1-r5.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# 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.7.1-r5.ebuild,v 1.21 2008/12/19 17:37:01 pva Exp $
-
-inherit eutils linux-info
-
-DESCRIPTION="Hardware Abstraction Layer"
-HOMEPAGE="http://www.freedesktop.org/Software/hal"
-SRC_URI="http://freedesktop.org/~david/dist/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 AFL-2.0 )"
-SLOT="0"
-KEYWORDS="alpha ~amd64 arm hppa ia64 ~ppc ppc64 sh sparc x86"
-IUSE="acpi crypt debug dmi doc pcmcia selinux"
-
-RDEPEND=">=dev-libs/glib-2.6
-	>=dev-libs/dbus-glib-0.71
-	>=sys-fs/udev-083
-	>=sys-apps/util-linux-2.12r
-	|| ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 )
-	dev-libs/expat
-	sys-apps/pciutils
-	dev-libs/libusb
-	virtual/eject
-	dmi? ( >=sys-apps/dmidecode-2.7 )
-	crypt? ( >=sys-fs/cryptsetup-1.0.5 )
-	selinux? ( sys-libs/libselinux )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29
-	doc? ( app-doc/doxygen app-text/docbook-sgml-utils )"
-
-## HAL Daemon drops privledges so we need group access to read disks
-HALDAEMON_GROUPS="haldaemon,plugdev,disk,cdrom,cdrw,floppy,usb"
-
-function check_uevent() {
-	local CONFIG_CHECK="~KOBJECT_UEVENT"
-	local WARNING_KOBJECT_UEVENT="CONFIG_KOBJECT_UEVENT:\tis not set (required for HAL)
-"
-	check_extra_config
-}
-
-function check_hotplug_net() {
-	local CONFIG_CHECK="~HOTPLUG ~NET"
-	local WARNING_HOTPLUG="CONFIG_HOTPLUG:\tis not set (required for HAL)
-"
-	local WARNING_NET="CONFIG_NET:\tis not set (required for HAL)
-"
-	check_extra_config
-}
-
-function check_procfs() {
-	local CONFIG_CHECK="~PROC_FS"
-	local WARNING_PROC_FS="CONFIG_PROC_FS:\tis not set (required for HAL)
-"
-	check_extra_config
-}
-
-pkg_setup() {
-	if ! built_with_use --missing true sys-apps/pciutils hal ; then
-		if built_with_use --missing false sys-apps/pciutils zlib ; then
-			die "You MUST build sys-apps/pciutils without the zlib USE flag"
-		fi
-	fi
-
-	if [ -e "${ROOT}/usr/src/linux/.config" ] ; then
-		if kernel_is ge 2 6 16 ; then
-			check_hotplug_net
-		elif kernel_is eq 2 6 15 ; then
-			check_uevent
-		else
-			ewarn "HAL requires a kernel version 2.6.15 or newer"
-		fi
-	fi
-
-	use acpi && check_procfs
-
-	if [ -d "${ROOT}/etc/hal/device.d" ]; then
-		eerror "HAL 0.5.x will not run with the HAL 0.4.x series of"
-		eerror "/etc/hal/device.d/ so please remove this directory"
-		eerror "with rm -rf /etc/hal/device.d/ and then re-emerge."
-		eerror "This is due to configuration protection of /etc/"
-		die "remove /etc/hal/device.d/"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# handle ignored volumes properly
-	epatch "${FILESDIR}"/${PN}-0.5.7.1-ignored-volumes.patch
-
-	# Fix bash in hald scripts
-	epatch "${FILESDIR}"/${PN}-0.5.7.1-hald-scripts.patch
-
-	# probe partition table
-	epatch "${FILESDIR}"/${PN}-0.5.7-part-table.patch
-
-	# fix pmu support crash
-	epatch "${FILESDIR}"/${PN}-0.5.7-pmu-fix.patch
-
-	# unclean unmount
-	epatch "${FILESDIR}"/${PN}-0.5.7-unclean-unmount-r1.patch
-
-	# allow plugdev group people to mount
-	epatch "${FILESDIR}"/${PN}-0.5.7-plugdev-allow-send.patch
-
-	# rescan devices on resume
-	epatch "${FILESDIR}"/${PN}-0.5.7.1-rescan-on-resume.patch
-
-	# dbus deprecated dbus_connection_disconnect
-	epatch "${FILESDIR}"/${PN}-0.5.7.1-dbus-close.patch
-
-	# sr driver fix
-	epatch "${FILESDIR}"/${PN}-0.5.7.1-sr-driver.patch
-
-	# mounting autofs & subfs fixes
-	epatch "${FILESDIR}"/${PN}-0.5.7.1-autofs-subfs.patch
-
-	# iPod Nano detected as RAID fix
-	epatch "${FILESDIR}"/${PN}-0.5.7.1-ipod-nano.patch
-
-	# Floppies mounting fix
-	epatch "${FILESDIR}"/${PN}-0.5.7.1-floppies-fix.patch
-
-	# fix undeclared ctype.h so everyone can stop getting their panties in a
-	# bundle
-	epatch "${FILESDIR}"/${PN}-0.5.7.1-ctype-fix.patch
-
-	# fix for dbus close/unref so we stop having errors from lshal about D-Bus
-	epatch "${FILESDIR}"/${PN}-0.5.7.1-fix-dbus.patch
-
-	# Fix for fdi issues with indirection problem in copy_property
-	# All work by Martin "Parmus" Parm <parmus@diku.dk
-	# passed upstream as fd.o bug #9849
-	epatch "${FILESDIR}"/${PN}-0.5.7.1-indirection-fix.patch
-}
-
-src_compile() {
-
-	econf \
-		--with-doc-dir=/usr/share/doc/${PF} \
-		--with-os-type=gentoo \
-		--with-pid-file=/var/run/hald.pid \
-		--with-hwdata=/usr/share/misc \
-		--enable-hotplug-map \
-		$(use_enable debug verbose-mode) \
-		$(use_enable pcmcia pcmcia-support) \
-		$(use_enable acpi acpi-proc) \
-		$(use_enable doc docbook-docs) \
-		$(use_enable doc doxygen-docs) \
-		$(use_enable selinux) \
-		|| die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-
-	# remove dep on gnome-python
-	mv "${D}"/usr/bin/hal-device-manager "${D}"/usr/share/hal/device-manager/
-
-	# hal umount for unclean unmounts
-	exeinto /lib/udev/
-	newexe "${FILESDIR}"/hal-unmount.dev hal_unmount
-
-	# initscript
-	newinitd "${FILESDIR}"/0.5-hald.rc hald
-
-	# We now create and keep /media here as both gnome-mount and pmount
-	# use these directories, to avoid collision.
-	dodir /media
-	keepdir /media
-}
-
-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/
-
-	# 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)
-	enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS}
-
-	# Make sure that the haldaemon user is in the ${HALDAEMON_GROUPS}
-	# If users have a problem with this, let them file a bug
-	usermod -G ${HALDAEMON_GROUPS} haldaemon
-
-	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"
-}
diff --git a/sys-apps/hal/hal-0.5.9-r1.ebuild b/sys-apps/hal/hal-0.5.9-r1.ebuild
deleted file mode 100644
index ff4d4409862c..000000000000
--- a/sys-apps/hal/hal-0.5.9-r1.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# 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.9-r1.ebuild,v 1.23 2008/12/19 17:37:01 pva Exp $
-
-inherit eutils linux-info autotools flag-o-matic
-
-DESCRIPTION="Hardware Abstraction Layer"
-HOMEPAGE="http://www.freedesktop.org/Software/hal"
-SRC_URI="http://people.freedesktop.org/~david/dist/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 AFL-2.0 )"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ia64 -mips ppc -ppc64 sh ~sparc x86 ~x86-fbsd"
-
-KERNEL_IUSE="kernel_linux kernel_FreeBSD"
-IUSE="acpi crypt debug dell disk-partition doc pcmcia selinux ${KERNEL_IUSE}"
-
-RDEPEND=">=dev-libs/glib-2.6
-		>=dev-libs/dbus-glib-0.61
-		kernel_linux? ( >=sys-fs/udev-104 )
-		kernel_linux? ( >=sys-apps/util-linux-2.12r-r1 )
-		kernel_linux? ( >=sys-kernel/linux-headers-2.6.17 )
-		kernel_FreeBSD? ( dev-libs/libvolume_id )
-		>=dev-libs/expat-1.95.8
-		>=sys-apps/pciutils-2.2.3
-		>=dev-libs/libusb-0.1.10a
-		sys-apps/usbutils
-		virtual/eject
-		amd64? ( >=sys-apps/dmidecode-2.7 )
-		x86? ( >=sys-apps/dmidecode-2.7 )
-		ia64? ( >=sys-apps/dmidecode-2.7 )
-		dell? ( >=sys-libs/libsmbios-0.13.4 )
-		disk-partition? ( <=sys-apps/parted-1.8.6 )
-		kernel_linux? ( crypt? ( >=sys-fs/cryptsetup-1.0.5 ) )
-		selinux? ( sys-libs/libselinux
-					sec-policy/selinux-hal )"
-#		pam? ( sys-auth/consolekit )"
-
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig
-		>=dev-util/intltool-0.35
-		doc? ( app-doc/doxygen
-				app-text/docbook-sgml-utils
-				app-text/xmlto )"
-
-PDEPEND="app-misc/hal-info"
-
-## 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)
-"
-	local WARNING_NET="CONFIG_NET:\tis not set (required for HAL)
-"
-	check_extra_config
-}
-
-function check_inotify() {
-	local CONFIG_CHECK="~INOTIFY_USER"
-	local WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER:\tis not set (required for HAL)
-"
-	check_extra_config
-}
-
-function check_procfs() {
-	local CONFIG_CHECK="~PROC_FS"
-	local WARNING_PROC_FS="CONFIG_PROC_FS:\tis not set (required for HAL)
-"
-	check_extra_config
-}
-
-pkg_setup() {
-	if ! built_with_use --missing true sys-apps/pciutils hal ; then
-		if built_with_use --missing false sys-apps/pciutils zlib ; then
-			die "You MUST build sys-apps/pciutils without the zlib USE flag"
-		fi
-	fi
-
-	if use kernel_linux ; then
-		if [ -e "${ROOT}/usr/src/linux/.config" ] ; then
-			kernel_is ge 2 6 17 || \
-				ewarn "HAL requires a kernel version 2.6.17 or newer"
-		fi
-
-		check_hotplug_net
-		check_inotify
-		use acpi && check_procfs
-	fi
-
-	if [[ -d ${ROOT}/etc/hal/device.d ]]; then
-		eerror "HAL 0.5.x will not run with the HAL 0.4.x series of"
-		eerror "/etc/hal/device.d/ so please remove this directory"
-		eerror "with rm -rf /etc/hal/device.d/ and then re-emerge."
-		eerror "This is due to configuration protection of /etc/"
-		die "remove /etc/hal/device.d/"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Patches accepted upstream
-	epatch "${FILESDIR}/${PV}/01_luks_mount_fix.patch"
-	epatch "${FILESDIR}/${PV}/02_acpi_repeated_property_change.patch"
-	epatch "${FILESDIR}/${PV}/03_crasher_fix_fail_to_return_value.patch"
-	epatch "${FILESDIR}/${PV}/04_cache_regen_return_fix.patch"
-	epatch "${FILESDIR}/${PV}/05_freebsd_partutil_make_fix.patch"
-	epatch "${FILESDIR}/${PV}/06_freebsd_backend_fix.patch"
-	epatch "${FILESDIR}/${PV}/07_malloc_h_for_stdlib_h.patch"
-	epatch "${FILESDIR}/${PV}/08_contains_not_fdi_directive.patch"
-	epatch "${FILESDIR}/${PV}/09_hald_addon_keyboard_start_one.patch"
-	epatch "${FILESDIR}/${PV}/10_freebsd_storage_reprobe_fix.patch"
-	epatch "${FILESDIR}/${PV}/11_hal_fix_segfault_probe_volume.patch"
-	epatch "${FILESDIR}/${PV}/12_hal_fix-vol_label_probe_volume.patch"
-	epatch "${FILESDIR}/${PV}/13_detect_newer_macbooks.patch"
-	epatch "${FILESDIR}/${PV}/14_ntfs_allows_utf8.patch"
-	epatch "${FILESDIR}/${PV}/15_spec_fdi_matching.patch"
-	epatch "${FILESDIR}/${PV}/16_dev_root_is_mounted.patch"
-	epatch "${FILESDIR}/${PV}/18_hal_fix_info.category_for_laptop_panel_v2.patch"
-	epatch "${FILESDIR}/${PV}/19_hald_runner_catch_dbus_disconnect.patch"
-
-	# Gentoo patchset
-	epatch "${FILESDIR}/${PV}/95_gentoo_man_page.patch"
-	epatch "${FILESDIR}/${PV}/96_plugdev_allow_send.patch"
-	epatch "${FILESDIR}/${PV}/97_ignore_fixed_drives.patch"
-	epatch "${FILESDIR}/${PV}/98_hald_cache_test_path.patch"
-
-	eautoreconf
-}
-
-src_compile() {
-	local backend=""
-	local acpi=""
-
-	# TODO :: policykit should have a pam useflag
-	append-flags -rdynamic
-
-	if use kernel_linux ; then
-		backend="linux"
-		use acpi && acpi="--enable-acpi-toshiba --enable-acpi-ibm"
-	elif use kernel_FreeBSD ; then
-		backend="freebsd"
-	else
-		eerror "Invalid backend"
-	fi
-
-	if ! use acpi ; then
-		acpi="--disable-acpi-proc --disable-acpi-acpid"
-	fi
-
-	econf --disable-policy-kit \
-		  --docdir=/usr/share/doc/${PF} \
-		  --with-os-type=gentoo \
-		  --with-pid-file=/var/run/hald.pid \
-		  --with-socket-dir=/var/run/hald \
-		  --with-hwdata=/usr/share/misc \
-		  --enable-hotplug-map \
-		  --enable-man-pages \
-		  --with-backend=${backend} \
-		  $(use_enable debug verbose-mode) \
-		  $(use_with dell dell-backlight) \
-		  $(use_enable disk-partition parted) \
-		  $(use_enable pcmcia pcmcia-support) \
-		  $(use_enable doc docbook-docs) \
-		  $(use_enable doc doxygen-docs) \
-		  $(use_enable selinux) \
-		  --disable-console-kit \
-		  ${acpi} \
-	|| die "configure failed"
-#$(use_enable pam console-kit)
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-
-	# remove dep on gnome-python
-	mv "${D}"/usr/bin/hal-device-manager "${D}"/usr/share/hal/device-manager/
-
-	# hal umount for unclean unmounts
-	exeinto /lib/udev/
-	newexe "${FILESDIR}"/hal-unmount.dev hal_unmount
-
-	# initscript
-	newinitd "${FILESDIR}"/0.5.9-hald.rc hald
-	cp "${FILESDIR}"/0.5.9-hald.conf "${WORKDIR}"/
-#	if use pam; then
-#		sed -e 's:RC_NEED="":RC_NEED="consolekit":' -i "${WORKDIR}"/0.5.9-hald.conf
-#	fi
-	if use debug; then
-		sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \
-		-i "${WORKDIR}"/0.5.9-hald.conf
-	fi
-	newconfd "${WORKDIR}"/0.5.9-hald.conf hald
-
-	# 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
-}
-
-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/
-
-	# 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
-
-	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"
-}
diff --git a/sys-apps/hal/hal-0.5.9.1-r1.ebuild b/sys-apps/hal/hal-0.5.9.1-r1.ebuild
deleted file mode 100644
index d1767e5ab2e3..000000000000
--- a/sys-apps/hal/hal-0.5.9.1-r1.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# 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.9.1-r1.ebuild,v 1.15 2008/12/19 17:37:01 pva Exp $
-
-inherit eutils linux-info autotools flag-o-matic
-
-DESCRIPTION="Hardware Abstraction Layer"
-HOMEPAGE="http://www.freedesktop.org/Software/hal"
-SRC_URI="http://people.freedesktop.org/~david/dist/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 AFL-2.0 )"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm hppa ~ia64 -mips ~ppc -ppc64 ~sh sparc ~x86 ~x86-fbsd"
-
-KERNEL_IUSE="kernel_linux kernel_FreeBSD"
-IUSE="acpi crypt debug dell disk-partition doc pcmcia selinux ${KERNEL_IUSE}"
-
-RDEPEND=">=dev-libs/glib-2.6
-		>=dev-libs/dbus-glib-0.61
-		kernel_linux? ( >=sys-fs/udev-104 )
-		kernel_linux? ( >=sys-apps/util-linux-2.12r-r1 )
-		kernel_linux? ( >=sys-kernel/linux-headers-2.6.17 )
-		kernel_FreeBSD? ( dev-libs/libvolume_id )
-		>=dev-libs/expat-1.95.8
-		>=sys-apps/pciutils-2.2.3
-		>=dev-libs/libusb-0.1.10a
-		sys-apps/usbutils
-		virtual/eject
-		amd64? ( >=sys-apps/dmidecode-2.7 )
-		x86? ( >=sys-apps/dmidecode-2.7 )
-		ia64? ( >=sys-apps/dmidecode-2.7 )
-		dell? ( >=sys-libs/libsmbios-0.13.4 )
-		disk-partition? ( <=sys-apps/parted-1.8.7 )
-		kernel_linux? ( crypt? ( >=sys-fs/cryptsetup-1.0.5 ) )
-		selinux? ( sys-libs/libselinux
-					sec-policy/selinux-hal )"
-#		pam? ( sys-auth/consolekit )"
-
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig
-		>=dev-util/intltool-0.35
-		doc? ( app-doc/doxygen
-				app-text/docbook-sgml-utils
-				app-text/xmlto )"
-
-PDEPEND="app-misc/hal-info"
-
-## 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)
-"
-	local WARNING_NET="CONFIG_NET:\tis not set (required for HAL)
-"
-	check_extra_config
-}
-
-function check_inotify() {
-	local CONFIG_CHECK="~INOTIFY_USER"
-	local WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER:\tis not set (required for HAL)
-"
-	check_extra_config
-}
-
-function check_procfs() {
-	local CONFIG_CHECK="~PROC_FS"
-	local WARNING_PROC_FS="CONFIG_PROC_FS:\tis not set (required for HAL)
-"
-	check_extra_config
-}
-
-pkg_setup() {
-	if ! built_with_use --missing true sys-apps/pciutils hal ; then
-		if built_with_use --missing false sys-apps/pciutils zlib ; then
-			die "You MUST build sys-apps/pciutils without the zlib USE flag"
-		fi
-	fi
-
-	if use kernel_linux ; then
-		if [ -e "${ROOT}/usr/src/linux/.config" ] ; then
-			kernel_is ge 2 6 17 || \
-				ewarn "HAL requires a kernel version 2.6.17 or newer"
-		fi
-
-		check_hotplug_net
-		check_inotify
-		use acpi && check_procfs
-	fi
-
-	if [[ -d ${ROOT}/etc/hal/device.d ]]; then
-		eerror "HAL 0.5.x will not run with the HAL 0.4.x series of"
-		eerror "/etc/hal/device.d/ so please remove this directory"
-		eerror "with rm -rf /etc/hal/device.d/ and then re-emerge."
-		eerror "This is due to configuration protection of /etc/"
-		die "remove /etc/hal/device.d/"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Gentoo patchset
-	epatch "${FILESDIR}/0.5.9/07_malloc_h_for_stdlib_h.patch"
-	epatch "${FILESDIR}/0.5.9/23_runner_64bit_values.patch"
-	epatch "${FILESDIR}/0.5.9/24_libparted_1_8_7.patch"
-	#epatch ${FILESDIR}/0.5.9/95_gentoo_man_page.patch
-	epatch "${FILESDIR}/0.5.9/96_plugdev_allow_send.patch"
-	epatch "${FILESDIR}/0.5.9/97_ignore_fixed_drives.patch"
-	epatch "${FILESDIR}/0.5.9/98_hald_cache_test_path.patch"
-	epatch "${FILESDIR}/0.5.9/99_sun_disklabel_ignore.patch"
-
-	eautoreconf
-}
-
-src_compile() {
-	local backend=""
-	local acpi=""
-
-	# TODO :: policykit should have a pam useflag
-	append-flags -rdynamic
-
-	if use kernel_linux ; then
-		backend="linux"
-		use acpi && acpi="--enable-acpi-toshiba --enable-acpi-ibm"
-	elif use kernel_FreeBSD ; then
-		backend="freebsd"
-	else
-		eerror "Invalid backend"
-	fi
-
-	if ! use acpi ; then
-		acpi="--disable-acpi-proc --disable-acpi-acpid"
-	fi
-
-	econf --disable-policy-kit \
-		  --docdir=/usr/share/doc/${PF} \
-		  --with-os-type=gentoo \
-		  --with-pid-file=/var/run/hald.pid \
-		  --with-socket-dir=/var/run/hald \
-		  --with-hwdata=/usr/share/misc \
-		  --enable-hotplug-map \
-		  --enable-man-pages \
-		  --with-backend=${backend} \
-		  $(use_enable debug verbose-mode) \
-		  $(use_with dell dell-backlight) \
-		  $(use_enable disk-partition parted) \
-		  $(use_enable pcmcia pcmcia-support) \
-		  $(use_enable doc docbook-docs) \
-		  $(use_enable doc doxygen-docs) \
-		  $(use_enable selinux) \
-		  --disable-console-kit \
-		  ${acpi} \
-	|| die "configure failed"
-#$(use_enable pam console-kit)
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-
-	# remove dep on gnome-python
-	mv "${D}"/usr/bin/hal-device-manager "${D}"/usr/share/hal/device-manager/
-
-	# hal umount for unclean unmounts
-	exeinto /lib/udev/
-	newexe "${FILESDIR}"/hal-unmount.dev hal_unmount
-
-	# initscript
-	newinitd "${FILESDIR}"/0.5.9-hald.rc hald
-	cp "${FILESDIR}"/0.5.9-hald.conf "${WORKDIR}"/
-#	if use pam; then
-#		sed -e 's:RC_NEED="":RC_NEED="consolekit":' -i "${WORKDIR}"/0.5.9-hald.conf
-#	fi
-	if use debug; then
-		sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \
-		-i "${WORKDIR}"/0.5.9-hald.conf
-	fi
-	newconfd "${WORKDIR}"/0.5.9-hald.conf hald
-
-	# 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
-}
-
-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/
-
-	# 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
-
-	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"
-}
diff --git a/sys-apps/hal/hal-0.5.9.1-r2.ebuild b/sys-apps/hal/hal-0.5.9.1-r2.ebuild
deleted file mode 100644
index 4ed7b01b15d4..000000000000
--- a/sys-apps/hal/hal-0.5.9.1-r2.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# 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.9.1-r2.ebuild,v 1.8 2008/12/19 17:37:01 pva Exp $
-
-inherit eutils linux-info autotools flag-o-matic
-
-DESCRIPTION="Hardware Abstraction Layer"
-HOMEPAGE="http://www.freedesktop.org/Software/hal"
-SRC_URI="http://people.freedesktop.org/~david/dist/${P}.tar.gz
-		http://dev.gentoo.org/~cardoe/files/hal/${PN}-${PVR}.tar.bz2"
-
-LICENSE="|| ( GPL-2 AFL-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 -mips ~ppc -ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-
-KERNEL_IUSE="kernel_linux kernel_FreeBSD"
-IUSE="acpi crypt debug dell disk-partition doc pcmcia selinux ${KERNEL_IUSE}"
-
-RDEPEND=">=dev-libs/glib-2.6
-		>=dev-libs/dbus-glib-0.61
-		kernel_linux? ( >=sys-fs/udev-104 )
-		kernel_linux? ( >=sys-apps/util-linux-2.12r-r1 )
-		kernel_linux? ( >=sys-kernel/linux-headers-2.6.17 )
-		kernel_FreeBSD? ( dev-libs/libvolume_id )
-		>=dev-libs/expat-1.95.8
-		>=sys-apps/pciutils-2.2.3
-		>=dev-libs/libusb-0.1.10a
-		sys-apps/usbutils
-		virtual/eject
-		amd64? ( >=sys-apps/dmidecode-2.7 )
-		x86? ( >=sys-apps/dmidecode-2.7 )
-		ia64? ( >=sys-apps/dmidecode-2.7 )
-		dell? ( >=sys-libs/libsmbios-0.13.4 )
-		disk-partition? ( <=sys-apps/parted-1.8.7 )
-		kernel_linux? ( crypt? ( >=sys-fs/cryptsetup-1.0.5 ) )
-		selinux? ( sys-libs/libselinux
-					sec-policy/selinux-hal )"
-#		pam? ( sys-auth/consolekit )"
-
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig
-		>=dev-util/intltool-0.35
-		doc? ( app-doc/doxygen
-				app-text/docbook-sgml-utils
-				app-text/xmlto )"
-
-PDEPEND="app-misc/hal-info"
-
-## 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)
-"
-	local WARNING_NET="CONFIG_NET:\tis not set (required for HAL)
-"
-	check_extra_config
-}
-
-function check_inotify() {
-	local CONFIG_CHECK="~INOTIFY_USER"
-	local WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER:\tis not set (required for HAL)
-"
-	check_extra_config
-}
-
-function check_procfs() {
-	local CONFIG_CHECK="~PROC_FS"
-	local WARNING_PROC_FS="CONFIG_PROC_FS:\tis not set (required for HAL)
-"
-	check_extra_config
-}
-
-pkg_setup() {
-	if ! built_with_use --missing true sys-apps/pciutils hal ; then
-		if built_with_use --missing false sys-apps/pciutils zlib ; then
-			die "You MUST build sys-apps/pciutils without the zlib USE flag"
-		fi
-	fi
-
-	if use kernel_linux ; then
-		if [ -e "${ROOT}/usr/src/linux/.config" ] ; then
-			kernel_is ge 2 6 17 || \
-				ewarn "HAL requires a kernel version 2.6.17 or newer"
-		fi
-
-		check_hotplug_net
-		check_inotify
-		use acpi && check_procfs
-	fi
-
-	if [[ -d ${ROOT}/etc/hal/device.d ]]; then
-		eerror "HAL 0.5.x will not run with the HAL 0.4.x series of"
-		eerror "/etc/hal/device.d/ so please remove this directory"
-		eerror "with rm -rf /etc/hal/device.d/ and then re-emerge."
-		eerror "This is due to configuration protection of /etc/"
-		die "remove /etc/hal/device.d/"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"/hal-patches
-
-	eautoreconf
-}
-
-src_compile() {
-	local backend=""
-	local acpi=""
-
-	# TODO :: policykit should have a pam useflag
-	append-flags -rdynamic
-
-	if use kernel_linux ; then
-		backend="linux"
-		use acpi && acpi="--enable-acpi-toshiba --enable-acpi-ibm"
-	elif use kernel_FreeBSD ; then
-		backend="freebsd"
-	else
-		eerror "Invalid backend"
-	fi
-
-	if ! use acpi ; then
-		acpi="--disable-acpi-proc --disable-acpi-acpid"
-	fi
-
-	econf --disable-policy-kit \
-		  --docdir=/usr/share/doc/${PF} \
-		  --with-os-type=gentoo \
-		  --with-pid-file=/var/run/hald.pid \
-		  --with-socket-dir=/var/run/hald \
-		  --with-hwdata=/usr/share/misc \
-		  --enable-hotplug-map \
-		  --enable-man-pages \
-		  --with-backend=${backend} \
-		  $(use_enable debug verbose-mode) \
-		  $(use_with dell dell-backlight) \
-		  $(use_enable disk-partition parted) \
-		  $(use_enable pcmcia pcmcia-support) \
-		  $(use_enable doc docbook-docs) \
-		  $(use_enable doc doxygen-docs) \
-		  $(use_enable selinux) \
-		  --disable-console-kit \
-		  ${acpi} \
-	|| die "configure failed"
-#$(use_enable pam console-kit)
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-
-	# remove dep on gnome-python
-	mv "${D}"/usr/bin/hal-device-manager "${D}"/usr/share/hal/device-manager/
-
-	# hal umount for unclean unmounts
-	exeinto /lib/udev/
-	newexe "${FILESDIR}"/hal-unmount.dev hal_unmount
-
-	# initscript
-	newinitd "${FILESDIR}"/0.5.9-hald.rc hald
-	cp "${FILESDIR}"/0.5.9-hald.conf "${WORKDIR}"/
-#	if use pam; then
-#		sed -e 's:RC_NEED="":RC_NEED="consolekit":' -i "${WORKDIR}"/0.5.9-hald.conf
-#	fi
-	if use debug; then
-		sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \
-		-i "${WORKDIR}"/0.5.9-hald.conf
-	fi
-	newconfd "${WORKDIR}"/0.5.9-hald.conf hald
-
-	# 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
-}
-
-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/
-
-	# 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
-
-	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"
-}