Remove deprecated hal support wrt #349050.

Package-Manager: portage-2.2.0_alpha10/cvs/Linux x86_64

3 files changed, 12 insertions, 25 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/Manifest b/media-sound/pulseaudio/Manifest
index d203f4cf31c1..4603432a794b 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -24,6 +24,6 @@ EBUILD pulseaudio-0.9.21.2-r1.ebuild 7127 RMD160 2506a1900209932c0340fb3dfe376df
 EBUILD pulseaudio-0.9.21.2-r2.ebuild 7383 RMD160 b8aeee48d39e14d60bdeac1830843ebc8e9e38d4 SHA1 d645b35acd340ee03d259bf7d566e6c44ead84eb SHA256 0902131ac752301d9c08da581e86a8e670440ed6a03dccd2bad8b4d5fbdce32c
 EBUILD pulseaudio-0.9.21.2.ebuild 7107 RMD160 958bcedd3c76894bb452961baa2615be4264baa0 SHA1 89e793eaa48c13a31bde2d4020878678b7e0287d SHA256 7df56c23340ad6769050dc083f01ba9e4da4ccb52cc83e079fed222bda0cf3be
 EBUILD pulseaudio-0.9.21.ebuild 5396 RMD160 e41be2f6f1c2ba8f4b0c1bcc1a86b1d823f7e4d5 SHA1 80140c3b8bad665646aa587cb0dcbc8f6a0d302e SHA256 24674c1d5466e25798d61f9f99e1c7fde7f58b49a2e59532386010561631a500
-EBUILD pulseaudio-0.9.22.ebuild 7123 RMD160 8045847edae17d3fc84698cb85a76f9ade83ede8 SHA1 6cb395a4a6ddd2f11eb20e50fd8b47b9fe2611f2 SHA256 e592e5bb959ce1f06d5fea7e26148fd892e15ceafa613b786cb3ce2452efc5a1
-MISC ChangeLog 40902 RMD160 70193c44e7f8da1ec2931fed451996671b364daa SHA1 f1f7f21a9874b3976463679cc759afc9addad01d SHA256 fd3cf53a6a0230766b8fff9069c8093326b1568ea7691aa37e93b3676fe892d2
+EBUILD pulseaudio-0.9.22.ebuild 6629 RMD160 7018c4f4c748156cbba98bc79f175ede0613199c SHA1 5566c89ac59d4bd235438e62909d77f356abb50f SHA256 c7d4ed98bb356d8d6cf9153fd6ec2b8becbcd5c342020140199b689386e635be
+MISC ChangeLog 41025 RMD160 8249618d302ea109ffca895ba01667261757389f SHA1 01cb6a25900da303e860b276569be4941700dc5e SHA256 108d52b8e4718b9597a41604af32ce8b3e4e5468764647f69af61a1183618421
 MISC metadata.xml 2156 RMD160 14d0f56694ac33865c29d7db9458c9636497a66f SHA1 a3ca6364922bf6d07714d8d6670cfdac75a39e39 SHA256 2573de70d411e31d4ce22e757757893270f45281520bce564a715c1abd1f9959
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