old, drop desc for USE hal

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

3 files changed, 6 insertions, 126 deletions

diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 91ce940c57e9..add9ccb9d412 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 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 3017 RMD160 03908767830b7a841e5d96e8defc885b518611f9 SHA1 1712c7f0ffde9fb2a14b1a5a7ab3b18d15bf276a SHA256 ec57a869eaf00d9a9a6cedb1e80a8b4bc8aec42d450b3e3530cba1910d2a1341
 MISC ChangeLog 19750 RMD160 4d3bd444e27359eb556ef4e78f528d7d4da1a2ed SHA1 9f94a66fa9ed90ee9c48a7ff4146622de18a6ba0 SHA256 78e8e1d20ab006a3998120c04f6b7d3f58f7e9645b2c5b7599fc0ccec0d022d7
-MISC metadata.xml 1099 RMD160 cf19e56e51f73d9c1049feb15a82c42db9d5f879 SHA1 9310ffb0c2560a094c3f33a19a841e532c186a67 SHA256 59de51ce61532c4efb84b3599743b5485bc4d9d58479d7efc57baabc856ebb98
+MISC metadata.xml 1026 RMD160 9f60ad05b950ee45d8500c8640f26021f397ab5f SHA1 dd73b18963c0beb12f4ea099833c1376952f0c3b SHA256 b5aa8baad5d63d30113e894a8630e80fb5350dbd91903949e336bd604925fd38
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk28SeoACgkQuQc30/atMkBX9ACgvT+OV7ZvZn16XKaJcq2umh+X
-Q6EAoKd4HViqMGOuAwtIx5qmHstBvCdj
-=ULpl
+iF4EAREIAAYFAk3FH6MACgkQXkR9YqOcLPEvvQD8CZx4hLyLiDCYIXNHSAEhSOfk
+3EiOuo5bteY923rydAsBAJqOReyk81EV9vKw0lO0ACLSrmcq1OK3ArwviSzXgHos
+=YX/e
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gvfs/gvfs-1.6.6-r1.ebuild b/gnome-base/gvfs/gvfs-1.6.6-r1.ebuild
deleted file mode 100644
index e923dc4bab1d..000000000000
--- a/gnome-base/gvfs/gvfs-1.6.6-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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.6-r1.ebuild,v 1.9 2011/03/27 15:48:03 ssuominen Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit autotools bash-completion gnome2 eutils
-
-DESCRIPTION="GNOME Virtual Filesystem Layer"
-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"
-
-RDEPEND=">=dev-libs/glib-2.23.4
-	>=sys-apps/dbus-1.0
-	dev-libs/libxml2
-	net-misc/openssh
-	>=sys-fs/udev-138
-	archive? ( app-arch/libarchive )
-	avahi? ( >=net-dns/avahi-0.6 )
-	bluetooth? (
-		>=app-mobilephone/obex-data-server-0.4.5
-		dev-libs/dbus-glib
-		net-wireless/bluez
-		dev-libs/expat )
-	fuse? ( sys-fs/fuse )
-	gdu? ( >=sys-apps/gnome-disk-utility-2.29 )
-	gnome? ( >=gnome-base/gconf-2.0 )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
-	gphoto2? ( >=media-libs/libgphoto2-2.4.7 )
-	ios? ( app-pda/libimobiledevice )
-	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 ) )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.19
-	dev-util/gtk-doc-am
-	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"
-	fi
-
-	G2CONF="${G2CONF}
-		--disable-hal
-		--enable-udev
-		--disable-bash-completion
-		--with-dbus-service-dir=/usr/share/dbus-1/services
-		$(use_enable archive)
-		$(use_enable avahi)
-		$(use_enable bluetooth obexftp)
-		$(use_enable cdda)
-		$(use_enable fuse)
-		$(use_enable gdu)
-		$(use_enable gnome gconf)
-		$(use_enable gphoto2)
-		$(use_enable ios afc)
-		$(use_enable udev gudev)
-		$(use_enable http)
-		$(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"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Conditional patching purely to avoid eautoreconf
-	use gphoto2 && epatch "${FILESDIR}/${PN}-1.2.2-gphoto2-stricter-checks.patch"
-
-	if use archive; then
-		epatch "${FILESDIR}/${PN}-1.2.2-expose-archive-backend.patch"
-		echo "mount-archive.desktop.in" >> po/POTFILES.in
-		echo "mount-archive.desktop.in.in" >> po/POTFILES.in
-	fi
-
-	use gphoto2 || use archive && eautoreconf
-
-	# Disable API deprecation
-	sed 's/-DG_DISABLE_DEPRECATED//' \
-		-i */*/Makefile.am */*/Makefile.in */Makefile.am */Makefile.in \
-		|| die "sed failed"
-}
-
-src_install() {
-	gnome2_src_install
-	use bash-completion && \
-		dobashcompletion programs/gvfs-bash-completion.sh ${PN}
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	use bash-completion && bash-completion_pkg_postinst
-
-	ewarn "In order to use the new gvfs services, please reload dbus configuration"
-	ewarn "You may need to log out and log back in for some changes to take effect"
-}
diff --git a/gnome-base/gvfs/metadata.xml b/gnome-base/gvfs/metadata.xml
index 604aa28b9b09..f71befad44bd 100644
--- a/gnome-base/gvfs/metadata.xml
+++ b/gnome-base/gvfs/metadata.xml
@@ -15,7 +15,6 @@ applications not using gio to access the gvfs filesystems.
 	<flag name='fuse'>Enables fuse mount points in $HOME/.gvfs for legacy
 		application access</flag>
 	<flag name="gdu">Enable <pkg>sys-apps/gnome-disk-utility</pkg> integration</flag>
-	<flag name="hal">Enable obsolete <pkg>sys-apps/hal</pkg> support</flag>
 	<flag name="http">Enable the HTTP/DAV backend using <pkg>net-libs/libsoup-gnome</pkg></flag>
 	<flag name="udev">Enable udev base replacement code for cdda feature</flag>
 </use>