Remove sys-apps/hal support wrt #313389.

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

3 files changed, 12 insertions, 27 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 75f196ae6a8c..60b3dedae318 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.137 2011/03/28 06:38:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.138 2011/03/29 03:10:47 ssuominen Exp $
+
+  29 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> gvfs-1.6.7.ebuild:
+  Remove sys-apps/hal support wrt #313389.
 
   28 Mar 2011; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Make ios USE description understandable without using google
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 5718e3bc427d..8ebf112dae56 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gvfs-1.2.2-expose-archive-backend.patch 1607 RMD160 cd17c501805fb81e560c35deb1d234280fd07f5c SHA1 70b1824a49ba654dda5ae2ef267ca45a31b53dc4 SHA256 a6cd0f6b848e1943f9121cf4ce4105f32573f9cf7cf75bc0d7d61a98babec519
 AUX gvfs-1.2.2-gphoto2-stricter-checks.patch 1127 RMD160 0c6d83f8b38cf41002dbe6f863916cfac66cd231 SHA1 fc4927fc0f3604689d446d4fe47b48384bee70a5 SHA256 146349147b82721551ce717d892068d608b352fdabd40b969ec9c2b97595c062
 DIST gvfs-1.6.6.tar.bz2 1387796 RMD160 705934a0a3f520a41237374abeb0182d01398903 SHA1 066800558370187abd838c358349bb73f1579f8b SHA256 902890deb6a670f642180ea958406ebb02af1d5867a464c87e493d56f1dde7bd
 DIST gvfs-1.6.7.tar.bz2 1404372 RMD160 e833fdbc9dc503cdde8e0ab5a7a8fa5403ec1aa1 SHA1 285a810772dce8b37289cbe0aaab8354f2b6717a SHA256 fe5f6181eac14d5147794389bf57717226a15ddf8283631b434c2d9ec120d659
 EBUILD gvfs-1.6.6-r1.ebuild 3326 RMD160 9c4fb8b3ce00cc09dac46b17c460a86c38e9b60e SHA1 48d5b4718c5ef46d5991b6e4ba76adce03031ef9 SHA256 5681044b3269269b77d776f2367e60eed1895226fcd5f487712abb76cab30a8c
-EBUILD gvfs-1.6.7.ebuild 3340 RMD160 5d066a5a26d599a24508123cfa5bba0a165b51a3 SHA1 b879bc03604476ee801ec7aa034929d4e6338dda SHA256 03b7cdfb70aa846b679bac24257c243f05d0eeecefbb268d3e9c413391cc94e3
-MISC ChangeLog 19091 RMD160 0c8d90992ed7cc304b245ad5ae214c69d53e4d00 SHA1 98c829e070563bbd61dbd04607be51382969e3f8 SHA256 31a5974324f00a466f19b12422192c4c286aa081fa4b4d1f3a9cadb3dd61c4f4
+EBUILD gvfs-1.6.7.ebuild 3028 RMD160 677fbdca6507ae4dd21dc8836ac64b99b6a2e8e4 SHA1 4def394394d6ff82e967f769e93adecb046feff7 SHA256 76e4f07b98db57ff6974c29d8284d6f63c924cafe752f4188c1f999bb207de8b
+MISC ChangeLog 19213 RMD160 69972553773fe7f47f065abe2434560bb80a49af SHA1 53cb0904bcf85587692e3964f6c8d6e75b748fa2 SHA256 90916bb4ab6f1ae6648b7ba0a89f91477e4814b7a6b62fc8b15c317e2a8ec6fd
 MISC metadata.xml 1154 RMD160 0a6e0e5c75b686a6f7f5fc3bd5ed18a6ba1b7f5d SHA1 c76ae391c6b1c185a65e5a8f38c29aff57190165 SHA256 897904c9667b0ddbde9fd035ad12d722efa3f4fda26742e90a538f49838853df
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk2QLPEACgkQgAnW8HDreRbJ2ACeL7wAEjX63gfUfk+qLmNcn985
-nUAAoLcNgwyUEGPQVJjSfKWSP1CCLVlD
-=spOD
------END PGP SIGNATURE-----
diff --git a/gnome-base/gvfs/gvfs-1.6.7.ebuild b/gnome-base/gvfs/gvfs-1.6.7.ebuild
index 44dbc94a7cc1..7550e24a3952 100644
--- a/gnome-base/gvfs/gvfs-1.6.7.ebuild
+++ b/gnome-base/gvfs/gvfs-1.6.7.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/gnome-base/gvfs/gvfs-1.6.7.ebuild,v 1.2 2011/03/27 15:48:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.6.7.ebuild,v 1.3 2011/03/29 03:10:47 ssuominen Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -13,8 +13,7 @@ HOMEPAGE="http://www.gnome.org"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="archive avahi bluetooth cdda doc fuse gdu gnome gnome-keyring gphoto2 hal
-+http ios samba +udev"
+IUSE="archive avahi bluetooth cdda doc fuse gdu gnome gnome-keyring gphoto2 +http ios samba +udev"
 
 RDEPEND=">=dev-libs/glib-2.23.4
 	>=sys-apps/dbus-1.0
@@ -37,9 +36,6 @@ RDEPEND=">=dev-libs/glib-2.23.4
 	udev? (
 		cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
 		>=sys-fs/udev-145[extras] )
-	hal? ( !udev? (
-		cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
-		>=sys-apps/hal-0.5.10 ) )
 	http? ( >=net-libs/libsoup-gnome-2.26.0 )
 	samba? ( || ( >=net-fs/samba-3.4.6[smbclient]
 			<=net-fs/samba-3.3 ) )"
@@ -50,9 +46,10 @@ DEPEND="${RDEPEND}
 	doc? ( >=dev-util/gtk-doc-1 )"
 
 pkg_setup() {
-	if use cdda && ! use hal && ! use udev; then
-		ewarn "You have \"+cdda\", but you have \"-hal\" and \"-udev\""
-		ewarn "cdda support will NOT be built unless you enable EITHER hal OR udev"
+	if use cdda && ! use udev; then
+		ewarn
+		ewarn "You need to enable USE=\"udev\" for USE=\"cdda\" to be useful."
+		ewarn
 	fi
 
 	G2CONF="${G2CONF}
@@ -74,11 +71,6 @@ pkg_setup() {
 		$(use_enable gnome-keyring keyring)
 		$(use_enable samba)"
 
-	if use hal && ! use udev; then
-		G2CONF="${G2CONF} --enable-hal"
-		ewarn "Enabling deprecated hal support. This will override udev support."
-	fi
-
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 }