Remove USE="hal" (replaced by USE="udev") wrt #313389.

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

4 files changed, 23 insertions, 29 deletions

diff --git a/media-sound/qmmp/ChangeLog b/media-sound/qmmp/ChangeLog
index e26501b6e6ea..1043e3615fb2 100644
--- a/media-sound/qmmp/ChangeLog
+++ b/media-sound/qmmp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/qmmp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/ChangeLog,v 1.58 2010/12/04 20:51:05 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/ChangeLog,v 1.59 2010/12/19 03:17:47 ssuominen Exp $
+
+  19 Dec 2010; Samuli Suominen <ssuominen@gentoo.org> qmmp-0.4.3.ebuild,
+  qmmp-9999.ebuild:
+  Remove USE="hal" (replaced by USE="udev") wrt #313389.
 
   04 Dec 2010; Markos Chandras <hwoarang@gentoo.org> -qmmp-0.4.2.ebuild,
   qmmp-0.4.3.ebuild:
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 4e724677de6b..aa4473318f31 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST qmmp-0.4.3.tar.bz2 647733 RMD160 cd59f5347189e3f7dc74c85a7bdddcd8b9e197f9 SHA1 3aecf8783ca3b5c944ff766bfc2ba1d16ffbaceb SHA256 a75c2c676515182ecfbe811cba29ba4ca736912e52fde283db4d03eb116457a4
-EBUILD qmmp-0.4.3.ebuild 2917 RMD160 ee01fc20b10bf449ee8741bc39ec1a42dca784ab SHA1 0368d3b80a4a77fa391d4c8188faf6f4ec4b75e9 SHA256 7f6e4851553dba8223fd27bf18ef321279332d4fe0dacd31d6c548d3c6229c71
-EBUILD qmmp-9999.ebuild 2985 RMD160 838d3d88d8897b368d8f0c989ed6bbfdaab21549 SHA1 3e34a988a00da6df02fd100e91f2b1a3fc581e45 SHA256 7d2c4f3374a4e928e7763bb34338d062769c4f2f9812139902a93cca0d38d440
-MISC ChangeLog 7997 RMD160 7d746a1fcf837680f2d9d1ba0e4cb0435b6495b4 SHA1 0b5c3c2ab41b2b0168ca84ea992d0c83abf3e7ca SHA256 1724a2519b4c2ecb0344c4797777969cbe11d51818e6a94cd8bb00319f813767
+EBUILD qmmp-0.4.3.ebuild 2867 RMD160 5d22a2a0661b77bf8c6e245098cd1e5470d98b69 SHA1 988b38f6673a54f848f7748246e7fb7e8e633886 SHA256 c99a4153ebcd9dd0efba0e96d9c510aa30c2ca826a024ec32fbe94bcc8a45854
+EBUILD qmmp-9999.ebuild 2936 RMD160 91a6c6cd32399692ea0c6963e9dd238d1ba4291a SHA1 09136ebf371ad6611a755f56ad4c1a734a9ece11 SHA256 875f59b328f12552029bddfa9a1083941e147dbd54380f88436417021cb6e2d7
+MISC ChangeLog 8149 RMD160 02deb0442c5843dc6657d3e5740cecd56068a3fc SHA1 094031a5c824705f3d091131498bd7af3311d9dc SHA256 cac5dc80942d8131d4fc99048a4b9f087380f80569b8cc6bd21d43add168f7cd
 MISC metadata.xml 1009 RMD160 9e6c380881f87afc17619d694e44422495ecf08d SHA1 d325a376a387dbde03ed6a39c842ebd105ed129b SHA256 352e00808008b4f37649e1868d40ffab1aebb266dc47016179791f22456496e2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkz6qbQACgkQ9/cejkQaxBCerQCeMmG55dt5LdXLgjFS4/uZngIp
-NdYAn0ICt79njP72SPNO4AlkKKvAEn9S
-=yalp
------END PGP SIGNATURE-----
diff --git a/media-sound/qmmp/qmmp-0.4.3.ebuild b/media-sound/qmmp/qmmp-0.4.3.ebuild
index 13cea49c6a33..125dac3c66ee 100644
--- a/media-sound/qmmp/qmmp-0.4.3.ebuild
+++ b/media-sound/qmmp/qmmp-0.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-0.4.3.ebuild,v 1.4 2010/12/04 20:51:05 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-0.4.3.ebuild,v 1.5 2010/12/19 03:17:47 ssuominen Exp $
 
 EAPI="2"
 
@@ -21,7 +21,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 # KEYWORDS further up
-IUSE="aac +alsa +dbus bs2b cdda cover enca ffmpeg flac hal jack kde ladspa
+IUSE="aac +alsa +dbus bs2b cdda cover enca ffmpeg flac jack kde ladspa
 libsamplerate lyrics +mad mms modplug mplayer mpris musepack notifier oss projectm pulseaudio scrobbler sndfile tray +vorbis wavpack"
 
 RDEPEND="x11-libs/qt-qt3support:4
@@ -33,7 +33,6 @@ RDEPEND="x11-libs/qt-qt3support:4
 	aac? ( media-libs/faad2 )
 	enca? ( app-i18n/enca )
 	flac? ( media-libs/flac )
-	hal? ( sys-apps/hal )
 	ladspa? ( media-libs/ladspa-cmt )
 	libsamplerate? ( media-libs/libsamplerate )
 	mad? ( media-libs/libmad )
@@ -59,7 +58,7 @@ DOCS="AUTHORS ChangeLog README"
 CMAKE_IN_SOURCE_BUILD="1"
 
 src_configure() {
-	mycmakeargs="${mycmakeargs}
+	mycmakeargs=(
 		$(cmake-utils_use_use alsa)
 		$(cmake-utils_use_use aac)
 		$(cmake-utils_use_use bs2b)
@@ -69,7 +68,7 @@ src_configure() {
 		$(cmake-utils_use_use enca)
 		$(cmake-utils_use_use ffmpeg)
 		$(cmake-utils_use_use flac)
-		$(cmake-utils_use_use hal)
+		-DUSE_HAL=OFF
 		$(cmake-utils_use_use jack)
 		$(cmake-utils_use_use kde KDENOTIFY)
 		$(cmake-utils_use_use ladspa)
@@ -89,7 +88,8 @@ src_configure() {
 		$(cmake-utils_use_use tray STATICON)
 		$(cmake-utils_use_use libsamplerate SRC)
 		$(cmake-utils_use_use vorbis)
-		$(cmake-utils_use_use wavpack)"
+		$(cmake-utils_use_use wavpack)
+		)
 
 	cmake-utils_src_configure
 }
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index cad8d8a24334..9b9aac012987 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-9999.ebuild,v 1.12 2010/11/03 22:01:25 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-9999.ebuild,v 1.13 2010/12/19 03:17:47 ssuominen Exp $
 
 EAPI="2"
 
@@ -21,9 +21,9 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 # KEYWORDS further up
-IUSE="aac +alsa +dbus bs2b cdda cover enca ffmpeg flac hal jack kde ladspa
+IUSE="aac +alsa +dbus bs2b cdda cover enca ffmpeg flac jack kde ladspa
 libsamplerate lyrics +mad mms modplug mplayer mpris musepack notifier oss
-projectm pulseaudio scrobbler sndfile tray udisks +vorbis wavpack"
+projectm pulseaudio scrobbler sndfile tray udev +vorbis wavpack"
 
 RDEPEND="x11-libs/qt-qt3support:4
 	media-libs/taglib
@@ -34,7 +34,6 @@ RDEPEND="x11-libs/qt-qt3support:4
 	aac? ( media-libs/faad2 )
 	enca? ( app-i18n/enca )
 	flac? ( media-libs/flac )
-	hal? ( sys-apps/hal )
 	ladspa? ( media-libs/ladspa-cmt )
 	libsamplerate? ( media-libs/libsamplerate )
 	mad? ( media-libs/libmad )
@@ -50,7 +49,7 @@ RDEPEND="x11-libs/qt-qt3support:4
 	projectm? ( media-libs/libprojectm
 		x11-libs/qt-opengl:4 )
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
-	udisks? ( sys-fs/udisks )
+	udev? ( sys-fs/udisks )
 	wavpack? ( media-sound/wavpack )
 	scrobbler? ( net-misc/curl )
 	sndfile? ( media-libs/libsndfile )"
@@ -61,7 +60,7 @@ DOCS="AUTHORS ChangeLog README"
 CMAKE_IN_SOURCE_BUILD="1"
 
 src_configure() {
-	mycmakeargs="${mycmakeargs}
+	mycmakeargs=(
 		$(cmake-utils_use_use alsa)
 		$(cmake-utils_use_use aac)
 		$(cmake-utils_use_use bs2b)
@@ -71,7 +70,7 @@ src_configure() {
 		$(cmake-utils_use_use enca)
 		$(cmake-utils_use_use ffmpeg)
 		$(cmake-utils_use_use flac)
-		$(cmake-utils_use_use hal)
+		-DUSE_HAL=OFF
 		$(cmake-utils_use_use jack)
 		$(cmake-utils_use_use kde KDENOTIFY)
 		$(cmake-utils_use_use ladspa)
@@ -90,9 +89,10 @@ src_configure() {
 		$(cmake-utils_use_use sndfile)
 		$(cmake-utils_use_use tray STATICON)
 		$(cmake-utils_use_use libsamplerate SRC)
-		$(cmake-utils_use_use udisks)
+		$(cmake-utils_use_use udev udisks)
 		$(cmake-utils_use_use vorbis)
-		$(cmake-utils_use_use wavpack)"
+		$(cmake-utils_use_use wavpack)
+		)
 
 	cmake-utils_src_configure
 }