Remove USE="hal" and pass --disable-hal wrt #350516.

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

2 files changed, 136 insertions, 1 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index bb86cf642956..cabce06bc70c 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.336 2011/02/24 19:01:05 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.337 2011/02/24 19:19:53 ssuominen Exp $
+
+*gnome-vfs-2.24.4-r1 (24 Feb 2011)
+
+  24 Feb 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +gnome-vfs-2.24.4-r1.ebuild:
+  Remove USE="hal" and pass --disable-hal wrt #350516.
 
   24 Feb 2011; Thomas Kahle <tomka@gentoo.org> gnome-vfs-2.24.4.ebuild:
   x86 stable per bug 353436
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r1.ebuild
new file mode 100644
index 000000000000..7ed1292c0b7e
--- /dev/null
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r1.ebuild,v 1.1 2011/02/24 19:19:53 ssuominen Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2 virtualx
+
+DESCRIPTION="Gnome Virtual Filesystem"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="acl avahi doc fam gnutls ipv6 kerberos samba ssl"
+
+RDEPEND=">=gnome-base/gconf-2
+	>=dev-libs/glib-2.9.3
+	>=dev-libs/libxml2-2.6
+	app-arch/bzip2
+	gnome-base/gnome-mime-data
+	>=x11-misc/shared-mime-info-0.14
+	>=dev-libs/dbus-glib-0.71
+	acl? (
+		sys-apps/acl
+		sys-apps/attr )
+	avahi? ( >=net-dns/avahi-0.6 )
+	kerberos? ( virtual/krb5 )
+	fam? ( virtual/fam )
+	samba? ( >=net-fs/samba-3 )
+	ssl? (
+		gnutls?	(
+			net-libs/gnutls
+			!gnome-extra/gnome-vfs-sftp )
+		!gnutls? (
+			>=dev-libs/openssl-0.9.5
+			!gnome-extra/gnome-vfs-sftp ) )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	gnome-base/gnome-common
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/gtk-doc-am-1.13
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-schemas-install
+		--disable-static
+		--disable-cdda
+		--disable-howl
+		$(use_enable acl)
+		$(use_enable avahi)
+		$(use_enable fam)
+		$(use_enable gnutls)
+		--disable-hal
+		$(use_enable ipv6)
+		$(use_enable kerberos krb5)
+		$(use_enable samba)
+		$(use_enable ssl openssl)"
+		# Useless ? --enable-http-neon
+
+	# this works because of the order of configure parsing
+	# so should always be behind the use_enable options
+	# foser <foser@gentoo.org 19 Apr 2004
+	use gnutls && use ssl && G2CONF="${G2CONF} --disable-openssl"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Allow the Trash on afs filesystems (#106118)
+	epatch "${FILESDIR}"/${PN}-2.12.0-afs.patch
+
+	# Fix compiling with headers missing
+	epatch "${FILESDIR}"/${PN}-2.15.2-headers-define.patch
+
+	# Fix for crashes running programs via sudo
+	epatch "${FILESDIR}"/${PN}-2.16.0-no-dbus-crash.patch
+
+	# Fix automagic dependencies, upstream bug #493475
+	epatch "${FILESDIR}"/${PN}-2.20.0-automagic-deps.patch
+	epatch "${FILESDIR}"/${PN}-2.20.1-automagic-deps.patch
+
+	# Fix to identify ${HOME} (#200897)
+	# thanks to debian folks
+	epatch "${FILESDIR}"/${PN}-2.24.4-home_dir_fakeroot.patch
+
+	# Configure with gnutls-2.7, bug #253729
+	epatch "${FILESDIR}"/${PN}-2.24.0-gnutls27.patch
+
+	# Prevent duplicated volumes, bug #193083
+	epatch "${FILESDIR}"/${PN}-2.24.0-uuid-mount.patch
+
+	# Do not build tests with FEATURES="-test", bug #226221
+	epatch "${FILESDIR}"/${PN}-2.24.4-build-tests-asneeded.patch
+
+	# Disable broken test, bug #285706
+	epatch "${FILESDIR}"/${PN}-2.24.4-disable-test-async-cancel.patch
+
+	# Fix deprecated API disabling in used libraries - this is not future-proof, bug 212163
+	# upstream bug #519632
+	sed -i -e '/DISABLE_DEPRECATED/d' \
+		daemon/Makefile.am daemon/Makefile.in \
+		libgnomevfs/Makefile.am libgnomevfs/Makefile.in \
+		modules/Makefile.am modules/Makefile.in \
+		test/Makefile.am test/Makefile.in || die
+	sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' \
+		programs/Makefile.am programs/Makefile.in || die
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
+src_test() {
+	unset DISPLAY
+	# Fix bug #285706
+	unset XAUTHORITY
+	Xemake check || die "tests failed"
+}
+
+src_install() {
+	gnome2_src_install
+	find "${ED}/usr/$(get_libdir)/gnome-vfs-2.0/modules/" -name "*.la" -delete || die
+}