old, drop desc for USE hal

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

2 files changed, 0 insertions, 118 deletions

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>