Remove support for sys-apps/hal wrt #313389.

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

3 files changed, 12 insertions, 18 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 635538191702..f23d544c853a 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.200 2011/03/23 23:01:56 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.201 2011/03/27 15:29:09 ssuominen Exp $
+
+  27 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> rhythmbox-0.13.3.ebuild:
+  Remove support for sys-apps/hal wrt #313389.
 
 *rhythmbox-0.13.3 (23 Mar 2011)
 
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index eb3549a38dca..c90794db3c71 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -4,6 +4,6 @@ AUX rhythmbox-0.12.8-namespace-conflict.patch 2155 RMD160 2ed6fe3966c860845d0d12
 DIST rhythmbox-0.12.8.tar.bz2 5358950 RMD160 072d4fa06408ebc181b40147db1575d0ef4c99fe SHA1 5d27923cc29b81d7bfbc73d867d7976a5295f964 SHA256 1752fab135808aa78a9afde78448e992020c58c07701f43c989fbabfc6352213
 DIST rhythmbox-0.13.3.tar.bz2 9978135 RMD160 f6f155768ce9c87d844ee47f7f1cc4f167d05052 SHA1 1c6e83972dcd7de8fc1a71586843e29092a0c706 SHA256 ad6532864bb4df30f1014ec81ddc0d2d3f69241235627f46abe5578cf629052a
 EBUILD rhythmbox-0.12.8-r1.ebuild 5320 RMD160 163e93a6c72e6c8987e64ec25e7f0d2c7b471054 SHA1 26ce9fdade1676cd8f709a499d76b27594a7e05a SHA256 46c6558a25b0c34ebb46aa81d273df044129e735445bf4bbe2703cb03179b3c3
-EBUILD rhythmbox-0.13.3.ebuild 5234 RMD160 8df8f84254d55fc095bd01bf0b6537d7ed93c362 SHA1 be291462337ce5cca8ecf97f050d87d6e3062bec SHA256 1804e636849df2989b3c7ce39cbbb1e2b83cfaaceff5e57094e312a6ad3c4c58
-MISC ChangeLog 30977 RMD160 3b9106411883da742b9bd261b373a027d1dc3591 SHA1 e74e1ba85a64339fe16f0d72786d04e578b7feac SHA256 1b7bef616654c967495ad9360d92714875d2a5a5f174d0934bd26b4b71ad4a8b
+EBUILD rhythmbox-0.13.3.ebuild 4932 RMD160 d1259193e6dcdab519ea1ec6115da930b8ceb41d SHA1 8f9956cbb2faddeb0c9fca8cec5aa6e2ce836e77 SHA256 b455620452567e45bc2fd818252a332d592063c21f14a6a47c04dcecf061d3dc
+MISC ChangeLog 31110 RMD160 18c70cd4dbc97f7694be0dab3ed74799db3c6f84 SHA1 4d640ef2e8efcf1958e87d83d59ed8ff74754eec SHA256 9d7dc49ddd3fb83fe4479bd166e14e50bcfe1fad1c696ad3053984a7d9946986
 MISC metadata.xml 493 RMD160 99d7c84f2cb44d34d07dbdbc9666531ca7d081ef SHA1 e014344c61ed45fd609943fec4097f3861bcebec SHA256 1fece30d8969d46bfa5a547efda6d08b53017ad2475729fc8e7b8ee25621dc0f
diff --git a/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild b/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild
index d5cd511df4ee..06605a5c4b25 100644
--- a/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild,v 1.2 2011/03/23 23:30:59 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild,v 1.3 2011/03/27 15:29:09 ssuominen Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.4"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.rhythmbox.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cdr daap doc gnome-keyring hal ipod +lastfm libnotify lirc musicbrainz mtp nsplugin python test udev upnp webkit"
+IUSE="cdr daap doc gnome-keyring ipod +lastfm libnotify lirc musicbrainz mtp nsplugin python test udev upnp webkit"
 
 # FIXME: double check what to do with fm-radio plugin
 # TODO: watchout for udev use flag changes
@@ -43,10 +43,6 @@ COMMON_DEPEND=">=dev-libs/glib-2.26:2
 		ipod? ( >=media-libs/libgpod-0.7.92 )
 		mtp? ( >=media-libs/libmtp-0.3 )
 		>=sys-fs/udev-145[extras] )
-	hal? (
-		ipod? ( >=media-libs/libgpod-0.6 )
-		mtp? ( >=media-libs/libmtp-0.3 )
-		>=sys-apps/hal-0.5 )
 	lastfm? ( dev-libs/json-glib )
 	libnotify? ( >=x11-libs/libnotify-0.4.1 )
 	lirc? ( app-misc/lirc )
@@ -100,15 +96,15 @@ pkg_setup() {
 		G2CONF="${G2CONF} PYTHON=$(PYTHON -2)"
 	fi
 
-	if ! use hal && ! use udev; then
+	if ! use udev; then
 		if use ipod; then
-			ewarn "ipod support requires hal or udev support.  Please"
+			ewarn "ipod support requires udev support.  Please"
 			ewarn "re-emerge with USE=udev to enable ipod support"
 			G2CONF="${G2CONF} --without-ipod"
 		fi
 
 		if use mtp; then
-			ewarn "MTP support requires hal or udev support.  Please"
+			ewarn "MTP support requires udev support.  Please"
 			ewarn "re-emerge with USE=udev to enable MTP support"
 			G2CONF="${G2CONF} --without-mtp"
 		fi
@@ -116,11 +112,6 @@ pkg_setup() {
 		G2CONF="${G2CONF} $(use_with ipod) $(use_with mtp)"
 	fi
 
-	if use hal && use udev; then
-		einfo "udev support replaces hal support completely. You can disable"
-		einfo "hal on this package via /etc/portage/package.use."
-	fi
-
 	if ! use cdr ; then
 		ewarn "You have cdr USE flag disabled."
 		ewarn "You will not be able to burn CDs."
@@ -139,7 +130,7 @@ pkg_setup() {
 		GST_INSPECT=$(type -P true)
 		$(use_with gnome-keyring)
 		$(use_with udev gudev)
-		$(use_with hal)
+		--without-hal
 		$(use_enable lastfm)
 		$(use_enable libnotify)
 		$(use_enable lirc)