Remove deprecated hal support wrt #349050.

(Portage version: 2.2.0_alpha10/cvs/Linux x86_64)

2 files changed, 10 insertions, 23 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index e16f574905be..2f932d67ab52 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/pulseaudio
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.203 2010/12/22 06:22:26 ford_prefect Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.204 2011/01/04 12:15:15 ssuominen Exp $
+
+  04 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> pulseaudio-0.9.22.ebuild:
+  Remove deprecated hal support wrt #349050.
 
   22 Dec 2010; Arun Raghavan <ford_prefect@gentoo.org>
   pulseaudio-0.9.19.ebuild, pulseaudio-0.9.21.ebuild,
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild
index 3674c609a54e..e5b8d7aae896 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild,v 1.6 2010/12/22 06:22:26 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild,v 1.7 2011/01/04 12:15:15 ssuominen Exp $
 
 EAPI=3
 
@@ -14,7 +14,7 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+alsa avahi +caps jack lirc oss tcpd +X hal dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime"
+IUSE="+alsa avahi +caps jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime"
 
 RDEPEND="app-admin/eselect-esd
 	X? (
@@ -34,10 +34,6 @@ RDEPEND="app-admin/eselect-esd
 	lirc? ( app-misc/lirc )
 	dbus? ( >=sys-apps/dbus-1.0.0 )
 	gnome? ( >=gnome-base/gconf-2.4.0 )
-	hal? (
-		>=sys-apps/hal-0.5.11
-		>=sys-apps/dbus-1.0.0
-	)
 	bluetooth? (
 		>=net-wireless/bluez-4
 		>=sys-apps/dbus-1.0.0
@@ -77,13 +73,6 @@ pkg_setup() {
 	enewgroup pulse-access
 	enewgroup pulse
 	enewuser pulse -1 -1 /var/run/pulse pulse,audio
-
-	if use udev && use hal; then
-		elog "Please note that enabling both udev and hal will build both"
-		elog "discover modules, but only udev will be used automatically."
-		elog "If you wish to use hal you have to enable it explicitly"
-		elog "or you might just disable the hal USE flag entirely."
-	fi
 }
 
 src_prepare() {
@@ -113,7 +102,7 @@ src_configure() {
 		$(use_enable jack) \
 		$(use_enable lirc) \
 		$(use_enable avahi) \
-		$(use_enable hal) \
+		--disable-hal \
 		$(use_enable dbus) \
 		$(use_enable gnome gconf) \
 		$(use_enable libsamplerate samplerate) \
@@ -158,8 +147,7 @@ src_install() {
 			use "$1" && echo "-D$define" || echo "-U$define"
 		}
 
-		unifdef $(use_define hal) \
-			$(use_define avahi) \
+		unifdef $(use_define avahi) \
 			$(use_define alsa) \
 			$(use_define bluetooth) \
 			$(use_define udev) \
@@ -171,10 +159,6 @@ src_install() {
 
 	use avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
 
-	if use hal && ! use udev; then
-		sed -i -e 's:-udev:-hal:' "${ED}/etc/pulse/default.pa" || die
-	fi
-
 	dodoc README ChangeLog todo || die
 
 	if use doc; then