Remove old version, leaving the last fbsd version keyworded to just fbsd

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

6 files changed, 14 insertions, 937 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index ae80d7afb95f..5fd7e833656c 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.313 2010/01/20 13:42:15 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.314 2010/03/10 21:47:55 dang Exp $
+
+  10 Mar 2010; Daniel Gryniewicz <dang@gentoo.org> -hal-0.5.11-r9.ebuild,
+  -hal-0.5.12_rc1-r6.ebuild, -hal-0.5.12_rc1-r7.ebuild,
+  hal-0.5.12_rc1-r8.ebuild:
+  Remove old version, leaving the last fbsd version keyworded to just fbsd
 
 *hal-0.5.14-r2 (20 Jan 2010)
 
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 4abd520bfc0f..47cc68edd755 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -6,9 +6,6 @@ AUX 0.5.10-hald.rc 1187 RMD160 b640dcca1b4c467eb678dfbdc903f26912096ac2 SHA1 a63
 AUX 0.5.14-hald.conf 119 RMD160 06e205ba7fa8acfb6f68e84a247845a3ad028351 SHA1 c8a62a808c7f632154dda1686fe344a4a136e28f SHA256 b19e6df9c78b6f813405a7cbff20e049714db1a000e6b71ab2eca02d372d58af
 AUX 0.5.14-hald.rc 1174 RMD160 e9371f69f6594cf53de234e443a204c2b2127d31 SHA1 35ff148aec2d457cdeaed7e2032a414315a7236b SHA256 0ba01941ed8b7946524fb7ba4253c3ae57c6bdf9ddb4eaa01bd9bd89d1d4ef21
 AUX hal-unmount.dev 397 RMD160 78286dd9527bbb421082e73b0d08e06cd514d275 SHA1 31169a28448fb1eb1dfee5d1699de9a02449a6b7 SHA256 747a4c483f8a558f2c75666e9547e539475f112363f1dbfc6ea19ca393c8e89b
-DIST hal-0.5.11-gentoo-patches-5.tar.bz2 8890 RMD160 ffa1ae251baa8caff74f343f9852a95b800ed9c5 SHA1 7ff6aa207216ac2fdaf1bb4e468c78a2884ef804 SHA256 f03d8f84f97dc3716aebaabc2af43762a8e1a2ffe5acb532915d31ac9794bc21
-DIST hal-0.5.11.tar.bz2 1281251 RMD160 741cfe82f0bc2d67106b24cfe526a754ab36e45f SHA1 1ddb7895d2ddc2464b553ad11f7ba38860478ae9 SHA256 78a2621209b2db4d71f25fe3a7df7b7dd4b5e866e9c699454b78e611def065cf
-DIST hal-0.5.12rc1-gentoo-patches-7.tar.bz2 4163 RMD160 deeddd0d71a53667a7aa17b049617a02a7728750 SHA1 e04dfe3c1d78c908bf7df0bb2385545b2fee4f8e SHA256 9ad8a7d8871e2fbfbdd5bf956d8b20001a3474f71b6ec552bcb5902c8a5a1463
 DIST hal-0.5.12rc1-gentoo-patches-8.tar.bz2 4196 RMD160 d503c42a03cca62fab12f3dc15897b20ce8fe37d SHA1 c3782090d2b8a1f0c69e58454a868896618e58a1 SHA256 6e5b3121ebaed2208ad30cd5778ead921e6480c06270da0aac78522a204cdc86
 DIST hal-0.5.12rc1.tar.bz2 1160384 RMD160 dce660d600c18bfd910814516b675f141d369824 SHA1 1dc809e98cea0fc2f183958da24921c2eaf55edc SHA256 eeeb438dcc2a58288ed3def8c1d0076ca16f35b54d501c46f96e89da24fe38f4
 DIST hal-0.5.13-gentoo-patches-1.tar.bz2 4049 RMD160 82aa03e2c99a92aadd68f6ada69cc2b06b2371e2 SHA1 546d6752147535607e34ebcb622aabc2948ed13a SHA256 0354b295a4b5f520a28030bb1282101dac9556326648b91c7ca7045ad5a559d6
@@ -17,20 +14,17 @@ DIST hal-0.5.14-gentoo-patches-1.tar.bz2 4379 RMD160 ecaec00d31ef2009caf8258c3f4
 DIST hal-0.5.14-gentoo-patches-2.tar.bz2 4491 RMD160 d8d4c55210d440b21383d931f76a476032df8e02 SHA1 bceb3836f3a480d6c674c7f8bd324fdaf7d23eec SHA256 0f56bb5ab7684723aea06c315f9df1004200413d6cc6336df0adcb96beb8d37e
 DIST hal-0.5.14-gentoo-patches-3.tar.bz2 4706 RMD160 98b761f78e8f1dda3d533c6921ca530afde85478 SHA1 2fd202df7b4dab55a6f81d90b5660f5a25d0b506 SHA256 d9997ce4890d66bca6611f3e5ee34112a0bdddf0675d4dc13f3268ba9d886a62
 DIST hal-0.5.14.tar.bz2 942954 RMD160 0314dace9512bf49a62bd1556963fc60a6c9caf9 SHA1 a6ec098d78112e18e2773afa5f9ed642b00c4c59 SHA256 c4c5ecc5d50d5d9c061dc06c405461b1f71c12f2c60ed062350b2e6db2f1c51e
-EBUILD hal-0.5.11-r9.ebuild 8893 RMD160 82350f2795c3be604aabd4d67fefbf45b98a742e SHA1 1f47d075d01d759b7bf287ba3f4b4bb8cad19b2d SHA256 af6589feba9fb9395f7d1e23bede156800fe3a870b94750c48c31c6a5572e5e8
-EBUILD hal-0.5.12_rc1-r6.ebuild 9821 RMD160 3861e904a70e10534fbde7af2c2c88f46f154c5d SHA1 c91f15233b0af3fd5661ae66a58646317d9a606e SHA256 f367e528a48ecdf93bd1334299462ec093e8674810b567ceaa9b747f9038b634
-EBUILD hal-0.5.12_rc1-r7.ebuild 9769 RMD160 95a92aa81f15944ef2f10b425933f2dfb5418dbb SHA1 bc45ad8afdadf32cf745cb417d3dd14cac55edf7 SHA256 818095452fa1458bc069a3fbb56f853ee91bfa4208d04706e5b471e242f0af3d
-EBUILD hal-0.5.12_rc1-r8.ebuild 9668 RMD160 54494d2f817d932db9350595e81a9870870d6809 SHA1 1bf9009c77de925fed98f2817ebe0b5a85260abb SHA256 83a08f6d6827ca290cfaca916119f8be8f7842db965e614114f97aff492b4b6f
+EBUILD hal-0.5.12_rc1-r8.ebuild 9605 RMD160 f6d09e5620ac7d28b7c5953ba4b062450da90817 SHA1 a4dadfc565aa8fe6bbf3348779db4cf93b1cd83b SHA256 18f541b86587b98102086c06d50c0eaa324bddeb64e6c72486ea567516a30836
 EBUILD hal-0.5.13-r2.ebuild 9793 RMD160 dcd8f938dccd0decc0134a06be9a628ea5c0954e SHA1 c3f8d1beb9ed79d885da59bd97294d4795e42775 SHA256 a35466fa8b1cfee9963fe72aef729a28c3528ee10dd59bf87d3175e033c09757
 EBUILD hal-0.5.14-r1.ebuild 9864 RMD160 1240479f004973aeef8c23677563e618b1f1a56a SHA1 b0b89e2a47593047eb979dafa77b1d1a5b3c4fa3 SHA256 12d35778c646e50ef617864cc77c404b26bf688aa099abcc3bfe307827824851
 EBUILD hal-0.5.14-r2.ebuild 10107 RMD160 03998033552a0a216f3a26bfa5ceb2e69eee6630 SHA1 184cc0295b2823600566c57973c8034a199fa54d SHA256 fcf9b44a37d8d4485b7e553e329980d59cb40c65b08ad02da0d93dfedde8e6a3
 EBUILD hal-0.5.14.ebuild 9865 RMD160 5f2c448e12431680ef3691fc0df49889f45fef1b SHA1 64dcc78ddda9c8a455fa5910203ce8bbfd5a5554 SHA256 9af3aa58cbad6ae47ee67b3da8e205c13c0a0c1113f85c7d0db181f5a587c5a4
-MISC ChangeLog 55687 RMD160 c37f5a43dbbf6c942689ea7608f199694a0cda9a SHA1 0ded81900fe1afe54c3b0272a363b9e1f695c052 SHA256 61bf23e61308e08150e8f8486f46bc722370e6c8789d0e282d8b8403ebe2b031
+MISC ChangeLog 55921 RMD160 f73126f2bf67102cf9670a2c5eabc8d81bb43563 SHA1 bdab60659f6f9da6fcc35d450f5173f0bd37ee00 SHA256 922f4cd19bde73cf52c6c2ca21fa34254c37ad7a9366e4cdc5c437088cdcaf09
 MISC metadata.xml 2017 RMD160 90b6fed11f5582fce64fe36354e94b811478d21e SHA1 2b2693c7d677adf363e41e16cc71787fbe01d383 SHA256 910ab10f73ca0bccdea716f39dd3d3cc3d594bd25f6bbb7e25b70082be194048
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktXCDoACgkQomPajV0RnrGvlgCcCk0xO6rfm8OyUIylQfnJtKG4
-rCgAn3BRU+oSavQ/FLI6eA0kubSIUp4m
-=hfmx
+iEYEARECAAYFAkuYE4gACgkQomPajV0RnrEp+gCeI8eK4E6Q8JDn7TtFZMQq6Svr
+0TMAmwRghYYU4QscDto3mRj22mJyrZvp
+=XSGt
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hal/hal-0.5.11-r9.ebuild b/sys-apps/hal/hal-0.5.11-r9.ebuild
deleted file mode 100644
index acb54cd1a678..000000000000
--- a/sys-apps/hal/hal-0.5.11-r9.ebuild
+++ /dev/null
@@ -1,293 +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-r9.ebuild,v 1.1 2009/06/17 17:58:18 gentoofan23 Exp $
-
-inherit eutils linux-info autotools flag-o-matic
-
-PATCH_VERSION="5"
-
-DESCRIPTION="Hardware Abstraction Layer"
-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"
-
-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
-		 =virtual/libusb-0*
-		 >=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
-		doc?	(
-					app-text/xmlto
-					dev-libs/libxml2
-					dev-util/gtk-doc
-					app-text/docbook-sgml-utils
-				)"
-PDEPEND="|| (
-	>=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
-
-	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 x86 || use amd64; then
-			hardware="$hardware --with-macbook --with-macbookpro"
-		fi
-
-		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"
-	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/cache/hald
-	keepdir /var/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/."
-		echo
-		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.12_rc1-r6.ebuild b/sys-apps/hal/hal-0.5.12_rc1-r6.ebuild
deleted file mode 100644
index b6a9f6c64e55..000000000000
--- a/sys-apps/hal/hal-0.5.12_rc1-r6.ebuild
+++ /dev/null
@@ -1,315 +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.12_rc1-r6.ebuild,v 1.3 2009/07/06 14:22:44 alexxy Exp $
-
-EAPI="2"
-
-inherit eutils linux-info autotools flag-o-matic multilib
-
-PATCH_VERSION="7"
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-PATCHNAME="${MY_P}-gentoo-patches-${PATCH_VERSION}"
-DESCRIPTION="Hardware Abstraction Layer"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/hal"
-SRC_URI="http://hal.freedesktop.org/releases/${MY_P}.tar.bz2
-	 http://dev.gentoo.org/~dang/files/${PATCHNAME}.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="X acpi apm crypt consolekit debug dell disk-partition doc laptop policykit selinux ${KERNEL_IUSE}"
-
-RDEPEND=">=dev-libs/dbus-glib-0.61
-		 >=dev-libs/glib-2.14
-		 >=dev-libs/expat-1.95.8
-		 =virtual/libusb-0*
-		 >=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 )
-		 consolekit?	(
-		 					sys-auth/consolekit[policykit=]
-					)
-		 policykit?	(
-		 					sys-auth/consolekit[policykit]
-							sys-auth/policykit[pam]
-		 			)"
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig
-		>=dev-util/intltool-0.35
-		doc?	(
-					app-text/xmlto
-					dev-libs/libxml2
-					dev-util/gtk-doc
-					app-text/docbook-sgml-utils
-				)
-		!<gnome-extra/gnome-power-manager-2.24.4-r2"
-PDEPEND=">=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
-}
-
-src_prepare() {
-	# Only apply one of the policy patches.  Bug #267042
-	if use policykit ; then
-		rm "${WORKDIR}/${PATCHNAME}/patches/0001-plugdev-dbus-policy.patch"
-	else
-		rm "${WORKDIR}/${PATCHNAME}/patches/0002-policykit-dbus-policy.patch"
-	fi
-
-	EPATCH_MULTI_MSG="Applying Gentoo Patchset ..." \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_SOURCE="${WORKDIR}/${PATCHNAME}/patches/" \
-	EPATCH_FORCE="yes" \
-	epatch
-
-	eautoreconf
-}
-
-src_configure() {
-	local acpi="$(use_enable acpi)"
-	local backend=
-	local hardware=
-	local consolekit="$(use_enable consolekit console-kit)"
-
-	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 x86 || use amd64; then
-			hardware="$hardware --with-macbook --with-macbookpro"
-		fi
-
-		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
-
-	# Policykit support depends on consolekit support.  Therefore, force on
-	# consolekit, even if it's USE flag is off, if policykit support is on.
-	# This enables packages to USE-depend on hal[policykit?]
-	if use policykit ; then
-		consolekit="--enable-console-kit"
-	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-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) \
-		  $(use_enable policykit policy-kit) \
-		  ${consolekit} \
-		  --docdir=/usr/share/doc/${PF} \
-		  --localstatedir=/var \
-		  ${acpi} ${hardware} \
-	|| die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README || die "docs failed"
-
-	# hal umount for unclean unmounts
-	exeinto /$(get_libdir)/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}/${PATCHNAME}/config-examples/"*.fdi || \
-			die "dodoc X examples failed"
-	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/cache/hald
-	keepdir /var/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 "Access to hal is not protected by either policykit or the plugdev group."
-	elog "If you have problems discovering/configuring hardware, try adding"
-	elog "yourself to plugdev."
-	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/."
-		echo
-		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.12_rc1-r7.ebuild b/sys-apps/hal/hal-0.5.12_rc1-r7.ebuild
deleted file mode 100644
index ded3556a1661..000000000000
--- a/sys-apps/hal/hal-0.5.12_rc1-r7.ebuild
+++ /dev/null
@@ -1,314 +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.12_rc1-r7.ebuild,v 1.3 2009/09/30 11:59:28 leio Exp $
-
-EAPI="2"
-
-inherit eutils linux-info autotools flag-o-matic multilib
-
-PATCH_VERSION="8"
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-PATCHNAME="${MY_P}-gentoo-patches-${PATCH_VERSION}"
-DESCRIPTION="Hardware Abstraction Layer"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/hal"
-SRC_URI="http://hal.freedesktop.org/releases/${MY_P}.tar.bz2
-	 http://dev.gentoo.org/~dang/files/${PATCHNAME}.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="X acpi apm crypt consolekit debug dell disk-partition doc laptop policykit selinux ${KERNEL_IUSE}"
-
-RDEPEND=">=dev-libs/dbus-glib-0.61
-		 >=dev-libs/glib-2.14
-		 >=dev-libs/expat-1.95.8
-		 =virtual/libusb-0*
-		 >=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 )
-		 consolekit?	(
-							sys-auth/consolekit[policykit=]
-					)
-		 policykit?	(
-							sys-auth/consolekit[policykit]
-							sys-auth/policykit[pam]
-					)"
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig
-		>=dev-util/intltool-0.35
-		doc?	(
-					app-text/xmlto
-					dev-libs/libxml2
-					dev-util/gtk-doc
-					app-text/docbook-sgml-utils
-				)"
-PDEPEND=">=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
-}
-
-src_prepare() {
-	# Only apply one of the policy patches.  Bug #267042
-	if use policykit ; then
-		rm "${WORKDIR}/${PATCHNAME}/patches/0001-plugdev-dbus-policy.patch"
-	else
-		rm "${WORKDIR}/${PATCHNAME}/patches/0002-policykit-dbus-policy.patch"
-	fi
-
-	EPATCH_MULTI_MSG="Applying Gentoo Patchset ..." \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_SOURCE="${WORKDIR}/${PATCHNAME}/patches/" \
-	EPATCH_FORCE="yes" \
-	epatch
-
-	eautoreconf
-}
-
-src_configure() {
-	local acpi="$(use_enable acpi)"
-	local backend=
-	local hardware=
-	local consolekit="$(use_enable consolekit console-kit)"
-
-	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 x86 || use amd64; then
-			hardware="$hardware --with-macbook --with-macbookpro"
-		fi
-
-		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
-
-	# Policykit support depends on consolekit support.  Therefore, force on
-	# consolekit, even if it's USE flag is off, if policykit support is on.
-	# This enables packages to USE-depend on hal[policykit?]
-	if use policykit ; then
-		consolekit="--enable-console-kit"
-	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-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) \
-		  $(use_enable policykit policy-kit) \
-		  ${consolekit} \
-		  --docdir=/usr/share/doc/${PF} \
-		  --localstatedir=/var \
-		  ${acpi} ${hardware} \
-	|| die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README || die "docs failed"
-
-	# hal umount for unclean unmounts
-	exeinto /$(get_libdir)/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}/${PATCHNAME}/config-examples/"*.fdi || \
-			die "dodoc X examples failed"
-	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/cache/hald
-	keepdir /var/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 "Access to hal is not protected by either policykit or the plugdev group."
-	elog "If you have problems discovering/configuring hardware, try adding"
-	elog "yourself to plugdev."
-	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/."
-		echo
-		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.12_rc1-r8.ebuild b/sys-apps/hal/hal-0.5.12_rc1-r8.ebuild
index f3968d2fef8c..cc5aa60f22e4 100644
--- a/sys-apps/hal/hal-0.5.12_rc1-r8.ebuild
+++ b/sys-apps/hal/hal-0.5.12_rc1-r8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.12_rc1-r8.ebuild,v 1.3 2009/10/03 21:56:49 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.12_rc1-r8.ebuild,v 1.4 2010/03/10 21:47:55 dang Exp $
 
 EAPI="2"
 
@@ -18,7 +18,7 @@ SRC_URI="http://hal.freedesktop.org/releases/${MY_P}.tar.bz2
 
 LICENSE="|| ( GPL-2 AFL-2.0 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~x86-fbsd"
 
 KERNEL_IUSE="kernel_linux kernel_FreeBSD"
 IUSE="X acpi apm crypt consolekit debug dell disk-partition doc laptop policykit selinux ${KERNEL_IUSE}"